Fix vfc request parameters

Fix vfc request parameters.

Change-Id: I73b726dfebf85597b81090aef03a2da4c55477fe
Issue-ID: SO-422
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVFCNSResource.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVFCNSResource.groovy
index b29c4dc..9456007 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVFCNSResource.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVFCNSResource.groovy
@@ -70,13 +70,13 @@ public class CreateVFCNSResource extends AbstractServiceTaskProcessor {
            //deal with nsName and Description\r
            String resourceInput = execution.getVariable("resourceInput")\r
 \r
+           String resourceParameters = jsonUtil.getJsonValue(resourceInput, "resourceParameters")\r
            // get service name\r
            String resourceName = jsonUtil.getJsonValue(resourceInput, "resourceInstanceName")\r
-           String nsServiceName = resourceName.substring(resourceName.indexOf("_") + 1)\r
-           execution.setVariable("nsServiceName", nsServiceName)\r
+           execution.setVariable("nsServiceName", resourceName)\r
 \r
            String nsServiceDescription = execution.getVariable("nsServiceDescription")\r
-           utils.log("INFO", "nsServiceName:" + nsServiceName + " nsServiceDescription:" + nsServiceDescription, isDebugEnabled)\r
+           utils.log("INFO", "nsServiceName:" + resourceName + " nsServiceDescription:" + nsServiceDescription, isDebugEnabled)\r
            //deal with operation key\r
            String globalSubscriberId = jsonUtil.getJsonValue(resourceInput, "globalSubscriberId")\r
            utils.log("INFO", "globalSubscriberId:" + globalSubscriberId, isDebugEnabled)\r
@@ -90,7 +90,7 @@ public class CreateVFCNSResource extends AbstractServiceTaskProcessor {
            String operationId = execution.getVariable("requestId")\r
            utils.log("INFO", "serviceType:" + serviceType, isDebugEnabled)\r
 \r
-           String nodeTemplateUUID = jsonUtil.getJsonValue(resourceInput, "resourceModelInfo.modelCustomizationUuid")\r
+           String nodeTemplateUUID = jsonUtil.getJsonValue(resourceParameters, "requestInputs.nsd0_providing_service_uuid")\r
            utils.log("INFO", "nodeTemplateUUID:" + nodeTemplateUUID, isDebugEnabled)\r
            /*\r
             * segmentInformation needed as a object of segment\r