summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-11 22:46:20 +0000
committerGerrit Code Review <review@openstack.org>2013-06-11 22:46:20 +0000
commit0dc8632659bf707e70fdf822e046d9c1482d833e (patch)
tree91a9a9c07d59f2ae8f2c4a710a7e1b28bb51ac33 /nova/api
parent2dd6adac8304547fbb2d80b1c4ef659e53048cf9 (diff)
parenta381df91b46582528685d4695019a5e18f5f702a (diff)
downloadnova-0dc8632659bf707e70fdf822e046d9c1482d833e.tar.gz
nova-0dc8632659bf707e70fdf822e046d9c1482d833e.tar.xz
nova-0dc8632659bf707e70fdf822e046d9c1482d833e.zip
Merge "Refactors get_instance_security_groups to only use instance_uuid"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/contrib/security_groups.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py
index 40b085be1..b34a77cab 100644
--- a/nova/api/openstack/compute/contrib/security_groups.py
+++ b/nova/api/openstack/compute/contrib/security_groups.py
@@ -420,7 +420,7 @@ class ServerSecurityGroupController(SecurityGroupControllerBase):
raise exc.HTTPNotFound(explanation=exp.format_message())
groups = self.security_group_api.get_instance_security_groups(
- context, instance['id'], instance['uuid'], True)
+ context, instance['uuid'], True)
result = [self._format_security_group(context, group)
for group in groups]