diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-26 23:23:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-26 23:23:18 +0000 |
| commit | e9912c6dd1c53a59822cc4332a7de0630f1ca0bb (patch) | |
| tree | 9e01050daacec14392ffa8a56977d9bd0d162b2d /nova/api | |
| parent | 31194ff33a171c192df32fb09b172bb990a8392e (diff) | |
| parent | 3492a7bfc54cb9d581d8a119a08448c01039e80c (diff) | |
| download | nova-e9912c6dd1c53a59822cc4332a7de0630f1ca0bb.tar.gz nova-e9912c6dd1c53a59822cc4332a7de0630f1ca0bb.tar.xz nova-e9912c6dd1c53a59822cc4332a7de0630f1ca0bb.zip | |
Merge "Fix /servers/<instance-id>os-security-groups using quantum"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/security_groups.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py index ce6f2687f..615bf9764 100644 --- a/nova/api/openstack/compute/contrib/security_groups.py +++ b/nova/api/openstack/compute/contrib/security_groups.py @@ -27,7 +27,6 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import compute from nova.compute import api as compute_api -from nova import db from nova import exception from nova.network.security_group import openstack_driver from nova.network.security_group import quantum_driver @@ -390,8 +389,8 @@ class ServerSecurityGroupController(SecurityGroupControllerBase): except exception.InstanceNotFound as exp: raise exc.HTTPNotFound(explanation=unicode(exp)) - groups = db.security_group_get_by_instance(context, instance['id']) - + groups = self.security_group_api.get_instance_security_groups( + req, instance['id'], instance['uuid'], True) result = [self._format_security_group(context, group) for group in groups] |