Change SecurityGroups to be passed directly to nova

This changes SecurityGroups to return the complete name
of a resource (stack.name).

Change-Id: I945f1213b3ddcb5550e7b4ed3d982d4ee7c4e912

diff --git a/heat/engine/resource.py b/heat/engine/resource.py
index 706e1087c9c7da6c4be414cc8157fa2e04ec4b6e..c48076b9e3f1f63c4f36b21efb0d789de9468b12 100644 (file)
--- a/heat/engine/resource.py
+++ b/heat/engine/resource.py
@@ -405,12 +405,6 @@ class Resource(object):
     def physical_resource_name(self):
         return '%s.%s' % (self.stack.name, self.name)
 
-    def physical_resource_name_find(self, resource_name):
-        if resource_name in self.stack:
-            return '%s.%s' % (self.stack.name, resource_name)
-        else:
-            raise IndexError('no such resource')
-
     def validate(self):
         logger.info('Validating %s' % str(self))
 

diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py
index 65847ca0e8c9be00dfe01527c4e355644c07f2be..94bf7fa52b8dee3c4c4b1a200a2d4b09a431dae8 100644 (file)
--- a/heat/engine/resources/instance.py
+++ b/heat/engine/resources/instance.py
@@ -272,12 +272,7 @@ class Instance(resource.Resource):
         return nics
 
     def handle_create(self):
-        if self.properties.get('SecurityGroups') is None:
-            security_groups = None
-        else:
-            security_groups = [self.physical_resource_name_find(sg)
-                               for sg in self.properties.get('SecurityGroups')]
-
+        security_groups = self.properties.get('SecurityGroups')
         userdata = self.properties['UserData'] or ''
         flavor = self.properties['InstanceType']
         key_name = self.properties['KeyName']

diff --git a/heat/engine/resources/security_group.py b/heat/engine/resources/security_group.py
index 94f8f1d97b44c37d724ea97b6a79bef146208696..24089784d2956c9a408e008ea0ab1fff0568f3ad 100644 (file)
--- a/heat/engine/resources/security_group.py
+++ b/heat/engine/resources/security_group.py
@@ -179,7 +179,7 @@ class SecurityGroup(resource.Resource):
             self.resource_id = None
 
     def FnGetRefId(self):
-        return unicode(self.name)
+        return self.physical_resource_name()
 
 
 def resource_mapping():

diff --git a/heat/tests/test_security_group.py b/heat/tests/test_security_group.py
index cfb496f5eb98b6493351d4e1750d45a4a6587f00..5be744dfa5783d0b7e24f8c282575890aaa16372 100644 (file)
--- a/heat/tests/test_security_group.py
+++ b/heat/tests/test_security_group.py
@@ -195,7 +195,7 @@ Resources:
         sg = stack['the_sg']
         self.assertRaises(resource.UpdateReplace, sg.handle_update, {}, {}, {})
 
-        self.assertResourceState(sg, 'the_sg')
+        self.assertResourceState(sg, 'test_stack.the_sg')
 
         stack.delete()
         self.m.VerifyAll()
@@ -268,7 +268,7 @@ Resources:
         sg = stack['the_sg']
         self.assertRaises(resource.UpdateReplace, sg.handle_update, {}, {}, {})
 
-        self.assertResourceState(sg, 'the_sg')
+        self.assertResourceState(sg, 'test_stack.the_sg')
 
         self.assertEqual(None, sg.delete())
 
@@ -412,7 +412,7 @@ Resources:
         sg = stack['the_sg']
         self.assertRaises(resource.UpdateReplace, sg.handle_update, {}, {}, {})
 
-        self.assertResourceState(sg, 'the_sg')
+        self.assertResourceState(sg, 'test_stack.the_sg')
 
         stack.delete()
         self.m.VerifyAll()
@@ -528,7 +528,7 @@ Resources:
         sg = stack['the_sg']
         self.assertRaises(resource.UpdateReplace, sg.handle_update, {}, {}, {})
 
-        self.assertResourceState(sg, 'the_sg')
+        self.assertResourceState(sg, 'test_stack.the_sg')
 
         self.assertEqual(None, sg.delete())