diff options
| author | Zuul <zuul@review.opendev.org> | 2021-11-30 19:08:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-11-30 19:08:01 +0000 |
| commit | d9ad0b5d46d7b81ff564e8a1ea33ebeec212d7f7 (patch) | |
| tree | 12f99951156b60bbe417b3fd5eb464626c89be8b /openstackclient/tests/unit/compute | |
| parent | e02fd2ab183806c951cb78ffa1ee40570f8e77b9 (diff) | |
| parent | f82afc7f379daebd1994d9133eff801f790c0d32 (diff) | |
| download | python-openstackclient-d9ad0b5d46d7b81ff564e8a1ea33ebeec212d7f7.tar.gz | |
Merge "Switch openstack server remove port/network to using sdk"
Diffstat (limited to 'openstackclient/tests/unit/compute')
| -rw-r--r-- | openstackclient/tests/unit/compute/v2/test_server.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py index 27ea1263..f78c56e9 100644 --- a/openstackclient/tests/unit/compute/v2/test_server.py +++ b/openstackclient/tests/unit/compute/v2/test_server.py @@ -7028,14 +7028,14 @@ class TestServerRemovePort(TestServer): # Set method to be tested. self.methods = { - 'interface_detach': None, + 'delete_server_interface': None, } self.find_port = mock.Mock() self.app.client_manager.network.find_port = self.find_port def _test_server_remove_port(self, port_id): - servers = self.setup_servers_mock(count=1) + servers = self.setup_sdk_servers_mock(count=1) port = 'fake-port' arglist = [ @@ -7050,7 +7050,8 @@ class TestServerRemovePort(TestServer): result = self.cmd.take_action(parsed_args) - servers[0].interface_detach.assert_called_once_with(port_id) + self.sdk_client.delete_server_interface.assert_called_with( + port_id, server=servers[0], ignore_missing=False) self.assertIsNone(result) def test_server_remove_port(self): @@ -7075,17 +7076,18 @@ class TestServerRemoveNetwork(TestServer): # Set method to be tested. self.fake_inf = mock.Mock() self.methods = { - 'interface_list': [self.fake_inf], - 'interface_detach': None, + 'server_interfaces': [self.fake_inf], + 'delete_server_interface': None, } self.find_network = mock.Mock() self.app.client_manager.network.find_network = self.find_network + self.sdk_client.server_interfaces.return_value = [self.fake_inf] def _test_server_remove_network(self, network_id): self.fake_inf.net_id = network_id self.fake_inf.port_id = 'fake-port' - servers = self.setup_servers_mock(count=1) + servers = self.setup_sdk_servers_mock(count=1) network = 'fake-network' arglist = [ @@ -7100,8 +7102,9 @@ class TestServerRemoveNetwork(TestServer): result = self.cmd.take_action(parsed_args) - servers[0].interface_list.assert_called_once_with() - servers[0].interface_detach.assert_called_once_with('fake-port') + self.sdk_client.server_interfaces.assert_called_once_with(servers[0]) + self.sdk_client.delete_server_interface.assert_called_once_with( + 'fake-port', server=servers[0]) self.assertIsNone(result) def test_server_remove_network(self): |