Merge "Reorder modifiers"

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

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleInfraV2.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleInfraV2.groovy
index eefe33d..18f36b8 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleInfraV2.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleInfraV2.groovy
@@ -1,6 +1,6 @@
 /*-\r
  * ============LICENSE_START=======================================================\r
- * OPENECOMP - MSO\r
+ * ONAP - SO\r
  * ================================================================================\r
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
  * ================================================================================\r
@@ -26,13 +26,10 @@ import groovy.json.JsonSlurper
 import groovy.util.Node\r
 import groovy.util.XmlParser;\r
 import groovy.xml.QName\r
-import inventory.aai.att.com.v10.GenericVnf\r
-import inventory.aai.att.com.v10.GenericVnfs\r
-import inventory.aai.att.com.v10.Pserver\r
 \r
 import org.camunda.bpm.engine.delegate.BpmnError\r
 import org.camunda.bpm.engine.impl.cmd.AbstractSetVariableCmd\r
-import org.camunda.bpm.engine.runtime.Execution\r
+import org.camunda.bpm.engine.delegate.DelegateExecution\r
 \r
 import java.io.Serializable;\r
 import java.util.List\r
@@ -76,7 +73,7 @@ public class UpdateVfModuleInfraV2 {
 \r
 \r
 \r
-       public void initProcessVariables(Execution execution) {\r
+       public void initProcessVariables(DelegateExecution execution) {\r
                execution.setVariable('prefix', 'UPDVfModI_')\r
                execution.setVariable('UPDVfModI_Request', null)\r
                execution.setVariable('UPDVfModI_requestInfo', null)\r
@@ -98,7 +95,7 @@ public class UpdateVfModuleInfraV2 {
         *\r
         * @param execution The flow's execution instance.\r
         */\r
