Use UUIDs for Quantum security groups

Quantum security groups are referenced by ID and supports duplicate
names, so having the ID available helps to avoid searching for it
when needed.

Change-Id: Idff9245b9848083029dd47fb2253a64b0c5de523

diff --git a/heat/engine/resources/security_group.py b/heat/engine/resources/security_group.py
index 24089784d2956c9a408e008ea0ab1fff0568f3ad..3478e9b85d36b1aa626237eeeb9242edcac40126 100644 (file)
--- a/heat/engine/resources/security_group.py
+++ b/heat/engine/resources/security_group.py
@@ -179,7 +179,10 @@ class SecurityGroup(resource.Resource):
             self.resource_id = None
 
     def FnGetRefId(self):
-        return self.physical_resource_name()
+        if self.properties['VpcId']:
+            return super(SecurityGroup, self).FnGetRefId()
+        else:
+            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 5be744dfa5783d0b7e24f8c282575890aaa16372..205820232c0922a32808e87f148a57e7c066ee02 100644 (file)
--- a/heat/tests/test_security_group.py
+++ b/heat/tests/test_security_group.py
@@ -412,7 +412,7 @@ Resources:
         sg = stack['the_sg']
         self.assertRaises(resource.UpdateReplace, sg.handle_update, {}, {}, {})
 
-        self.assertResourceState(sg, 'test_stack.the_sg')
+        self.assertResourceState(sg, 'aaaa')
 
         stack.delete()
         self.m.VerifyAll()
@@ -528,7 +528,7 @@ Resources:
         sg = stack['the_sg']
         self.assertRaises(resource.UpdateReplace, sg.handle_update, {}, {}, {})
 
-        self.assertResourceState(sg, 'test_stack.the_sg')
+        self.assertResourceState(sg, 'aaaa')
 
         self.assertEqual(None, sg.delete())