python-openstackclient 6.3.0__py3-none-any.whl → 6.5.0__py3-none-any.whl

openstackclient/tests/unit/volume/v3/test_block_storage_resource_filter.py

@@ -10,7 +10,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 from cinderclient import api_versions
+from openstack import utils as sdk_utils
+from osc_lib.cli import format_columns
 from osc_lib import exceptions
 
 from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
@@ -21,11 +25,22 @@ class TestBlockStorageResourceFilter(volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
 
-        # Get a shortcut to the ResourceFilterManager Mock
-        self.resource_filter_mock = (
-            self.app.client_manager.volume.resource_filters
+        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)
         )
-        self.resource_filter_mock.reset_mock()
 
 
 class TestBlockStorageResourceFilterList(TestBlockStorageResourceFilter):
@@ -35,7 +50,7 @@ class TestBlockStorageResourceFilterList(TestBlockStorageResourceFilter):
     def setUp(self):
         super().setUp()
 
-        self.resource_filter_mock.list.return_value = (
+        self.volume_sdk_client.resource_filters.return_value = (
             self.fake_resource_filters
         )
 
@@ -47,9 +62,7 @@ class TestBlockStorageResourceFilterList(TestBlockStorageResourceFilter):
         )
 
     def test_resource_filter_list(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.33'
-        )
+        self._set_mock_microversion('3.33')
 
         arglist = []
         verifylist = []
@@ -59,7 +72,7 @@ class TestBlockStorageResourceFilterList(TestBlockStorageResourceFilter):
         expected_data = tuple(
             (
                 resource_filter.resource,
-                resource_filter.filters,
+                format_columns.ListColumn(resource_filter.filters),
             )
             for resource_filter in self.fake_resource_filters
         )
@@ -69,12 +82,10 @@ class TestBlockStorageResourceFilterList(TestBlockStorageResourceFilter):
         self.assertEqual(expected_data, tuple(data))
 
         # checking if proper call was made to list clusters
-        self.resource_filter_mock.list.assert_called_with()
+        self.volume_sdk_client.resource_filters.assert_called_with()
 
     def test_resource_filter_list_pre_v333(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.32'
-        )
+        self._set_mock_microversion('3.32')
 
         arglist = []
         verifylist = []
@@ -95,7 +106,7 @@ class TestBlockStorageResourceFilterShow(TestBlockStorageResourceFilter):
     def setUp(self):
         super().setUp()
 
