x/mogan
Code Issues Proposed changes

Fix the instance type extra related APIs

Browse Source 
The current instance type extra related APIs have been broken, this change
fix it.

Change-Id: I2d6742ee5db1d31f663293257d42afa805a71fbb
Closes-Bug: #1651417
This commit is contained in:
liusheng 2016-12-20 20:17:25 +08:00
parent 57c4f4ad3f
commit bc5e430679
2 changed files with 70 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nimble/objects/instance_type.py
View File

@ -112,7 +112,7 @@ class InstanceType(base.NimbleObject, object_base.VersionedObjectDictCompat):
:param:to_add: A dict of new keys to add/update
:param:to_delete: A list of keys to remove
"""
ident = self.id
ident = self.uuid
to_add = to_add if to_add is not None else {}
to_delete = to_delete if to_delete is not None else []
@ -121,5 +121,5 @@ class InstanceType(base.NimbleObject, object_base.VersionedObjectDictCompat):
self.dbapi.extra_specs_update_or_create(context, ident, to_add)
for key in to_delete:
self.dbapi.type_extra_specs_delete(ident, key)
self.dbapi.type_extra_specs_delete(context, ident, key)
self.obj_reset_changes(['extra_specs'])

68
nimble/tests/functional/api/v1/test_instance_types.py
View File

@ -16,6 +16,8 @@
import mock
import six
from oslo_serialization import jsonutils
from nimble.tests.functional.api import v1 as v1_test
@ -66,3 +68,69 @@ class TestInstanceType(v1_test.APITestV1):
self.delete('/types/' + self.TYPE_UUIDS[0], status=204)
resp = self.get_json('/types')
self.assertEqual(3, len(resp['types']))
class TestInstanceTypeExtra(v1_test.APITestV1):
TYPE_UUID = 'ff28b5a2-73e5-431c-b4b7-1b96b74bca7b'
def setUp(self):
super(TestInstanceTypeExtra, self).setUp()
self._prepare_instance_type()
@mock.patch('oslo_utils.uuidutils.generate_uuid')
def _prepare_instance_type(self, mocked):
mocked.return_value = self.TYPE_UUID
body = {"name": "test_type_extra",
"description": "just test type extra"}
self.post_json('/types', body, status=201)
def test_list_extra_empty(self):
resp = self.get_json('/types/%s/extraspecs' % self.TYPE_UUID)
self.assertEqual({}, resp['extra_specs'])
def test_add_extra(self):
resp = self.patch_json('/types/%s/extraspecs' % self.TYPE_UUID,
{'test_key': 'test_value'})
resp = resp.json
self.assertEqual({'extra_specs': {'test_key': 'test_value'}}, resp)
def test_update_extra(self):
resp = self.patch_json('/types/%s/extraspecs' % self.TYPE_UUID,
{'test_key': 'test_value1'})
resp = resp.json
self.assertEqual({'extra_specs': {'test_key': 'test_value1'}}, resp)
resp = self.patch_json('/types/%s/extraspecs' % self.TYPE_UUID,
{'test_key': 'test_value2'})
resp = resp.json
self.assertEqual({'extra_specs': {'test_key': 'test_value2'}}, resp)
def test_list_extra(self):
resp = self.patch_json('/types/%s/extraspecs' % self.TYPE_UUID,
{'test_key1': 'test_value1',
'test_key2': 'test_value2'})
resp = resp.json
self.assertEqual(
'{"test_key1": "test_value1", "test_key2": "test_value2"}',
jsonutils.dumps(resp['extra_specs'], sort_keys=True))
self.patch_json('/types/%s/extraspecs' % self.TYPE_UUID,
{'test_key3': 'test_value3'})
resp = self.get_json('/types/%s/extraspecs' % self.TYPE_UUID)
self.assertEqual(
'{"test_key1": "test_value1", "test_key2": "test_value2", '
'"test_key3": "test_value3"}',
jsonutils.dumps(resp['extra_specs'], sort_keys=True))
def test_delete_extra(self):
resp = self.patch_json('/types/%s/extraspecs' % self.TYPE_UUID,
{'test_key1': 'test_value1',
'test_key2': 'test_value2'})
resp = resp.json
self.assertEqual(
'{"test_key1": "test_value1", "test_key2": "test_value2"}',
jsonutils.dumps(resp['extra_specs'], sort_keys=True))
self.delete('/types/%s/extraspecs/test_key1' % self.TYPE_UUID)
resp = self.get_json('/types/%s/extraspecs' % self.TYPE_UUID)
self.assertEqual({'test_key2': 'test_value2'}, resp['extra_specs'])