Skip to content

Commit eafe579

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "compute: Switch server restore to SDK"
2 parents 0a9a175 + 004b2ab commit eafe579

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
@@ -4044,12 +4044,13 @@ def get_parser(self, prog_name):
40444044
return parser
40454045

40464046
def take_action(self, parsed_args):
4047-
compute_client = self.app.client_manager.compute
4047+
compute_client = self.app.client_manager.sdk_connection.compute
40484048
for server in parsed_args.server:
4049-
utils.find_resource(
4050-
compute_client.servers,
4051-
server
4052-
).restore()
4049+
server_id = compute_client.find_server(
4050+
server,
4051+
ignore_missing=False,
4052+
).id
4053+
compute_client.restore_server(server_id)
40534054

40544055

40554056
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
@@ -7498,21 +7498,16 @@ def test_migration_revert(self):
74987498
class TestServerRestore(TestServer):
74997499

75007500
def setUp(self):
7501-
super(TestServerRestore, self).setUp()
7501+
super().setUp()
75027502

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

7506-
# Set methods to be tested.
7507-
self.methods = {
7508-
'restore': None,
7509-
}
7510-
75117506
def test_server_restore_one_server(self):
7512-
self.run_method_with_servers('restore', 1)
7507+
self.run_method_with_sdk_servers('restore_server', 1)
75137508

75147509
def test_server_restore_multi_servers(self):
7515-
self.run_method_with_servers('restore', 3)
7510+
self.run_method_with_sdk_servers('restore_server', 3)
75167511

75177512

75187513
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)