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

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

@@ -10,13 +10,9 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
-from unittest import mock
 from unittest.mock import call
 
-from cinderclient import api_versions
-from openstack import utils as sdk_utils
 from osc_lib import exceptions
 
 from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
@@ -37,29 +33,7 @@ class TestBackupLegacy(volume_fakes.TestVolume):
         self.restores_mock.reset_mock()
 
 
-class TestBackup(volume_fakes.TestVolume):
-    def setUp(self):
-        super().setUp()
-
-        patcher = mock.patch.object(
-            sdk_utils, 'supports_microversion', return_value=True
-        )
-        self.addCleanup(patcher.stop)
-        self.supports_microversion_mock = patcher.start()
-        self._set_mock_microversion(
-            self.app.client_manager.volume.api_version.get_string()
-        )
-
-    def _set_mock_microversion(self, mock_v):
-        """Set a specific microversion for the mock supports_microversion()."""
-        self.supports_microversion_mock.reset_mock(return_value=True)
-        self.supports_microversion_mock.side_effect = (
-            lambda _, v: api_versions.APIVersion(v)
-            <= api_versions.APIVersion(mock_v)
-        )
-
-
-class TestBackupCreate(TestBackup):
+class TestBackupCreate(volume_fakes.TestVolume):
     volume = volume_fakes.create_one_volume()
     snapshot = volume_fakes.create_one_snapshot()
     new_backup = volume_fakes.create_one_backup(
@@ -120,110 +94,12 @@ class TestBackupCreate(TestBackup):
             name=self.new_backup.name,
             description=self.new_backup.description,
             force=True,
-            incremental=True,
+            is_incremental=True,
             snapshot_id=self.new_backup.snapshot_id,
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
-    def test_backup_create_with_properties(self):
-        self._set_mock_microversion('3.43')
-
-        arglist = [
-            "--property",
-            "foo=bar",
-            "--property",
-            "wow=much-cool",
-            self.new_backup.volume_id,
-        ]
-        verifylist = [
-            ("properties", {"foo": "bar", "wow": "much-cool"}),
-            ("volume", self.new_backup.volume_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        columns, data = self.cmd.take_action(parsed_args)
-
-        self.volume_sdk_client.create_backup.assert_called_with(
-            volume_id=self.new_backup.volume_id,
-            container=None,
-            name=None,
-            description=None,
-            force=False,
-            incremental=False,
-            metadata={"foo": "bar", "wow": "much-cool"},
-        )
-        self.assertEqual(self.columns, columns)
-        self.assertEqual(self.data, data)
-
-    def test_backup_create_with_properties_pre_v343(self):
-        self._set_mock_microversion('3.42')
-
-        arglist = [
-            "--property",
-            "foo=bar",
-            "--property",
-            "wow=much-cool",
-            self.new_backup.volume_id,
-        ]
-        verifylist = [
-            ("properties", {"foo": "bar", "wow": "much-cool"}),
-            ("volume", self.new_backup.volume_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        exc = self.assertRaises(
-            exceptions.CommandError, self.cmd.take_action, parsed_args
-        )
-        self.assertIn("--os-volume-api-version 3.43 or greater", str(exc))
-
-    def test_backup_create_with_availability_zone(self):
-        self._set_mock_microversion('3.51')
-
-        arglist = [
-            "--availability-zone",
-            "my-az",
-            self.new_backup.volume_id,
-        ]
-        verifylist = [
-            ("availability_zone", "my-az"),
-            ("volume", self.new_backup.volume_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        columns, data = self.cmd.take_action(parsed_args)
-
-        self.volume_sdk_client.create_backup.assert_called_with(
-            volume_id=self.new_backup.volume_id,
-            container=None,
-            name=None,
-            description=None,
-            force=False,
-            incremental=False,
-            availability_zone="my-az",
-        )
-        self.assertEqual(self.columns, columns)
-        self.assertEqual(self.data, data)
-
-    def test_backup_create_with_availability_zone_pre_v351(self):
-        self._set_mock_microversion('3.50')
-
-        arglist = [
-            "--availability-zone",
-            "my-az",
-            self.new_backup.volume_id,
-        ]
-        verifylist = [
-            ("availability_zone", "my-az"),
-            ("volume", self.new_backup.volume_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        exc = self.assertRaises(
-            exceptions.CommandError, self.cmd.take_action, parsed_args
-        )
-        self.assertIn("--os-volume-api-version 3.51 or greater", str(exc))
-
     def test_backup_create_without_name(self):
         arglist = [
             "--description",
@@ -247,13 +123,13 @@ class TestBackupCreate(TestBackup):
             name=None,
             description=self.new_backup.description,
             force=False,
-            incremental=False,
+            is_incremental=False,
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
 
-class TestBackupDelete(TestBackup):
+class TestBackupDelete(volume_fakes.TestVolume):
     backups = volume_fakes.create_backups(count=2)
 
     def setUp(self):
@@ -346,7 +222,7 @@ class TestBackupDelete(TestBackup):
         )
 
 
-class TestBackupList(TestBackup):
+class TestBackupList(volume_fakes.TestVolume):
     volume = volume_fakes.create_one_volume()
     backups = volume_fakes.create_backups(
         attrs={'volume_id': volume.name}, count=3
@@ -479,7 +355,7 @@ class TestBackupList(TestBackup):
         self.assertCountEqual(self.data_long, list(data))
 
 
-class TestBackupRestore(TestBackup):
+class TestBackupRestore(volume_fakes.TestVolume):
     volume = volume_fakes.create_one_volume()
     backup = volume_fakes.create_one_backup(
         attrs={'volume_id': volume.id},
@@ -592,91 +468,6 @@ class TestBackupSet(TestBackupLegacy):
         # Get the command object to test
         self.cmd = volume_backup.SetVolumeBackup(self.app, None)
 
-    def test_backup_set_name(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.9')
-
-        arglist = [
-            '--name',
-            'new_name',
-            self.backup.id,
-        ]
-        verifylist = [
-            ('name', 'new_name'),
-            ('backup', self.backup.id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class ShowOne in cliff, abstract method take_action()
-        # returns nothing
-        result = self.cmd.take_action(parsed_args)
-        self.backups_mock.update.assert_called_once_with(
-            self.backup.id, **{'name': 'new_name'}
-        )
-        self.assertIsNone(result)
-
-    def test_backup_set_name_pre_v39(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.8')
-
-        arglist = [
-            '--name',
-            'new_name',
-            self.backup.id,
-        ]
-        verifylist = [
-            ('name', 'new_name'),
-            ('backup', self.backup.id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        exc = self.assertRaises(
-            exceptions.CommandError, self.cmd.take_action, parsed_args
-        )
-        self.assertIn("--os-volume-api-version 3.9 or greater", str(exc))
-
-    def test_backup_set_description(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.9')
-
-        arglist = [
-            '--description',
-            'new_description',
-            self.backup.id,
-        ]
-        verifylist = [
-            ('name', None),
-            ('description', 'new_description'),
-            ('backup', self.backup.id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        result = self.cmd.take_action(parsed_args)
-
-        # Set expected values
-        kwargs = {'description': 'new_description'}
-        self.backups_mock.update.assert_called_once_with(
-            self.backup.id, **kwargs
-        )
-        self.assertIsNone(result)
-
-    def test_backup_set_description_pre_v39(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.8')
-
-        arglist = [
-            '--description',
-            'new_description',
-            self.backup.id,
-        ]
-        verifylist = [
-            ('name', None),
-            ('description', 'new_description'),
-            ('backup', self.backup.id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        exc = self.assertRaises(
-            exceptions.CommandError, self.cmd.take_action, parsed_args
-        )
-        self.assertIn("--os-volume-api-version 3.9 or greater", str(exc))
-
     def test_backup_set_state(self):
         arglist = ['--state', 'error', self.backup.id]
         verifylist = [('state', 'error'), ('backup', self.backup.id)]
@@ -706,152 +497,8 @@ class TestBackupSet(TestBackupLegacy):
             self.backup.id, 'error'
         )
 
-    def test_backup_set_no_property(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.43')
-
-        arglist = [
-            '--no-property',
-            self.backup.id,
-        ]
-        verifylist = [
-            ('no_property', True),
-            ('backup', self.backup.id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        result = self.cmd.take_action(parsed_args)
-
-        # Set expected values
-        kwargs = {
-            'metadata': {},
-        }
-        self.backups_mock.update.assert_called_once_with(
-            self.backup.id, **kwargs
-        )
-        self.assertIsNone(result)
-
-    def test_backup_set_no_property_pre_v343(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.42')
-
-        arglist = [
-            '--no-property',
-            self.backup.id,
-        ]
-        verifylist = [
-            ('no_property', True),
-            ('backup', self.backup.id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        exc = self.assertRaises(
-            exceptions.CommandError, self.cmd.take_action, parsed_args
-        )
-        self.assertIn("--os-volume-api-version 3.43 or greater", str(exc))
-
-    def test_backup_set_property(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.43')
-
-        arglist = [
-            '--property',
-            'foo=bar',
-            self.backup.id,
-        ]
-        verifylist = [
-            ('properties', {'foo': 'bar'}),
-            ('backup', self.backup.id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        result = self.cmd.take_action(parsed_args)
-
-        # Set expected values
-        kwargs = {
-            'metadata': {'wow': 'cool', 'foo': 'bar'},
-        }
-        self.backups_mock.update.assert_called_once_with(
-            self.backup.id, **kwargs
-        )
-        self.assertIsNone(result)
-
-    def test_backup_set_property_pre_v343(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.42')
-
-        arglist = [
-            '--property',
-            'foo=bar',
-            self.backup.id,
-        ]
-        verifylist = [
-            ('properties', {'foo': 'bar'}),
-            ('backup', self.backup.id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        exc = self.assertRaises(
-            exceptions.CommandError, self.cmd.take_action, parsed_args
-        )
-        self.assertIn("--os-volume-api-version 3.43 or greater", str(exc))
-
-
-class TestBackupUnset(TestBackupLegacy):
-    backup = volume_fakes.create_one_backup(
-        attrs={'metadata': {'foo': 'bar'}},
-    )
-
-    def setUp(self):
-        super().setUp()
-
-        self.backups_mock.get.return_value = self.backup
-
-        # Get the command object to test
-        self.cmd = volume_backup.UnsetVolumeBackup(self.app, None)
-
-    def test_backup_unset_property(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.43')
-
-        arglist = [
-            '--property',
-            'foo',
-            self.backup.id,
-        ]
-        verifylist = [
-            ('properties', ['foo']),
-            ('backup', self.backup.id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        result = self.cmd.take_action(parsed_args)
-
-        # Set expected values
-        kwargs = {
-            'metadata': {},
-        }
-        self.backups_mock.update.assert_called_once_with(
-            self.backup.id, **kwargs
-        )
-        self.assertIsNone(result)
-
-    def test_backup_unset_property_pre_v343(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.42')
-
-        arglist = [
-            '--property',
-            'foo',
-            self.backup.id,
-        ]
-        verifylist = [
-            ('properties', ['foo']),
-            ('backup', self.backup.id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        exc = self.assertRaises(
-            exceptions.CommandError, self.cmd.take_action, parsed_args
-        )
-        self.assertIn("--os-volume-api-version 3.43 or greater", str(exc))
-
 
-class TestBackupShow(TestBackup):
+class TestBackupShow(volume_fakes.TestVolume):
     backup = volume_fakes.create_one_backup()
 
     columns = (
@@ -860,20 +507,16 @@ class TestBackupShow(TestBackup):
         "created_at",
         "data_timestamp",
         "description",
-        "encryption_key_id",
         "fail_reason",
         "has_dependent_backups",
         "id",
         "is_incremental",
-        "metadata",
         "name",
         "object_count",
-        "project_id",
         "size",
         "snapshot_id",
         "status",
         "updated_at",
-        "user_id",
         "volume_id",
     )
     data = (
@@ -882,20 +525,16 @@ class TestBackupShow(TestBackup):
         backup.created_at,
         backup.data_timestamp,
         backup.description,
-        backup.encryption_key_id,
         backup.fail_reason,
         backup.has_dependent_backups,
         backup.id,
         backup.is_incremental,
-        backup.metadata,
         backup.name,
         backup.object_count,
-        backup.project_id,
         backup.size,
         backup.snapshot_id,
         backup.status,
         backup.updated_at,
-        backup.user_id,
         backup.volume_id,
     )
 

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

@@ -31,7 +31,7 @@ class TestVolumeSnapshot(volume_fakes.TestVolume):
         self.snapshots_mock.reset_mock()
         self.volumes_mock = self.volume_client.volumes
         self.volumes_mock.reset_mock()
-        self.project_mock = self.app.client_manager.identity.projects
+        self.project_mock = self.identity_client.projects
         self.project_mock.reset_mock()
 
 

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

@@ -15,7 +15,6 @@
 from unittest import mock
 from unittest.mock import call
 
-from cinderclient import api_versions
 from osc_lib import exceptions
 from osc_lib import utils
 
@@ -176,49 +175,6 @@ class TestTransferCreate(TestTransfer):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
-    def test_transfer_create_with_no_snapshots(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.55')
-
-        arglist = [
-            '--no-snapshots',
-            self.volume.id,
-        ]
-        verifylist = [
-            ('name', None),
-            ('snapshots', False),
-            ('volume', self.volume.id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        columns, data = self.cmd.take_action(parsed_args)
-
-        self.transfer_mock.create.assert_called_once_with(
-            self.volume.id, None, no_snapshots=True
-        )
-        self.assertEqual(self.columns, columns)
-        self.assertEqual(self.data, data)
-
-    def test_transfer_create_pre_v355(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.54')
-
-        arglist = [
-            '--no-snapshots',
-            self.volume.id,
-        ]
-        verifylist = [
-            ('name', None),
-            ('snapshots', False),
-            ('volume', self.volume.id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        exc = self.assertRaises(
-            exceptions.CommandError, self.cmd.take_action, parsed_args
-        )
-        self.assertIn(
-            '--os-volume-api-version 3.55 or greater is required', str(exc)
-        )
-
 
 class TestTransferDelete(TestTransfer):
     volume_transfers = volume_fakes.create_transfers(count=2)

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

@@ -15,7 +15,6 @@
 from unittest import mock
 from unittest.mock import call
 
-from cinderclient import api_versions
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 from osc_lib import utils
@@ -41,7 +40,7 @@ class TestType(volume_fakes.TestVolume):
         )
         self.volume_encryption_types_mock.reset_mock()
 
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
         self.projects_mock.reset_mock()
 
 
@@ -333,7 +332,7 @@ class TestTypeList(TestType):
         "Name",
         "Is Public",
     ]
-    columns_long = columns + ["Description", "Properties"]
+    columns_long = columns + ["Description"]
     data_with_default_type = [(volume_types[0].id, volume_types[0].name, True)]
     data = []
     for t in volume_types:
@@ -352,7 +351,6 @@ class TestTypeList(TestType):
                 t.name,
                 t.is_public,
                 t.description,
-                format_columns.DictColumn(t.extra_specs),
             )
         )
 
@@ -374,9 +372,7 @@ class TestTypeList(TestType):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.volume_types_mock.list.assert_called_once_with(
-            search_opts={}, is_public=None
-        )
+        self.volume_types_mock.list.assert_called_once_with(is_public=None)
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
@@ -393,9 +389,7 @@ class TestTypeList(TestType):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.volume_types_mock.list.assert_called_once_with(
-            search_opts={}, is_public=True
-        )
+        self.volume_types_mock.list.assert_called_once_with(is_public=True)
         self.assertEqual(self.columns_long, columns)
         self.assertCountEqual(self.data_long, list(data))
 
@@ -411,9 +405,7 @@ class TestTypeList(TestType):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.volume_types_mock.list.assert_called_once_with(
-            search_opts={}, is_public=False
-        )
+        self.volume_types_mock.list.assert_called_once_with(is_public=False)
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
@@ -434,77 +426,6 @@ class TestTypeList(TestType):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data_with_default_type, list(data))
 
-    def test_type_list_with_properties(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.52'
-        )
-
-        arglist = [
-            "--property",
-            "foo=bar",
-            "--multiattach",
-            "--cacheable",
-            "--replicated",
-            "--availability-zone",
-            "az1",
-        ]
-        verifylist = [
-            ("encryption_type", False),
-            ("long", False),
-            ("is_public", None),
-            ("default", False),
-            ("properties", {"foo": "bar"}),
-            ("multiattach", True),
-            ("cacheable", True),
-            ("replicated", True),
-            ("availability_zones", ["az1"]),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        columns, data = self.cmd.take_action(parsed_args)
-        self.volume_types_mock.list.assert_called_once_with(
-            search_opts={
-                "extra_specs": {
-                    "foo": "bar",
-                    "multiattach": "<is> True",
-                    "cacheable": "<is> True",
-                    "replication_enabled": "<is> True",
-                    "RESKEY:availability_zones": "az1",
-                }
-            },
-            is_public=None,
-        )
-        self.assertEqual(self.columns, columns)
-        self.assertCountEqual(self.data, list(data))
-
-    def test_type_list_with_properties_pre_v352(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.51'
-        )
-
-        arglist = [
-            "--property",
-            "foo=bar",
-        ]
-        verifylist = [
-            ("encryption_type", False),
-            ("long", False),
-            ("is_public", None),
-            ("default", False),
-            ("properties", {"foo": "bar"}),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        exc = self.assertRaises(
-            exceptions.CommandError,
-            self.cmd.take_action,
-            parsed_args,
-        )
-        self.assertIn(
-            '--os-volume-api-version 3.52 or greater is required',
-            str(exc),
-        )
-
     def test_type_list_with_encryption(self):
         encryption_type = volume_fakes.create_one_encryption_volume_type(
             attrs={'volume_type_id': self.volume_types[0].id},
@@ -550,9 +471,7 @@ class TestTypeList(TestType):
 
         columns, data = self.cmd.take_action(parsed_args)
         self.volume_encryption_types_mock.list.assert_called_once_with()
-        self.volume_types_mock.list.assert_called_once_with(
-            search_opts={}, is_public=None
-        )
+        self.volume_types_mock.list.assert_called_once_with(is_public=None)
         self.assertEqual(encryption_columns, columns)
         self.assertCountEqual(encryption_data, list(data))