openstack/nova
Code Issues Proposed changes

Merge "Handle non dict metadata in server metadata V2 API"

Browse Source
This commit is contained in:
Jenkins
2014-09-01 02:17:12 +00:00
committed by Gerrit Code Review
parent 680c4430e6 acb32e773b
commit fab6c89d2f
2 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nova/api/openstack/compute/server_metadata.py
View File

@@ -56,6 +56,9 @@ class Controller(object):
except (KeyError, TypeError):
msg = _("Malformed request body")
raise exc.HTTPBadRequest(explanation=msg)
if not isinstance(metadata, dict):
msg = _("Malformed request body. metadata must be object")
raise exc.HTTPBadRequest(explanation=msg)
context = req.environ['nova.context']
@@ -75,6 +78,10 @@ class Controller(object):
expl = _('Malformed request body')
raise exc.HTTPBadRequest(explanation=expl)
if not isinstance(meta_item, dict):
msg = _("Malformed request body. meta item must be object")
raise exc.HTTPBadRequest(explanation=msg)
if id not in meta_item:
expl = _('Request body and URI mismatch')
raise exc.HTTPBadRequest(explanation=expl)
@@ -100,6 +107,10 @@ class Controller(object):
expl = _('Malformed request body')
raise exc.HTTPBadRequest(explanation=expl)
if not isinstance(metadata, dict):
msg = _("Malformed request body. metadata must be object")
raise exc.HTTPBadRequest(explanation=msg)
context = req.environ['nova.context']
new_metadata = self._update_instance_metadata(context,
server_id,

36
nova/tests/api/openstack/compute/test_server_metadata.py
View File

@@ -245,6 +245,18 @@ class ServerMetaDataTest(BaseTest):
self.assertRaises(webob.exc.HTTPBadRequest,
self.controller.create, req, self.uuid, body)
def test_create_item_non_dict(self):
self.stubs.Set(nova.db, 'instance_metadata_update',
return_create_instance_metadata)
req = fakes.HTTPRequest.blank(self.url + '/key1')
req.method = 'PUT'
body = {"metadata": None}
req.body = jsonutils.dumps(body)
req.headers["content-type"] = "application/json"
self.assertRaises(webob.exc.HTTPBadRequest,
self.controller.create, req, self.uuid, body)
def test_create_item_key_too_long(self):
self.stubs.Set(nova.db, 'instance_metadata_update',
return_create_instance_metadata)
@@ -347,6 +359,18 @@ class ServerMetaDataTest(BaseTest):
self.assertRaises(webob.exc.HTTPNotFound,
self.controller.update_all, req, '100', body)
def test_update_all_non_dict(self):
self.stubs.Set(nova.db, 'instance_metadata_update',
return_create_instance_metadata)
req = fakes.HTTPRequest.blank(self.url)
req.method = 'PUT'
body = {"metadata": None}
req.body = jsonutils.dumps(body)
req.headers["content-type"] = "application/json"
self.assertRaises(webob.exc.HTTPBadRequest,
self.controller.update_all, req, self.uuid, body)
def test_update_item(self):
self.stubs.Set(objects.Instance, 'save', fake_instance_save)
req = fakes.HTTPRequest.blank(self.url + '/key1')
@@ -442,6 +466,18 @@ class ServerMetaDataTest(BaseTest):
self.assertRaises(webob.exc.HTTPBadRequest,
self.controller.update, req, self.uuid, 'bad', body)
def test_update_item_non_dict(self):
self.stubs.Set(nova.db, 'instance_metadata_update',
return_create_instance_metadata)
req = fakes.HTTPRequest.blank(self.url + '/bad')
req.method = 'PUT'
body = {"meta": None}
req.body = jsonutils.dumps(body)
req.headers["content-type"] = "application/json"
self.assertRaises(webob.exc.HTTPBadRequest,
self.controller.update, req, self.uuid, 'bad', body)
def test_too_many_metadata_items_on_create(self):
self.stubs.Set(nova.db, 'instance_metadata_update',
return_create_instance_metadata)