Merge "Refactors get_instance_security_groups to only use instance_uuid"

1 files changed, 5 insertions, 4 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 145a0ee27..75a438fa6 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -3237,11 +3237,12 @@ class SecurityGroupAPI(base.Base, security_group_base.SecurityGroupBase):
                 self.security_group_rpcapi.refresh_instance_security_rules(
                         context, instance['host'], instance)
 
-    def get_instance_security_groups(self, context, instance_id,
-                                     instance_uuid=None, detailed=False):
+    def get_instance_security_groups(self, context, instance_uuid,
+                                     detailed=False):
         if detailed:
-            return self.db.security_group_get_by_instance(context, instance_id)
-        instance = self.db.instance_get(context, instance_id)
+            return self.db.security_group_get_by_instance(context,
+                                                          instance_uuid)
+        instance = self.db.instance_get_by_uuid(context, instance_uuid)
         groups = instance.get('security_groups')
         if groups:
             return [{'name': group['name']} for group in groups]