openstack/placement
Code Issues Proposed changes

Merge "Add API schema for aggregates set_metadata API"

Browse Source
This commit is contained in:
Jenkins 2014-11-21 02:40:28 +00:00 committed by Gerrit Code Review
commit 22e5815631
3 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nova/api/openstack/compute/plugins/v3/aggregates.py
View File

@ -26,7 +26,6 @@ from nova.api import validation
from nova.compute import api as compute_api
from nova import exception
from nova.i18n import _
from nova import utils
ALIAS = "os-aggregates"
authorize = extensions.extension_authorizer('compute', "v3:" + ALIAS)
@ -174,28 +173,13 @@ class AggregateController(wsgi.Controller):
@extensions.expected_errors((400, 404))
@wsgi.action('set_metadata')
@validation.schema(aggregates.set_metadata)
def _set_metadata(self, req, id, body):
"""Replaces the aggregate's existing metadata with new metadata."""
context = _get_context(req)
authorize(context, action='set_metadata')
if not self.is_valid_body(body, 'set_metadata'):
raise exc.HTTPBadRequest(explanation=_("Invalid request body"))
if not self.is_valid_body(body["set_metadata"], "metadata"):
raise exc.HTTPBadRequest(
explanation=_("Invalid request format for metadata"))
metadata = body["set_metadata"]["metadata"]
# The metadata should be a dict
if not isinstance(metadata, dict):
msg = _('The value of metadata must be a dict')
raise exc.HTTPBadRequest(explanation=msg)
try:
for key, value in metadata.items():
utils.check_string_length(key, "metadata.key", 1, 255)
if value is not None:
utils.check_string_length(value, "metadata.value", 0, 255)
except exception.InvalidInput as e:
raise exc.HTTPBadRequest(explanation=e.format_message())
metadata = body["set_metadata"]["metadata"]
try:
aggregate = self.api.update_aggregate_metadata(context,
id, metadata)

18
nova/api/openstack/compute/schemas/v3/aggregates.py
View File

@ -91,3 +91,21 @@ remove_host = {
'required': ['remove_host'],
'additionalProperties': False,
}
set_metadata = {
'type': 'object',
'properties': {
'type': 'object',
'set_metadata': {
'type': 'object',
'properties': {
'metadata': parameter_types.metadata_with_null
},
'required': ['metadata'],
'additionalProperties': False,
},
},
'required': ['set_metadata'],
'additionalProperties': False,
}

14
nova/tests/unit/api/openstack/compute/contrib/test_aggregates.py
View File

@ -577,37 +577,37 @@ class AggregateTestCaseV21(test.NoDBTestCase):
def test_set_metadata_with_missing_metadata(self):
body = {"asdf": {"foo": "bar"}}
self.assertRaises(exc.HTTPBadRequest, eval(self.set_metadata),
self.assertRaises(self.bad_request, eval(self.set_metadata),
self.req, "1", body=body)
def test_set_metadata_with_extra_params(self):
body = {"metadata": {"foo": "bar"}, "asdf": {"foo": "bar"}}
self.assertRaises(exc.HTTPBadRequest, eval(self.set_metadata),
self.assertRaises(self.bad_request, eval(self.set_metadata),
self.req, "1", body=body)
def test_set_metadata_without_dict(self):
body = {"set_metadata": {'metadata': 1}}
self.assertRaises(exc.HTTPBadRequest, eval(self.set_metadata),
self.assertRaises(self.bad_request, eval(self.set_metadata),
self.req, "1", body=body)
def test_set_metadata_with_empty_key(self):
body = {"set_metadata": {"metadata": {"": "value"}}}
self.assertRaises(exc.HTTPBadRequest, eval(self.set_metadata),
self.assertRaises(self.bad_request, eval(self.set_metadata),
self.req, "1", body=body)
def test_set_metadata_with_key_too_long(self):
body = {"set_metadata": {"metadata": {"x" * 256: "value"}}}
self.assertRaises(exc.HTTPBadRequest, eval(self.set_metadata),
self.assertRaises(self.bad_request, eval(self.set_metadata),
self.req, "1", body=body)
def test_set_metadata_with_value_too_long(self):
body = {"set_metadata": {"metadata": {"key": "x" * 256}}}
self.assertRaises(exc.HTTPBadRequest, eval(self.set_metadata),
self.assertRaises(self.bad_request, eval(self.set_metadata),
self.req, "1", body=body)
def test_set_metadata_with_string(self):
body = {"set_metadata": {"metadata": "test"}}
self.assertRaises(exc.HTTPBadRequest, eval(self.set_metadata),
self.assertRaises(self.bad_request, eval(self.set_metadata),
self.req, "1", body=body)
def test_delete_aggregate(self):