Merge "tests: Use consistent shortcut to fake volume client"

Author: Zuul

openstackclient/tests/unit/common/test_availability_zone.py

@@ -87,8 +87,8 @@ def setUp(self):
         self.compute_client.availability_zones = mock.Mock()
 
         self.app.client_manager.sdk_connection.volume = mock.Mock()
-        self.volume_client = self.app.client_manager.sdk_connection.volume
-        self.volume_client.availability_zones = mock.Mock()
+        self.volume_sdk_client = self.app.client_manager.sdk_connection.volume
+        self.volume_sdk_client.availability_zones = mock.Mock()
 
 
 class TestAvailabilityZoneList(TestAvailabilityZone):
@@ -110,7 +110,9 @@ def setUp(self):
         super().setUp()
 
         self.compute_client.availability_zones.return_value = self.compute_azs
-        self.volume_client.availability_zones.return_value = self.volume_azs
+        self.volume_sdk_client.availability_zones.return_value = (
+            self.volume_azs
+        )
         self.network_client.availability_zones.return_value = self.network_azs
 
         # Get the command object to test
@@ -127,7 +129,7 @@ def test_availability_zone_list_no_options(self):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_called_with(details=True)
-        self.volume_client.availability_zones.assert_called_with()
+        self.volume_sdk_client.availability_zones.assert_called_with()
         self.network_client.availability_zones.assert_called_with()
 
         self.assertEqual(self.short_columnslist, columns)
@@ -155,7 +157,7 @@ def test_availability_zone_list_long(self):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_called_with(details=True)
-        self.volume_client.availability_zones.assert_called_with()
+        self.volume_sdk_client.availability_zones.assert_called_with()
         self.network_client.availability_zones.assert_called_with()
 
         self.assertEqual(self.long_columnslist, columns)
@@ -189,7 +191,7 @@ def test_availability_zone_list_compute(self):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_called_with(details=True)
-        self.volume_client.availability_zones.assert_not_called()
+        self.volume_sdk_client.availability_zones.assert_not_called()
         self.network_client.availability_zones.assert_not_called()
 
         self.assertEqual(self.short_columnslist, columns)
@@ -213,7 +215,7 @@ def test_availability_zone_list_volume(self):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_not_called()
-        self.volume_client.availability_zones.assert_called_with()
+        self.volume_sdk_client.availability_zones.assert_called_with()
         self.network_client.availability_zones.assert_not_called()
 
         self.assertEqual(self.short_columnslist, columns)
@@ -237,7 +239,7 @@ def test_availability_zone_list_network(self):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_not_called()
-        self.volume_client.availability_zones.assert_not_called()
+        self.volume_sdk_client.availability_zones.assert_not_called()
         self.network_client.availability_zones.assert_called_with()
 
         self.assertEqual(self.short_columnslist, columns)

openstackclient/tests/unit/common/test_limits.py

@@ -74,10 +74,9 @@ class TestVolumeLimits(volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
         self.app.client_manager.compute_endpoint_enabled = False
-        self.volume = self.app.client_manager.volume
 
         self.fake_limits = volume_fakes.FakeLimits()
-        self.volume.limits.get.return_value = self.fake_limits
+        self.volume_client.limits.get.return_value = self.fake_limits
 
     def test_volume_show_absolute(self):
         arglist = ['--absolute']

openstackclient/tests/unit/common/test_quota.py

@@ -55,11 +55,9 @@ def setUp(self):
         )
         self.compute_quotas_class_mock.reset_mock()
 
-        self.volume_quotas_mock = self.app.client_manager.volume.quotas
+        self.volume_quotas_mock = self.volume_client.quotas
         self.volume_quotas_mock.reset_mock()
-        self.volume_quotas_class_mock = (
-            self.app.client_manager.volume.quota_classes
-        )
+        self.volume_quotas_class_mock = self.volume_client.quota_classes
         self.volume_quotas_class_mock.reset_mock()
 
         self.app.client_manager.auth_ref = mock.Mock()
@@ -180,8 +178,7 @@ def setUp(self):
             volume_fakes.create_one_default_vol_quota(),
             volume_fakes.create_one_default_vol_quota(),
         ]
-        self.volume = self.app.client_manager.volume
-        self.volume.quotas.defaults = mock.Mock(
+        self.volume_client.quotas.defaults = mock.Mock(
             side_effect=self.volume_default_quotas,
         )
 
@@ -288,7 +285,7 @@ def test_quota_list_details_volume(self):
             detailed_quota
         )
 
