From 239886aea40e4a9cd73bfda783dfedd7ef56f675 Mon Sep 17 00:00:00 2001
From: "ramu.n" <ramu.n@huawei.com>
Date: Wed, 11 Oct 2017 14:59:44 +0530
Subject: [PATCH] Fix underlay DG loading errors

*Remove duplicate parameter names
*Update 'error-message' parameter value

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

Former-commit-id: 04580d7eb6c59fdd613a8fea1d161e0ed7a46a1e
---
 ...URCE-API_network-topology-operation-create.json | 1376 ++++++++--------
 ...URCE-API_validate-network-input-parameters.json | 1656 ++++++++++----------
 ...OURCE-API_network-topology-operation-create.xml |   12 +-
 ...OURCE-API_validate-network-input-parameters.xml |   34 +-
 4 files changed, 1524 insertions(+), 1554 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 fd04a766..c2d67a4b 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,20 +1,20 @@
 [
   {
-    "id": "697cab81.51512c",
+    "id": "2d119cf9.da55d4",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 84,
-    "y": 53.999969482421875,
-    "z": "4d931804.43f9f",
+    "x": 89,
+    "y": 66.99996948242188,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "1ae693ee.c03974"
+        "a281a341.cee95"
       ]
     ]
   },
   {
-    "id": "1ae693ee.c03974",
+    "id": "a281a341.cee95",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1977 +22,1977 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 296.00000381469727,
-    "y": 125.99998664855957,
-    "z": "4d931804.43f9f",
+    "x": 301.00000381469727,
+    "y": 138.99998664855957,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "f0d914e3.9a2588"
+        "f765e2a8.07eac"
       ]
     ]
   },
   {
-    "id": "f0d914e3.9a2588",
+    "id": "f765e2a8.07eac",
     "type": "method",
     "name": "method network-topology-operation-create",
     "xml": "<method rpc='network-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 284.0001220703125,
-    "y": 213.99996948242188,
-    "z": "4d931804.43f9f",
+    "x": 289.0001220703125,
+    "y": 226.99996948242188,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "ce9e8119.8976c"
+        "ba8938ef.875328"
       ]
     ]
   },
   {
-    "id": "ce9e8119.8976c",
+    "id": "ba8938ef.875328",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 360,
-    "y": 612,
-    "z": "4d931804.43f9f",
+    "x": 365,
+    "y": 625,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "47fba1f5.640898",
-        "c605463b.774db8",
-        "7b59e079.3d22b8",
-        "5c8ba0bf.2e98f8",
-        "c7ad74ad.27add8",
-        "b2d33596.d59c1",
-        "c00ac3fa.32f9e",
-        "3cc192be.0780ae",
-        "74f090f.f41e0f",
-        "54853363.a6cb2c",
-        "5411c45f.3ab70c",
-        "af24f51b.e33eb",
-        "98d8796c.a3bbc",
-        "64964558.e55ee4",
-        "8ea2eceb.3de538",
-        "da8e6fe4.5c07a8",
-        "51c60b4c.2a6944"
+        "e2f31eb5.a183e",
+        "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"
       ]
     ]
   },
   {
-    "id": "8c395a0a.a246c8",
+    "id": "f1c4e62c.acf5f",
     "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": 1162.0001831054688,
-    "y": 984.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1167.0001831054688,
+    "y": 997.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       []
     ]
   },
   {
-    "id": "47fba1f5.640898",
+    "id": "e2f31eb5.a183e",
     "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[0].esr-system-info.serviceUrl`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`\" />\n",
     "comments": "",
-    "x": 785.0000610351562,
-    "y": 268.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 790.0000610351562,
+    "y": 281.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "c7ad74ad.27add8",
+    "id": "d96cca8b.aef998",
     "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": 845.6666259765625,
-    "y": 390.6666259765625,
-    "z": "4d931804.43f9f",
+    "x": 850.6666259765625,
+    "y": 403.6666259765625,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "680d9a64.4950bc"
+        "22c32b46.de62ec"
       ]
     ]
   },
   {
-    "id": "771a98af.5ed45",
+    "id": "2bd25145.a5e5d6",
     "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": 1133.6668701171875,
-    "y": 1187.6666564941406,
-    "z": "4d931804.43f9f",
+    "x": 1138.6668701171875,
+    "y": 1200.6666564941406,
+    "z": "afcbb687.85236",
     "wires": [
       []
     ]
   },
   {
-    "id": "5c8ba0bf.2e98f8",
+    "id": "8d5aeff7.32c67",
     "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": 805.6666259765625,
-    "y": 447.6666564941406,
-    "z": "4d931804.43f9f",
+    "x": 810.6666259765625,
+    "y": 460.6666564941406,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "d81f8c27.c89ff8"
+        "f683f47d.fcccc8"
       ]
     ]
   },
   {
-    "id": "d81f8c27.c89ff8",
+    "id": "f683f47d.fcccc8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1030.6666259765625,
-    "y": 450.6666259765625,
-    "z": "4d931804.43f9f",
+    "x": 1035.6666259765625,
+    "y": 463.6666259765625,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "90acf08b.06d308"
+        "64dcb25e.cfa1dc"
       ]
     ]
   },
   {
-    "id": "90acf08b.06d308",
+    "id": "64dcb25e.cfa1dc",
     "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": 1211.6666259765625,
-    "y": 448.6666259765625,
-    "z": "4d931804.43f9f",
+    "x": 1216.6666259765625,
+    "y": 461.6666259765625,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "c605463b.774db8",
+    "id": "ade3e35c.b5b59",
     "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": 857.5,
-    "y": 90.99996948242188,
-    "z": "4d931804.43f9f",
+    "x": 862.5,
+    "y": 103.99996948242188,
+    "z": "afcbb687.85236",
     "wires": [
       []
     ]
   },
   {
-    "id": "7b59e079.3d22b8",
+    "id": "7c2f72f7.87d2ac",
     "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": 827.5,
-    "y": 207.99996948242188,
-    "z": "4d931804.43f9f",
+    "x": 832.5,
+    "y": 220.99996948242188,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "97dc2002.c660f8",
-        "4f41ca53.5d5914",
-        "b70bb66f.267f38"
+        "7c3121a2.590238",
+        "78ce712c.ccd01",
+        "cd33fdee.3222d"
       ]
     ]
   },
   {
-    "id": "97dc2002.c660f8",
+    "id": "7c3121a2.590238",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1152.5,
-    "y": 138.99996948242188,
-    "z": "4d931804.43f9f",
+    "x": 1157.5,
+    "y": 151.99996948242188,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "ef5fb88a.6f28b8"
+        "9cd190ea.6976c8"
       ]
     ]
   },
   {
-    "id": "4f41ca53.5d5914",
+    "id": "78ce712c.ccd01",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1155.990966796875,
-    "y": 186.57400512695312,
-    "z": "4d931804.43f9f",
+    "x": 1160.990966796875,
+    "y": 199.57400512695312,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "3b62b821.ac8e7"
+        "3b83df46.29f0f"
       ]
     ]
   },
   {
-    "id": "b70bb66f.267f38",
+    "id": "cd33fdee.3222d",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1151.323974609375,
-    "y": 227.90731811523438,
-    "z": "4d931804.43f9f",
+    "x": 1156.323974609375,
+    "y": 240.90731811523438,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "b99bfa59.2cb0a8"
+        "767371f2.e9e528"
       ]
     ]
   },
   {
-    "id": "3b62b821.ac8e7",
+    "id": "3b83df46.29f0f",
     "type": "returnFailure",
     "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Network model is_bound_to_vpn=true but no vpn_binding is present\" />\n\n",
+    "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": 1332.5623779296875,
-    "y": 174.8597412109375,
-    "z": "4d931804.43f9f",
+    "x": 1337.5623779296875,
+    "y": 187.8597412109375,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "b99bfa59.2cb0a8",
+    "id": "767371f2.e9e528",
     "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",
+    "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": 1339.0965309143066,
-    "y": 223.346510887146,
-    "z": "4d931804.43f9f",
+    "x": 1344.0965309143066,
+    "y": 236.346510887146,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "ef5fb88a.6f28b8",
+    "id": "9cd190ea.6976c8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1330.705322265625,
-    "y": 131.57400512695312,
-    "z": "4d931804.43f9f",
+    "x": 1335.705322265625,
+    "y": 144.57400512695312,
+    "z": "afcbb687.85236",
     "wires": [
       []
     ]
   },
   {
-    "id": "680d9a64.4950bc",
+    "id": "22c32b46.de62ec",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1244.5,
-    "y": 396.9999694824219,
-    "z": "4d931804.43f9f",
-    "wires": [
-      [
-        "e3908f6a.c4c398",
-        "be9e77b7.873ff",
-        "7a5cf18f.b317f8",
-        "35389645.393b9a",
-        "d348a96f.1822f8",
-        "be3b730d.7e954",
-        "b3c5e265.deb178",
-        "7d1094cd.bc6bbc",
-        "8d88db5d.e1f338",
-        "aaeb2956.e246f8",
-        "4cf00d90.a548a4",
-        "8f9bdfe5.d2a3d8",
-        "7d72ad7e.5e03ac",
-        "79f918.475996e8",
-        "c4791db3.7410b",
-        "2fb7f830.a142c",
-        "9253ced1.f2cee8",
-        "fc940e44.bb799",
-        "f5993a9c.9252b",
-        "dc6166fe.43d058",
-        "596289d7.f6ddc8",
-        "ff3cab94.0ba1d",
-        "10aaaff3.858108",
-        "1a3c9b5d.13700d",
-        "18c39015.325968"
-      ]
-    ]
-  },
-  {
-    "id": "e3908f6a.c4c398",
+    "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",
     "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": 1595.5,
-    "y": 21,
-    "z": "4d931804.43f9f",
+    "x": 1600.5,
+    "y": 34,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "a0c30c9b.5ab5d"
+        "f559aca3.91e3"
       ]
     ]
   },
   {
-    "id": "be9e77b7.873ff",
+    "id": "38873b05.a3c454",
     "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": 1599.4999389648438,
-    "y": 82.5999755859375,
-    "z": "4d931804.43f9f",
+    "x": 1604.4999389648438,
+    "y": 95.5999755859375,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "bd7dc877.f559d8"
+        "401247a1.5ff7d"
       ]
     ]
   },
   {
-    "id": "a0c30c9b.5ab5d",
+    "id": "f559aca3.91e3",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1782.5,
-    "y": 21,
-    "z": "4d931804.43f9f",
+    "x": 1787.5,
+    "y": 34,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "4d6d01e9.6c7218"
+        "79625ec4.855a18"
       ]
     ]
   },
   {
-    "id": "bd7dc877.f559d8",
+    "id": "401247a1.5ff7d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1784.4999389648438,
-    "y": 80.5999755859375,
-    "z": "4d931804.43f9f",
+    "x": 1789.4999389648438,
+    "y": 93.5999755859375,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "d36de49f.f68a6"
+        "6a87bf48.abeba"
       ]
     ]
   },
   {
-    "id": "4d6d01e9.6c7218",
+    "id": "79625ec4.855a18",
     "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": 1950.5,
-    "y": 21.600006103515625,
-    "z": "4d931804.43f9f",
+    "x": 1955.5,
+    "y": 34.600006103515625,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "d36de49f.f68a6",
+    "id": "6a87bf48.abeba",
     "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": 1953.4999389648438,
-    "y": 78.5999755859375,
-    "z": "4d931804.43f9f",
+    "x": 1958.4999389648438,
+    "y": 91.5999755859375,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "7a5cf18f.b317f8",
+    "id": "9175a87c.a6aee",
     "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": 1598.5,
-    "y": 143.99996948242188,
-    "z": "4d931804.43f9f",
+    "x": 1603.5,
+    "y": 156.99996948242188,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "68b9f582.2430d4"
+        "a64e4877.40f2a8"
       ]
     ]
   },
   {
-    "id": "35389645.393b9a",
+    "id": "c55257b2.b8e8",
     "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": 1601.5,
-    "y": 196.99996948242188,
-    "z": "4d931804.43f9f",
+    "x": 1606.5,
+    "y": 209.99996948242188,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "5cda61be.c753d8"
+        "9ba6f7b3.df8438"
       ]
     ]
   },
   {
-    "id": "d348a96f.1822f8",
+    "id": "75421ae0.2f14a4",
     "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": 1606.5,
-    "y": 258.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1611.5,
+    "y": 271.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "d7b076fd.372c4"
+        "3fe3c429.54f524"
       ]
     ]
   },
   {
-    "id": "be3b730d.7e954",
+    "id": "8d568c42.a5a6b",
     "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": 1601.5,
-    "y": 321.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1606.5,
+    "y": 334.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "5b648810.dd844"
+        "4b788419.283d84"
       ]
     ]
   },
   {
-    "id": "b3c5e265.deb178",
+    "id": "c77b0665.1769f8",
     "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": 1606.5,
-    "y": 381.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1611.5,
+    "y": 394.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "d0d57f1c.8c8bf8"
+        "df5a50d3.c67ae"
       ]
     ]
   },
   {
-    "id": "7d1094cd.bc6bbc",
+    "id": "9a8d8afe.f563a",
     "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": 1601.5,
-    "y": 445.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1606.5,
+    "y": 458.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "6e174e25.5f3d78"
+        "8824fdd5.acc64"
       ]
     ]
   },
   {
-    "id": "8d88db5d.e1f338",
+    "id": "88904f93.c66ce8",
     "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": 1606.5,
-    "y": 507.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1611.5,
+    "y": 520.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "ebb8fa90.99fc4"
+        "11f03ae0.763e8d"
       ]
     ]
   },
   {
-    "id": "aaeb2956.e246f8",
+    "id": "6e84728c.673824",
     "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": 1621.5,
-    "y": 567.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1626.5,
+    "y": 580.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "52d74051.7b6e58"
+        "62aa94da.25d62c"
       ]
     ]
   },
   {
-    "id": "4cf00d90.a548a4",
+    "id": "1d735f8b.a0bda8",
     "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": 1616.5,
-    "y": 639.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1621.5,
+    "y": 652.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "9ef12bf7.50569"
+        "a020360c.e4bb5"
       ]
     ]
   },
   {
-    "id": "8f9bdfe5.d2a3d8",
+    "id": "e368f329.6d7548",
     "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": 1615.5,
-    "y": 698.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1620.5,
+    "y": 711.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "62d558d2.f880e8"
+        "8fc6e5e2.e24288"
       ]
     ]
   },
   {
-    "id": "7d72ad7e.5e03ac",
+    "id": "a3622b1.27cced8",
     "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": 1592.5,
-    "y": 761.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1597.5,
+    "y": 774.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "bf3182f6.a9ab1"
+        "e82a870c.b39b28"
       ]
     ]
   },
   {
-    "id": "79f918.475996e8",
+    "id": "abae0359.a1f078",
     "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": 1595.5,
-    "y": 818.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1600.5,
+    "y": 831.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "f2b94cc1.85afb"
+        "47898e68.b0462"
       ]
     ]
   },
   {
-    "id": "c4791db3.7410b",
+    "id": "68ac49c7.06602",
     "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": 1601.5,
-    "y": 870.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1606.5,
+    "y": 883.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "acf4ab48.24e14"
+        "eaea8bad.5cf788"
       ]
     ]
   },
   {
-    "id": "2fb7f830.a142c",
+    "id": "5e346a8c.2e71cc",
     "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": 1602.5,
-    "y": 925.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1607.5,
+    "y": 938.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "d9b315dd.3141e"
+        "54e08fc1.717778"
       ]
     ]
   },
   {
-    "id": "9253ced1.f2cee8",
+    "id": "d1e7e706.64fca8",
     "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": 1614.5,
-    "y": 974.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1619.5,
+    "y": 987.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "cf0b48ac.5ee088"
+        "c485c539.43b58"
       ]
     ]
   },
   {
-    "id": "fc940e44.bb799",
+    "id": "bac90fd8.5903c8",
     "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": 1607.5,
-    "y": 1025.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1612.5,
+    "y": 1038.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "e277ffaa.d760f"
+        "dc18349.f485ec8"
       ]
     ]
   },
   {
-    "id": "f5993a9c.9252b",
+    "id": "5b9e96bc.f4818",
     "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": 1600.5,
-    "y": 1083.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1605.5,
+    "y": 1096.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "77a12f7f.4e9878"
+        "a2803a12.7713d8"
       ]
     ]
   },
   {
-    "id": "dc6166fe.43d058",
+    "id": "ec98c6d8.1a97c",
     "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": 1601.5,
-    "y": 1143.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1606.5,
+    "y": 1156.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "cee26b03.9d9c08"
+        "596f6089.d1edf8"
       ]
     ]
   },
   {
-    "id": "596289d7.f6ddc8",
+    "id": "2e62b281.5fb4be",
     "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": 1595.5,
-    "y": 1329.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1600.5,
+    "y": 1342.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "16e14c45.8f7a9c"
+        "6e2cd8be.f3048"
       ]
     ]
   },
   {
-    "id": "ff3cab94.0ba1d",
+    "id": "aedad5e0.0eea1",
     "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": 1601.5,
-    "y": 1380.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1606.5,
+    "y": 1393.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "c5269182.01e42"
+        "d0f887af.29671"
       ]
     ]
   },
   {
-    "id": "10aaaff3.858108",
+    "id": "c0968178.a081f",
     "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": 1568.5,
-    "y": 1471.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1573.5,
+    "y": 1484.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "f174a3e.2e99c6"
+        "82ff06f7.d0d528"
       ]
     ]
   },
   {
-    "id": "68b9f582.2430d4",
+    "id": "a64e4877.40f2a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1773.5,
-    "y": 139.99996948242188,
-    "z": "4d931804.43f9f",
+    "x": 1778.5,
+    "y": 152.99996948242188,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "8b63a167.2125c8"
+        "da8c11e9.9cbec8"
       ]
     ]
   },
   {
-    "id": "5cda61be.c753d8",
+    "id": "9ba6f7b3.df8438",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1779.5,
-    "y": 192.99996948242188,
-    "z": "4d931804.43f9f",
+    "x": 1784.5,
+    "y": 205.99996948242188,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "97ed26f3.136da8"
+        "ccc7b6d7.c058c8"
       ]
     ]
   },
   {
-    "id": "d7b076fd.372c4",
+    "id": "3fe3c429.54f524",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1788.5,
-    "y": 254.99996948242188,
-    "z": "4d931804.43f9f",
+    "x": 1793.5,
+    "y": 267.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "9b2f5bce.e2493"
+        "e5bd3aa8.87da7"
       ]
     ]
   },
   {
-    "id": "5b648810.dd844",
+    "id": "4b788419.283d84",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1786.5,
-    "y": 317.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1791.5,
+    "y": 330.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "ca017dc5.e6b6a"
+        "bd7f255d.5699f"
       ]
     ]
   },
   {
-    "id": "d0d57f1c.8c8bf8",
+    "id": "df5a50d3.c67ae",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1791.5,
-    "y": 379.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1796.5,
+    "y": 392.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "7a5a1e9.b76ff6"
+        "f25f5.2f7afa0c"
       ]
     ]
   },
   {
-    "id": "6e174e25.5f3d78",
+    "id": "8824fdd5.acc64",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1783.5,
-    "y": 437.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1788.5,
+    "y": 450.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "9b74f8ad.ece11"
+        "901b9d66.12536"
       ]
     ]
   },
   {
-    "id": "ebb8fa90.99fc4",
+    "id": "11f03ae0.763e8d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1784.5,
-    "y": 500.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1789.5,
+    "y": 513.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "de03ade1.de45c8"
+        "95a707d1.9e9078"
       ]
     ]
   },
   {
-    "id": "52d74051.7b6e58",
+    "id": "62aa94da.25d62c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1783.5,
-    "y": 569.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1788.5,
+    "y": 582.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "7788fc94.c4a214"
+        "3501cf57.589d68"
       ]
     ]
   },
   {
-    "id": "9ef12bf7.50569",
+    "id": "a020360c.e4bb5",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1780.5,
-    "y": 637.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1785.5,
+    "y": 650.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "cc439e5e.959be"
+        "c6cf31c5.5d1aa"
       ]
     ]
   },
   {
-    "id": "62d558d2.f880e8",
+    "id": "8fc6e5e2.e24288",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1779.5,
-    "y": 701.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1784.5,
+    "y": 714.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "7f607ee6.048328"
+        "6265cd27.81f2dc"
       ]
     ]
   },
   {
-    "id": "bf3182f6.a9ab1",
+    "id": "e82a870c.b39b28",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1752.5,
-    "y": 759.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1757.5,
+    "y": 772.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "82ba67e9.3e3948"
+        "6e17c55d.2a19a4"
       ]
     ]
   },
   {
-    "id": "f2b94cc1.85afb",
+    "id": "47898e68.b0462",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1754.5,
-    "y": 816.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1759.5,
+    "y": 829.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "78aa250c.4c86dc"
+        "7924cc2a.35fc2c"
       ]
     ]
   },
   {
-    "id": "acf4ab48.24e14",
+    "id": "eaea8bad.5cf788",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1790.5,
-    "y": 867.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1795.5,
+    "y": 880.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "fed7f529.21c158"
+        "3e869a26.2e7586"
       ]
     ]
   },
   {
-    "id": "d9b315dd.3141e",
+    "id": "54e08fc1.717778",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1795.5,
-    "y": 930.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1800.5,
+    "y": 943.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "1e28306.dccb65"
+        "9886630f.778418"
       ]
     ]
   },
   {
-    "id": "cf0b48ac.5ee088",
+    "id": "c485c539.43b58",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1791.5,
-    "y": 979.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1796.5,
+    "y": 992.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "7587d056.b8eff8"
+        "78c58e8a.23d18"
       ]
     ]
   },
   {
-    "id": "e277ffaa.d760f",
+    "id": "dc18349.f485ec8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1775.5,
-    "y": 1028.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1780.5,
+    "y": 1041.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "ec48bf2e.e56588"
+        "69f6023e.41e15c"
       ]
     ]
   },
   {
-    "id": "77a12f7f.4e9878",
+    "id": "a2803a12.7713d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1772.5,
-    "y": 1081.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1777.5,
+    "y": 1094.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "a9616742.2a0ca"
+        "2df41f91.eb242"
       ]
     ]
   },
   {
-    "id": "cee26b03.9d9c08",
+    "id": "596f6089.d1edf8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1785.5,
-    "y": 1140.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1790.5,
+    "y": 1153.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "65101682.4139e"
+        "e6263a0e.005cf8"
       ]
     ]
   },
   {
-    "id": "16e14c45.8f7a9c",
+    "id": "6e2cd8be.f3048",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1803.5,
-    "y": 1326.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1808.5,
+    "y": 1339.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "5a2356b9.ace14"
+        "84d5b1db.9b60d8"
       ]
     ]
   },
   {
-    "id": "c5269182.01e42",
+    "id": "d0f887af.29671",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1810.5,
-    "y": 1376.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1815.5,
+    "y": 1389.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "35f9d54c.a32492"
+        "a8af002f.68a168"
       ]
     ]
   },
   {
-    "id": "f174a3e.2e99c6",
+    "id": "82ff06f7.d0d528",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1772.5,
-    "y": 1480.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1777.5,
+    "y": 1493.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "7b317e34.63e888"
+        "849d8b1.9052178"
       ]
     ]
   },
   {
-    "id": "8b63a167.2125c8",
+    "id": "da8c11e9.9cbec8",
     "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": 1968.5,
-    "y": 140.99996948242188,
-    "z": "4d931804.43f9f",
+    "x": 1973.5,
+    "y": 153.99996948242188,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "97ed26f3.136da8",
+    "id": "ccc7b6d7.c058c8",
     "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": 1958.5,
-    "y": 194.99996948242188,
-    "z": "4d931804.43f9f",
+    "x": 1963.5,
+    "y": 207.99996948242188,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "9b2f5bce.e2493",
+    "id": "e5bd3aa8.87da7",
     "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": 1962.5,
-    "y": 251.99996948242188,
-    "z": "4d931804.43f9f",
+    "x": 1967.5,
+    "y": 264.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "ca017dc5.e6b6a",
+    "id": "bd7f255d.5699f",
     "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": 1965.5,
-    "y": 310.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1970.5,
+    "y": 323.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "7a5a1e9.b76ff6",
+    "id": "f25f5.2f7afa0c",
     "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": 1973.5,
-    "y": 372.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1978.5,
+    "y": 385.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "9b74f8ad.ece11",
+    "id": "901b9d66.12536",
     "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": 1965.5,
-    "y": 432.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1970.5,
+    "y": 445.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "de03ade1.de45c8",
+    "id": "95a707d1.9e9078",
     "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": 1962.5,
-    "y": 492.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1967.5,
+    "y": 505.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "7788fc94.c4a214",
+    "id": "3501cf57.589d68",
     "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": 1958.5,
-    "y": 563.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1963.5,
+    "y": 576.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "cc439e5e.959be",
+    "id": "c6cf31c5.5d1aa",
     "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": 1951.5,
-    "y": 629.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1956.5,
+    "y": 642.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "7f607ee6.048328",
+    "id": "6265cd27.81f2dc",
     "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": 1954.5,
-    "y": 696.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1959.5,
+    "y": 709.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "82ba67e9.3e3948",
+    "id": "6e17c55d.2a19a4",
     "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": 1930.5,
-    "y": 762.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1935.5,
+    "y": 775.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "78aa250c.4c86dc",
+    "id": "7924cc2a.35fc2c",
     "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": 1934.5,
-    "y": 816.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1939.5,
+    "y": 829.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "fed7f529.21c158",
+    "id": "3e869a26.2e7586",
     "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": 1982.5,
-    "y": 871.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1987.5,
+    "y": 884.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "1e28306.dccb65",
+    "id": "9886630f.778418",
     "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": 1978.5,
-    "y": 926.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1983.5,
+    "y": 939.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "7587d056.b8eff8",
+    "id": "78c58e8a.23d18",
     "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": 1972.5,
-    "y": 981.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1977.5,
+    "y": 994.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "ec48bf2e.e56588",
+    "id": "69f6023e.41e15c",
     "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": 1969.5,
-    "y": 1034.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1974.5,
+    "y": 1047.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "a9616742.2a0ca",
+    "id": "2df41f91.eb242",
     "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": 1967.5,
-    "y": 1091.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1972.5,
+    "y": 1104.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "65101682.4139e",
+    "id": "e6263a0e.005cf8",
     "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": 1976.5,
-    "y": 1143.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1981.5,
+    "y": 1156.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "5a2356b9.ace14",
+    "id": "84d5b1db.9b60d8",
     "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": 2070.5,
-    "y": 1347.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 2075.5,
+    "y": 1360.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "35f9d54c.a32492",
+    "id": "a8af002f.68a168",
     "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": 2082.5,
-    "y": 1396.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 2087.5,
+    "y": 1409.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "7b317e34.63e888",
+    "id": "849d8b1.9052178",
     "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": 1966.5,
-    "y": 1490.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1971.5,
+    "y": 1503.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "b2d33596.d59c1",
+    "id": "38000c67.90cd64",
     "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=\"peer2-ip\" value=\"`$prop.l3vpn.peer2-ip`\"/>\n<parameter name=\"ac2_protocol_bgp_as\" value=\"`$prop.l3vpn.ac2_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",
+    "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": 717,
-    "y": 982,
-    "z": "4d931804.43f9f",
+    "x": 722,
+    "y": 995,
+    "z": "afcbb687.85236",
     "wires": [
       []
     ]
   },
   {
-    "id": "c00ac3fa.32f9e",
+    "id": "496a2fd4.025b58",
     "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": 698,
-    "y": 1128,
-    "z": "4d931804.43f9f",
+    "x": 703,
+    "y": 1141,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "c698b222.502b88",
-        "db8a34f.58a0b48",
-        "56357348.8f579c"
+        "42648755.1a8ba8",
+        "902f9c3b.315d",
+        "a37f7e10.357a9"
       ]
     ]
   },
   {
-    "id": "c698b222.502b88",
+    "id": "42648755.1a8ba8",
     "type": "outcomeTrue",
     "name": "l3vpn-ipwan",
     "xml": "<outcome value='l3vpn-ipwan'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 684,
-    "y": 1053,
-    "z": "4d931804.43f9f",
+    "x": 689,
+    "y": 1066,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "2087b578.62417a"
+        "490fa182.d51e38"
       ]
     ]
   },
   {
-    "id": "db8a34f.58a0b48",
+    "id": "902f9c3b.315d",
     "type": "outcomeTrue",
     "name": "l3vpn-sptn",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 840,
-    "y": 1196.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 845,
+    "y": 1209.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "771a98af.5ed45"
+        "2bd25145.a5e5d6"
       ]
     ]
   },
   {
-    "id": "56357348.8f579c",
+    "id": "a37f7e10.357a9",
     "type": "outcomeTrue",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 838,
-    "y": 1275.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 843,
+    "y": 1288.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "6d9cbcbd.3f88e4"
+        "33c3396f.7705ae"
       ]
     ]
   },
   {
-    "id": "6d9cbcbd.3f88e4",
+    "id": "33c3396f.7705ae",
     "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": 1021,
-    "y": 1274.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1026,
+    "y": 1287.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "3cc192be.0780ae",
+    "id": "7637caf4.d6c8f4",
     "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": 806,
-    "y": 505.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 811,
+    "y": 518.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "302083c7.ac3dac"
+        "79569ec3.085fc8"
       ]
     ]
   },
   {
-    "id": "302083c7.ac3dac",
+    "id": "79569ec3.085fc8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1031,
-    "y": 508.99993896484375,
-    "z": "4d931804.43f9f",
+    "x": 1036,
+    "y": 521.9999389648438,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "54073616.bf22b8"
+        "7d3a2bea.3c871c"
       ]
     ]
   },
   {
-    "id": "54073616.bf22b8",
+    "id": "7d3a2bea.3c871c",
     "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": 1212,
-    "y": 506.99993896484375,
-    "z": "4d931804.43f9f",
+    "x": 1217,
+    "y": 519.9999389648438,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "74f090f.f41e0f",
+    "id": "a2fb9e2f.a93ff8",
     "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": 792,
-    "y": 553.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 797,
+    "y": 566.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "b8ee366a.f0394",
+    "id": "f9dfb478.509fa",
     "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": 2196,
-    "y": 1203.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 2201,
+    "y": 1216.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "ddb4705.fd9691",
-        "68d6fb06.f03804"
+        "b38bd339.2df29",
+        "1e11b04b.0ff178"
       ]
     ]
   },
   {
-    "id": "18c39015.325968",
+    "id": "6df47e7a.007368",
     "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": 1597,
-    "y": 1251.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1602,
+    "y": 1264.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "3ccf3bc3.3e11b4"
+        "ee5731bf.7a59"
       ]
     ]
   },
   {
-    "id": "1a3c9b5d.13700d",
+    "id": "b0b0d932.2b92c",
     "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": 1598,
-    "y": 1202.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1603,
+    "y": 1215.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "2acb832d.497074"
+        "8155aba.b3b4b58"
       ]
     ]
   },
   {
-    "id": "2acb832d.497074",
+    "id": "8155aba.b3b4b58",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1770,
-    "y": 1200.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1775,
+    "y": 1213.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "7a26ed2f.516504"
+        "416ea37c.b615f4"
       ]
     ]
   },
   {
-    "id": "3ccf3bc3.3e11b4",
+    "id": "ee5731bf.7a59",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1783,
-    "y": 1259.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1788,
+    "y": 1272.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "7a2c30da.6c0ff8"
+        "8a2c10ff.716378"
       ]
     ]
   },
   {
-    "id": "e6f43c15.04d7d8",
+    "id": "ab97d7c6.69d6c8",
     "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": 2167,
-    "y": 1151.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 2172,
+    "y": 1164.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "d68e6b1e.3b7a88",
+    "id": "9bb53e2e.efe8e8",
     "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": 2165,
-    "y": 1251.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 2170,
+    "y": 1264.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "e330304a.7683b8",
+    "id": "35d0769.4fc008a",
     "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": 2189,
-    "y": 1296.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 2194,
+    "y": 1309.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "74434b75.2c92cc",
-        "15dee51f.f19993"
+        "7c6566d5.b2a9b",
+        "90dfb534.cb1ad8"
       ]
     ]
   },
   {
-    "id": "7a26ed2f.516504",
+    "id": "416ea37c.b615f4",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1921,
-    "y": 1200.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1926,
+    "y": 1213.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "e6f43c15.04d7d8",
-        "b8ee366a.f0394"
+        "ab97d7c6.69d6c8",
+        "f9dfb478.509fa"
       ]
     ]
   },
   {
-    "id": "7a2c30da.6c0ff8",
+    "id": "8a2c10ff.716378",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1922,
-    "y": 1259.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1927,
+    "y": 1272.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "d68e6b1e.3b7a88",
-        "e330304a.7683b8"
+        "9bb53e2e.efe8e8",
+        "35d0769.4fc008a"
       ]
     ]
   },
   {
-    "id": "54853363.a6cb2c",
+    "id": "fb6e4c2e.3cc6e8",
     "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": 791,
-    "y": 607,
-    "z": "4d931804.43f9f",
+    "x": 796,
+    "y": 620,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "9116d057.5fc3b8"
+        "6687816c.51c6a"
       ]
     ]
   },
   {
-    "id": "5411c45f.3ab70c",
+    "id": "f086eb6d.36e988",
     "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": 788.3333740234375,
-    "y": 664.333251953125,
-    "z": "4d931804.43f9f",
+    "x": 793.3333740234375,
+    "y": 677.333251953125,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "b4142046.58a198"
+        "ef8aa3a.49722e"
       ]
     ]
   },
   {
-    "id": "b4142046.58a198",
+    "id": "ef8aa3a.49722e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1038.3333740234375,
-    "y": 670.333251953125,
-    "z": "4d931804.43f9f",
+    "x": 1043.3333740234375,
+    "y": 683.333251953125,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "bc6dd7fc.1f785"
+        "7888c7c1.9e6b28"
       ]
     ]
   },
   {
-    "id": "9116d057.5fc3b8",
+    "id": "6687816c.51c6a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1038,
-    "y": 611.9999389648438,
-    "z": "4d931804.43f9f",
+    "x": 1043,
+    "y": 624.9999389648438,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "180eaafe.c7ddcd"
+        "75199177.ec8fa"
       ]
     ]
   },
   {
-    "id": "180eaafe.c7ddcd",
+    "id": "75199177.ec8fa",
     "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": 1219,
-    "y": 609.9999389648438,
-    "z": "4d931804.43f9f",
+    "x": 1224,
+    "y": 622.9999389648438,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "bc6dd7fc.1f785",
+    "id": "7888c7c1.9e6b28",
     "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": 1219.3333740234375,
-    "y": 668.333251953125,
-    "z": "4d931804.43f9f",
+    "x": 1224.3333740234375,
+    "y": 681.333251953125,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "2087b578.62417a",
+    "id": "490fa182.d51e38",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 863,
-    "y": 1053,
-    "z": "4d931804.43f9f",
+    "x": 868,
+    "y": 1066,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "8c395a0a.a246c8",
-        "684d1f56.45dbc",
-        "b745c53.90938b8"
+        "f1c4e62c.acf5f",
+        "edbfaa69.4481f",
+        "660c6e65.05f44"
       ]
     ]
   },
   {
-    "id": "684d1f56.45dbc",
+    "id": "edbfaa69.4481f",
     "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 +'/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": 1169,
-    "y": 1048.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1174,
+    "y": 1061.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       []
     ]
   },
   {
-    "id": "b745c53.90938b8",
+    "id": "660c6e65.05f44",
     "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 +'/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,
-    "y": 1119.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 1172,
+    "y": 1132.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       []
     ]
   },
   {
-    "id": "ddb4705.fd9691",
+    "id": "b38bd339.2df29",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2414,
-    "y": 1195.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 2419,
+    "y": 1208.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "f772d637.96bc1"
+        "91359bf2.ca7a7"
       ]
     ]
   },
   {
-    "id": "f772d637.96bc1",
+    "id": "91359bf2.ca7a7",
     "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": 2595,
-    "y": 1193.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 2600,
+    "y": 1206.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "74434b75.2c92cc",
+    "id": "7c6566d5.b2a9b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2412,
-    "y": 1297.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 2417,
+    "y": 1310.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "96d44573.8b1e"
+        "f6d0c6a9.1391a8"
       ]
     ]
   },
   {
-    "id": "96d44573.8b1e",
+    "id": "f6d0c6a9.1391a8",
     "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": 2593,
-    "y": 1295.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 2598,
+    "y": 1308.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "68d6fb06.f03804",
+    "id": "1e11b04b.0ff178",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2413,
-    "y": 1129.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 2418,
+    "y": 1142.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "1ff92161.8fff2f"
+        "55f4fd6f.ed453c"
       ]
     ]
   },
   {
-    "id": "15dee51f.f19993",
+    "id": "90dfb534.cb1ad8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2409,
-    "y": 1249.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 2414,
+    "y": 1262.9999694824219,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "7cd46973.7a534"
+        "58f0e3b1.633ccc"
       ]
     ]
   },
   {
-    "id": "1ff92161.8fff2f",
+    "id": "55f4fd6f.ed453c",
     "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": 2620,
-    "y": 1123.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 2625,
+    "y": 1136.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "7cd46973.7a534",
+    "id": "58f0e3b1.633ccc",
     "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": 2620,
-    "y": 1242.9999694824219,
-    "z": "4d931804.43f9f",
+    "x": 2625,
+    "y": 1255.9999694824219,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "af24f51b.e33eb",
+    "id": "fb5a457c.e3d938",
     "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": 847,
-    "y": 758,
-    "z": "4d931804.43f9f",
+    "x": 852,
+    "y": 771,
+    "z": "afcbb687.85236",
     "wires": [
       []
     ]
   },
   {
-    "id": "98d8796c.a3bbc",
+    "id": "7b0c7c0c.cadfec",
     "type": "switchNode",
     "name": "switch service-data.networks_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 805,
-    "y": 839,
-    "z": "4d931804.43f9f",
+    "x": 810,
+    "y": 852,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "6ea3b109.b3364",
-        "5169eb5.4d74c94"
+        "3f9ab1b0.ebe9de",
+        "3e9e6437.52d94c"
       ]
     ]
   },
   {
-    "id": "6ea3b109.b3364",
+    "id": "3f9ab1b0.ebe9de",
     "type": "other",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1078.8095703125,
-    "y": 807.952392578125,
-    "z": "4d931804.43f9f",
+    "x": 1083.8095703125,
+    "y": 820.952392578125,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "19b6c967.f095e7"
+        "29d18753.fcaf7"
       ]
     ]
   },
   {
-    "id": "5169eb5.4d74c94",
+    "id": "3e9e6437.52d94c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1073.666748046875,
-    "y": 853.6666870117188,
-    "z": "4d931804.43f9f",
+    "x": 1078.666748046875,
+    "y": 866.6666870117188,
+    "z": "afcbb687.85236",
     "wires": [
       [
-        "ea699e67.4bd718"
+        "81dbeda3.9b8ed8"
       ]
     ]
   },
   {
-    "id": "19b6c967.f095e7",
+    "id": "29d18753.fcaf7",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='0' />\n",
     "comments": "",
-    "x": 1231.8095703125,
-    "y": 807.5238037109375,
-    "z": "4d931804.43f9f",
+    "x": 1236.8095703125,
+    "y": 820.5238037109375,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "ea699e67.4bd718",
+    "id": "81dbeda3.9b8ed8",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
     "comments": "",
-    "x": 1233.2381591796875,
-    "y": 852.5238647460938,
-    "z": "4d931804.43f9f",
+    "x": 1238.2381591796875,
+    "y": 865.5238647460938,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "64964558.e55ee4",
+    "id": "aec2b21c.351b48",
     "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": 787,
-    "y": 902,
-    "z": "4d931804.43f9f",
+    "x": 792,
+    "y": 915,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "8ea2eceb.3de538",
+    "id": "fd85e187.c7dde",
     "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": 771,
-    "y": 1332,
-    "z": "4d931804.43f9f",
+    "x": 776,
+    "y": 1345,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "da8e6fe4.5c07a8",
+    "id": "4308a2c5.6e7bac",
     "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": 686,
-    "y": 1457,
-    "z": "4d931804.43f9f",
+    "x": 691,
+    "y": 1470,
+    "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "51c60b4c.2a6944",
+    "id": "8381990.da591e8",
     "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": 743,
-    "y": 1391,
-    "z": "4d931804.43f9f",
+    "x": 748,
+    "y": 1404,
+    "z": "afcbb687.85236",
     "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 695f6f30..109b3113 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,1132 +1,1102 @@
 [
   {
-    "id":"876e190d.c525e8",
-    "type":"dgstart",
-    "name":"DGSTART",
-    "outputs":1,
-    "x":102.66666412353516,
-    "y":113.04766654968262,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "faa0ffba.e89d8",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 85,
+    "y": 113.04766654968262,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "b93e38a6.cd8608"
+        "b95f4940.66cc78"
       ]
     ]
   },
   {
-    "id":"b93e38a6.cd8608",
-    "type":"service-logic",
-    "name":"GENERIC-RESOURCE-API ${project.version}",
-    "module":"GENERIC-RESOURCE-API",
-    "version":"${project.version}",
-    "comments":"",
-    "xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
-    "outputs":1,
-    "x":347.95237731933594,
-    "y":112.28574562072754,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "b95f4940.66cc78",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "${project.version}",
+    "comments": "",
+    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+    "outputs": 1,
+    "x": 330.2857131958008,
+    "y": 112.28574562072754,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "fbd1bd91.34b78"
+        "db8880e7.399138"
       ]
     ]
   },
   {
-    "id":"fbd1bd91.34b78",
-    "type":"method",
-    "name":"method validate-network-input-parameters",
-    "xml":"<method rpc='validate-network-input-parameters' mode='sync'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":305.5833511352539,
-    "y":187.30068397521973,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "db8880e7.399138",
+    "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",
+    "wires": [
       [
-        "6b5c5bc8.7d32d4"
+        "c2bcbabd.ce8158"
       ]
     ]
   },
   {
-    "id":"6b5c5bc8.7d32d4",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":589.5833587646484,
-    "y":175.30070877075195,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "c2bcbabd.ce8158",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 571.9166946411133,
+    "y": 175.30070877075195,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "fa0b7905.76ead8",
-        "b76add98.9e1be"
+        "7723f6f5.70d16",
+        "23bb4d68.1d6aca"
       ]
     ]
   },
   {
-    "id":"fa0b7905.76ead8",
-    "type":"switchNode",
-    "name":"switch  svc-action",
-    "xml":"<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":870.5833587646484,
-    "y":170.3006944656372,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "7723f6f5.70d16",
+    "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",
+    "wires": [
       [
-        "5c424a89.e26674"
+        "847bfdf7.dfd188"
       ]
     ]
   },
   {
-    "id":"5c424a89.e26674",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":1061.2976608276367,
-    "y":171.30069541931152,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "847bfdf7.dfd188",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1043.6309967041016,
+    "y": 171.30069541931152,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "47b80c53.4ff5d4"
+        "a76f46ec.4caa98"
       ]
     ]
   },
   {
-    "id":"47b80c53.4ff5d4",
-    "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":1235.7262115478516,
-    "y":170.300687789917,
-    "z":"6ce0e277.83694c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"b76add98.9e1be",
-    "type":"switchNode",
-    "name":"switch svc-action",
-    "xml":"<switch test='`$service-topology-operation-input.sdnc-request-header.svc-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":171.58330535888672,
-    "y":446.30070877075195,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "a76f46ec.4caa98",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "23bb4d68.1d6aca",
+    "type": "switchNode",
+    "name": "switch svc-action",
+    "xml": "<switch test='`$service-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 153.91664123535156,
+    "y": 446.30070877075195,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "9f1d13e8.82e5",
-        "35c209ea.ec9956",
-        "bc476f2b.e9662",
-        "a4e386cc.9d4fe8",
-        "3750fd7a.51d192"
+        "2a23b50.62488cc",
+        "ffd34193.404aa",
+        "fc4b5571.bad3e",
+        "3670d91f.b7e116",
+        "823b7913.83e82"
       ]
     ]
   },
   {
-    "id":"9f1d13e8.82e5",
-    "type":"outcome",
-    "name":"create",
-    "xml":"<outcome value='create'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":373.08338928222656,
-    "y":446.30070877075195,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "2a23b50.62488cc",
+    "type": "outcome",
+    "name": "create",
+    "xml": "<outcome value='create'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 355.4167251586914,
+    "y": 446.30070877075195,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "229d8b8e.ad42f4"
+        "35a22a62.927db6"
       ]
     ]
   },
   {
-    "id":"229d8b8e.ad42f4",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":539.0833969116211,
-    "y":446.30070877075195,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "35a22a62.927db6",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 521.4167327880859,
+    "y": 446.30070877075195,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "87553fdd.439b4"
+        "84b1bafe.d753c8"
       ]
     ]
   },
   {
-    "id":"31212153.05a14e",
-    "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",
-    "comments":"",
-    "outputs":1,
-    "x":1738.2975387573242,
-    "y":110.01497840881348,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "c761568c.03f0a",
+    "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",
+    "comments": "",
+    "outputs": 1,
+    "x": 1720.630874633789,
+    "y": 110.01497840881348,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "f4b30b58.428408"
+        "6bbe7ccf.21c664"
       ]
     ]
   },
   {
-    "id":"673a19c8.c4f588",
-    "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$tmp.value`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2591.8688888549805,
-    "y":364.01495361328125,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "80903373.40bd",
+    "type": "switchNode",
+    "name": "switch value",
+    "xml": "<switch test=\"`$tmp.value`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2574.2022247314453,
+    "y": 364.01495361328125,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "e672b71c.729478"
+        "7dc03e79.e30648"
       ]
     ]
   },
   {
-    "id":"e672b71c.729478",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":2808.8688621520996,
-    "y":363.01495933532715,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "7dc03e79.e30648",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2791.2021980285645,
+    "y": 363.01495933532715,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "9880ef3.46a7f1"
+        "4449f580.7eb1b4"
       ]
     ]
   },
   {
-    "id":"9880ef3.46a7f1",
-    "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":2987.297576904297,
-    "y":364.01495933532715,
-    "z":"6ce0e277.83694c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"35c209ea.ec9956",
-    "type":"outcome",
-    "name":"deactivate",
-    "xml":"<outcome value='deactivate'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":375.38094329833984,
-    "y":604.4762363433838,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "4449f580.7eb1b4",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "ffd34193.404aa",
+    "type": "outcome",
+    "name": "deactivate",
+    "xml": "<outcome value='deactivate'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 357.7142791748047,
+    "y": 604.4762363433838,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "cb8ed99f.c4ede8"
+        "7ef0cfae.a9d9c"
       ]
     ]
   },
   {
-    "id":"bc476f2b.e9662",
-    "type":"outcome",
-    "name":"delete",
-    "xml":"<outcome value='delete'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":379.0953254699707,
-    "y":775.1907939910889,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "fc4b5571.bad3e",
+    "type": "outcome",
+    "name": "delete",
+    "xml": "<outcome value='delete'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 361.42866134643555,
+    "y": 775.1907939910889,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "1a9b73a8.0cf75c"
+        "e0263cc1.d96968"
       ]
     ]
   },
   {
-    "id":"a4e386cc.9d4fe8",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":376.85720443725586,
-    "y":729.619062423706,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "3670d91f.b7e116",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 359.1905403137207,
+    "y": 729.619062423706,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "5e5bc4fc.5288dc"
+        "1187da8e.1e68e5"
       ]
     ]
   },
   {
-    "id":"5e5bc4fc.5288dc",
-    "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":530.4287796020508,
-    "y":732.2382063865662,
-    "z":"6ce0e277.83694c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"f4b30b58.428408",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1616.3809127807617,
-    "y":256.761926651001,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "1187da8e.1e68e5",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "6bbe7ccf.21c664",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1598.7142486572266,
+    "y": 256.761926651001,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "e47573a1.6ba18",
-        "26ac63ef.a9427c",
-        "71e6ba60.1db544"
+        "9a78d49c.5c6c48",
+        "4d7afbb9.93f474",
+        "e49aca1a.0651b8"
       ]
     ]
   },
   {
-    "id":"87553fdd.439b4",
-    "type":"switchNode",
-    "name":"switch request-action",
-    "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":864.6666793823242,
-    "y":335.7143363952637,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "84b1bafe.d753c8",
+    "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",
+    "wires": [
       [
-        "39a5f2c0.1dc56e",
-        "88f987b2.ec07e8"
+        "b2571e45.c855e8",
+        "ac398ddc.f05998"
       ]
     ]
   },
   {
-    "id":"39a5f2c0.1dc56e",
-    "type":"other",
-    "name":"CreateNetworkInstance",
-    "xml":"<outcome value='CreateNetworkInstance'>",
-    "comments":"",
-    "outputs":1,
-    "x":1130.6666793823242,
-    "y":294.7143363952637,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "b2571e45.c855e8",
+    "type": "other",
+    "name": "CreateNetworkInstance",
+    "xml": "<outcome value='CreateNetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1113.000015258789,
+    "y": 294.7143363952637,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "c169b655.0cf8b8"
+        "8b60af63.0db818"
       ]
     ]
   },
   {
-    "id":"88f987b2.ec07e8",
-    "type":"other",
-    "name":"Other",
-    "xml":"<outcome value='Other'>",
-    "comments":"",
-    "outputs":1,
-    "x":1084.6666793823242,
-    "y":344.7143363952637,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "ac398ddc.f05998",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1067.000015258789,
+    "y": 344.7143363952637,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "8ba2158c.eefe38"
+        "e121de21.0ffe78"
       ]
     ]
   },
   {
-    "id":"8ba2158c.eefe38",
-    "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":1253.6666793823242,
-    "y":344.7143363952637,
-    "z":"6ce0e277.83694c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"c169b655.0cf8b8",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":1355.6666793823242,
-    "y":283.7143363952637,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "e121de21.0ffe78",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "8b60af63.0db818",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1338.000015258789,
+    "y": 283.7143363952637,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "31212153.05a14e"
+        "c761568c.03f0a"
       ]
     ]
   },
   {
-    "id":"e47573a1.6ba18",
-    "type":"set",
-    "name":"clear tmp-data",
-    "xml":"<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n",
-    "comments":"",
-    "x":1808.380973815918,
-    "y":211.00002479553223,
-    "z":"6ce0e277.83694c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"26ac63ef.a9427c",
-    "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",
-    "comments":"",
-    "x":1797.380973815918,
-    "y":301.0000247955322,
-    "z":"6ce0e277.83694c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"71e6ba60.1db544",
-    "type":"switchNode",
-    "name":"switch name",
-    "xml":"<switch test=\"'$tmp.name'\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1776.380973815918,
-    "y":395.0000247955322,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "9a78d49c.5c6c48",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "4d7afbb9.93f474",
+    "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",
+    "comments": "",
+    "x": 1779.7143096923828,
+    "y": 301.0000247955322,
+    "z": "d98986ab.861428",
+    "wires": []
+  },
+  {
+    "id": "e49aca1a.0651b8",
+    "type": "switchNode",
+    "name": "switch name",
+    "xml": "<switch test=\"'$tmp.name'\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1758.7143096923828,
+    "y": 395.0000247955322,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "680083b4.4ec03c",
-        "52ae21e2.cbfde",
-        "eb52f0cc.707a2",
-        "729b727c.e783bc",
-        "a11ee971.636938",
-        "847e975f.c4e778",
-        "9c556409.b9d588",
-        "92551891.abca18",
-        "43e55944.571388",
-        "bffd97c2.c0d0d8",
-        "53c77b44.d42e04",
-        "5b52d96e.83c168",
-        "12245816.6f2ce8",
-        "10b6ad91.e93502",
-        "311da7df.56b808",
-        "5e98d17a.e9af5",
-        "ae2e4af6.5db478"
+        "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"
       ]
     ]
   },
   {
-    "id":"680083b4.4ec03c",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":2315.952262878418,
-    "y":898,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "41e3528.04abc2c",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2298.285598754883,
+    "y": 898,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "cc20162b.8f5aa8"
+        "1b8d374a.29cc89"
       ]
     ]
   },
   {
-    "id":"cc20162b.8f5aa8",
-    "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":2490.952262878418,
-    "y":897,
-    "z":"6ce0e277.83694c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"52ae21e2.cbfde",
-    "type":"other",
-    "name":"name",
-    "xml":"<outcome value='name'>",
-    "comments":"",
-    "outputs":1,
-    "x":2292.952262878418,
-    "y":20,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "1b8d374a.29cc89",
+    "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": 2473.285598754883,
+    "y": 897,
+    "z": "d98986ab.861428",
+    "wires": []
+  },
+  {
+    "id": "6ac01d8a.f6a7fc",
+    "type": "other",
+    "name": "name",
+    "xml": "<outcome value='name'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2275.285598754883,
+    "y": 20,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "673a19c8.c4f588"
+        "80903373.40bd"
       ]
     ]
   },
   {
-    "id":"eb52f0cc.707a2",
-    "type":"other",
-    "name":"service-type",
-    "xml":"<outcome value='service-type'>",
-    "comments":"",
-    "outputs":1,
-    "x":2295.952262878418,
-    "y":87,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "f26849c8.b296e",
+    "type": "other",
+    "name": "service-type",
+    "xml": "<outcome value='service-type'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2278.285598754883,
+    "y": 87,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "673a19c8.c4f588"
+        "80903373.40bd"
       ]
     ]
   },
   {
-    "id":"9c556409.b9d588",
-    "type":"other",
-    "name":"sna2_name",
-    "xml":"<outcome value='sna2_name'>",
-    "comments":"",
-    "outputs":1,
-    "x":2299.952262878418,
-    "y":316,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "c927ca6e.4041d8",
+    "type": "other",
+    "name": "sna2_name",
+    "xml": "<outcome value='sna2_name'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2282.285598754883,
+    "y": 316,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "673a19c8.c4f588"
+        "80903373.40bd"
       ]
     ]
   },
   {
-    "id":"729b727c.e783bc",
-    "type":"other",
-    "name":"site1-name",
-    "xml":"<outcome value='site1-name'>",
-    "comments":"",
-    "outputs":1,
-    "x":2296.952262878418,
-    "y":148,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "bb7bcaf4.82d9e8",
+    "type": "other",
+    "name": "site1-name",
+    "xml": "<outcome value='site1-name'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2279.285598754883,
+    "y": 148,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "673a19c8.c4f588"
+        "80903373.40bd"
       ]
     ]
   },
   {
-    "id":"a11ee971.636938",
-    "type":"other",
-    "name":"site2-name",
-    "xml":"<outcome value='site2-name'>",
-    "comments":"",
-    "outputs":1,
-    "x":2292.952262878418,
-    "y":205,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "27adc52c.8ee0d2",
+    "type": "other",
+    "name": "site2-name",
+    "xml": "<outcome value='site2-name'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2275.285598754883,
+    "y": 205,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "673a19c8.c4f588"
+        "80903373.40bd"
       ]
     ]
   },
   {
-    "id":"847e975f.c4e778",
-    "type":"other",
-    "name":"sna1_name",
-    "xml":"<outcome value='sna1_name'>",
-    "comments":"",
-    "outputs":1,
-    "x":2295.952262878418,
-    "y":262,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "ef56550b.fc6858",
+    "type": "other",
+    "name": "sna1_name",
+    "xml": "<outcome value='sna1_name'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2278.285598754883,
+    "y": 262,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "673a19c8.c4f588"
+        "80903373.40bd"
       ]
     ]
   },
   {
-    "id":"92551891.abca18",
-    "type":"other",
-    "name":"pe1_id",
-    "xml":"<outcome value='pe1_id'>",
-    "comments":"",
-    "outputs":1,
-    "x":2299.952262878418,
-    "y":367,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "510578da.17aeb",
+    "type": "other",
+    "name": "pe1_id",
+    "xml": "<outcome value='pe1_id'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2282.285598754883,
+    "y": 367,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "673a19c8.c4f588"
+        "80903373.40bd"
       ]
     ]
   },
   {
-    "id":"43e55944.571388",
-    "type":"other",
-    "name":"pe2_id",
-    "xml":"<outcome value='pe2_id'>",
-    "comments":"",
-    "outputs":1,
-    "x":2302.952262878418,
-    "y":415,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "d6240771.8bfc8",
+    "type": "other",
+    "name": "pe2_id",
+    "xml": "<outcome value='pe2_id'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2285.285598754883,
+    "y": 415,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "673a19c8.c4f588"
+        "80903373.40bd"
       ]
     ]
   },
   {
-    "id":"bffd97c2.c0d0d8",
-    "type":"other",
-    "name":"ac1-id",
-    "xml":"<outcome value='ac1-id'>",
-    "comments":"",
-    "outputs":1,
-    "x":2307.952262878418,
-    "y":464,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "19bb94a8.8e46bb",
+    "type": "other",
+    "name": "ac1-id",
+    "xml": "<outcome value='ac1-id'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2290.285598754883,
+    "y": 464,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "673a19c8.c4f588"
+        "80903373.40bd"
       ]
     ]
   },
   {
-    "id":"53c77b44.d42e04",
-    "type":"other",
-    "name":"ac2-id",
-    "xml":"<outcome value='ac2-id'>",
-    "comments":"",
-    "outputs":1,
-    "x":2309.952262878418,
-    "y":519,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "7cf56a59.b76d14",
+    "type": "other",
+    "name": "ac2-id",
+    "xml": "<outcome value='ac2-id'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2292.285598754883,
+    "y": 519,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "673a19c8.c4f588"
+        "80903373.40bd"
       ]
     ]
   },
   {
-    "id":"5b52d96e.83c168",
-    "type":"other",
-    "name":"ac1-ip",
-    "xml":"<outcome value='ac1-ip'>",
-    "comments":"",
-    "outputs":1,
-    "x":2309.952262878418,
-    "y":571,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "164ce143.0020d7",
+    "type": "other",
+    "name": "ac1-ip",
+    "xml": "<outcome value='ac1-ip'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2292.285598754883,
+    "y": 571,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "673a19c8.c4f588"
+        "80903373.40bd"
       ]
     ]
   },
   {
-    "id":"12245816.6f2ce8",
-    "type":"other",
-    "name":"ac2-ip",
-    "xml":"<outcome value='ac2-ip'>",
-    "comments":"",
-    "outputs":1,
-    "x":2311.952262878418,
-    "y":632,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "b5cb2d0b.15677",
+    "type": "other",
+    "name": "ac2-ip",
+    "xml": "<outcome value='ac2-ip'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2294.285598754883,
+    "y": 632,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "673a19c8.c4f588"
+        "80903373.40bd"
       ]
     ]
   },
   {
-    "id":"10b6ad91.e93502",
-    "type":"other",
-    "name":"ac1_peer_ip",
-    "xml":"<outcome value='ac1_peer_ip'>",
-    "comments":"",
-    "outputs":1,
-    "x":2313.952262878418,
-    "y":682,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "211400b.5190a8",
+    "type": "other",
+    "name": "ac1_peer_ip",
+    "xml": "<outcome value='ac1_peer_ip'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2296.285598754883,
+    "y": 682,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "673a19c8.c4f588"
+        "80903373.40bd"
       ]
     ]
   },
   {
-    "id":"311da7df.56b808",
-    "type":"other",
-    "name":"ac2_peer_ip",
-    "xml":"<outcome value='ac2_peer_ip'>",
-    "comments":"",
-    "outputs":1,
-    "x":2309.952262878418,
-    "y":730,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "ca0ced45.a76e28",
+    "type": "other",
+    "name": "ac2_peer_ip",
+    "xml": "<outcome value='ac2_peer_ip'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2292.285598754883,
+    "y": 730,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "673a19c8.c4f588"
+        "80903373.40bd"
       ]
     ]
   },
   {
-    "id":"5e98d17a.e9af5",
-    "type":"other",
-    "name":"ac1_svlan",
-    "xml":"<outcome value='ac1_svlan'>",
-    "comments":"",
-    "outputs":1,
-    "x":2311.952262878418,
-    "y":783,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "b3a58592.3d9868",
+    "type": "other",
+    "name": "ac1_svlan",
+    "xml": "<outcome value='ac1_svlan'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2294.285598754883,
+    "y": 783,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "673a19c8.c4f588"
+        "80903373.40bd"
       ]
     ]
   },
   {
-    "id":"ae2e4af6.5db478",
-    "type":"other",
-    "name":"ac2_svlan",
-    "xml":"<outcome value='ac2_svlan'>",
-    "comments":"",
-    "outputs":1,
-    "x":2313.952262878418,
-    "y":844,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "5f626258.048c44",
+    "type": "other",
+    "name": "ac2_svlan",
+    "xml": "<outcome value='ac2_svlan'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2296.285598754883,
+    "y": 844,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "673a19c8.c4f588"
+        "80903373.40bd"
       ]
     ]
   },
   {
-    "id":"1a9b73a8.0cf75c",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":310.23809814453125,
-    "y":856.8572435379028,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "e0263cc1.d96968",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 292.5714340209961,
+    "y": 856.8572435379028,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "9d2b6252.7686e"
+        "283fd358.50e254"
       ]
     ]
   },
   {
-    "id":"a2921cae.f2ac3",
-    "type":"other",
-    "name":"DeleteNetworkInstance",
-    "xml":"<outcome value='DeleteNetworkInstance'>",
-    "comments":"",
-    "outputs":1,
-    "x":776.9523887634277,
-    "y":769.8572072982788,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "145e812a.ac0acf",
+    "type": "other",
+    "name": "DeleteNetworkInstance",
+    "xml": "<outcome value='DeleteNetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 759.2857246398926,
+    "y": 769.8572072982788,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "5219fa84.90d664"
+        "a555e2be.b46fc"
       ]
     ]
   },
   {
-    "id":"444810a.5a640f",
-    "type":"other",
-    "name":"Other",
-    "xml":"<outcome value='Other'>",
-    "comments":"",
-    "outputs":1,
-    "x":836.9523887634277,
-    "y":899.8572072982788,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "92eeaa34.08fe58",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 819.2857246398926,
+    "y": 899.8572072982788,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "975771a8.05f76"
+        "1149d054.e0f5"
       ]
     ]
   },
   {
-    "id":"975771a8.05f76",
-    "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":1023.9523887634277,
-    "y":900.8572072982788,
-    "z":"6ce0e277.83694c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"5219fa84.90d664",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":731.9523887634277,
-    "y":969.8572072982788,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "1149d054.e0f5",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "a555e2be.b46fc",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 714.2857246398926,
+    "y": 969.8572072982788,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "9de6db30.2f5d08",
-        "1e164e5f.bcc522"
+        "99cbd7b1.dcbe1",
+        "802c04a5.b5b44"
       ]
     ]
   },
   {
-    "id":"9de6db30.2f5d08",
-    "type":"switchNode",
-    "name":"switch network-id",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-information.network-id`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":885.9523277282715,
-    "y":1069.8572072982788,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "99cbd7b1.dcbe1",
+    "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",
+    "wires": [
       [
-        "8dcf2b85.8a7718"
+        "5340ccc7.b7728c"
       ]
     ]
   },
   {
-    "id":"8dcf2b85.8a7718",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":1069.9523277282715,
-    "y":1072.8572072982788,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "5340ccc7.b7728c",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1052.2856636047363,
+    "y": 1072.8572072982788,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "826c9129.66a6a"
+        "937ab8ad.e150a8"
       ]
     ]
   },
   {
-    "id":"826c9129.66a6a",
-    "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":1226.3810386657715,
-    "y":1071.8572072982788,
-    "z":"6ce0e277.83694c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"3750fd7a.51d192",
-    "type":"outcome",
-    "name":"activate",
-    "xml":"<outcome value='activate'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":374.0952339172363,
-    "y":538.7619791030884,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "937ab8ad.e150a8",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "823b7913.83e82",
+    "type": "outcome",
+    "name": "activate",
+    "xml": "<outcome value='activate'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 356.4285697937012,
+    "y": 538.7619791030884,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "5d1ff75b.5232f8"
+        "413afb53.a7e9bc"
       ]
     ]
   },
   {
-    "id":"5d1ff75b.5232f8",
-    "type":"switchNode",
-    "name":"switch request-action",
-    "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":556.9524002075195,
-    "y":535.9048290252686,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "413afb53.a7e9bc",
+    "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",
+    "wires": [
       [
-        "2afede0b.bd1572",
-        "54e1c91a.d85148"
+        "c51c21dc.9f93c8",
+        "aa444685.51676"
       ]
     ]
   },
   {
-    "id":"2afede0b.bd1572",
-    "type":"other",
-    "name":"ActivateDCINetworkInstance",
-    "xml":"<outcome value='ActivateDCINetworkInstance'>",
-    "comments":"",
-    "outputs":1,
-    "x":822.9524002075195,
-    "y":494.90482902526855,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "c51c21dc.9f93c8",
+    "type": "other",
+    "name": "ActivateDCINetworkInstance",
+    "xml": "<outcome value='ActivateDCINetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 805.2857360839844,
+    "y": 494.90482902526855,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "50e656ca.d6f338"
+        "5edae240.c29634"
       ]
     ]
   },
   {
-    "id":"54e1c91a.d85148",
-    "type":"other",
-    "name":"Other",
-    "xml":"<outcome value='Other'>",
-    "comments":"",
-    "outputs":1,
-    "x":776.9524002075195,
-    "y":544.9048290252686,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "aa444685.51676",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 759.2857360839844,
+    "y": 544.9048290252686,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "3c265a21.293036"
+        "d0b092f4.14515"
       ]
     ]
   },
   {
-    "id":"3c265a21.293036",
-    "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":945.9524002075195,
-    "y":544.9048290252686,
-    "z":"6ce0e277.83694c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"50e656ca.d6f338",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":1047.9524002075195,
-    "y":483.90482902526855,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "d0b092f4.14515",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "5edae240.c29634",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1030.2857360839844,
+    "y": 483.90482902526855,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "64a676e8.861d28"
+        "3c91ea2c.5c300e"
       ]
     ]
   },
   {
-    "id":"6076d36f.c0eccc",
-    "type":"other",
-    "name":"DeActivateDCINetworkInstance",
-    "xml":"<outcome value='DeActivateDCINetworkInstance'>",
-    "comments":"",
-    "outputs":1,
-    "x":818.8095703125,
-    "y":606.1906299591064,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "12ffbf1d.3d33f1",
+    "type": "other",
+    "name": "DeActivateDCINetworkInstance",
+    "xml": "<outcome value='DeActivateDCINetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 801.1429061889648,
+    "y": 606.1906299591064,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "ad73741b.c60b68"
+        "ac68aa10.9b9f5"
       ]
     ]
   },
   {
-    "id":"b7a2dc33.468d7",
-    "type":"other",
-    "name":"Other",
-    "xml":"<outcome value='Other'>",
-    "comments":"",
-    "outputs":1,
-    "x":733.8095626831055,
-    "y":675.190637588501,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "95197a73.2ccf78",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 716.1428985595703,
+    "y": 675.190637588501,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "866ab25a.9ff16"
+        "e8dac5d.c9e4fb8"
       ]
     ]
   },
   {
-    "id":"866ab25a.9ff16",
-    "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":914.8095779418945,
-    "y":676.190637588501,
-    "z":"6ce0e277.83694c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"64a676e8.861d28",
-    "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":1355.8177337646484,
-    "y":485.3333520889282,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "e8dac5d.c9e4fb8",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "3c91ea2c.5c300e",
+    "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",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7ef0cfae.a9d9c",
+    "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",
+    "wires": [
       [
-
+        "12ffbf1d.3d33f1",
+        "95197a73.2ccf78"
       ]
     ]
   },
   {
-    "id":"cb8ed99f.c4ede8",
-    "type":"switchNode",
-    "name":"switch request-action",
-    "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":555.6666259765625,
-    "y":606.6664638519287,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "283fd358.50e254",
+    "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",
+    "wires": [
       [
-        "6076d36f.c0eccc",
-        "b7a2dc33.468d7"
+        "145e812a.ac0acf",
+        "92eeaa34.08fe58"
       ]
     ]
   },
   {
-    "id":"9d2b6252.7686e",
-    "type":"switchNode",
-    "name":"switch request-action",
-    "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":545.6666831970215,
-    "y":857.0000295639038,
-    "z":"6ce0e277.83694c",
-    "wires":[
-      [
-        "a2921cae.f2ac3",
-        "444810a.5a640f"
-      ]
-    ]
-  },
-  {
-    "id":"1e164e5f.bcc522",
-    "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":1018.6666831970215,
-    "y":966.0000295639038,
-    "z":"6ce0e277.83694c",
-    "wires":[
-      [
-
-      ]
+    "id": "802c04a5.b5b44",
+    "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",
+    "wires": [
+      []
     ]
   },
   {
-    "id":"ad73741b.c60b68",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":1107.6666259765625,
-    "y":609,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "ac68aa10.9b9f5",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1089.9999618530273,
+    "y": 609,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "68fa6b90.e42414",
-        "b293eb0.4a82b18"
+        "7eb5d9ab.f2a3a8",
+        "c8c856a4.b3312"
       ]
     ]
   },
   {
-    "id":"68fa6b90.e42414",
-    "type":"switchNode",
-    "name":"switch network-id",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-information.network-id`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1261.6665649414062,
-    "y":709,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "7eb5d9ab.f2a3a8",
+    "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",
+    "wires": [
       [
-        "e6a56919.99b308"
+        "cc5bae19.b165f8"
       ]
     ]
   },
   {
-    "id":"e6a56919.99b308",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":1445.6665649414062,
-    "y":712,
-    "z":"6ce0e277.83694c",
-    "wires":[
+    "id": "cc5bae19.b165f8",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1427.999900817871,
+    "y": 712,
+    "z": "d98986ab.861428",
+    "wires": [
       [
-        "c239837d.9386b"
+        "a0a11a5f.fe6fb"
       ]
     ]
   },
   {
-    "id":"c239837d.9386b",
-    "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":1602.0952758789062,
-    "y":711,
-    "z":"6ce0e277.83694c",
-    "wires":[
-
-    ]
+    "id": "a0a11a5f.fe6fb",
+    "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",
+    "wires": []
   },
   {
-    "id":"b293eb0.4a82b18",
-    "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":1394.3809204101562,
-    "y":605.142822265625,
-    "z":"6ce0e277.83694c",
-    "wires":[
-      [
-
-      ]
+    "id": "c8c856a4.b3312",
+    "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",
+    "wires": [
+      []
     ]
   }
-]
\ No newline at end of file
+]
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 81ddee29..c2561f6b 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
@@ -11,14 +11,14 @@
                     <return status="failure">
                         <parameter name="ack-final" value="Y" />
                         <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Network model is_bound_to_vpn=true but no vpn_binding is present" />
