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

openstackclient/tests/functional/volume/v3/common.py

@@ -10,6 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
+
 import fixtures
 
 from openstackclient.tests.functional.volume import base
@@ -18,6 +20,8 @@ from openstackclient.tests.functional.volume import base
 class BaseVolumeTests(base.BaseVolumeTests):
     """Base class for Volume functional tests."""
 
+    haz_volume_v3: ClassVar[bool]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()

openstackclient/tests/functional/volume/v3/test_volume_snapshot.py

@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
 import uuid
 
 from openstackclient.tests.functional.volume.v3 import common
@@ -18,24 +19,27 @@ from openstackclient.tests.functional.volume.v3 import common
 class VolumeSnapshotTests(common.BaseVolumeTests):
     """Functional tests for volume snapshot."""
 
-    VOLLY = uuid.uuid4().hex
+    VOLUME_NAME = uuid.uuid4().hex
+    VOLUME_ID: ClassVar[str]
 
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
         # create a test volume used by all snapshot tests
         cmd_output = cls.openstack(
-            'volume create ' + '--size 1 ' + cls.VOLLY,
+            'volume create ' + '--size 1 ' + cls.VOLUME_NAME,
             parse_output=True,
         )
-        cls.wait_for_status('volume', cls.VOLLY, 'available')
+        cls.wait_for_status('volume', cls.VOLUME_NAME, 'available')
         cls.VOLUME_ID = cmd_output['id']
 
     @classmethod
     def tearDownClass(cls):
         try:
-            cls.wait_for_status('volume', cls.VOLLY, 'available')
-            raw_output = cls.openstack('volume delete --force ' + cls.VOLLY)
+            cls.wait_for_status('volume', cls.VOLUME_NAME, 'available')
+            raw_output = cls.openstack(
+                'volume delete --force ' + cls.VOLUME_NAME
+            )
             cls.assertOutput('', raw_output)
         finally:
             super().tearDownClass()
@@ -47,7 +51,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
         cmd_output = self.openstack(
             'volume snapshot create '
             + '--volume '
-            + self.VOLLY
+            + self.VOLUME_NAME
             + ' --description aaaa '
             + '--property Alpha=a '
             + name,
@@ -83,7 +87,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
 
         # list volume snapshot --volume
         cmd_output = self.openstack(
-            'volume snapshot list ' + '--volume ' + self.VOLLY,
+            'volume snapshot list ' + '--volume ' + self.VOLUME_NAME,
             parse_output=True,
         )
         names = [x["Name"] for x in cmd_output]

openstackclient/tests/functional/volume/v3/test_volume_type.py

@@ -173,9 +173,9 @@ class VolumeTypeTests(common.BaseVolumeTests):
             'volume type list --encryption-type',
             parse_output=True,
         )
-        encryption_output = [
+        encryption_output = next(
             t['Encryption'] for t in cmd_output if t['Name'] == encryption_type
-        ][0]
+        )
         expected = {
             'provider': 'LuksEncryptor',
             'cipher': 'aes-xts-plain64',

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_module.py

@@ -128,11 +128,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,7 +145,12 @@ 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.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)
@@ -177,7 +177,12 @@ 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.dict(
+            'openstackclient.common.module.sys.modules',
+            values=MODULES,
+            clear=True,
+        ):
+            columns, data = self.cmd.take_action(parsed_args)
 
         # Output xxxclient, openstacksdk and regular module, like: zlib
         self.assertIn(module_name_1, columns)

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

@@ -382,8 +382,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 +390,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 +410,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 +417,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 +428,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 +439,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 +709,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 +807,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,
@@ -1155,7 +1135,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),
@@ -1165,8 +1145,8 @@ class TestQuotaShow(TestQuota):
                 ('ports', 0, 0, 0),
                 ('rbac_policies', 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),
             ],

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

