Merge "Convert v3 flavor extraspecs plugin to v2.1"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
6b579b87d3
|
|
@ -13,15 +13,16 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import six
|
||||
import webob
|
||||
|
||||
from nova.api.openstack.compute.schemas.v3 import flavors_extraspecs
|
||||
from nova.api.openstack import extensions
|
||||
from nova.api.openstack import wsgi
|
||||
from nova.api import validation
|
||||
from nova import exception
|
||||
from nova.i18n import _
|
||||
from nova import objects
|
||||
from nova import utils
|
||||
|
||||
ALIAS = 'flavor-extra-specs'
|
||||
authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS)
|
||||
|
|
@ -37,6 +38,19 @@ class FlavorExtraSpecsController(object):
|
|||
flavor = objects.Flavor.get_by_flavor_id(context, flavor_id)
|
||||
return dict(extra_specs=flavor.extra_specs)
|
||||
|
||||
# NOTE(gmann): Max length for numeric value is being checked
|
||||
# explicitly as json schema cannot have max length check for numeric value
|
||||
def _check_extra_specs_value(self, specs):
|
||||
for key, value in specs.iteritems():
|
||||
try:
|
||||
if isinstance(value, (six.integer_types, float)):
|
||||
value = six.text_type(value)
|
||||
utils.check_string_length(value, 'extra_specs value',
|
||||
max_length=255)
|
||||
except exception.InvalidInput as error:
|
||||
raise webob.exc.HTTPBadRequest(
|
||||
explanation=error.format_message())
|
||||
|
||||
@extensions.expected_errors(())
|
||||
def index(self, req, flavor_id):
|
||||
"""Returns the list of extra specs for a given flavor."""
|
||||
|
|
@ -44,14 +58,17 @@ class FlavorExtraSpecsController(object):
|
|||
authorize(context, action='index')
|
||||
return self._get_extra_specs(context, flavor_id)
|
||||
|
||||
# NOTE(gmann): Here should be 201 instead of 200 by v2.1
|
||||
# +microversions because the flavor extra specs has been created
|
||||
# completely when returning a response.
|
||||
@extensions.expected_errors((400, 404, 409))
|
||||
@wsgi.response(201)
|
||||
@validation.schema(flavors_extraspecs.create)
|
||||
def create(self, req, flavor_id, body):
|
||||
context = req.environ['nova.context']
|
||||
authorize(context, action='create')
|
||||
|
||||
specs = body['extra_specs']
|
||||
self._check_extra_specs_value(specs)
|
||||
try:
|
||||
flavor = objects.Flavor.get_by_flavor_id(context, flavor_id)
|
||||
flavor.extra_specs = dict(flavor.extra_specs, **specs)
|
||||
|
|
@ -68,6 +85,7 @@ class FlavorExtraSpecsController(object):
|
|||
context = req.environ['nova.context']
|
||||
authorize(context, action='update')
|
||||
|
||||
self._check_extra_specs_value(body)
|
||||
if id not in body:
|
||||
expl = _('Request body and URI mismatch')
|
||||
raise webob.exc.HTTPBadRequest(explanation=expl)
|
||||
|
|
@ -98,7 +116,9 @@ class FlavorExtraSpecsController(object):
|
|||
key=id)
|
||||
raise webob.exc.HTTPNotFound(explanation=msg)
|
||||
|
||||
@wsgi.response(204)
|
||||
# NOTE(gmann): Here should be 204(No Content) instead of 200 by v2.1
|
||||
# +microversions because the flavor extra specs has been deleted
|
||||
# completely when returning a response.
|
||||
@extensions.expected_errors(404)
|
||||
def delete(self, req, flavor_id, id):
|
||||
"""Deletes an existing extra spec."""
|
||||
|
|
@ -126,7 +146,7 @@ class FlavorsExtraSpecs(extensions.V3APIExtensionBase):
|
|||
|
||||
def get_resources(self):
|
||||
extra_specs = extensions.ResourceExtension(
|
||||
ALIAS,
|
||||
'os-extra_specs',
|
||||
FlavorExtraSpecsController(),
|
||||
parent=dict(member_name='flavor', collection_name='flavors'))
|
||||
|
||||
|
|
|
|||
|
|
@ -90,7 +90,8 @@ metadata = {
|
|||
'type': 'object',
|
||||
'patternProperties': {
|
||||
'^[a-zA-Z0-9-_:. ]{1,255}$': {
|
||||
'type': 'string', 'maxLength': 255
|
||||
'type': ['string', 'number'],
|
||||
'maxLength': 255
|
||||
}
|
||||
},
|
||||
'additionalProperties': False
|
||||
|
|
|
|||
|
|
@ -16,7 +16,10 @@
|
|||
import mock
|
||||
import webob
|
||||
|
||||
from nova.api.openstack.compute.contrib import flavorextraspecs
|
||||
from nova.api.openstack.compute.contrib import flavorextraspecs \
|
||||
as flavorextraspecs_v2
|
||||
from nova.api.openstack.compute.plugins.v3 import flavors_extraspecs \
|
||||
as flavorextraspecs_v21
|
||||
import nova.db
|
||||
from nova import exception
|
||||
from nova import test
|
||||
|
|
@ -54,18 +57,25 @@ def stub_flavor_extra_specs():
|
|||
return specs
|
||||
|
||||
|
||||
class FlavorsExtraSpecsTest(test.TestCase):
|
||||
class FlavorsExtraSpecsTestV21(test.TestCase):
|
||||
bad_request = exception.ValidationError
|
||||
flavorextraspecs = flavorextraspecs_v21
|
||||
|
||||
def _get_request(self, url, use_admin_context=False):
|
||||
req_url = '/flavors/' + url
|
||||
return fakes.HTTPRequestV3.blank(req_url,
|
||||
use_admin_context=use_admin_context)
|
||||
|
||||
def setUp(self):
|
||||
super(FlavorsExtraSpecsTest, self).setUp()
|
||||
super(FlavorsExtraSpecsTestV21, self).setUp()
|
||||
fakes.stub_out_key_pair_funcs(self.stubs)
|
||||
self.controller = flavorextraspecs.FlavorExtraSpecsController()
|
||||
self.controller = self.flavorextraspecs.FlavorExtraSpecsController()
|
||||
|
||||
def test_index(self):
|
||||
flavor = dict(test_flavor.fake_flavor,
|
||||
extra_specs={'key1': 'value1'})
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs')
|
||||
req = self._get_request('1/os-extra_specs')
|
||||
with mock.patch('nova.db.flavor_get_by_flavor_id') as mock_get:
|
||||
mock_get.return_value = flavor
|
||||
res_dict = self.controller.index(req, 1)
|
||||
|
|
@ -76,7 +86,7 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
self.stubs.Set(nova.db, 'flavor_extra_specs_get',
|
||||
return_empty_flavor_extra_specs)
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs')
|
||||
req = self._get_request('1/os-extra_specs')
|
||||
res_dict = self.controller.index(req, 1)
|
||||
|
||||
self.assertEqual(0, len(res_dict['extra_specs']))
|
||||
|
|
@ -84,8 +94,7 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
def test_show(self):
|
||||
flavor = dict(test_flavor.fake_flavor,
|
||||
extra_specs={'key5': 'value5'})
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs' +
|
||||
'/key5')
|
||||
req = self._get_request('1/os-extra_specs/key5')
|
||||
with mock.patch('nova.db.flavor_get_by_flavor_id') as mock_get:
|
||||
mock_get.return_value = flavor
|
||||
res_dict = self.controller.show(req, 1, 'key5')
|
||||
|
|
@ -96,29 +105,27 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
self.stubs.Set(nova.db, 'flavor_extra_specs_get',
|
||||
return_empty_flavor_extra_specs)
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs' +
|
||||
'/key6')
|
||||
req = self._get_request('1/os-extra_specs/key6')
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.show,
|
||||
req, 1, 'key6')
|
||||
|
||||
def test_not_found_because_flavor(self):
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs/key5',
|
||||
use_admin_context=True)
|
||||
req = self._get_request('1/os-extra_specs/key5',
|
||||
use_admin_context=True)
|
||||
with mock.patch('nova.db.flavor_get_by_flavor_id') as mock_get:
|
||||
mock_get.side_effect = exception.FlavorNotFound(flavor_id='1')
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.show,
|
||||
req, 1, 'key5')
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.update,
|
||||
req, 1, 'key5', {'key5': 'value5'})
|
||||
req, 1, 'key5', body={'key5': 'value5'})
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.delete,
|
||||
req, 1, 'key5')
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs',
|
||||
use_admin_context=True)
|
||||
req = self._get_request('1/os-extra_specs', use_admin_context=True)
|
||||
with mock.patch('nova.db.flavor_get_by_flavor_id') as mock_get:
|
||||
mock_get.side_effect = exception.FlavorNotFound(flavor_id='1')
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.create,
|
||||
req, 1, {'extra_specs': {'key5': 'value5'}})
|
||||
req, 1, body={'extra_specs': {'key5': 'value5'}})
|
||||
|
||||
def test_delete(self):
|
||||
flavor = dict(test_flavor.fake_flavor,
|
||||
|
|
@ -126,8 +133,8 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
self.stubs.Set(nova.db, 'flavor_extra_specs_delete',
|
||||
delete_flavor_extra_specs)
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs' +
|
||||
'/key5', use_admin_context=True)
|
||||
req = self._get_request('1/os-extra_specs/key5',
|
||||
use_admin_context=True)
|
||||
with mock.patch('nova.db.flavor_get_by_flavor_id') as mock_get:
|
||||
mock_get.return_value = flavor
|
||||
self.controller.delete(req, 1, 'key5')
|
||||
|
|
@ -136,14 +143,13 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
self.stubs.Set(nova.db, 'flavor_extra_specs_delete',
|
||||
delete_flavor_extra_specs)
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs' +
|
||||
'/key5')
|
||||
req = self._get_request('1/os-extra_specs/key5')
|
||||
self.assertRaises(exception.Forbidden, self.controller.delete,
|
||||
req, 1, 'key 5')
|
||||
|
||||
def test_delete_spec_not_found(self):
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs' +
|
||||
'/key6', use_admin_context=True)
|
||||
req = self._get_request('1/os-extra_specs/key6',
|
||||
use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.delete,
|
||||
req, 1, 'key6')
|
||||
|
||||
|
|
@ -153,9 +159,8 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
return_create_flavor_extra_specs)
|
||||
body = {"extra_specs": {"key1": "value1", "key2": 0.5, "key3": 5}}
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs',
|
||||
use_admin_context=True)
|
||||
res_dict = self.controller.create(req, 1, body)
|
||||
req = self._get_request('1/os-extra_specs', use_admin_context=True)
|
||||
res_dict = self.controller.create(req, 1, body=body)
|
||||
|
||||
self.assertEqual('value1', res_dict['extra_specs']['key1'])
|
||||
self.assertEqual(0.5, res_dict['extra_specs']['key2'])
|
||||
|
|
@ -167,9 +172,9 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
return_create_flavor_extra_specs)
|
||||
body = {"extra_specs": {"key1": "value1"}}
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs')
|
||||
req = self._get_request('1/os-extra_specs')
|
||||
self.assertRaises(exception.Forbidden, self.controller.create,
|
||||
req, 1, body)
|
||||
req, 1, body=body)
|
||||
|
||||
def test_create_flavor_not_found(self):
|
||||
def fake_instance_type_extra_specs_update_or_create(*args, **kwargs):
|
||||
|
|
@ -179,10 +184,9 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
'flavor_extra_specs_update_or_create',
|
||||
fake_instance_type_extra_specs_update_or_create)
|
||||
body = {"extra_specs": {"key1": "value1"}}
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs',
|
||||
use_admin_context=True)
|
||||
req = self._get_request('1/os-extra_specs', use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.create,
|
||||
req, 1, body)
|
||||
req, 1, body=body)
|
||||
|
||||
def test_create_flavor_db_duplicate(self):
|
||||
def fake_instance_type_extra_specs_update_or_create(*args, **kwargs):
|
||||
|
|
@ -192,20 +196,18 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
'flavor_extra_specs_update_or_create',
|
||||
fake_instance_type_extra_specs_update_or_create)
|
||||
body = {"extra_specs": {"key1": "value1"}}
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs',
|
||||
use_admin_context=True)
|
||||
req = self._get_request('1/os-extra_specs', use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPConflict, self.controller.create,
|
||||
req, 1, body)
|
||||
req, 1, body=body)
|
||||
|
||||
def _test_create_bad_request(self, body):
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs',
|
||||
use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create,
|
||||
req, 1, body)
|
||||
req = self._get_request('1/os-extra_specs', use_admin_context=True)
|
||||
self.assertRaises(self.bad_request, self.controller.create,
|
||||
req, 1, body=body)
|
||||
|
||||
def test_create_empty_body(self):
|
||||
self._test_create_bad_request('')
|
||||
|
|
@ -230,9 +232,14 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
value = "a" * 256
|
||||
self._test_create_bad_request({"extra_specs": {"key1": value}})
|
||||
|
||||
def test_create_really_long_integer_value(self):
|
||||
@mock.patch('nova.db.flavor_extra_specs_update_or_create')
|
||||
def test_create_really_long_integer_value(self, mock_flavor_extra_specs):
|
||||
value = 10 ** 1000
|
||||
self._test_create_bad_request({"extra_specs": {"key1": value}})
|
||||
mock_flavor_extra_specs.side_effects = return_create_flavor_extra_specs
|
||||
|
||||
req = self._get_request('1/os-extra_specs', use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create,
|
||||
req, 1, body={"extra_specs": {"key1": value}})
|
||||
|
||||
@mock.patch('nova.db.flavor_extra_specs_update_or_create')
|
||||
def test_create_invalid_specs_key(self, mock_flavor_extra_specs):
|
||||
|
|
@ -241,10 +248,9 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
|
||||
for key in invalid_keys:
|
||||
body = {"extra_specs": {key: "value1"}}
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs',
|
||||
use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create,
|
||||
req, 1, body)
|
||||
req = self._get_request('1/os-extra_specs', use_admin_context=True)
|
||||
self.assertRaises(self.bad_request, self.controller.create,
|
||||
req, 1, body=body)
|
||||
|
||||
@mock.patch('nova.db.flavor_extra_specs_update_or_create')
|
||||
def test_create_valid_specs_key(self, mock_flavor_extra_specs):
|
||||
|
|
@ -253,9 +259,8 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
|
||||
for key in valid_keys:
|
||||
body = {"extra_specs": {key: "value1"}}
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs',
|
||||
use_admin_context=True)
|
||||
res_dict = self.controller.create(req, 1, body)
|
||||
req = self._get_request('1/os-extra_specs', use_admin_context=True)
|
||||
res_dict = self.controller.create(req, 1, body=body)
|
||||
self.assertEqual('value1', res_dict['extra_specs'][key])
|
||||
|
||||
def test_update_item(self):
|
||||
|
|
@ -264,9 +269,9 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
return_create_flavor_extra_specs)
|
||||
body = {"key1": "value1"}
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs' +
|
||||
'/key1', use_admin_context=True)
|
||||
res_dict = self.controller.update(req, 1, 'key1', body)
|
||||
req = self._get_request('1/os-extra_specs/key1',
|
||||
use_admin_context=True)
|
||||
res_dict = self.controller.update(req, 1, 'key1', body=body)
|
||||
|
||||
self.assertEqual('value1', res_dict['key1'])
|
||||
|
||||
|
|
@ -276,20 +281,19 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
return_create_flavor_extra_specs)
|
||||
body = {"key1": "value1"}
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs' +
|
||||
'/key1')
|
||||
req = self._get_request('1/os-extra_specs/key1')
|
||||
self.assertRaises(exception.Forbidden, self.controller.update,
|
||||
req, 1, 'key1', body)
|
||||
req, 1, 'key1', body=body)
|
||||
|
||||
def _test_update_item_bad_request(self, body):
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs' +
|
||||
'/key1', use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
|
||||
req, 1, 'key1', body)
|
||||
req = self._get_request('1/os-extra_specs/key1',
|
||||
use_admin_context=True)
|
||||
self.assertRaises(self.bad_request, self.controller.update,
|
||||
req, 1, 'key1', body=body)
|
||||
|
||||
def test_update_item_empty_body(self):
|
||||
self._test_update_item_bad_request('')
|
||||
|
|
@ -324,10 +328,9 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
return_create_flavor_extra_specs)
|
||||
body = {"key1": "value1"}
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs/bad',
|
||||
use_admin_context=True)
|
||||
req = self._get_request('1/os-extra_specs/bad', use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
|
||||
req, 1, 'bad', body)
|
||||
req, 1, 'bad', body=body)
|
||||
|
||||
def test_update_flavor_not_found(self):
|
||||
def fake_instance_type_extra_specs_update_or_create(*args, **kwargs):
|
||||
|
|
@ -338,10 +341,10 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
fake_instance_type_extra_specs_update_or_create)
|
||||
body = {"key1": "value1"}
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/extra-specs/key1',
|
||||
use_admin_context=True)
|
||||
req = self._get_request('1/os-extra_specs/key1',
|
||||
use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.update,
|
||||
req, 1, 'key1', body)
|
||||
req, 1, 'key1', body=body)
|
||||
|
||||
def test_update_flavor_db_duplicate(self):
|
||||
def fake_instance_type_extra_specs_update_or_create(*args, **kwargs):
|
||||
|
|
@ -352,22 +355,43 @@ class FlavorsExtraSpecsTest(test.TestCase):
|
|||
fake_instance_type_extra_specs_update_or_create)
|
||||
body = {"key1": "value1"}
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/extra-specs/key1',
|
||||
use_admin_context=True)
|
||||
req = self._get_request('1/os-extra_specs/key1',
|
||||
use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPConflict, self.controller.update,
|
||||
req, 1, 'key1', body)
|
||||
req, 1, 'key1', body=body)
|
||||
|
||||
def test_update_really_long_integer_value(self):
|
||||
value = 10 ** 1000
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
|
||||
req = self._get_request('1/os-extra_specs/key1',
|
||||
use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
|
||||
req, 1, 'key1', body={"key1": value})
|
||||
|
||||
|
||||
class FlavorsExtraSpecsTestV2(FlavorsExtraSpecsTestV21):
|
||||
bad_request = webob.exc.HTTPBadRequest
|
||||
flavorextraspecs = flavorextraspecs_v2
|
||||
|
||||
def _get_request(self, url, use_admin_context=False):
|
||||
req_url = '/v2/fake/flavors/' + url
|
||||
return fakes.HTTPRequest.blank(req_url,
|
||||
use_admin_context=use_admin_context)
|
||||
|
||||
|
||||
class FlavorsExtraSpecsXMLSerializerTest(test.TestCase):
|
||||
def test_serializer(self):
|
||||
serializer = flavorextraspecs.ExtraSpecsTemplate()
|
||||
serializer = flavorextraspecs_v2.ExtraSpecsTemplate()
|
||||
expected = ("<?xml version='1.0' encoding='UTF-8'?>\n"
|
||||
'<extra_specs><key1>value1</key1></extra_specs>')
|
||||
text = serializer.serialize(dict(extra_specs={"key1": "value1"}))
|
||||
self.assertEqual(text, expected)
|
||||
|
||||
def test_show_update_serializer(self):
|
||||
serializer = flavorextraspecs.ExtraSpecTemplate()
|
||||
serializer = flavorextraspecs_v2.ExtraSpecTemplate()
|
||||
expected = ("<?xml version='1.0' encoding='UTF-8'?>\n"
|
||||
'<extra_spec key="key1">value1</extra_spec>')
|
||||
text = serializer.serialize(dict({"key1": "value1"}))
|
||||
|
|
@ -376,7 +400,7 @@ class FlavorsExtraSpecsXMLSerializerTest(test.TestCase):
|
|||
def test_serializer_with_colon_tagname(self):
|
||||
# Our test object to serialize
|
||||
obj = {'extra_specs': {'foo:bar': '999'}}
|
||||
serializer = flavorextraspecs.ExtraSpecsTemplate()
|
||||
serializer = flavorextraspecs_v2.ExtraSpecsTemplate()
|
||||
expected_xml = (("<?xml version='1.0' encoding='UTF-8'?>\n"
|
||||
'<extra_specs><foo:bar xmlns:foo="foo">999</foo:bar>'
|
||||
'</extra_specs>'))
|
||||
|
|
|
|||
|
|
@ -1,353 +0,0 @@
|
|||
# Copyright 2011 University of Southern California
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import mock
|
||||
import webob
|
||||
|
||||
from nova.api.openstack.compute.plugins.v3 import flavors_extraspecs
|
||||
import nova.db
|
||||
from nova import exception
|
||||
from nova import test
|
||||
from nova.tests.api.openstack import fakes
|
||||
from nova.tests.objects import test_flavor
|
||||
|
||||
|
||||
def return_create_flavor_extra_specs(context, flavor_id, extra_specs):
|
||||
return stub_flavor_extra_specs()
|
||||
|
||||
|
||||
def return_flavor_extra_specs(context, flavor_id):
|
||||
return stub_flavor_extra_specs()
|
||||
|
||||
|
||||
def return_flavor_extra_specs_item(context, flavor_id, key):
|
||||
return {key: stub_flavor_extra_specs()[key]}
|
||||
|
||||
|
||||
def return_empty_flavor_extra_specs(context, flavor_id):
|
||||
return {}
|
||||
|
||||
|
||||
def delete_flavor_extra_specs(context, flavor_id, key):
|
||||
pass
|
||||
|
||||
|
||||
def stub_flavor_extra_specs():
|
||||
specs = {
|
||||
"key1": "value1",
|
||||
"key2": "value2",
|
||||
"key3": "value3",
|
||||
"key4": "value4",
|
||||
"key5": "value5"}
|
||||
return specs
|
||||
|
||||
|
||||
class FlavorsExtraSpecsTest(test.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(FlavorsExtraSpecsTest, self).setUp()
|
||||
fakes.stub_out_key_pair_funcs(self.stubs)
|
||||
self.controller = flavors_extraspecs.FlavorExtraSpecsController()
|
||||
|
||||
def test_index(self):
|
||||
flavor = dict(test_flavor.fake_flavor,
|
||||
extra_specs={'key1': 'value1'})
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs')
|
||||
with mock.patch('nova.db.flavor_get_by_flavor_id') as mock_get:
|
||||
mock_get.return_value = flavor
|
||||
res_dict = self.controller.index(req, 1)
|
||||
|
||||
self.assertEqual('value1', res_dict['extra_specs']['key1'])
|
||||
|
||||
def test_index_no_data(self):
|
||||
self.stubs.Set(nova.db, 'flavor_extra_specs_get',
|
||||
return_empty_flavor_extra_specs)
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs')
|
||||
res_dict = self.controller.index(req, 1)
|
||||
|
||||
self.assertEqual(0, len(res_dict['extra_specs']))
|
||||
|
||||
def test_show(self):
|
||||
flavor = dict(test_flavor.fake_flavor,
|
||||
extra_specs={'key5': 'value5'})
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs/key5')
|
||||
with mock.patch('nova.db.flavor_get_by_flavor_id') as mock_get:
|
||||
mock_get.return_value = flavor
|
||||
res_dict = self.controller.show(req, 1, 'key5')
|
||||
|
||||
self.assertEqual('value5', res_dict['key5'])
|
||||
|
||||
def test_show_spec_not_found(self):
|
||||
flavor = dict(test_flavor.fake_flavor,
|
||||
extra_specs={'key5': 'value5'})
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs/key6')
|
||||
with mock.patch('nova.db.flavor_get_by_flavor_id') as mock_get:
|
||||
mock_get.return_value = flavor
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.show,
|
||||
req, 1, 'key6')
|
||||
|
||||
def test_not_found_because_flavor(self):
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs/key5',
|
||||
use_admin_context=True)
|
||||
with mock.patch('nova.db.flavor_get_by_flavor_id') as mock_get:
|
||||
mock_get.side_effect = exception.FlavorNotFound(flavor_id='1')
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.show,
|
||||
req, 1, 'key5')
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.update,
|
||||
req, 1, 'key5', body={'key5': 'value5'})
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.delete,
|
||||
req, 1, 'key5')
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs',
|
||||
use_admin_context=True)
|
||||
with mock.patch('nova.db.flavor_get_by_flavor_id') as mock_get:
|
||||
mock_get.side_effect = exception.FlavorNotFound(flavor_id='1')
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.create,
|
||||
req, 1, body={'extra_specs': {'key5': 'value5'}})
|
||||
|
||||
def test_delete(self):
|
||||
flavor = dict(test_flavor.fake_flavor,
|
||||
extra_specs={'key5': 'value5'})
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs/key5',
|
||||
use_admin_context=True)
|
||||
with mock.patch('nova.db.flavor_get_by_flavor_id') as mock_get:
|
||||
mock_get.return_value = flavor
|
||||
self.controller.delete(req, 1, 'key5')
|
||||
|
||||
def test_delete_no_admin(self):
|
||||
self.stubs.Set(nova.db, 'flavor_extra_specs_delete',
|
||||
delete_flavor_extra_specs)
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs/key5')
|
||||
self.assertRaises(exception.Forbidden, self.controller.delete,
|
||||
req, 1, 'key 5')
|
||||
|
||||
def test_delete_spec_not_found(self):
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs/key6',
|
||||
use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.delete,
|
||||
req, 1, 'key6')
|
||||
|
||||
def test_create(self):
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
body = {"extra_specs": {"key1": "value1"}}
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs',
|
||||
use_admin_context=True)
|
||||
res_dict = self.controller.create(req, 1, body=body)
|
||||
|
||||
self.assertEqual('value1', res_dict['extra_specs']['key1'])
|
||||
self.assertEqual(self.controller.create.wsgi_code, 201)
|
||||
|
||||
def test_create_no_admin(self):
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
body = {"extra_specs": {"key1": "value1"}}
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs')
|
||||
self.assertRaises(exception.Forbidden, self.controller.create,
|
||||
req, 1, body=body)
|
||||
|
||||
def _test_create_bad_request(self, body):
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs',
|
||||
use_admin_context=True)
|
||||
self.assertRaises(exception.ValidationError, self.controller.create,
|
||||
req, 1, body=body)
|
||||
|
||||
def test_create_empty_body(self):
|
||||
self._test_create_bad_request('')
|
||||
|
||||
def test_create_non_dict_extra_specs(self):
|
||||
self._test_create_bad_request({"extra_specs": "non_dict"})
|
||||
|
||||
def test_create_non_string_key(self):
|
||||
self._test_create_bad_request({"extra_specs": {None: "value1"}})
|
||||
|
||||
def test_create_non_string_value(self):
|
||||
self._test_create_bad_request({"extra_specs": {"key1": None}})
|
||||
|
||||
def test_create_zero_length_key(self):
|
||||
self._test_create_bad_request({"extra_specs": {"": "value1"}})
|
||||
|
||||
def test_create_long_key(self):
|
||||
key = "a" * 256
|
||||
self._test_create_bad_request({"extra_specs": {key: "value1"}})
|
||||
|
||||
def test_create_long_value(self):
|
||||
value = "a" * 256
|
||||
self._test_create_bad_request({"extra_specs": {"key1": value}})
|
||||
|
||||
def test_create_flavor_not_found(self):
|
||||
def fake_instance_type_extra_specs_update_or_create(*args, **kwargs):
|
||||
raise exception.FlavorNotFound(flavor_id='')
|
||||
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
fake_instance_type_extra_specs_update_or_create)
|
||||
body = {"extra_specs": {"key1": "value1"}}
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs',
|
||||
use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.create,
|
||||
req, 1, body=body)
|
||||
|
||||
def test_create_flavor_db_duplicate(self):
|
||||
def fake_instance_type_extra_specs_update_or_create(*args, **kwargs):
|
||||
raise exception.FlavorExtraSpecUpdateCreateFailed(id=1, retries=5)
|
||||
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
fake_instance_type_extra_specs_update_or_create)
|
||||
body = {"extra_specs": {"key1": "value1"}}
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs',
|
||||
use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPConflict, self.controller.create,
|
||||
req, 1, body=body)
|
||||
|
||||
@mock.patch('nova.db.flavor_extra_specs_update_or_create')
|
||||
def test_create_invalid_specs_key(self, mock_flavor_extra_specs):
|
||||
invalid_keys = ("key1/", "<key>", "$$akey$", "!akey", "")
|
||||
mock_flavor_extra_specs.side_effects = return_create_flavor_extra_specs
|
||||
|
||||
for key in invalid_keys:
|
||||
body = {"extra_specs": {key: "value1"}}
|
||||
|
||||
req = fakes.HTTPRequest.blank('/flavors/1/extra-specs',
|
||||
use_admin_context=True)
|
||||
self.assertRaises(exception.ValidationError,
|
||||
self.controller.create, req, 1, body=body)
|
||||
|
||||
@mock.patch('nova.db.flavor_extra_specs_update_or_create')
|
||||
def test_create_valid_specs_key(self, mock_flavor_extra_specs):
|
||||
valid_keys = ("key1", "month.price", "I_am-a Key", "finance:g2")
|
||||
mock_flavor_extra_specs.side_effects = return_create_flavor_extra_specs
|
||||
|
||||
for key in valid_keys:
|
||||
body = {"extra_specs": {key: "value1"}}
|
||||
|
||||
req = fakes.HTTPRequest.blank('/flavors/1/extra-specs',
|
||||
use_admin_context=True)
|
||||
res_dict = self.controller.create(req, 1, body=body)
|
||||
self.assertEqual('value1', res_dict['extra_specs'][key])
|
||||
self.assertEqual(self.controller.create.wsgi_code, 201)
|
||||
|
||||
def test_update_item(self):
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
body = {"key1": "value1"}
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs/key1',
|
||||
use_admin_context=True)
|
||||
res_dict = self.controller.update(req, 1, 'key1', body=body)
|
||||
|
||||
self.assertEqual('value1', res_dict['key1'])
|
||||
|
||||
def test_update_item_no_admin(self):
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
body = {"key1": "value1"}
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs/key1')
|
||||
self.assertRaises(exception.Forbidden, self.controller.update,
|
||||
req, 1, 'key1', body=body)
|
||||
|
||||
def _test_update_item_bad_request(self, body):
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs/key1',
|
||||
use_admin_context=True)
|
||||
self.assertRaises(exception.ValidationError, self.controller.update,
|
||||
req, 1, 'key1', body=body)
|
||||
|
||||
def test_update_item_empty_body(self):
|
||||
self._test_update_item_bad_request('')
|
||||
|
||||
def test_update_item_too_many_keys(self):
|
||||
body = {"key1": "value1", "key2": "value2"}
|
||||
self._test_update_item_bad_request(body)
|
||||
|
||||
def test_update_item_non_dict_extra_specs(self):
|
||||
self._test_update_item_bad_request("non_dict")
|
||||
|
||||
def test_update_item_non_string_key(self):
|
||||
self._test_update_item_bad_request({None: "value1"})
|
||||
|
||||
def test_update_item_non_string_value(self):
|
||||
self._test_update_item_bad_request({"key1": None})
|
||||
|
||||
def test_update_item_zero_length_key(self):
|
||||
self._test_update_item_bad_request({"": "value1"})
|
||||
|
||||
def test_update_item_long_key(self):
|
||||
key = "a" * 256
|
||||
self._test_update_item_bad_request({key: "value1"})
|
||||
|
||||
def test_update_item_long_value(self):
|
||||
value = "a" * 256
|
||||
self._test_update_item_bad_request({"key1": value})
|
||||
|
||||
def test_update_item_body_uri_mismatch(self):
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
body = {"key1": "value1"}
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs/bad',
|
||||
use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
|
||||
req, 1, 'bad', body=body)
|
||||
|
||||
def test_update_flavor_not_found(self):
|
||||
def fake_instance_type_extra_specs_update_or_create(*args, **kwargs):
|
||||
raise exception.FlavorNotFound(flavor_id='')
|
||||
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
fake_instance_type_extra_specs_update_or_create)
|
||||
body = {"key1": "value1"}
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs/key1',
|
||||
use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.update,
|
||||
req, 1, 'key1', body=body)
|
||||
|
||||
def test_update_flavor_db_duplicate(self):
|
||||
def fake_instance_type_extra_specs_update_or_create(*args, **kwargs):
|
||||
raise exception.FlavorExtraSpecUpdateCreateFailed(id=1, retries=5)
|
||||
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
fake_instance_type_extra_specs_update_or_create)
|
||||
body = {"key1": "value1"}
|
||||
|
||||
req = fakes.HTTPRequestV3.blank('/flavors/1/extra-specs/key1',
|
||||
use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPConflict, self.controller.update,
|
||||
req, 1, 'key1', body=body)
|
||||
|
|
@ -23,15 +23,15 @@ class FlavorExtraSpecsSampleJsonTests(api_sample_base.ApiSampleTestBaseV3):
|
|||
subs = {'value1': 'value1',
|
||||
'value2': 'value2'
|
||||
}
|
||||
response = self._do_post('flavors/1/flavor-extra-specs',
|
||||
response = self._do_post('flavors/1/os-extra_specs',
|
||||
'flavor-extra-specs-create-req', subs)
|
||||
self._verify_response('flavor-extra-specs-create-resp',
|
||||
subs, response, 201)
|
||||
subs, response, 200)
|
||||
|
||||
def test_flavor_extra_specs_get(self):
|
||||
subs = {'value1': 'value1'}
|
||||
self._flavor_extra_specs_create()
|
||||
response = self._do_get('flavors/1/flavor-extra-specs/key1')
|
||||
response = self._do_get('flavors/1/os-extra_specs/key1')
|
||||
self._verify_response('flavor-extra-specs-get-resp',
|
||||
subs, response, 200)
|
||||
|
||||
|
|
@ -40,7 +40,7 @@ class FlavorExtraSpecsSampleJsonTests(api_sample_base.ApiSampleTestBaseV3):
|
|||
'value2': 'value2'
|
||||
}
|
||||
self._flavor_extra_specs_create()
|
||||
response = self._do_get('flavors/1/flavor-extra-specs')
|
||||
response = self._do_get('flavors/1/os-extra_specs')
|
||||
self._verify_response('flavor-extra-specs-list-resp',
|
||||
subs, response, 200)
|
||||
|
||||
|
|
@ -50,13 +50,13 @@ class FlavorExtraSpecsSampleJsonTests(api_sample_base.ApiSampleTestBaseV3):
|
|||
def test_flavor_extra_specs_update(self):
|
||||
subs = {'value1': 'new_value1'}
|
||||
self._flavor_extra_specs_create()
|
||||
response = self._do_put('flavors/1/flavor-extra-specs/key1',
|
||||
response = self._do_put('flavors/1/os-extra_specs/key1',
|
||||
'flavor-extra-specs-update-req', subs)
|
||||
self._verify_response('flavor-extra-specs-update-resp',
|
||||
subs, response, 200)
|
||||
|
||||
def test_flavor_extra_specs_delete(self):
|
||||
self._flavor_extra_specs_create()
|
||||
response = self._do_delete('flavors/1/flavor-extra-specs/key1')
|
||||
self.assertEqual(response.status, 204)
|
||||
response = self._do_delete('flavors/1/os-extra_specs/key1')
|
||||
self.assertEqual(response.status, 200)
|
||||
self.assertEqual(response.read(), '')
|
||||
|
|
|
|||
Loading…
Reference in New Issue