-        self.volume.quotas.get = mock.Mock(return_value=detailed_quota)
+        self.volume_client.quotas.get = mock.Mock(return_value=detailed_quota)
 
         arglist = [
             '--detail',
@@ -541,7 +538,7 @@ def test_quota_list_network_by_project(self):
 
     def test_quota_list_volume(self):
         # Two projects with non-default quotas
-        self.volume.quotas.get = mock.Mock(
+        self.volume_client.quotas.get = mock.Mock(
             side_effect=self.volume_quotas,
         )
 
@@ -562,7 +559,7 @@ def test_quota_list_volume(self):
 
     def test_quota_list_volume_default(self):
         # Two projects with non-default quotas
-        self.volume.quotas.get = mock.Mock(
+        self.volume_client.quotas.get = mock.Mock(
             side_effect=[
                 self.volume_quotas[0],
                 volume_fakes.create_one_default_vol_quota(),
@@ -586,7 +583,7 @@ def test_quota_list_volume_default(self):
 
     def test_quota_list_volume_no_project(self):
         # Two projects with non-default quotas
-        self.volume.quotas.get = mock.Mock(
+        self.volume_client.quotas.get = mock.Mock(
             side_effect=[
                 self.volume_quotas[0],
                 volume_fakes.create_one_default_vol_quota(),
@@ -610,7 +607,7 @@ def test_quota_list_volume_no_project(self):
 
     def test_quota_list_volume_by_project(self):
         # Two projects with non-default quotas
-        self.volume.quotas.get = mock.Mock(
+        self.volume_client.quotas.get = mock.Mock(
             side_effect=self.volume_quotas,
         )
 

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

@@ -175,6 +175,7 @@ def setUp(self):
             endpoint=fakes.AUTH_URL,
             token=fakes.AUTH_TOKEN,
         )
+        self.volume_client = self.app.client_manager.volume
 
 
 def create_one_aggregate(attrs=None):

openstackclient/tests/unit/compute/v2/test_server.py

@@ -92,14 +92,14 @@ def setUp(self):
         self.flavors_mock.reset_mock()
 
         # Get a shortcut to the volume client VolumeManager Mock
-        self.volumes_mock = self.app.client_manager.volume.volumes
+        self.volumes_mock = self.volume_client.volumes
         self.volumes_mock.reset_mock()
 
         self.app.client_manager.sdk_connection.volume = mock.Mock()
-        self.sdk_volume_client = self.app.client_manager.sdk_connection.volume
+        self.volume_sdk_client = self.app.client_manager.sdk_connection.volume
 
         # Get a shortcut to the volume client VolumeManager Mock
-        self.snapshots_mock = self.app.client_manager.volume.volume_snapshots
+        self.snapshots_mock = self.volume_client.volume_snapshots
         self.snapshots_mock.reset_mock()
 
         # Set object attributes to be tested. Could be overwritten in subclass.
@@ -162,7 +162,7 @@ def setup_sdk_volumes_mock(self, count):
         volumes = volume_fakes.create_sdk_volumes(count=count)
 
         # This is the return value for volume_client.find_volume()
-        self.sdk_volume_client.find_volume.side_effect = volumes
+        self.volume_sdk_client.find_volume.side_effect = volumes
 
         return volumes
 

openstackclient/tests/unit/compute/v2/test_server_volume.py

@@ -29,7 +29,7 @@ def setUp(self):
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.app.client_manager.sdk_connection.volume = mock.Mock()
         self.compute_client = self.app.client_manager.sdk_connection.compute
-        self.volume_client = self.app.client_manager.sdk_connection.volume
+        self.volume_sdk_client = self.app.client_manager.sdk_connection.volume
 
 
 class TestServerVolumeList(TestServerVolume):
@@ -243,7 +243,7 @@ def setUp(self):
         self.compute_client.find_server.return_value = self.server
 
         self.volume = volume_fakes.create_one_sdk_volume()
-        self.volume_client.find_volume.return_value = self.volume
+        self.volume_sdk_client.find_volume.return_value = self.volume
 
         # Get the command object to test
         self.cmd = server_volume.UpdateServerVolume(self.app, None)

openstackclient/tests/unit/image/v1/fakes.py

@@ -39,6 +39,7 @@ def setUp(self):
             endpoint=fakes.AUTH_URL,
             token=fakes.AUTH_TOKEN,
         )
+        self.volume_client = self.app.client_manager.volume
 
 
 def create_one_image(attrs=None):

openstackclient/tests/unit/image/v1/test_image.py

@@ -593,7 +593,7 @@ def test_image_set_properties(self):
 
     def test_image_update_volume(self):
         # Set up VolumeManager Mock
-        volumes_mock = self.app.client_manager.volume.volumes
+        volumes_mock = self.volume_client.volumes
         volumes_mock.reset_mock()
         volumes_mock.get.return_value = fakes.FakeResource(
             None,

openstackclient/tests/unit/image/v2/test_image.py

@@ -37,7 +37,7 @@ def setUp(self):
         self.project_mock.reset_mock()
         self.domain_mock = self.app.client_manager.identity.domains
         self.domain_mock.reset_mock()
-        self.volumes_mock = self.app.client_manager.volume.volumes
+        self.volumes_mock = self.volume_client.volumes
         fake_body = {
             'os-volume_upload_image': {'volume_type': {'name': 'fake_type'}}
         }
@@ -369,9 +369,7 @@ class FakeVolume:
     @mock.patch('osc_lib.utils.find_resource')
     @mock.patch('openstackclient.image.v2.image.get_data_from_stdin')
     def test_image_create_from_volume_v31(self, mock_get_data_f, mock_get_vol):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.1'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.1')
 
         fake_vol_id = 'fake-volume-id'
         mock_get_data_f.return_value = None

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

@@ -61,6 +61,7 @@ def setUp(self):
             endpoint=fakes.AUTH_URL,
             token=fakes.AUTH_TOKEN,
         )
+        self.volume_client = self.app.client_manager.volume
 
         self.app.client_manager.identity = identity_fakes.FakeIdentityv2Client(
             endpoint=fakes.AUTH_URL,