tests: Remove unnecessary nesting of volume resources

Change-Id: I210ce7534d161e89115e5cb96e42ab7f27170aa1
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

Author: stephenfin

openstackclient/tests/unit/common/test_availability_zone.py

@@ -78,7 +78,7 @@ def _build_network_az_datalist(network_az, long_datalist=False):
 class TestAvailabilityZone(utils.TestCommand):
 
     def setUp(self):
-        super(TestAvailabilityZone, self).setUp()
+        super().setUp()
 
         compute_client = compute_fakes.FakeComputev2Client(
             endpoint=fakes.AUTH_URL,
@@ -113,8 +113,7 @@ class TestAvailabilityZoneList(TestAvailabilityZone):
 
     compute_azs = \
         compute_fakes.FakeAvailabilityZone.create_availability_zones()
-    volume_azs = \
-        volume_fakes.FakeAvailabilityZone.create_availability_zones(count=1)
+    volume_azs = volume_fakes.create_availability_zones(count=1)
     network_azs = network_fakes.create_availability_zones()
 
     short_columnslist = ('Zone Name', 'Zone Status')
@@ -128,7 +127,7 @@ class TestAvailabilityZoneList(TestAvailabilityZone):
     )
 
     def setUp(self):
-        super(TestAvailabilityZoneList, self).setUp()
+        super().setUp()
 
         self.compute_azs_mock.list.return_value = self.compute_azs
         self.volume_azs_mock.list.return_value = self.volume_azs

openstackclient/tests/unit/common/test_extension.py

@@ -26,7 +26,7 @@
 class TestExtension(utils.TestCommand):
 
     def setUp(self):
-        super(TestExtension, self).setUp()
+        super().setUp()
 
         identity_client = identity_fakes.FakeIdentityv2Client(
             endpoint=fakes.AUTH_URL,
@@ -66,13 +66,13 @@ class TestExtensionList(TestExtension):
     long_columns = ('Name', 'Alias', 'Description', 'Namespace', 'Updated',
                     'Links')
 
-    volume_extension = volume_fakes.FakeExtension.create_one_extension()
+    volume_extension = volume_fakes.create_one_extension()
     identity_extension = identity_fakes.FakeExtension.create_one_extension()
     compute_extension = compute_fakes.FakeExtension.create_one_extension()
     network_extension = network_fakes.FakeExtension.create_one_extension()
 
     def setUp(self):
-        super(TestExtensionList, self).setUp()
+        super().setUp()
 
         self.identity_extensions_mock.list.return_value = [
             self.identity_extension]
@@ -310,7 +310,7 @@ class TestExtensionShow(TestExtension):
     )
 
     def setUp(self):
-        super(TestExtensionShow, self).setUp()
+        super().setUp()
 
         self.cmd = extension.ShowExtension(self.app, None)
 

openstackclient/tests/unit/common/test_limits.py

@@ -33,7 +33,7 @@ class TestComputeLimits(compute_fakes.TestComputev2):
     ]
 
     def setUp(self):
-        super(TestComputeLimits, self).setUp()
+        super().setUp()
         self.app.client_manager.volume_endpoint_enabled = False
         self.compute = self.app.client_manager.compute
 
@@ -87,7 +87,7 @@ class TestVolumeLimits(volume_fakes.TestVolume):
     ]
 
     def setUp(self):
-        super(TestVolumeLimits, self).setUp()
+        super().setUp()
         self.app.client_manager.compute_endpoint_enabled = False
         self.volume = self.app.client_manager.volume
 

openstackclient/tests/unit/common/test_project_purge.py

@@ -26,7 +26,7 @@
 class TestProjectPurgeInit(tests_utils.TestCommand):
 
     def setUp(self):
