Handle missing server when getting security groups

Code Issues Proposed changes

Fix bug 1010486.
Treat InstanceNotFound as a 404 when querying the security groups of server
that does not exist. Also removes old exception translation, ApiError no
longer exists and NotAuthorized shouldn't need handling at this level.
Includes tweak suggested by Mark McLoughlin in review.
Change-Id: Iaeada84dbadc232968f792c6f4855bf61cc5a5ae

This commit is contained in:

Martin Packman

2012年06月08日 15:08:48 +01:00

parent 6279e16ae1

commit 984435b1ed

3 changed files with 19 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1
Authors

View File

@@ -138,6 +138,7 @@ Mandell Degerness <mdegerne@gmail.com>

Mark McClain <mark.mcclain@dreamhost.com>

Mark McLoughlin <markmc@redhat.com>

Mark Washenberger <mark.washenberger@rackspace.com>

Martin Packman <martin.packman@canonical.com>

Maru Newby <mnewby@internap.com>

Masanori Itoh <itoumsn@nttdata.co.jp>

Matt Dietz <matt.dietz@rackspace.com>

10
nova/api/openstack/compute/contrib/security_groups.py

View File

@@ -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]

14
nova/tests/api/openstack/compute/contrib/test_security_groups.py

View File

@@ -285,6 +285,20 @@ class TestSecurityGroups(test.TestCase):

self.assertEquals(res_dict, expected)

def test_get_security_group_by_instance_non_existing(self):

self.stubs.Set(nova.db, 'instance_get', return_server_nonexistent)

self.stubs.Set(nova.db, 'instance_get_by_uuid',

return_server_nonexistent)

req = fakes.HTTPRequest.blank('/v2/fake/servers/1/os-security-groups')

self.assertRaises(webob.exc.HTTPNotFound,

self.server_controller.index, req, '1')

def test_get_security_group_by_instance_invalid_id(self):

req = fakes.HTTPRequest.blank(

'/v2/fake/servers/invalid/os-security-groups')

self.assertRaises(webob.exc.HTTPNotFound,

self.server_controller.index, req, 'invalid')

def test_get_security_group_by_id(self):

sg = security_group_template(id=2, rules=[])