x/python-moganclient
Code Issues Proposed changes

Replace /types with /flavors in URI

Browse Source 
Change-Id: I50358a289c58b827283c9c4c6e068eee17063bfd
This commit is contained in:
Zhenguo Niu 2017-04-18 11:09:46 +08:00
parent 67305bea7b
commit dced15370e
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moganclient/common/base.py
View File

@ -41,7 +41,7 @@ def getid(obj):
class Manager(object): class Manager(object):
"""Interacts with type of API """Interacts with type of API
Managers interact with a particular type of API (instances, types, etc.) Managers interact with a particular type of API (instances, flavors, etc.)
and provide CRUD operations for them. and provide CRUD operations for them.
""" """
resource_class = None resource_class = None

30
moganclient/tests/unit/osc/v1/test_flavor.py
View File

@ -65,7 +65,7 @@ class TestFlavorCreate(TestFlavor):
mock_create.return_value = self.fake_flavor mock_create.return_value = self.fake_flavor
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
mock_create.assert_called_once_with('/types', mock_create.assert_called_once_with('/flavors',
data={ data={
'name': 'flavor1', 'name': 'flavor1',
'is_public': True, 'is_public': True,
@ -86,7 +86,7 @@ class TestFlavorCreate(TestFlavor):
mock_create.return_value = self.fake_flavor mock_create.return_value = self.fake_flavor
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
mock_create.assert_called_once_with('/types', mock_create.assert_called_once_with('/flavors',
data={ data={
'name': 'flavor1', 'name': 'flavor1',
'is_public': True, 'is_public': True,
@ -107,7 +107,7 @@ class TestFlavorCreate(TestFlavor):
mock_create.return_value = self.fake_flavor mock_create.return_value = self.fake_flavor
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
mock_create.assert_called_once_with('/types', mock_create.assert_called_once_with('/flavors',
data={ data={
'name': 'flavor1', 'name': 'flavor1',
'is_public': False, 'is_public': False,
@ -129,7 +129,7 @@ class TestFlavorCreate(TestFlavor):
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
mock_create.assert_called_once_with( mock_create.assert_called_once_with(
'/types', '/flavors',
data={ data={
'name': 'flavor1', 'name': 'flavor1',
'is_public': True, 'is_public': True,
@ -154,13 +154,13 @@ class TestFlavorCreate(TestFlavor):
mock_get.return_value = {'extra_specs': {'key1': 'value1'}} mock_get.return_value = {'extra_specs': {'key1': 'value1'}}
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
mock_create.assert_called_once_with('/types', mock_create.assert_called_once_with('/flavors',
data={ data={
'name': 'flavor1', 'name': 'flavor1',
'is_public': True, 'is_public': True,
'description': None, 'description': None,
}) })
expected_url = '/types/%s/extraspecs' % base.getid(self.fake_flavor) expected_url = '/flavors/%s/extraspecs' % base.getid(self.fake_flavor)
mock_update.assert_called_once_with(expected_url, mock_update.assert_called_once_with(expected_url,
data=parsed_args.property, data=parsed_args.property,
return_raw=True) return_raw=True)
@ -190,7 +190,7 @@ class TestFlavorDelete(TestFlavor):
mock_find.return_value = self.fake_flavor mock_find.return_value = self.fake_flavor
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
expected_url = '/types/%s' % base.getid(self.fake_flavor) expected_url = '/flavors/%s' % base.getid(self.fake_flavor)
mock_delete.assert_called_once_with(expected_url) mock_delete.assert_called_once_with(expected_url)
self.assertIsNone(result) self.assertIsNone(result)
@ -206,7 +206,7 @@ class TestFlavorDelete(TestFlavor):
mock_find.return_value = self.fake_flavor mock_find.return_value = self.fake_flavor
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
expected_url = '/types/%s' % base.getid(self.fake_flavor) expected_url = '/flavors/%s' % base.getid(self.fake_flavor)
expected_call = [mock.call(expected_url), mock.call(expected_url), expected_call = [mock.call(expected_url), mock.call(expected_url),
mock.call(expected_url)] mock.call(expected_url)]
mock_delete.assert_has_calls(expected_call) mock_delete.assert_has_calls(expected_call)
@ -241,7 +241,7 @@ class TestFlavorList(TestFlavor):
mock_list.return_value = [self.fake_flavor] mock_list.return_value = [self.fake_flavor]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
mock_list.assert_called_once_with('/types', response_key='types') mock_list.assert_called_once_with('/flavors', response_key='flavors')
self.assertEqual(self.list_columns, columns) self.assertEqual(self.list_columns, columns)
self.assertEqual(self.list_data, tuple(data)) self.assertEqual(self.list_data, tuple(data))
@ -267,7 +267,7 @@ class TestFlavorSet(TestFlavor):
mock_find.return_value = self.fake_flavor mock_find.return_value = self.fake_flavor
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
expected_url = '/types/%s/extraspecs' % base.getid(self.fake_flavor) expected_url = '/flavors/%s/extraspecs' % base.getid(self.fake_flavor)
expected_data = {'key1': 'value1', 'key2': 'value2'} expected_data = {'key1': 'value1', 'key2': 'value2'}
mock_update.assert_called_once_with(expected_url, mock_update.assert_called_once_with(expected_url,
data=expected_data, data=expected_data,
@ -288,7 +288,7 @@ class TestFlavorSet(TestFlavor):
mock_find.return_value = self.fake_flavor mock_find.return_value = self.fake_flavor
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
expected_url = '/types/%s/extraspecs/key0' % base.getid( expected_url = '/flavors/%s/extraspecs/key0' % base.getid(
self.fake_flavor) self.fake_flavor)
self.assertNotCalled(mock_update) self.assertNotCalled(mock_update)
mock_delete.assert_called_once_with(expected_url) mock_delete.assert_called_once_with(expected_url)
@ -309,12 +309,12 @@ class TestFlavorSet(TestFlavor):
mock_find.return_value = self.fake_flavor mock_find.return_value = self.fake_flavor
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
expected_url = '/types/%s/extraspecs' % base.getid(self.fake_flavor) expected_url = '/flavors/%s/extraspecs' % base.getid(self.fake_flavor)
expected_data = {'key1': 'value1'} expected_data = {'key1': 'value1'}
mock_update.assert_called_once_with(expected_url, mock_update.assert_called_once_with(expected_url,
data=expected_data, data=expected_data,
return_raw=True) return_raw=True)
expected_url = '/types/%s/extraspecs/key0' % base.getid( expected_url = '/flavors/%s/extraspecs/key0' % base.getid(
self.fake_flavor) self.fake_flavor)
mock_delete.assert_called_once_with(expected_url) mock_delete.assert_called_once_with(expected_url)
self.assertIsNone(result) self.assertIsNone(result)
@ -336,7 +336,7 @@ class TestFlavorShow(TestFlavor):
mock_get.return_value = self.fake_flavor mock_get.return_value = self.fake_flavor
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
expected_url = '/types/%s' % parsed_args.flavor expected_url = '/flavors/%s' % parsed_args.flavor
mock_get.assert_called_once_with(expected_url) mock_get.assert_called_once_with(expected_url)
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertEqual(self.data, data) self.assertEqual(self.data, data)
@ -362,7 +362,7 @@ class TestFlavorUnset(TestFlavor):
mock_find.return_value = self.fake_flavor mock_find.return_value = self.fake_flavor
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
expected_url = '/types/%s/extraspecs/key0' % base.getid( expected_url = '/flavors/%s/extraspecs/key0' % base.getid(
self.fake_flavor) self.fake_flavor)
mock_delete.assert_called_once_with(expected_url) mock_delete.assert_called_once_with(expected_url)
self.assertIsNone(result) self.assertIsNone(result)

16
moganclient/v1/flavor.py
View File

@ -24,7 +24,7 @@ class FlavorManager(base.ManagerWithFind):
resource_class = Flavor resource_class = Flavor
def create(self, name, is_public, description=None): def create(self, name, is_public, description=None):
url = '/types' url = '/flavors'
data = { data = {
'name': name, 'name': name,
'is_public': is_public, 'is_public': is_public,
@ -33,27 +33,27 @@ class FlavorManager(base.ManagerWithFind):
return self._create(url, data=data) return self._create(url, data=data)
def delete(self, flavor): def delete(self, flavor):
url = '/types/%s' % base.getid(flavor) url = '/flavors/%s' % base.getid(flavor)
return self._delete(url) return self._delete(url)
def get(self, flavor): def get(self, flavor):
url = '/types/%s' % base.getid(flavor) url = '/flavors/%s' % base.getid(flavor)
return self._get(url) return self._get(url)
def list(self): def list(self):
url = '/types' url = '/flavors'
return self._list(url, response_key='types') return self._list(url, response_key='flavors')
def get_extra_specs(self, flavor): def get_extra_specs(self, flavor):
url = '/types/%s/extraspecs' % base.getid(flavor) url = '/flavors/%s/extraspecs' % base.getid(flavor)
return self._get(url, return_raw=True) return self._get(url, return_raw=True)
def update_extra_specs(self, flavor, extra_specs): def update_extra_specs(self, flavor, extra_specs):
url = '/types/%s/extraspecs' % base.getid(flavor) url = '/flavors/%s/extraspecs' % base.getid(flavor)
data = extra_specs data = extra_specs
return self._update(url, data=data, return_raw=True) return self._update(url, data=data, return_raw=True)
def delete_extra_specs(self, flavor, key): def delete_extra_specs(self, flavor, key):
url = '/types/%(id)s/extraspecs/%(key)s' % { url = '/flavors/%(id)s/extraspecs/%(key)s' % {
'id': base.getid(flavor), 'key': key} 'id': base.getid(flavor), 'key': key}
return self._delete(url) return self._delete(url)