python-openstackclient 9.0.0__py3-none-any.whl → 10.1.0__py3-none-any.whl

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

@@ -155,7 +155,7 @@ class TestListL3ConntrackHelper(TestConntrackHelper):
     def setUp(self):
         super().setUp()
         attrs = {'router_id': self.router.id}
-        ct_helpers = (
+        self.conntrack_helpers = (
             network_fakes.FakeL3ConntrackHelper.create_l3_conntrack_helpers(
                 attrs, count=3
             )
@@ -168,7 +168,7 @@ class TestListL3ConntrackHelper(TestConntrackHelper):
             'Port',
         )
         self.data = []
-        for ct_helper in ct_helpers:
+        for ct_helper in self.conntrack_helpers:
             self.data.append(
                 (
                     ct_helper.id,
@@ -178,7 +178,9 @@ class TestListL3ConntrackHelper(TestConntrackHelper):
                     ct_helper.port,
                 )
             )
-        self.network_client.conntrack_helpers.return_value = ct_helpers
+        self.network_client.conntrack_helpers.return_value = (
+            self.conntrack_helpers
+        )
 
         # Get the command object to test
         self.cmd = l3_conntrack_helper.ListConntrackHelper(self.app, None)
@@ -201,6 +203,30 @@ class TestListL3ConntrackHelper(TestConntrackHelper):
         for index in range(len(list_data)):
             self.assertEqual(self.data[index], list_data[index])
 
+    def test_conntrack_helpers_list_pagination(self):
+        arglist = [
+            '--marker',
+            self.conntrack_helpers[0].id,
+            '--limit',
+            '1',
+            self.router.id,
+        ]
+        verifylist = [
+            ('marker', self.conntrack_helpers[0].id),
+            ('limit', 1),
+            ('router', self.router.id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.conntrack_helpers.assert_called_once_with(
+            self.router.id,
+            **{'marker': self.conntrack_helpers[0].id, 'limit': 1},
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
 
 class TestSetL3ConntrackHelper(TestConntrackHelper):
     def setUp(self):

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

@@ -70,6 +70,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
         'provider:network_type',
         'provider:physical_network',
         'provider:segmentation_id',
+        'pvlan',
         'qos_policy_id',
         'router:external',
         'shared',
@@ -99,6 +100,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
         _network.provider_network_type,
         _network.provider_physical_network,
         _network.provider_segmentation_id,
+        _network.pvlan,
         _network.qos_policy_id,
         network.RouterExternalColumn(_network.is_router_external),
         _network.is_shared,
@@ -189,6 +191,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
             self.qos_policy.id,
             "--transparent-vlan",
             "--no-qinq-vlan",
+            "--no-pvlan",
             "--enable-port-security",
             "--dns-domain",
             "example.org.",
@@ -210,6 +213,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
             ('qos_policy', self.qos_policy.id),
             ('transparent_vlan', True),
             ('qinq_vlan', False),
+            ('pvlan', False),
             ('enable_port_security', True),
             ('name', self._network.name),
             ('dns_domain', 'example.org.'),
@@ -235,6 +239,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
                 'qos_policy_id': self.qos_policy.id,
                 'vlan_transparent': True,
                 'vlan_qinq': False,
+                'pvlan': False,
                 'port_security_enabled': True,
                 'dns_domain': 'example.org.',
             }
@@ -326,6 +331,19 @@ class TestCreateNetworkIdentityV3(TestNetwork):
             exceptions.CommandError, self.cmd.take_action, parsed_args
         )
 
+    def test_create_with_pvlan_and_port_security_disabled(self):
+        arglist = [
+            "--disable-port-security",
+            "--pvlan",
+            self._network.name,
+        ]
+        verifylist = [('disable_port_security', True), ('pvlan', True)]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
+
     def test_create_with_provider_segment_without_provider_type(self):
         arglist = [
             "--provider-segment",
@@ -371,6 +389,7 @@ class TestCreateNetworkIdentityV2(
         'name',
         'port_security_enabled',
         'project_id',
+        'pvlan',
         'provider:network_type',
         'provider:physical_network',
         'provider:segmentation_id',
@@ -400,6 +419,7 @@ class TestCreateNetworkIdentityV2(
         _network.name,
         _network.is_port_security_enabled,
         _network.project_id,
+        _network.pvlan,
         _network.provider_network_type,
         _network.provider_physical_network,
         _network.provider_segmentation_id,
@@ -576,7 +596,7 @@ class TestDeleteNetwork(TestNetwork):
 
 class TestListNetwork(TestNetwork):
     # The networks going to be listed up.
-    _network = network_fakes.create_networks(count=3)
+    _networks = network_fakes.create_networks(count=3)
 
     columns = (
         'ID',
@@ -598,7 +618,7 @@ class TestListNetwork(TestNetwork):
     )
 
     data = []
-    for net in _network:
+    for net in _networks:
         data.append(
             (
                 net.id,
@@ -608,7 +628,7 @@ class TestListNetwork(TestNetwork):
         )
 
     data_long = []
-    for net in _network:
+    for net in _networks:
         data_long.append(
             (
                 net.id,
@@ -631,13 +651,13 @@ class TestListNetwork(TestNetwork):
         # Get the command object to test
         self.cmd = network.ListNetwork(self.app, None)
 
-        self.network_client.networks.return_value = self._network
+        self.network_client.networks.return_value = self._networks
 
         self._agent = network_fakes.create_one_network_agent()
         self.network_client.get_agent.return_value = self._agent
 
         self.network_client.dhcp_agent_hosting_networks.return_value = (
-            self._network
+            self._networks
         )
 
         # TestListTagMixin
@@ -660,7 +680,31 @@ class TestListNetwork(TestNetwork):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
-    def test_list_external(self):
+    def test_network_list_pagination(self):
+        arglist = [
+            '--marker',
+            self._networks[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self._networks[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.networks.assert_called_once_with(
+            **{
+                'marker': self._networks[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
+    def test_network_list_external(self):
         arglist = [
             '--external',
         ]
@@ -681,7 +725,7 @@ class TestListNetwork(TestNetwork):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
-    def test_list_internal(self):
+    def test_network_list_internal(self):
         arglist = [
             '--internal',
         ]
@@ -717,7 +761,7 @@ class TestListNetwork(TestNetwork):
         self.assertEqual(self.columns_long, columns)
         self.assertCountEqual(self.data_long, list(data))
 
-    def test_list_name(self):
+    def test_network_list_name(self):
         test_name = "fakename"
         arglist = [
             '--name',
@@ -865,7 +909,7 @@ class TestListNetwork(TestNetwork):
         self.assertCountEqual(self.data, list(data))
 
     def test_network_list_provider_network_type(self):
-        network_type = self._network[0].provider_network_type
+        network_type = self._networks[0].provider_network_type
         arglist = [
             '--provider-network-type',
             network_type,
@@ -886,7 +930,7 @@ class TestListNetwork(TestNetwork):
         self.assertCountEqual(self.data, list(data))
 
     def test_network_list_provider_physical_network(self):
-        physical_network = self._network[0].provider_physical_network
+        physical_network = self._networks[0].provider_physical_network
         arglist = [
             '--provider-physical-network',
             physical_network,
@@ -907,7 +951,7 @@ class TestListNetwork(TestNetwork):
         self.assertCountEqual(self.data, list(data))
 
     def test_network_list_provider_segment(self):
-        segmentation_id = self._network[0].provider_segmentation_id
+        segmentation_id = self._networks[0].provider_segmentation_id
         arglist = [
             '--provider-segment',
             segmentation_id,
@@ -996,6 +1040,23 @@ class TestSetNetwork(TestNetwork):
         # Get the command object to test
         self.cmd = network.SetNetwork(self.app, None)
 
+    def test_set_with_pvlan_and_port_security_disabled(self):
+        arglist = [
+            self._network.name,
+            '--disable-port-security',
+            '--pvlan',
+        ]
+        verifylist = [
+            ('network', self._network.name),
+            ('disable_port_security', True),
+            ('pvlan', True),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
+
     def test_set_this(self):
         arglist = [
             self._network.name,
@@ -1189,6 +1250,7 @@ class TestShowNetwork(TestNetwork):
         'provider:network_type',
         'provider:physical_network',
         'provider:segmentation_id',
+        'pvlan',
         'qos_policy_id',
         'router:external',
         'shared',
@@ -1218,6 +1280,7 @@ class TestShowNetwork(TestNetwork):
         _network.provider_network_type,
         _network.provider_physical_network,
         _network.provider_segmentation_id,
+        _network.pvlan,
         _network.qos_policy_id,
         network.RouterExternalColumn(_network.is_router_external),
         _network.is_shared,
@@ -1265,7 +1328,6 @@ class TestShowNetwork(TestNetwork):
         self.network_client.find_network.assert_called_once_with(
             self._network.name, ignore_missing=False
         )
-
         self.assertEqual(set(self.columns), set(columns))
         self.assertCountEqual(self.data, data)
 

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

@@ -109,7 +109,32 @@ class TestAddRouterAgent(TestNetworkAgent):
         result = self.cmd.take_action(parsed_args)
 
         self.network_client.add_router_to_agent.assert_called_with(
-            self._agent, self._router
+            self._agent, self._router, ha_chassis_priority=None
+        )
+        self.assertIsNone(result)
+
+    def test_add_router_with_ha_chassis_priority(self):
+        arglist = [
+            self._agent.id,
+            self._router.id,
+            '--l3',
+            '--ha-chassis-priority',
+            '100',
+        ]
+        verifylist = [
+            ('l3', True),
+            ('agent_id', self._agent.id),
+            ('router', self._router.id),
+            ('ha_chassis_priority', 100),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        result = self.cmd.take_action(parsed_args)
+
+        self.network_client.add_router_to_agent.assert_called_with(
+            self._agent,
+            self._router,
+            ha_chassis_priority=100,
         )
         self.assertIsNone(result)
 
@@ -249,6 +274,30 @@ class TestListNetworkAgent(TestNetworkAgent):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
+    def test_network_agents_list_pagination(self):
+        arglist = [
+            '--marker',
+            self.network_agents[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self.network_agents[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.agents.assert_called_once_with(
+            **{
+                'marker': self.network_agents[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_network_agents_list_agent_type(self):
         arglist = [
             '--agent-type',
@@ -340,8 +389,8 @@ class TestListNetworkAgent(TestNetworkAgent):
         )
 
         # Add a column 'HA State' and corresponding data.
-        router_agent_columns = self.columns + ('HA State',)
-        router_agent_data = [d + ('',) for d in self.data]
+        router_agent_columns = (*self.columns, 'HA State')
+        router_agent_data = [(*d, '') for d in self.data]
 
         self.assertEqual(router_agent_columns, columns)
         self.assertEqual(len(router_agent_data), len(list(data)))
@@ -541,8 +590,9 @@ class TestShowNetworkAgent(TestNetworkAgent):
         'configuration',
         'created_at',
         'description',
-        'host',
+        'ha_chassis_priority',
         'ha_state',
+        'host',
         'id',
         'last_heartbeat_at',
         'resources_synced',
@@ -558,6 +608,9 @@ class TestShowNetworkAgent(TestNetworkAgent):
         format_columns.DictColumn(_network_agent.configuration),
         _network_agent.created_at,
         _network_agent.description,
+        # NOTE(ralonsoh): `ha_chassis_priority` column is still not supported
+        # by the API. See LP#2103521.
+        None,
         _network_agent.ha_state,
         _network_agent.host,
         _network_agent.id,
@@ -601,5 +654,5 @@ class TestShowNetworkAgent(TestNetworkAgent):
         self.network_client.get_agent.assert_called_once_with(
             self._network_agent.id
         )
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertEqual(len(list(self.data)), len(list(data)))

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

@@ -167,7 +167,7 @@ class TestValidateAutoAllocatedTopology(TestAutoAllocatedTopology):
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        columns, data = self.cmd.take_action(parsed_args)
+        _columns, _data = self.cmd.take_action(parsed_args)
 
         self.network_client.validate_auto_allocated_topology.assert_called_with(
             None
@@ -185,7 +185,7 @@ class TestValidateAutoAllocatedTopology(TestAutoAllocatedTopology):
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        columns, data = self.cmd.take_action(parsed_args)
+        _columns, _data = self.cmd.take_action(parsed_args)
 
         self.network_client.validate_auto_allocated_topology.assert_called_with(
             self.project.id
@@ -206,7 +206,7 @@ class TestValidateAutoAllocatedTopology(TestAutoAllocatedTopology):
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        columns, data = self.cmd.take_action(parsed_args)
+        _columns, _data = self.cmd.take_action(parsed_args)
 
         self.network_client.validate_auto_allocated_topology.assert_called_with(
             self.project.id

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

@@ -71,7 +71,7 @@ class TestAddNetworkFlavorToProfile(TestNetworkFlavor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
-        self.network_client.associate_flavor_with_service_profile.assert_called_once_with(  # noqa: E501
+        self.network_client.associate_flavor_with_service_profile.assert_called_once_with(
             self.network_flavor, self.service_profile
         )
 
@@ -335,6 +335,30 @@ class TestListNetworkFlavor(TestNetworkFlavor):
         self.assertEqual(set(self.columns), set(columns))
         self.assertEqual(self.data, list(data))
 
+    def test_network_flavor_list_pagination(self):
+        arglist = [
+            '--marker',
+            self._network_flavors[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self._network_flavors[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.flavors.assert_called_once_with(
+            **{
+                'marker': self._network_flavors[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
 
 class TestRemoveNetworkFlavorFromProfile(TestNetworkFlavor):
     network_flavor = network_fakes.create_one_network_flavor()
@@ -377,7 +401,7 @@ class TestRemoveNetworkFlavorFromProfile(TestNetworkFlavor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
-        self.network_client.disassociate_flavor_from_service_profile.assert_called_once_with(  # noqa: E501
+        self.network_client.disassociate_flavor_from_service_profile.assert_called_once_with(
             self.network_flavor, self.service_profile
         )
 

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

@@ -332,6 +332,30 @@ class TestListFlavorProfile(TestFlavorProfile):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
+    def test_network_flavor_profile_list_pagination(self):
+        arglist = [
+            '--marker',
+            self._network_flavor_profiles[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self._network_flavor_profiles[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.service_profiles.assert_called_once_with(
+            **{
+                'marker': self._network_flavor_profiles[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
 
 class TestShowFlavorProfile(TestFlavorProfile):
     # The network flavor profile to show.

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

@@ -250,6 +250,30 @@ class TestListMeter(TestMeter):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
+    def test_meter_list_pagination(self):
+        arglist = [
+            '--marker',
+            self.meter_list[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self.meter_list[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.metering_labels.assert_called_once_with(
+            **{
+                'marker': self.meter_list[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
 
 class TestShowMeter(TestMeter):
     new_meter = network_fakes.FakeNetworkMeter.create_one_meter()

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

@@ -28,7 +28,7 @@ class TestQosPolicy(network_fakes.TestNetworkV2):
     def setUp(self):
         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
 
 
 class TestCreateNetworkQosPolicy(TestQosPolicy):
@@ -280,6 +280,30 @@ class TestListNetworkQosPolicy(TestQosPolicy):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
+    def test_qos_policy_list_pagination(self):
+        arglist = [
+            '--marker',
+            self.qos_policies[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self.qos_policies[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.qos_policies.assert_called_once_with(
+            **{
+                'marker': self.qos_policies[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_qos_policy_list_share(self):
         arglist = [
             '--share',

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

@@ -226,7 +226,7 @@ class TestCreateNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.network_client.create_qos_minimum_packet_rate_rule.assert_called_once_with(  # noqa: E501
+        self.network_client.create_qos_minimum_packet_rate_rule.assert_called_once_with(
             self.qos_policy.id,
             **{
                 'min_kpps': self.new_rule.min_kpps,
@@ -613,7 +613,7 @@ class TestDeleteNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
         self.network_client.find_qos_policy.assert_called_once_with(
             self.qos_policy.id, ignore_missing=False
         )
-        self.network_client.delete_qos_minimum_packet_rate_rule.assert_called_once_with(  # noqa: E501
+        self.network_client.delete_qos_minimum_packet_rate_rule.assert_called_once_with(
             self.new_rule.id, self.qos_policy.id
         )
         self.assertIsNone(result)

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

@@ -126,3 +126,27 @@ class TestListNetworkQosRuleType(TestNetworkQosRuleType):
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
+
+    def test_qos_rule_type_list_pagination(self):
+        arglist = [
+            '--marker',
+            self.qos_rule_types[0].type,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self.qos_rule_types[0].type),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.qos_rule_types.assert_called_once_with(
+            **{
+                'marker': self.qos_rule_types[0].type,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))

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

@@ -224,7 +224,7 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        columns, data = self.cmd.take_action(parsed_args)
+        _columns, _data = self.cmd.take_action(parsed_args)
 
         self.network_client.create_rbac_policy.assert_called_with(
             **{
@@ -469,6 +469,30 @@ class TestListNetworkRABC(TestNetworkRBAC):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
+    def test_network_rbac_list_pagination(self):
+        arglist = [
+            '--marker',
+            self.rbac_policies[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self.rbac_policies[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.rbac_policies.assert_called_once_with(
+            **{
+                'marker': self.rbac_policies[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_network_rbac_list_type_opt(self):
         arglist = [
             '--type',