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

openstackclient/tests/unit/identity/v3/test_token.py

@@ -16,7 +16,7 @@ from openstackclient.identity.v3 import token
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 
-class TestTokenIssue(identity_fakes.TestIdentityv3):
+class TestTokenIssue(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 
@@ -99,7 +99,7 @@ class TestTokenIssue(identity_fakes.TestIdentityv3):
         self.assertEqual(datalist, data)
 
 
-class TestTokenRevoke(identity_fakes.TestIdentityv3):
+class TestTokenRevoke(identity_fakes.TestIdentity):
     TOKEN = 'fob'
 
     def setUp(self):

openstackclient/tests/unit/identity/v3/test_trust.py

@@ -26,7 +26,7 @@ from openstackclient.identity.v3 import trust
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 
-class TestTrustCreate(identity_fakes.TestIdentityv3):
+class TestTrustCreate(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 
@@ -109,7 +109,7 @@ class TestTrustCreate(identity_fakes.TestIdentityv3):
         self.assertEqual(datalist, data)
 
 
-class TestTrustDelete(identity_fakes.TestIdentityv3):
+class TestTrustDelete(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 
@@ -166,7 +166,7 @@ class TestTrustDelete(identity_fakes.TestIdentityv3):
         )
 
 
-class TestTrustList(identity_fakes.TestIdentityv3):
+class TestTrustList(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 
@@ -341,7 +341,7 @@ class TestTrustList(identity_fakes.TestIdentityv3):
         self.assertEqual(datalist, tuple(data))
 
 
-class TestTrustShow(identity_fakes.TestIdentityv3):
+class TestTrustShow(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 

openstackclient/tests/unit/identity/v3/test_user.py

@@ -31,7 +31,7 @@ from openstackclient.identity.v3 import user
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 
-class TestUserCreate(identity_fakes.TestIdentityv3):
+class TestUserCreate(identity_fakes.TestIdentity):
     domain = sdk_fakes.generate_fake_resource(_domain.Domain)
     project = sdk_fakes.generate_fake_resource(_project.Project)
 
@@ -777,7 +777,7 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         self.assertEqual(self.datalist, data)
 
 
-class TestUserDelete(identity_fakes.TestIdentityv3):
+class TestUserDelete(identity_fakes.TestIdentity):
     user = sdk_fakes.generate_fake_resource(_user.User)
 
     def setUp(self):
@@ -840,7 +840,7 @@ class TestUserDelete(identity_fakes.TestIdentityv3):
         )
 
 
-class TestUserList(identity_fakes.TestIdentityv3):
+class TestUserList(identity_fakes.TestIdentity):
     domain = sdk_fakes.generate_fake_resource(_domain.Domain)
     project = sdk_fakes.generate_fake_resource(_project.Project)
     user = sdk_fakes.generate_fake_resource(
@@ -1034,8 +1034,75 @@ class TestUserList(identity_fakes.TestIdentityv3):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.datalist, tuple(data))
 
+    def test_user_list_with_pagination(self):
+        arglist = [
+            '--limit',
+            '2',
+            '--marker',
+            'some-marker',
+        ]
+        verifylist = [
+            ('limit', 2),
+            ('marker', 'some-marker'),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        kwargs = {
+            'domain_id': None,
+            'limit': 2,
+            'marker': 'some-marker',
+        }
+        self.identity_sdk_client.users.assert_called_with(**kwargs)
+
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, tuple(data))
+
+    def test_user_list_with_pagination_and_group(self):
+        arglist = [
+            '--group',
+            self.group.name,
+            '--limit',
+            '5',
+        ]
+        verifylist = [
+            ('group', self.group.name),
+            ('limit', 5),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        kwargs = {
+            'domain_id': None,
+            'group': self.group.id,
+            'limit': 5,
+        }
+        self.identity_sdk_client.group_users.assert_called_with(**kwargs)
+
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, tuple(data))
+
+    def test_user_list_pagination_with_project_fails(self):
+        arglist = [
+            '--project',
+            self.project.name,
+            '--limit',
+            '2',
+        ]
+        verifylist = [
+            ('project', self.project.name),
+            ('limit', 2),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
+
 
-class TestUserSet(identity_fakes.TestIdentityv3):
+class TestUserSet(identity_fakes.TestIdentity):
     project = sdk_fakes.generate_fake_resource(_project.Project)
     domain = sdk_fakes.generate_fake_resource(_domain.Domain)
     user = sdk_fakes.generate_fake_resource(
@@ -1684,7 +1751,7 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         self.assertIsNone(result)
 
 
-class TestUserSetPassword(identity_fakes.TestIdentityv3):
+class TestUserSetPassword(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
         self.cmd = user.SetPasswordUser(self.app, None)
@@ -1763,7 +1830,7 @@ class TestUserSetPassword(identity_fakes.TestIdentityv3):
         )
 
 
-class TestUserShow(identity_fakes.TestIdentityv3):
+class TestUserShow(identity_fakes.TestIdentity):
     user = sdk_fakes.generate_fake_resource(_user.User)
 
     def setUp(self):

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

@@ -58,6 +58,8 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit import utils
 
 
+PVLAN_TYPE_COMMUNITY = 'community'
+PVLAN_COMMUNITY_NAME = 'community_1'
 RULE_TYPE_BANDWIDTH_LIMIT = 'bandwidth-limit'
 RULE_TYPE_DSCP_MARKING = 'dscp-marking'
 RULE_TYPE_MINIMUM_BANDWIDTH = 'minimum-bandwidth'
@@ -951,6 +953,7 @@ def create_one_network(attrs=None):
         'provider:network_type': 'vlan',
         'provider:physical_network': 'physnet1',
         'provider:segmentation_id': "400",
+        'pvlan': "False",
         'router:external': True,
         'availability_zones': [],
         'availability_zone_hints': [],
@@ -1211,6 +1214,8 @@ def create_one_port(attrs=None):
         'security_group_ids': [],
         'status': 'ACTIVE',
         'project_id': 'project-id-' + uuid.uuid4().hex,
+        'pvlan_type': PVLAN_TYPE_COMMUNITY,
+        'pvlan_community': PVLAN_COMMUNITY_NAME,
         'qos_network_policy_id': 'qos-policy-id-' + uuid.uuid4().hex,
         'qos_policy_id': 'qos-policy-id-' + uuid.uuid4().hex,
         'tags': [],
@@ -1309,25 +1314,6 @@ def create_network_agents(attrs=None, count=2):
     return agents
 
 
-def get_network_agents(agents=None, count=2):
-    """Get an iterable Mock object with a list of faked network agents.
-
-    If network agents list is provided, then initialize the Mock object
-    with the list. Otherwise create one.
-
-    :param List agents:
-        A list of Agent objects faking network agents
-    :param int count:
-        The number of network agents to fake
-    :return:
-        An iterable Mock object with side_effect set to a list of faked
-        network agents
-    """
-    if agents is None:
-        agents = create_network_agents(count)
-    return mock.Mock(side_effect=agents)
-
-
 def create_one_network_rbac(attrs=None):
     """Create a fake network rbac
 
@@ -1962,26 +1948,6 @@ def create_local_ip_associations(attrs=None, count=2):
     return local_ip_associations
 
 
-def get_local_ip_associations(local_ip_associations=None, count=2):
-    """Get a list of faked local ip associations
-
-    If local ip association list is provided, then initialize
-    the Mock object with the list. Otherwise create one.
-
-    :param List local_ip_associations:
-        A list of FakeResource objects faking local ip associations
-    :param int count:
-        The number of local ip associations to fake
-    :return:
-        An iterable Mock object with side_effect set to a list of faked
-        local ip associations
-    """
-    if local_ip_associations is None:
-        local_ip_associations = create_local_ip_associations(count)
-
-    return mock.Mock(side_effect=local_ip_associations)
-
-
 def create_one_ndp_proxy(attrs=None):
     """Create a fake NDP proxy.
 
@@ -2027,25 +1993,6 @@ def create_ndp_proxies(attrs=None, count=2):
     return ndp_proxies
 
 
-def get_ndp_proxies(ndp_proxies=None, count=2):
-    """Get a list of faked NDP proxies.
-
-    If ndp_proxy list is provided, then initialize the Mock object
-    with the list. Otherwise create one.
-
-    :param List ndp_proxies:
-        A list of FakeResource objects faking ndp proxy
-    :param int count:
-        The number of ndp proxy to fake
-    :return:
-        An iterable Mock object with side_effect set to a list of faked
-        ndp proxy
-    """
-    if ndp_proxies is None:
-        ndp_proxies = create_ndp_proxies(count)
-    return mock.Mock(side_effect=ndp_proxies)
-
-
 def create_one_trunk(attrs=None):
     """Create a fake trunk.
 
@@ -2096,22 +2043,3 @@ def create_trunks(attrs=None, count=2):
         trunks.append(create_one_trunk(attrs))
 
     return trunks
-
-
-def get_trunks(trunks=None, count=2):
-    """Get an iterable Mock object with a list of faked trunks.
-
-    If trunk list is provided, then initialize the Mock object
-    with the list. Otherwise create one.
-
-    :param List trunks:
-        A list of FakeResource objects faking trunks
-    :param int count:
-        The number of trunks to fake
-    :return:
-        An iterable Mock object with side_effect set to a list of faked
-        trunks
-    """
-    if trunks is None:
-        trunks = create_trunks(count)
-    return mock.Mock(side_effect=trunks)

openstackclient/tests/unit/network/v2/fwaas/test_group.py

@@ -32,6 +32,7 @@ CONVERT_MAP = {
     'egress_firewall_policy': 'egress_firewall_policy_id',
     'no_ingress_firewall_policy': 'ingress_firewall_policy_id',
     'no_egress_firewall_policy': 'egress_firewall_policy_id',
+    'positional_name': 'name',
     'project': 'project_id',
     'port': 'ports',
 }
@@ -247,7 +248,6 @@ class TestCreateFirewallGroup(TestFirewallGroup):
         self.network_client.find_port.side_effect = _mock_find
         project_id = 'my-project'
         arglist = [
-            '--name',
             name,
             '--description',
             description,
@@ -263,7 +263,7 @@ class TestCreateFirewallGroup(TestFirewallGroup):
             '--disable',
         ]
         verifylist = [
-            ('name', name),
+            ('positional_name', name),
             ('description', description),
             ('ingress_firewall_policy', ingress_policy),
             ('egress_firewall_policy', egress_policy),
@@ -279,6 +279,32 @@ class TestCreateFirewallGroup(TestFirewallGroup):
 
         self.check_results(headers, data, request)
 
+    def test_create_with_name_option_deprecated(self):
+        name = 'my-name'
+        arglist = ['--name', name]
+        verifylist = [('name', name)]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        with mock.patch.object(fwaas_group.LOG, 'warning') as mock_warning:
+            headers, _data = self.cmd.take_action(parsed_args)
+            mock_warning.assert_called_once_with(
+                'The --name option is deprecated for the "firewall group '
+                'create" command, please pass the name as a positional '
+                'argument instead.'
+            )
+        self.assertEqual(self.ordered_headers, tuple(sorted(headers)))
+
+    def test_create_with_both_positional_and_option_name(self):
+        name = 'my-name'
+        arglist = [name, '--name', 'other-name']
+        verifylist = [
+            ('positional_name', name),
+            ('name', 'other-name'),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
+
     def test_create_with_shared_and_no_share(self):
         arglist = [
             '--share',

openstackclient/tests/unit/network/v2/fwaas/test_rule.py

@@ -29,6 +29,7 @@ from openstackclient.tests.unit import utils as test_utils
 
 
 CONVERT_MAP = {
+    'positional_name': 'name',
     'project': 'project_id',
 }
 
@@ -222,10 +223,9 @@ class TestCreateFirewallRule(TestFirewallRule):
         destination_port = args.get('destination_port') or '0:65535'
         project_id = args.get('project_id') or 'my-tenant'
         arglist = [
+            name,
             '--description',
             description,
-            '--name',
-            name,
             '--protocol',
             protocol,
             '--ip-version',
@@ -247,7 +247,7 @@ class TestCreateFirewallRule(TestFirewallRule):
         ]
 
         verifylist = [
-            ('name', name),
+            ('positional_name', name),
             ('description', description),
             ('shared', True),
             ('protocol', protocol),
@@ -320,6 +320,31 @@ class TestCreateFirewallRule(TestFirewallRule):
                 verifylist,
             )
 
+    def test_create_with_name_option_deprecated(self):
+        name = 'my-name'
+        arglist = ['--name', name]
+        verifylist = [('name', name)]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        with mock.patch.object(fwaas_rule.LOG, 'warning') as mock_warning:
+            _headers, _data = self.cmd.take_action(parsed_args)
+            mock_warning.assert_called_once_with(
+                'The --name option is deprecated for the "firewall group '
+                'rule create" command, please pass the name as a positional '
+                'argument instead.'
+            )
+
+    def test_create_with_both_positional_and_option_name(self):
+        name = 'my-name'
+        arglist = [name, '--name', 'other-name']
+        verifylist = [
+            ('positional_name', name),
+            ('name', 'other-name'),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
+
 
 class TestListFirewallRule(TestFirewallRule):
     def _setup_summary(self, expect=None):

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

@@ -264,6 +264,30 @@ class TestListAddressGroup(TestAddressGroup):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
+    def test_address_group_list_pagination(self):
+        arglist = [
+            '--marker',
+            self.address_groups[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self.address_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.address_groups.assert_called_once_with(
+            **{
+                'marker': self.address_groups[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_address_group_list_name(self):
         arglist = [
             '--name',

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

@@ -280,6 +280,30 @@ class TestListAddressScope(TestAddressScope):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
+    def test_address_scope_list_pagination(self):
+        arglist = [
+            '--marker',
+            self.address_scopes[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self.address_scopes[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.address_scopes.assert_called_once_with(
+            **{
+                'marker': self.address_scopes[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_address_scope_list_name(self):
         arglist = [
             '--name',

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

@@ -700,6 +700,30 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
+    def test_floating_ip_list_pagination(self):
+        arglist = [
+            '--marker',
+            self.floating_ips[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self.floating_ips[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.ips.assert_called_once_with(
+            **{
+                'marker': self.floating_ips[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
 
 class TestShowFloatingIPNetwork(TestFloatingIPNetwork):
     def setUp(self):

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

@@ -513,6 +513,30 @@ class TestListFloatingIPPortForwarding(TestFloatingIPPortForwarding):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
+    def test_port_forwarding_list_pagination(self):
+        arglist = [
+            '--marker',
+            self.port_forwardings[0].id,
+            '--limit',
+            '1',
+            self.floating_ip.id,
+        ]
+        verifylist = [
+            ('marker', self.port_forwardings[0].id),
+            ('limit', 1),
+            ('floating_ip', self.floating_ip.id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.floating_ip_port_forwardings.assert_called_once_with(
+            self.floating_ip,
+            **{'marker': self.port_forwardings[0].id, 'limit': 1},
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_port_forwarding_list_all_options(self):
         arglist = [
             '--port',

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

@@ -73,6 +73,31 @@ class TestListIPAvailability(TestIPAvailability):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
+    def test_list_pagination(self):
+        arglist = [
+            '--marker',
+            self._ip_availability[0].network_id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self._ip_availability[0].network_id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.network_ip_availabilities.assert_called_once_with(
+            **{
+                'ip_version': 4,
+                'marker': self._ip_availability[0].network_id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_list_ip_version(self):
         arglist = [
             '--ip-version',

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):