openstack
/
heat
Code Issues Proposed changes

Merge "Add a separate get_class_to_instantiate() method to Environment"

This commit is contained in:
Jenkins 2015-12-07 10:29:07 +00:00 committed by Gerrit Code Review
parent 6b88bd765e 06a713c445
commit 456e01818a
6 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
heat/engine/environment.py
View File

@ -122,6 +122,12 @@ class ResourceInfo(object):
def matches(self, resource_type):
return False
def get_class(self):
raise NotImplemented
def get_class_to_instantiate(self):
return self.get_class()
def __str__(self):
return '[%s](User:%s) %s -> %s' % (self.description,
self.user_resource,
@ -155,6 +161,10 @@ class TemplateResourceInfo(ResourceInfo):
self.template_name,
env, files=files)
def get_class_to_instantiate(self):
from heat.engine.resources import template_resource
return template_resource.TemplateResource
class MapResourceInfo(ResourceInfo):
"""Store the mapping of one resource type to another.
@ -428,6 +438,11 @@ class ResourceRegistry(object):
name=resource_type)
def get_class(self, resource_type, resource_name=None, files=None):
info = self.get_resource_info(resource_type,
resource_name=resource_name)
return info.get_class(files=files)
def get_class_to_instantiate(self, resource_type, resource_name=None):
if resource_type == "":
msg = _('Resource "%s" has no type') % resource_name
raise exception.StackValidationFailed(message=msg)
@ -445,7 +460,7 @@ class ResourceRegistry(object):
except exception.EntityNotFound as exc:
raise exception.StackValidationFailed(message=six.text_type(exc))
return info.get_class(files=files)
return info.get_class_to_instantiate()
def as_dict(self):
"""Return user resources in a dict format."""
@ -593,6 +608,10 @@ class Environment(object):
return self.registry.get_class(resource_type, resource_name,
files=files)
def get_class_to_instantiate(self, resource_type, resource_name=None):
return self.registry.get_class_to_instantiate(resource_type,
resource_name)
def get_types(self,
cnxt=None,
support_status=None,

11
heat/engine/resource.py
View File

@ -132,15 +132,10 @@ class Resource(object):
# Call is already for a subclass, so pass it through
ResourceClass = cls
else:
from heat.engine.resources import template_resource
registry = stack.env.registry
try:
ResourceClass = registry.get_class(definition.resource_type,
resource_name=name,
files=stack.t.files)
except exception.NotFound:
ResourceClass = template_resource.TemplateResource
ResourceClass = registry.get_class_to_instantiate(
definition.resource_type,
resource_name=name)
assert issubclass(ResourceClass, Resource)

6
heat/engine/resources/openstack/heat/resource_group.py
View File

@ -269,11 +269,7 @@ class ResourceGroup(stack_resource.StackResource):
res_def = next(six.itervalues(
test_tmpl.resource_definitions(self.stack)))
# make sure we can resolve the nested resource type
try:
self.stack.env.get_class(res_def.resource_type)
except exception.NotFound:
# its a template resource
pass
self.stack.env.get_class_to_instantiate(res_def.resource_type)
try:
name = "%s-%s" % (self.stack.name, self.name)

15
heat/engine/service.py
View File

@ -1279,9 +1279,6 @@ class EngineService(service.Service):
self.resource_enforcer.enforce(cnxt, type_name)
try:
resource_class = resources.global_env().get_class(type_name)
except exception.StackValidationFailed:
raise exception.EntityNotFound(entity='Resource Type',
name=type_name)
except exception.NotFound:
LOG.exception(_LE('Error loading resource type %s '
'from global environment.'),
@ -1328,18 +1325,16 @@ class EngineService(service.Service):
self.resource_enforcer.enforce(cnxt, type_name)
try:
resource_class = resources.global_env().get_class(type_name)
if resource_class.support_status.status == support.HIDDEN:
raise exception.NotSupported(type_name)
return resource_class.resource_to_template(type_name,
template_type)
except exception.StackValidationFailed:
raise exception.EntityNotFound(entity='Resource Type',
name=type_name)
except exception.NotFound:
LOG.exception(_LE('Error loading resource type %s '
'from global environment.'),
type_name)
raise exception.InvalidGlobalResource(type_name=type_name)
else:
if resource_class.support_status.status == support.HIDDEN:
raise exception.NotSupported(type_name)
return resource_class.resource_to_template(type_name,
template_type)
@context.request_context
def list_events(self, cnxt, stack_identity, filters=None, limit=None,

4
heat/tests/test_provider_template.py
View File

@ -690,10 +690,6 @@ class ProviderTemplateTest(common.HeatTestCase):
test_templ = test_templ_file.read()
self.assertTrue(test_templ, "Empty test template")
self.m.StubOutWithMock(urlfetch, "get")
urlfetch.get(test_templ_name,
allowed_schemes=('file',)
).AndRaise(urlfetch.URLFetchError(
_('Failed to retrieve template')))
urlfetch.get(test_templ_name,
allowed_schemes=('http', 'https')).AndReturn(test_templ)
parsed_test_templ = template_format.parse(test_templ)

5
heat/tests/test_resource.py
View File

@ -69,12 +69,13 @@ class ResourceTest(common.HeatTestCase):
self.dummy_timeout = 10
def test_get_class_ok(self):
cls = resources.global_env().get_class('GenericResourceType')
cls = resources.global_env().get_class_to_instantiate(
'GenericResourceType')
self.assertEqual(generic_rsrc.GenericResource, cls)
def test_get_class_noexist(self):
self.assertRaises(exception.StackValidationFailed,
resources.global_env().get_class,
resources.global_env().get_class_to_instantiate,
'NoExistResourceType')
def test_resource_new_ok(self):