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

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

@@ -250,7 +250,7 @@ class TestListNetworkSegment(TestNetworkSegment):
         'Network Type',
         'Segment',
     )
-    columns_long = columns + ('Physical Network',)
+    columns_long = (*columns, 'Physical Network')
 
     data = []
     for _network_segment in _network_segments:
@@ -333,6 +333,30 @@ class TestListNetworkSegment(TestNetworkSegment):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
+    def test_list_pagination(self):
+        arglist = [
+            '--marker',
+            self._network_segments[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self._network_segments[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.segments.assert_called_once_with(
+            **{
+                'marker': self._network_segments[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
 
 class TestSetNetworkSegment(TestNetworkSegment):
     # The network segment to show.

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

@@ -333,7 +333,7 @@ class TestCreateNetworkSegmentRange(TestNetworkSegmentRange):
                 'shared': self._network_segment_range.shared,
                 'project_id': mock.ANY,
                 'network_type': self._network_segment_range.network_type,
-                'physical_network': self._network_segment_range.physical_network,  # noqa: E501
+                'physical_network': self._network_segment_range.physical_network,
                 'minimum': self._network_segment_range.minimum,
                 'maximum': self._network_segment_range.maximum,
                 'name': self._network_segment_range.name,
@@ -450,10 +450,7 @@ class TestListNetworkSegmentRange(TestNetworkSegmentRange):
         'Minimum ID',
         'Maximum ID',
     )
-    columns_long = columns + (
-        'Used',
-        'Available',
-    )
+    columns_long = (*columns, 'Used', 'Available')
 
     data = []
     for _network_segment_range in _network_segment_ranges:
@@ -518,6 +515,30 @@ class TestListNetworkSegmentRange(TestNetworkSegmentRange):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
+    def test_list_pagination(self):
+        arglist = [
+            '--marker',
+            self._network_segment_ranges[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self._network_segment_ranges[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.network_segment_ranges.assert_called_once_with(
+            **{
+                'marker': self._network_segment_ranges[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_list_long(self):
         arglist = [
             '--long',
@@ -544,11 +565,11 @@ class TestSetNetworkSegmentRange(TestNetworkSegmentRange):
     # The network segment range updated.
     minimum_updated = _network_segment_range.minimum - 5
     maximum_updated = _network_segment_range.maximum + 5
-    available_updated = (
-        list(range(minimum_updated, 104))
-        + [105]
-        + list(range(107, maximum_updated + 1))
-    )
+    available_updated = [
+        *list(range(minimum_updated, 104)),
+        105,
+        *list(range(107, maximum_updated + 1)),
+    ]
     _network_segment_range_updated = (
         network_fakes.create_one_network_segment_range(
             attrs={

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

@@ -468,7 +468,7 @@ class TestListNetworkTrunk(TestNetworkTrunk):
     )
 
     columns = ('ID', 'Name', 'Parent Port', 'Description')
-    columns_long = columns + ('Status', 'State', 'Created At', 'Updated At')
+    columns_long = (*columns, 'Status', 'State', 'Created At', 'Updated At')
     data = []
     for t in new_trunks:
         data.append((t['id'], t['name'], t['port_id'], t['description']))

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

@@ -72,6 +72,8 @@ class TestPort(network_fakes.TestNetworkV2):
             'port_security_enabled',
             'project_id',
             'propagate_uplink_status',
+            'pvlan_type',
+            'pvlan_community',
             'resource_request',
             'revision_number',
             'qos_network_policy_id',
@@ -114,6 +116,8 @@ class TestPort(network_fakes.TestNetworkV2):
             fake_port.is_port_security_enabled,
             fake_port.project_id,
             fake_port.propagate_uplink_status,
+            fake_port.pvlan_type,
+            fake_port.pvlan_community,
             fake_port.resource_request,
             fake_port.revision_number,
             fake_port.qos_network_policy_id,
@@ -207,6 +211,10 @@ class TestCreatePort(TestPort):
             '--dns-name',
             '8.8.8.8',
             'test-port',
+            '--pvlan-type',
+            network_fakes.PVLAN_TYPE_COMMUNITY,
+            '--pvlan-community',
+            network_fakes.PVLAN_COMMUNITY_NAME,
         ]
         verifylist = [
             ('mac_address', 'aa:aa:aa:aa:aa:aa'),
@@ -224,6 +232,8 @@ class TestCreatePort(TestPort):
             ('dns_domain', 'example.org'),
             ('dns_name', '8.8.8.8'),
             ('name', 'test-port'),
+            ('pvlan_type', network_fakes.PVLAN_TYPE_COMMUNITY),
+            ('pvlan_community', network_fakes.PVLAN_COMMUNITY_NAME),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -247,6 +257,8 @@ class TestCreatePort(TestPort):
                 'network_id': self._port.network_id,
                 'dns_domain': 'example.org',
                 'dns_name': '8.8.8.8',
+                'pvlan_type': network_fakes.PVLAN_TYPE_COMMUNITY,
+                'pvlan_community': network_fakes.PVLAN_COMMUNITY_NAME,
                 'name': 'test-port',
             }
         )
@@ -1156,6 +1168,78 @@ class TestCreatePort(TestPort):
     def test_create_with_trusted_false(self):
         self._test_create_with_trusted_field(False)
 
+    def test_create_pvlan_community_without_name(self):
+        arglist = [
+            '--network',
+            self._port.network_id,
+            '--pvlan-type',
+            'community',
+            'test-port',
+        ]
+        verifylist = [
+            ('network', self._port.network_id),
+            ('enable', True),
+            ('pvlan_type', 'community'),
+            ('name', 'test-port'),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+
+    def test_create_pvlan_with_port_security_disabled(self):
+        arglist = [
+            '--network',
+            self._port.network_id,
+            '--disable-port-security',
+            '--pvlan-type',
+            'isolated',
+            'test-port',
+        ]
+        verifylist = [
+            ('network', self._port.network_id),
+            ('enable', True),
+            ('disable_port_security', True),
+            ('pvlan_type', 'isolated'),
+            ('name', 'test-port'),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+
+    def test_create_pvlan_on_non_pvlan_network(self):
+        fake_net = network_fakes.create_one_network(
+            {'id': self._port.network_id, 'pvlan': False}
+        )
+        self.network_client.find_network.return_value = fake_net
+        arglist = [
+            '--network',
+            self._port.network_id,
+            '--pvlan-type',
+            'isolated',
+            'test-port',
+        ]
+        verifylist = [
+            ('network', self._port.network_id),
+            ('enable', True),
+            ('pvlan_type', 'isolated'),
+            ('name', 'test-port'),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+
 
 class TestDeletePort(TestPort):
     # Ports to delete.
@@ -1349,6 +1433,28 @@ class TestListPort(compute_fakes.FakeClientMixin, TestPort):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
+    def test_port_list_pagination(self):
+        arglist = [
+            '--marker',
+            self._ports[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self._ports[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.ports.assert_called_once_with(
+            fields=LIST_FIELDS_TO_RETRIEVE,
+            **{'marker': self._ports[0].id, 'limit': 1},
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_port_list_router_opt(self):
         arglist = [
             '--router',
@@ -2653,6 +2759,66 @@ class TestSetPort(TestPort):
     def test_set_uplink_status_propagation_false(self):
         self._test_set_uplink_status_propagation(False)
 
+    def test_set_pvlan_community_without_name(self):
+        arglist = [
+            '--pvlan-type',
+            'community',
+            self._port.name,
+        ]
+        verifylist = [
+            ('pvlan_type', 'community'),
+            ('port', self._port.name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+
+    def test_set_pvlan_with_port_security_disabled(self):
+        arglist = [
+            '--disable-port-security',
+            '--pvlan-type',
+            'isolated',
+            self._port.name,
+        ]
+        verifylist = [
+            ('disable_port_security', True),
+            ('pvlan_type', 'isolated'),
+            ('port', self._port.name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+
+    def test_set_pvlan_on_non_pvlan_network(self):
+        fake_net = network_fakes.create_one_network(
+            {'id': self._port.network_id, 'pvlan': False}
+        )
+        self.network_client.find_network.return_value = fake_net
+        arglist = [
+            '--pvlan-type',
+            'isolated',
+            self._port.name,
+        ]
+        verifylist = [
+            ('pvlan_type', 'isolated'),
+            ('port', self._port.name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+
 
 class TestShowPort(TestPort):
     # The port to show.

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

@@ -70,10 +70,7 @@ class TestAddPortToRouter(TestRouter):
         result = self.cmd.take_action(parsed_args)
 
         self.network_client.add_interface_to_router.assert_called_with(
-            self._router,
-            **{
-                'port_id': self._router.port,
-            },
+            self._router, port=self._router.port
         )
         self.assertIsNone(result)
 
@@ -117,7 +114,7 @@ class TestAddSubnetToRouter(TestRouter):
 
         result = self.cmd.take_action(parsed_args)
         self.network_client.add_interface_to_router.assert_called_with(
-            self._router, **{'subnet_id': self._router.subnet}
+            self._router, subnet=self._router.subnet
         )
 
         self.assertIsNone(result)
@@ -711,17 +708,14 @@ class TestListRouter(TestRouter):
         'Distributed',
         'HA',
     )
-    columns_long = columns + (
+    columns_long = (
+        *columns,
         'Routes',
         'External gateway info',
         'Availability zones',
         'Tags',
     )
-    columns_long_no_az = columns + (
-        'Routes',
-        'External gateway info',
-        'Tags',
-    )
+    columns_long_no_az = (*columns, 'Routes', 'External gateway info', 'Tags')
 
     data = []
     for r in routers:
@@ -810,6 +804,30 @@ class TestListRouter(TestRouter):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
+    def test_router_list_pagination(self):
+        arglist = [
+            '--marker',
+            self.routers[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self.routers[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.routers.assert_called_once_with(
+            **{
+                'marker': self.routers[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_router_list_no_ha_no_distributed(self):
         _routers = network_fakes.create_routers(
             {'ha': None, 'distributed': None}, count=3
@@ -824,7 +842,7 @@ class TestListRouter(TestRouter):
         with mock.patch.object(
             self.network_client, "routers", return_value=_routers
         ):
-            columns, data = self.cmd.take_action(parsed_args)
+            columns, _data = self.cmd.take_action(parsed_args)
 
         self.assertNotIn("is_distributed", columns)
         self.assertNotIn("is_ha", columns)
@@ -1067,7 +1085,7 @@ class TestRemovePortFromRouter(TestRouter):
         result = self.cmd.take_action(parsed_args)
 
         self.network_client.remove_interface_from_router.assert_called_with(
-            self._router, **{'port_id': self._router.port}
+            self._router, port=self._router.port
         )
         self.assertIsNone(result)
 
@@ -1111,7 +1129,7 @@ class TestRemoveSubnetFromRouter(TestRouter):
 
         result = self.cmd.take_action(parsed_args)
         self.network_client.remove_interface_from_router.assert_called_with(
-            self._router, **{'subnet_id': self._router.subnet}
+            self._router, subnet=self._router.subnet
         )
         self.assertIsNone(result)
 
@@ -1900,7 +1918,7 @@ class TestShowRouter(TestRouter):
         with mock.patch.object(
             self.network_client, "find_router", return_value=_router
         ):
-            columns, data = self.cmd.take_action(parsed_args)
+            columns, _data = self.cmd.take_action(parsed_args)
 
         self.assertNotIn("is_distributed", columns)
         self.assertNotIn("is_ha", columns)
@@ -1922,7 +1940,9 @@ class TestShowRouter(TestRouter):
             columns, data = self.cmd.take_action(parsed_args)
 
         self.assertIn("routes", columns)
-        self.assertIsNone(list(data)[columns.index('routes')].human_readable())
+        self.assertEqual(
+            list(data)[columns.index('routes')].human_readable(), ''
+        )
 
 
 class TestUnsetRouter(TestRouter):

openstackclient/tests/unit/network/v2/{test_security_group_network.py → test_security_group.py}

@@ -299,9 +299,7 @@ class TestListSecurityGroupNetwork(TestSecurityGroupNetwork):
 
     def test_security_group_list_no_options(self):
         arglist = []
-        verifylist = [
-            ('all_projects', False),
-        ]
+        verifylist = []
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
@@ -312,22 +310,27 @@ class TestListSecurityGroupNetwork(TestSecurityGroupNetwork):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
-    def test_security_group_list_all_projects(self):
+    def test_security_groups_list_pagination(self):
         arglist = [
-            '--all-projects',
+            '--marker',
+            self._security_groups[0].id,
+            '--limit',
+            '1',
         ]
         verifylist = [
-            ('all_projects', True),
+            ('marker', self._security_groups[0].id),
+            ('limit', 1),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network_client.security_groups.assert_called_once_with(
-            fields=security_group.ListSecurityGroup.FIELDS_TO_RETRIEVE
+            fields=security_group.ListSecurityGroup.FIELDS_TO_RETRIEVE,
+            **{'marker': self._security_groups[0].id, 'limit': 1},
         )
         self.assertEqual(self.columns, columns)
-        self.assertCountEqual(self.data, list(data))
+        self.assertEqual(self.data, list(data))
 
     def test_security_group_list_project(self):
         project = identity_fakes.FakeProject.create_one_project()

openstackclient/tests/unit/network/v2/{test_security_group_rule_network.py → test_security_group_rule.py}

@@ -171,22 +171,6 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         parsed_args = self.check_parser(self.cmd, arglist, [])
         self.assertEqual('IPv6', parsed_args.ethertype)
 
-    def test_create_all_protocol_options(self):
-        arglist = [
-            '--protocol',
-            'tcp',
-            '--proto',
-            'tcp',
-            self._security_group.id,
-        ]
-        self.assertRaises(
-            tests_utils.ParserException,
-            self.check_parser,
-            self.cmd,
-            arglist,
-            [],
-        )
-
     def test_create_all_port_range_options(self):
         arglist = [
             '--dst-port',
@@ -251,7 +235,7 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         self.assertEqual(self.expected_columns, columns)
         self.assertEqual(self.expected_data, data)
 
-    def test_create_proto_option(self):
+    def test_create_protocol_option(self):
         self._setup_security_group_rule(
             {
                 'protocol': 'icmp',
@@ -259,15 +243,14 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
             }
         )
         arglist = [
-            '--proto',
+            '--protocol',
             self._security_group_rule.protocol,
             '--remote-ip',
             self._security_group_rule.remote_ip_prefix,
             self._security_group.id,
         ]
         verifylist = [
-            ('proto', self._security_group_rule.protocol),
-            ('protocol', None),
+            ('protocol', self._security_group_rule.protocol),
             ('remote_ip', self._security_group_rule.remote_ip_prefix),
             ('group', self._security_group.id),
         ]
@@ -295,15 +278,14 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
             }
         )
         arglist = [
-            '--proto',
+            '--protocol',
             'any',
             '--remote-ip',
             self._security_group_rule.remote_ip_prefix,
             self._security_group.id,
         ]
         verifylist = [
-            ('proto', 'any'),
-            ('protocol', None),
+            ('protocol', 'any'),
             ('remote_ip', self._security_group_rule.remote_ip_prefix),
             ('group', self._security_group.id),
         ]
@@ -1153,13 +1135,17 @@ class TestListSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         self.assertEqual(self.expected_columns_no_group, columns)
         self.assertEqual(self.expected_data_no_group, list(data))
 
-    def test_list_with_group(self):
+    def test_list_with_pagination(self):
         self._security_group_rule_tcp.port_range_min = 80
         arglist = [
-            self._security_group.id,
+            '--marker',
+            self._security_group_rules[0].id,
+            '--limit',
+            '1',
         ]
         verifylist = [
-            ('group', self._security_group.id),
+            ('marker', self._security_group_rules[0].id),
+            ('limit', 1),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1167,27 +1153,32 @@ class TestListSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
 
         self.network_client.security_group_rules.assert_called_once_with(
             **{
-                'security_group_id': self._security_group.id,
+                'marker': self._security_group_rules[0].id,
+                'limit': 1,
             }
         )
-        self.assertEqual(self.expected_columns_with_group, columns)
-        self.assertEqual(self.expected_data_with_group, list(data))
+        self.assertEqual(self.expected_columns_no_group, columns)
+        self.assertEqual(self.expected_data_no_group, list(data))
 
-    def test_list_with_ignored_options(self):
+    def test_list_with_group(self):
         self._security_group_rule_tcp.port_range_min = 80
         arglist = [
-            '--all-projects',
+            self._security_group.id,
         ]
         verifylist = [
-            ('all_projects', True),
+            ('group', self._security_group.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.network_client.security_group_rules.assert_called_once_with(**{})
-        self.assertEqual(self.expected_columns_no_group, columns)
-        self.assertEqual(self.expected_data_no_group, list(data))
+        self.network_client.security_group_rules.assert_called_once_with(
+            **{
+                'security_group_id': self._security_group.id,
+            }
+        )
+        self.assertEqual(self.expected_columns_with_group, columns)
+        self.assertEqual(self.expected_data_with_group, list(data))
 
     def test_list_with_protocol(self):
         self._security_group_rule_tcp.port_range_min = 80
@@ -1265,7 +1256,7 @@ class TestListSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        filters = {'tenant_id': project.id, 'project_id': project.id}
+        filters = {'project_id': project.id}
 
         self.network_client.security_group_rules.assert_called_once_with(
             **filters
@@ -1291,7 +1282,7 @@ class TestListSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        filters = {'tenant_id': project.id, 'project_id': project.id}
+        filters = {'project_id': project.id}
 
         self.network_client.security_group_rules.assert_called_once_with(
             **filters