Skip to content

Commit e0f7306

Browse files
committed
network: Migrate 'port list' to compute SDK
We use the compute client here to look up server IDs when filtering by 'device_id'. Change-Id: I76515eaa4ce4e7c7d0173d2e0a91d7564ba7041a Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
1 parent aa5eb88 commit e0f7306

2 files changed

Lines changed: 11 additions & 13 deletions

File tree

openstackclient/network/v2/port.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -844,9 +844,10 @@ def take_action(self, parsed_args):
844844
)
845845
filters['device_id'] = _router.id
846846
if parsed_args.server:
847-
compute_client = self.app.client_manager.compute
848-
server = utils.find_resource(
849-
compute_client.servers, parsed_args.server
847+
compute_client = self.app.client_manager.sdk_connection.compute
848+
server = compute_client.find_server(
849+
parsed_args.server,
850+
ignore_missing=False,
850851
)
851852
filters['device_id'] = server.id
852853
if parsed_args.host:

openstackclient/tests/unit/network/v2/test_port.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
from osc_lib.cli import format_columns
1717
from osc_lib import exceptions
18-
from osc_lib import utils
1918

2019
from openstackclient.network.v2 import port
2120
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
@@ -1190,7 +1189,7 @@ def test_multi_ports_delete_with_exception(self):
11901189
self.network_client.delete_port.assert_called_once_with(self._ports[0])
11911190

11921191

1193-
class TestListPort(TestPort):
1192+
class TestListPort(compute_fakes.FakeClientMixin, TestPort):
11941193
_ports = network_fakes.create_ports(count=3)
11951194

11961195
columns = (
@@ -1256,9 +1255,6 @@ def setUp(self):
12561255
self.network_client.find_router = mock.Mock(return_value=fake_router)
12571256
self.network_client.find_network = mock.Mock(return_value=fake_network)
12581257

1259-
self.app.client_manager.compute = mock.Mock()
1260-
self.compute_client = self.app.client_manager.compute
1261-
12621258
# Get the command object to test
12631259
self.cmd = port.ListPort(self.app, None)
12641260

@@ -1297,10 +1293,9 @@ def test_port_list_router_opt(self):
12971293
self.assertEqual(self.columns, columns)
12981294
self.assertCountEqual(self.data, list(data))
12991295

1300-
@mock.patch.object(utils, 'find_resource')
1301-
def test_port_list_with_server_option(self, mock_find):
1302-
fake_server = compute_fakes.create_one_server()
1303-
mock_find.return_value = fake_server
1296+
def test_port_list_with_server_option(self):
1297+
fake_server = compute_fakes.create_one_sdk_server()
1298+
self.compute_sdk_client.find_server.return_value = fake_server
13041299

13051300
arglist = [
13061301
'--server',
@@ -1315,7 +1310,9 @@ def test_port_list_with_server_option(self, mock_find):
13151310
self.network_client.ports.assert_called_once_with(
13161311
device_id=fake_server.id, fields=LIST_FIELDS_TO_RETRIEVE
13171312
)
1318-
mock_find.assert_called_once_with(mock.ANY, 'fake-server-name')
1313+
self.compute_sdk_client.find_server.aassert_called_once_with(
1314+
mock.ANY, 'fake-server-name'
1315+
)
13191316
self.assertEqual(self.columns, columns)
13201317
self.assertCountEqual(self.data, list(data))
13211318

0 commit comments

Comments
 (0)