Update the exception class of the plugins

Change-Id: Id96edc25c12045453cc9c85c51bd826eaabda8e4

karbor/exception.py

@@ -293,11 +293,6 @@ class CheckpointRecordNotFound(NotFound):
     message = _("CheckpointRecord %(id)s could not be found.")
 
 
-class CreateBackupFailed(KarborException):
-    message = _("Create Backup failed: %(reason)s, id=%(resource_id)s,"
-                " type=%(resource_type)s")
-
-
 class CreateResourceFailed(KarborException):
     message = _("Create %(name)s failed: %(reason)s, id=%(resource_id)s,"
                 " type=%(resource_type)s")
@@ -313,16 +308,6 @@ class RestoreResourceFailed(KarborException):
                 " type=%(resource_type)s")
 
 
-class DeleteBackupFailed(KarborException):
-    message = _("Delete Backup failed: %(reason)s, id=%(resource_id)s,"
-                " type=%(resource_type)s")
-
-
-class RestoreBackupFailed(KarborException):
-    message = _("Restore Backup failed: %(reason)s, id=%(resource_id)s,"
-                " type=%(resource_type)s")
-
-
 class GetBackupFailed(KarborException):
     message = _("Get Backup failed: %(reason)s, id=%(resource_id)s,"
                 " type=%(resource_type)s")

karbor/services/protection/protection_plugins/image/image_protection_plugin.py

@@ -78,7 +78,8 @@ class ProtectOperation(protection_plugin.Operation):
                 if is_success is not True:
                     LOG.error("The status of image (id: %s) is invalid.",
                               image_id)
