From 55df8be379e56ebf9a23f3406791386b3ff075ca Mon Sep 17 00:00:00 2001
From: "ramu.n" <ramu.n@huawei.com>
Date: Mon, 16 Oct 2017 20:53:50 +0530
Subject: Fix underlay DG testing issues

*Use "network-topology-operation-input.sdnc-request-header.svc-action" instead of service-topology-operation-input.sdnc-request-header.svc-action
*Fix indexing of network-topology-operation-input.network-request-input.network-input-parameters
*Fix sdnc-request-header.svc-action switch case order

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

Former-commit-id: e38045ecf304cb65f348c019ffc859c649e030e8
---
 ...URCE-API_network-topology-operation-create.json | 1460 ++++++++++----------
 ...URCE-API_validate-network-input-parameters.json |  752 +++++-----
 ...OURCE-API_network-topology-operation-create.xml |    4 +-
 ...OURCE-API_validate-network-input-parameters.xml |   24 +-
 4 files changed, 1120 insertions(+), 1120 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 821fbfab..ceaf597e 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
@@ -1,2111 +1,2111 @@
 [
   {
-    "id": "2d119cf9.da55d4",
+    "id": "47e67080.80954",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 89,
-    "y": 66.99996948242188,
-    "z": "afcbb687.85236",
+    "x": 86,
+    "y": 57,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "a281a341.cee95"
+        "2a509806.cfd2b"
       ]
     ]
   },
   {
-    "id": "a281a341.cee95",
+    "id": "2a509806.cfd2b",
     "type": "service-logic",
-    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "name": "GENERIC-RESOURCE-API 1.2.0-SNAPSHOT",
     "module": "GENERIC-RESOURCE-API",
-    "version": "${project.version}",
+    "version": "1.2.0-SNAPSHOT",
     "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}'>",
+    "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'>",
     "outputs": 1,
-    "x": 301.00000381469727,
-    "y": 138.99998664855957,
-    "z": "afcbb687.85236",
+    "x": 298.00000381469727,
+    "y": 129.0000171661377,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "f765e2a8.07eac"
+        "25026a28.6facee"
       ]
     ]
   },
   {
-    "id": "f765e2a8.07eac",
+    "id": "25026a28.6facee",
     "type": "method",
     "name": "method network-topology-operation-create",
     "xml": "<method rpc='network-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 289.0001220703125,
-    "y": 226.99996948242188,
-    "z": "afcbb687.85236",
+    "x": 286.0001220703125,
+    "y": 217,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "ba8938ef.875328"
+        "fbf289ee.ac5b88"
       ]
     ]
   },
   {
-    "id": "ba8938ef.875328",
+    "id": "fbf289ee.ac5b88",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 365,
-    "y": 625,
-    "z": "afcbb687.85236",
+    "x": 362,
+    "y": 615.0000305175781,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "ade3e35c.b5b59",
-        "7c2f72f7.87d2ac",
-        "8d5aeff7.32c67",
-        "d96cca8b.aef998",
-        "38000c67.90cd64",
-        "496a2fd4.025b58",
-        "7637caf4.d6c8f4",
-        "a2fb9e2f.a93ff8",
-        "fb6e4c2e.3cc6e8",
-        "f086eb6d.36e988",
-        "fb5a457c.e3d938",
-        "7b0c7c0c.cadfec",
-        "aec2b21c.351b48",
-        "fd85e187.c7dde",
-        "4308a2c5.6e7bac",
-        "8381990.da591e8",
-        "ced212e0.c44f6",
-        "3039bc18.0720bc",
-        "eb064901.8cfbf"
+        "7de5755c.474434",
+        "d604a407.16f9a",
+        "83ddbf2a.ca0fb8",
+        "89f06a3c.5cf0c8",
+        "acc5dbef.ee3348",
+        "e2132fcb.e54328",
+        "c225d084.2fc3d8",
+        "6a15cb31.6626a4",
+        "fdf946de.e32c5",
+        "c90552d6.d68d2",
+        "e0e6781c.4e0188",
+        "9875bc60.171298",
+        "3a5f6ad2.fcb69e",
+        "9104517f.7f262",
+        "cbcd99ce.c72bd8",
+        "7a9f34e2.0af57c",
+        "b55f1296.840848",
+        "5c189e4b.93fcf8",
+        "6a04e23f.5461dc"
       ]
     ]
   },
   {
-    "id": "f1c4e62c.acf5f",
+    "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\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1167.0001831054688,
-    "y": 997.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1164.0001831054688,
+    "y": 988,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       []
     ]
   },
   {
-    "id": "e2f31eb5.a183e",
+    "id": "c81881c5.b2d718",
     "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].service-url`\" />\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": 1266.0000610351562,
-    "y": 271.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1263.0000610351562,
+    "y": 262,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "d96cca8b.aef998",
+    "id": "89f06a3c.5cf0c8",
     "type": "for",
     "name": "for each network-input-parameters",
     "xml": "<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 807.6666259765625,
-    "y": 187.6666259765625,
-    "z": "afcbb687.85236",
+    "x": 804.6666259765625,
+    "y": 177.66665649414062,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "22c32b46.de62ec"
+        "4838189c.cc5c2"
       ]
     ]
   },
   {
-    "id": "2bd25145.a5e5d6",
+    "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\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1138.6668701171875,
-    "y": 1200.6666564941406,
-    "z": "afcbb687.85236",
+    "x": 1135.6668701171875,
+    "y": 1190.6666870117188,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       []
     ]
   },
   {
-    "id": "8d5aeff7.32c67",
+    "id": "83ddbf2a.ca0fb8",
     "type": "execute",
     "name": "execute vpn-policy1-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vpn-policy1-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 810.6666259765625,
-    "y": 460.6666564941406,
-    "z": "afcbb687.85236",
+    "x": 807.6666259765625,
+    "y": 450.66668701171875,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "f683f47d.fcccc8"
+        "1c6ccd23.dfd9ab"
       ]
     ]
   },
   {
-    "id": "f683f47d.fcccc8",
+    "id": "1c6ccd23.dfd9ab",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1035.6666259765625,
-    "y": 463.6666259765625,
-    "z": "afcbb687.85236",
+    "x": 1032.6666259765625,
+    "y": 453.6666564941406,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "64dcb25e.cfa1dc"
+        "c7b2537.20c0ab"
       ]
     ]
   },
   {
-    "id": "64dcb25e.cfa1dc",
+    "id": "c7b2537.20c0ab",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation vpn policy ID\" />\n",
     "comments": "",
-    "x": 1216.6666259765625,
-    "y": 461.6666259765625,
-    "z": "afcbb687.85236",
+    "x": 1213.6666259765625,
+    "y": 451.6666564941406,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "ade3e35c.b5b59",
+    "id": "7de5755c.474434",
     "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": 862.5,
-    "y": 103.99996948242188,
-    "z": "afcbb687.85236",
+    "x": 859.5,
+    "y": 94,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       []
     ]
   },
   {
-    "id": "7c2f72f7.87d2ac",
+    "id": "d604a407.16f9a",
     "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": 823.5,
-    "y": 337.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 820.5,
+    "y": 328,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "7c3121a2.590238",
-        "78ce712c.ccd01",
-        "cd33fdee.3222d"
+        "85e43fb.89fcec",
+        "2e779e4a.efc65a",
+        "30f09d47.f52bd2"
       ]
     ]
   },
   {
-    "id": "7c3121a2.590238",
+    "id": "85e43fb.89fcec",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1068.5,
-    "y": 283.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1065.5,
+    "y": 274,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "e2f31eb5.a183e"
+        "c81881c5.b2d718"
       ]
     ]
   },
   {
-    "id": "78ce712c.ccd01",
+    "id": "2e779e4a.efc65a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1071.990966796875,
-    "y": 331.5740051269531,
-    "z": "afcbb687.85236",
+    "x": 1068.990966796875,
+    "y": 321.57403564453125,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "3b83df46.29f0f"
+        "5e19031a.6be224"
       ]
     ]
   },
   {
-    "id": "cd33fdee.3222d",
+    "id": "30f09d47.f52bd2",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1067.323974609375,
-    "y": 372.9073181152344,
-    "z": "afcbb687.85236",
+    "x": 1064.323974609375,
+    "y": 362.9073486328125,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "767371f2.e9e528"
+        "ca3e7785.85e588"
       ]
     ]
   },
   {
-    "id": "3b83df46.29f0f",
+    "id": "5e19031a.6be224",
     "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": 1248.5623779296875,
-    "y": 319.8597412109375,
-    "z": "afcbb687.85236",
+    "x": 1245.5623779296875,
+    "y": 309.8597717285156,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "767371f2.e9e528",
+    "id": "ca3e7785.85e588",
     "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": 1255.0965309143066,
-    "y": 368.346510887146,
-    "z": "afcbb687.85236",
+    "x": 1252.0965309143066,
+    "y": 358.3465414047241,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "22c32b46.de62ec",
+    "id": "4838189c.cc5c2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1249.5,
-    "y": 409.9999694824219,
-    "z": "afcbb687.85236",
-    "wires": [
-      [
-        "ff55b388.99abf8",
-        "38873b05.a3c454",
-        "9175a87c.a6aee",
-        "c55257b2.b8e8",
-        "75421ae0.2f14a4",
-        "8d568c42.a5a6b",
-        "c77b0665.1769f8",
-        "9a8d8afe.f563a",
-        "88904f93.c66ce8",
-        "6e84728c.673824",
-        "1d735f8b.a0bda8",
-        "e368f329.6d7548",
-        "a3622b1.27cced8",
-        "abae0359.a1f078",
-        "68ac49c7.06602",
-        "5e346a8c.2e71cc",
-        "d1e7e706.64fca8",
-        "bac90fd8.5903c8",
-        "5b9e96bc.f4818",
-        "ec98c6d8.1a97c",
-        "2e62b281.5fb4be",
-        "aedad5e0.0eea1",
-        "c0968178.a081f",
-        "b0b0d932.2b92c",
-        "6df47e7a.007368"
-      ]
-    ]
-  },
-  {
-    "id": "ff55b388.99abf8",
+    "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",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1600.5,
-    "y": 34,
-    "z": "afcbb687.85236",
+    "x": 1597.5,
+    "y": 24.000030517578125,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "f559aca3.91e3"
+        "790fe8ea.59c5f8"
       ]
     ]
   },
   {
-    "id": "38873b05.a3c454",
+    "id": "3ffa7de9.3d22aa",
     "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",
     "comments": "",
     "outputs": 1,
-    "x": 1604.4999389648438,
-    "y": 95.5999755859375,
-    "z": "afcbb687.85236",
+    "x": 1601.4999389648438,
+    "y": 85.60000610351562,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "401247a1.5ff7d"
+        "503c6fe2.37ebc"
       ]
     ]
   },
   {
-    "id": "f559aca3.91e3",
+    "id": "790fe8ea.59c5f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1787.5,
-    "y": 34,
-    "z": "afcbb687.85236",
+    "x": 1784.5,
+    "y": 24.000030517578125,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "79625ec4.855a18"
+        "c0ed55b7.392048"
       ]
     ]
   },
   {
-    "id": "401247a1.5ff7d",
+    "id": "503c6fe2.37ebc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1789.4999389648438,
-    "y": 93.5999755859375,
-    "z": "afcbb687.85236",
+    "x": 1786.4999389648438,
+    "y": 83.60000610351562,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "6a87bf48.abeba"
+        "100cc5e.56d753a"
       ]
     ]
   },
   {
-    "id": "79625ec4.855a18",
+    "id": "c0ed55b7.392048",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.l3vpn.name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1955.5,
-    "y": 34.600006103515625,
-    "z": "afcbb687.85236",
+    "x": 1952.5,
+    "y": 24.60003662109375,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "6a87bf48.abeba",
+    "id": "100cc5e.56d753a",
     "type": "set",
     "name": "set service-type",
     "xml": "<set>\n<parameter name='prop.l3vpn.service-type' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1958.4999389648438,
-    "y": 91.5999755859375,
-    "z": "afcbb687.85236",
+    "x": 1955.4999389648438,
+    "y": 81.60000610351562,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "9175a87c.a6aee",
+    "id": "664b1b62.1edb04",
     "type": "switchNode",
     "name": "switch topology",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'topology'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1603.5,
-    "y": 156.99996948242188,
-    "z": "afcbb687.85236",
+    "x": 1600.5,
+    "y": 147,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "a64e4877.40f2a8"
+        "f87542c8.b42238"
       ]
     ]
   },
   {
-    "id": "c55257b2.b8e8",
+    "id": "34505a72.fd91d6",
     "type": "switchNode",
     "name": "switch technology",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'technology'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1606.5,
-    "y": 209.99996948242188,
-    "z": "afcbb687.85236",
+    "x": 1603.5,
+    "y": 200,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "9ba6f7b3.df8438"
+        "1b29c3a2.67f81c"
       ]
     ]
   },
   {
-    "id": "75421ae0.2f14a4",
+    "id": "7e10e5c0.fe770c",
     "type": "switchNode",
     "name": "switch site1_name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1611.5,
-    "y": 271.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1608.5,
+    "y": 262,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "3fe3c429.54f524"
+        "6e3aae9.70d855"
       ]
     ]
   },
   {
-    "id": "8d568c42.a5a6b",
+    "id": "13208c8b.098ffb",
     "type": "switchNode",
     "name": "switch site2_name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1606.5,
-    "y": 334.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1603.5,
+    "y": 325,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "4b788419.283d84"
+        "3a603034.e9efa"
       ]
     ]
   },
   {
-    "id": "c77b0665.1769f8",
+    "id": "746f494e.5eb71",
     "type": "switchNode",
     "name": "switch sna1_name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'sna1_name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1611.5,
-    "y": 394.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1608.5,
+    "y": 385,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "df5a50d3.c67ae"
+        "a8e565d2.d10748"
       ]
     ]
   },
   {
-    "id": "9a8d8afe.f563a",
+    "id": "234c66fc.f3b94a",
     "type": "switchNode",
     "name": "switch sna2_name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'sna2_name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1606.5,
-    "y": 458.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1603.5,
+    "y": 449,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "8824fdd5.acc64"
+        "907f12f7.ac643"
       ]
     ]
   },
   {
-    "id": "88904f93.c66ce8",
+    "id": "57e3e674.d18598",
     "type": "switchNode",
     "name": "switch pe1_id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'pe1_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1611.5,
-    "y": 520.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1608.5,
+    "y": 511,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "11f03ae0.763e8d"
+        "1c1a9f73.56aea1"
       ]
     ]
   },
   {
-    "id": "6e84728c.673824",
+    "id": "b57b62d6.ecd3f8",
     "type": "switchNode",
     "name": "switch pe2_id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'pe2_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1626.5,
-    "y": 580.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1623.5,
+    "y": 571,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "62aa94da.25d62c"
+        "80e772d.f39d31"
       ]
     ]
   },
   {
-    "id": "1d735f8b.a0bda8",
+    "id": "19af71a4.6ac59e",
     "type": "switchNode",
     "name": "switch ac1_id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1621.5,
-    "y": 652.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1618.5,
+    "y": 643,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "a020360c.e4bb5"
+        "41098a93.695abc"
       ]
     ]
   },
   {
-    "id": "e368f329.6d7548",
+    "id": "f7634e7a.60329",
     "type": "switchNode",
     "name": "switch ac2_id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1620.5,
-    "y": 711.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1617.5,
+    "y": 702,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "8fc6e5e2.e24288"
+        "b357553d.e05988"
       ]
     ]
   },
   {
-    "id": "a3622b1.27cced8",
+    "id": "ef48199.418d9e8",
     "type": "switchNode",
     "name": "switch ac1_ip",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_ip'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1597.5,
-    "y": 774.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1594.5,
+    "y": 765,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "e82a870c.b39b28"
+        "bd5afe60.0d7eb8"
       ]
     ]
   },
   {
-    "id": "abae0359.a1f078",
+    "id": "bc753ec1.7895e",
     "type": "switchNode",
     "name": "switch ac2_ip",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_ip'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1600.5,
-    "y": 831.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1597.5,
+    "y": 822,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "47898e68.b0462"
+        "688c01f9.3034f8"
       ]
     ]
   },
   {
-    "id": "68ac49c7.06602",
+    "id": "68aca326.79a5c4",
     "type": "switchNode",
     "name": "switch ac1_peer_ip",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_peer_ip'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1606.5,
-    "y": 883.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1603.5,
+    "y": 874,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "eaea8bad.5cf788"
+        "9b0c1592.8e3b1"
       ]
     ]
   },
   {
-    "id": "5e346a8c.2e71cc",
+    "id": "4df426f9.add138",
     "type": "switchNode",
     "name": "switch ac2_peer_ip",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_peer_ip'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1607.5,
-    "y": 938.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1604.5,
+    "y": 929,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "54e08fc1.717778"
+        "2cc17c57.778524"
       ]
     ]
   },
   {
-    "id": "d1e7e706.64fca8",
+    "id": "7b807eaa.43ad18",
     "type": "switchNode",
     "name": "switch ac1_svlan",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_svlan'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1619.5,
-    "y": 987.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1616.5,
+    "y": 978,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "c485c539.43b58"
+        "495c6f54.c6c1"
       ]
     ]
   },
   {
-    "id": "bac90fd8.5903c8",
+    "id": "aeb88291.366bb",
     "type": "switchNode",
     "name": "switch ac2_svlan",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_svlan'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1612.5,
-    "y": 1038.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1609.5,
+    "y": 1029,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "dc18349.f485ec8"
+        "f6a8ab99.9bdd08"
       ]
     ]
   },
   {
-    "id": "5b9e96bc.f4818",
+    "id": "7d79c207.4a89ac",
     "type": "switchNode",
     "name": "switch ac1_protocol",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_protocol'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1605.5,
-    "y": 1096.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1602.5,
+    "y": 1087,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "a2803a12.7713d8"
+        "d62ba27.6f7c2e"
       ]
     ]
   },
   {
-    "id": "ec98c6d8.1a97c",
+    "id": "7b628f48.c22598",
     "type": "switchNode",
     "name": "switch ac2_protocol",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_protocol'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1606.5,
-    "y": 1156.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1603.5,
+    "y": 1147,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "596f6089.d1edf8"
+        "c9a16999.043798"
       ]
     ]
   },
   {
-    "id": "2e62b281.5fb4be",
+    "id": "f4a82fcb.89b23",
     "type": "switchNode",
     "name": "switch ac1_protocol_bgp_as",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_protocol_bgp_as'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1600.5,
-    "y": 1342.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1597.5,
+    "y": 1333,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "6e2cd8be.f3048"
+        "51172d80.d16d84"
       ]
     ]
   },
   {
-    "id": "aedad5e0.0eea1",
+    "id": "9f057f5a.21a718",
     "type": "switchNode",
     "name": "switch ac2_protocol_bgp_as",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_protocol_bgp_as'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1606.5,
-    "y": 1393.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1603.5,
+    "y": 1384,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "d0f887af.29671"
+        "541f74d7.9ae7c4"
       ]
     ]
   },
   {
-    "id": "c0968178.a081f",
+    "id": "c28375dc.9cf31",
     "type": "switchNode",
     "name": "switch af_type",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'af_type'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1573.5,
-    "y": 1484.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1570.5,
+    "y": 1475,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "82ff06f7.d0d528"
+        "433d764e.56026"
       ]
     ]
   },
   {
-    "id": "a64e4877.40f2a8",
+    "id": "f87542c8.b42238",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1778.5,
-    "y": 152.99996948242188,
-    "z": "afcbb687.85236",
+    "x": 1775.5,
+    "y": 143,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "da8c11e9.9cbec8"
+        "8037bd5.ffecf4"
       ]
     ]
   },
   {
-    "id": "9ba6f7b3.df8438",
+    "id": "1b29c3a2.67f81c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1784.5,
-    "y": 205.99996948242188,
-    "z": "afcbb687.85236",
+    "x": 1781.5,
+    "y": 196,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "ccc7b6d7.c058c8"
+        "8f7a26de.1385e"
       ]
     ]
   },
   {
-    "id": "3fe3c429.54f524",
+    "id": "6e3aae9.70d855",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1793.5,
-    "y": 267.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1790.5,
+    "y": 258,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "e5bd3aa8.87da7"
+        "7e165873.b921b8"
       ]
     ]
   },
   {
-    "id": "4b788419.283d84",
+    "id": "3a603034.e9efa",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1791.5,
-    "y": 330.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1788.5,
+    "y": 321,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "bd7f255d.5699f"
+        "83cebdf0.5d9d88"
       ]
     ]
   },
   {
-    "id": "df5a50d3.c67ae",
+    "id": "a8e565d2.d10748",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1796.5,
-    "y": 392.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1793.5,
+    "y": 383,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "f25f5.2f7afa0c"
+        "be068d69.761ee8"
       ]
     ]
   },
   {
-    "id": "8824fdd5.acc64",
+    "id": "907f12f7.ac643",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1788.5,
-    "y": 450.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1785.5,
+    "y": 441,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "901b9d66.12536"
+        "403c491d.5a2bf"
       ]
     ]
   },
   {
-    "id": "11f03ae0.763e8d",
+    "id": "1c1a9f73.56aea1",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1789.5,
-    "y": 513.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1786.5,
+    "y": 504,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "95a707d1.9e9078"
+        "d04a64a0.07df1"
       ]
     ]
   },
   {
-    "id": "62aa94da.25d62c",
+    "id": "80e772d.f39d31",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1788.5,
-    "y": 582.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1785.5,
+    "y": 573,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "3501cf57.589d68"
+        "5cd5a2d.68f96dc"
       ]
     ]
   },
   {
-    "id": "a020360c.e4bb5",
+    "id": "41098a93.695abc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1785.5,
-    "y": 650.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1782.5,
+    "y": 641,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "c6cf31c5.5d1aa"
+        "83a050e0.27157"
       ]
     ]
   },
   {
-    "id": "8fc6e5e2.e24288",
+    "id": "b357553d.e05988",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1784.5,
-    "y": 714.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1781.5,
+    "y": 705,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "6265cd27.81f2dc"
+        "973fa53a.ec107"
       ]
     ]
   },
   {
-    "id": "e82a870c.b39b28",
+    "id": "bd5afe60.0d7eb8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1757.5,
-    "y": 772.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1754.5,
+    "y": 763,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "6e17c55d.2a19a4"
+        "6563e244.afa0a4"
       ]
     ]
   },
   {
-    "id": "47898e68.b0462",
+    "id": "688c01f9.3034f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1759.5,
-    "y": 829.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1756.5,
+    "y": 820,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "7924cc2a.35fc2c"
+        "ea03192c.fa34d8"
       ]
     ]
   },
   {
-    "id": "eaea8bad.5cf788",
+    "id": "9b0c1592.8e3b1",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1795.5,
-    "y": 880.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1792.5,
+    "y": 871,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "3e869a26.2e7586"
+        "27144be0.d6e57c"
       ]
     ]
   },
   {
-    "id": "54e08fc1.717778",
+    "id": "2cc17c57.778524",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1800.5,
-    "y": 943.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1797.5,
+    "y": 934,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "9886630f.778418"
+        "af57a2a3.2224"
       ]
     ]
   },
   {
-    "id": "c485c539.43b58",
+    "id": "495c6f54.c6c1",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1796.5,
-    "y": 992.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1793.5,
+    "y": 983,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "78c58e8a.23d18"
+        "395b1e98.d76342"
       ]
     ]
   },
   {
-    "id": "dc18349.f485ec8",
+    "id": "f6a8ab99.9bdd08",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1780.5,
-    "y": 1041.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1777.5,
+    "y": 1032,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "69f6023e.41e15c"
+        "be2b6f25.ac0e3"
       ]
     ]
   },
   {
-    "id": "a2803a12.7713d8",
+    "id": "d62ba27.6f7c2e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1777.5,
-    "y": 1094.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1774.5,
+    "y": 1085,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "2df41f91.eb242"
+        "b57fe3af.1292c"
       ]
     ]
   },
   {
-    "id": "596f6089.d1edf8",
+    "id": "c9a16999.043798",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1790.5,
-    "y": 1153.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1787.5,
+    "y": 1144,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "e6263a0e.005cf8"
+        "863327dc.5149a8"
       ]
     ]
   },
   {
-    "id": "6e2cd8be.f3048",
+    "id": "51172d80.d16d84",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1808.5,
-    "y": 1339.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1805.5,
+    "y": 1330,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "84d5b1db.9b60d8"
+        "fa6d5b00.b5cee8"
       ]
     ]
   },
   {
-    "id": "d0f887af.29671",
+    "id": "541f74d7.9ae7c4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1815.5,
-    "y": 1389.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1812.5,
+    "y": 1380,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "a8af002f.68a168"
+        "90ad7a71.fa1e48"
       ]
     ]
   },
   {
-    "id": "82ff06f7.d0d528",
+    "id": "433d764e.56026",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1777.5,
-    "y": 1493.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1774.5,
+    "y": 1484,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "849d8b1.9052178"
+        "15acea8e.b09f55"
       ]
     ]
   },
   {
-    "id": "da8c11e9.9cbec8",
+    "id": "8037bd5.ffecf4",
     "type": "set",
     "name": "set topology",
     "xml": "<set>\n<parameter name='prop.l3vpn.topology' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1973.5,
-    "y": 153.99996948242188,
-    "z": "afcbb687.85236",
+    "x": 1970.5,
+    "y": 144,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "ccc7b6d7.c058c8",
+    "id": "8f7a26de.1385e",
     "type": "set",
     "name": "set technology",
     "xml": "<set>\n<parameter name='prop.l3vpn.technology' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1963.5,
-    "y": 207.99996948242188,
-    "z": "afcbb687.85236",
+    "x": 1960.5,
+    "y": 198,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "e5bd3aa8.87da7",
+    "id": "7e165873.b921b8",
     "type": "set",
     "name": "set site1_name",
     "xml": "<set>\n<parameter name='prop.l3vpn.site1_name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1967.5,
-    "y": 264.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1964.5,
+    "y": 255,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "bd7f255d.5699f",
+    "id": "83cebdf0.5d9d88",
     "type": "set",
     "name": "set site2_name",
     "xml": "<set>\n<parameter name='prop.l3vpn.site2_name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1970.5,
-    "y": 323.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1967.5,
+    "y": 314,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "f25f5.2f7afa0c",
+    "id": "be068d69.761ee8",
     "type": "set",
     "name": "set sna1_name",
     "xml": "<set>\n<parameter name='prop.l3vpn.sna1_name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1978.5,
-    "y": 385.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1975.5,
+    "y": 376,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "901b9d66.12536",
+    "id": "403c491d.5a2bf",
     "type": "set",
     "name": "set sna2_name",
     "xml": "<set>\n<parameter name='prop.l3vpn.sna2_name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1970.5,
-    "y": 445.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1967.5,
+    "y": 436,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "95a707d1.9e9078",
+    "id": "d04a64a0.07df1",
     "type": "set",
     "name": "set pe1_id",
     "xml": "<set>\n<parameter name='prop.l3vpn.pe1_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1967.5,
-    "y": 505.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1964.5,
+    "y": 496,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "3501cf57.589d68",
+    "id": "5cd5a2d.68f96dc",
     "type": "set",
     "name": "set pe2_id",
     "xml": "<set>\n<parameter name='prop.l3vpn.pe2_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1963.5,
-    "y": 576.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1960.5,
+    "y": 567,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "c6cf31c5.5d1aa",
+    "id": "83a050e0.27157",
     "type": "set",
     "name": "set ac1_id",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1956.5,
-    "y": 642.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1953.5,
+    "y": 633,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "6265cd27.81f2dc",
+    "id": "973fa53a.ec107",
     "type": "set",
     "name": "set ac2_id",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1959.5,
-    "y": 709.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1956.5,
+    "y": 700,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "6e17c55d.2a19a4",
+    "id": "6563e244.afa0a4",
     "type": "set",
     "name": "set ac1_ip",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_ip' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1935.5,
-    "y": 775.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1932.5,
+    "y": 766,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "7924cc2a.35fc2c",
+    "id": "ea03192c.fa34d8",
     "type": "set",
     "name": "set ac2_ip",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_ip' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1939.5,
-    "y": 829.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1936.5,
+    "y": 820,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "3e869a26.2e7586",
+    "id": "27144be0.d6e57c",
     "type": "set",
     "name": "set ac1_peer_ip",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_peer_ip' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1987.5,
-    "y": 884.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1984.5,
+    "y": 875,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "9886630f.778418",
+    "id": "af57a2a3.2224",
     "type": "set",
     "name": "set ac2_peer_ip",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_peer_ip' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1983.5,
-    "y": 939.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1980.5,
+    "y": 930,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "78c58e8a.23d18",
+    "id": "395b1e98.d76342",
     "type": "set",
     "name": "set ac1_svlan",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_svlan' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1977.5,
-    "y": 994.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1974.5,
+    "y": 985,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "69f6023e.41e15c",
+    "id": "be2b6f25.ac0e3",
     "type": "set",
     "name": "set ac2_svlan",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_svlan' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1974.5,
-    "y": 1047.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1971.5,
+    "y": 1038,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "2df41f91.eb242",
+    "id": "b57fe3af.1292c",
     "type": "set",
     "name": "set ac1_protocol",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_protocol' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1972.5,
-    "y": 1104.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1969.5,
+    "y": 1095,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "e6263a0e.005cf8",
+    "id": "863327dc.5149a8",
     "type": "set",
     "name": "set ac2_protocol",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_protocol' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1981.5,
-    "y": 1156.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1978.5,
+    "y": 1147,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "84d5b1db.9b60d8",
+    "id": "fa6d5b00.b5cee8",
     "type": "set",
     "name": "set ac1_protocol_bgp_as",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_protocol_bgp_as' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n<parameter name='prop.l3vpn.peer1-ip' value='`$prop.l3vpn.ac1_ip`' />\n",
     "comments": "",
-    "x": 2075.5,
-    "y": 1360.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 2072.5,
+    "y": 1351,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "a8af002f.68a168",
+    "id": "90ad7a71.fa1e48",
     "type": "set",
     "name": "set ac2_protocol_bgp_as",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_protocol_bgp_as' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n<parameter name='prop.l3vpn.peer2-ip' value='`$prop.l3vpn.ac2_ip`' />\n",
     "comments": "",
-    "x": 2087.5,
-    "y": 1409.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 2084.5,
+    "y": 1400,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "849d8b1.9052178",
+    "id": "15acea8e.b09f55",
     "type": "set",
     "name": "set af_type",
     "xml": "<set>\n<parameter name='prop.l3vpn.af_type' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1971.5,
-    "y": 1503.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1968.5,
+    "y": 1494,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "38000c67.90cd64",
+    "id": "acc5dbef.ee3348",
     "type": "record",
     "name": "record",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"Time\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"Method\" value=\"network-topology-operation-create\"/>\n<parameter name=\"SubMethod\" value=\"L3VPN-Config\"/>\n<parameter name=\"l3vpn_name\" value=\"`$prop.l3vpn.name`\"/>\n<parameter name=\"topology\" value=\"`$prop.l3vpn.topology`\"/>\n<parameter name=\"site1_name\" value=\"`$prop.l3vpn.site1_name`\"/>\n<parameter name=\"vpn-policy1-id\" value=\"`$prop.l3vpn.vpn-policy1-id`\"/>\n<parameter name=\"l3vpn.entry1-id\" value=\"`$prop.l3vpn.entry1-id`\"/>\n<parameter name=\"sna1_name\" value=\"`$prop.l3vpn.sna1_name`\"/>\n<parameter name=\"pe1_id\" value=\"`$prop.l3vpn.pe1_id`\"/>\n<parameter name=\"ac1_id\" value=\"`$prop.l3vpn.ac1_id`\"/>\n<parameter name=\"sna1_svlan\" value=\"`$prop.l3vpn.sna1_svlan`\"/>\n<parameter name=\"ac1-peer-ip\" value=\"`$prop.l3vpn.ac1-peer-ip`\"/>\n<parameter name=\"ac1-ip\" value=\"`$prop.l3vpn.ac1-ip`\"/>\n<parameter name=\"ac1_protocol\" value=\"`$prop.l3vpn.ac1_protocol`\"/>\n<parameter name=\"sna1-route-ip-prefix\" value=\"`$prop.l3vpn.sna1-route-ip-prefix`\"/>\n<parameter name=\"sna1-route-next-hop\" value=\"`$prop.l3vpn.sna1-route-next-hop`\"/>\n<parameter name=\"peer1-ip\" value=\"`$prop.l3vpn.peer1-ip`\"/>\n<parameter name=\"ac1_protocol_bgp_as\" value=\"`$prop.l3vpn.ac1_protocol_bgp_as`\"/>\n<parameter name=\"vrf1-id\" value=\"`$prop.l3vpn.vrf1-id`\"/>\n<parameter name=\"site2_name\" value=\"`$prop.l3vpn.site2_name`\"/>\n<parameter name=\"vpn-policy2-id\" value=\"`$prop.l3vpn.vpn-policy2-id`\"/>\n<parameter name=\"l3vpn.entry2-id\" value=\"`$prop.l3vpn.entry2-id`\"/>\n<parameter name=\"sna2_name\" value=\"`$prop.l3vpn.sna2_name`\"/>\n<parameter name=\"pe2_id\" value=\"`$prop.l3vpn.pe2_id`\"/>\n<parameter name=\"ac2_id\" value=\"`$prop.l3vpn.ac2_id`\"/>\n<parameter name=\"sna2_svlan\" value=\"`$prop.l3vpn.sna2_svlan`\"/>\n<parameter name=\"ac2-peer-ip\" value=\"`$prop.l3vpn.ac2-peer-ip`\"/>\n<parameter name=\"ac2-ip\" value=\"`$prop.l3vpn.ac2-ip`\"/>\n<parameter name=\"ac2_protocol\" value=\"`$prop.l3vpn.ac2_protocol`\"/>\n<parameter name=\"sna2-route-ip-prefix\" value=\"`$prop.l3vpn.sna2-route-ip-prefix`\"/>\n<parameter name=\"sna2-route-next-hop\" value=\"`$prop.l3vpn.sna2-route-next-hop`\"/>\n<parameter name=\"peer2-ip\" value=\"`$prop.l3vpn.peer2-ip`\"/>\n<parameter name=\"ac2_protocol_bgp_as\" value=\"`$prop.l3vpn.ac2_protocol_bgp_as`\"/>\n<parameter name=\"vrf2-id\" value=\"`$prop.l3vpn.vrf2-id`\"/>\n<parameter name=\"af_type\" value=\"`$prop.l3vpn.af_type`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 722,
-    "y": 995,
-    "z": "afcbb687.85236",
+    "x": 719,
+    "y": 985.0000305175781,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       []
     ]
   },
   {
-    "id": "496a2fd4.025b58",
+    "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",
     "comments": "",
     "outputs": 1,
-    "x": 703,
-    "y": 1141,
-    "z": "afcbb687.85236",
+    "x": 700,
+    "y": 1131.0000305175781,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "42648755.1a8ba8",
-        "902f9c3b.315d",
-        "a37f7e10.357a9"
+        "fc787a60.02b",
+        "3f2ca116.1448fe",
+        "943ab515.9c9a88"
       ]
     ]
   },
   {
-    "id": "42648755.1a8ba8",
+    "id": "fc787a60.02b",
     "type": "outcomeTrue",
     "name": "l3vpn-ipwan",
     "xml": "<outcome value='l3vpn-ipwan'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 689,
-    "y": 1066,
-    "z": "afcbb687.85236",
+    "x": 686,
+    "y": 1056.0000305175781,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "490fa182.d51e38"
+        "ef26a584.d90698"
       ]
     ]
   },
   {
-    "id": "902f9c3b.315d",
+    "id": "3f2ca116.1448fe",
     "type": "outcomeTrue",
     "name": "l3vpn-sptn",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 845,
-    "y": 1209.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 842,
+    "y": 1200,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "2bd25145.a5e5d6"
+        "ee76e905.760cf"
       ]
     ]
   },
   {
-    "id": "a37f7e10.357a9",
+    "id": "943ab515.9c9a88",
     "type": "outcomeTrue",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 843,
-    "y": 1288.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 840,
+    "y": 1279,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "33c3396f.7705ae"
+        "a1a89b00.18e668"
       ]
     ]
   },
   {
-    "id": "33c3396f.7705ae",
+    "id": "a1a89b00.18e668",
     "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": 1026,
-    "y": 1287.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1023,
+    "y": 1278,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "7637caf4.d6c8f4",
+    "id": "c225d084.2fc3d8",
     "type": "execute",
     "name": "execute vpn-policy2-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vpn-policy2-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 811,
-    "y": 518.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 808,
+    "y": 509,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "79569ec3.085fc8"
+        "9f4eb3ab.50d678"
       ]
     ]
   },
   {
-    "id": "79569ec3.085fc8",
+    "id": "9f4eb3ab.50d678",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1036,
-    "y": 521.9999389648438,
-    "z": "afcbb687.85236",
+    "x": 1033,
+    "y": 511.9999694824219,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "7d3a2bea.3c871c"
+        "9e489083.518d3"
       ]
     ]
   },
   {
-    "id": "7d3a2bea.3c871c",
+    "id": "9e489083.518d3",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation vpn policy ID\" />\n",
     "comments": "",
-    "x": 1217,
-    "y": 519.9999389648438,
-    "z": "afcbb687.85236",
+    "x": 1214,
+    "y": 509.9999694824219,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "a2fb9e2f.a93ff8",
+    "id": "6a15cb31.6626a4",
     "type": "set",
     "name": "set policy entry",
     "xml": "<set>\n<parameter name='prop.l3vpn.entry1-id' value='1' />\n<parameter name='prop.l3vpn.entry2-id' value='1' />\n\n",
     "comments": "",
-    "x": 797,
-    "y": 566.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 794,
+    "y": 557,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "f9dfb478.509fa",
+    "id": "bc0654d.b4c1928",
     "type": "execute",
     "name": "execute split ac1-route",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.l3vpn.ac1-route`'/>\n<parameter name=\"regex\" value=\" ## \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route1\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2201,
-    "y": 1216.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 2198,
+    "y": 1207,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "b38bd339.2df29",
-        "1e11b04b.0ff178"
+        "333b151b.f48562",
+        "f82f2f6f.ba3178"
       ]
     ]
   },
   {
-    "id": "6df47e7a.007368",
+    "id": "f8750aec.0b434",
     "type": "switchNode",
     "name": "switch ac2_route",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_route'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1602,
-    "y": 1264.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1599,
+    "y": 1255,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "ee5731bf.7a59"
+        "9b788c28.bb9ff8"
       ]
     ]
   },
   {
-    "id": "b0b0d932.2b92c",
+    "id": "3493b1b1.d0be5e",
     "type": "switchNode",
     "name": "switch ac1_route",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_route'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1603,
-    "y": 1215.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1600,
+    "y": 1206,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "8155aba.b3b4b58"
+        "b4e99b4d.04cb9"
       ]
     ]
   },
   {
-    "id": "8155aba.b3b4b58",
+    "id": "b4e99b4d.04cb9",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1775,
-    "y": 1213.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1772,
+    "y": 1204,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "416ea37c.b615f4"
+        "16bee176.348f1f"
       ]
     ]
   },
   {
-    "id": "ee5731bf.7a59",
+    "id": "9b788c28.bb9ff8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1788,
-    "y": 1272.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1785,
+    "y": 1263,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "8a2c10ff.716378"
+        "d1dc0cd3.5bc328"
       ]
     ]
   },
   {
-    "id": "ab97d7c6.69d6c8",
+    "id": "9133f5.ce552c08",
     "type": "set",
     "name": "set ac1_route",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_route' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2172,
-    "y": 1164.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 2169,
+    "y": 1155,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "9bb53e2e.efe8e8",
+    "id": "4ee51926.384fd8",
     "type": "set",
     "name": "set ac2_route",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_route' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2170,
-    "y": 1264.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 2167,
+    "y": 1255,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "35d0769.4fc008a",
+    "id": "50cad229.565bbc",
     "type": "execute",
     "name": "execute split ac2-route",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.l3vpn.ac2-route`'/>\n<parameter name=\"regex\" value=\" ## \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route2\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2194,
-    "y": 1309.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 2191,
+    "y": 1300,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "7c6566d5.b2a9b",
-        "90dfb534.cb1ad8"
+        "322f767c.4c3332",
+        "f711611e.94f868"
       ]
     ]
   },
   {
-    "id": "416ea37c.b615f4",
+    "id": "16bee176.348f1f",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1926,
-    "y": 1213.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1923,
+    "y": 1204,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "ab97d7c6.69d6c8",
-        "f9dfb478.509fa"
+        "9133f5.ce552c08",
+        "bc0654d.b4c1928"
       ]
     ]
   },
   {
-    "id": "8a2c10ff.716378",
+    "id": "d1dc0cd3.5bc328",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1927,
-    "y": 1272.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1924,
+    "y": 1263,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "9bb53e2e.efe8e8",
-        "35d0769.4fc008a"
+        "4ee51926.384fd8",
+        "50cad229.565bbc"
       ]
     ]
   },
   {
-    "id": "fb6e4c2e.3cc6e8",
+    "id": "fdf946de.e32c5",
     "type": "execute",
     "name": "execute vrf1-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vrf1-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 796,
-    "y": 620,
-    "z": "afcbb687.85236",
+    "x": 793,
+    "y": 610.0000305175781,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "6687816c.51c6a"
+        "2a44ccf.3f0eab4"
       ]
     ]
   },
   {
-    "id": "f086eb6d.36e988",
+    "id": "c90552d6.d68d2",
     "type": "execute",
     "name": "execute vrf2-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vrf2-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 793.3333740234375,
-    "y": 677.333251953125,
-    "z": "afcbb687.85236",
+    "x": 790.3333740234375,
+    "y": 667.3332824707031,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "ef8aa3a.49722e"
+        "de0cfccd.b9e3"
       ]
     ]
   },
   {
-    "id": "ef8aa3a.49722e",
+    "id": "de0cfccd.b9e3",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1043.3333740234375,
-    "y": 683.333251953125,
-    "z": "afcbb687.85236",
+    "x": 1040.3333740234375,
+    "y": 673.3332824707031,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "7888c7c1.9e6b28"
+        "d657f9c0.1d236"
       ]
     ]
   },
   {
-    "id": "6687816c.51c6a",
+    "id": "2a44ccf.3f0eab4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1043,
-    "y": 624.9999389648438,
-    "z": "afcbb687.85236",
+    "x": 1040,
+    "y": 614.9999694824219,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "75199177.ec8fa"
+        "bef436b0.97b6c8"
       ]
     ]
   },
   {
-    "id": "75199177.ec8fa",
+    "id": "bef436b0.97b6c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation vpn policy ID\" />\n",
     "comments": "",
-    "x": 1224,
-    "y": 622.9999389648438,
-    "z": "afcbb687.85236",
+    "x": 1221,
+    "y": 612.9999694824219,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "7888c7c1.9e6b28",
+    "id": "d657f9c0.1d236",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation vpn policy ID\" />\n",
     "comments": "",
-    "x": 1224.3333740234375,
-    "y": 681.333251953125,
-    "z": "afcbb687.85236",
+    "x": 1221.3333740234375,
+    "y": 671.3332824707031,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "490fa182.d51e38",
+    "id": "ef26a584.d90698",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 868,
-    "y": 1066,
-    "z": "afcbb687.85236",
+    "x": 865,
+    "y": 1056.0000305175781,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "f1c4e62c.acf5f",
-        "edbfaa69.4481f",
-        "660c6e65.05f44"
+        "ea6e7cc2.759108",
+        "3b2cff3e.76e6d",
+        "ec543af.60d7dc8"
       ]
     ]
   },
   {
-    "id": "edbfaa69.4481f",
+    "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\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1174,
-    "y": 1061.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1171,
+    "y": 1052,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       []
     ]
   },
   {
-    "id": "660c6e65.05f44",
+    "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\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1172,
-    "y": 1132.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 1169,
+    "y": 1123,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       []
     ]
   },
   {
-    "id": "b38bd339.2df29",
+    "id": "333b151b.f48562",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2419,
-    "y": 1208.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 2416,
+    "y": 1199,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "91359bf2.ca7a7"
+        "fc1f2aa8.f75b3"
       ]
     ]
   },
   {
-    "id": "91359bf2.ca7a7",
+    "id": "fc1f2aa8.f75b3",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 2600,
-    "y": 1206.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 2597,
+    "y": 1197,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "7c6566d5.b2a9b",
+    "id": "322f767c.4c3332",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2417,
-    "y": 1310.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 2414,
+    "y": 1301,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "f6d0c6a9.1391a8"
+        "e94d25cc.c6377"
       ]
     ]
   },
   {
-    "id": "f6d0c6a9.1391a8",
+    "id": "e94d25cc.c6377",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 2598,
-    "y": 1308.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 2595,
+    "y": 1299,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "1e11b04b.0ff178",
+    "id": "f82f2f6f.ba3178",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2418,
-    "y": 1142.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 2415,
+    "y": 1133,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "55f4fd6f.ed453c"
+        "c5c1b135.242a3"
       ]
     ]
   },
   {
-    "id": "90dfb534.cb1ad8",
+    "id": "f711611e.94f868",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2414,
-    "y": 1262.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 2411,
+    "y": 1253,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "58f0e3b1.633ccc"
+        "c23f470d.b8db08"
       ]
     ]
   },
   {
-    "id": "55f4fd6f.ed453c",
+    "id": "c5c1b135.242a3",
     "type": "set",
     "name": "set route1 ip-prefix next-hop",
     "xml": "<set>\n<parameter name='prop.l3vpn.sna1-route.ip-prefix' value='`$route1[0]`' />\n<parameter name='prop.l3vpn.sna1-route.next-hop' value='`$route1[1]`' />\n",
     "comments": "",
-    "x": 2625,
-    "y": 1136.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 2622,
+    "y": 1127,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "58f0e3b1.633ccc",
+    "id": "c23f470d.b8db08",
     "type": "set",
     "name": "set route2 ip-prefix next-hop",
     "xml": "<set>\n<parameter name='prop.l3vpn.sna2-route.ip-prefix' value='`$route2[0]`' />\n<parameter name='prop.l3vpn.sna2-route.next-hop' value='`$route2[1]`' />",
     "comments": "",
-    "x": 2625,
-    "y": 1255.9999694824219,
-    "z": "afcbb687.85236",
+    "x": 2622,
+    "y": 1246,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "fb5a457c.e3d938",
+    "id": "e0e6781c.4e0188",
     "type": "execute",
     "name": "execute generate-underlay-network-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.network-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 852,
-    "y": 771,
-    "z": "afcbb687.85236",
+    "x": 849,
+    "y": 761.0000305175781,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       []
     ]
   },
   {
-    "id": "7b0c7c0c.cadfec",
+    "id": "9875bc60.171298",
     "type": "switchNode",
     "name": "switch service-data.networks_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 810,
-    "y": 852,
-    "z": "afcbb687.85236",
+    "x": 807,
+    "y": 842.0000305175781,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "3f9ab1b0.ebe9de",
-        "3e9e6437.52d94c"
+        "cac4aec8.8232b8",
+        "81a4cd14.cebc38"
       ]
     ]
   },
   {
-    "id": "3f9ab1b0.ebe9de",
+    "id": "cac4aec8.8232b8",
     "type": "other",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1083.8095703125,
-    "y": 820.952392578125,
-    "z": "afcbb687.85236",
+    "x": 1080.8095703125,
+    "y": 810.9524230957031,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "29d18753.fcaf7"
+        "52d26ca7.c68dec"
       ]
     ]
   },
   {
-    "id": "3e9e6437.52d94c",
+    "id": "81a4cd14.cebc38",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1078.666748046875,
-    "y": 866.6666870117188,
-    "z": "afcbb687.85236",
+    "x": 1075.666748046875,
+    "y": 856.6667175292969,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "81dbeda3.9b8ed8"
+        "5fb24d6e.9f9c94"
       ]
     ]
   },
   {
-    "id": "29d18753.fcaf7",
+    "id": "52d26ca7.c68dec",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='0' />\n",
     "comments": "",
-    "x": 1236.8095703125,
-    "y": 820.5238037109375,
-    "z": "afcbb687.85236",
+    "x": 1233.8095703125,
+    "y": 810.5238342285156,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "81dbeda3.9b8ed8",
+    "id": "5fb24d6e.9f9c94",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
     "comments": "",
-    "x": 1238.2381591796875,
-    "y": 865.5238647460938,
-    "z": "afcbb687.85236",
+    "x": 1235.2381591796875,
+    "y": 855.5238952636719,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "aec2b21c.351b48",
+    "id": "3a5f6ad2.fcb69e",
     "type": "set",
     "name": "set network in service-data",
     "xml": "<set>\n<parameter name=\"service-data.networks.network[$nidx].network-id\" value='`$prop.l3vpn.network-id`' />\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-request-input.' value='`$network-topology-operation-input.network-request-input.`' />\n<parameter name=\"service-data.networks.network_length\" value='`$nidx+1`' />\n\n",
     "comments": "",
-    "x": 724,
-    "y": 1340,
-    "z": "afcbb687.85236",
+    "x": 721,
+    "y": 1330.0000305175781,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "fd85e187.c7dde",
+    "id": "9104517f.7f262",
     "type": "set",
     "name": "set networkId and network-object-path",
     "xml": "<set>\n<parameter name='networkId' value='`$prop.l3vpn.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.l3vpn.network-id  + '/network-data/'` \" />",
     "comments": "",
-    "x": 753,
-    "y": 1385,
-    "z": "afcbb687.85236",
+    "x": 750,
+    "y": 1375.0000305175781,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "4308a2c5.6e7bac",
+    "id": "cbcd99ce.c72bd8",
     "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": 700,
-    "y": 1574,
-    "z": "afcbb687.85236",
+    "x": 697,
+    "y": 1564.0000305175781,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "8381990.da591e8",
+    "id": "7a9f34e2.0af57c",
     "type": "set",
     "name": "set network-level-oper-status",
     "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.networks.network[$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[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
     "comments": "",
-    "x": 726,
-    "y": 1432,
-    "z": "afcbb687.85236",
+    "x": 723,
+    "y": 1422.0000305175781,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "ced212e0.c44f6",
+    "id": "b55f1296.840848",
     "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": 801,
-    "y": 258,
-    "z": "afcbb687.85236",
+    "x": 798,
+    "y": 248.00003051757812,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "eadbe688.b2511",
-        "3cc9c2b7.cfb8de",
-        "8d496330.30d8c8"
+        "b5e19965.6c52e8",
+        "b4a31e90.9f841",
+        "2f6c8f95.b1b07"
       ]
     ]
   },
   {
-    "id": "eadbe688.b2511",
+    "id": "b5e19965.6c52e8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1123,
-    "y": 148,
-    "z": "afcbb687.85236",
+    "x": 1120,
+    "y": 138.00003051757812,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "3db9a787.d2e218"
+        "a553dc.f2aa0c28"
       ]
     ]
   },
   {
-    "id": "3cc9c2b7.cfb8de",
+    "id": "b4a31e90.9f841",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1126.490966796875,
-    "y": 195.57403564453125,
-    "z": "afcbb687.85236",
+    "x": 1123.490966796875,
+    "y": 185.57406616210938,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "f2ff3e53.95d6c"
+        "5ffc796f.6a8e6"
       ]
     ]
   },
   {
-    "id": "8d496330.30d8c8",
+    "id": "2f6c8f95.b1b07",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1121.823974609375,
-    "y": 236.9073486328125,
-    "z": "afcbb687.85236",
+    "x": 1118.823974609375,
+    "y": 226.90737915039062,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       [
-        "dbc59ca.25a126"
+        "258408f4.196188"
       ]
     ]
   },
   {
-    "id": "f2ff3e53.95d6c",
+    "id": "5ffc796f.6a8e6",
     "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",
+    "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 pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 1303.0623779296875,
-    "y": 183.85977172851562,
-    "z": "afcbb687.85236",
+    "x": 1300.0623779296875,
+    "y": 173.85980224609375,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "dbc59ca.25a126",
+    "id": "258408f4.196188",
     "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",
+    "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 pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 1309.5965309143066,
-    "y": 232.34654140472412,
-    "z": "afcbb687.85236",
+    "x": 1306.5965309143066,
+    "y": 222.34657192230225,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "3db9a787.d2e218",
+    "id": "a553dc.f2aa0c28",
     "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": 1327,
-    "y": 135,
-    "z": "afcbb687.85236",
+    "x": 1324,
+    "y": 125.00003051757812,
+    "z": "f0bdac73.5c8b08",
     "wires": []
   },
   {
-    "id": "3039bc18.0720bc",
+    "id": "5c189e4b.93fcf8",
     "type": "save",
     "name": "save underlay configuration in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n      key='configuration.configuration-id = $prop.l3vpn.network-id' >\n<parameter name='configuration-id' value='`$prop.l3vpn.network-id`' />\n<parameter name='configuration-type' value='underlay' />\n<parameter name='orchestration-status' value='Created' />\n<parameter name='configuration-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.l3vpn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 745,
-    "y": 1482,
-    "z": "afcbb687.85236",
+    "x": 742,
+    "y": 1472.0000305175781,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       []
     ]
   },
   {
-    "id": "eb064901.8cfbf",
+    "id": "6a04e23f.5461dc",
     "type": "save",
     "name": "save service relationship in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-id' >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"configuration\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"/network/configurations/configuration\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"configuration.configuration-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.l3vpn.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"configuration.configuration-type\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value=\"underlay\" />",
     "comments": "",
     "outputs": 1,
-    "x": 737,
-    "y": 1528,
-    "z": "afcbb687.85236",
+    "x": 734,
+    "y": 1518.0000305175781,
+    "z": "f0bdac73.5c8b08",
     "wires": [
       []
     ]
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 ce0a2fa3..94ee31b3 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
@@ -1,1100 +1,1100 @@
 [
   {
-    "id": "faa0ffba.e89d8",
+    "id": "ddf8122b.bf6e5",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 85,
-    "y": 113.04766654968262,
-    "z": "d98986ab.861428",
+    "x": 87,
+    "y": 115.04766654968262,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "b95f4940.66cc78"
+        "2fff1e3d.63ab82"
       ]
     ]
   },
   {
-    "id": "b95f4940.66cc78",
+    "id": "2fff1e3d.63ab82",
     "type": "service-logic",
-    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "name": "GENERIC-RESOURCE-API 1.2.0-SNAPSHOT",
     "module": "GENERIC-RESOURCE-API",
-    "version": "${project.version}",
+    "version": "1.2.0-SNAPSHOT",
     "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}'>",
+    "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'>",
     "outputs": 1,
-    "x": 330.2857131958008,
-    "y": 112.28574562072754,
-    "z": "d98986ab.861428",
+    "x": 332.2857131958008,
+    "y": 114.28574562072754,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "db8880e7.399138"
+        "5d7ec735.0c4ba8"
       ]
     ]
   },
   {
-    "id": "db8880e7.399138",
+    "id": "5d7ec735.0c4ba8",
     "type": "method",
     "name": "method validate-network-input-parameters",
     "xml": "<method rpc='validate-network-input-parameters' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 287.91668701171875,
-    "y": 187.30068397521973,
-    "z": "d98986ab.861428",
+    "x": 289.91668701171875,
+    "y": 189.30068397521973,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "c2bcbabd.ce8158"
+        "c72cc377.3d6a98"
       ]
     ]
   },
   {
-    "id": "c2bcbabd.ce8158",
+    "id": "c72cc377.3d6a98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 571.9166946411133,
-    "y": 175.30070877075195,
-    "z": "d98986ab.861428",
+    "x": 573.9166946411133,
+    "y": 177.30070877075195,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "7723f6f5.70d16",
-        "23bb4d68.1d6aca"
+        "846bb887.500c9",
+        "26516dd.068d212"
       ]
     ]
   },
   {
-    "id": "7723f6f5.70d16",
+    "id": "846bb887.500c9",
     "type": "switchNode",
     "name": "switch  svc-action",
     "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 852.9166946411133,
-    "y": 170.3006944656372,
-    "z": "d98986ab.861428",
+    "x": 854.9166946411133,
+    "y": 172.3006944656372,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "847bfdf7.dfd188"
+        "770a13b8.39f74c"
       ]
     ]
   },
   {
-    "id": "847bfdf7.dfd188",
+    "id": "770a13b8.39f74c",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 1043.6309967041016,
-    "y": 171.30069541931152,
-    "z": "d98986ab.861428",
+    "x": 1045.6309967041016,
+    "y": 173.30069541931152,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "a76f46ec.4caa98"
+        "b2cafa38.2cf18"
       ]
     ]
   },
   {
-    "id": "a76f46ec.4caa98",
+    "id": "b2cafa38.2cf18",
     "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=\"sdnc-request-header.svc-request-id is a required input\" />\n",
     "comments": "",
-    "x": 1218.0595474243164,
-    "y": 170.300687789917,
-    "z": "d98986ab.861428",
+    "x": 1220.0595474243164,
+    "y": 172.300687789917,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "23bb4d68.1d6aca",
+    "id": "26516dd.068d212",
     "type": "switchNode",
     "name": "switch svc-action",
-    "xml": "<switch test='`$service-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+    "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 153.91664123535156,
-    "y": 446.30070877075195,
-    "z": "d98986ab.861428",
+    "x": 155.91664123535156,
+    "y": 448.30070877075195,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "2a23b50.62488cc",
-        "ffd34193.404aa",
-        "fc4b5571.bad3e",
-        "3670d91f.b7e116",
-        "823b7913.83e82"
+        "3553ffe6.e3983",
+        "9543c13f.54a338",
+        "67e65045.59b8a8",
+        "72ab0083.c0d808",
+        "1c3c77bb.a2bfc"
       ]
     ]
   },
   {
-    "id": "2a23b50.62488cc",
+    "id": "3553ffe6.e3983",
     "type": "outcome",
     "name": "create",
     "xml": "<outcome value='create'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 355.4167251586914,
-    "y": 446.30070877075195,
-    "z": "d98986ab.861428",
+    "x": 357.4167251586914,
+    "y": 448.30070877075195,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "35a22a62.927db6"
+        "dfd730e2.3d41a"
       ]
     ]
   },
   {
-    "id": "35a22a62.927db6",
+    "id": "dfd730e2.3d41a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 521.4167327880859,
-    "y": 446.30070877075195,
-    "z": "d98986ab.861428",
+    "x": 523.4167327880859,
+    "y": 448.30070877075195,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "84b1bafe.d753c8"
+        "b792e4c7.13b96"
       ]
     ]
   },
   {
-    "id": "c761568c.03f0a",
+    "id": "786f42e8.a3ebcc",
     "type": "for",
     "name": "for loop i - Network input parameters",
-    "xml": "<for index=\"i\" start=\"0\" end=\"`$network-topology-information.network-request-input.network-input-parameters.param_length`\">\n",
+    "xml": "<for index=\"i\" start=\"0\" end=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1720.630874633789,
-    "y": 110.01497840881348,
-    "z": "d98986ab.861428",
+    "x": 1720.630859375,
+    "y": 109.01498413085938,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "6bbe7ccf.21c664"
+        "39c05252.332006"
       ]
     ]
   },
   {
-    "id": "80903373.40bd",
+    "id": "4662d843.0df85",
     "type": "switchNode",
     "name": "switch value",
     "xml": "<switch test=\"`$tmp.value`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2574.2022247314453,
-    "y": 364.01495361328125,
-    "z": "d98986ab.861428",
+    "x": 2576.2022247314453,
+    "y": 366.01495361328125,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "7dc03e79.e30648"
+        "632316ae.127dd"
       ]
     ]
   },
   {
-    "id": "7dc03e79.e30648",
+    "id": "632316ae.127dd",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 2791.2021980285645,
-    "y": 363.01495933532715,
-    "z": "d98986ab.861428",
+    "x": 2793.2021980285645,
+    "y": 365.01495933532715,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4449f580.7eb1b4"
+        "3f61b79e.239a58"
       ]
     ]
   },
   {
-    "id": "4449f580.7eb1b4",
+    "id": "3f61b79e.239a58",
     "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-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`\" />\n",
     "comments": "",
-    "x": 2969.6309127807617,
-    "y": 364.01495933532715,
-    "z": "d98986ab.861428",
+    "x": 2971.6309127807617,
+    "y": 366.01495933532715,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "ffd34193.404aa",
+    "id": "9543c13f.54a338",
     "type": "outcome",
     "name": "deactivate",
     "xml": "<outcome value='deactivate'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 357.7142791748047,
-    "y": 604.4762363433838,
-    "z": "d98986ab.861428",
+    "x": 359.7142791748047,
+    "y": 606.4762363433838,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "7ef0cfae.a9d9c"
+        "ff7f1b4f.30d5a8"
       ]
     ]
   },
   {
-    "id": "fc4b5571.bad3e",
+    "id": "67e65045.59b8a8",
     "type": "outcome",
     "name": "delete",
     "xml": "<outcome value='delete'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 361.42866134643555,
-    "y": 775.1907939910889,
-    "z": "d98986ab.861428",
+    "x": 363.42866134643555,
+    "y": 777.1907939910889,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "e0263cc1.d96968"
+        "c1e4044f.d7929"
       ]
     ]
   },
   {
-    "id": "3670d91f.b7e116",
+    "id": "72ab0083.c0d808",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 359.1905403137207,
-    "y": 729.619062423706,
-    "z": "d98986ab.861428",
+    "x": 363.1905517578125,
+    "y": 950.6190795898438,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "1187da8e.1e68e5"
+        "f0129720.1ef558"
       ]
     ]
   },
   {
-    "id": "1187da8e.1e68e5",
+    "id": "f0129720.1ef558",
     "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.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
     "comments": "",
-    "x": 512.7621154785156,
-    "y": 732.2382063865662,
-    "z": "d98986ab.861428",
+    "x": 546.7620849609375,
+    "y": 951.2382202148438,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "6bbe7ccf.21c664",
+    "id": "39c05252.332006",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1598.7142486572266,
-    "y": 256.761926651001,
-    "z": "d98986ab.861428",
+    "x": 1600.7142486572266,
+    "y": 258.761926651001,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "9a78d49c.5c6c48",
-        "4d7afbb9.93f474",
-        "e49aca1a.0651b8"
+        "bd82571.4ad4228",
+        "ce182094.ef8a3",
+        "6a5abb1b.52e074"
       ]
     ]
   },
   {
-    "id": "84b1bafe.d753c8",
+    "id": "b792e4c7.13b96",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 847.0000152587891,
-    "y": 335.7143363952637,
-    "z": "d98986ab.861428",
+    "x": 849.0000152587891,
+    "y": 337.7143363952637,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "b2571e45.c855e8",
-        "ac398ddc.f05998"
+        "c5d42ffb.c9f0d8",
+        "69f739d0.28fca"
       ]
     ]
   },
   {
-    "id": "b2571e45.c855e8",
+    "id": "c5d42ffb.c9f0d8",
     "type": "other",
     "name": "CreateNetworkInstance",
     "xml": "<outcome value='CreateNetworkInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1113.000015258789,
-    "y": 294.7143363952637,
-    "z": "d98986ab.861428",
+    "x": 1115.000015258789,
+    "y": 296.7143363952637,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "8b60af63.0db818"
+        "2a69c84.9676bb8"
       ]
     ]
   },
   {
-    "id": "ac398ddc.f05998",
+    "id": "69f739d0.28fca",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1067.000015258789,
-    "y": 344.7143363952637,
-    "z": "d98986ab.861428",
+    "x": 1069.000015258789,
+    "y": 346.7143363952637,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "e121de21.0ffe78"
+        "a4f6f6a1.e1ab58"
       ]
     ]
   },
   {
-    "id": "e121de21.0ffe78",
+    "id": "a4f6f6a1.e1ab58",
     "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=\"request-information.request-action is required to be CreateNetworkInstance for svc-action=create\" />\n",
     "comments": "",
-    "x": 1236.000015258789,
-    "y": 344.7143363952637,
-    "z": "d98986ab.861428",
+    "x": 1238.000015258789,
+    "y": 346.7143363952637,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "8b60af63.0db818",
+    "id": "2a69c84.9676bb8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1338.000015258789,
-    "y": 283.7143363952637,
-    "z": "d98986ab.861428",
+    "x": 1340.000015258789,
+    "y": 285.7143363952637,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "c761568c.03f0a"
+        "786f42e8.a3ebcc"
       ]
     ]
   },
   {
-    "id": "9a78d49c.5c6c48",
+    "id": "bd82571.4ad4228",
     "type": "set",
     "name": "clear tmp-data",
     "xml": "<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n",
     "comments": "",
-    "x": 1790.7143096923828,
-    "y": 211.00002479553223,
-    "z": "d98986ab.861428",
+    "x": 1792.7143096923828,
+    "y": 213.00002479553223,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "4d7afbb9.93f474",
+    "id": "ce182094.ef8a3",
     "type": "set",
     "name": "set tmp-data",
-    "xml": "<set>\n<parameter name='tmp.name' value=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[i].name`\"/>\n<parameter name='tmp.value' value=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[i].value`\"/>\n",
+    "xml": "<set>\n<parameter name='tmp.name' value=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].name`\"/>\n<parameter name='tmp.value' value=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].value`\"/>\n",
     "comments": "",
-    "x": 1779.7143096923828,
-    "y": 301.0000247955322,
-    "z": "d98986ab.861428",
+    "x": 1781.7143096923828,
+    "y": 303.0000247955322,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "e49aca1a.0651b8",
+    "id": "6a5abb1b.52e074",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$tmp.name`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1758.7143096923828,
-    "y": 395.0000247955322,
-    "z": "d98986ab.861428",
+    "x": 1760.7143096923828,
+    "y": 397.0000247955322,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "41e3528.04abc2c",
-        "6ac01d8a.f6a7fc",
-        "f26849c8.b296e",
-        "bb7bcaf4.82d9e8",
-        "27adc52c.8ee0d2",
-        "ef56550b.fc6858",
-        "c927ca6e.4041d8",
-        "510578da.17aeb",
-        "d6240771.8bfc8",
-        "19bb94a8.8e46bb",
-        "7cf56a59.b76d14",
-        "164ce143.0020d7",
-        "b5cb2d0b.15677",
-        "211400b.5190a8",
-        "ca0ced45.a76e28",
-        "b3a58592.3d9868",
-        "5f626258.048c44"
+        "52effe4f.ac2ae8",
+        "869a7fd8.50b75",
+        "407c2eba.5d49f8",
+        "174077c9.6c10c8",
+        "4f610fc8.b35008",
+        "10ff2035.1d4618",
+        "4c528719.50cae",
+        "a67c5c2f.007308",
+        "8b639e89.f3549",
+        "d88cca1b.f3ea88",
+        "986570e4.376248",
+        "cd383e71.d36be8",
+        "a1ba7fd7.d88d3",
+        "a53ac3b.66852c",
+        "3d95e365.11bc6c",
+        "18048265.211a56",
+        "e570f120.c01b38"
       ]
     ]
   },
   {
-    "id": "41e3528.04abc2c",
+    "id": "52effe4f.ac2ae8",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 2298.285598754883,
-    "y": 898,
-    "z": "d98986ab.861428",
+    "x": 2300.285598754883,
+    "y": 900,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "1b8d374a.29cc89"
+        "540cec23.3e0ea4"
       ]
     ]
   },
   {
-    "id": "1b8d374a.29cc89",
+    "id": "540cec23.3e0ea4",
     "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.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
+    "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-input-parameters.param[' + $i + ']' + '.name is a required input'`\" />\n",
     "comments": "",
-    "x": 2473.285598754883,
-    "y": 897,
-    "z": "d98986ab.861428",
+    "x": 2475.285598754883,
+    "y": 899,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "6ac01d8a.f6a7fc",
+    "id": "869a7fd8.50b75",
     "type": "other",
     "name": "name",
     "xml": "<outcome value='name'>",
     "comments": "",
     "outputs": 1,
-    "x": 2275.285598754883,
-    "y": 20,
-    "z": "d98986ab.861428",
+    "x": 2277.285598754883,
+    "y": 22,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "80903373.40bd"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "f26849c8.b296e",
+    "id": "407c2eba.5d49f8",
     "type": "other",
     "name": "service-type",
     "xml": "<outcome value='service-type'>",
     "comments": "",
     "outputs": 1,
-    "x": 2278.285598754883,
-    "y": 87,
-    "z": "d98986ab.861428",
+    "x": 2280.285598754883,
+    "y": 89,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "80903373.40bd"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "c927ca6e.4041d8",
+    "id": "4c528719.50cae",
     "type": "other",
     "name": "sna2_name",
     "xml": "<outcome value='sna2_name'>",
     "comments": "",
     "outputs": 1,
-    "x": 2282.285598754883,
-    "y": 316,
-    "z": "d98986ab.861428",
+    "x": 2284.285598754883,
+    "y": 318,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "80903373.40bd"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "bb7bcaf4.82d9e8",
+    "id": "174077c9.6c10c8",
     "type": "other",
     "name": "site1-name",
     "xml": "<outcome value='site1-name'>",
     "comments": "",
     "outputs": 1,
-    "x": 2279.285598754883,
-    "y": 148,
-    "z": "d98986ab.861428",
+    "x": 2281.285598754883,
+    "y": 150,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "80903373.40bd"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "27adc52c.8ee0d2",
+    "id": "4f610fc8.b35008",
     "type": "other",
     "name": "site2-name",
     "xml": "<outcome value='site2-name'>",
     "comments": "",
     "outputs": 1,
-    "x": 2275.285598754883,
-    "y": 205,
-    "z": "d98986ab.861428",
+    "x": 2277.285598754883,
+    "y": 207,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "80903373.40bd"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "ef56550b.fc6858",
+    "id": "10ff2035.1d4618",
     "type": "other",
     "name": "sna1_name",
     "xml": "<outcome value='sna1_name'>",
     "comments": "",
     "outputs": 1,
-    "x": 2278.285598754883,
-    "y": 262,
-    "z": "d98986ab.861428",
+    "x": 2280.285598754883,
+    "y": 264,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "80903373.40bd"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "510578da.17aeb",
+    "id": "a67c5c2f.007308",
     "type": "other",
     "name": "pe1_id",
     "xml": "<outcome value='pe1_id'>",
     "comments": "",
     "outputs": 1,
-    "x": 2282.285598754883,
-    "y": 367,
-    "z": "d98986ab.861428",
+    "x": 2284.285598754883,
+    "y": 369,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "80903373.40bd"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "d6240771.8bfc8",
+    "id": "8b639e89.f3549",
     "type": "other",
     "name": "pe2_id",
     "xml": "<outcome value='pe2_id'>",
     "comments": "",
     "outputs": 1,
-    "x": 2285.285598754883,
-    "y": 415,
-    "z": "d98986ab.861428",
+    "x": 2287.285598754883,
+    "y": 417,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "80903373.40bd"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "19bb94a8.8e46bb",
+    "id": "d88cca1b.f3ea88",
     "type": "other",
     "name": "ac1-id",
     "xml": "<outcome value='ac1-id'>",
     "comments": "",
     "outputs": 1,
-    "x": 2290.285598754883,
-    "y": 464,
-    "z": "d98986ab.861428",
+    "x": 2292.285598754883,
+    "y": 466,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "80903373.40bd"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "7cf56a59.b76d14",
+    "id": "986570e4.376248",
     "type": "other",
     "name": "ac2-id",
     "xml": "<outcome value='ac2-id'>",
     "comments": "",
     "outputs": 1,
-    "x": 2292.285598754883,
-    "y": 519,
-    "z": "d98986ab.861428",
+    "x": 2294.285598754883,
+    "y": 521,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "80903373.40bd"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "164ce143.0020d7",
+    "id": "cd383e71.d36be8",
     "type": "other",
     "name": "ac1-ip",
     "xml": "<outcome value='ac1-ip'>",
     "comments": "",
     "outputs": 1,
-    "x": 2292.285598754883,
-    "y": 571,
-    "z": "d98986ab.861428",
+    "x": 2294.285598754883,
+    "y": 573,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "80903373.40bd"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "b5cb2d0b.15677",
+    "id": "a1ba7fd7.d88d3",
     "type": "other",
     "name": "ac2-ip",
     "xml": "<outcome value='ac2-ip'>",
     "comments": "",
     "outputs": 1,
-    "x": 2294.285598754883,
-    "y": 632,
-    "z": "d98986ab.861428",
+    "x": 2296.285598754883,
+    "y": 634,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "80903373.40bd"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "211400b.5190a8",
+    "id": "a53ac3b.66852c",
     "type": "other",
     "name": "ac1_peer_ip",
     "xml": "<outcome value='ac1_peer_ip'>",
     "comments": "",
     "outputs": 1,
-    "x": 2296.285598754883,
-    "y": 682,
-    "z": "d98986ab.861428",
+    "x": 2298.285598754883,
+    "y": 684,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "80903373.40bd"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "ca0ced45.a76e28",
+    "id": "3d95e365.11bc6c",
     "type": "other",
     "name": "ac2_peer_ip",
     "xml": "<outcome value='ac2_peer_ip'>",
     "comments": "",
     "outputs": 1,
-    "x": 2292.285598754883,
-    "y": 730,
-    "z": "d98986ab.861428",
+    "x": 2294.285598754883,
+    "y": 732,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "80903373.40bd"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "b3a58592.3d9868",
+    "id": "18048265.211a56",
     "type": "other",
     "name": "ac1_svlan",
     "xml": "<outcome value='ac1_svlan'>",
     "comments": "",
     "outputs": 1,
-    "x": 2294.285598754883,
-    "y": 783,
-    "z": "d98986ab.861428",
+    "x": 2296.285598754883,
+    "y": 785,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "80903373.40bd"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "5f626258.048c44",
+    "id": "e570f120.c01b38",
     "type": "other",
     "name": "ac2_svlan",
     "xml": "<outcome value='ac2_svlan'>",
     "comments": "",
     "outputs": 1,
-    "x": 2296.285598754883,
-    "y": 844,
-    "z": "d98986ab.861428",
+    "x": 2298.285598754883,
+    "y": 846,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "80903373.40bd"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "e0263cc1.d96968",
+    "id": "c1e4044f.d7929",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 292.5714340209961,
-    "y": 856.8572435379028,
-    "z": "d98986ab.861428",
+    "x": 532.5714111328125,
+    "y": 775.8572387695312,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "283fd358.50e254"
+        "4d5581d7.e27f88"
       ]
     ]
   },
   {
-    "id": "145e812a.ac0acf",
+    "id": "4f4bf5a8.a829ac",
     "type": "other",
     "name": "DeleteNetworkInstance",
     "xml": "<outcome value='DeleteNetworkInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 759.2857246398926,
-    "y": 769.8572072982788,
-    "z": "d98986ab.861428",
+    "x": 965.2857055664062,
+    "y": 778.857177734375,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "a555e2be.b46fc"
+        "562b1ef.a708d6"
       ]
     ]
   },
   {
-    "id": "92eeaa34.08fe58",
+    "id": "548cf43d.62af0c",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 819.2857246398926,
-    "y": 899.8572072982788,
-    "z": "d98986ab.861428",
+    "x": 1025.2857055664062,
+    "y": 908.857177734375,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "1149d054.e0f5"
+        "5adf131e.a61cf4"
       ]
     ]
   },
   {
-    "id": "1149d054.e0f5",
+    "id": "5adf131e.a61cf4",
     "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=\"request-information.request-action is required to be DeleteNetworkInstance for svc-action=delete\" />\n",
     "comments": "",
-    "x": 1006.2857246398926,
-    "y": 900.8572072982788,
-    "z": "d98986ab.861428",
+    "x": 1212.2857055664062,
+    "y": 909.857177734375,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "a555e2be.b46fc",
+    "id": "562b1ef.a708d6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 714.2857246398926,
-    "y": 969.8572072982788,
-    "z": "d98986ab.861428",
+    "x": 920.2857055664062,
+    "y": 978.857177734375,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "99cbd7b1.dcbe1",
-        "802c04a5.b5b44"
+        "253ad8eb.98869",
+        "aeedc57a.12dee8"
       ]
     ]
   },
   {
-    "id": "99cbd7b1.dcbe1",
+    "id": "253ad8eb.98869",
     "type": "switchNode",
     "name": "switch network-id",
     "xml": "<switch test='`$network-topology-operation-input.network-information.network-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 868.2856636047363,
-    "y": 1069.8572072982788,
-    "z": "d98986ab.861428",
+    "x": 1074.28564453125,
+    "y": 1078.857177734375,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "5340ccc7.b7728c"
+        "34e7b676.a0927a"
       ]
     ]
   },
   {
-    "id": "5340ccc7.b7728c",
+    "id": "34e7b676.a0927a",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 1052.2856636047363,
-    "y": 1072.8572072982788,
-    "z": "d98986ab.861428",
+    "x": 1258.28564453125,
+    "y": 1081.857177734375,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "937ab8ad.e150a8"
+        "8389ad47.02308"
       ]
     ]
   },
   {
-    "id": "937ab8ad.e150a8",
+    "id": "8389ad47.02308",
     "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-request-input.network-input-parameters.name is a required input\" />\n",
     "comments": "",
-    "x": 1208.7143745422363,
-    "y": 1071.8572072982788,
-    "z": "d98986ab.861428",
+    "x": 1414.71435546875,
+    "y": 1080.857177734375,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "823b7913.83e82",
+    "id": "1c3c77bb.a2bfc",
     "type": "outcome",
     "name": "activate",
     "xml": "<outcome value='activate'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 356.4285697937012,
-    "y": 538.7619791030884,
-    "z": "d98986ab.861428",
+    "x": 358.4285697937012,
+    "y": 540.7619791030884,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "413afb53.a7e9bc"
+        "3c6d4ec3.c79d7a"
       ]
     ]
   },
   {
-    "id": "413afb53.a7e9bc",
+    "id": "3c6d4ec3.c79d7a",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 539.2857360839844,
-    "y": 535.9048290252686,
-    "z": "d98986ab.861428",
+    "x": 541.2857360839844,
+    "y": 537.9048290252686,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "c51c21dc.9f93c8",
-        "aa444685.51676"
+        "bc964363.f267b",
+        "a1a12099.fb3058"
       ]
     ]
   },
   {
-    "id": "c51c21dc.9f93c8",
+    "id": "bc964363.f267b",
     "type": "other",
     "name": "ActivateDCINetworkInstance",
     "xml": "<outcome value='ActivateDCINetworkInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 805.2857360839844,
-    "y": 494.90482902526855,
-    "z": "d98986ab.861428",
+    "x": 807.2857360839844,
+    "y": 496.90482902526855,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "5edae240.c29634"
+        "a3300122.bf0e6"
       ]
     ]
   },
   {
-    "id": "aa444685.51676",
+    "id": "a1a12099.fb3058",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 759.2857360839844,
-    "y": 544.9048290252686,
-    "z": "d98986ab.861428",
+    "x": 761.2857360839844,
+    "y": 546.9048290252686,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "d0b092f4.14515"
+        "7572ee8e.b0b5b8"
       ]
     ]
   },
   {
-    "id": "d0b092f4.14515",
+    "id": "7572ee8e.b0b5b8",
     "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=\"request-information.request-action is required to be ActivateNetworkInstance for svc-action=activate\" />\n",
     "comments": "",
-    "x": 928.2857360839844,
-    "y": 544.9048290252686,
-    "z": "d98986ab.861428",
+    "x": 930.2857360839844,
+    "y": 546.9048290252686,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "5edae240.c29634",
+    "id": "a3300122.bf0e6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1030.2857360839844,
-    "y": 483.90482902526855,
-    "z": "d98986ab.861428",
+    "x": 1032.2857360839844,
+    "y": 485.90482902526855,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "3c91ea2c.5c300e"
+        "7cd4d474.99df44"
       ]
     ]
   },
   {
-    "id": "12ffbf1d.3d33f1",
+    "id": "e4ddb749.a4dd58",
     "type": "other",
     "name": "DeActivateDCINetworkInstance",
     "xml": "<outcome value='DeActivateDCINetworkInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 801.1429061889648,
-    "y": 606.1906299591064,
-    "z": "d98986ab.861428",
+    "x": 803.1429061889648,
+    "y": 608.1906299591064,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "ac68aa10.9b9f5"
+        "393b880c.5a2ab8"
       ]
     ]
   },
   {
-    "id": "95197a73.2ccf78",
+    "id": "b415c4d7.ec51d8",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 716.1428985595703,
-    "y": 675.190637588501,
-    "z": "d98986ab.861428",
+    "x": 718.1428985595703,
+    "y": 677.190637588501,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "e8dac5d.c9e4fb8"
+        "b678cd71.9eea48"
       ]
     ]
   },
   {
-    "id": "e8dac5d.c9e4fb8",
+    "id": "b678cd71.9eea48",
     "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=\"request-information.request-action is required to be DeactivateNetworkInstance for svc-action=deactivate\" />\n",
     "comments": "",
-    "x": 897.1429138183594,
-    "y": 676.190637588501,
-    "z": "d98986ab.861428",
+    "x": 899.1429138183594,
+    "y": 678.190637588501,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "3c91ea2c.5c300e",
+    "id": "7cd4d474.99df44",
     "type": "call",
     "name": "call validate-overlay-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-overlay-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1338.1510696411133,
-    "y": 485.3333520889282,
-    "z": "d98986ab.861428",
+    "x": 1340.1510696411133,
+    "y": 487.3333520889282,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       []
     ]
   },
   {
-    "id": "7ef0cfae.a9d9c",
+    "id": "ff7f1b4f.30d5a8",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 537.9999618530273,
-    "y": 606.6664638519287,
-    "z": "d98986ab.861428",
+    "x": 539.9999618530273,
+    "y": 608.6664638519287,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "12ffbf1d.3d33f1",
-        "95197a73.2ccf78"
+        "e4ddb749.a4dd58",
+        "b415c4d7.ec51d8"
       ]
     ]
   },
   {
-    "id": "283fd358.50e254",
+    "id": "4d5581d7.e27f88",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 528.0000190734863,
-    "y": 857.0000295639038,
-    "z": "d98986ab.861428",
+    "x": 706,
+    "y": 867,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "145e812a.ac0acf",
-        "92eeaa34.08fe58"
+        "4f4bf5a8.a829ac",
+        "548cf43d.62af0c"
       ]
     ]
   },
   {
-    "id": "802c04a5.b5b44",
+    "id": "aeedc57a.12dee8",
     "type": "execute",
     "name": "execute requiredParameter",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"$network-topology-operation-input.network-information.network-id\" value=\"\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1001.0000190734863,
-    "y": 966.0000295639038,
-    "z": "d98986ab.861428",
+    "x": 1207,
+    "y": 975,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       []
     ]
   },
   {
-    "id": "ac68aa10.9b9f5",
+    "id": "393b880c.5a2ab8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1089.9999618530273,
-    "y": 609,
-    "z": "d98986ab.861428",
+    "x": 1091.9999618530273,
+    "y": 611,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "7eb5d9ab.f2a3a8",
-        "c8c856a4.b3312"
+        "46bbeff4.c42c88",
+        "1fbe8bfb.465ce4"
       ]
     ]
   },
   {
-    "id": "7eb5d9ab.f2a3a8",
+    "id": "46bbeff4.c42c88",
     "type": "switchNode",
     "name": "switch network-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-information.network-id`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1243.999900817871,
-    "y": 709,
-    "z": "d98986ab.861428",
+    "x": 1245.999900817871,
+    "y": 711,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "cc5bae19.b165f8"
+        "147516eb.099cf9"
       ]
     ]
   },
   {
-    "id": "cc5bae19.b165f8",
+    "id": "147516eb.099cf9",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 1427.999900817871,
-    "y": 712,
-    "z": "d98986ab.861428",
+    "x": 1429.999900817871,
+    "y": 714,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "a0a11a5f.fe6fb"
+        "c957deec.097848"
       ]
     ]
   },
   {
-    "id": "a0a11a5f.fe6fb",
+    "id": "c957deec.097848",
     "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-request-input.network-input-parameters.name is a required input\" />\n",
     "comments": "",
-    "x": 1584.428611755371,
-    "y": 711,
-    "z": "d98986ab.861428",
+    "x": 1586.428611755371,
+    "y": 713,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "c8c856a4.b3312",
+    "id": "1fbe8bfb.465ce4",
     "type": "execute",
     "name": "execute requiredParameters",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"$network-topology-operation-input.network-information.network-id\" value=\"\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1376.714256286621,
-    "y": 605.142822265625,
-    "z": "d98986ab.861428",
+    "x": 1378.714256286621,
+    "y": 607.142822265625,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       []
     ]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
