Merge "tests: Use SDK objects for volume tests"

Author: Zuul

openstackclient/tests/unit/common/test_availability_zone.py

@@ -10,13 +10,23 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
+import uuid
+
+from openstack.block_storage.v3 import availability_zone as _volume_az
+
 from openstackclient.common import availability_zone
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.network.v2 import fakes as network_fakes
 from openstackclient.tests.unit import utils
 from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
 
 
+def _create_fake_volume_az():
+    return _volume_az.AvailabilityZone(
+        name=uuid.uuid4().hex, state={'available': True}
+    )
+
+
 def _build_compute_az_datalist(compute_az, long_datalist=False):
     datalist = ()
     if not long_datalist:
@@ -86,7 +96,7 @@ def setUp(self):
         self.compute_client.availability_zones.return_value = self.compute_azs
         self.network_azs = network_fakes.create_availability_zones()
         self.network_client.availability_zones.return_value = self.network_azs
-        self.volume_azs = volume_fakes.create_availability_zones(count=1)
+        self.volume_azs = [_create_fake_volume_az()]
         self.volume_sdk_client.availability_zones.return_value = (
             self.volume_azs
         )

openstackclient/tests/unit/common/test_extension.py

@@ -10,7 +10,9 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-from openstack.identity.v2 import extension as _extension
+
+from openstack.block_storage.v3 import extension as _volume_extension
+from openstack.identity.v2 import extension as _identity_extension
 from openstack.test import fakes as sdk_fakes
 
 from openstackclient.common import extension
@@ -42,8 +44,12 @@ class TestExtensionList(TestExtension):
         'Links',
     )
 
-    volume_extension = volume_fakes.create_one_extension()
-    identity_extension = sdk_fakes.generate_fake_resource(_extension.Extension)
+    volume_extension = sdk_fakes.generate_fake_resource(
+        _volume_extension.Extension
+    )
+    identity_extension = sdk_fakes.generate_fake_resource(
+        _identity_extension.Extension
+    )
     compute_extension = compute_fakes.create_one_extension()
     network_extension = network_fakes.create_one_extension()
 

openstackclient/tests/unit/common/test_limits.py

@@ -9,13 +9,59 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
+
+from openstack.block_storage.v3 import limits as _volume_limits
 
 from openstackclient.common import limits
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
 
 
+def _create_fake_volume_limits():
+    return _volume_limits.Limit(
+        absolute={
+            'totalSnapshotsUsed': 1,
+            'maxTotalBackups': 10,
+            'maxTotalVolumeGigabytes': 1000,
+            'maxTotalSnapshots': 10,
+            'maxTotalBackupGigabytes': 1000,
+            'totalBackupGigabytesUsed': 0,
+            'maxTotalVolumes': 10,
+            'totalVolumesUsed': 4,
+            'totalBackupsUsed': 0,
+            'totalGigabytesUsed': 35,
+        },
+        rate=[
+            {
+                "uri": "*",
+                "limit": [
+                    {
+                        "value": 10,
+                        "verb": "POST",
+                        "remaining": 2,
+                        "unit": "MINUTE",
+                        "next-available": "2011-12-15T22:42:45Z",
+                    },
+                    {
+                        "value": 10,
+                        "verb": "PUT",
+                        "remaining": 2,
+                        "unit": "MINUTE",
+                        "next-available": "2011-12-15T22:42:45Z",
+                    },
+                    {
+                        "value": 100,
+                        "verb": "DELETE",
+                        "remaining": 100,
+                        "unit": "MINUTE",
+                        "next-available": "2011-12-15T22:42:45Z",
+                    },
+                ],
+            }
+        ],
+    )
+
+
 class TestComputeLimits(compute_fakes.TestCompute):
     absolute_columns = ['Name', 'Value']
     rate_columns = ["Verb", "URI", "Value", "Remain", "Unit", "Next Available"]
@@ -101,7 +147,7 @@ def setUp(self):
         super().setUp()
         self.app.client_manager.compute_endpoint_enabled = False
 
-        self.fake_limits = volume_fakes.create_limits()
+        self.fake_limits = _create_fake_volume_limits()
 
         self.absolute_data = [
             ('max_total_backup_gigabytes', 1000),

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

@@ -38,7 +38,6 @@
 from openstackclient.tests.unit.image.v2 import fakes as image_fakes
 from openstackclient.tests.unit.network.v2 import fakes as network_fakes
 from openstackclient.tests.unit import utils as test_utils
-from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
 
 
 class TestPowerStateColumn(test_utils.TestCase):
@@ -2541,7 +2540,7 @@ def test_server_create_with_block_device(self):
     def test_server_create_with_block_device_full(self):
         self.set_compute_api_version('2.67')
 
-        self.volume_alt = volume_fakes.create_one_volume()
+        self.volume_alt = sdk_fakes.generate_fake_resource(_volume.Volume)
         block_device = (
             f'uuid={self.volume.id},source_type=volume,'
             f'destination_type=volume,disk_bus=ide,device_type=disk,'