openstack
/
heat
Code Issues Proposed changes

Merge "Correct parameter when raise NotSupported exception"

This commit is contained in:
Jenkins 2016-07-01 15:52:58 +00:00 committed by Gerrit Code Review
parent 7c589c720b beb86a2981
commit 9e70e9231d
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/engine/service.py
View File

@ -1508,7 +1508,7 @@ class EngineService(service.Service):
raise exception.InvalidGlobalResource(type_name=type_name)
if resource_class.support_status.status == support.HIDDEN:
raise exception.NotSupported(type_name)
raise exception.NotSupported(feature=type_name)
try:
svc_available = resource_class.is_service_available(cnxt)[0]
@ -1567,7 +1567,7 @@ class EngineService(service.Service):
raise exception.InvalidGlobalResource(type_name=type_name)
else:
if resource_class.support_status.status == support.HIDDEN:
raise exception.NotSupported(type_name)
raise exception.NotSupported(feature=type_name)
return resource_class.resource_to_template(type_name,
template_type)

2
heat/tests/common.py
View File

@ -194,6 +194,8 @@ class HeatTestCase(testscenarios.WithScenarios,
generic_rsrc.ResourceTypeUnSupportedLiberty)
resource._register_class('ResourceTypeSupportedKilo',
generic_rsrc.ResourceTypeSupportedKilo)
resource._register_class('ResourceTypeHidden',
generic_rsrc.ResourceTypeHidden)
def patchobject(self, obj, attr, **kwargs):
mockfixture = self.useFixture(mockpatch.PatchObject(obj, attr,

10
heat/tests/engine/test_resource_type.py
View File

@ -127,6 +127,16 @@ class ResourceTypeTest(common.HeatTestCase):
with_description=True)
self.assertEqual(expected, schema)
def test_resource_schema_for_hidden_type(self):
type_name = 'ResourceTypeHidden'
self.assertRaises(exception.NotSupported, self.eng.resource_schema,
self.ctx, type_name)
def test_generate_template_for_hidden_type(self):
type_name = 'ResourceTypeHidden'
self.assertRaises(exception.NotSupported, self.eng.generate_template,
self.ctx, type_name)
def test_resource_schema_with_attr_type(self):
type_name = 'ResourceWithAttributeType'

6
heat/tests/generic_resource.py
View File

@ -341,3 +341,9 @@ class ResourceTypeUnSupportedLiberty(GenericResource):
class ResourceTypeSupportedKilo(GenericResource):
support_status = support.SupportStatus(
version='2015.1')
class ResourceTypeHidden(GenericResource):
support_status = support.SupportStatus(
version='7.0.0',
status=support.HIDDEN)