Merge "Display missing key name in error message"

This commit is contained in:
Jenkins 2016-01-04 18:56:43 +00:00 committed by Gerrit Code Review
commit 81a9262be3
2 changed files with 3 additions and 3 deletions

View File

@ -86,7 +86,7 @@ class ParamYAMLNotWellFormed(exceptions.InvalidInput):
class InputValuesMissing(exceptions.InvalidInput):
message = _("Input values missing for 'get_input")
message = _("Parameter input values missing for the key '%(key)s'")
class ParamYAMLInputMissing(exceptions.InvalidInput):

View File

@ -111,13 +111,13 @@ class DeviceHeat(abstract_driver.DeviceAbstractDriver):
self._update_params(value, paramvalues[key], False)
else:
LOG.debug('Key missing Value: %s', key)
raise vnfm.InputValuesMissing()
raise vnfm.InputValuesMissing(key=key)
elif 'get_input' in value:
if value['get_input'] in paramvalues:
original[key] = paramvalues[value['get_input']]
else:
LOG.debug('Key missing Value: %s', key)
raise vnfm.InputValuesMissing()
raise vnfm.InputValuesMissing(key=key)
else:
self._update_params(value, paramvalues, True)