Merge "Add volume-rebuild support to cinder module"

Author: Zuul

nova/tests/unit/volume/test_cinder.py

@@ -1046,6 +1046,17 @@ def test_get_volume_encryption_metadata(self, mock_cinderclient):
         mock_volumes.get_encryption_metadata.assert_called_once_with(
             {'encryption_key_id': 'fake_key'})
 
+    @mock.patch('nova.volume.cinder.cinderclient')
+    def test_volume_reimage(self, mock_cinderclient):
+        mock_reimage = mock.MagicMock()
+        mock_volumes = mock.MagicMock(reimage=mock_reimage)
+        mock_cinderclient.return_value = mock.MagicMock(volumes=mock_volumes)
+        self.api.reimage_volume(
+            self.ctx, uuids.volume_id, uuids.image_id,
+            reimage_reserved=True)
+        mock_cinderclient.assert_called_once_with(self.ctx, '3.68')
+        mock_reimage.assert_called_with(uuids.volume_id, uuids.image_id, True)
+
     def test_translate_cinder_exception_no_error(self):
         my_func = mock.Mock()
         my_func.__name__ = 'my_func'

nova/volume/cinder.py

@@ -924,3 +924,9 @@ def attachment_complete(self, context, attachment_id):
                           {'id': attachment_id,
                            'msg': str(ex),
                            'code': getattr(ex, 'code', None)})
+
+    @translate_volume_exception
+    def reimage_volume(self, context, volume_id, image_id,
+                       reimage_reserved=False):
+        cinderclient(context, '3.68').volumes.reimage(
+            volume_id, image_id, reimage_reserved)