summaryrefslogtreecommitdiff
path: root/openstackclient/tests/unit/compute/v2
diff options
context:
space:
mode:
authorDiwei Zhu <zhu.diw@northeastern.edu>2021-11-14 22:52:14 +0000
committerDiwei Zhu <zhu.diw@northeastern.edu>2021-11-29 14:31:07 +0000
commitf82afc7f379daebd1994d9133eff801f790c0d32 (patch)
tree95e5295e59ce1de26f9735b0f085649ee953fd03 /openstackclient/tests/unit/compute/v2
parent28cd5763de8706fb997bdd53deaf94aca0de5c52 (diff)
downloadpython-openstackclient-f82afc7f379daebd1994d9133eff801f790c0d32.tar.gz
Switch openstack server remove port/network to using sdk
Change-Id: I1540c1f52e9a107dba20eeea9dc323c5510fe2b1
Diffstat (limited to 'openstackclient/tests/unit/compute/v2')
-rw-r--r--openstackclient/tests/unit/compute/v2/test_server.py19
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 203e47eb..bb0a2c67 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -6973,14 +6973,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 = [
@@ -6995,7 +6995,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):
@@ -7020,17 +7021,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 = [
@@ -7045,8 +7047,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):