3 files changed
@@ -3130,12 +3130,13 @@ def get_parser(self, prog_name): | |||
| 3130 | 3130 | return parser | |
| 3131 | 3131 | ||
| 3132 | 3132 | def take_action(self, parsed_args): | |
| 3133 | - compute_client = self.app.client_manager.compute | ||
| 3133 | + compute_client = self.app.client_manager.sdk_connection.compute | ||
| 3134 | 3134 | for server in parsed_args.server: | |
| 3135 | - utils.find_resource( | ||
| 3136 | - compute_client.servers, | ||
| 3137 | - server | ||
| 3138 | - ).pause() | ||
| 3135 | + server_id = compute_client.find_server( | ||
| 3136 | + server, | ||
| 3137 | + ignore_missing=False, | ||
| 3138 | + ).id | ||
| 3139 | + compute_client.pause_server(server_id) | ||
| 3139 | 3140 | ||
| 3140 | 3141 | ||
| 3141 | 3142 | class RebootServer(command.Command): | |
@@ -4674,7 +4675,6 @@ def get_parser(self, prog_name): | |||
| 4674 | 4675 | return parser | |
| 4675 | 4676 | ||
| 4676 | 4677 | def take_action(self, parsed_args): | |
| 4677 | - | ||
| 4678 | 4678 | compute_client = self.app.client_manager.compute | |
| 4679 | 4679 | for server in parsed_args.server: | |
| 4680 | 4680 | utils.find_resource( | |
@@ -4697,13 +4697,13 @@ def get_parser(self, prog_name): | |||
| 4697 | 4697 | return parser | |
| 4698 | 4698 | ||
| 4699 | 4699 | def take_action(self, parsed_args): | |
| 4700 | - | ||
| 4701 | - compute_client = self.app.client_manager.compute | ||
| 4700 | + compute_client = self.app.client_manager.sdk_connection.compute | ||
| 4702 | 4701 | for server in parsed_args.server: | |
| 4703 | - utils.find_resource( | ||
| 4704 | - compute_client.servers, | ||
| 4702 | + server_id = compute_client.find_server( | ||
| 4705 | 4703 | server, | |
| 4706 | - ).unpause() | ||
| 4704 | + ignore_missing=False, | ||
| 4705 | + ).id | ||
| 4706 | + compute_client.unpause_server(server_id) | ||
| 4707 | 4707 | ||
| 4708 | 4708 | ||
| 4709 | 4709 | class UnrescueServer(command.Command): | |
@@ -192,6 +192,22 @@ def run_method_with_servers(self, method_name, server_count): | |||
| 192 | 192 | method.assert_called_with() | |
| 193 | 193 | self.assertIsNone(result) | |
| 194 | 194 | ||
| 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 | + | ||
| 195 | 211 | ||
| 196 | 212 | class TestServerAddFixedIP(TestServer): | |
| 197 | 213 | ||
@@ -6062,10 +6078,10 @@ def setUp(self): | |||
| 6062 | 6078 | } | |
| 6063 | 6079 | ||
| 6064 | 6080 | 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) | ||
| 6066 | 6082 | ||
| 6067 | 6083 | 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) | ||
| 6069 | 6085 | ||
| 6070 | 6086 | ||
| 6071 | 6087 | class TestServerRebuild(TestServer): | |
@@ -8308,10 +8324,10 @@ def setUp(self): | |||
| 8308 | 8324 | } | |
| 8309 | 8325 | ||
| 8310 | 8326 | 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) | ||
| 8312 | 8328 | ||
| 8313 | 8329 | 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) | ||
| 8315 | 8331 | ||
| 8316 | 8332 | ||
| 8317 | 8333 | class TestServerUnset(TestServer): | |
@@ -0,0 +1,5 @@ | |||
| 1 | + --- | ||
| 2 | + features: | ||
| 3 | + - | | ||
| 4 | + Migrate ``server pause`` and ``server unpause`` commands from novaclient | ||
| 5 | + to sdk. | ||
0 commit comments