Fix the error reporting.
- Don't return a dict error - in manager return full response - return the result in Resource.validate() Change-Id: I585ea9dd9cf747927fb4effb90cfff49cba20931 Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
This commit is contained in:
parent
1fc9ff4a0b
commit
f45d436263
|
@ -154,11 +154,9 @@ class Properties(CheckedDict):
|
||||||
if 'Required' in self.data[key]:
|
if 'Required' in self.data[key]:
|
||||||
if self.data[key]['Required'] \
|
if self.data[key]['Required'] \
|
||||||
and not 'Value' in self.data[key]:
|
and not 'Value' in self.data[key]:
|
||||||
return {'Error':
|
return '%s Property must be provided' % key
|
||||||
'%s Property must be provided' % key}
|
|
||||||
|
|
||||||
# are there unimplemented Properties
|
# are there unimplemented Properties
|
||||||
if not self.data[key]['Implemented'] and 'Value' in self.data[key]:
|
if not self.data[key]['Implemented'] and 'Value' in self.data[key]:
|
||||||
return {'Error':
|
return '%s Property not implemented yet' % key
|
||||||
'%s Property not implemented yet' % key}
|
|
||||||
return None
|
return None
|
||||||
|
|
|
@ -203,7 +203,7 @@ class EngineManager(manager.Manager):
|
||||||
template_copy = None
|
template_copy = None
|
||||||
if 'Malformed Query Response' in \
|
if 'Malformed Query Response' in \
|
||||||
response['ValidateTemplateResult']['Description']:
|
response['ValidateTemplateResult']['Description']:
|
||||||
return response['ValidateTemplateResult']['Description']
|
return response
|
||||||
|
|
||||||
stack = parser.Stack(context, stack_name, template, 0, params,
|
stack = parser.Stack(context, stack_name, template, 0, params,
|
||||||
metadata_server=metadata_server)
|
metadata_server=metadata_server)
|
||||||
|
|
|
@ -103,7 +103,7 @@ class Stack(object):
|
||||||
res = str(ex)
|
res = str(ex)
|
||||||
finally:
|
finally:
|
||||||
if res:
|
if res:
|
||||||
err_str = 'Malformed Query Response [%s]' % (res)
|
err_str = 'Malformed Query Response %s' % (res)
|
||||||
response = {'ValidateTemplateResult': {
|
response = {'ValidateTemplateResult': {
|
||||||
'Description': err_str,
|
'Description': err_str,
|
||||||
'Parameters': []}}
|
'Parameters': []}}
|
||||||
|
|
|
@ -128,8 +128,8 @@ class Resource(object):
|
||||||
try:
|
try:
|
||||||
self.calculate_properties()
|
self.calculate_properties()
|
||||||
except ValueError as ex:
|
except ValueError as ex:
|
||||||
return {'Error': '%s' % str(ex)}
|
return str(ex)
|
||||||
self.properties.validate()
|
return self.properties.validate()
|
||||||
|
|
||||||
def instance_id_set(self, inst):
|
def instance_id_set(self, inst):
|
||||||
self.instance_id = inst
|
self.instance_id = inst
|
||||||
|
|
Loading…
Reference in New Issue