fc8579dfa8
This change applies a regular expression in order to filter flavor extraspects keys with invalid characters. The characters allowed are: letters, numbers, underscores, periods, colons, spaces and hyphens. A new test flavor has been created which doesn't check the keys in the post body. This flavor has been created in the third place (instead of in the last) in order to keep working existent test cases which depend on the last flavor received in the get method. Change-Id: Ifd86bed23a05a5946ae8b9ba6f6c9bf4b24b1d4c Partial-Bug: #1256119
68 lines
2.3 KiB
Python
68 lines
2.3 KiB
Python
# Copyright (c) 2013, OpenStack
|
|
# Copyright 2013 IBM Corp.
|
|
#
|
|
# 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.
|
|
|
|
from novaclient.tests.v1_1 import test_flavors
|
|
from novaclient.tests.v3 import fakes
|
|
from novaclient.v3 import flavors
|
|
|
|
|
|
class FlavorsTest(test_flavors.FlavorsTest):
|
|
def _get_fake_client(self):
|
|
return fakes.FakeClient()
|
|
|
|
def _get_flavor_type(self):
|
|
return flavors.Flavor
|
|
|
|
def _create_body(self, name, ram, vcpus, disk, ephemeral, id, swap,
|
|
rxtx_factor, is_public):
|
|
return {
|
|
"flavor": {
|
|
"name": name,
|
|
"ram": ram,
|
|
"vcpus": vcpus,
|
|
"disk": disk,
|
|
"ephemeral": ephemeral,
|
|
"id": id,
|
|
"swap": swap,
|
|
"rxtx_factor": rxtx_factor,
|
|
"flavor-access:is_public": is_public,
|
|
}
|
|
}
|
|
|
|
def test_set_keys(self):
|
|
f = self.cs.flavors.get(1)
|
|
f.set_keys({'k1': 'v1'})
|
|
self.cs.assert_called('POST', '/flavors/1/flavor-extra-specs',
|
|
{"extra_specs": {'k1': 'v1'}})
|
|
|
|
def test_set_with_valid_keys(self):
|
|
valid_keys = ['key4', 'month.price', 'I-Am:AK-ey.44-',
|
|
'key with spaces and _']
|
|
|
|
f = self.cs.flavors.get(4)
|
|
for key in valid_keys:
|
|
f.set_keys({key: 'v4'})
|
|
self.cs.assert_called('POST', '/flavors/4/flavor-extra-specs',
|
|
{"extra_specs": {key: 'v4'}})
|
|
|
|
def test_unset_keys(self):
|
|
f = self.cs.flavors.get(1)
|
|
f.unset_keys(['k1'])
|
|
self.cs.assert_called('DELETE', '/flavors/1/flavor-extra-specs/k1')
|
|
|
|
def test_get_flavor_details_diablo(self):
|
|
# Don't need for V3 API to work against diablo
|
|
pass
|