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

openstackclient/tests/unit/common/test_availability_zone.py

@@ -38,18 +38,15 @@ def _build_compute_az_datalist(compute_az, long_datalist=False):
     return (datalist,)
 
 
-def _build_volume_az_datalist(volume_az, long_datalist=False):
+def _build_network_az_datalist(network_az, long_datalist=False):
     datalist = ()
     if not long_datalist:
-        datalist = (
-            volume_az.name,
-            'available',
-        )
+        datalist = (network_az.name, network_az.state)
     else:
         datalist = (
-            volume_az.name,
-            'available',
-            '',
+            network_az.name,
+            network_az.state,
+            network_az.resource,
             '',
             '',
             '',
@@ -57,22 +54,12 @@ def _build_volume_az_datalist(volume_az, long_datalist=False):
     return (datalist,)
 
 
-def _build_network_az_datalist(network_az, long_datalist=False):
+def _build_volume_az_datalist(volume_az, long_datalist=False):
     datalist = ()
     if not long_datalist:
-        datalist = (
-            network_az.name,
-            network_az.state,
-        )
+        datalist = (volume_az.name, 'available')
     else:
-        datalist = (
-            network_az.name,
-            network_az.state,
-            network_az.resource,
-            '',
-            '',
-            '',
-        )
+        datalist = (volume_az.name, 'available', '', '', '', '')
     return (datalist,)
 
 
@@ -82,10 +69,6 @@ class TestAvailabilityZoneList(
     compute_fakes.FakeClientMixin,
     utils.TestCommand,
 ):
-    compute_azs = compute_fakes.create_availability_zones()
-    volume_azs = volume_fakes.create_availability_zones(count=1)
-    network_azs = network_fakes.create_availability_zones()
-
     short_columnslist = ('Zone Name', 'Zone Status')
     long_columnslist = (
         'Zone Name',
@@ -99,11 +82,14 @@ class TestAvailabilityZoneList(
     def setUp(self):
         super().setUp()
 
+        self.compute_azs = compute_fakes.create_availability_zones()
         self.compute_client.availability_zones.return_value = self.compute_azs
+        self.network_azs = network_fakes.create_availability_zones()
+        self.network_client.availability_zones.return_value = self.network_azs
+        self.volume_azs = volume_fakes.create_availability_zones(count=1)
         self.volume_sdk_client.availability_zones.return_value = (
             self.volume_azs
         )
-        self.network_client.availability_zones.return_value = self.network_azs
 
         # Get the command object to test
         self.cmd = availability_zone.ListAvailabilityZone(self.app, None)
@@ -119,17 +105,17 @@ class TestAvailabilityZoneList(
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_called_with(details=True)
-        self.volume_sdk_client.availability_zones.assert_called_with()
         self.network_client.availability_zones.assert_called_with()
+        self.volume_sdk_client.availability_zones.assert_called_with()
 
         self.assertEqual(self.short_columnslist, columns)
         datalist = ()
         for compute_az in self.compute_azs:
             datalist += _build_compute_az_datalist(compute_az)
-        for volume_az in self.volume_azs:
-            datalist += _build_volume_az_datalist(volume_az)
         for network_az in self.network_azs:
             datalist += _build_network_az_datalist(network_az)
+        for volume_az in self.volume_azs:
+            datalist += _build_volume_az_datalist(volume_az)
         self.assertEqual(datalist, tuple(data))
 
     def test_availability_zone_list_long(self):
@@ -147,8 +133,8 @@ class TestAvailabilityZoneList(
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_called_with(details=True)
-        self.volume_sdk_client.availability_zones.assert_called_with()
         self.network_client.availability_zones.assert_called_with()
+        self.volume_sdk_client.availability_zones.assert_called_with()
 
         self.assertEqual(self.long_columnslist, columns)
         datalist = ()
@@ -156,14 +142,14 @@ class TestAvailabilityZoneList(
             datalist += _build_compute_az_datalist(
                 compute_az, long_datalist=True
             )
-        for volume_az in self.volume_azs:
-            datalist += _build_volume_az_datalist(
-                volume_az, long_datalist=True
-            )
         for network_az in self.network_azs:
             datalist += _build_network_az_datalist(
                 network_az, long_datalist=True
             )
+        for volume_az in self.volume_azs:
+            datalist += _build_volume_az_datalist(
+                volume_az, long_datalist=True
+            )
         self.assertEqual(datalist, tuple(data))
 
     def test_availability_zone_list_compute(self):
@@ -181,8 +167,8 @@ class TestAvailabilityZoneList(
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_called_with(details=True)
-        self.volume_sdk_client.availability_zones.assert_not_called()
         self.network_client.availability_zones.assert_not_called()
+        self.volume_sdk_client.availability_zones.assert_not_called()
 
         self.assertEqual(self.short_columnslist, columns)
         datalist = ()
@@ -190,12 +176,12 @@ class TestAvailabilityZoneList(
             datalist += _build_compute_az_datalist(compute_az)
         self.assertEqual(datalist, tuple(data))
 
-    def test_availability_zone_list_volume(self):
+    def test_availability_zone_list_network(self):
         arglist = [
-            '--volume',
+            '--network',
         ]
         verifylist = [
-            ('volume', True),
+            ('network', True),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -205,21 +191,21 @@ class TestAvailabilityZoneList(
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_not_called()
-        self.volume_sdk_client.availability_zones.assert_called_with()
-        self.network_client.availability_zones.assert_not_called()
+        self.network_client.availability_zones.assert_called_with()
+        self.volume_sdk_client.availability_zones.assert_not_called()
 
         self.assertEqual(self.short_columnslist, columns)
         datalist = ()
-        for volume_az in self.volume_azs:
-            datalist += _build_volume_az_datalist(volume_az)
+        for network_az in self.network_azs:
+            datalist += _build_network_az_datalist(network_az)
         self.assertEqual(datalist, tuple(data))
 
-    def test_availability_zone_list_network(self):
+    def test_availability_zone_list_volume(self):
         arglist = [
-            '--network',
+            '--volume',
         ]
         verifylist = [
-            ('network', True),
+            ('volume', True),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -229,11 +215,11 @@ class TestAvailabilityZoneList(
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_not_called()
-        self.volume_sdk_client.availability_zones.assert_not_called()
-        self.network_client.availability_zones.assert_called_with()
+        self.network_client.availability_zones.assert_not_called()
+        self.volume_sdk_client.availability_zones.assert_called_with()
 
         self.assertEqual(self.short_columnslist, columns)
         datalist = ()
-        for network_az in self.network_azs:
-            datalist += _build_network_az_datalist(network_az)
+        for volume_az in self.volume_azs:
+            datalist += _build_volume_az_datalist(volume_az)
         self.assertEqual(datalist, tuple(data))

openstackclient/tests/unit/common/test_extension.py

@@ -294,7 +294,7 @@ class TestExtensionShow(TestExtension):
 
         self.cmd = extension.ShowExtension(self.app, None)
 
-        self.app.client_manager.network.find_extension.return_value = (
+        self.network_client.find_extension.return_value = (
             self.extension_details
         )
 
@@ -322,7 +322,7 @@ class TestExtensionShow(TestExtension):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.app.client_manager.network.find_extension.assert_called_with(
+        self.network_client.find_extension.assert_called_with(
             self.extension_details.alias, ignore_missing=False
         )
 

openstackclient/tests/unit/common/test_limits.py

@@ -16,7 +16,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
 
 
-class TestComputeLimits(compute_fakes.TestComputev2):
+class TestComputeLimits(compute_fakes.TestCompute):
     absolute_columns = ['Name', 'Value']
     rate_columns = ["Verb", "URI", "Value", "Remain", "Unit", "Next Available"]
 

openstackclient/tests/unit/common/test_module.py

@@ -22,42 +22,61 @@ from openstackclient.tests.unit import utils
 
 
 class FakeModule:
-    def __init__(self, name, version):
+    def __init__(self, name):
         self.name = name
-        self.__version__ = version
-        # Workaround for openstacksdk case
-        self.version = mock.Mock()
-        self.version.__version__ = version
 
 
 # NOTE(dtroyer): module_1 must match the version list filter (not --all)
 #                currently == '*client*'
 module_name_1 = 'fakeclient'
-module_version_1 = '0.1.2'
+package_name_1 = 'python-fakeclient'
+package_version_1 = '0.1.2'
 
-module_name_2 = 'zlib'
-module_version_2 = '1.1'
+# module_2 match openstacksdk
+module_name_2 = 'openstack'
+package_name_2 = 'openstacksdk'
+package_version_2 = '0.9.13'
 
-# module_3 match openstacksdk
-module_name_3 = 'openstack'
-module_version_3 = '0.9.13'
+# module_3 match sub module of fakeclient
+module_name_3 = 'fakeclient.submodule'
+package_name_3 = 'python-fakeclient'
+package_version_3 = '0.2.2'
 
-# module_4 match sub module of fakeclient
-module_name_4 = 'fakeclient.submodule'
-module_version_4 = '0.2.2'
+# module_4 match non-client package
+module_name_4 = 'requests'
+package_name_4 = 'requests'
+package_version_4 = '2.34.2'
 
 # module_5 match private module
 module_name_5 = '_private_module.lib'
-module_version_5 = '0.0.1'
 
 MODULES = {
     'sys': sys,
-    module_name_1: FakeModule(module_name_1, module_version_1),
-    module_name_2: FakeModule(module_name_2, module_version_2),
-    module_name_3: FakeModule(module_name_3, module_version_3),
-    module_name_4: FakeModule(module_name_4, module_version_4),
-    module_name_5: FakeModule(module_name_5, module_version_5),
+    module_name_1: FakeModule(module_name_1),
+    module_name_2: FakeModule(module_name_2),
+    module_name_3: FakeModule(module_name_3),
+    module_name_4: FakeModule(module_name_4),
+    module_name_5: FakeModule(module_name_5),
 }
+PACKAGES = {
+    module_name_1: [package_name_1],
+    module_name_2: [package_name_2],
+    module_name_3: [package_name_3],
+    module_name_4: [package_name_4],
+}
+
+
+def fake_metadata_version(package):
+    if package == package_name_1:
+        return package_version_1
+    if package == package_name_2:
+        return package_version_2
+    if package == package_name_3:
+        return package_version_3
+    if package == package_name_4:
+        return package_version_4
+
+    raise Exception('unrecognised package')
 
 
 class TestCommandList(utils.TestCommand):
@@ -128,11 +147,6 @@ class TestCommandList(utils.TestCommand):
         self.assertEqual(datalist, tuple(data))
 
 
-@mock.patch.dict(
-    'openstackclient.common.module.sys.modules',
-    values=MODULES,
-    clear=True,
-)
 class TestModuleList(utils.TestCommand):
     def setUp(self):
         super().setUp()
@@ -150,20 +164,31 @@ class TestModuleList(utils.TestCommand):
         # In base command class Lister in cliff, abstract method take_action()
         # returns a tuple containing the column names and an iterable
         # containing the data to be listed.
-        columns, data = self.cmd.take_action(parsed_args)
+        with (
+            mock.patch(
+                'openstackclient.common.module.importlib.metadata.packages_distributions',
+                return_value=PACKAGES,
+            ),
+            mock.patch(
+                'openstackclient.common.module.importlib.metadata.version',
+                side_effect=fake_metadata_version,
+            ),
+            mock.patch.dict(
+                'openstackclient.common.module.sys.modules',
+                values=MODULES,
+                clear=True,
+            ),
+        ):
+            columns, data = self.cmd.take_action(parsed_args)
 
         # Output xxxclient and openstacksdk, but not regular module, like: zlib
         self.assertIn(module_name_1, columns)
-        self.assertIn(module_version_1, data)
-        self.assertNotIn(module_name_2, columns)
-        self.assertNotIn(module_version_2, data)
-        self.assertIn(module_name_3, columns)
-        self.assertIn(module_version_3, data)
+        self.assertIn(package_version_1, data)
+        self.assertIn(module_name_2, columns)
+        self.assertIn(package_version_2, data)
         # Filter sub and private modules
-        self.assertNotIn(module_name_4, columns)
-        self.assertNotIn(module_version_4, data)
+        self.assertNotIn(module_name_3, columns)
         self.assertNotIn(module_name_5, columns)
-        self.assertNotIn(module_version_5, data)
 
     def test_module_list_all(self):
         arglist = [
@@ -177,17 +202,30 @@ class TestModuleList(utils.TestCommand):
         # In base command class Lister in cliff, abstract method take_action()
         # returns a tuple containing the column names and an iterable
         # containing the data to be listed.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # Output xxxclient, openstacksdk and regular module, like: zlib
+        with (
+            mock.patch(
+                'openstackclient.common.module.importlib.metadata.packages_distributions',
+                return_value=PACKAGES,
+            ),
+            mock.patch(
+                'openstackclient.common.module.importlib.metadata.version',
+                side_effect=fake_metadata_version,
+            ),
+            mock.patch.dict(
+                'openstackclient.common.module.sys.modules',
+                values=MODULES,
+                clear=True,
+            ),
+        ):
+            columns, data = self.cmd.take_action(parsed_args)
+
+        # Output xxxclient, openstacksdk and regular modules like requests
         self.assertIn(module_name_1, columns)
-        self.assertIn(module_version_1, data)
+        self.assertIn(package_version_1, data)
         self.assertIn(module_name_2, columns)
-        self.assertIn(module_version_2, data)
-        self.assertIn(module_name_3, columns)
-        self.assertIn(module_version_3, data)
+        self.assertIn(package_version_2, data)
+        self.assertIn(module_name_4, columns)
+        self.assertIn(package_version_4, data)
         # Filter sub and private modules
-        self.assertNotIn(module_name_4, columns)
-        self.assertNotIn(module_version_4, data)
+        self.assertNotIn(module_name_3, columns)
         self.assertNotIn(module_name_5, columns)
-        self.assertNotIn(module_version_5, data)

openstackclient/tests/unit/common/test_project_cleanup.py

@@ -17,7 +17,9 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit import utils as test_utils
 
 
-class TestProjectCleanup(test_utils.TestCommand):
+class TestProjectCleanup(
+    identity_fakes.FakeClientMixin, test_utils.TestCommand
+):
     project = identity_fakes.FakeProject.create_one_project()
 
     def setUp(self):

openstackclient/tests/unit/common/test_quota.py

@@ -68,6 +68,7 @@ class TestQuotaList(TestQuota):
         'Networks',
         'Ports',
         'RBAC Policies',
+        'Router Routes',
         'Routers',
         'Security Groups',
         'Security Group Rules',
@@ -80,6 +81,7 @@ class TestQuotaList(TestQuota):
         'Backups',
         'Backup Gigabytes',
         'Gigabytes',
+        'Groups',
         'Per Volume Gigabytes',
         'Snapshots',
         'Volumes',
@@ -133,6 +135,10 @@ class TestQuotaList(TestQuota):
             self.network_quotas[0].networks,
             self.network_quotas[0].ports,
             self.network_quotas[0].rbac_policies,
+            # TODO(ralonsoh): restore once [1] is merged and released.
+            # [1]https://review.opendev.org/c/openstack/openstacksdk/+/991063
+            # self.network_quotas[0].router_routes,
+            getattr(self.network_quotas[0], 'router_routes', ''),
             self.network_quotas[0].routers,
             self.network_quotas[0].security_groups,
             self.network_quotas[0].security_group_rules,
@@ -156,6 +162,7 @@ class TestQuotaList(TestQuota):
             self.volume_quotas[0].backups,
             self.volume_quotas[0].backup_gigabytes,
             self.volume_quotas[0].gigabytes,
+            self.volume_quotas[0].groups,
             self.volume_quotas[0].per_volume_gigabytes,
             self.volume_quotas[0].snapshots,
             self.volume_quotas[0].volumes,
@@ -382,8 +389,6 @@ class TestQuotaSet(TestQuota):
         self.cmd = quota.SetQuota(self.app, None)
 
     def test_quota_set(self):
-        floating_ip_num = 100
-        fix_ip_num = 100
         injected_file_num = 100
         injected_file_size_num = 10240
         injected_path_size_num = 255
@@ -392,16 +397,10 @@ class TestQuotaSet(TestQuota):
         ram_num = 51200
         instance_num = 10
         property_num = 128
-        secgroup_rule_num = 20
-        secgroup_num = 10
         servgroup_num = 10
         servgroup_members_num = 10
 
         arglist = [
-            '--floating-ips',
-            str(floating_ip_num),
-            '--fixed-ips',
-            str(fix_ip_num),
             '--injected-files',
             str(injected_file_num),
             '--injected-file-size',
@@ -418,10 +417,6 @@ class TestQuotaSet(TestQuota):
             str(instance_num),
             '--properties',
             str(property_num),
-            '--secgroup-rules',
-            str(secgroup_rule_num),
-            '--secgroups',
-            str(secgroup_num),
             '--server-groups',
             str(servgroup_num),
             '--server-group-members',
@@ -429,8 +424,6 @@ class TestQuotaSet(TestQuota):
             self.projects[0].name,
         ]
         verifylist = [
-            ('floating_ips', floating_ip_num),
-            ('fixed_ips', fix_ip_num),
             ('injected_files', injected_file_num),
             (
                 'injected_file_content_bytes',
@@ -442,8 +435,6 @@ class TestQuotaSet(TestQuota):
             ('ram', ram_num),
             ('instances', instance_num),
             ('metadata_items', property_num),
-            ('security_group_rules', secgroup_rule_num),
-            ('security_groups', secgroup_num),
             ('server_groups', servgroup_num),
             ('server_group_members', servgroup_members_num),
             ('force', False),
@@ -455,18 +446,14 @@ class TestQuotaSet(TestQuota):
         result = self.cmd.take_action(parsed_args)
 
         kwargs = {
-            'floating_ips': floating_ip_num,
-            'fixed_ips': fix_ip_num,
             'injected_files': injected_file_num,
-            'injected_file_content_bytes': injected_file_size_num,  # noqa: E501
+            'injected_file_content_bytes': injected_file_size_num,
             'injected_file_path_bytes': injected_path_size_num,
             'key_pairs': key_pair_num,
             'cores': core_num,
             'ram': ram_num,
             'instances': instance_num,
             'metadata_items': property_num,
-            'security_group_rules': secgroup_rule_num,
-            'security_groups': secgroup_num,
             'server_groups': servgroup_num,
             'server_group_members': servgroup_members_num,
         }
@@ -729,7 +716,7 @@ class TestQuotaSet(TestQuota):
 
         kwargs_compute = {
             'injected_files': injected_file_num,
-            'injected_file_content_bytes': injected_file_size_num,  # noqa: E501
+            'injected_file_content_bytes': injected_file_size_num,
             'injected_file_path_bytes': injected_path_size_num,
             'key_pairs': key_pair_num,
             'cores': core_num,
@@ -827,7 +814,7 @@ class TestQuotaSet(TestQuota):
 
         kwargs_compute = {
             'injected_files': injected_file_num,
-            'injected_file_content_bytes': injected_file_size_num,  # noqa: E501
+            'injected_file_content_bytes': injected_file_size_num,
             'injected_file_path_bytes': injected_path_size_num,
             'key_pairs': key_pair_num,
             'cores': core_num,
@@ -966,6 +953,7 @@ class TestQuotaShow(TestQuota):
         'pools': {'limit': 0, 'reserved': 0, 'used': 0},
         'ports': {'limit': 0, 'reserved': 0, 'used': 0},
         'rbac_policies': {'limit': 0, 'reserved': 0, 'used': 0},
+        'router_routes': {'limit': 0, 'reserved': 0, 'used': 0},
         'routers': {'limit': 0, 'reserved': 0, 'used': 0},
         'security_group_rules': {'limit': 0, 'reserved': 0, 'used': 0},
         'security_groups': {'limit': 0, 'reserved': 0, 'used': 0},
@@ -1155,7 +1143,7 @@ class TestQuotaShow(TestQuota):
 
         self.assertEqual(
             [
-                ('floating-ips', 30, 7, 20),
+                ('floating_ips', 30, 7, 20),
                 ('health_monitors', 0, 0, 0),
                 ('l7_policies', 0, 0, 0),
                 ('listeners', 0, 0, 0),
@@ -1164,9 +1152,10 @@ class TestQuotaShow(TestQuota):
                 ('pools', 0, 0, 0),
                 ('ports', 0, 0, 0),
                 ('rbac_policies', 0, 0, 0),
+                ('router_routes', 0, 0, 0),
                 ('routers', 0, 0, 0),
-                ('secgroup-rules', 9, 5, 7),
-                ('secgroups', 0, 0, 0),
+                ('security_group_rules', 9, 5, 7),
+                ('security_groups', 0, 0, 0),
                 ('subnet_pools', 0, 0, 0),
                 ('subnets', 0, 0, 0),
             ],