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

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)
@@ -807,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
@@ -1064,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)
 
@@ -1108,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)
 

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

@@ -310,6 +310,28 @@ class TestListSecurityGroupNetwork(TestSecurityGroupNetwork):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
+    def test_security_groups_list_pagination(self):
+        arglist = [
+            '--marker',
+            self._security_groups[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('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,
+            **{'marker': self._security_groups[0].id, 'limit': 1},
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_security_group_list_project(self):
         project = identity_fakes.FakeProject.create_one_project()
         self.projects_mock.get.return_value = project

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

@@ -1135,6 +1135,31 @@ class TestListSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         self.assertEqual(self.expected_columns_no_group, columns)
         self.assertEqual(self.expected_data_no_group, list(data))
 
+    def test_list_with_pagination(self):
+        self._security_group_rule_tcp.port_range_min = 80
+        arglist = [
+            '--marker',
+            self._security_group_rules[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self._security_group_rules[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_group_rules.assert_called_once_with(
+            **{
+                'marker': self._security_group_rules[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.expected_columns_no_group, columns)
+        self.assertEqual(self.expected_data_no_group, list(data))
+
     def test_list_with_group(self):
         self._security_group_rule_tcp.port_range_min = 80
         arglist = [

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

@@ -790,7 +790,7 @@ class TestDeleteSubnet(TestSubnet):
 
 class TestListSubnet(TestSubnet):
     # The subnets going to be listed up.
-    _subnet = network_fakes.FakeSubnet.create_subnets(count=3)
+    _subnets = network_fakes.FakeSubnet.create_subnets(count=3)
 
     columns = (
         'ID',
@@ -812,7 +812,7 @@ class TestListSubnet(TestSubnet):
     )
 
     data = []
-    for subnet in _subnet:
+    for subnet in _subnets:
         data.append(
             (
                 subnet.id,
@@ -823,7 +823,7 @@ class TestListSubnet(TestSubnet):
         )
 
     data_long = []
-    for subnet in _subnet:
+    for subnet in _subnets:
         data_long.append(
             (
                 subnet.id,
@@ -848,7 +848,7 @@ class TestListSubnet(TestSubnet):
         # Get the command object to test
         self.cmd = subnet_v2.ListSubnet(self.app, None)
 
-        self.network_client.subnets.return_value = self._subnet
+        self.network_client.subnets.return_value = self._subnets
 
     def test_subnet_list_no_options(self):
         arglist = []
@@ -878,6 +878,30 @@ class TestListSubnet(TestSubnet):
         self.assertEqual(self.columns_long, columns)
         self.assertCountEqual(self.data_long, list(data))
 
+    def test_subnet_list_pagination(self):
+        arglist = [
+            '--marker',
+            self._subnets[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self._subnets[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.subnets.assert_called_once_with(
+            **{
+                'marker': self._subnets[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_subnet_list_ip_version(self):
         arglist = [
             '--ip-version',

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

@@ -541,6 +541,30 @@ class TestListSubnetPool(TestSubnetPool):
         self.assertEqual(self.columns_long, columns)
         self.assertCountEqual(self.data_long, list(data))
 
+    def test_subnet_pool_list_pagination(self):
+        arglist = [
+            '--marker',
+            self._subnet_pools[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self._subnet_pools[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.subnet_pools.assert_called_once_with(
+            **{
+                'marker': self._subnet_pools[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_subnet_pool_list_no_share(self):
         arglist = [
             '--no-share',

openstackclient/tests/unit/volume/v2/fakes.py

@@ -38,24 +38,14 @@ class FakeVolumeClient:
         self.management_url = kwargs['endpoint']
         self.api_version = api_versions.APIVersion('2.0')
 
-        self.availability_zones = mock.Mock()
-        self.availability_zones.resource_class = fakes.FakeResource(None, {})
         self.backups = mock.Mock()
         self.backups.resource_class = fakes.FakeResource(None, {})
-        self.capabilities = mock.Mock()
-        self.capabilities.resource_class = fakes.FakeResource(None, {})
         self.cgsnapshots = mock.Mock()
         self.cgsnapshots.resource_class = fakes.FakeResource(None, {})
         self.consistencygroups = mock.Mock()
         self.consistencygroups.resource_class = fakes.FakeResource(None, {})
-        self.limits = mock.Mock()
-        self.limits.resource_class = fakes.FakeResource(None, {})
-        self.pools = mock.Mock()
-        self.pools.resource_class = fakes.FakeResource(None, {})
         self.qos_specs = mock.Mock()
         self.qos_specs.resource_class = fakes.FakeResource(None, {})
-        self.restores = mock.Mock()
-        self.restores.resource_class = fakes.FakeResource(None, {})
         self.services = mock.Mock()
         self.services.resource_class = fakes.FakeResource(None, {})
         self.transfers = mock.Mock()
@@ -243,23 +233,6 @@ def create_one_service(attrs=None):
     return service
 
 
-def create_services(attrs=None, count=2):
-    """Create multiple fake services.
-
-    :param dict attrs:
-        A dictionary with all attributes of service
-    :param Integer count:
-        The number of services to be faked
-    :return:
-        A list of FakeResource objects
-    """
-    services = []
-    for n in range(0, count):
-        services.append(create_one_service(attrs))
-
-    return services
-
-
 def create_one_capability(attrs=None):
     """Create a fake volume backend capability.
 
@@ -400,6 +373,26 @@ def create_volumes(attrs=None, count=2):
     return volumes
 
 
+def get_volumes(volumes=None, count=2):
+    """Get an iterable MagicMock object with a list of faked volumes.
+
+    If volumes list is provided, then initialize the Mock object with the
+    list. Otherwise create one.
+
+    :param List volumes:
+        A list of FakeResource objects faking volumes
+    :param Integer count:
+        The number of volumes to be faked
+    :return
+        An iterable Mock object with side_effect set to a list of faked
+        volumes
+    """
+    if volumes is None:
+        volumes = create_volumes(count)
+
+    return mock.Mock(side_effect=volumes)
+
+
 def create_one_sdk_volume(attrs=None):
     """Create a fake volume.
 
@@ -439,43 +432,6 @@ def create_one_sdk_volume(attrs=None):
     return _volume.Volume(**volume_info)
 
 
-def create_sdk_volumes(attrs=None, count=2):
-    """Create multiple fake volumes.
-
-    :param dict attrs:
-        A dictionary with all attributes of volume
-    :param Integer count:
-        The number of volumes to be faked
-    :return:
-        A list of FakeResource objects
-    """
-    volumes = []
-    for n in range(0, count):
-        volumes.append(create_one_sdk_volume(attrs))
-
-    return volumes
-
-
-def get_volumes(volumes=None, count=2):
-    """Get an iterable MagicMock object with a list of faked volumes.
-
-    If volumes list is provided, then initialize the Mock object with the
-    list. Otherwise create one.
-
-    :param List volumes:
-        A list of FakeResource objects faking volumes
-    :param Integer count:
-        The number of volumes to be faked
-    :return
-        An iterable Mock object with side_effect set to a list of faked
-        volumes
-    """
-    if volumes is None:
-        volumes = create_volumes(count)
-
-    return mock.Mock(side_effect=volumes)
-
-
 def create_one_backup(attrs=None):
     """Create a fake backup.
 
@@ -513,44 +469,6 @@ def create_one_backup(attrs=None):
     return backup
 
 
-def create_backups(attrs=None, count=2):
-    """Create multiple fake backups.
-
-    :param dict attrs:
-        A dictionary with all attributes
-    :param int count:
-        The number of backups to fake
-    :return: A list of fake
-        openstack.block_storage.v2.backup.Backup objects
-    """
-    backups = []
-    for i in range(0, count):
-        backup = create_one_backup(attrs)
-        backups.append(backup)
-
-    return backups
-
-
-def get_backups(backups=None, count=2):
-    """Get an iterable MagicMock object with a list of faked backups.
-
-    If backups list is provided, then initialize the Mock object with the
-    list. Otherwise create one.
-
-    :param List backups:
-        A list of FakeResource objects faking backups
-    :param Integer count:
-        The number of backups to be faked
-    :return
-        An iterable Mock object with side_effect set to a list of faked
-        backups
-    """
-    if backups is None:
-        backups = create_backups(count)
-
-    return mock.Mock(side_effect=backups)
-
-
 def create_backup_record():
     """Gets a fake backup record for a given backup.
 
@@ -841,44 +759,6 @@ def create_one_snapshot(attrs=None):
     return snapshot
 
 
-def create_snapshots(attrs=None, count=2):
-    """Create multiple fake snapshots.
-
-    :param dict attrs:
-        A dictionary with all attributes
-    :param int count:
-        The number of snapshots to fake
-    :return:
-        A list of FakeResource objects faking the snapshots
-    """
-    snapshots = []
-    for i in range(0, count):
-        snapshot = create_one_snapshot(attrs)
-        snapshots.append(snapshot)
-
-    return snapshots
-
-
-def get_snapshots(snapshots=None, count=2):
-    """Get an iterable MagicMock object with a list of faked snapshots.
-
-    If snapshots list is provided, then initialize the Mock object with the
-    list. Otherwise create one.
-
-    :param List snapshots:
-        A list of FakeResource objects faking snapshots
-    :param Integer count:
-        The number of snapshots to be faked
-    :return
-        An iterable Mock object with side_effect set to a list of faked
-        snapshots
-    """
-    if snapshots is None:
-        snapshots = create_snapshots(count)
-
-    return mock.Mock(side_effect=snapshots)
-
-
 def create_one_volume_type(attrs=None, methods=None):
     """Create a fake volume type.
 

openstackclient/tests/unit/volume/v2/test_volume_backup.py

@@ -293,6 +293,7 @@ class TestBackupList(volume_fakes.TestVolume):
             all_tenants=False,
             marker=None,
             limit=None,
+            max_items=None,
         )
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
@@ -338,6 +339,7 @@ class TestBackupList(volume_fakes.TestVolume):
             all_tenants=True,
             marker=self.backups[0].id,
             limit=3,
+            max_items=None,
         )
         self.assertEqual(self.columns_long, columns)
         self.assertCountEqual(self.data_long, list(data))
@@ -386,9 +388,7 @@ class TestBackupRestore(volume_fakes.TestVolume):
 
         columns, data = self.cmd.take_action(parsed_args)
         self.volume_sdk_client.restore_backup.assert_called_with(
-            self.backup.id,
-            volume_id=None,
-            name=None,
+            self.backup.id, volume=None, name=None
         )
 
         self.assertEqual(self.columns, columns)
@@ -410,9 +410,7 @@ class TestBackupRestore(volume_fakes.TestVolume):
 
         columns, data = self.cmd.take_action(parsed_args)
         self.volume_sdk_client.restore_backup.assert_called_with(
-            self.backup.id,
-            volume_id=None,
-            name=self.backup.volume_id,
+            self.backup.id, volume=None, name=self.backup.volume_id
         )
 
         self.assertEqual(self.columns, columns)
@@ -433,9 +431,7 @@ class TestBackupRestore(volume_fakes.TestVolume):
 
         columns, data = self.cmd.take_action(parsed_args)
         self.volume_sdk_client.restore_backup.assert_called_with(
-            self.backup.id,
-            volume_id=self.volume.id,
-            name=None,
+            self.backup.id, volume=self.volume.id, name=None
         )
 
         self.assertEqual(self.columns, columns)