Skip to content

Commit e02fd2a

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Switch server suspend and server resume to SDK"
2 parents cf02135 + ff96fea commit e02fd2a

3 files changed

Lines changed: 19 additions & 14 deletions

File tree

openstackclient/compute/v2/server.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4099,13 +4099,13 @@ def get_parser(self, prog_name):
40994099
return parser
41004100

41014101
def take_action(self, parsed_args):
4102-
4103-
compute_client = self.app.client_manager.compute
4102+
compute_client = self.app.client_manager.sdk_connection.compute
41044103
for server in parsed_args.server:
4105-
utils.find_resource(
4106-
compute_client.servers,
4104+
server_id = compute_client.find_server(
41074105
server,
4108-
).resume()
4106+
ignore_missing=False,
4107+
).id
4108+
compute_client.resume_server(server_id)
41094109

41104110

41114111
class SetServer(command.Command):
@@ -4670,13 +4670,13 @@ def get_parser(self, prog_name):
46704670
return parser
46714671

46724672
def take_action(self, parsed_args):
4673-
4674-
compute_client = self.app.client_manager.compute
4673+
compute_client = self.app.client_manager.sdk_connection.compute
46754674
for server in parsed_args.server:
4676-
utils.find_resource(
4677-
compute_client.servers,
4675+
server_id = compute_client.find_server(
46784676
server,
4679-
).suspend()
4677+
ignore_missing=False,
4678+
).id
4679+
compute_client.suspend_server(server_id)
46804680

46814681

46824682
class UnlockServer(command.Command):

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7617,10 +7617,10 @@ def setUp(self):
76177617
}
76187618

76197619
def test_server_resume_one_server(self):
7620-
self.run_method_with_servers('resume', 1)
7620+
self.run_method_with_sdk_servers('resume_server', 1)
76217621

76227622
def test_server_resume_multi_servers(self):
7623-
self.run_method_with_servers('resume', 3)
7623+
self.run_method_with_sdk_servers('resume_server', 3)
76247624

76257625

76267626
class TestServerSet(TestServer):
@@ -8284,10 +8284,10 @@ def setUp(self):
82848284
}
82858285

82868286
def test_server_suspend_one_server(self):
8287-
self.run_method_with_servers('suspend', 1)
8287+
self.run_method_with_sdk_servers('suspend_server', 1)
82888288

82898289
def test_server_suspend_multi_servers(self):
8290-
self.run_method_with_servers('suspend', 3)
8290+
self.run_method_with_sdk_servers('suspend_server', 3)
82918291

82928292

82938293
class TestServerUnlock(TestServer):
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
features:
3+
- |
4+
Migrate ``server suspend`` and ``server resume`` commands from novaclient
5+
to sdk.

0 commit comments

Comments
 (0)