openstack/heat
Code Issues Proposed changes

Merge "Get the resource type from ResourceDefinition"

Browse Source
This commit is contained in:
Jenkins
2014-06-17 06:52:37 +00:00
committed by Gerrit Code Review
parent 6379804670 7fdb2a80ee
commit 5a9ee2ddd8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/api.py
View File

@@ -125,7 +125,7 @@ def format_stack_resource(resource, detail=True):
api.RES_ACTION: resource.action,
api.RES_STATUS: resource.status,
api.RES_STATUS_DATA: resource.status_reason,
api.RES_TYPE: resource.t['Type'],
api.RES_TYPE: resource.type(),
api.RES_ID: dict(resource.identifier()),
api.RES_STACK_ID: dict(resource.stack.identifier()),
api.RES_STACK_NAME: resource.stack.name,

2
heat/engine/resource.py
View File

@@ -234,7 +234,7 @@ class Resource(object):
self._rsrc_metadata = metadata
def type(self):
return self.t['Type']
return self.t.resource_type
def has_interface(self, resource_type):
"""Check to see if this resource is either mapped to resource_type

2
heat/engine/resources/resource_group.py
View File

@@ -104,7 +104,7 @@ class ResourceGroup(stack_resource.StackResource):
test_tmpl = self._assemble_nested(1, include_all=True)
val_templ = parser.Template(test_tmpl)
res_def = val_templ.resource_definitions(self.stack)["0"]
res_class = self.stack.env.get_class(res_def['Type'])
res_class = self.stack.env.get_class(res_def.resource_type)
res_inst = res_class("%s:resource_def" % self.name, res_def,
self.stack)
res_inst.validate()