Merge "volume: Use force delete param when possible"

Author: Zuul

openstack/block_storage/v3/_proxy.py

@@ -761,11 +761,16 @@ def delete_volume(
         :returns: ``None``
         """
         volume = self._get_resource(_volume.Volume, volume)
+
+        params = {'cascade': cascade}
+        if utils.supports_microversion(self, '3.23'):
+            params['force'] = force
+
         try:
-            if not force:
-                volume.delete(self, params={'cascade': cascade})
-            else:
+            if force and not utils.supports_microversion(self, '3.23'):
                 volume.force_delete(self)
+            else:
+                volume.delete(self, params=params)
         except exceptions.NotFoundException:
             if ignore_missing:
                 return None

openstack/tests/unit/block_storage/v3/test_proxy.py

@@ -74,7 +74,12 @@ def test_volumes_not_detailed(self):
     def test_volume_create_attrs(self):
         self.verify_create(self.proxy.create_volume, volume.Volume)
 
-    def test_volume_delete(self):
+    @mock.patch(
+        'openstack.utils.supports_microversion',
+        autospec=True,
+        return_value=False,
+    )
+    def test_volume_delete(self, mock_mv):
         self._verify(
             "openstack.block_storage.v3.volume.Volume.delete",
             self.proxy.delete_volume,
@@ -83,7 +88,12 @@ def test_volume_delete(self):
             expected_kwargs={"params": {"cascade": False}},
         )
 
-    def test_volume_delete_force(self):
+    @mock.patch(
+        'openstack.utils.supports_microversion',
+        autospec=True,
+        return_value=False,
+    )
+    def test_volume_delete_force(self, mock_mv):
         self._verify(
             "openstack.block_storage.v3.volume.Volume.force_delete",
             self.proxy.delete_volume,
@@ -92,6 +102,21 @@ def test_volume_delete_force(self):
             expected_args=[self.proxy],
         )
 
+    @mock.patch(
+        'openstack.utils.supports_microversion',
+        autospec=True,
+        return_value=True,
+    )
+    def test_volume_delete_force_v323(self, mock_mv):
+        self._verify(
+            "openstack.block_storage.v3.volume.Volume.delete",
+            self.proxy.delete_volume,
+            method_args=["value"],
+            method_kwargs={"force": True},
+            expected_args=[self.proxy],
+            expected_kwargs={"params": {"cascade": False, "force": True}},
+        )
+
     def test_get_volume_metadata(self):
         self._verify(
             "openstack.block_storage.v3.volume.Volume.fetch_metadata",