diff options
| author | Zuul <zuul@review.opendev.org> | 2020-11-26 02:17:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-11-26 02:17:17 +0000 |
| commit | 8b892239dcc012d833ea4fb95d4bfd7db6ae7869 (patch) | |
| tree | 095c49a019226da7166cfc49711336dfa1557e6a | |
| parent | e43454f4b066a0c9a3feaa4ad0bec19564b7596f (diff) | |
| parent | 3647805c673d0124d72c01ad1eef2478825514fe (diff) | |
| download | python-troveclient-8b892239dcc012d833ea4fb95d4bfd7db6ae7869.tar.gz | |
Merge "Revert "Fix resize flavor for instance""6.0.0
| -rw-r--r-- | troveclient/osc/v1/database_instances.py | 15 | ||||
| -rw-r--r-- | troveclient/tests/osc/v1/test_database_instances.py | 11 |
2 files changed, 15 insertions, 11 deletions
diff --git a/troveclient/osc/v1/database_instances.py b/troveclient/osc/v1/database_instances.py index 918ce20..4b3654d 100644 --- a/troveclient/osc/v1/database_instances.py +++ b/troveclient/osc/v1/database_instances.py @@ -518,21 +518,24 @@ class ResizeDatabaseInstanceFlavor(command.Command): help=_('ID or name of the instance') ) parser.add_argument( - 'flavor_id', - metavar='<flavor_id>', + 'flavor', type=str, - help=_('New flavor ID of the instance') + help=_('ID or name of the new flavor.') ) return parser def take_action(self, parsed_args): instance_mgr = self.app.client_manager.database.instances - instance_id = parsed_args.instance + flavor_mgr = self.app.client_manager.database.flavors + instance_id = parsed_args.instance if not uuidutils.is_uuid_like(instance_id): - instance_id = osc_utils.find_resource(instance_mgr, instance_id) + instance = osc_utils.find_resource(instance_mgr, instance_id) + instance_id = instance.id + + flavor = osc_utils.find_resource(flavor_mgr, parsed_args.flavor) - instance_mgr.resize_instance(instance_id, parsed_args.flavor_id) + instance_mgr.resize_instance(instance_id, flavor.id) class UpgradeDatabaseInstance(command.Command): diff --git a/troveclient/tests/osc/v1/test_database_instances.py b/troveclient/tests/osc/v1/test_database_instances.py index 62c9a25..38893bd 100644 --- a/troveclient/tests/osc/v1/test_database_instances.py +++ b/troveclient/tests/osc/v1/test_database_instances.py @@ -410,14 +410,15 @@ class TestDatabaseInstanceResizeFlavor(TestInstances): @mock.patch.object(utils, 'find_resource') def test_instance_resize_flavor(self, mock_find): args = ['instance1', 'flavor_id'] - mock_find.return_value = 'fake_instance_id' - + mock_find.side_effect = [ + mock.MagicMock(id='fake_instance_id'), + mock.MagicMock(id='fake_flavor_id') + ] parsed_args = self.check_parser(self.cmd, args, []) - result = self.cmd.take_action(parsed_args) + self.cmd.take_action(parsed_args) self.instance_client.resize_instance.assert_called_with( - 'fake_instance_id', 'flavor_id') - self.assertIsNone(result) + 'fake_instance_id', 'fake_flavor_id') class TestDatabaseInstanceUpgrade(TestInstances): |