Skip to content

Commit cf02135

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Switch server pause and server unpause to SDK"
2 parents 3456ee7 + b515fe6 commit cf02135

3 files changed

Lines changed: 36 additions & 15 deletions

File tree

openstackclient/compute/v2/server.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3148,12 +3148,13 @@ def get_parser(self, prog_name):
31483148
return parser
31493149

31503150
def take_action(self, parsed_args):
3151-
compute_client = self.app.client_manager.compute
3151+
compute_client = self.app.client_manager.sdk_connection.compute
31523152
for server in parsed_args.server:
3153-
utils.find_resource(
3154-
compute_client.servers,
3155-
server
3156-
).pause()
3153+
server_id = compute_client.find_server(
3154+
server,
3155+
ignore_missing=False,
3156+
).id
3157+
compute_client.pause_server(server_id)
31573158

31583159

31593160
class RebootServer(command.Command):
@@ -4692,7 +4693,6 @@ def get_parser(self, prog_name):
46924693
return parser
46934694

46944695
def take_action(self, parsed_args):
4695-
46964696
compute_client = self.app.client_manager.compute
46974697
for server in parsed_args.server:
46984698
utils.find_resource(
@@ -4715,13 +4715,13 @@ def get_parser(self, prog_name):
47154715
return parser
47164716

47174717
def take_action(self, parsed_args):
4718-
4719-
compute_client = self.app.client_manager.compute
4718+
compute_client = self.app.client_manager.sdk_connection.compute
47204719
for server in parsed_args.server:
4721-
utils.find_resource(
4722-
compute_client.servers,
4720+
server_id = compute_client.find_server(
47234721
server,
4724-
).unpause()
4722+
ignore_missing=False,
4723+
).id
4724+
compute_client.unpause_server(server_id)
47254725

47264726

47274727
class UnrescueServer(command.Command):

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,22 @@ def run_method_with_servers(self, method_name, server_count):
192192
method.assert_called_with()
193193
self.assertIsNone(result)
194194

195+
def run_method_with_sdk_servers(self, method_name, server_count):
196+
servers = self.setup_sdk_servers_mock(count=server_count)
197+
198+
arglist = [s.id for s in servers]
199+
verifylist = [
200+
('server', arglist),
201+
]
202+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
203+
204+
result = self.cmd.take_action(parsed_args)
205+
206+
calls = [call(s.id) for s in servers]
207+
method = getattr(self.sdk_client, method_name)
208+
method.assert_has_calls(calls)
209+
self.assertIsNone(result)
210+
195211

196212
class TestServerAddFixedIP(TestServer):
197213

@@ -6062,10 +6078,10 @@ def setUp(self):
60626078
}
60636079

60646080
def test_server_pause_one_server(self):
6065-
self.run_method_with_servers('pause', 1)
6081+
self.run_method_with_sdk_servers('pause_server', 1)
60666082

60676083
def test_server_pause_multi_servers(self):
6068-
self.run_method_with_servers('pause', 3)
6084+
self.run_method_with_sdk_servers('pause_server', 3)
60696085

60706086

60716087
class TestServerRebuild(TestServer):
@@ -8308,10 +8324,10 @@ def setUp(self):
83088324
}
83098325

83108326
def test_server_unpause_one_server(self):
8311-
self.run_method_with_servers('unpause', 1)
8327+
self.run_method_with_sdk_servers('unpause_server', 1)
83128328

83138329
def test_server_unpause_multi_servers(self):
8314-
self.run_method_with_servers('unpause', 3)
8330+
self.run_method_with_sdk_servers('unpause_server', 3)
83158331

83168332

83178333
class TestServerUnset(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 pause`` and ``server unpause`` commands from novaclient
5+
to sdk.

0 commit comments

Comments
 (0)