diff options
| author | Zuul <zuul@review.opendev.org> | 2023-04-03 20:36:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-04-03 20:36:11 +0000 |
| commit | eafe579534682887b6a23bf552b195cd901192d8 (patch) | |
| tree | 866c3b6caee8fa58459cd3aa120bb9f5bea51d5f | |
| parent | 0a9a1753b5e6f57b39ef692d186b01954f2e58e8 (diff) | |
| parent | 004b2ab2fbad3655915f226ca2f479b35f7bfc46 (diff) | |
| download | python-openstackclient-eafe579534682887b6a23bf552b195cd901192d8.tar.gz | |
Merge "compute: Switch server restore to SDK"
| -rw-r--r-- | openstackclient/compute/v2/server.py | 11 | ||||
| -rw-r--r-- | openstackclient/tests/unit/compute/v2/test_server.py | 11 | ||||
| -rw-r--r-- | releasenotes/notes/migrate-server-restore-to-sdk-4540f26753031779.yaml | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 0d40d96a..2c83d5dd 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -4044,12 +4044,13 @@ class RestoreServer(command.Command): return parser def take_action(self, parsed_args): - compute_client = self.app.client_manager.compute + compute_client = self.app.client_manager.sdk_connection.compute for server in parsed_args.server: - utils.find_resource( - compute_client.servers, - server - ).restore() + server_id = compute_client.find_server( + server, + ignore_missing=False, + ).id + compute_client.restore_server(server_id) class ResumeServer(command.Command): diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py index 25337175..0e0e70c7 100644 --- a/openstackclient/tests/unit/compute/v2/test_server.py +++ b/openstackclient/tests/unit/compute/v2/test_server.py @@ -7498,21 +7498,16 @@ class TestServerRevertMigration(TestServer): class TestServerRestore(TestServer): def setUp(self): - super(TestServerRestore, self).setUp() + super().setUp() # Get the command object to test self.cmd = server.RestoreServer(self.app, None) - # Set methods to be tested. - self.methods = { - 'restore': None, - } - def test_server_restore_one_server(self): - self.run_method_with_servers('restore', 1) + self.run_method_with_sdk_servers('restore_server', 1) def test_server_restore_multi_servers(self): - self.run_method_with_servers('restore', 3) + self.run_method_with_sdk_servers('restore_server', 3) class TestServerResume(TestServer): diff --git a/releasenotes/notes/migrate-server-restore-to-sdk-4540f26753031779.yaml b/releasenotes/notes/migrate-server-restore-to-sdk-4540f26753031779.yaml new file mode 100644 index 00000000..1adc40be --- /dev/null +++ b/releasenotes/notes/migrate-server-restore-to-sdk-4540f26753031779.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + The ``server restore`` command has been migrated to SDK. |