Fix request inputs for vfc-adapter

Fix request input for vfc-adapter.

Change-Id: Id9dcff0df05302ea7d3779b7617238989cbb3fda
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 b520ca5..b29c4dc 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
@@ -103,7 +103,7 @@ public class CreateVFCNSResource extends AbstractServiceTaskProcessor {
             *     }\r
             * }\r
             */\r
-           String nsParameters = execution.getVariable("resourceParameters")\r
+           String nsParameters = jsonUtil.getJsonValue(resourceInput, "resourceParameters")\r
            utils.log("INFO", "nsParameters:" + nsParameters, isDebugEnabled)\r
            String nsOperationKey = """{\r
                    "globalSubscriberId":"${globalSubscriberId}",\r
@@ -136,11 +136,16 @@ public class CreateVFCNSResource extends AbstractServiceTaskProcessor {
         String nsParameters = execution.getVariable("nsParameters");\r
         String nsServiceName = execution.getVariable("nsServiceName")\r
         String nsServiceDescription = execution.getVariable("nsServiceDescription")\r
+        String locationConstraints = jsonUtil.getJsonValue(nsParameters, "locationConstraints")\r
+        String requestInputs = jsonUtil.getJsonValue(nsParameters, "requestInputs")\r
         String reqBody ="""{\r
                 "nsServiceName":"${nsServiceName}",\r
                 "nsServiceDescription":"${nsServiceDescription}",\r
                 "nsOperationKey":${nsOperationKey},\r
-                "nsParameters":${nsParameters}\r
+                "nsParameters":{\r
+                     "locationConstraints":${locationConstraints},\r
+                     "additionalParamForNs":${requestInputs}\r
+                }\r
                }"""\r
         APIResponse apiResponse = postRequest(execution, host + vfcUrl + "/ns", reqBody)\r
         String returnCode = apiResponse.getStatusCode()\r