python-openstackclient 6.6.1__py3-none-any.whl → 7.0.0__py3-none-any.whl

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

@@ -25,10 +25,10 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestNetworkRBAC(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestNetworkRBAC, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the ProjectManager Mock
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
 
 
 @ddt.ddt
@@ -67,10 +67,10 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
     ]
 
     def setUp(self):
-        super(TestCreateNetworkRBAC, self).setUp()
+        super().setUp()
 
         # Get the command object to test
-        self.cmd = network_rbac.CreateNetworkRBAC(self.app, self.namespace)
+        self.cmd = network_rbac.CreateNetworkRBAC(self.app, None)
 
         self.network_client.create_rbac_policy = mock.Mock(
             return_value=self.rbac_policy
@@ -342,14 +342,14 @@ class TestDeleteNetworkRBAC(TestNetworkRBAC):
     rbac_policies = network_fakes.create_network_rbacs(count=2)
 
     def setUp(self):
-        super(TestDeleteNetworkRBAC, self).setUp()
+        super().setUp()
         self.network_client.delete_rbac_policy = mock.Mock(return_value=None)
         self.network_client.find_rbac_policy = network_fakes.get_network_rbacs(
             rbac_policies=self.rbac_policies
         )
 
         # Get the command object to test
-        self.cmd = network_rbac.DeleteNetworkRBAC(self.app, self.namespace)
+        self.cmd = network_rbac.DeleteNetworkRBAC(self.app, None)
 
     def test_network_rbac_delete(self):
         arglist = [
@@ -457,10 +457,10 @@ class TestListNetworkRABC(TestNetworkRBAC):
         )
 
     def setUp(self):
-        super(TestListNetworkRABC, self).setUp()
+        super().setUp()
 
         # Get the command object to test
-        self.cmd = network_rbac.ListNetworkRBAC(self.app, self.namespace)
+        self.cmd = network_rbac.ListNetworkRBAC(self.app, None)
 
         self.network_client.rbac_policies = mock.Mock(
             return_value=self.rbac_policies
@@ -559,10 +559,10 @@ class TestSetNetworkRBAC(TestNetworkRBAC):
     )
 
     def setUp(self):
-        super(TestSetNetworkRBAC, self).setUp()
+        super().setUp()
 
         # Get the command object to test
-        self.cmd = network_rbac.SetNetworkRBAC(self.app, self.namespace)
+        self.cmd = network_rbac.SetNetworkRBAC(self.app, None)
 
         self.network_client.find_rbac_policy = mock.Mock(
             return_value=self.rbac_policy
@@ -634,10 +634,10 @@ class TestShowNetworkRBAC(TestNetworkRBAC):
     ]
 
     def setUp(self):
-        super(TestShowNetworkRBAC, self).setUp()
+        super().setUp()
 
         # Get the command object to test
-        self.cmd = network_rbac.ShowNetworkRBAC(self.app, self.namespace)
+        self.cmd = network_rbac.ShowNetworkRBAC(self.app, None)
 
         self.network_client.find_rbac_policy = mock.Mock(
             return_value=self.rbac_policy

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

@@ -23,7 +23,7 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestNetworkSegment(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestNetworkSegment, self).setUp()
+        super().setUp()
 
 
 class TestCreateNetworkSegment(TestNetworkSegment):
@@ -56,7 +56,7 @@ class TestCreateNetworkSegment(TestNetworkSegment):
     )
 
     def setUp(self):
-        super(TestCreateNetworkSegment, self).setUp()
+        super().setUp()
 
         self.network_client.create_segment = mock.Mock(
             return_value=self._network_segment
@@ -66,9 +66,7 @@ class TestCreateNetworkSegment(TestNetworkSegment):
         )
 
         # Get the command object to test
-        self.cmd = network_segment.CreateNetworkSegment(
-            self.app, self.namespace
-        )
+        self.cmd = network_segment.CreateNetworkSegment(self.app, None)
 
     def test_create_no_options(self):
         # Missing required args should bail here
@@ -172,7 +170,7 @@ class TestDeleteNetworkSegment(TestNetworkSegment):
     _network_segments = network_fakes.create_network_segments()
 
     def setUp(self):
-        super(TestDeleteNetworkSegment, self).setUp()
+        super().setUp()
 
         self.network_client.delete_segment = mock.Mock(return_value=None)
         self.network_client.find_segment = mock.Mock(
@@ -180,9 +178,7 @@ class TestDeleteNetworkSegment(TestNetworkSegment):
         )
 
         # Get the command object to test
-        self.cmd = network_segment.DeleteNetworkSegment(
-            self.app, self.namespace
-        )
+        self.cmd = network_segment.DeleteNetworkSegment(self.app, None)
 
     def test_delete(self):
         arglist = [
@@ -290,10 +286,10 @@ class TestListNetworkSegment(TestNetworkSegment):
         )
 
     def setUp(self):
-        super(TestListNetworkSegment, self).setUp()
+        super().setUp()
 
         # Get the command object to test
-        self.cmd = network_segment.ListNetworkSegment(self.app, self.namespace)
+        self.cmd = network_segment.ListNetworkSegment(self.app, None)
 
         self.network_client.find_network = mock.Mock(
             return_value=self._network
@@ -354,7 +350,7 @@ class TestSetNetworkSegment(TestNetworkSegment):
     _network_segment = network_fakes.create_one_network_segment()
 
     def setUp(self):
-        super(TestSetNetworkSegment, self).setUp()
+        super().setUp()
 
         self.network_client.find_segment = mock.Mock(
             return_value=self._network_segment
@@ -364,7 +360,7 @@ class TestSetNetworkSegment(TestNetworkSegment):
         )
 
         # Get the command object to test
-        self.cmd = network_segment.SetNetworkSegment(self.app, self.namespace)
+        self.cmd = network_segment.SetNetworkSegment(self.app, None)
 
     def test_set_no_options(self):
         arglist = [
@@ -434,14 +430,14 @@ class TestShowNetworkSegment(TestNetworkSegment):
     )
 
     def setUp(self):
-        super(TestShowNetworkSegment, self).setUp()
+        super().setUp()
 
         self.network_client.find_segment = mock.Mock(
             return_value=self._network_segment
         )
 
         # Get the command object to test
-        self.cmd = network_segment.ShowNetworkSegment(self.app, self.namespace)
+        self.cmd = network_segment.ShowNetworkSegment(self.app, None)
 
     def test_show_no_options(self):
         # Missing required args should bail here

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

@@ -40,7 +40,7 @@ class TestAuxiliaryFunctions(tests_utils.TestCase):
 
 class TestNetworkSegmentRange(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestNetworkSegmentRange, self).setUp()
+        super().setUp()
 
 
 class TestCreateNetworkSegmentRange(TestNetworkSegmentRange):
@@ -76,7 +76,7 @@ class TestCreateNetworkSegmentRange(TestNetworkSegmentRange):
     )
 
     def setUp(self):
-        super(TestCreateNetworkSegmentRange, self).setUp()
+        super().setUp()
 
         self.network_client.create_network_segment_range = mock.Mock(
             return_value=self._network_segment_range
@@ -84,7 +84,7 @@ class TestCreateNetworkSegmentRange(TestNetworkSegmentRange):
 
         # Get the command object to test
         self.cmd = network_segment_range.CreateNetworkSegmentRange(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_create_no_options(self):
@@ -349,7 +349,7 @@ class TestDeleteNetworkSegmentRange(TestNetworkSegmentRange):
     _network_segment_ranges = network_fakes.create_network_segment_ranges()
 
     def setUp(self):
-        super(TestDeleteNetworkSegmentRange, self).setUp()
+        super().setUp()
 
         self.network_client.delete_network_segment_range = mock.Mock(
             return_value=None
@@ -360,7 +360,7 @@ class TestDeleteNetworkSegmentRange(TestNetworkSegmentRange):
 
         # Get the command object to test
         self.cmd = network_segment_range.DeleteNetworkSegmentRange(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_delete(self):
@@ -491,7 +491,7 @@ class TestListNetworkSegmentRange(TestNetworkSegmentRange):
         )
 
     def setUp(self):
-        super(TestListNetworkSegmentRange, self).setUp()
+        super().setUp()
 
         self.network_client.network_segment_ranges = mock.Mock(
             return_value=self._network_segment_ranges
@@ -499,7 +499,7 @@ class TestListNetworkSegmentRange(TestNetworkSegmentRange):
 
         # Get the command object to test
         self.cmd = network_segment_range.ListNetworkSegmentRange(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_list_no_option(self):
@@ -565,16 +565,14 @@ class TestSetNetworkSegmentRange(TestNetworkSegmentRange):
     )
 
     def setUp(self):
-        super(TestSetNetworkSegmentRange, self).setUp()
+        super().setUp()
 
         self.network_client.find_network_segment_range = mock.Mock(
             return_value=self._network_segment_range
         )
 
         # Get the command object to test
-        self.cmd = network_segment_range.SetNetworkSegmentRange(
-            self.app, self.namespace
-        )
+        self.cmd = network_segment_range.SetNetworkSegmentRange(self.app, None)
 
     def test_set_no_options(self):
         arglist = [
@@ -662,7 +660,7 @@ class TestShowNetworkSegmentRange(TestNetworkSegmentRange):
     )
 
     def setUp(self):
-        super(TestShowNetworkSegmentRange, self).setUp()
+        super().setUp()
 
         self.network_client.find_network_segment_range = mock.Mock(
             return_value=self._network_segment_range
@@ -670,7 +668,7 @@ class TestShowNetworkSegmentRange(TestNetworkSegmentRange):
 
         # Get the command object to test
         self.cmd = network_segment_range.ShowNetworkSegmentRange(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_show_no_options(self):

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

@@ -23,7 +23,7 @@ from openstackclient.tests.unit.network.v2 import fakes
 
 class TestNetworkServiceProvider(fakes.TestNetworkV2):
     def setUp(self):
-        super(TestNetworkServiceProvider, self).setUp()
+        super().setUp()
 
 
 class TestListNetworkServiceProvider(TestNetworkServiceProvider):
@@ -51,14 +51,12 @@ class TestListNetworkServiceProvider(TestNetworkServiceProvider):
         )
 
     def setUp(self):
-        super(TestListNetworkServiceProvider, self).setUp()
+        super().setUp()
         self.network_client.service_providers = mock.Mock(
             return_value=self.provider_list
         )
 
-        self.cmd = service_provider.ListNetworkServiceProvider(
-            self.app, self.namespace
-        )
+        self.cmd = service_provider.ListNetworkServiceProvider(self.app, None)
 
     def test_network_service_provider_list(self):
         arglist = []

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

@@ -31,9 +31,9 @@ class TestNetworkTrunk(network_fakes.TestNetworkV2):
         super().setUp()
 
         # Get a shortcut to the ProjectManager Mock
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
         # Get a shortcut to the DomainManager Mock
-        self.domains_mock = self.app.client_manager.identity.domains
+        self.domains_mock = self.identity_client.domains
 
 
 class TestCreateNetworkTrunk(TestNetworkTrunk):
@@ -92,7 +92,7 @@ class TestCreateNetworkTrunk(TestNetworkTrunk):
         )
 
         # Get the command object to test
-        self.cmd = network_trunk.CreateNetworkTrunk(self.app, self.namespace)
+        self.cmd = network_trunk.CreateNetworkTrunk(self.app, None)
 
         self.projects_mock.get.return_value = self.project
         self.domains_mock.get.return_value = self.domain
@@ -233,7 +233,7 @@ class TestCreateNetworkTrunk(TestNetworkTrunk):
             '--parent-port',
             self.new_trunk.port_id,
             '--subport',
-            'port=%(port)s' % {'port': subport['port_id']},
+            'port={port}'.format(port=subport['port_id']),
             self.new_trunk.name,
         ]
         verifylist = [
@@ -329,7 +329,7 @@ class TestDeleteNetworkTrunk(TestNetworkTrunk):
         self.domains_mock.get.return_value = self.domain
 
         # Get the command object to test
-        self.cmd = network_trunk.DeleteNetworkTrunk(self.app, self.namespace)
+        self.cmd = network_trunk.DeleteNetworkTrunk(self.app, None)
 
     def test_delete_trunkx(self):
         arglist = [
@@ -423,7 +423,7 @@ class TestShowNetworkTrunk(TestNetworkTrunk):
         self.domains_mock.get.return_value = self.domain
 
         # Get the command object to test
-        self.cmd = network_trunk.ShowNetworkTrunk(self.app, self.namespace)
+        self.cmd = network_trunk.ShowNetworkTrunk(self.app, None)
 
     def test_show_no_options(self):
         arglist = []
@@ -495,7 +495,7 @@ class TestListNetworkTrunk(TestNetworkTrunk):
         self.domains_mock.get.return_value = self.domain
 
         # Get the command object to test
-        self.cmd = network_trunk.ListNetworkTrunk(self.app, self.namespace)
+        self.cmd = network_trunk.ListNetworkTrunk(self.app, None)
 
     def test_trunk_list_no_option(self):
         arglist = []
@@ -581,7 +581,7 @@ class TestSetNetworkTrunk(TestNetworkTrunk):
         self.domains_mock.get.return_value = self.domain
 
         # Get the command object to test
-        self.cmd = network_trunk.SetNetworkTrunk(self.app, self.namespace)
+        self.cmd = network_trunk.SetNetworkTrunk(self.app, None)
 
     def _test_set_network_trunk_attr(self, attr, value):
         arglist = [
@@ -712,7 +712,7 @@ class TestSetNetworkTrunk(TestNetworkTrunk):
         subport.pop('segmentation_id')
         arglist = [
             '--subport',
-            'port=%(port)s' % {'port': subport['port_id']},
+            'port={port}'.format(port=subport['port_id']),
             self._trunk['name'],
         ]
         verifylist = [
@@ -842,7 +842,7 @@ class TestListNetworkSubport(TestNetworkTrunk):
         )
 
         # Get the command object to test
-        self.cmd = network_trunk.ListNetworkSubport(self.app, self.namespace)
+        self.cmd = network_trunk.ListNetworkSubport(self.app, None)
 
     def test_subport_list(self):
         arglist = [
@@ -915,7 +915,7 @@ class TestUnsetNetworkTrunk(TestNetworkTrunk):
         )
 
         # Get the command object to test
-        self.cmd = network_trunk.UnsetNetworkTrunk(self.app, self.namespace)
+        self.cmd = network_trunk.UnsetNetworkTrunk(self.app, None)
 
     def test_unset_network_trunk_subport(self):
         subport = self._trunk['sub_ports'][0]

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

@@ -15,7 +15,6 @@ from unittest.mock import call
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
-from osc_lib import utils
 
 from openstackclient.network.v2 import port
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
@@ -30,10 +29,10 @@ LIST_FIELDS_TO_RETRIEVE_LONG = ('security_group_ids', 'device_owner', 'tags')
 
 class TestPort(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestPort, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the ProjectManager Mock
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
 
     @staticmethod
     def _get_common_cols_data(fake_port):
@@ -127,7 +126,7 @@ class TestCreatePort(TestPort):
     columns, data = TestPort._get_common_cols_data(_port)
 
     def setUp(self):
-        super(TestCreatePort, self).setUp()
+        super().setUp()
 
         self.network_client.create_port = mock.Mock(return_value=self._port)
         self.network_client.set_tags = mock.Mock(return_value=None)
@@ -143,7 +142,7 @@ class TestCreatePort(TestPort):
         )
         self.network_client.find_extension = mock.Mock(return_value=[])
         # Get the command object to test
-        self.cmd = port.CreatePort(self.app, self.namespace)
+        self.cmd = port.CreatePort(self.app, None)
 
     def test_create_default_options(self):
         arglist = [
@@ -1118,14 +1117,14 @@ class TestDeletePort(TestPort):
     _ports = network_fakes.create_ports(count=2)
 
     def setUp(self):
-        super(TestDeletePort, self).setUp()
+        super().setUp()
 
         self.network_client.delete_port = mock.Mock(return_value=None)
         self.network_client.find_port = network_fakes.get_ports(
             ports=self._ports
         )
         # Get the command object to test
-        self.cmd = port.DeletePort(self.app, self.namespace)
+        self.cmd = port.DeletePort(self.app, None)
 
     def test_port_delete(self):
         arglist = [
@@ -1190,7 +1189,7 @@ class TestDeletePort(TestPort):
         self.network_client.delete_port.assert_called_once_with(self._ports[0])
 
 
-class TestListPort(TestPort):
+class TestListPort(compute_fakes.FakeClientMixin, TestPort):
     _ports = network_fakes.create_ports(count=3)
 
     columns = (
@@ -1240,7 +1239,7 @@ class TestListPort(TestPort):
         )
 
     def setUp(self):
-        super(TestListPort, self).setUp()
+        super().setUp()
 
         self.network_client.ports = mock.Mock(return_value=self._ports)
         fake_router = network_fakes.FakeRouter.create_one_router(
@@ -1256,11 +1255,8 @@ class TestListPort(TestPort):
         self.network_client.find_router = mock.Mock(return_value=fake_router)
         self.network_client.find_network = mock.Mock(return_value=fake_network)
 
-        self.app.client_manager.compute = mock.Mock()
-        self.compute_client = self.app.client_manager.compute
-
         # Get the command object to test
-        self.cmd = port.ListPort(self.app, self.namespace)
+        self.cmd = port.ListPort(self.app, None)
 
     def test_port_list_no_options(self):
         arglist = []
@@ -1297,10 +1293,9 @@ class TestListPort(TestPort):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
-    @mock.patch.object(utils, 'find_resource')
-    def test_port_list_with_server_option(self, mock_find):
-        fake_server = compute_fakes.create_one_server()
-        mock_find.return_value = fake_server
+    def test_port_list_with_server_option(self):
+        fake_server = compute_fakes.create_one_sdk_server()
+        self.compute_sdk_client.find_server.return_value = fake_server
 
         arglist = [
             '--server',
@@ -1315,7 +1310,9 @@ class TestListPort(TestPort):
         self.network_client.ports.assert_called_once_with(
             device_id=fake_server.id, fields=LIST_FIELDS_TO_RETRIEVE
         )
-        mock_find.assert_called_once_with(mock.ANY, 'fake-server-name')
+        self.compute_sdk_client.find_server.aassert_called_once_with(
+            mock.ANY, 'fake-server-name'
+        )
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
@@ -1490,7 +1487,7 @@ class TestListPort(TestPort):
         ip_address = self._ports[0].fixed_ips[0]['ip_address']
         arglist = [
             '--fixed-ip',
-            "subnet=%s,ip-address=%s" % (subnet_id, ip_address),
+            f"subnet={subnet_id},ip-address={ip_address}",
         ]
         verifylist = [
             ('fixed_ip', [{'subnet': subnet_id, 'ip-address': ip_address}])
@@ -1720,7 +1717,7 @@ class TestSetPort(TestPort):
     _port = network_fakes.create_one_port({'tags': ['green', 'red']})
 
     def setUp(self):
-        super(TestSetPort, self).setUp()
+        super().setUp()
         self.fake_subnet = network_fakes.FakeSubnet.create_one_subnet()
         self.network_client.find_subnet = mock.Mock(
             return_value=self.fake_subnet
@@ -1730,7 +1727,7 @@ class TestSetPort(TestPort):
         self.network_client.set_tags = mock.Mock(return_value=None)
 
         # Get the command object to test
-        self.cmd = port.SetPort(self.app, self.namespace)
+        self.cmd = port.SetPort(self.app, None)
 
     def test_set_port_defaults(self):
         arglist = [
@@ -2507,12 +2504,12 @@ class TestShowPort(TestPort):
     columns, data = TestPort._get_common_cols_data(_port)
 
     def setUp(self):
-        super(TestShowPort, self).setUp()
+        super().setUp()
 
         self.network_client.find_port = mock.Mock(return_value=self._port)
 
         # Get the command object to test
-        self.cmd = port.ShowPort(self.app, self.namespace)
+        self.cmd = port.ShowPort(self.app, None)
 
     def test_show_no_options(self):
         arglist = []
@@ -2547,7 +2544,7 @@ class TestShowPort(TestPort):
 
 class TestUnsetPort(TestPort):
     def setUp(self):
-        super(TestUnsetPort, self).setUp()
+        super().setUp()
         self._testport = network_fakes.create_one_port(
             {
                 'fixed_ips': [
@@ -2577,7 +2574,7 @@ class TestUnsetPort(TestPort):
         self.network_client.update_port = mock.Mock(return_value=None)
         self.network_client.set_tags = mock.Mock(return_value=None)
         # Get the command object to test
-        self.cmd = port.UnsetPort(self.app, self.namespace)
+        self.cmd = port.UnsetPort(self.app, None)
 
     def test_unset_port_parameters(self):
         arglist = [