Refactor around bulk cancelling

src/main/java/net/geant/nmaas/nmservice/deployment/bulks/BulkDeploymentQueueService.java

@@ -156,7 +156,7 @@ public class BulkDeploymentQueueService {
             if (optional.isPresent()) {
                 log.warn("Delete {} / {}", optional.get().getDeploymentId(), optional.get().getBulkEntryId());
                 queueRepository.deleteById(optional.get().getId());
-                bulkApplicationService.setBulkToCancel(optional.get());
+                bulkApplicationService.cancelBulkEntry(optional.get());
             }
         });
         bulkApplicationService.updateMainState(bulkDeployment);

src/main/java/net/geant/nmaas/orchestration/DefaultAppLifecycleManager.java

@@ -13,7 +13,13 @@ import net.geant.nmaas.orchestration.api.model.AppConfigurationView;
 import net.geant.nmaas.orchestration.entities.AppConfiguration;
 import net.geant.nmaas.orchestration.entities.AppDeployment;
 import net.geant.nmaas.orchestration.entities.AppDeploymentState;
-import net.geant.nmaas.orchestration.events.app.*;
+import net.geant.nmaas.orchestration.events.app.AppApplyConfigurationActionEvent;
+import net.geant.nmaas.orchestration.events.app.AppRemoveActionEvent;
+import net.geant.nmaas.orchestration.events.app.AppRemoveFailedActionEvent;
+import net.geant.nmaas.orchestration.events.app.AppRestartActionEvent;
+import net.geant.nmaas.orchestration.events.app.AppUpgradeActionEvent;
+import net.geant.nmaas.orchestration.events.app.AppVerifyRequestActionEvent;
+import net.geant.nmaas.orchestration.events.app.AppVerifyServiceActionEvent;
 import net.geant.nmaas.orchestration.exceptions.InvalidDeploymentIdException;
 import net.geant.nmaas.portal.api.exception.ProcessingException;
 import net.geant.nmaas.portal.service.ConfigurationManager;
@@ -227,8 +233,12 @@ public class DefaultAppLifecycleManager implements AppLifecycleManager {
     @Override
     @Loggable(LogLevel.INFO)
     public void removeApplication(Identifier deploymentId) {
-        if (!AppDeploymentState.APPLICATION_REMOVED.equals(deploymentRepositoryManager.loadState(deploymentId))) {
-            eventPublisher.publishEvent(new AppRemoveActionEvent(this, deploymentId));
+        try {
+            if (!AppDeploymentState.APPLICATION_REMOVED.equals(deploymentRepositoryManager.loadState(deploymentId))) {
+                eventPublisher.publishEvent(new AppRemoveActionEvent(this, deploymentId));
+            }
+        } catch (InvalidDeploymentIdException e) {
+            log.warn("Application deployment {} not found for removal. Skipping.", deploymentId, e);
         }
     }
 

src/main/java/net/geant/nmaas/portal/service/BulkApplicationService.java

@@ -46,7 +46,7 @@ public interface BulkApplicationService {
 
     Optional<BulkDeploymentEntry> getBulkEntry(Long bulkEntryId);
 
-    void setBulkToCancel(BulkDeploymentQueueEntry queueEntry);
+    void cancelBulkEntry(BulkDeploymentQueueEntry queueEntry);
 
     void updateMainState(BulkDeployment bulkDeployment);
 

src/main/java/net/geant/nmaas/portal/service/impl/BulkApplicationServiceImpl.java

@@ -479,7 +479,7 @@ public class BulkApplicationServiceImpl implements BulkApplicationService {
     }
 
     @Override
-    public void setBulkToCancel(BulkDeploymentQueueEntry queueEntry) {
+    public void cancelBulkEntry(BulkDeploymentQueueEntry queueEntry) {
         try {
             AppDeploymentState state = appDeploymentRepositoryManager.loadState(queueEntry.getDeploymentId());
             if (!(state.isInFailedState() || state.isInRunningState())) {
@@ -488,7 +488,7 @@ public class BulkApplicationServiceImpl implements BulkApplicationService {
                     BulkDeploymentEntry bulkDeploymentEntry = entry.get();
                     bulkDeploymentEntry.setState(BulkDeploymentState.CANCELED);
                     bulkDeploymentEntryRepository.save(bulkDeploymentEntry);
-                    log.warn("Bulk set to CANCELED correctly.");
+                    log.warn("Bulk set to CANCELED correctly. Proceeding with application instance removal.");
                     appLifecycleManager.removeApplication(queueEntry.getDeploymentId());
                 }
             }