-       public void preProcessRequest(Execution execution) {\r
+       public void preProcessRequest(DelegateExecution execution) {\r
                System.out.print("*****************************PreProcessRequest**************************")\r
 \r
                def method = getClass().getSimpleName() + '.preProcessRequest(' +\r
@@ -164,7 +161,7 @@ public class UpdateVfModuleInfraV2 {
                        Map<String, String> userParamsMap = [:]\r
                        if (userParams != null) {\r
                                userParams.each { userParam ->\r
-                                       userParamsMap.put(userParam.name, userParam.value)\r
+                                       userParamsMap.put(userParam.name, userParam.value.toString())\r
                                }\r
                        }\r
 \r
@@ -260,7 +257,7 @@ public class UpdateVfModuleInfraV2 {
         *\r
         * @param execution The flow's execution instance.\r
         */\r
-       public void sendSynchResponse(Execution execution) {\r
+       public void sendSynchResponse(DelegateExecution execution) {\r
                System.out.print("*****************************SendSynchResponse**************************")\r
 \r
                def method = getClass().getSimpleName() + '.sendSynchResponse(' +\r
@@ -297,7 +294,7 @@ public class UpdateVfModuleInfraV2 {
        }\r
 \r
        //check to see if the Pserver Flag is locked\r
-       public void checkPserverFlag(Execution execution) {\r
+       public void checkPserverFlag(DelegateExecution execution) {\r
 \r
                System.out.println("*****************************CheckingPserverFlag*************************")\r
                String vnfId = (String)execution.getVariable('vnfId')\r
@@ -307,7 +304,7 @@ public class UpdateVfModuleInfraV2 {
        }\r
 \r
        //check to see if the VFFlag is locked\r
-       public void vfFlagCheck(Execution execution) {\r
+       public void vfFlagCheck(DelegateExecution execution) {\r
 \r
                System.out.print("*****************************VfFlagCheck*************************")\r
                String vnfId = (String)execution.getVariable('vnfId')\r
@@ -317,7 +314,7 @@ public class UpdateVfModuleInfraV2 {
 \r
        }\r
        //lock the VF Flag\r
-       public void vfFlagSet(Execution execution) {\r
+       public void vfFlagSet(DelegateExecution execution) {\r
 \r
                System.out.print("*****************************VfFlagSet*************************")\r
                String vnfId = (String)execution.getVariable('vnfId')\r
@@ -328,7 +325,7 @@ public class UpdateVfModuleInfraV2 {
        }\r
 \r
        //Lock AppC\r
-       public void lockAppC(Execution execution) {\r
+       public void lockAppC(DelegateExecution execution) {\r
 \r
                System.out.print("*****************************lockAppC*************************")\r
                def vfModuleId = ""\r
@@ -338,7 +335,7 @@ public class UpdateVfModuleInfraV2 {
 \r
        }\r
        //run health check\r
-       public void healthCheckAppC(Execution execution) {\r
+       public void healthCheckAppC(DelegateExecution execution) {\r
 \r
                System.out.print("*****************************healthCheckAppC*************************")\r
                def vfModuleId = ""\r
@@ -347,14 +344,14 @@ public class UpdateVfModuleInfraV2 {
 \r
        }\r
        //SDNO health diagnostic\r
-       public void healthDiagnosticSDNO(Execution execution) {\r
+       public void healthDiagnosticSDNO(DelegateExecution execution) {\r
 \r
                System.out.print("*****************************healthDiagnosticSDNO is currently ignored*************************")\r
                //SDNOValidatorImpl.healthDiagnostic("","");\r
 \r
        }\r
        //stop VF module controller\r
-       public void stopVfModuleController(Execution execution) {\r
+       public void stopVfModuleController(DelegateExecution execution) {\r
 \r
                System.out.print("*****************************stopVfModuleController*************************")\r
                def vfModuleId = ""\r
@@ -364,7 +361,7 @@ public class UpdateVfModuleInfraV2 {
 \r
        }\r
 \r
-       public void doUpdateVfModulePrep(Execution execution) {\r
+       public void doUpdateVfModulePrep(DelegateExecution execution) {\r
 \r
                System.out.print("*****************************doUpdateVfModulePrep*************************")\r
                def method = getClass().getSimpleName() + '.prepDoUpdateVfModule(' +\r
@@ -386,7 +383,7 @@ public class UpdateVfModuleInfraV2 {
 \r
        }\r
 \r
-       public void completionHandlerPrep(Execution execution,String resultVar) {\r
+       public void completionHandlerPrep(DelegateExecution execution,String resultVar) {\r
 \r
                System.out.print("*****************************completionHandlerPrep*************************")\r
                def method = getClass().getSimpleName() + '.completionHandlerPrep(' +\r
@@ -422,7 +419,7 @@ public class UpdateVfModuleInfraV2 {
 \r
        }\r
 \r
-       public void healthCheckController(Execution execution) {\r
+       public void healthCheckController(DelegateExecution execution) {\r
 \r
                System.out.print("*****************************healthCheckController*************************")\r
                def vfModuleId = ""\r
@@ -431,7 +428,7 @@ public class UpdateVfModuleInfraV2 {
 \r
        }\r
 \r
-       public void startVfModuleController(Execution execution) {\r
+       public void startVfModuleController(DelegateExecution execution) {\r
 \r
                System.out.print("*****************************startVfModuleController*************************")\r
                def vfModuleId = ""\r
@@ -440,7 +437,7 @@ public class UpdateVfModuleInfraV2 {
 \r
        }\r
 \r
-       public void vFFlagUnset(Execution execution) {\r
+       public void vFFlagUnset(DelegateExecution execution) {\r
 \r
                System.out.print("*****************************vFFlagUnset*************************")\r
                String vnfId = (String)execution.getVariable('vnfId')\r
@@ -451,7 +448,7 @@ public class UpdateVfModuleInfraV2 {
 \r
        }\r
 \r
-       public void unlockAppC(Execution execution) {\r
+       public void unlockAppC(DelegateExecution execution) {\r
 \r
                System.out.print("*****************************unlockAppC*************************")\r
                def vfModuleId = ""\r
@@ -460,7 +457,7 @@ public class UpdateVfModuleInfraV2 {
 \r
        }\r
 \r
-       public void postUpgradeHealthCheckController(Execution execution) {\r
+       public void postUpgradeHealthCheckController(DelegateExecution execution) {\r
 \r
                System.out.print("*****************************postUpgradeHealthCheckController*************************")\r
                def vfModuleId = ""\r