-        self.resource_filter_mock.list.return_value = iter(
+        self.volume_sdk_client.resource_filters.return_value = iter(
             [self.fake_resource_filter]
         )
 
@@ -107,9 +118,7 @@ class TestBlockStorageResourceFilterShow(TestBlockStorageResourceFilter):
         )
 
     def test_resource_filter_show(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.33'
-        )
+        self._set_mock_microversion('3.33')
 
         arglist = [
             self.fake_resource_filter.resource,
@@ -119,10 +128,10 @@ class TestBlockStorageResourceFilterShow(TestBlockStorageResourceFilter):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        expected_columns = ('filters', 'resource')
+        expected_columns = ('Resource', 'Filters')
         expected_data = (
-            self.fake_resource_filter.filters,
             self.fake_resource_filter.resource,
+            format_columns.ListColumn(self.fake_resource_filter.filters),
         )
         columns, data = self.cmd.take_action(parsed_args)
 
@@ -130,12 +139,12 @@ class TestBlockStorageResourceFilterShow(TestBlockStorageResourceFilter):
         self.assertEqual(expected_data, data)
 
         # checking if proper call was made to list clusters
-        self.resource_filter_mock.list.assert_called_with(resource='volume')
+        self.volume_sdk_client.resource_filters.assert_called_with(
+            resource='volume'
+        )
 
     def test_resource_filter_show_pre_v333(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.32'
-        )
+        self._set_mock_microversion('3.32')
 
         arglist = [
             self.fake_resource_filter.resource,

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

@@ -16,30 +16,29 @@ import copy
 from unittest import mock
 
 from cinderclient import api_versions
+from openstack.block_storage.v3 import block_storage_summary as _summary
+from openstack.block_storage.v3 import snapshot as _snapshot
+from openstack.block_storage.v3 import volume as _volume
+from openstack.test import fakes as sdk_fakes
 from openstack import utils as sdk_utils
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 
-from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
-from openstackclient.tests.unit.volume.v3 import fakes as v3_fakes
+from openstackclient.tests.unit.volume.v3 import fakes
 from openstackclient.volume.v3 import volume
 
 
-class BaseVolumeTest(volume_fakes.TestVolume):
+class BaseVolumeTest(fakes.TestVolume):
     def setUp(self):
         super().setUp()
 
-        self.app.client_manager.sdk_connection = mock.Mock()
-        self.app.client_manager.sdk_connection.volume = mock.Mock()
-        self.sdk_client = self.app.client_manager.sdk_connection.volume
-
         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()
+            self.volume_client.api_version.get_string()
         )
 
     def _set_mock_microversion(self, mock_v):
@@ -60,12 +59,14 @@ class TestVolumeSummary(BaseVolumeTest):
     def setUp(self):
         super().setUp()
 
-        self.mock_vol_1 = volume_fakes.create_one_volume()
-        self.mock_vol_2 = volume_fakes.create_one_volume()
-        block_storage_summary = v3_fakes.get_one_block_storage_summary(
-            self.mock_vol_1.size + self.mock_vol_2.size
+        self.volume_a = sdk_fakes.generate_fake_resource(_volume.Volume)
+        self.volume_b = sdk_fakes.generate_fake_resource(_volume.Volume)
+        self.summary = sdk_fakes.generate_fake_resource(
+            _summary.BlockStorageSummary,
+            total_count=2,
+            total_size=self.volume_a.size + self.volume_b.size,
         )
-        self.sdk_client.summary.return_value = block_storage_summary
+        self.volume_sdk_client.summary.return_value = self.summary
 
         # Get the command object to test
         self.cmd = volume.VolumeSummary(self.app, None)
@@ -82,11 +83,11 @@ class TestVolumeSummary(BaseVolumeTest):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.summary.assert_called_once_with(True)
+        self.volume_sdk_client.summary.assert_called_once_with(True)
 
         self.assertEqual(self.columns, columns)
 
-        datalist = (2, self.mock_vol_1.size + self.mock_vol_2.size)
+        datalist = (2, self.volume_a.size + self.volume_b.size)
         self.assertCountEqual(datalist, tuple(data))
 
     def test_volume_summary_pre_312(self):
@@ -108,11 +109,14 @@ class TestVolumeSummary(BaseVolumeTest):
     def test_volume_summary_with_metadata(self):
         self._set_mock_microversion('3.36')
 
-        combine_meta = {**self.mock_vol_1.metadata, **self.mock_vol_2.metadata}
-        block_storage_summary = v3_fakes.get_one_block_storage_summary(
-            self.mock_vol_1.size + self.mock_vol_2.size, metadata=combine_meta
+        metadata = {**self.volume_a.metadata, **self.volume_b.metadata}
+        self.summary = sdk_fakes.generate_fake_resource(
+            _summary.BlockStorageSummary,
+            total_count=2,
+            total_size=self.volume_a.size + self.volume_b.size,
+            metadata=metadata,
         )
-        self.sdk_client.summary.return_value = block_storage_summary
+        self.volume_sdk_client.summary.return_value = self.summary
 
         new_cols = copy.deepcopy(self.columns)
         new_cols.extend(['Metadata'])
@@ -127,14 +131,14 @@ class TestVolumeSummary(BaseVolumeTest):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.summary.assert_called_once_with(True)
+        self.volume_sdk_client.summary.assert_called_once_with(True)
 
         self.assertEqual(new_cols, columns)
 
         datalist = (
             2,
-            self.mock_vol_1.size + self.mock_vol_2.size,
-            format_columns.DictColumn(combine_meta),
+            self.volume_a.size + self.volume_b.size,
+            format_columns.DictColumn(metadata),
         )
         self.assertCountEqual(datalist, tuple(data))
 
@@ -143,20 +147,23 @@ class TestVolumeRevertToSnapshot(BaseVolumeTest):
     def setUp(self):
         super().setUp()
 
-        self.mock_volume = volume_fakes.create_one_volume()
-        self.mock_snapshot = volume_fakes.create_one_snapshot(
-            attrs={'volume_id': self.mock_volume.id}
+        self.volume = sdk_fakes.generate_fake_resource(_volume.Volume)
+        self.snapshot = sdk_fakes.generate_fake_resource(
+            _snapshot.Snapshot,
+            volume_id=self.volume.id,
         )
+        self.volume_sdk_client.find_volume.return_value = self.volume
+        self.volume_sdk_client.find_snapshot.return_value = self.snapshot
 
         # Get the command object to test
         self.cmd = volume.VolumeRevertToSnapshot(self.app, None)
 
     def test_volume_revert_to_snapshot_pre_340(self):
         arglist = [
-            self.mock_snapshot.id,
+            self.snapshot.id,
         ]
         verifylist = [
-            ('snapshot', self.mock_snapshot.id),
+            ('snapshot', self.snapshot.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -170,29 +177,24 @@ class TestVolumeRevertToSnapshot(BaseVolumeTest):
     def test_volume_revert_to_snapshot(self):
         self._set_mock_microversion('3.40')
         arglist = [
-            self.mock_snapshot.id,
+            self.snapshot.id,
         ]
         verifylist = [
-            ('snapshot', self.mock_snapshot.id),
+            ('snapshot', self.snapshot.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        with mock.patch.object(
-            self.sdk_client, 'find_volume', return_value=self.mock_volume
-        ), mock.patch.object(
-            self.sdk_client, 'find_snapshot', return_value=self.mock_snapshot
-        ):
-            self.cmd.take_action(parsed_args)
-
-            self.sdk_client.revert_volume_to_snapshot.assert_called_once_with(
-                self.mock_volume,
-                self.mock_snapshot,
-            )
-            self.sdk_client.find_volume.assert_called_with(
-                self.mock_volume.id,
-                ignore_missing=False,
-            )
-            self.sdk_client.find_snapshot.assert_called_with(
-                self.mock_snapshot.id,
-                ignore_missing=False,
-            )
+        self.cmd.take_action(parsed_args)
+
+        self.volume_sdk_client.revert_volume_to_snapshot.assert_called_once_with(
+            self.volume,
+            self.snapshot,
+        )
+        self.volume_sdk_client.find_volume.assert_called_with(
+            self.volume.id,
+            ignore_missing=False,
+        )
+        self.volume_sdk_client.find_snapshot.assert_called_with(
+            self.snapshot.id,
+            ignore_missing=False,
+        )

openstackclient/tests/unit/volume/v3/test_volume_attachment.py

@@ -24,18 +24,16 @@ class TestVolumeAttachment(volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
 
-        self.volumes_mock = self.app.client_manager.volume.volumes
+        self.volumes_mock = self.volume_client.volumes
         self.volumes_mock.reset_mock()
 
-        self.volume_attachments_mock = (
-            self.app.client_manager.volume.attachments
-        )
+        self.volume_attachments_mock = self.volume_client.attachments
         self.volume_attachments_mock.reset_mock()
 
         self.projects_mock = self.app.client_manager.identity.projects
         self.projects_mock.reset_mock()
 
-        self.servers_mock = self.app.client_manager.compute.servers
+        self.servers_mock = self.compute_client.servers
         self.servers_mock.reset_mock()
 
 
@@ -80,9 +78,7 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment):
         self.cmd = volume_attachment.CreateVolumeAttachment(self.app, None)
 
     def test_volume_attachment_create(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.27'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.27')
 
         arglist = [
             self.volume.id,
@@ -117,9 +113,7 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment):
         self.assertCountEqual(self.data, data)
 
     def test_volume_attachment_create_with_connect(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.54'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.54')
 
         arglist = [
             self.volume.id,
@@ -182,9 +176,7 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment):
         self.assertCountEqual(self.data, data)
 
     def test_volume_attachment_create_pre_v327(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.26'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.26')
 
         arglist = [
             self.volume.id,
@@ -204,9 +196,7 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment):
         )
 
     def test_volume_attachment_create_with_mode_pre_v354(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.53'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.53')
 
         arglist = [
             self.volume.id,
@@ -229,9 +219,7 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment):
         )
 
     def test_volume_attachment_create_with_connect_missing_arg(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.54'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.54')
 
         arglist = [
             self.volume.id,
@@ -266,9 +254,7 @@ class TestVolumeAttachmentDelete(TestVolumeAttachment):
         self.cmd = volume_attachment.DeleteVolumeAttachment(self.app, None)
 
     def test_volume_attachment_delete(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.27'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.27')
 
         arglist = [
             self.volume_attachment.id,
@@ -286,9 +272,7 @@ class TestVolumeAttachmentDelete(TestVolumeAttachment):
         self.assertIsNone(result)
 
     def test_volume_attachment_delete_pre_v327(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.26'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.26')
 
         arglist = [
             self.volume_attachment.id,
@@ -340,9 +324,7 @@ class TestVolumeAttachmentSet(TestVolumeAttachment):
         self.cmd = volume_attachment.SetVolumeAttachment(self.app, None)
 
     def test_volume_attachment_set(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.27'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.27')
 
         arglist = [
             self.volume_attachment.id,
@@ -394,9 +376,7 @@ class TestVolumeAttachmentSet(TestVolumeAttachment):
         self.assertCountEqual(self.data, data)
 
     def test_volume_attachment_set_pre_v327(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.26'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.26')
 
         arglist = [
             self.volume_attachment.id,
@@ -428,9 +408,7 @@ class TestVolumeAttachmentComplete(TestVolumeAttachment):
         self.cmd = volume_attachment.CompleteVolumeAttachment(self.app, None)
 
     def test_volume_attachment_complete(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.44'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.44')
 
         arglist = [
             self.volume_attachment.id,
@@ -448,9 +426,7 @@ class TestVolumeAttachmentComplete(TestVolumeAttachment):
         self.assertIsNone(result)
 
     def test_volume_attachment_complete_pre_v344(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.43'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.43')
 
         arglist = [
             self.volume_attachment.id,
@@ -499,9 +475,7 @@ class TestVolumeAttachmentList(TestVolumeAttachment):
         self.cmd = volume_attachment.ListVolumeAttachment(self.app, None)
 
     def test_volume_attachment_list(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.27'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.27')
 
         arglist = []
         verifylist = [
@@ -530,9 +504,7 @@ class TestVolumeAttachmentList(TestVolumeAttachment):
         self.assertCountEqual(tuple(self.data), data)
 
     def test_volume_attachment_list_with_options(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.27'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.27')
 
         arglist = [
             '--project',
@@ -572,9 +544,7 @@ class TestVolumeAttachmentList(TestVolumeAttachment):
         self.assertCountEqual(tuple(self.data), data)
 
     def test_volume_attachment_list_pre_v327(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.26'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.26')
 
         arglist = []
         verifylist = [