@@ -29,7 +29,9 @@ from openstack.compute.v2 import server as _server
 from openstack.compute.v2 import server_action as _server_action
 from openstack.compute.v2 import server_interface as _server_interface
 from openstack.compute.v2 import server_migration as _server_migration
+from openstack.compute.v2 import server_share as _server_share
 from openstack.compute.v2 import volume_attachment as _volume_attachment
+from openstack.test import fakes as sdk_fakes
 
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit.image.v2 import fakes as image_fakes
@@ -788,6 +790,29 @@ def create_volume_attachments(attrs=None, count=2):
     return volume_attachments
 
 
+def create_one_share(attrs=None):
+    """Create a fake share attachment.
+
+    :param dict attrs: A dictionary with all attributes
+    :return: A fake openstack.compute.v2.server_share.ShareMapping
+        object
+    """
+    return sdk_fakes.generate_fake_resource(
+        _server_share.ShareMapping, **(attrs or {})
+    )
+
+
+def create_shares(attrs=None, count=2):
+    """Create multiple fake share attachments.
+
+    :param dict attrs: A dictionary with all attributes
+    :param int count: The number of share attachments to fake
+    :return: A list of fake
+        openstack.compute.v2.server_share.ShareMapping objects
+    """
+    return [create_one_share(attrs) for _ in range(count)]
+
+
 def create_one_server_interface(attrs=None):
     """Create a fake ServerInterface.
 

openstackclient/tests/unit/compute/v2/test_flavor.py

@@ -106,7 +106,6 @@ class TestFlavorCreate(TestFlavor):
             'id': None,
             'ephemeral': 0,
             'swap': 0,
-            'rxtx_factor': 1.0,
             'is_public': True,
         }
 
@@ -395,6 +394,32 @@ class TestFlavorCreate(TestFlavor):
             exceptions.CommandError, self.cmd.take_action, parsed_args
         )
 
+    def test_flavor_create_with_rxtx_factor_post_v2102(self):
+        self.set_compute_api_version('2.102')
+
+        arglist = [
+            '--id',
+            self.flavor.id,
+            '--ram',
+            str(self.flavor.ram),
+            '--vcpus',
+            str(self.flavor.vcpus),
+            '--rxtx-factor',
+            '1.0',
+            self.flavor.name,
+        ]
+        verifylist = [
+            ('ram', self.flavor.ram),
+            ('vcpus', self.flavor.vcpus),
+            ('rxtx_factor', 1.0),
+            ('name', self.flavor.name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
+
 
 class TestFlavorDelete(TestFlavor):
     def setUp(self):
@@ -494,7 +519,8 @@ class TestFlavorList(TestFlavor):
             'VCPUs',
             'Is Public',
         )
-        self.columns_long = self.columns + (
+        self.columns_long = (
+            *self.columns,
             'Swap',
             'RXTX Factor',
             'Properties',

openstackclient/tests/unit/compute/v2/test_keypair.py

@@ -90,8 +90,8 @@ class TestKeypairCreate(TestKeypair):
             public_key=mock_generate.return_value.public_key,
         )
 
-        self.assertEqual({}, columns)
-        self.assertEqual({}, data)
+        self.assertEqual((), columns)
+        self.assertEqual((), data)
 
     def test_keypair_create_public_key(self):
         self.data = (
@@ -279,8 +279,8 @@ class TestKeypairCreate(TestKeypair):
             public_key=mock_generate.return_value.public_key,
         )
 
-        self.assertEqual({}, columns)
-        self.assertEqual({}, data)
+        self.assertEqual((), columns)
+        self.assertEqual((), data)
 
     def test_key_pair_create_with_user_pre_v210(self):
         self.set_compute_api_version('2.9')
@@ -740,8 +740,8 @@ class TestKeypairShow(TestKeypair):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.assertEqual({}, columns)
-        self.assertEqual({}, data)
+        self.assertEqual((), columns)
+        self.assertEqual((), data)
 
     def test_keypair_show_with_user(self):
         self.set_compute_api_version('2.10')