fix for incoming jsonreq in groovy test

IssueId: SO-281

Change-Id: Ie7a82e78b5a3eca2bf751598a83a370dfe2e7f86
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericAlaCarteServiceInstanceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericAlaCarteServiceInstanceTest.groovy
index 6d2d25a..6919302 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericAlaCarteServiceInstanceTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericAlaCarteServiceInstanceTest.groovy
@@ -74,94 +74,70 @@ class CreateGenericAlaCarteServiceInstanceTest  {
 \r
                String jsonIncomingRequest =\r
        """{\r
-       "service": {\r
-    "name": "so_test4",\r
-    "description": "so_test2",\r
-    "serviceDefId": "60c3e96e-0970-4871-b6e0-3b6de7561519",\r
-    "templateId": "592f9437-a9c0-4303-b9f6-c445bb7e9814",\r
-    "parameters": {\r
-      "globalSubscriberId": "123457",\r
-      "subscriberName": "Customer1",\r
-      "serviceType": "voLTE",\r
-      "templateName": "voLTE Service:1.0",\r
-      "resources": [\r
-        {\r
-          "resourceName": "vIMS",\r
-          "resourceDefId": "60c3e96e-0970-4871-b6e0-3b6de7561516",\r
-          "resourceId": "60c3e96e-0970-4871-b6e0-3b6de7561512",\r
-          "nsParameters": {\r
-            "locationConstraints": [\r
-              {\r
-                "vnfProfileId": "zte-vBAS-1.0",\r
-                "locationConstraints": {\r
-                  "vimId": "4050083f-465f-4838-af1e-47a545222ad0"\r
-                }\r
-              },\r
-              {\r
-                "vnfProfileId": "zte-vMME-1.0",\r
-                "locationConstraints": {\r
-                  "vimId": "4050083f-465f-4838-af1e-47a545222ad0"\r
-                }\r
-              }\r
-            ],\r
-            "additionalParamForNs": {}\r
-          }\r
-        },\r
-        {\r
-          "resourceName": "vEPC",\r
-          "resourceDefId": "61c3e96e-0970-4871-b6e0-3b6de7561516",\r
-          "resourceId": "62c3e96e-0970-4871-b6e0-3b6de7561512",\r
-          "nsParameters": {\r
-            "locationConstraints": [\r
-              {\r
-                "vnfProfileId": "zte-CSCF-1.0",\r
-                "locationConstraints": {\r
-                  "vimId": "4050083f-465f-4838-af1e-47a545222ad1"\r
-                }\r
-              }\r
-            ],\r
-            "additionalParamForNs": {}\r
-          }\r
-        },\r
-        {\r
-          "resourceName": "underlayvpn",\r
-          "resourceDefId": "60c3e96e-0970-4871-b6e0-3b6de7561513",\r
-          "resourceId": "60c3e96e-0970-4871-b6e0-3b6de7561514",\r
-          "nsParameters": {\r
-            "locationConstraints": [],\r
-            "additionalParamForNs": {\r
-              "externalDataNetworkName": "Flow_out_net",\r
-              "m6000_mng_ip": "181.18.20.2",\r
-              "externalCompanyFtpDataNetworkName": "Flow_out_net",\r
-              "externalPluginManageNetworkName": "plugin_net_2014",\r
-              "externalManageNetworkName": "mng_net_2017",\r
-              "sfc_data_network": "sfc_data_net_2016",\r
-              "NatIpRange": "210.1.1.10-210.1.1.20",\r
-              "location": "4050083f-465f-4838-af1e-47a545222ad0",\r
-              "sdncontroller": "9b9f02c0-298b-458a-bc9c-be3692e4f35e"\r
-            }\r
-          }\r
-        },\r
-        {\r
-          "resourceName": "overlayvpn",\r
-          "resourceDefId": "60c3e96e-0970-4871-b6e0-3b6de7561517",\r
-          "resourceId": "60c3e96e-0970-4871-b6e0-3b6de7561518",\r
-          "nsParameters": {\r
-            "locationConstraints": [],\r
-            "additionalParamForNs": {\r
-              "externalDataNetworkName": "Flow_out_net",\r
-              "m6000_mng_ip": "181.18.20.2",\r
-              "externalCompanyFtpDataNetworkName": "Flow_out_net",\r
-              "externalPluginManageNetworkName": "plugin_net_2014",\r
-              "externalManageNetworkName": "mng_net_2017",\r
-              "sfc_data_network": "sfc_data_net_2016",\r
-              "NatIpRange": "210.1.1.10-210.1.1.20",\r
-              "location": "4050083f-465f-4838-af1e-47a545222ad0",\r
-              "sdncontroller": "9b9f02c0-298b-458a-bc9c-be3692e4f35e"\r
-            }\r
-          }\r
-        }\r
-      ]\r
+  "variables": {\r
+    "bpmnRequest": {\r
+      "value": "{\"requestDetails\":{\"modelInfo\":{\"modelInvariantUuid\":\"1de901ed-17af-4b03-bc1f-41659cfa27cb\",\"modelType\":\"service\",\"modelName\":\"demoVLB\",\"modelVersion\":\"1.0\",\"modelUuid\":\"ace39141-09ec-4068-b06d-ac6b23bdc6e0\"},\"requestInfo\":{\"productFamilyId\":\"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\",\"source\":\"VID\",\"instanceName\":\"sample-instance-2\",\"suppressRollback\":false,\"requestorId\":\"1234\"},\"subscriberInfo\":{\"globalSubscriberId\":\"Demonstration\",\"subscriberName\":\"Demonstration\"},\"cloudConfiguration\":{\"tenantId\":\"onap\",\"lcpCloudRegionId\":\"RegionOne\"},\"requestParameters\":{\"subscriptionServiceType\":\"vLB\",\"aLaCarte\":false,\"autoBuildVfModules\":false,\"cascadeDelete\":false,\"usePreload\":true,\"rebuildVolumeGroups\":false}}}",\r
+      "type": "String"\r
+    },\r
+    "requestId": {\r
+      "value": "786230f6-5120-4400-aa6b-92a0eb214685",\r
+      "type": "String"\r
+    },\r
+    "mso-request-id": {\r
+      "value": "786230f6-5120-4400-aa6b-92a0eb214685",\r
+      "type": "String"\r
+    },\r
+    "isBaseVfModule": {\r
+      "value": false,\r
+      "type": "Boolean"\r
+    },\r
+    "recipeTimeout": {\r
+      "value": 180,\r
+      "type": "Integer"\r
+    },\r
+    "requestAction": {\r
+      "value": "createInstance",\r
+      "type": "String"\r
+    },\r
+    "serviceInstanceId": {\r
+      "value": "",\r
+      "type": "String"\r
+    },\r
+    "vnfId": {\r
+      "value": "",\r
+      "type": "String"\r
+    },\r
+    "vfModuleId": {\r
+      "value": "",\r
+      "type": "String"\r
+    },\r
+    "volumeGroupId": {\r
+      "value": "",\r
+      "type": "String"\r
+    },\r
+    "networkId": {\r
+      "value": "",\r
+      "type": "String"\r
+    },\r
+    "serviceType": {\r
+      "value": "demoVLB",\r
+      "type": "String"\r
+    },\r
+    "vnfType": {\r
+      "value": "",\r
+      "type": "String"\r
+    },\r
+    "vfModuleType": {\r
+      "value": "",\r
+      "type": "String"\r
+    },\r
+    "networkType": {\r
+      "value": "",\r
+      "type": "String"\r
+    },\r
+    "host": {\r
+      "value": "mso",\r
+      "type": "String"\r
     }\r
   }\r
 }"""\r