+                        <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-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 retrieving vpn binding" />
+                        <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
                     </return>
                 </outcome>
             </get-resource>
@@ -319,7 +319,7 @@
                 <parameter name="l3vpn_name" value="`$prop.l3vpn.name`" />
                 <parameter name="topology" value="`$prop.l3vpn.topology`" />
                 <parameter name="site1_name" value="`$prop.l3vpn.site1_name`" />
-                <parameter name="vpn-policy1-id" value="`$prop.l3vpn.vpn-policy1-id}`" />
+                <parameter name="vpn-policy1-id" value="`$prop.l3vpn.vpn-policy1-id`" />
                 <parameter name="l3vpn.entry1-id" value="`$prop.l3vpn.entry1-id`" />
                 <parameter name="sna1_name" value="`$prop.l3vpn.sna1_name`" />
                 <parameter name="pe1_id" value="`$prop.l3vpn.pe1_id`" />
@@ -330,11 +330,11 @@
                 <parameter name="ac1_protocol" value="`$prop.l3vpn.ac1_protocol`" />
                 <parameter name="sna1-route-ip-prefix" value="`$prop.l3vpn.sna1-route-ip-prefix`" />
                 <parameter name="sna1-route-next-hop" value="`$prop.l3vpn.sna1-route-next-hop`" />
