diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-19 05:50:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-19 05:50:55 +0000 |
| commit | 6e6ffc2e4eff90e07f03049452979773e67a6a1c (patch) | |
| tree | 3b52ccaf2c782d896e7f489d14108f73cfb4c4f2 /nova/api | |
| parent | 169112c15394425bf633d004f1feb6aaf43cb08d (diff) | |
| parent | 984435b1edc9ab0ec3d33e809babd04884e96ff1 (diff) | |
| download | nova-6e6ffc2e4eff90e07f03049452979773e67a6a1c.tar.gz nova-6e6ffc2e4eff90e07f03049452979773e67a6a1c.tar.xz nova-6e6ffc2e4eff90e07f03049452979773e67a6a1c.zip | |
Merge "Handle missing server when getting security groups"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/security_groups.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py index 5e81347ec..840813d68 100644 --- a/nova/api/openstack/compute/contrib/security_groups.py +++ b/nova/api/openstack/compute/contrib/security_groups.py @@ -385,12 +385,10 @@ class ServerSecurityGroupController(SecurityGroupControllerBase): try: instance = self.compute_api.get(context, server_id) - groups = db.security_group_get_by_instance(context, - instance['id']) - except exception.ApiError, e: - raise webob.exc.HTTPBadRequest(explanation=e.message) - except exception.NotAuthorized, e: - raise webob.exc.HTTPUnauthorized() + except exception.InstanceNotFound as exp: + raise exc.HTTPNotFound(explanation=unicode(exp)) + + groups = db.security_group_get_by_instance(context, instance['id']) result = [self._format_security_group(context, group) for group in groups] |