From dced15370eae51883ca9883dc3b0ff217067cb9d Mon Sep 17 00:00:00 2001 From: Zhenguo Niu Date: Tue, 18 Apr 2017 11:09:46 +0800 Subject: [PATCH] Replace /types with /flavors in URI Change-Id: I50358a289c58b827283c9c4c6e068eee17063bfd --- moganclient/common/base.py | 2 +- moganclient/tests/unit/osc/v1/test_flavor.py | 30 ++++++++++---------- moganclient/v1/flavor.py | 16 +++++------ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/moganclient/common/base.py b/moganclient/common/base.py index 7d28ee8..847f0f2 100644 --- a/moganclient/common/base.py +++ b/moganclient/common/base.py @@ -41,7 +41,7 @@ def getid(obj): class Manager(object): """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. """ resource_class = None diff --git a/moganclient/tests/unit/osc/v1/test_flavor.py b/moganclient/tests/unit/osc/v1/test_flavor.py index 1259c40..492b838 100644 --- a/moganclient/tests/unit/osc/v1/test_flavor.py +++ b/moganclient/tests/unit/osc/v1/test_flavor.py @@ -65,7 +65,7 @@ class TestFlavorCreate(TestFlavor): mock_create.return_value = self.fake_flavor parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - mock_create.assert_called_once_with('/types', + mock_create.assert_called_once_with('/flavors', data={ 'name': 'flavor1', 'is_public': True, @@ -86,7 +86,7 @@ class TestFlavorCreate(TestFlavor): mock_create.return_value = self.fake_flavor parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - mock_create.assert_called_once_with('/types', + mock_create.assert_called_once_with('/flavors', data={ 'name': 'flavor1', 'is_public': True, @@ -107,7 +107,7 @@ class TestFlavorCreate(TestFlavor): mock_create.return_value = self.fake_flavor parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - mock_create.assert_called_once_with('/types', + mock_create.assert_called_once_with('/flavors', data={ 'name': 'flavor1', 'is_public': False, @@ -129,7 +129,7 @@ class TestFlavorCreate(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) mock_create.assert_called_once_with( - '/types', + '/flavors', data={ 'name': 'flavor1', 'is_public': True, @@ -154,13 +154,13 @@ class TestFlavorCreate(TestFlavor): mock_get.return_value = {'extra_specs': {'key1': 'value1'}} parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - mock_create.assert_called_once_with('/types', + mock_create.assert_called_once_with('/flavors', data={ 'name': 'flavor1', 'is_public': True, '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, data=parsed_args.property, return_raw=True) @@ -190,7 +190,7 @@ class TestFlavorDelete(TestFlavor): mock_find.return_value = self.fake_flavor parsed_args = self.check_parser(self.cmd, arglist, verifylist) 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) self.assertIsNone(result) @@ -206,7 +206,7 @@ class TestFlavorDelete(TestFlavor): mock_find.return_value = self.fake_flavor parsed_args = self.check_parser(self.cmd, arglist, verifylist) 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), mock.call(expected_url)] mock_delete.assert_has_calls(expected_call) @@ -241,7 +241,7 @@ class TestFlavorList(TestFlavor): mock_list.return_value = [self.fake_flavor] parsed_args = self.check_parser(self.cmd, arglist, verifylist) 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_data, tuple(data)) @@ -267,7 +267,7 @@ class TestFlavorSet(TestFlavor): mock_find.return_value = self.fake_flavor parsed_args = self.check_parser(self.cmd, arglist, verifylist) 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'} mock_update.assert_called_once_with(expected_url, data=expected_data, @@ -288,7 +288,7 @@ class TestFlavorSet(TestFlavor): mock_find.return_value = self.fake_flavor parsed_args = self.check_parser(self.cmd, arglist, verifylist) 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.assertNotCalled(mock_update) mock_delete.assert_called_once_with(expected_url) @@ -309,12 +309,12 @@ class TestFlavorSet(TestFlavor): mock_find.return_value = self.fake_flavor parsed_args = self.check_parser(self.cmd, arglist, verifylist) 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'} mock_update.assert_called_once_with(expected_url, data=expected_data, return_raw=True) - expected_url = '/types/%s/extraspecs/key0' % base.getid( + expected_url = '/flavors/%s/extraspecs/key0' % base.getid( self.fake_flavor) mock_delete.assert_called_once_with(expected_url) self.assertIsNone(result) @@ -336,7 +336,7 @@ class TestFlavorShow(TestFlavor): mock_get.return_value = self.fake_flavor parsed_args = self.check_parser(self.cmd, arglist, verifylist) 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) self.assertEqual(self.columns, columns) self.assertEqual(self.data, data) @@ -362,7 +362,7 @@ class TestFlavorUnset(TestFlavor): mock_find.return_value = self.fake_flavor parsed_args = self.check_parser(self.cmd, arglist, verifylist) 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) mock_delete.assert_called_once_with(expected_url) self.assertIsNone(result) diff --git a/moganclient/v1/flavor.py b/moganclient/v1/flavor.py index 6434ff9..79af2c0 100644 --- a/moganclient/v1/flavor.py +++ b/moganclient/v1/flavor.py @@ -24,7 +24,7 @@ class FlavorManager(base.ManagerWithFind): resource_class = Flavor def create(self, name, is_public, description=None): - url = '/types' + url = '/flavors' data = { 'name': name, 'is_public': is_public, @@ -33,27 +33,27 @@ class FlavorManager(base.ManagerWithFind): return self._create(url, data=data) def delete(self, flavor): - url = '/types/%s' % base.getid(flavor) + url = '/flavors/%s' % base.getid(flavor) return self._delete(url) def get(self, flavor): - url = '/types/%s' % base.getid(flavor) + url = '/flavors/%s' % base.getid(flavor) return self._get(url) def list(self): - url = '/types' - return self._list(url, response_key='types') + url = '/flavors' + return self._list(url, response_key='flavors') 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) 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 return self._update(url, data=data, return_raw=True) 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} return self._delete(url)