python-openstackclient 6.6.1__py3-none-any.whl → 7.1.0__py3-none-any.whl

openstackclient/tests/unit/volume/v1/test_volume.py

@@ -35,11 +35,11 @@ class TestVolume(volume_fakes.TestVolumev1):
         self.volumes_mock.reset_mock()
 
         # Get a shortcut to the TenantManager Mock
-        self.projects_mock = self.app.client_manager.identity.tenants
+        self.projects_mock = self.identity_client.tenants
         self.projects_mock.reset_mock()
 
         # Get a shortcut to the UserManager Mock
-        self.users_mock = self.app.client_manager.identity.users
+        self.users_mock = self.identity_client.users
         self.users_mock.reset_mock()
 
     def setup_volumes_mock(self, count):
@@ -1425,7 +1425,8 @@ class TestColumns(TestVolume):
 
         col = volume.AttachmentsColumn(_volume.attachments, {})
         self.assertEqual(
-            'Attached to %s on %s ' % (server_id, device), col.human_readable()
+            f'Attached to {server_id} on {device} ',
+            col.human_readable(),
         )
         self.assertEqual(_volume.attachments, col.machine_readable())
 
@@ -1440,7 +1441,7 @@ class TestColumns(TestVolume):
 
         col = volume.AttachmentsColumn(_volume.attachments, server_cache)
         self.assertEqual(
-            'Attached to %s on %s ' % ('fake-server-name', device),
+            'Attached to {} on {} '.format('fake-server-name', device),
             col.human_readable(),
         )
         self.assertEqual(_volume.attachments, col.machine_readable())

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

@@ -14,37 +14,25 @@
 
 import copy
 import random
+import typing as ty
 from unittest import mock
 import uuid
 
 # FIXME(stephenfin): We are using v3 resource versions despite being v2 fakes
 from cinderclient import api_versions
+from keystoneauth1 import discover
 from openstack.block_storage.v2 import _proxy as block_storage_v2_proxy
-from openstack.block_storage.v3 import backup as _backup
+from openstack.block_storage.v2 import backup as _backup
 from openstack.block_storage.v3 import capabilities as _capabilities
 from openstack.block_storage.v3 import stats as _stats
 from openstack.block_storage.v3 import volume as _volume
 from openstack.image.v2 import _proxy as image_v2_proxy
-from osc_lib.cli import format_columns
 
 from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit import utils
 
 
-QUOTA = {
-    "gigabytes": 1000,
-    "volumes": 11,
-    "snapshots": 10,
-    "backups": 10,
-    "backup_gigabytes": 1000,
-    "per_volume_gigabytes": -1,
-    "gigabytes_volume_type_backend": -1,
-    "volumes_volume_type_backend": -1,
-    "snapshots_volume_type_backend": -1,
-}
-
-
 class FakeVolumeClient:
     def __init__(self, **kwargs):
         self.auth_token = kwargs['token']
@@ -67,10 +55,6 @@ class FakeVolumeClient:
         self.pools.resource_class = fakes.FakeResource(None, {})
         self.qos_specs = mock.Mock()
         self.qos_specs.resource_class = fakes.FakeResource(None, {})
-        self.quota_classes = mock.Mock()
-        self.quota_classes.resource_class = fakes.FakeResource(None, {})
-        self.quotas = mock.Mock()
-        self.quotas.resource_class = fakes.FakeResource(None, {})
         self.restores = mock.Mock()
         self.restores.resource_class = fakes.FakeResource(None, {})
         self.services = mock.Mock()
@@ -106,16 +90,36 @@ class FakeClientMixin:
             spec=block_storage_v2_proxy.Proxy,
         )
         self.volume_sdk_client = self.app.client_manager.sdk_connection.volume
+        self.set_volume_api_version()  # default to the lowest
 
+    def set_volume_api_version(self, version: ty.Optional[str] = None):
+        """Set a fake block storage API version.
 
-class TestVolume(FakeClientMixin, utils.TestCommand):
-    def setUp(self):
-        super().setUp()
+        :param version: The fake microversion to "support". This must be None
+            since cinder v2 didn't support microversions.
+        :returns: None
+        """
+        assert version is None
 