-                <parameter name="peer2-ip" value="`$prop.l3vpn.peer2-ip`" />
-                <parameter name="ac2_protocol_bgp_as" value="`$prop.l3vpn.ac2_protocol_bgp_as`" />
+                <parameter name="peer1-ip" value="`$prop.l3vpn.peer1-ip`" />
+                <parameter name="ac1_protocol_bgp_as" value="`$prop.l3vpn.ac1_protocol_bgp_as`" />
                 <parameter name="vrf1-id" value="`$prop.l3vpn.vrf1-id`" />
                 <parameter name="site2_name" value="`$prop.l3vpn.site2_name`" />
-                <parameter name="vpn-policy2-id" value="`$prop.l3vpn.vpn-policy2-id}`" />
+                <parameter name="vpn-policy2-id" value="`$prop.l3vpn.vpn-policy2-id`" />
                 <parameter name="l3vpn.entry2-id" value="`$prop.l3vpn.entry2-id`" />
                 <parameter name="sna2_name" value="`$prop.l3vpn.sna2_name`" />
                 <parameter name="pe2_id" value="`$prop.l3vpn.pe2_id`" />
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 3af34c61..9c13bbf5 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
@@ -34,7 +34,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -45,7 +45,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -56,7 +56,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -67,7 +67,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -78,7 +78,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -89,7 +89,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -100,7 +100,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -111,7 +111,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -122,7 +122,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -133,7 +133,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -144,7 +144,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -155,7 +155,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -166,7 +166,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -177,7 +177,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -188,7 +188,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -199,7 +199,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -308,4 +308,4 @@
             </switch>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>
-- 
2.16.6