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

3 files changed, 588 insertions, 333 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": []
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json
index 38d99368..3cea5298 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "5b1da5a1.42a48c",
+    "id": "d563afb0.056168",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 84,
-    "y": 118.11099243164062,
-    "z": "cb78d918.7fc128",
+    "x": 92,
+    "y": 121.33333587646484,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "93750cf9.1f2d78"
+        "f7c87a2f.fb9cf"
       ]
     ]
   },
   {
-    "id": "93750cf9.1f2d78",
+    "id": "f7c87a2f.fb9cf",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,744 +22,877 @@
     "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='${project.version}'>",
     "outputs": 1,
-    "x": 296.00000381469727,
-    "y": 190.11100959777832,
-    "z": "cb78d918.7fc128",
+    "x": 304.00000381469727,
+    "y": 193.33335304260254,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "86c0b848.b39ba"
+        "37f24cdb.d75cb4"
       ]
     ]
   },
   {
-    "id": "86c0b848.b39ba",
+    "id": "37f24cdb.d75cb4",
     "type": "method",
     "name": "method network-topology-operation-delete",
     "xml": "<method rpc='network-topology-operation-delete' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 284.0001220703125,
-    "y": 278.1109924316406,
-    "z": "cb78d918.7fc128",
+    "x": 292.0001220703125,
+    "y": 281.33333587646484,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "77e3cc35.7d7cd4"
+        "968f84c1.36e27"
       ]
     ]
   },
   {
-    "id": "77e3cc35.7d7cd4",
+    "id": "968f84c1.36e27",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 560.0000305175781,
-    "y": 286.11100578308105,
-    "z": "cb78d918.7fc128",
+    "x": 568.0000305175781,
+    "y": 289.3333492279053,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "be2e1456.227648",
-        "a1897ab9.0fe448",
-        "b9226511.aff8f8",
-        "bac94eb6.f12e88",
-        "d9cb698f.15b1f",
-        "4f7bc968.61f5a",
-        "af92894.71fa378",
-        "4a75daf.1521ba4",
-        "70ae31cf.a526f"
+        "ae3d965a.4a7378",
+        "b83c4e05.5eb538",
+        "fc04e5a4.52eb5",
+        "a964f2cc.8cf37",
+        "92a504dc.ec13d8",
+        "229c0a0d.36236e",
+        "5b36b323.b34d7c",
+        "6331818b.c6bfc",
+        "e6735147.08a6d8"
       ]
     ]
   },
   {
-    "id": "be2e1456.227648",
+    "id": "ae3d965a.4a7378",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 881,
-    "y": 69.11099243164062,
-    "z": "cb78d918.7fc128",
+    "x": 889,
+    "y": 72.33333587646484,
+    "z": "89eca582.be817",
     "wires": [
       []
     ]
   },
   {
-    "id": "a1897ab9.0fe448",
+    "id": "b83c4e05.5eb538",
     "type": "get-resource",
     "name": "get-resource esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 825,
-    "y": 514.1109619140625,
-    "z": "cb78d918.7fc128",
+    "x": 833,
+    "y": 517.3333053588867,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "75e7b934.cb3dd8",
-        "796a59b1.8d0548",
-        "5c8d6866.b859a"
+        "3ddcae6d.d600c2",
+        "8879d867.b4938",
+        "24d0dda7.8f860a"
       ]
     ]
   },
   {
-    "id": "75e7b934.cb3dd8",
+    "id": "3ddcae6d.d600c2",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1063,
-    "y": 470.1109924316406,
-    "z": "cb78d918.7fc128",
+    "x": 1071,
+    "y": 473.33333587646484,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "cf00d60e.b98ae8"
+        "2875c9d1.a679ce"
       ]
     ]
   },
   {
-    "id": "796a59b1.8d0548",
+    "id": "8879d867.b4938",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1067.490966796875,
-    "y": 511.68505859375,
-    "z": "cb78d918.7fc128",
+    "x": 1075.490966796875,
+    "y": 514.9074020385742,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "b91067cd.af8e68"
+        "2fdf1df8.d37b9a"
       ]
     ]
   },
   {
-    "id": "5c8d6866.b859a",
+    "id": "24d0dda7.8f860a",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1060.823974609375,
-    "y": 563.018310546875,
-    "z": "cb78d918.7fc128",
+    "x": 1068.823974609375,
+    "y": 566.2406539916992,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "977f0d12.35997"
+        "d6d9101d.068098"
       ]
     ]
   },
   {
-    "id": "b91067cd.af8e68",
+    "id": "2fdf1df8.d37b9a",
     "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=\"Network model is_bound_to_vpn=true but no vpn_binding is present\" />\n\n",
     "comments": "",
-    "x": 1243.0623779296875,
-    "y": 509.97076416015625,
-    "z": "cb78d918.7fc128",
+    "x": 1251.0623779296875,
+    "y": 513.1931076049805,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "977f0d12.35997",
+    "id": "d6d9101d.068098",
     "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=\"Unexpected error retrieving vpn binding\" />\n\n",
     "comments": "",
-    "x": 1221.5965576171875,
-    "y": 561.45751953125,
-    "z": "cb78d918.7fc128",
+    "x": 1229.5965576171875,
+    "y": 564.6798629760742,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "b9226511.aff8f8",
+    "id": "fc04e5a4.52eb5",
     "type": "for",
     "name": "for each network-input-parameters",
     "xml": "<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 843,
-    "y": 247.11099243164062,
-    "z": "cb78d918.7fc128",
+    "x": 851,
+    "y": 250.33333587646484,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "1203f51d.6f9be3"
+        "21f32325.9d7694"
       ]
     ]
   },
   {
-    "id": "1203f51d.6f9be3",
+    "id": "21f32325.9d7694",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1124.8333740234375,
-    "y": 225.4443359375,
-    "z": "cb78d918.7fc128",
+    "x": 1132.8333740234375,
+    "y": 228.66667938232422,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "f23590e3.3d3e",
-        "9c473946.08b4",
-        "634e4197.82f778"
+        "15f7b5bc.24b652",
+        "58a03af6.4686fc",
+        "83edb691.4ecc08"
       ]
     ]
   },
   {
-    "id": "f23590e3.3d3e",
+    "id": "15f7b5bc.24b652",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1333,
-    "y": 186.11099243164062,
-    "z": "cb78d918.7fc128",
+    "x": 1341,
+    "y": 189.33333587646484,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "722e293e.27d6a8"
+        "57533497.32b74c"
       ]
     ]
   },
   {
-    "id": "722e293e.27d6a8",
+    "id": "57533497.32b74c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1520,
-    "y": 186.11099243164062,
-    "z": "cb78d918.7fc128",
+    "x": 1528,
+    "y": 189.33333587646484,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "ed3016dc.763f5"
+        "636e0cba.4ad824"
       ]
     ]
   },
   {
-    "id": "ed3016dc.763f5",
+    "id": "636e0cba.4ad824",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.l3vpn.name' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1688,
-    "y": 186.71099853515625,
-    "z": "cb78d918.7fc128",
+    "x": 1696,
+    "y": 189.93334197998047,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "9c473946.08b4",
+    "id": "58a03af6.4686fc",
     "type": "switchNode",
     "name": "switch service-type",
     "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1338,
-    "y": 240.71096801757812,
-    "z": "cb78d918.7fc128",
+    "x": 1346,
+    "y": 243.93331146240234,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "406e37de.0fb498"
+        "49b85e52.02df98"
       ]
     ]
   },
   {
-    "id": "406e37de.0fb498",
+    "id": "49b85e52.02df98",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1521.9999389648438,
-    "y": 245.71096801757812,
-    "z": "cb78d918.7fc128",
+    "x": 1529.9999389648438,
+    "y": 248.93331146240234,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "3e9c73.d1f31b8e"
+        "8bbe0d91.97e45"
       ]
     ]
   },
   {
-    "id": "3e9c73.d1f31b8e",
+    "id": "8bbe0d91.97e45",
     "type": "set",
     "name": "set service-type",
     "xml": "<set>\n<parameter name='prop.l3vpn.service-type' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1690.9999389648438,
-    "y": 243.71096801757812,
-    "z": "cb78d918.7fc128",
+    "x": 1698.9999389648438,
+    "y": 246.93331146240234,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "cf00d60e.b98ae8",
+    "id": "2875c9d1.a679ce",
     "type": "set",
     "name": "set controller data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].serviceUrl`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
     "comments": "",
-    "x": 1249,
-    "y": 467.1109619140625,
-    "z": "cb78d918.7fc128",
+    "x": 1257,
+    "y": 470.3333053588867,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "91ceb00c.aa0fd",
+    "id": "e7464274.0f82b8",
     "type": "execute",
     "name": "execute REST DELETE VPN",
-    "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/vpnservice=' + $prop.l3vpn.name`\" />\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=\"delete\"/>\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.tempDir +'/l3smvpntemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services/vpnservice=' + $prop.l3vpn.name`\" />\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=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1314,
-    "y": 600.1109924316406,
-    "z": "cb78d918.7fc128",
+    "x": 1579,
+    "y": 685.3333129882812,
+    "z": "89eca582.be817",
     "wires": [
-      []
+      [
+        "9b0fa013.788a28",
+        "19c42608.424b9a"
+      ]
     ]
   },
   {
-    "id": "bac94eb6.f12e88",
+    "id": "a964f2cc.8cf37",
     "type": "switchNode",
     "name": "switch service-type",
     "xml": "<switch test=\"`$prop.l3vpn.service-type`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 784,
-    "y": 618.1109924316406,
-    "z": "cb78d918.7fc128",
+    "x": 792,
+    "y": 621.3333358764648,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "31607169.f993a6"
+        "93ec2320.02d11"
       ]
     ]
   },
   {
-    "id": "31607169.f993a6",
+    "id": "93ec2320.02d11",
     "type": "outcomeTrue",
     "name": "l3vpn-ipwan",
     "xml": "<outcome value='l3vpn-ipwan'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1034,
-    "y": 602.1109924316406,
-    "z": "cb78d918.7fc128",
+    "x": 1049,
+    "y": 622.3333129882812,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "91ceb00c.aa0fd"
+        "4e922d10.8ba70c"
       ]
     ]
   },
   {
-    "id": "d9cb698f.15b1f",
+    "id": "92a504dc.ec13d8",
     "type": "switchNode",
     "name": "switch service-data.networks.network_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 823,
-    "y": 142.11099243164062,
-    "z": "cb78d918.7fc128",
+    "x": 831,
+    "y": 145.33333587646484,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "652472f9.d0128c",
-        "2b9737f2.ff2e58"
+        "8e028d38.9057d",
+        "c340ac4a.71f85"
       ]
     ]
   },
   {
-    "id": "652472f9.d0128c",
+    "id": "8e028d38.9057d",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1268,
-    "y": 68.11105346679688,
-    "z": "cb78d918.7fc128",
+    "x": 1276,
+    "y": 71.3333969116211,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "56dffac.74ce404"
+        "ac7b7cef.c3a35"
       ]
     ]
   },
   {
-    "id": "56dffac.74ce404",
+    "id": "ac7b7cef.c3a35",
     "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=\"network-topology-operation-input.network-request-input.network-id not found in service-data\" />\n",
     "comments": "",
-    "x": 1458.7774658203125,
-    "y": 55,
-    "z": "cb78d918.7fc128",
+    "x": 1466.7774658203125,
+    "y": 58.22234344482422,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "2b9737f2.ff2e58",
+    "id": "c340ac4a.71f85",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1152.0003662109375,
-    "y": 133.11106872558594,
-    "z": "cb78d918.7fc128",
+    "x": 1160.0003662109375,
+    "y": 136.33341217041016,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "5d39d6e3.de1a58"
+        "8cbfe4b9.2a2368"
       ]
     ]
   },
   {
-    "id": "5d39d6e3.de1a58",
+    "id": "8cbfe4b9.2a2368",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1323.2698974609375,
-    "y": 116.66560363769531,
-    "z": "cb78d918.7fc128",
+    "x": 1331.2698974609375,
+    "y": 119.88794708251953,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "2ac08a71.09b5de",
-        "9c86a373.825778"
+        "7a7f5cb9.3ef364",
+        "89dd7f04.eed92"
       ]
     ]
   },
   {
-    "id": "2ac08a71.09b5de",
+    "id": "7a7f5cb9.3ef364",
     "type": "for",
     "name": "for nidx..service-data.networks.network[]",
     "xml": "<for index='nidx' start='0' end='`$service-data.networks.network_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1621.285888671875,
-    "y": 97.53961181640625,
-    "z": "cb78d918.7fc128",
+    "x": 1629.285888671875,
+    "y": 100.76195526123047,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "5db8c267.915c24"
+        "b49be6d2.09dbc8"
       ]
     ]
   },
   {
-    "id": "9c86a373.825778",
+    "id": "89dd7f04.eed92",
     "type": "switchNode",
     "name": "switch tmp.nidx ",
     "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1542.5872802734375,
-    "y": 140.52279663085938,
-    "z": "cb78d918.7fc128",
+    "x": 1550.5872802734375,
+    "y": 143.7451400756836,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "3d81dbd3.1a6114"
+        "ab419b0d.e9521"
       ]
     ]
   },
   {
-    "id": "3d81dbd3.1a6114",
+    "id": "ab419b0d.e9521",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1743.015869140625,
-    "y": 146.09420776367188,
-    "z": "cb78d918.7fc128",
+    "x": 1751.015869140625,
+    "y": 149.3165512084961,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "75e88bb1.8a62cc"
+        "8e89ca22.c1f468"
       ]
     ]
   },
   {
-    "id": "5db8c267.915c24",
+    "id": "b49be6d2.09dbc8",
     "type": "switchNode",
     "name": "switch networkid found",
     "xml": "<switch test=\"`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1931.7144775390625,
-    "y": 95.78970336914062,
-    "z": "cb78d918.7fc128",
+    "x": 1939.7144775390625,
+    "y": 99.01204681396484,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "e928a560.5b1c7"
+        "92fa60c6.e61928"
       ]
     ]
   },
   {
-    "id": "75e88bb1.8a62cc",
+    "id": "8e89ca22.c1f468",
     "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=\"network-topology-operation-input.network-request-input.network-id not found in service-data\" />\n",
     "comments": "",
-    "x": 1914.4443359375,
-    "y": 146.237060546875,
-    "z": "cb78d918.7fc128",
+    "x": 1922.4443359375,
+    "y": 149.45940399169922,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "e928a560.5b1c7",
+    "id": "92fa60c6.e61928",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2137.666748046875,
-    "y": 94.68243408203125,
-    "z": "cb78d918.7fc128",
+    "x": 2145.666748046875,
+    "y": 97.90477752685547,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "4ba4d636.a30d6"
+        "13e93e78.dc98f2"
       ]
     ]
   },
   {
-    "id": "4ba4d636.a30d6",
+    "id": "13e93e78.dc98f2",
     "type": "set",
     "name": "set tmp.nidx and ctx.network-data",
     "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].`' />\n",
     "comments": "",
-    "x": 2376.198486328125,
-    "y": 90.43243408203125,
-    "z": "cb78d918.7fc128",
+    "x": 2384.198486328125,
+    "y": 93.65477752685547,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "4f7bc968.61f5a",
+    "id": "229c0a0d.36236e",
     "type": "block",
     "name": "block : saveNetworkData",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 802,
-    "y": 708.1109924316406,
-    "z": "cb78d918.7fc128",
+    "x": 810,
+    "y": 711.3333358764648,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "79d9aff3.77d7a8",
-        "7c1ac8d9.cf4248",
-        "305a1978.b12f4e",
-        "93b679b.6a51508"
+        "2f2a571f.f701d8",
+        "ad0ac3a3.801d88",
+        "3a891d55.fcf27a",
+        "4dbcadac.7cacd4"
       ]
     ]
   },
   {
-    "id": "af92894.71fa378",
+    "id": "5b36b323.b34d7c",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 754.6665649414062,
-    "y": 926.4442749023438,
-    "z": "cb78d918.7fc128",
+    "x": 762.6665649414062,
+    "y": 929.666618347168,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "305a1978.b12f4e",
+    "id": "3a891d55.fcf27a",
     "type": "set",
     "name": "copy input to service-data",
     "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n",
     "comments": "",
-    "x": 1095.0000076293945,
-    "y": 688.4443044662476,
-    "z": "cb78d918.7fc128",
+    "x": 1103.0000076293945,
+    "y": 691.6666479110718,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "79d9aff3.77d7a8",
+    "id": "2f2a571f.f701d8",
     "type": "set",
     "name": "set networkId",
     "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n",
     "comments": "",
-    "x": 1059.2895622253418,
-    "y": 732.1621513366699,
-    "z": "cb78d918.7fc128",
+    "x": 1067.2895622253418,
+    "y": 735.3844947814941,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "7c1ac8d9.cf4248",
+    "id": "ad0ac3a3.801d88",
     "type": "set",
     "name": "set object-path",
     "xml": "<set>\n<parameter name='network-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/networks/network/'\n + $networkId\n + '/network-data/'` \" />\n \n",
     "comments": "",
-    "x": 1065.0039291381836,
-    "y": 769.30504322052,
-    "z": "cb78d918.7fc128",
+    "x": 1073.0039291381836,
+    "y": 772.5273866653442,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "93b679b.6a51508",
+    "id": "4dbcadac.7cacd4",
     "type": "set",
     "name": "set network-level-oper-status",
     "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Deleted' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\n",
     "comments": "",
-    "x": 1108.9999389648438,
-    "y": 816.4442625045776,
-    "z": "cb78d918.7fc128",
+    "x": 1116.9999389648438,
+    "y": 819.6666059494019,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "4a75daf.1521ba4",
+    "id": "6331818b.c6bfc",
     "type": "get-resource",
     "name": "get-resource pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $prop.l3vpn.pe1_id AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 781,
-    "y": 392,
-    "z": "cb78d918.7fc128",
+    "x": 789,
+    "y": 395.2223434448242,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "b89fb093.0489a8",
-        "6b28b3fc.71f09c",
-        "6a884f6a.df82b8"
+        "2c36397a.e13af6",
+        "81511490.7b5318",
+        "8ef29169.d30308"
       ]
     ]
   },
   {
-    "id": "b89fb093.0489a8",
+    "id": "2c36397a.e13af6",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 975,
-    "y": 330,
-    "z": "cb78d918.7fc128",
+    "x": 983,
+    "y": 333.2223434448242,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "af6e1f5.d3f8c6"
+        "69eaa950.7e3dd"
       ]
     ]
   },
   {
-    "id": "6b28b3fc.71f09c",
+    "id": "81511490.7b5318",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 984.490966796875,
-    "y": 372.57403564453125,
-    "z": "cb78d918.7fc128",
+    "x": 992.490966796875,
+    "y": 375.79637908935547,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "f8931666.61247"
+        "a2279b64.597d58"
       ]
     ]
   },
   {
-    "id": "6a884f6a.df82b8",
+    "id": "8ef29169.d30308",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 977.823974609375,
-    "y": 420.9073486328125,
-    "z": "cb78d918.7fc128",
+    "x": 985.823974609375,
+    "y": 424.1296920776367,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "d28c6955.33e8f"
+        "48d06926.05169"
       ]
     ]
   },
   {
-    "id": "f8931666.61247",
+    "id": "a2279b64.597d58",
     "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1170.0623779296875,
-    "y": 373.8597717285156,
-    "z": "cb78d918.7fc128",
+    "x": 1178.0623779296875,
+    "y": 377.08211517333984,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "d28c6955.33e8f",
+    "id": "48d06926.05169",
     "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1166.5965576171875,
-    "y": 424.3465270996094,
-    "z": "cb78d918.7fc128",
+    "x": 1174.5965576171875,
+    "y": 427.5688705444336,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "af6e1f5.d3f8c6",
+    "id": "69eaa950.7e3dd",
     "type": "set",
     "name": "set tmp.thirdparty-sdnc-id",
     "xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 1189,
-    "y": 326,
-    "z": "cb78d918.7fc128",
+    "x": 1197,
+    "y": 329.2223434448242,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "634e4197.82f778",
+    "id": "83edb691.4ecc08",
     "type": "switchNode",
     "name": "switch pe1_id",
     "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'pe1_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1340,
-    "y": 287,
-    "z": "cb78d918.7fc128",
+    "x": 1348,
+    "y": 290.2223434448242,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "5329ae02.4dab98"
+        "6271005d.f22478"
       ]
     ]
   },
   {
-    "id": "5329ae02.4dab98",
+    "id": "6271005d.f22478",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1526,
-    "y": 296,
-    "z": "cb78d918.7fc128",
+    "x": 1534,
+    "y": 299.2223434448242,
+    "z": "89eca582.be817",
     "wires": [
       [
-        "19f03810.34cf68"
+        "170629d3.536056"
       ]
     ]
   },
   {
-    "id": "19f03810.34cf68",
+    "id": "170629d3.536056",
     "type": "set",
     "name": "set pe1_id",
     "xml": "<set>\n<parameter name='prop.l3vpn.pe1_id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1709,
-    "y": 300,
-    "z": "cb78d918.7fc128",
+    "x": 1717,
+    "y": 303.2223434448242,
+    "z": "89eca582.be817",
     "wires": []
   },
   {
-    "id": "70ae31cf.a526f",
+    "id": "e6735147.08a6d8",
     "type": "delete",
     "name": "delete underlay configuration in AAI",
     "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='configuration' \n        key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 812,
-    "y": 854,
-    "z": "cb78d918.7fc128",
+    "x": 820,
+    "y": 857.2223434448242,
+    "z": "89eca582.be817",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "390c3473.62cfd4",
+    "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": 1602,
+    "y": 613,
+    "z": "89eca582.be817",
+    "wires": [
+      [
+        "114e384f.cecfb8",
+        "a016d52e.8ce4a8"
+      ]
+    ]
+  },
+  {
+    "id": "114e384f.cecfb8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1842,
+    "y": 576,
+    "z": "89eca582.be817",
+    "wires": [
+      [
+        "600363c2.6867f4"
+      ]
+    ]
+  },
+  {
+    "id": "a016d52e.8ce4a8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1849.25,
+    "y": 642.6428833007812,
+    "z": "89eca582.be817",
+    "wires": [
+      [
+        "e5ef3b3f.f1e878"
+      ]
+    ]
+  },
+  {
+    "id": "e5ef3b3f.f1e878",
+    "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": 2030,
+    "y": 641.3929443359375,
+    "z": "89eca582.be817",
+    "wires": []
+  },
+  {
+    "id": "600363c2.6867f4",
+    "type": "set",
+    "name": "set token-id",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='$token-result.token_id' />\n",
+    "comments": "",
+    "x": 2027,
+    "y": 573,
+    "z": "89eca582.be817",
+    "wires": []
+  },
+  {
+    "id": "9b0fa013.788a28",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1799,
+    "y": 698,
+    "z": "89eca582.be817",
     "wires": [
       []
     ]
+  },
+  {
+    "id": "19c42608.424b9a",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1800.25,
+    "y": 761.642822265625,
+    "z": "89eca582.be817",
+    "wires": [
+      [
+        "6961c23b.26892c"
+      ]
+    ]
+  },
+  {
+    "id": "6961c23b.26892c",
+    "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": 1966,
+    "y": 764.3929443359375,
+    "z": "89eca582.be817",
+    "wires": []
+  },
+  {
+    "id": "4e922d10.8ba70c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1273,
+    "y": 624,
+    "z": "89eca582.be817",
+    "wires": [
+      [
+        "390c3473.62cfd4",
+        "e7464274.0f82b8"
+      ]
+    ]
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
index 94ee31b3..da6fd8d3 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
@@ -16,11 +16,11 @@
   {
     "id": "2fff1e3d.63ab82",
     "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": 332.2857131958008,
     "y": 114.28574562072754,