Merge "Remove unneeded param type definition"

[so.git] / bpmn / MSOInfrastructureBPMN / src / main / groovy / org / openecomp / mso / bpmn / infrastructure / scripts / DoCreateVnfAndModulesRollback.groovy

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModulesRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModulesRollback.groovy
index c5d87d8..e931903 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModulesRollback.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModulesRollback.groovy
@@ -25,7 +25,7 @@ import org.json.JSONObject;
 import org.json.JSONArray;\r
 \r
 import org.camunda.bpm.engine.delegate.BpmnError\r
-import org.camunda.bpm.engine.runtime.Execution;\r
+import org.camunda.bpm.engine.delegate.DelegateExecution;\r
 \r
 import static org.apache.commons.lang3.StringUtils.*;\r
 \r
@@ -55,7 +55,7 @@ class DoCreateVnfAndModulesRollback extends AbstractServiceTaskProcessor {
         * @param - execution\r
         *\r
         */\r
-       public void preProcessRequest(Execution execution) {\r
+       public void preProcessRequest(DelegateExecution execution) {\r
                def isDebugEnabled = execution.getVariable("isDebugLogEnabled")\r
                execution.setVariable("prefix",Prefix)\r
                utils.log("DEBUG", " *** STARTED DoCreateVnfAndModulesRollback PreProcessRequest Process*** ", isDebugEnabled)\r
@@ -117,7 +117,10 @@ class DoCreateVnfAndModulesRollback extends AbstractServiceTaskProcessor {
                        }\r
                        else {\r
                                execution.setVariable("DCVAMR_numOfModulesToDelete", numOfAddOnModules + 1)                             \r
-                       }                       \r
+                       }\r
+                       \r
+                       // Set aLaCarte to false\r
+                       execution.setVariable("DCVAMR_aLaCarte", false)                 \r
                        \r
                }catch(BpmnError b){\r
                        utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)\r
@@ -132,7 +135,7 @@ class DoCreateVnfAndModulesRollback extends AbstractServiceTaskProcessor {
 \r
        \r
        \r
-       public void preProcessCreateVfModuleRollback(Execution execution){\r
+       public void preProcessCreateVfModuleRollback(DelegateExecution execution){\r
                def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")\r
                execution.setVariable("prefix", Prefix)\r
                logDebug(" ======== STARTED preProcessCreateVfModuleRollback ======== ", isDebugLogEnabled)\r
@@ -167,7 +170,7 @@ class DoCreateVnfAndModulesRollback extends AbstractServiceTaskProcessor {
        }\r
        \r
        \r
-       public void postProcessCreateVfModuleRollback(Execution execution){\r
+       public void postProcessCreateVfModuleRollback(DelegateExecution execution){\r
                def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")\r
                execution.setVariable("prefix", Prefix)\r
                logDebug(" ======== STARTED postProcessCreateVfModuleRollback ======== ", isDebugLogEnabled)\r
@@ -190,7 +193,7 @@ class DoCreateVnfAndModulesRollback extends AbstractServiceTaskProcessor {
        }\r
        \r
        \r
-       public void preProcessSDNCDeactivateRequest(Execution execution){\r
+       public void preProcessSDNCDeactivateRequest(DelegateExecution execution){\r
                def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")\r
                execution.setVariable("prefix", Prefix)\r
                logDebug(" ======== STARTED preProcessSDNCDeactivateRequest ======== ", isDebugLogEnabled)\r
@@ -214,7 +217,7 @@ class DoCreateVnfAndModulesRollback extends AbstractServiceTaskProcessor {
                logDebug("======== COMPLETED preProcessSDNCDeactivateRequest ======== ", isDebugLogEnabled)\r
        }\r
        \r
-       public void preProcessSDNCUnassignRequest(Execution execution) {\r
+       public void preProcessSDNCUnassignRequest(DelegateExecution execution) {\r
                def method = getClass().getSimpleName() + '.preProcessSDNCUnassignRequest(' +\r
                        'execution=' + execution.getId() +\r
                        ')'\r
@@ -239,7 +242,7 @@ class DoCreateVnfAndModulesRollback extends AbstractServiceTaskProcessor {
                logDebug("======== COMPLETED  preProcessSDNCUnassignRequest Process ======== ", isDebugLogEnabled)\r
        }\r
        \r
-       public String buildSDNCRequest(Execution execution, String svcInstId, String action){\r
+       public String buildSDNCRequest(DelegateExecution execution, String svcInstId, String action){\r
                \r
                                String uuid = execution.getVariable('testReqId') // for junits\r
                                if(uuid==null){\r
@@ -296,7 +299,7 @@ class DoCreateVnfAndModulesRollback extends AbstractServiceTaskProcessor {
                        return sdncRequest\r
        }\r
                \r
-       public void validateSDNCResponse(Execution execution, String response, String method){\r
+       public void validateSDNCResponse(DelegateExecution execution, String response, String method){\r
                def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")\r
                execution.setVariable("prefix",Prefix)\r
                logDebug(" *** STARTED ValidateSDNCResponse Process*** ", isDebugLogEnabled)\r
@@ -321,7 +324,7 @@ class DoCreateVnfAndModulesRollback extends AbstractServiceTaskProcessor {
                logDebug(" *** COMPLETED ValidateSDNCResponse Process*** ", isDebugLogEnabled)\r
        }\r
        \r
-       public void setSuccessfulRollbackStatus (Execution execution){\r
+       public void setSuccessfulRollbackStatus (DelegateExecution execution){\r
                def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")\r
                execution.setVariable("prefix", Prefix)\r
                logDebug(" ======== STARTED setSuccessfulRollbackStatus ======== ", isDebugLogEnabled)\r
@@ -338,7 +341,7 @@ class DoCreateVnfAndModulesRollback extends AbstractServiceTaskProcessor {
                logDebug("======== COMPLETED setSuccessfulRollbackStatus ======== ", isDebugLogEnabled)\r
        }\r
        \r
-       public void setFailedRollbackStatus (Execution execution){\r
+       public void setFailedRollbackStatus (DelegateExecution execution){\r
                def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")\r
                execution.setVariable("prefix", Prefix)\r
                logDebug(" ======== STARTED setFailedRollbackStatus ======== ", isDebugLogEnabled)\r