volume: Add v3-specific volume module

This makes testing easier.

Change-Id: I6b31026ae3c9dc66d828744534b35bb0a0d2ffbe
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

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

@@ -25,7 +25,6 @@
 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
@@ -472,43 +471,6 @@ 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.
 

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
@@ -42,9 +40,6 @@ def setUp(self):
         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 @@ def test_volume_create_min_options(self):
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -178,7 +172,6 @@ def test_volume_create_options(self):
             source_volid=None,
             consistencygroup_id=consistency_group.id,
             scheduler_hints={'k': 'v'},
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -218,7 +211,6 @@ def test_volume_create_properties(self):
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -259,7 +251,6 @@ def test_volume_create_image_id(self):
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -300,7 +291,6 @@ def test_volume_create_image_name(self):
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -339,74 +329,11 @@ def test_volume_create_with_snapshot(self):
             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 @@ def test_volume_create_with_source_volume(self):
             source_volid=self.new_volume.id,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -479,7 +405,6 @@ def test_volume_create_with_bootable_and_readonly(self, mock_wait):
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -525,7 +450,6 @@ def test_volume_create_with_nonbootable_and_readwrite(self, mock_wait):
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -580,7 +504,6 @@ def test_volume_create_with_bootable_and_readonly_fail(
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(2, mock_error.call_count)
@@ -632,7 +555,6 @@ def test_volume_create_non_available_with_readonly(
             source_volid=None,
             consistencygroup_id=None,
             scheduler_hints=None,
-            backup_id=None,
         )
 
         self.assertEqual(2, mock_error.call_count)
@@ -742,7 +664,6 @@ def test_volume_create_hints(self):
                 'local_to_instance': 'v6',
                 'different_host': ['v5', 'v7'],
             },
-            backup_id=None,
         )
 
         self.assertEqual(self.columns, columns)
@@ -789,7 +710,7 @@ def test_volume_delete_multi_volumes(self):
 
         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 @@ def test_volume_show(self):
         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,
         )