-                    raise exception.CreateBackupFailed(
+                    raise exception.CreateResourceFailed(
+                        name="Image Backup",
                         reason="The status of image is invalid.",
                         resource_id=image_id,
                         resource_type=constants.IMAGE_RESOURCE_TYPE)
@@ -95,7 +96,8 @@ class ProtectOperation(protection_plugin.Operation):
             LOG.error("Create image backup failed, image_id: %s.", image_id)
             bank_section.update_object("status",
                                        constants.RESOURCE_STATUS_ERROR)
-            raise exception.CreateBackupFailed(
+            raise exception.CreateResourceFailed(
+                name="Image Backup",
                 reason=err,
                 resource_id=image_id,
                 resource_type=constants.IMAGE_RESOURCE_TYPE)
@@ -150,7 +152,8 @@ class ProtectOperation(protection_plugin.Operation):
                           image_id)
             bank_section.update_object("status",
                                        constants.RESOURCE_STATUS_ERROR)
-            raise exception.CreateBackupFailed(
+            raise exception.CreateResourceFailed(
+                name="Image Backup",
                 reason=err,
                 resource_id=image_id,
                 resource_type=constants.IMAGE_RESOURCE_TYPE)
@@ -176,7 +179,8 @@ class DeleteOperation(protection_plugin.Operation):
             LOG.error("delete image backup failed, image_id: %s.", image_id)
             bank_section.update_object("status",
                                        constants.RESOURCE_STATUS_ERROR)
-            raise exception.DeleteBackupFailed(
+            raise exception.DeleteResourceFailed(
+                name="Image Backup",
                 reason=err,
                 resource_id=image_id,
                 resource_type=constants.IMAGE_RESOURCE_TYPE)
@@ -209,7 +213,8 @@ class RestoreOperation(protection_plugin.Operation):
             if len(objects) != int(chunks_num):
                 LOG.debug('object num: {0}, chunk num: {1}'.
                           format(len(objects), chunks_num))
-                raise exception.RestoreBackupFailed(
+                raise exception.RestoreResourceFailed(
+                    name="Image Backup",
                     reason=" The chunks_num of restored image is invalid.",
                     resource_id=original_image_id,
                     resource_type=constants.IMAGE_RESOURCE_TYPE)
@@ -236,13 +241,15 @@ class RestoreOperation(protection_plugin.Operation):
                 if is_success is not True:
                     LOG.error('The status of image is invalid. status:%s',
                               image_info.status)
-                    raise exception.RestoreBackupFailed(
+                    raise exception.RestoreResourceFailed(
+                        name="Image Backup",
                         resource_id=image_info.id,
                         resource_type=constants.IMAGE_RESOURCE_TYPE)
 
             # check the checksum
             if image_info.checksum != image_metadata["checksum"]:
-                raise exception.RestoreBackupFailed(
+                raise exception.RestoreResourceFailed(
+                    name="Image Backup",
                     reason=" The checksum of restored image is invalid.",
                     resource_id=original_image_id,
                     resource_type=constants.IMAGE_RESOURCE_TYPE)
@@ -253,7 +260,8 @@ class RestoreOperation(protection_plugin.Operation):
             if image is not None and hasattr(image, 'id'):
                 LOG.info("Delete the failed image, image_id: %s.", image.id)
                 glance_client.images.delete(image.id)
-            raise exception.RestoreBackupFailed(
+            raise exception.RestoreResourceFailed(
+                name="Image Backup",
                 reason=e, resource_id=original_image_id,
                 resource_type=constants.IMAGE_RESOURCE_TYPE)
         LOG.info("Finish restoring image backup, image_id: %s.",

karbor/services/protection/protection_plugins/server/nova_protection_plugin.py

@@ -144,7 +144,8 @@ class ProtectOperation(protection_plugin.Operation):
             LOG.exception("Create backup failed, server_id: %s.", server_id)
             bank_section.update_object("status",
                                        constants.RESOURCE_STATUS_ERROR)
-            raise exception.CreateBackupFailed(
+            raise exception.CreateResourceFailed(
+                name="Server Backup",
                 reason=err,
                 resource_id=server_id,
                 resource_type=constants.SERVER_RESOURCE_TYPE)
@@ -173,7 +174,8 @@ class DeleteOperation(protection_plugin.Operation):
             LOG.error("Delete backup failed, server_id: %s.", resource_id)
             bank_section.update_object("status",
                                        constants.RESOURCE_STATUS_ERROR)
-            raise exception.DeleteBackupFailed(
+            raise exception.DeleteResourceFailed(
+                name="Server Backup",
                 reason=err,
                 resource_id=resource_id,
                 resource_type=constants.SERVER_RESOURCE_TYPE)
@@ -229,7 +231,8 @@ class RestoreOperation(protection_plugin.Operation):
                 update_method(constants.RESOURCE_STATUS_ERROR, str(e))
             LOG.exception("Restore server backup failed, server_id: %s.",
                           original_server_id)
-            raise exception.RestoreBackupFailed(
+            raise exception.RestoreResourceFailed(
+                name="Server Backup",
                 reason=e,
                 resource_id=original_server_id,
                 resource_type=constants.SERVER_RESOURCE_TYPE

karbor/services/protection/protection_plugins/volume/cinder_protection_plugin.py

@@ -161,7 +161,8 @@ class ProtectOperation(protection_plugin.Operation):
         except Exception:
             bank_section.update_object('status',
                                        constants.RESOURCE_STATUS_ERROR)
-            raise exception.CreateBackupFailed(
+            raise exception.CreateResourceFailed(
+                name="Volume Backup",
                 reason='Error creating snapshot for volume',
                 resource_id=volume_id,
                 resource_type=constants.VOLUME_RESOURCE_TYPE,
@@ -190,8 +191,9 @@ class ProtectOperation(protection_plugin.Operation):
         if not is_success:
             bank_section.update_object('status',
                                        constants.RESOURCE_STATUS_ERROR)
-            raise exception.CreateBackupFailed(
-                reason='Volume is in erroneous state',
+            raise exception.CreateResourceFailed(
+                name="Volume Backup",
+                reason='Volume is in errorneous state',
                 resource_id=volume_id,
                 resource_type=constants.VOLUME_RESOURCE_TYPE,
             )
@@ -221,7 +223,8 @@ class ProtectOperation(protection_plugin.Operation):
                       )
             bank_section.update_object('status',
                                        constants.RESOURCE_STATUS_ERROR)
-            raise exception.CreateBackupFailed(
+            raise exception.CreateResourceFailed(
+                name="Volume Backup",
                 reason=e,
                 resource_id=volume_id,
                 resource_type=constants.VOLUME_RESOURCE_TYPE,
@@ -291,7 +294,8 @@ class RestoreOperation(protection_plugin.Operation):
             reason = 'Error creating volume'
             update_method(constants.RESOURCE_STATUS_ERROR, reason)
 
-            raise exception.RestoreBackupFailed(
+            raise exception.RestoreResourceFailed(
+                name="Volume Backup",
                 reason=reason,
                 resource_id=resource_id,
                 resource_type=resource.type
@@ -344,7 +348,8 @@ class DeleteOperation(protection_plugin.Operation):
             LOG.error('delete volume backup failed, backup_id: %s', backup_id)
             bank_section.update_object('status',
                                        constants.RESOURCE_STATUS_ERROR)
-            raise exception.DeleteBackupFailed(
+            raise exception.DeleteResourceFailed(
+                name="Volume Backup",
                 reason=six.text_type(e),
                 resource_id=resource_id,
                 resource_type=constants.VOLUME_RESOURCE_TYPE

karbor/tests/unit/protection/test_cinder_protection_plugin.py

@@ -205,7 +205,7 @@ class CinderProtectionPluginTest(base.TestCase):
             mocks['volume_snapshots'].get = BackupResponse(
                 '789', 'available', 'creating', 2)
             self.assertRaises(
-                exception.CreateBackupFailed,
+                exception.CreateResourceFailed,
                 call_hooks,
                 operation,
                 checkpoint,
@@ -241,7 +241,7 @@ class CinderProtectionPluginTest(base.TestCase):
             mocks['volume_snapshots'].get = BackupResponse(
                 '789', 'error', 'creating', 2)
             self.assertRaises(
-                exception.CreateBackupFailed,
+                exception.CreateResourceFailed,
                 call_hooks,
                 operation,
                 checkpoint,
@@ -277,7 +277,7 @@ class CinderProtectionPluginTest(base.TestCase):
             mocks['volume_snapshots'].get = BackupResponse(
                 '789', 'available', 'creating', 2)
             self.assertRaises(
-                exception.CreateBackupFailed,
+                exception.CreateResourceFailed,
                 call_hooks,
                 operation,
                 checkpoint,
@@ -323,7 +323,7 @@ class CinderProtectionPluginTest(base.TestCase):
             backups.delete = BackupResponse('456', 'deleting', '---', 0)
             backups.get = BackupResponse('456', 'error', 'deleting', 2)
             self.assertRaises(
-                exception.DeleteBackupFailed,
+                exception.DeleteResourceFailed,
                 call_hooks,
                 operation,
                 checkpoint,
@@ -425,7 +425,7 @@ class CinderProtectionPluginTest(base.TestCase):
             mocks['volumes'].get.return_value.status = 'error'
             mocks['restores'].restore = RestoreResponse(volume_id)
             self.assertRaises(
-                exception.RestoreBackupFailed, call_hooks,
+                exception.RestoreResourceFailed, call_hooks,
                 operation, checkpoint, resource, self.cntxt,
                 {}, **{'restore':  None})