From 93de8e44e0555568c5c7373f321a63ad8c4a7276 Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Tue, 30 Dec 2025 14:31:27 +0530
Subject: [PATCH] Event typo fix

---
 .../ObjectInDataStoreStateMachine.java        |  6 +--
 .../manager/StorageCacheManagerImpl.java      |  2 +-
 .../motion/AncientDataMotionStrategy.java     |  4 +-
 .../StorageSystemDataMotionStrategy.java      | 12 ++---
 .../image/SecondaryStorageServiceImpl.java    |  4 +-
 .../storage/image/TemplateServiceImpl.java    | 14 +++---
 .../snapshot/DefaultSnapshotStrategy.java     |  2 +-
 .../storage/snapshot/SnapshotServiceImpl.java | 12 ++---
 .../datastore/DataObjectManagerImpl.java      |  8 ++--
 .../ObjectInDataStoreManagerImpl.java         | 16 +++----
 .../storage/volume/VolumeObject.java          |  2 +-
 .../storage/volume/VolumeServiceImpl.java     | 48 +++++++++----------
 .../storage/volume/VolumeObjectTest.java      |  4 +-
 .../motion/StorPoolDataMotionStrategy.java    |  4 +-
 .../snapshot/StorPoolSnapshotStrategy.java    |  2 +-
 15 files changed, 68 insertions(+), 72 deletions(-)

diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java
index a8e80313768d..d4ca163e4e6f 100644
--- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java
+++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java
@@ -33,9 +33,9 @@ enum State {
         Destroying("Template is destroying"),
         Destroyed("Template is destroyed"),
         Failed("Failed to download Template");
-        String _description;
+        final String _description;
 
-        private State(String description) {
+        State(String description) {
             _description = description;
         }
 
@@ -48,7 +48,7 @@ enum Event {
         CreateRequested,
         CreateOnlyRequested,
         DestroyRequested,
-        OperationSuccessed,
+        OperationSucceeded,
         OperationFailed,
         CopyRequested,
         CopyingRequested,
diff --git a/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java b/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java
index 889d0ce14ccc..21ef851fb2f2 100644
--- a/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java
+++ b/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java
@@ -323,7 +323,7 @@ public DataObject createCacheObject(DataObject data, DataStore store) {
             if (result.isFailed()) {
                 objOnCacheStore.processEvent(Event.OperationFailed);
             } else {
-                objOnCacheStore.processEvent(Event.OperationSuccessed, result.getAnswer());
+                objOnCacheStore.processEvent(Event.OperationSucceeded, result.getAnswer());
                 objOnCacheStore.incRefCount();
                 return objOnCacheStore;
             }
diff --git a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
index 0b0065361d07..b59ee2c61660 100644
--- a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
+++ b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
@@ -396,7 +396,7 @@ protected Answer copyVolumeBetweenPools(DataObject srcData, DataObject destData)
                     return answer;
                 }
 
-                objOnImageStore.processEvent(Event.OperationSuccessed, answer);
+                objOnImageStore.processEvent(Event.OperationSucceeded, answer);
 
                 objOnImageStore.processEvent(Event.CopyingRequested);
 
@@ -427,7 +427,7 @@ protected Answer copyVolumeBetweenPools(DataObject srcData, DataObject destData)
                 throw e;
             }
 
-            objOnImageStore.processEvent(Event.OperationSuccessed);
+            objOnImageStore.processEvent(Event.OperationSucceeded);
             deleteVolumeOnSecondaryStore(objOnImageStore);
             return answer;
         } else {
diff --git a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
index cdf823eaf5b5..21a8655ca86d 100644
--- a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
+++ b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
@@ -1048,7 +1048,7 @@ private void handleCopyAsyncToSecondaryStorageAdaptive(SnapshotInfo snapshotInfo
 
             //submit processEvent
             if (StringUtils.isEmpty(errMsg)) {
-                snapshotInfo.processEvent(Event.OperationSuccessed);
+                snapshotInfo.processEvent(Event.OperationSucceeded);
             } else {
                 snapshotInfo.processEvent(Event.OperationFailed);
             }
@@ -1211,7 +1211,7 @@ else if (HypervisorType.VMware.equals(snapshotInfo.getHypervisorType()) || Hyper
                     // command to copy this data from cache to secondary storage. We
                     // then clean up the cache.
 
-                    destOnStore.processEvent(Event.OperationSuccessed, copyCmdAnswer);
+                    destOnStore.processEvent(Event.OperationSucceeded, copyCmdAnswer);
 
                     CopyCommand cmd = new CopyCommand(destOnStore.getTO(), destData.getTO(), primaryStorageDownloadWait,
                             VirtualMachineManager.ExecuteInSequence.value());
@@ -1261,7 +1261,7 @@ else if (HypervisorType.VMware.equals(snapshotInfo.getHypervisorType()) || Hyper
 
                 try {
                     if (StringUtils.isEmpty(errMsg)) {
-                        snapshotInfo.processEvent(Event.OperationSuccessed);
+                        snapshotInfo.processEvent(Event.OperationSucceeded);
                     }
                     else {
                         snapshotInfo.processEvent(Event.OperationFailed);
@@ -1394,7 +1394,7 @@ private void handleCreateNonManagedVolumeFromManagedSnapshot(SnapshotInfo snapsh
 
             try {
                 if (StringUtils.isEmpty(errMsg)) {
-                    snapshotInfo.processEvent(Event.OperationSuccessed);
+                    snapshotInfo.processEvent(Event.OperationSucceeded);
                 }
                 else {
                     snapshotInfo.processEvent(Event.OperationFailed);
@@ -2316,7 +2316,7 @@ private void handlePostMigration(boolean success, Map<VolumeInfo, VolumeInfo> sr
 
                 _volumeDao.update(volumeVO.getId(), volumeVO);
 
-                _volumeService.copyPoliciesBetweenVolumesAndDestroySourceVolumeAfterMigration(Event.OperationSuccessed, null, srcVolumeInfo, destVolumeInfo, false);
+                _volumeService.copyPoliciesBetweenVolumesAndDestroySourceVolumeAfterMigration(Event.OperationSucceeded, null, srcVolumeInfo, destVolumeInfo, false);
 
 
                 // Update the volume ID for snapshots on secondary storage
@@ -2639,7 +2639,7 @@ private void handleCreateTemplateFromManagedVolume(VolumeInfo volumeInfo, Templa
 
                 try {
                     if (StringUtils.isEmpty(errMsg)) {
-                        volumeInfo.processEvent(Event.OperationSuccessed);
+                        volumeInfo.processEvent(Event.OperationSucceeded);
                     }
                     else {
                         volumeInfo.processEvent(Event.OperationFailed);
diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImpl.java
index 502bbaf9e49e..641a2a40dcd5 100644
--- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImpl.java
+++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImpl.java
@@ -257,9 +257,9 @@ protected Void migrateDataCallBack(AsyncCallbackDispatcher<SecondaryStorageServi
                 }
             } else {
                 if (destData instanceof  VolumeInfo) {
-                    ((VolumeInfo) destData).processEventOnly(ObjectInDataStoreStateMachine.Event.OperationSuccessed, answer);
+                    ((VolumeInfo) destData).processEventOnly(ObjectInDataStoreStateMachine.Event.OperationSucceeded, answer);
                 } else {
-                    destData.processEvent(ObjectInDataStoreStateMachine.Event.OperationSuccessed, answer);
+                    destData.processEvent(ObjectInDataStoreStateMachine.Event.OperationSucceeded, answer);
                 }
                 updateDataObject(srcData, destData);
                 logger.debug("Deleting source data");
diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
index ecdd38c19e65..1bb954da4109 100644
--- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
+++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
@@ -669,7 +669,7 @@ protected Void copyTemplateToImageStoreCallback(AsyncCallbackDispatcher<Template
         TemplateApiResult res = new TemplateApiResult(tmplt);
         if (result.isSuccess()) {
             logger.info("Copied template [{}] to image store [{}].", tmplt.getUniqueName(), tmplt.getDataStore().getName());
-            tmplt.processEvent(Event.OperationSuccessed, result.getAnswer());
+            tmplt.processEvent(Event.OperationSucceeded, result.getAnswer());
             publishTemplateCreation(tmplt);
         } else {
             logger.warn("Failed to copy template [{}] to image store [{}].", tmplt.getUniqueName(), tmplt.getDataStore().getName());
@@ -822,7 +822,7 @@ protected Void createTemplateCallback(AsyncCallbackDispatcher<TemplateServiceImp
         }
 
         try {
-            template.processEvent(ObjectInDataStoreStateMachine.Event.OperationSuccessed);
+            template.processEvent(ObjectInDataStoreStateMachine.Event.OperationSucceeded);
         } catch (Exception e) {
             result.setResult(e.toString());
             if (parentCallback != null) {
@@ -1031,7 +1031,7 @@ public Void deleteTemplateCallback(AsyncCallbackDispatcher<TemplateServiceImpl,
         CommandResult result = callback.getResult();
         TemplateObject vo = context.getTemplate();
         if (result.isSuccess()) {
-            vo.processEvent(Event.OperationSuccessed);
+            vo.processEvent(Event.OperationSucceeded);
         } else {
             vo.processEvent(Event.OperationFailed);
         }
@@ -1091,7 +1091,7 @@ protected Void syncTemplateCallBack(AsyncCallbackDispatcher<TemplateServiceImpl,
                 // no change to existing template_store_ref, will try to re-sync later if other call triggers this sync operation, like copy template
             } else {
                 // this will update install path properly, next time it will not sync anymore.
-                destTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
+                destTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
             }
             future.complete(res);
         } catch (Exception e) {
@@ -1271,7 +1271,7 @@ protected Void copyTemplateCallBack(AsyncCallbackDispatcher<TemplateServiceImpl,
                 res.setResult(result.getResult());
                 destTemplate.processEvent(Event.OperationFailed);
             } else {
-                destTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
+                destTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
             }
             future.complete(res);
         } catch (Exception e) {
@@ -1296,7 +1296,7 @@ protected Void copyTemplateCrossZoneCallBack(AsyncCallbackDispatcher<TemplateSer
                 res.setResult(result.getResult());
                 destTemplate.processEvent(Event.OperationFailed);
             } else {
-                destTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
+                destTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
             }
             future.complete(res);
         } catch (Exception e) {
@@ -1382,7 +1382,7 @@ protected Void createDatadiskTemplateCallback(AsyncCallbackDispatcher<TemplateSe
         TemplateApiResult dataDiskTemplateResult = new TemplateApiResult((TemplateObject)dataDiskTemplate);
         try {
             if (result.isSuccess()) {
-                dataDiskTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
+                dataDiskTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
             } else {
                 dataDiskTemplate.processEvent(Event.OperationFailed);
                 dataDiskTemplateResult.setResult(result.getResult());
diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
index f5cfaf072743..1a3ee5f2325d 100644
--- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
+++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
@@ -131,7 +131,7 @@ public SnapshotInfo backupSnapshot(SnapshotInfo snapshot) {
 
                 CreateObjectAnswer createSnapshotAnswer = new CreateObjectAnswer(snapTO);
 
-                snapshotOnImageStore.processEvent(Event.OperationSuccessed, createSnapshotAnswer);
+                snapshotOnImageStore.processEvent(Event.OperationSucceeded, createSnapshotAnswer);
                 SnapshotObject snapObj = castSnapshotInfoToSnapshotObject(snapshot);
                 try {
                     snapObj.processEvent(Snapshot.Event.OperationNotPerformed);
diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
index 2173aba3f056..de095f58dd1f 100644
--- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
+++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
@@ -212,7 +212,7 @@ protected Void createSnapshotAsyncCallback(AsyncCallbackDispatcher<SnapshotServi
         }
 
         try {
-            snapshot.processEvent(Event.OperationSuccessed, result.getAnswer());
+            snapshot.processEvent(Event.OperationSucceeded, result.getAnswer());
             snapshot.processEvent(Snapshot.Event.OperationSucceeded);
         } catch (Exception e) {
             logger.debug("Failed to create snapshot: ", e);
@@ -423,7 +423,7 @@ protected Void copySnapshotAsyncCallback(AsyncCallbackDispatcher<SnapshotService
 
         try {
             CopyCmdAnswer copyCmdAnswer = (CopyCmdAnswer)result.getAnswer();
-            destSnapshot.processEvent(Event.OperationSuccessed, copyCmdAnswer);
+            destSnapshot.processEvent(Event.OperationSucceeded, copyCmdAnswer);
             srcSnapshot.processEvent(Snapshot.Event.OperationSucceeded);
             snapResult = new SnapshotResult(_snapshotFactory.getSnapshot(destSnapshot.getId(), destSnapshot.getDataStore()), copyCmdAnswer);
             future.complete(snapResult);
@@ -448,7 +448,7 @@ protected Void copySnapshotZoneAsyncCallback(AsyncCallbackDispatcher<SnapshotSer
         }
         try {
             Answer answer = result.getAnswer();
-            destSnapshot.processEvent(Event.OperationSuccessed);
+            destSnapshot.processEvent(Event.OperationSucceeded);
             snapResult = new SnapshotResult(_snapshotFactory.getSnapshot(destSnapshot.getId(), destSnapshot.getDataStore()), answer);
             future.complete(snapResult);
         } catch (Exception e) {
@@ -491,7 +491,7 @@ protected Void deleteSnapshotCallback(AsyncCallbackDispatcher<SnapshotServiceImp
                 res = new SnapshotResult(context.snapshot, null);
                 res.setResult(result.getResult());
             } else {
-                snapshot.processEvent(ObjectInDataStoreStateMachine.Event.OperationSuccessed);
+                snapshot.processEvent(ObjectInDataStoreStateMachine.Event.OperationSucceeded);
                 res = new SnapshotResult(context.snapshot, null);
             }
         } catch (Exception e) {
@@ -681,7 +681,7 @@ protected Void syncSnapshotCallBack(AsyncCallbackDispatcher<SnapshotServiceImpl,
                 // no change to existing snapshot_store_ref, will try to re-sync later if other call triggers this sync operation
             } else {
                 // this will update install path properly, next time it will not sync anymore.
-                destSnapshot.processEvent(Event.OperationSuccessed, result.getAnswer());
+                destSnapshot.processEvent(Event.OperationSucceeded, result.getAnswer());
             }
             future.complete(res);
         } catch (Exception e) {
@@ -711,7 +711,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
                 try {
                     SnapshotObject srcSnapshot = (SnapshotObject)snapshot;
                     srcSnapshot.processEvent(Event.DestroyRequested);
-                    srcSnapshot.processEvent(Event.OperationSuccessed);
+                    srcSnapshot.processEvent(Event.OperationSucceeded);
 
                     srcSnapshot.processEvent(Snapshot.Event.OperationFailed);
 
diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java
index 7c1cbb55b3b1..3f925f08322c 100644
--- a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java
+++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java
@@ -178,7 +178,7 @@ protected Void createAsynCallback(AsyncCallbackDispatcher<DataObjectManagerImpl,
         }
 
         try {
-            objectInDataStoreMgr.update(objInStrore, ObjectInDataStoreStateMachine.Event.OperationSuccessed);
+            objectInDataStoreMgr.update(objInStrore, ObjectInDataStoreStateMachine.Event.OperationSucceeded);
         } catch (NoTransitionException e) {
             try {
                 objectInDataStoreMgr.update(objInStrore, ObjectInDataStoreStateMachine.Event.OperationFailed);
@@ -267,7 +267,7 @@ protected Void copyCallback(AsyncCallbackDispatcher<DataObjectManagerImpl, CopyC
         }
 
         try {
-            objectInDataStoreMgr.update(destObj, ObjectInDataStoreStateMachine.Event.OperationSuccessed);
+            objectInDataStoreMgr.update(destObj, ObjectInDataStoreStateMachine.Event.OperationSucceeded);
         } catch (NoTransitionException e) {
             logger.debug("Failed to update copying state: ", e);
             try {
@@ -341,7 +341,7 @@ protected Void deleteAsynCallback(AsyncCallbackDispatcher<DataObjectManagerImpl,
 
         } else {
             try {
-                objectInDataStoreMgr.update(destObj, Event.OperationSuccessed);
+                objectInDataStoreMgr.update(destObj, Event.OperationSucceeded);
             } catch (NoTransitionException e) {
                 logger.debug("delete failed", e);
             } catch (ConcurrentOperationException e) {
@@ -365,7 +365,7 @@ public DataObject createInternalStateOnly(DataObject data, DataStore store) {
             event = ObjectInDataStoreStateMachine.Event.CreateRequested;
             objectInDataStoreMgr.update(objInStore, event);
 
-            objectInDataStoreMgr.update(objInStore, ObjectInDataStoreStateMachine.Event.OperationSuccessed);
+            objectInDataStoreMgr.update(objInStore, ObjectInDataStoreStateMachine.Event.OperationSucceeded);
         } catch (NoTransitionException e) {
             logger.debug("Failed to update state", e);
             throw new CloudRuntimeException("Failed to update state", e);
diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
index 570a47a752c6..2986f3f8fab6 100644
--- a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
+++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
@@ -91,27 +91,27 @@ public ObjectInDataStoreManagerImpl() {
         stateMachines.addTransition(State.Allocated, Event.CreateOnlyRequested, State.Creating);
         stateMachines.addTransition(State.Allocated, Event.DestroyRequested, State.Destroying);
         stateMachines.addTransition(State.Allocated, Event.OperationFailed, State.Failed);
-        stateMachines.addTransition(State.Allocated, Event.OperationSuccessed, State.Ready);
+        stateMachines.addTransition(State.Allocated, Event.OperationSucceeded, State.Ready);
         stateMachines.addTransition(State.Creating, Event.OperationFailed, State.Allocated);
-        stateMachines.addTransition(State.Creating, Event.OperationSuccessed, State.Ready);
+        stateMachines.addTransition(State.Creating, Event.OperationSucceeded, State.Ready);
         stateMachines.addTransition(State.Ready, Event.CopyingRequested, State.Copying);
-        stateMachines.addTransition(State.Copying, Event.OperationSuccessed, State.Ready);
+        stateMachines.addTransition(State.Copying, Event.OperationSucceeded, State.Ready);
         stateMachines.addTransition(State.Copying, Event.OperationFailed, State.Ready);
         stateMachines.addTransition(State.Ready, Event.DestroyRequested, State.Destroying);
         stateMachines.addTransition(State.Destroying, Event.DestroyRequested, State.Destroying);
-        stateMachines.addTransition(State.Destroying, Event.OperationSuccessed, State.Destroyed);
+        stateMachines.addTransition(State.Destroying, Event.OperationSucceeded, State.Destroyed);
         stateMachines.addTransition(State.Destroying, Event.OperationFailed, State.Destroying);
         stateMachines.addTransition(State.Failed, Event.DestroyRequested, State.Destroying);
         // TODO: further investigate why an extra event is sent when it is
         // already Ready for DownloadListener
-        stateMachines.addTransition(State.Ready, Event.OperationSuccessed, State.Ready);
+        stateMachines.addTransition(State.Ready, Event.OperationSucceeded, State.Ready);
         // State transitions for data object migration
         stateMachines.addTransition(State.Ready, Event.MigrateDataRequested, State.Migrating);
         stateMachines.addTransition(State.Ready, Event.CopyRequested, State.Copying);
         stateMachines.addTransition(State.Allocated, Event.MigrateDataRequested, State.Migrating);
         stateMachines.addTransition(State.Migrating, Event.MigrationFailed, State.Failed);
         stateMachines.addTransition(State.Migrating, Event.MigrationSucceeded, State.Destroyed);
-        stateMachines.addTransition(State.Migrating, Event.OperationSuccessed, State.Ready);
+        stateMachines.addTransition(State.Migrating, Event.OperationSucceeded, State.Ready);
         stateMachines.addTransition(State.Migrating, Event.OperationFailed, State.Ready);
     }
 
@@ -318,9 +318,7 @@ public boolean update(DataObject data, Event event) throws NoTransitionException
                     break;
             }
         } else if (data.getType() == DataObjectType.TEMPLATE && data.getDataStore().getRole() == DataStoreRole.Primary) {
-
             result = this.stateMachines.transitTo(obj, event, null, templatePoolDao);
-
         } else if (data.getType() == DataObjectType.SNAPSHOT && data.getDataStore().getRole() == DataStoreRole.Primary) {
             result = this.stateMachines.transitTo(obj, event, null, snapshotDataStoreDao);
         } else {
@@ -380,7 +378,5 @@ public DataObjectInStore findObject(long objId, DataObjectType type, long dataSt
         }
 
         return vo;
-
     }
-
 }
diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java
index 4a9f34c9f565..9c3f218e5ff1 100644
--- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java
+++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java
@@ -415,7 +415,7 @@ protected Map<ObjectInDataStoreStateMachine.Event, Volume.Event> getMapOfEvents(
         }
         mapOfEvents.put(ObjectInDataStoreStateMachine.Event.DestroyRequested, Volume.Event.DestroyRequested);
         mapOfEvents.put(ObjectInDataStoreStateMachine.Event.ExpungeRequested, Volume.Event.ExpungingRequested);
-        mapOfEvents.put(ObjectInDataStoreStateMachine.Event.OperationSuccessed, Volume.Event.OperationSucceeded);
+        mapOfEvents.put(ObjectInDataStoreStateMachine.Event.OperationSucceeded, Volume.Event.OperationSucceeded);
         mapOfEvents.put(ObjectInDataStoreStateMachine.Event.MigrationCopySucceeded, Volume.Event.MigrationCopySucceeded);
         mapOfEvents.put(ObjectInDataStoreStateMachine.Event.OperationFailed, Volume.Event.OperationFailed);
         mapOfEvents.put(ObjectInDataStoreStateMachine.Event.MigrationCopyFailed, Volume.Event.MigrationCopyFailed);
diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 9de56035aa26..eeac55be1412 100644
--- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -324,7 +324,7 @@ protected Void createVolumeCallback(AsyncCallbackDispatcher<VolumeServiceImpl, C
         DataObject vo = context.getVolume();
         String errMsg = null;
         if (result.isSuccess()) {
-            vo.processEvent(Event.OperationSuccessed, result.getAnswer());
+            vo.processEvent(Event.OperationSucceeded, result.getAnswer());
         } else {
             vo.processEvent(Event.OperationFailed);
             errMsg = result.getResult();
@@ -485,7 +485,7 @@ public Void deleteVolumeCallback(AsyncCallbackDispatcher<VolumeServiceImpl, Comm
         VolumeApiResult apiResult = new VolumeApiResult(vo);
         try {
             if (result.isSuccess()) {
-                vo.processEvent(Event.OperationSuccessed);
+                vo.processEvent(Event.OperationSucceeded);
 
                 if (vo.getPassphraseId() != null) {
                     vo.deletePassphrase();
@@ -741,7 +741,7 @@ protected Void createManagedTemplateImageCallback(AsyncCallbackDispatcher<Volume
 
         if (result.isSuccess()) {
             ((TemplateObject)templateOnPrimaryStoreObj).setInstallPath(result.getPath());
-            templateOnPrimaryStoreObj.processEvent(Event.OperationSuccessed, result.getAnswer());
+            templateOnPrimaryStoreObj.processEvent(Event.OperationSucceeded, result.getAnswer());
         } else {
             templateOnPrimaryStoreObj.processEvent(Event.OperationFailed);
         }
@@ -761,7 +761,7 @@ protected Void copyManagedTemplateCallback(AsyncCallbackDispatcher<VolumeService
         DataObject templateOnPrimaryStoreObj = context.destObj;
 
         if (result.isSuccess()) {
-            templateOnPrimaryStoreObj.processEvent(Event.OperationSuccessed, result.getAnswer());
+            templateOnPrimaryStoreObj.processEvent(Event.OperationSucceeded, result.getAnswer());
         } else {
             templateOnPrimaryStoreObj.processEvent(Event.OperationFailed);
         }
@@ -785,7 +785,7 @@ protected Void copyBaseImageCallback(AsyncCallbackDispatcher<VolumeServiceImpl,
             return null;
         }
 
-        templateOnPrimaryStoreObj.processEvent(Event.OperationSuccessed, result.getAnswer());
+        templateOnPrimaryStoreObj.processEvent(Event.OperationSucceeded, result.getAnswer());
         createVolumeFromBaseImageAsync(context.volume, templateOnPrimaryStoreObj, context.dataStore, future);
         return null;
     }
@@ -836,7 +836,7 @@ protected Void createVolumeFromBaseImageCallBack(AsyncCallbackDispatcher<VolumeS
         String deployAsIsConfiguration = context.deployAsIsConfiguration;
 
         if (result.isSuccess()) {
-            vo.processEvent(Event.OperationSuccessed, result.getAnswer());
+            vo.processEvent(Event.OperationSucceeded, result.getAnswer());
         } else {
 
             vo.processEvent(Event.OperationFailed);
@@ -891,7 +891,7 @@ protected Void createVolumeFromBaseManagedImageCallBack(AsyncCallbackDispatcher<
             }
 
             volDao.update(volume.getId(), volume);
-            vo.processEvent(Event.OperationSuccessed);
+            vo.processEvent(Event.OperationSucceeded);
         } else {
             volResult.setResult(result.getResult());
 
@@ -955,7 +955,7 @@ private TemplateInfo createManagedTemplateVolume(TemplateInfo srcTemplateInfo, P
                 throw new CloudRuntimeException(String.format("Unable to create template %s on primary storage %s: %s", templateOnPrimary.getImage(), destPrimaryDataStore, errMesg));
             }
 
-            templateOnPrimary.processEvent(Event.OperationSuccessed);
+            templateOnPrimary.processEvent(Event.OperationSucceeded);
 
         } catch (Throwable e) {
             logger.debug("Failed to create template volume on storage", e);
@@ -1428,7 +1428,7 @@ public TemplateInfo createManagedStorageTemplate(long srcTemplateId, long destDa
                         logger.debug("Failed to prepare ready bypassed template: {} on primary storage: {}", srcTemplateInfo, templateOnPrimary);
                         throw new CloudRuntimeException(String.format("Failed to prepare ready bypassed template: %s on primary storage: %s", srcTemplateInfo, templateOnPrimary));
                     }
-                    templateOnPrimary.processEvent(Event.OperationSuccessed);
+                    templateOnPrimary.processEvent(Event.OperationSucceeded);
                     return templateOnPrimaryNow;
                 } finally {
                     revokeAccess(templateOnPrimary, destHost, destPrimaryDataStore);
@@ -1683,7 +1683,7 @@ protected Void createVolumeFromSnapshotCallback(AsyncCallbackDispatcher<VolumeSe
             apiResult.setResult(result.getResult());
             event = Event.OperationFailed;
         } else {
-            event = Event.OperationSuccessed;
+            event = Event.OperationSucceeded;
         }
 
         try {
@@ -1789,8 +1789,8 @@ protected Void copyVolumeFromImageToPrimaryCallback(AsyncCallbackDispatcher<Volu
                 return null;
             }
 
-            srcVolume.processEvent(Event.OperationSuccessed);
-            destVolume.processEvent(Event.OperationSuccessed, result.getAnswer());
+            srcVolume.processEvent(Event.OperationSucceeded);
+            destVolume.processEvent(Event.OperationSucceeded, result.getAnswer());
             srcVolume.getDataStore().delete(srcVolume);
             future.complete(res);
         } catch (Exception e) {
@@ -1840,8 +1840,8 @@ protected Void copyVolumeFromPrimaryToImageCallback(AsyncCallbackDispatcher<Volu
                 res.setResult(result.getResult());
                 future.complete(res);
             } else {
-                srcVolume.processEvent(Event.OperationSuccessed); // back to Ready state in Volume table
-                destVolume.processEventOnly(Event.OperationSuccessed, result.getAnswer());
+                srcVolume.processEvent(Event.OperationSucceeded); // back to Ready state in Volume table
+                destVolume.processEventOnly(Event.OperationSucceeded, result.getAnswer());
                 future.complete(res);
             }
         } catch (Exception e) {
@@ -1923,7 +1923,7 @@ protected Void copyVolumeCallBack(AsyncCallbackDispatcher<VolumeServiceImpl, Cop
                 if (destVolume.getStoragePoolType() == StoragePoolType.PowerFlex) {
                     logger.info("Dest volume {} can be removed", destVolume);
                     destVolume.processEvent(Event.ExpungeRequested);
-                    destVolume.processEvent(Event.OperationSuccessed);
+                    destVolume.processEvent(Event.OperationSucceeded);
                     volDao.remove(destVolume.getId());
                     future.complete(res);
                     return null;
@@ -1956,7 +1956,7 @@ public boolean copyPoliciesBetweenVolumesAndDestroySourceVolumeAfterMigration(Ev
 
     protected boolean destroySourceVolumeAfterMigration(Event destinationEvent, Answer destinationEventAnswer, VolumeInfo sourceVolume,
       VolumeInfo destinationVolume, boolean retryExpungeVolumeAsync) {
-        sourceVolume.processEvent(Event.OperationSuccessed);
+        sourceVolume.processEvent(Event.OperationSucceeded);
         destinationVolume.processEvent(destinationEvent, destinationEventAnswer);
 
         VolumeVO sourceVolumeVo = ((VolumeObject) sourceVolume).getVolume();
@@ -1972,7 +1972,7 @@ protected boolean destroySourceVolumeAfterMigration(Event destinationEvent, Answ
             if (sourceVolume.getStoragePoolType() == StoragePoolType.PowerFlex) {
                 logger.info("Source volume {} can be removed.", sourceVolumeVo);
                 sourceVolume.processEvent(Event.ExpungeRequested);
-                sourceVolume.processEvent(Event.OperationSuccessed);
+                sourceVolume.processEvent(Event.OperationSucceeded);
                 volDao.remove(sourceVolume.getId());
                 return true;
             }
@@ -2067,7 +2067,7 @@ private AsyncCallFuture<VolumeApiResult> copyManagedVolume(VolumeInfo srcVolume,
                 logger.debug("Failed to create dest volume {}, volume can be removed", destVolume);
                 destroyVolume(destVolume.getId());
                 destVolume.processEvent(Event.ExpungeRequested);
-                destVolume.processEvent(Event.OperationSuccessed);
+                destVolume.processEvent(Event.OperationSucceeded);
                 volDao.remove(destVolume.getId());
                 throw new CloudRuntimeException("Creation of a dest volume failed: " + createVolumeResult.getResult());
             }
@@ -2156,7 +2156,7 @@ protected Void copyManagedVolumeCallBack(AsyncCallbackDispatcher<VolumeServiceIm
                     logger.debug("failed to clean up managed volume on storage", e);
                 }
             } else {
-                srcVolume.processEvent(Event.OperationSuccessed);
+                srcVolume.processEvent(Event.OperationSucceeded);
                 destVolume.processEvent(Event.MigrationCopySucceeded, result.getAnswer());
                 volDao.updateUuid(srcVolume.getId(), destVolume.getId());
                 volDao.detachVolume(srcVolume.getId());
@@ -2276,7 +2276,7 @@ protected Void migrateVolumeCallBack(AsyncCallbackDispatcher<VolumeServiceImpl,
                 srcVolume.processEvent(Event.OperationFailed);
                 future.complete(res);
             } else {
-                srcVolume.processEvent(Event.OperationSuccessed);
+                srcVolume.processEvent(Event.OperationSucceeded);
                 if (srcVolume.getStoragePoolType() == StoragePoolType.PowerFlex) {
                     future.complete(res);
                     return null;
@@ -2363,7 +2363,7 @@ protected Void migrateVmWithVolumesCallBack(AsyncCallbackDispatcher<VolumeServic
                 for (Map.Entry<VolumeInfo, DataStore> entry : volumeToPool.entrySet()) {
                     VolumeInfo volume = entry.getKey();
                     snapshotMgr.cleanupSnapshotsByVolume(volume.getId());
-                    volume.processEvent(Event.OperationSuccessed);
+                    volume.processEvent(Event.OperationSucceeded);
                 }
                 future.complete(res);
             }
@@ -2431,7 +2431,7 @@ protected Void registerVolumeCallback(AsyncCallbackDispatcher<VolumeServiceImpl,
                 }
 
             } else {
-                vo.processEvent(Event.OperationSuccessed, result.getAnswer());
+                vo.processEvent(Event.OperationSucceeded, result.getAnswer());
 
                 if (vo.getSize() != null) {
                     // publish usage events
@@ -2551,7 +2551,7 @@ protected Void resizeVolumeCallback(AsyncCallbackDispatcher<VolumeServiceImpl, C
         }
 
         try {
-            volume.processEvent(Event.OperationSuccessed);
+            volume.processEvent(Event.OperationSucceeded);
         } catch (Exception e) {
             logger.debug("Failed to change volume state (after resize success)", e);
         }
@@ -2640,7 +2640,7 @@ public void handleVolumeSync(DataStore store) {
 
                                 if (volume.getState() == State.NotUploaded || volume.getState() == State.UploadInProgress) {
                                     VolumeObject volObj = (VolumeObject)volFactory.getVolume(volume.getId());
-                                    volObj.processEvent(Event.OperationSuccessed);
+                                    volObj.processEvent(Event.OperationSucceeded);
                                 }
 
                                 if (volInfo.getSize() > 0) {
diff --git a/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/VolumeObjectTest.java b/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/VolumeObjectTest.java
index 58f47a5db64e..5701bc49e15a 100644
--- a/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/VolumeObjectTest.java
+++ b/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/VolumeObjectTest.java
@@ -147,7 +147,7 @@ public void validateGetMapOfEventsDataStoreIsImage(){
         expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationRequested, Volume.Event.CopyRequested);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.DestroyRequested, Volume.Event.DestroyRequested);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.ExpungeRequested, Volume.Event.ExpungingRequested);
-        expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationSuccessed, Volume.Event.OperationSucceeded);
+        expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationSucceeded, Volume.Event.OperationSucceeded);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationCopySucceeded, Volume.Event.MigrationCopySucceeded);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationFailed, Volume.Event.OperationFailed);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationCopyFailed, Volume.Event.MigrationCopyFailed);
@@ -168,7 +168,7 @@ public void validateGetMapOfEventsDataStoreIsNotImage(){
         expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationCopyRequested, Volume.Event.MigrationCopyRequested);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.DestroyRequested, Volume.Event.DestroyRequested);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.ExpungeRequested, Volume.Event.ExpungingRequested);
-        expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationSuccessed, Volume.Event.OperationSucceeded);
+        expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationSucceeded, Volume.Event.OperationSucceeded);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationCopySucceeded, Volume.Event.MigrationCopySucceeded);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationFailed, Volume.Event.OperationFailed);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationCopyFailed, Volume.Event.MigrationCopyFailed);
diff --git a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/motion/StorPoolDataMotionStrategy.java b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/motion/StorPoolDataMotionStrategy.java
index aa972d44343a..5a4802ab2640 100644
--- a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/motion/StorPoolDataMotionStrategy.java
+++ b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/motion/StorPoolDataMotionStrategy.java
@@ -453,8 +453,8 @@ private void handlePostMigration(boolean success, Map<VolumeInfo, VolumeInfo> sr
             VolumeInfo destVolumeInfo = entry.getValue();
 
             if (success) {
-                srcVolumeInfo.processEvent(Event.OperationSuccessed);
-                destVolumeInfo.processEvent(Event.OperationSuccessed);
+                srcVolumeInfo.processEvent(Event.OperationSucceeded);
+                destVolumeInfo.processEvent(Event.OperationSucceeded);
 
                 _volumeDao.updateUuid(srcVolumeInfo.getId(), destVolumeInfo.getId());
 
diff --git a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/snapshot/StorPoolSnapshotStrategy.java b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/snapshot/StorPoolSnapshotStrategy.java
index 5ec86df91e17..8a51e2672eab 100644
--- a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/snapshot/StorPoolSnapshotStrategy.java
+++ b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/snapshot/StorPoolSnapshotStrategy.java
@@ -201,7 +201,7 @@ private boolean deleteSnapshotChain(SnapshotInfo snapshot) {
                     if (parent.getPath() != null && parent.getPath().equalsIgnoreCase(snapshot.getPath())) {
                         logger.debug("for empty delta snapshot, only mark it as destroyed in db");
                         snapshot.processEvent(Event.DestroyRequested);
-                        snapshot.processEvent(Event.OperationSuccessed);
+                        snapshot.processEvent(Event.OperationSucceeded);
                         deleted = true;
                         if (!resultIsSet) {
                             result = true;