-        super(TestProjectPurgeInit, self).setUp()
+        super().setUp()
         compute_client = compute_fakes.FakeComputev2Client(
             endpoint=fakes.AUTH_URL,
             token=fakes.AUTH_TOKEN,
@@ -71,12 +71,12 @@ class TestProjectPurge(TestProjectPurgeInit):
     project = identity_fakes.FakeProject.create_one_project()
     server = compute_fakes.FakeServer.create_one_server()
     image = image_fakes.create_one_image()
-    volume = volume_fakes.FakeVolume.create_one_volume()
-    backup = volume_fakes.FakeBackup.create_one_backup()
-    snapshot = volume_fakes.FakeSnapshot.create_one_snapshot()
+    volume = volume_fakes.create_one_volume()
+    backup = volume_fakes.create_one_backup()
+    snapshot = volume_fakes.create_one_snapshot()
 
     def setUp(self):
-        super(TestProjectPurge, self).setUp()
+        super().setUp()
         self.projects_mock.get.return_value = self.project
         self.projects_mock.delete.return_value = None
         self.images_mock.list.return_value = [self.image]

openstackclient/tests/unit/common/test_quota.py

@@ -176,12 +176,12 @@ def setUp(self):
         )
 
         self.volume_quotas = [
-            volume_fakes.FakeQuota.create_one_vol_quota(),
-            volume_fakes.FakeQuota.create_one_vol_quota(),
+            volume_fakes.create_one_vol_quota(),
+            volume_fakes.create_one_vol_quota(),
         ]
         self.volume_default_quotas = [
-            volume_fakes.FakeQuota.create_one_default_vol_quota(),
-            volume_fakes.FakeQuota.create_one_default_vol_quota(),
+            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(
@@ -280,8 +280,7 @@ def test_quota_list_details_network(self):
             sorted(detailed_reference_data), sorted(ret_quotas))
 
     def test_quota_list_details_volume(self):
-        detailed_quota = (
-            volume_fakes.FakeQuota.create_one_detailed_quota())
+        detailed_quota = volume_fakes.create_one_detailed_quota()
 
         detailed_column_header = (
             'Resource',
@@ -567,7 +566,7 @@ def test_quota_list_volume_default(self):
         self.volume.quotas.get = mock.Mock(
             side_effect=[
                 self.volume_quotas[0],
-                volume_fakes.FakeQuota.create_one_default_vol_quota(),
+                volume_fakes.create_one_default_vol_quota(),
             ],
         )
 
@@ -591,7 +590,7 @@ def test_quota_list_volume_no_project(self):
         self.volume.quotas.get = mock.Mock(
             side_effect=[
                 self.volume_quotas[0],
-                volume_fakes.FakeQuota.create_one_default_vol_quota(),
+                volume_fakes.create_one_default_vol_quota(),
             ],
         )
 
@@ -1046,10 +1045,9 @@ def setUp(self):
             loaded=True,
         )
 
-        self.volume_quota = volume_fakes.FakeQuota.create_one_vol_quota()
+        self.volume_quota = volume_fakes.create_one_vol_quota()
         self.volume_quotas_mock.get.return_value = self.volume_quota
-        self.volume_default_quota = \
-            volume_fakes.FakeQuota.create_one_default_vol_quota()
+        self.volume_default_quota = volume_fakes.create_one_default_vol_quota()
         self.volume_quotas_mock.defaults.return_value = \
             self.volume_default_quota
         self.volume_quotas_class_mock.get.return_value = FakeQuotaResource(
@@ -1217,8 +1215,7 @@ def test_quota_show__with_usage(self):
         self.compute_quota = \
             compute_fakes.FakeQuota.create_one_comp_detailed_quota()
         self.compute_quotas_mock.get.return_value = self.compute_quota
-        self.volume_quota = \
-            volume_fakes.FakeQuota.create_one_detailed_quota()
+        self.volume_quota = volume_fakes.create_one_detailed_quota()
         self.volume_quotas_mock.get.return_value = self.volume_quota
         self.network.get_quota.return_value = \
             network_fakes.FakeQuota.create_one_net_detailed_quota()

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

@@ -153,7 +153,7 @@ def setup_sdk_servers_mock(self, count):
         return servers
 
     def setup_sdk_volumes_mock(self, count):
-        volumes = volume_fakes.FakeVolume.create_sdk_volumes(count=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
@@ -1444,10 +1444,10 @@ def setUp(self):
         self.flavor = compute_fakes.FakeFlavor.create_one_flavor()
         self.flavors_mock.get.return_value = self.flavor
 
-        self.volume = volume_fakes.FakeVolume.create_one_volume()
+        self.volume = volume_fakes.create_one_volume()
         self.volumes_mock.get.return_value = self.volume
 
-        self.snapshot = volume_fakes.FakeSnapshot.create_one_snapshot()
+        self.snapshot = volume_fakes.create_one_snapshot()
         self.snapshots_mock.get.return_value = self.snapshot
 
         # Get the command object to test