Merge "Reorder modifiers"

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

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVnfInfra.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVnfInfra.groovy
index 0db7616..0b6ddb8 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVnfInfra.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVnfInfra.groovy
@@ -25,7 +25,6 @@ import groovy.util.Node
 import groovy.util.XmlParser;\r
 import groovy.xml.QName\r
 \r
-import java.beans.MetaData.java_lang_Class_PersistenceDelegate\r
 import java.io.Serializable;\r
 import java.util.UUID;\r
 import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil\r
@@ -39,7 +38,6 @@ import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor;
 import org.openecomp.mso.bpmn.common.scripts.VidUtils;\r
 import org.openecomp.mso.bpmn.core.RollbackData\r
 import org.openecomp.mso.bpmn.core.WorkflowException\r
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil\r
 import org.openecomp.mso.bpmn.core.json.JsonUtils\r
 import org.openecomp.mso.bpmn.core.domain.ModelInfo\r
 import org.openecomp.mso.bpmn.core.domain.ServiceDecomposition\r
@@ -76,7 +74,8 @@ public class UpdateVnfInfra extends VnfCmBase {
                execution.setVariable('source', null)\r
                execution.setVariable('vnfInputs', null)                        \r
                execution.setVariable('tenantId', null)         \r
-               execution.setVariable('vnfParams', null)                \r
+               execution.setVariable('vnfParams', null)\r
+               execution.setVariable('controllerType', null)           \r
                execution.setVariable('UpdateVnfSuccessIndicator', false)\r
                execution.setVariable('serviceType', null)\r
                execution.setVariable('nfRole', null)\r
@@ -156,6 +155,11 @@ public class UpdateVnfInfra extends VnfCmBase {
                        def vnfType = execution.getVariable('vnfType')\r
                        execution.setVariable('vnfType', vnfType)\r
                        \r
+                       def controllerType = reqMap.requestDetails?.requestParameters?.controllerType\r
+                       execution.setVariable('controllerType', controllerType)\r
+                       \r
+                       utils.log("DEBUG", 'Controller Type: ' + controllerType, isDebugLogEnabled)\r
+                       \r
                        def userParams = reqMap.requestDetails?.requestParameters?.userParams                                   \r
                        \r
                        Map<String, String> userParamsMap = [:]\r