Updating {add,remove}_security_group in compute.api to use instance

uuids instead of instance ids.
blueprint internal-uuids

Change-Id: I7ba998c67a6b42961657876a8eaa797aa8c29896

2 files changed, 10 insertions, 6 deletions

diff --git a/nova/tests/api/openstack/v2/contrib/test_security_groups.py b/nova/tests/api/openstack/v2/contrib/test_security_groups.py
index 74a764cdb..9055e1bca 100644
--- a/nova/tests/api/openstack/v2/contrib/test_security_groups.py
+++ b/nova/tests/api/openstack/v2/contrib/test_security_groups.py
@@ -22,6 +22,7 @@ import webob
 from nova.api.openstack.v2.contrib import security_groups
 import nova.db
 from nova import exception
+from nova import utils
 from nova import test
 from nova.tests.api.openstack import fakes
 
@@ -86,12 +87,13 @@ def return_server_by_uuid(context, server_uuid):
 
 
 def return_non_running_server(context, server_id):
-    return {'id': server_id, 'power_state': 0x02,
+    return {'id': server_id, 'power_state': 0x02, 'uuid': FAKE_UUID,
             'host': "localhost", 'name': 'asdf'}
 
 
 def return_security_group_by_name(context, project_id, group_name):
-    return {'id': 1, 'name': group_name, "instances": [{'id': 1}]}
+    return {'id': 1, 'name': group_name,
+            "instances": [{'id': 1, 'uuid': FAKE_UUID}]}
 
 
 def return_security_group_without_instances(context, project_id, group_name):
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index c1fae1df2..1e9e2ab04 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -1320,9 +1320,9 @@ class IptablesFirewallTestCase(test.TestCase):
                                        'to_port': 81,
                                        'group_id': src_secgroup['id']})
 
-        db.instance_add_security_group(admin_ctxt, instance_ref['id'],
+        db.instance_add_security_group(admin_ctxt, instance_ref['uuid'],
                                        secgroup['id'])
-        db.instance_add_security_group(admin_ctxt, src_instance_ref['id'],
+        db.instance_add_security_group(admin_ctxt, src_instance_ref['uuid'],
                                        src_secgroup['id'])
         instance_ref = db.instance_get(admin_ctxt, instance_ref['id'])
         src_instance_ref = db.instance_get(admin_ctxt, src_instance_ref['id'])
@@ -1664,6 +1664,7 @@ class NWFilterTestCase(test.TestCase):
 
         instance_ref = self._create_instance()
         inst_id = instance_ref['id']
+        inst_uuid = instance_ref['uuid']
 
         def _ensure_all_called(mac):
             instance_filter = 'nova-instance-%s-%s' % (instance_ref['name'],
@@ -1679,7 +1680,7 @@ class NWFilterTestCase(test.TestCase):
 
         self.security_group = self.setup_and_return_security_group()
 
-        db.instance_add_security_group(self.context, inst_id,
+        db.instance_add_security_group(self.context, inst_uuid,
                                        self.security_group.id)
         instance = db.instance_get(self.context, inst_id)
 
@@ -1713,10 +1714,11 @@ class NWFilterTestCase(test.TestCase):
 
         instance_ref = self._create_instance()
         inst_id = instance_ref['id']
+        inst_uuid = instance_ref['uuid']
 
         self.security_group = self.setup_and_return_security_group()
 
-        db.instance_add_security_group(self.context, inst_id,
+        db.instance_add_security_group(self.context, inst_uuid,
                                        self.security_group.id)
 
         instance = db.instance_get(self.context, inst_id)