Fix underlay DG testing issues

*Fix json template context variable name
*Add customHttpHeaders

Change-Id: Ic565716227327db53c8cd65cb5c44b57f2501042
Issue-Id: SDNC-131
Signed-off-by: Ramu N <ramu.n@huawei.com>

Former-commit-id: 9ea126b1bfbf0908e45eaf52d61b6b2032fc1b23

1 files changed, 191 insertions, 69 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
index ceaf597e..35795625 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
@@ -16,11 +16,11 @@
   {
     "id": "2a509806.cfd2b",
     "type": "service-logic",
-    "name": "GENERIC-RESOURCE-API 1.2.0-SNAPSHOT",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
-    "version": "1.2.0-SNAPSHOT",
+    "version": "${project.version}",
     "comments": "",
-    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='1.2.0-SNAPSHOT'>",
+    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
     "x": 298.00000381469727,
     "y": 129.0000171661377,
@@ -61,7 +61,6 @@
     "wires": [
       [
         "7de5755c.474434",
-        "d604a407.16f9a",
         "83ddbf2a.ca0fb8",
         "89f06a3c.5cf0c8",
         "acc5dbef.ee3348",
@@ -77,6 +76,7 @@
         "cbcd99ce.c72bd8",
         "7a9f34e2.0af57c",
         "b55f1296.840848",
+        "d604a407.16f9a",
         "5c189e4b.93fcf8",
         "6a04e23f.5461dc"
       ]
@@ -86,14 +86,17 @@
     "id": "ea6e7cc2.759108",
     "type": "execute",
     "name": "execute RestApiCallNode Create IPWAN L3VPN",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.tempDir + '/l3smvpntemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.templateDir + '/l3smvpntemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1164.0001831054688,
+    "x": 1109.0001831054688,
     "y": 988,
     "z": "f0bdac73.5c8b08",
     "wires": [
-      []
+      [
+        "4a301b10.4617ec",
+        "41cb92ed.fecc84"
+      ]
     ]
   },
   {
@@ -127,11 +130,11 @@
     "id": "ee76e905.760cf",
     "type": "execute",
     "name": "execute RestApiCallNode Create SPTN L3VPN",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l3smsitetemplate.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.templateDir +'/l3smsitetemplate.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1135.6668701171875,
-    "y": 1190.6666870117188,
+    "x": 1145.6668701171875,
+    "y": 1227.666748046875,
     "z": "f0bdac73.5c8b08",
     "wires": [
       []
@@ -283,47 +286,6 @@
     "wires": []
   },
   {
-    "id": "4838189c.cc5c2",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1246.5,
-    "y": 400,
-    "z": "f0bdac73.5c8b08",
-    "wires": [
-      [
-        "3d658710.cc53a",
-        "3ffa7de9.3d22aa",
-        "664b1b62.1edb04",
-        "34505a72.fd91d6",
-        "7e10e5c0.fe770c",
-        "13208c8b.098ffb",
-        "746f494e.5eb71",
-        "234c66fc.f3b94a",
-        "57e3e674.d18598",
-        "b57b62d6.ecd3f8",
-        "19af71a4.6ac59e",
-        "f7634e7a.60329",
-        "ef48199.418d9e8",
-        "bc753ec1.7895e",
-        "68aca326.79a5c4",
-        "4df426f9.add138",
-        "7b807eaa.43ad18",
-        "aeb88291.366bb",
-        "7d79c207.4a89ac",
-        "7b628f48.c22598",
-        "f4a82fcb.89b23",
-        "9f057f5a.21a718",
-        "c28375dc.9cf31",
-        "3493b1b1.d0be5e",
-        "f8750aec.0b434"
-      ]
-    ]
-  },
-  {
     "id": "3d658710.cc53a",
     "type": "switchNode",
     "name": "switch name",
@@ -331,7 +293,7 @@
     "comments": "",
     "outputs": 1,
     "x": 1597.5,
-    "y": 24.000030517578125,
+    "y": 28.000030517578125,
     "z": "f0bdac73.5c8b08",
     "wires": [
       [
@@ -1330,7 +1292,7 @@
     "id": "e2132fcb.e54328",
     "type": "switchNode",
     "name": "switch service-type",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`\">\n",
+    "xml": "<switch test=\"`$prop.l3vpn.service-type`\">\n",
     "comments": "",
     "outputs": 1,
     "x": 700,
@@ -1351,8 +1313,8 @@
     "xml": "<outcome value='l3vpn-ipwan'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 686,
-    "y": 1056.0000305175781,
+    "x": 655,
+    "y": 1048,
     "z": "f0bdac73.5c8b08",
     "wires": [
       [
@@ -1364,11 +1326,11 @@
     "id": "3f2ca116.1448fe",
     "type": "outcomeTrue",
     "name": "l3vpn-sptn",
-    "xml": "<outcome value='true'>\n",
+    "xml": "<outcome value='l3vpn-sptn'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 842,
-    "y": 1200,
+    "x": 844,
+    "y": 1235,
     "z": "f0bdac73.5c8b08",
     "wires": [
       [
@@ -1707,14 +1669,15 @@
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 865,
-    "y": 1056.0000305175781,
+    "x": 822,
+    "y": 1048,
     "z": "f0bdac73.5c8b08",
     "wires": [
       [
         "ea6e7cc2.759108",
         "3b2cff3e.76e6d",
-        "ec543af.60d7dc8"
+        "ec543af.60d7dc8",
+        "81408502.df9e98"
       ]
     ]
   },
@@ -1722,28 +1685,34 @@
     "id": "3b2cff3e.76e6d",
     "type": "execute",
     "name": "execute RestApiCallNode IPWAN Site Config",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.tempDir +'/l3smsitetemplate.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.templateDir +'/l3smsitetemplate.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"site-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1171,
-    "y": 1052,
+    "x": 1093,
+    "y": 1098,
     "z": "f0bdac73.5c8b08",
     "wires": [
-      []
+      [
+        "4a301b10.4617ec",
+        "41cb92ed.fecc84"
+      ]
     ]
   },
   {
     "id": "ec543af.60d7dc8",
     "type": "execute",
     "name": "execute RestApiCallNode IPWAN VRF Config",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.tempDir +'/l3smvrftemplate.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vrf-attributes'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.templateDir +'/l3smvrftemplate.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vrf-attributes'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vrf-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1169,
-    "y": 1123,
+    "x": 1090,
+    "y": 1171,
     "z": "f0bdac73.5c8b08",
     "wires": [
-      []
+      [
+        "4a301b10.4617ec",
+        "41cb92ed.fecc84"
+      ]
     ]
   },
   {
@@ -2109,5 +2078,158 @@
     "wires": [
       []
     ]
+  },
+  {
+    "id": "4838189c.cc5c2",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1246.5,
+    "y": 400,
+    "z": "f0bdac73.5c8b08",
+    "wires": [
+      [
+        "3d658710.cc53a",
+        "3ffa7de9.3d22aa",
+        "664b1b62.1edb04",
+        "34505a72.fd91d6",
+        "7e10e5c0.fe770c",
+        "13208c8b.098ffb",
+        "746f494e.5eb71",
+        "234c66fc.f3b94a",
+        "57e3e674.d18598",
+        "b57b62d6.ecd3f8",
+        "19af71a4.6ac59e",
+        "f7634e7a.60329",
+        "ef48199.418d9e8",
+        "bc753ec1.7895e",
+        "68aca326.79a5c4",
+        "4df426f9.add138",
+        "7b807eaa.43ad18",
+        "aeb88291.366bb",
+        "7d79c207.4a89ac",
+        "7b628f48.c22598",
+        "f4a82fcb.89b23",
+        "9f057f5a.21a718",
+        "c28375dc.9cf31",
+        "3493b1b1.d0be5e",
+        "f8750aec.0b434"
+      ]
+    ]
+  },
+  {
+    "id": "81408502.df9e98",
+    "type": "execute",
+    "name": "execute RestApiCallNode Get token",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>",
+    "comments": "",
+    "outputs": 1,
+    "x": 967,
+    "y": 915,
+    "z": "f0bdac73.5c8b08",
+    "wires": [
+      [
+        "38a0724b.4de246",
+        "756c4519.f37034"
+      ]
+    ]
+  },
+  {
+    "id": "38a0724b.4de246",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1202,
+    "y": 893,
+    "z": "f0bdac73.5c8b08",
+    "wires": [
+      [
+        "a121e319.bf2cd8"
+      ]
+    ]
+  },
+  {
+    "id": "756c4519.f37034",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1194.25,
+    "y": 946.6428833007812,
+    "z": "f0bdac73.5c8b08",
+    "wires": [
+      [
+        "e1f11752.4c0f58"
+      ]
+    ]
+  },
+  {
+    "id": "e1f11752.4c0f58",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",
+    "comments": "",
+    "x": 1347,
+    "y": 946.3929443359375,
+    "z": "f0bdac73.5c8b08",
+    "wires": []
+  },
+  {
+    "id": "a121e319.bf2cd8",
+    "type": "set",
+    "name": "set token-id",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='$token-result.token_id' />\n",
+    "comments": "",
+    "x": 1356,
+    "y": 894,
+    "z": "f0bdac73.5c8b08",
+    "wires": []
+  },
+  {
+    "id": "4a301b10.4617ec",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1382,
+    "y": 1066,
+    "z": "f0bdac73.5c8b08",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "41cb92ed.fecc84",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1389.25,
+    "y": 1160.642822265625,
+    "z": "f0bdac73.5c8b08",
+    "wires": [
+      [
+        "ef1bae96.039368"
+      ]
+    ]
+  },
+  {
+    "id": "ef1bae96.039368",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing 3rd party controller rest api\" />\n",
+    "comments": "",
+    "x": 1361,
+    "y": 1345.3929443359375,
+    "z": "f0bdac73.5c8b08",
+    "wires": []
   }
 ]