Skip to content

Commit 004b2ab

Browse files
committed
compute: Switch server restore to SDK
Change-Id: I8df9711b736991c01136988aa06c8540d640f52f Signed-off-by: Stephen Finucane <sfinucan@redhat.com> Depends-On: https://review.opendev.org/c/openstack/openstacksdk/+/868108
1 parent 29fafab commit 004b2ab

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

openstackclient/compute/v2/server.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4050,12 +4050,13 @@ def get_parser(self, prog_name):
40504050
return parser
40514051

40524052
def take_action(self, parsed_args):
4053-
compute_client = self.app.client_manager.compute
4053+
compute_client = self.app.client_manager.sdk_connection.compute
40544054
for server in parsed_args.server:
4055-
utils.find_resource(
4056-
compute_client.servers,
4057-
server
4058-
).restore()
4055+
server_id = compute_client.find_server(
4056+
server,
4057+
ignore_missing=False,
4058+
).id
4059+
compute_client.restore_server(server_id)
40594060

40604061

40614062
class ResumeServer(command.Command):

openstackclient/tests/unit/compute/v2/test_server.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7499,21 +7499,16 @@ def test_migration_revert(self):
74997499
class TestServerRestore(TestServer):
75007500

75017501
def setUp(self):
7502-
super(TestServerRestore, self).setUp()
7502+
super().setUp()
75037503

75047504
# Get the command object to test
75057505
self.cmd = server.RestoreServer(self.app, None)
75067506

7507-
# Set methods to be tested.
7508-
self.methods = {
7509-
'restore': None,
7510-
}
7511-
75127507
def test_server_restore_one_server(self):
7513-
self.run_method_with_servers('restore', 1)
7508+
self.run_method_with_sdk_servers('restore_server', 1)
75147509

75157510
def test_server_restore_multi_servers(self):
7516-
self.run_method_with_servers('restore', 3)
7511+
self.run_method_with_sdk_servers('restore_server', 3)
75177512

75187513

75197514
class TestServerResume(TestServer):
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
features:
3+
- |
4+
The ``server restore`` command has been migrated to SDK.

0 commit comments

Comments
 (0)