-        self.app.client_manager.identity = identity_fakes.FakeIdentityv3Client(
-            endpoint=fakes.AUTH_URL, token=fakes.AUTH_TOKEN
+        self.volume_client.api_version = None
+
+        self.volume_sdk_client.default_microversion = None
+        self.volume_sdk_client.get_endpoint_data.return_value = (
+            discover.EndpointData(
+                min_microversion=None,
+                max_microversion=None,
+            )
         )
 
+
+class TestVolume(
+    identity_fakes.FakeClientMixin,
+    FakeClientMixin,
+    utils.TestCommand,
+):
+    def setUp(self):
+        super().setUp()
+
         # avoid circular imports by defining this manually rather than using
         # openstackclient.tests.unit.image.v2.fakes.FakeClientMixin
         self.app.client_manager.image = mock.Mock(spec=image_v2_proxy.Proxy)
@@ -472,76 +476,34 @@ def get_volumes(volumes=None, count=2):
     return mock.Mock(side_effect=volumes)
 
 
-def get_volume_columns(volume=None):
-    """Get the volume columns from a faked volume object.
-
-    :param volume:
-        A FakeResource objects faking volume
-    :return
-        A tuple which may include the following keys:
-        ('id', 'name', 'description', 'status', 'size', 'volume_type',
-         'metadata', 'snapshot', 'availability_zone', 'attachments')
-    """
-    if volume is not None:
-        return tuple(k for k in sorted(volume.keys()))
-    return tuple([])
-
-
-def get_volume_data(volume=None):
-    """Get the volume data from a faked volume object.
-
-    :param volume:
-        A FakeResource objects faking volume
-    :return
-        A tuple which may include the following values:
-        ('ce26708d', 'fake_volume', 'fake description', 'available',
-         20, 'fake_lvmdriver-1', "Alpha='a', Beta='b', Gamma='g'",
-         1, 'nova', [{'device': '/dev/ice', 'server_id': '1233'}])
-    """
-    data_list = []
-    if volume is not None:
-        for x in sorted(volume.keys()):
-            if x == 'tags':
-                # The 'tags' should be format_list
-                data_list.append(format_columns.ListColumn(volume.info.get(x)))
-            else:
-                data_list.append(volume.info.get(x))
-    return tuple(data_list)
-
-
 def create_one_backup(attrs=None):
     """Create a fake backup.
 
     :param dict attrs:
         A dictionary with all attributes
-    :return:
-        A FakeResource object with id, name, volume_id, etc.
+    :return: A fake
+        openstack.block_storage.v2.backup.Backup object
     """
     attrs = attrs or {}
 
     # Set default attributes.
     backup_info = {
+        "availability_zone": 'zone' + uuid.uuid4().hex,
+        "container": 'container-' + uuid.uuid4().hex,
         "created_at": 'time-' + uuid.uuid4().hex,
         "data_timestamp": 'time-' + uuid.uuid4().hex,
-        "id": 'backup-id-' + uuid.uuid4().hex,
-        "encryption_key_id": None,
+        "description": 'description-' + uuid.uuid4().hex,
         "fail_reason": "Service not found for creating backup.",
         "has_dependent_backups": False,
+        "id": 'backup-id-' + uuid.uuid4().hex,
         "is_incremental": False,
-        "metadata": {},
-        "project_id": uuid.uuid4().hex,
-        "updated_at": 'time-' + uuid.uuid4().hex,
-        "user_id": uuid.uuid4().hex,
         "name": 'backup-name-' + uuid.uuid4().hex,
-        "volume_id": 'volume-id-' + uuid.uuid4().hex,
-        "snapshot_id": 'snapshot-id' + uuid.uuid4().hex,
-        "description": 'description-' + uuid.uuid4().hex,
         "object_count": None,
-        "container": 'container-' + uuid.uuid4().hex,
         "size": random.randint(1, 20),
-        "is_incremental": False,
+        "snapshot_id": 'snapshot-id' + uuid.uuid4().hex,
         "status": "error",
-        "availability_zone": 'zone' + uuid.uuid4().hex,
+        "updated_at": 'time-' + uuid.uuid4().hex,
+        "volume_id": 'volume-id-' + uuid.uuid4().hex,
     }
 
     # Overwrite default attributes.
@@ -558,8 +520,8 @@ def create_backups(attrs=None, count=2):
         A dictionary with all attributes
     :param int count:
         The number of backups to fake
-    :return:
-        A list of FakeResource objects faking the backups
+    :return: A list of fake
+        openstack.block_storage.v2.backup.Backup objects
     """
     backups = []
     for i in range(0, count):
@@ -1012,185 +974,3 @@ def create_one_encryption_volume_type(attrs=None):
         info=copy.deepcopy(encryption_info), loaded=True
     )
     return encryption_type
-
-
-def create_one_vol_quota(attrs=None):
-    """Create one quota"""
-    attrs = attrs or {}
-
-    quota_attrs = {
-        'id': 'project-id-' + uuid.uuid4().hex,
-        'backups': 100,
-        'backup_gigabytes': 100,
-        'gigabytes': 10,
-        'per_volume_gigabytes': 10,
-        'snapshots': 0,
-        'volumes': 10,
-    }
-
-    quota_attrs.update(attrs)
-
-    quota = fakes.FakeResource(info=copy.deepcopy(quota_attrs), loaded=True)
-    quota.project_id = quota_attrs['id']
-
-    return quota
-
-
-def create_one_default_vol_quota(attrs=None):
-    """Create one quota"""
-    attrs = attrs or {}
-
-    quota_attrs = {
-        'id': 'project-id-' + uuid.uuid4().hex,
-        'backups': 100,
-        'backup_gigabytes': 100,
-        'gigabytes': 100,
-        'per_volume_gigabytes': 100,
-        'snapshots': 100,
-        'volumes': 100,
-    }
-
-    quota_attrs.update(attrs)
-
-    quota = fakes.FakeResource(info=copy.deepcopy(quota_attrs), loaded=True)
-    quota.project_id = quota_attrs['id']
-
-    return quota
-
-
-def create_one_detailed_quota(attrs=None):
-    """Create one quota"""
-    attrs = attrs or {}
-
-    quota_attrs = {
-        'volumes': {'limit': 3, 'in_use': 1, 'reserved': 0},
-        'per_volume_gigabytes': {'limit': -1, 'in_use': 0, 'reserved': 0},
-        'snapshots': {'limit': 10, 'in_use': 0, 'reserved': 0},
-        'gigabytes': {'limit': 1000, 'in_use': 5, 'reserved': 0},
-        'backups': {'limit': 10, 'in_use': 0, 'reserved': 0},
-        'backup_gigabytes': {'limit': 1000, 'in_use': 0, 'reserved': 0},
-        'volumes_lvmdriver-1': {'limit': -1, 'in_use': 1, 'reserved': 0},
-        'gigabytes_lvmdriver-1': {'limit': -1, 'in_use': 5, 'reserved': 0},
-        'snapshots_lvmdriver-1': {'limit': -1, 'in_use': 0, 'reserved': 0},
-        'volumes___DEFAULT__': {'limit': -1, 'in_use': 0, 'reserved': 0},
-        'gigabytes___DEFAULT__': {'limit': -1, 'in_use': 0, 'reserved': 0},
-        'snapshots___DEFAULT__': {'limit': -1, 'in_use': 0, 'reserved': 0},
-        'groups': {'limit': 10, 'in_use': 0, 'reserved': 0},
-        'id': uuid.uuid4().hex,
-    }
-    quota_attrs.update(attrs)
-
-    quota = fakes.FakeResource(info=copy.deepcopy(quota_attrs), loaded=True)
-
-    return quota
-
-
-class FakeLimits(object):
-    """Fake limits"""
-
-    def __init__(self, absolute_attrs=None):
-        self.absolute_limits_attrs = {
-            'totalSnapshotsUsed': 1,
-            'maxTotalBackups': 10,
-            'maxTotalVolumeGigabytes': 1000,
-            'maxTotalSnapshots': 10,
-            'maxTotalBackupGigabytes': 1000,
-            'totalBackupGigabytesUsed': 0,
-            'maxTotalVolumes': 10,
-            'totalVolumesUsed': 4,
-            'totalBackupsUsed': 0,
-            'totalGigabytesUsed': 35,
-        }
-        absolute_attrs = absolute_attrs or {}
-        self.absolute_limits_attrs.update(absolute_attrs)
-
-        self.rate_limits_attrs = [
-            {
-                "uri": "*",
-                "limit": [
-                    {
-                        "value": 10,
-                        "verb": "POST",
-                        "remaining": 2,
-                        "unit": "MINUTE",
-                        "next-available": "2011-12-15T22:42:45Z",
-                    },
-                    {
-                        "value": 10,
-                        "verb": "PUT",
-                        "remaining": 2,
-                        "unit": "MINUTE",
-                        "next-available": "2011-12-15T22:42:45Z",
-                    },
-                    {
-                        "value": 100,
-                        "verb": "DELETE",
-                        "remaining": 100,
-                        "unit": "MINUTE",
-                        "next-available": "2011-12-15T22:42:45Z",
-                    },
-                ],
-            }
-        ]
-
-    @property
-    def absolute(self):
-        for name, value in self.absolute_limits_attrs.items():
-            yield FakeAbsoluteLimit(name, value)
-
-    def absolute_limits(self):
-        reference_data = []
-        for name, value in self.absolute_limits_attrs.items():
-            reference_data.append((name, value))
-        return reference_data
-
-    @property
-    def rate(self):
-        for group in self.rate_limits_attrs:
-            uri = group['uri']
-            for rate in group['limit']:
-                yield FakeRateLimit(
-                    rate['verb'],
-                    uri,
-                    rate['value'],
-                    rate['remaining'],
-                    rate['unit'],
-                    rate['next-available'],
-                )
-
-    def rate_limits(self):
-        reference_data = []
-        for group in self.rate_limits_attrs:
-            uri = group['uri']
-            for rate in group['limit']:
-                reference_data.append(
-                    (
-                        rate['verb'],
-                        uri,
-                        rate['value'],
-                        rate['remaining'],
-                        rate['unit'],
-                        rate['next-available'],
-                    )
-                )
-        return reference_data
-
-
-class FakeAbsoluteLimit(object):
-    """Data model that represents an absolute limit."""
-
-    def __init__(self, name, value):
-        self.name = name
-        self.value = value
-
-
-class FakeRateLimit(object):
-    """Data model that represents a flattened view of a single rate limit."""
-
-    def __init__(self, verb, uri, value, remain, unit, next_available):
-        self.verb = verb
-        self.uri = uri
-        self.value = value
-        self.remain = remain
-        self.unit = unit
-        self.next_available = next_available

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

@@ -20,7 +20,7 @@ from openstackclient.volume.v2 import consistency_group_snapshot
 
 class TestConsistencyGroupSnapshot(volume_fakes.TestVolume):
     def setUp(self):
-        super(TestConsistencyGroupSnapshot, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the TransferManager Mock
         self.cgsnapshots_mock = self.volume_client.cgsnapshots
@@ -53,7 +53,7 @@ class TestConsistencyGroupSnapshotCreate(TestConsistencyGroupSnapshot):
     )
 
     def setUp(self):
-        super(TestConsistencyGroupSnapshotCreate, self).setUp()
+        super().setUp()
         self.cgsnapshots_mock.create.return_value = (
             self._consistency_group_snapshot
         )
@@ -126,7 +126,7 @@ class TestConsistencyGroupSnapshotDelete(TestConsistencyGroupSnapshot):
     )
 
     def setUp(self):
-        super(TestConsistencyGroupSnapshotDelete, self).setUp()
+        super().setUp()
 
         self.cgsnapshots_mock.get = (
             volume_fakes.get_consistency_group_snapshots(
@@ -217,7 +217,7 @@ class TestConsistencyGroupSnapshotList(TestConsistencyGroupSnapshot):
         )
 
     def setUp(self):
-        super(TestConsistencyGroupSnapshotList, self).setUp()
+        super().setUp()
 
         self.cgsnapshots_mock.list.return_value = (
             self.consistency_group_snapshots
@@ -332,7 +332,7 @@ class TestConsistencyGroupSnapshotShow(TestConsistencyGroupSnapshot):
     )
 
     def setUp(self):
-        super(TestConsistencyGroupSnapshotShow, self).setUp()
+        super().setUp()
 
         self.cgsnapshots_mock.get.return_value = (
             self._consistency_group_snapshot

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

@@ -27,7 +27,7 @@ from openstackclient.volume.v2 import qos_specs
 
 class TestQos(volume_fakes.TestVolume):
     def setUp(self):
-        super(TestQos, self).setUp()
+        super().setUp()
 
         self.qos_mock = self.volume_client.qos_specs
         self.qos_mock.reset_mock()
@@ -41,7 +41,7 @@ class TestQosAssociate(TestQos):
     qos_spec = volume_fakes.create_one_qos()
 
     def setUp(self):
-        super(TestQosAssociate, self).setUp()
+        super().setUp()
 
         self.qos_mock.get.return_value = self.qos_spec
         self.types_mock.get.return_value = self.volume_type
@@ -68,7 +68,7 @@ class TestQosCreate(TestQos):
     columns = ('consumer', 'id', 'name', 'properties')
 
     def setUp(self):
-        super(TestQosCreate, self).setUp()
+        super().setUp()
 
         self.new_qos_spec = volume_fakes.create_one_qos()
         self.qos_mock.create.return_value = self.new_qos_spec
@@ -158,7 +158,7 @@ class TestQosDelete(TestQos):
     qos_specs = volume_fakes.create_qoses(count=2)
 
     def setUp(self):
-        super(TestQosDelete, self).setUp()
+        super().setUp()
 
         self.qos_mock.get = volume_fakes.get_qoses(self.qos_specs)
         # Get the command object to test
@@ -238,7 +238,7 @@ class TestQosDisassociate(TestQos):
     qos_spec = volume_fakes.create_one_qos()
 
     def setUp(self):
-        super(TestQosDisassociate, self).setUp()
+        super().setUp()
 
         self.qos_mock.get.return_value = self.qos_spec
         self.types_mock.get.return_value = self.volume_type
@@ -302,7 +302,7 @@ class TestQosList(TestQos):
         )
 
     def setUp(self):
-        super(TestQosList, self).setUp()
+        super().setUp()
 
         self.qos_mock.list.return_value = self.qos_specs
         self.qos_mock.get_associations.return_value = [self.qos_association]
@@ -354,7 +354,7 @@ class TestQosSet(TestQos):
     qos_spec = volume_fakes.create_one_qos()
 
     def setUp(self):
-        super(TestQosSet, self).setUp()
+        super().setUp()
 
         self.qos_mock.get.return_value = self.qos_spec
         # Get the command object to test
@@ -403,7 +403,7 @@ class TestQosShow(TestQos):
     )
 
     def setUp(self):
-        super(TestQosShow, self).setUp()
+        super().setUp()
 
         self.qos_mock.get.return_value = self.qos_spec
         self.qos_mock.get_associations.return_value = [self.qos_association]
@@ -428,7 +428,7 @@ class TestQosUnset(TestQos):
     qos_spec = volume_fakes.create_one_qos()
 
     def setUp(self):
-        super(TestQosUnset, self).setUp()
+        super().setUp()
 
         self.qos_mock.get.return_value = self.qos_spec
         # Get the command object to test