openstack/deb-heat
Code Issues Proposed changes

Merge "Return template based class in list resource types"

Browse Source
This commit is contained in:
Jenkins 2014-03-13 23:59:24 +00:00 committed by Gerrit Code Review
commit 4a8cae5e28
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
heat/engine/environment.py
View File

@ -310,15 +310,17 @@ class ResourceRegistry(object):
def get_types(self, support_status): def get_types(self, support_status):
'''Return a list of valid resource types.''' '''Return a list of valid resource types.'''
def is_plugin(key): def is_resource(key):
return isinstance(self._registry[key], ClassResourceInfo) return isinstance(self._registry[key], (ClassResourceInfo,
TemplateResourceInfo))
def status_matches(cls): def status_matches(cls):
return support_status is None or \ return (support_status is None or
cls.value.support_status.status == support_status.encode() cls.get_class().support_status.status ==
support_status.encode())
return [name for name, cls in self._registry.iteritems() return [name for name, cls in self._registry.iteritems()
if is_plugin(name) and status_matches(cls)] if is_resource(name) and status_matches(cls)]
SECTIONS = (PARAMETERS, RESOURCE_REGISTRY) = \ SECTIONS = (PARAMETERS, RESOURCE_REGISTRY) = \

1
heat/tests/test_engine_service.py
View File

@ -1791,6 +1791,7 @@ class StackServiceTest(HeatTestCase):
resources = self.eng.list_resource_types(self.ctx) resources = self.eng.list_resource_types(self.ctx)
self.assertIsInstance(resources, list) self.assertIsInstance(resources, list)
self.assertIn('AWS::EC2::Instance', resources) self.assertIn('AWS::EC2::Instance', resources)
self.assertIn('AWS::RDS::DBInstance', resources)
def test_list_resource_types_deprecated(self): def test_list_resource_types_deprecated(self):
resources = self.eng.list_resource_types(self.ctx, "DEPRECATED") resources = self.eng.list_resource_types(self.ctx, "DEPRECATED")