Merge "Reorder modifiers"

[so.git] / bpmn / MSOCommonBPMN / src / main / groovy / org / openecomp / mso / bpmn / common / scripts / AppCClient.groovy

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AppCClient.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AppCClient.groovy
index 8df6af7..535b65e 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AppCClient.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AppCClient.groovy
@@ -27,6 +27,8 @@ import java.util.UUID;
  * @param - vnfId
  * @param - action
  * @param - payload
+ * @param - vnfName
+ * @param - controllerType
  *
  * Outputs:
  * @param - errorcode
@@ -72,12 +74,15 @@ public class AppCClient extends AbstractServiceTaskProcessor{
                        String vnfHostIpAddress = execution.getVariable('vnfHostIpAddress')
                        String vmIdList = execution.getVariable("vmIdList")
                        String identityUrl = execution.getVariable("identityUrl")
-                       HashMap<String, String> payloadInfo = new HashMap<String, String>();
+                       String controllerType = execution.getVariable("controllerType") 
+                       String vfModuleId = execution.getVariable("vfModuleId")         
+                       HashMap<String, String> payloadInfo = new HashMap<String, String>();            
                        payloadInfo.put("vnfName", vnfName)
                        payloadInfo.put("aicIdentity", aicIdentity)
                        payloadInfo.put("vnfHostIpAddress", vnfHostIpAddress)
                        payloadInfo.put("vmIdList", vmIdList)
                        payloadInfo.put("identityUrl", identityUrl)
+                       payloadInfo.put("vfModuleId",vfModuleId)
                        Optional<String> payload
                        logDebug("Running APP-C action: " + action.toString(), isDebugLogEnabled)
                        utils.log("DEBUG", "VNFID: " + vnfId, isDebugLogEnabled)
@@ -96,7 +101,7 @@ public class AppCClient extends AbstractServiceTaskProcessor{
                        ApplicationControllerAction client = new ApplicationControllerAction()
                        utils.log("DEBUG", "Created Application Controller Action Object", isDebugLogEnabled)
                        //PayloadInfo contains extra information that adds on to payload before making request to appc
-                       client.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo)
+                       client.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType)
                        utils.log("DEBUG", "ran through the main method for Application Contoller", isDebugLogEnabled)
                        appcCode = client.getErrorCode()
                        appcMessage = client.getErrorMessage()