index 0753281e..bc167e8f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
@@ -232,14 +232,14 @@
                     <return status="failure">
                         <parameter name="ack-final" value="Y" />
                         <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
                     </return>
                 </outcome>
                 <outcome value="Other">
                     <return status="failure">
                         <parameter name="ack-final" value="Y" />
                         <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
                     </return>
                 </outcome>
             </get-resource>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
index 435ecf00..930e2773 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
@@ -11,21 +11,21 @@
                     </return>
                 </outcome>
             </switch>
-            <switch test="`$service-topology-operation-input.sdnc-request-header.svc-action`">
+            <switch test="`$network-topology-operation-input.sdnc-request-header.svc-action`">
                 <outcome value="create">
                     <block atomic="true">
                         <switch test="`$network-topology-operation-input.request-information.request-action`">
                             <outcome value="CreateNetworkInstance">
                                 <block atomic="true">
-                                    <for index="i" start="0" end="`$network-topology-information.network-request-input.network-input-parameters.param_length`">
+                                    <for index="i" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
                                         <block>
                                             <set>
                                                 <parameter name="tmp.name" value="" />
                                                 <parameter name="tmp.value" value="" />
                                             </set>
                                             <set>
-                                                <parameter name="tmp.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[i].name`" />
-                                                <parameter name="tmp.value" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[i].value`" />
+                                                <parameter name="tmp.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].name`" />
+                                                <parameter name="tmp.value" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].value`" />
                                             </set>
                                             <switch test="`$tmp.name`">
                                                 <outcome value="name">
@@ -208,7 +208,7 @@
                                                     <return status="failure">
                                                         <parameter name="ack-final" value="Y" />
                                                         <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
+                                                        <parameter name="error-message" value="`'network-topology-operation-input.network-request-input.network-input-parameters.param[' + $i + ']' + '.name is a required input'`" />
                                                     </return>
                                                 </outcome>
                                             </switch>
@@ -269,13 +269,6 @@
                         </outcome>
                     </switch>
                 </outcome>
-                <outcome value="Other">
-                    <return status="failure">
-                        <parameter name="ack-final" value="Y" />
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
-                    </return>
-                </outcome>
                 <outcome value="delete">
                     <block atomic="true">
                         <switch test="`$network-topology-operation-input.request-information.request-action`">
@@ -305,6 +298,13 @@
                         </switch>
                     </block>
                 </outcome>
+                <outcome value="Other">
+                    <return status="failure">
+                        <parameter name="ack-final" value="Y" />
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
+                    </return>
+                </outcome>
             </switch>
         </block>
     </method>
-- 
cgit 1.2.3-korg