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

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

@@ -12,9 +12,7 @@
 #   under the License.
 
 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
@@ -33,18 +31,15 @@ class TestVolume(volume_fakes.TestVolume):
         self.volumes_mock = self.volume_client.volumes
         self.volumes_mock.reset_mock()
 
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
         self.projects_mock.reset_mock()
 
-        self.users_mock = self.app.client_manager.identity.users
+        self.users_mock = self.identity_client.users
         self.users_mock.reset_mock()
 
         self.snapshots_mock = self.volume_client.volume_snapshots
         self.snapshots_mock.reset_mock()
 
-        self.backups_mock = self.volume_client.backups
-        self.backups_mock.reset_mock()
-
         self.types_mock = self.volume_client.volume_types
         self.types_mock.reset_mock()
 
@@ -126,7 +121,6 @@ class TestVolumeCreate(TestVolume):
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -178,7 +172,6 @@ class TestVolumeCreate(TestVolume):
             source_volid=None,
             consistencygroup_id=consistency_group.id,
             scheduler_hints={'k': 'v'},
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -218,7 +211,6 @@ class TestVolumeCreate(TestVolume):
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -259,7 +251,6 @@ class TestVolumeCreate(TestVolume):
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -300,7 +291,6 @@ class TestVolumeCreate(TestVolume):
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -339,74 +329,11 @@ class TestVolumeCreate(TestVolume):
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.datalist, data)
 
-    def test_volume_create_with_backup(self):
-        backup = volume_fakes.create_one_backup()
-        self.new_volume.backup_id = backup.id
-        arglist = [
-            '--backup',
-            self.new_volume.backup_id,
-            self.new_volume.name,
-        ]
-        verifylist = [
-            ('backup', self.new_volume.backup_id),
-            ('name', self.new_volume.name),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        self.backups_mock.get.return_value = backup
-
-        self.volume_client.api_version = api_versions.APIVersion('3.47')
-
-        # In base command class ShowOne in cliff, abstract method take_action()
-        # returns a two-part tuple with a tuple of column names and a tuple of
-        # data to be shown.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        self.volumes_mock.create.assert_called_once_with(
-            size=backup.size,
-            snapshot_id=None,
-            name=self.new_volume.name,
-            description=None,
-            volume_type=None,
-            availability_zone=None,
-            metadata=None,
-            imageRef=None,
-            source_volid=None,
-            consistencygroup_id=None,
-            scheduler_hints=None,
-            backup_id=backup.id,
-        )
-
-        self.assertEqual(self.columns, columns)
-        self.assertCountEqual(self.datalist, data)
-
-    def test_volume_create_with_backup_pre_347(self):
-        backup = volume_fakes.create_one_backup()
-        self.new_volume.backup_id = backup.id
-        arglist = [
-            '--backup',
-            self.new_volume.backup_id,
-            self.new_volume.name,
-        ]
-        verifylist = [
-            ('backup', self.new_volume.backup_id),
-            ('name', self.new_volume.name),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        self.backups_mock.get.return_value = backup
-
-        exc = self.assertRaises(
-            exceptions.CommandError, self.cmd.take_action, parsed_args
-        )
-        self.assertIn("--os-volume-api-version 3.47 or greater", str(exc))
-
     def test_volume_create_with_source_volume(self):
         source_vol = "source_vol"
         arglist = [
@@ -439,7 +366,6 @@ class TestVolumeCreate(TestVolume):
             source_volid=self.new_volume.id,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -479,7 +405,6 @@ class TestVolumeCreate(TestVolume):
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -525,7 +450,6 @@ class TestVolumeCreate(TestVolume):
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -580,7 +504,6 @@ class TestVolumeCreate(TestVolume):
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(2, mock_error.call_count)
@@ -632,7 +555,6 @@ class TestVolumeCreate(TestVolume):
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(2, mock_error.call_count)
@@ -742,7 +664,6 @@ class TestVolumeCreate(TestVolume):
                 'local_to_instance': 'v6',
                 'different_host': ['v5', 'v7'],
             },
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -789,7 +710,7 @@ class TestVolumeDelete(TestVolume):
 
         result = self.cmd.take_action(parsed_args)
 
-        calls = [call(v.id, cascade=False) for v in volumes]
+        calls = [mock.call(v.id, cascade=False) for v in volumes]
         self.volumes_mock.delete.assert_has_calls(calls)
         self.assertIsNone(result)
 
@@ -1721,11 +1642,23 @@ class TestVolumeShow(TestVolume):
         self.volumes_mock.get.assert_called_with(self._volume.id)
 
         self.assertEqual(
-            volume_fakes.get_volume_columns(self._volume),
+            tuple(sorted(self._volume.keys())),
             columns,
         )
-        self.assertCountEqual(
-            volume_fakes.get_volume_data(self._volume),
+        self.assertTupleEqual(
+            (
+                self._volume.attachments,
+                self._volume.availability_zone,
+                self._volume.bootable,
+                self._volume.description,
+                self._volume.id,
+                self._volume.name,
+                format_columns.DictColumn(self._volume.metadata),
+                self._volume.size,
+                self._volume.snapshot_id,
+                self._volume.status,
+                self._volume.volume_type,
+            ),
             data,
         )
 
@@ -1825,7 +1758,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())
 
@@ -1840,7 +1774,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())