diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-16 02:46:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-16 02:46:27 +0000 |
| commit | 65f26fbd7cfef5ebe17e4ed6e61010b5f9b1497e (patch) | |
| tree | 842043e20039f936fd319b574d52411bb5452629 | |
| parent | 9e0f3677af75c21758df414fc48532138fcda68b (diff) | |
| parent | cf60e32d208d776831329c057c5ccd156d423ee5 (diff) | |
| download | heat-65f26fbd7cfef5ebe17e4ed6e61010b5f9b1497e.tar.gz | |
Merge "Resource.has_interface check get_resource_info result" into stable/kilo
| -rw-r--r-- | heat/engine/resource.py | 2 | ||||
| -rw-r--r-- | heat/tests/test_resource.py | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/heat/engine/resource.py b/heat/engine/resource.py index bb51964e1..d8079a48a 100644 --- a/heat/engine/resource.py +++ b/heat/engine/resource.py @@ -331,7 +331,7 @@ class Resource(object): return True ri = self.stack.env.get_resource_info(self.type(), self.name) - return ri.name == resource_type + return ri is not None and ri.name == resource_type def implementation_signature(self): ''' diff --git a/heat/tests/test_resource.py b/heat/tests/test_resource.py index b77466ebf..2dda46eab 100644 --- a/heat/tests/test_resource.py +++ b/heat/tests/test_resource.py @@ -270,6 +270,12 @@ class ResourceTest(common.HeatTestCase): res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack) self.assertTrue(res.has_interface('GenericResourceType')) + def test_has_interface_mapping_no_match(self): + tmpl = rsrc_defn.ResourceDefinition('test_resource', + 'OS::Test::GenoricResort') + res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack) + self.assertFalse(res.has_interface('GenericResourceType')) + def test_created_time(self): tmpl = rsrc_defn.ResourceDefinition('test_resource', 'Foo') res = generic_rsrc.GenericResource('test_res_new', tmpl, self.stack) |