Merge "Update underlay DGs for VoLTE use case"

Former-commit-id: fc653f61e98cafa25c94b3b3326e8505ec5bc176

2 files changed, 791 insertions, 635 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 15b1db0d..1c01a518 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": "6c6bc16c.ca3e3",
+    "id": "e82c66ea.44e898",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 77,
-    "y": 53,
-    "z": "f29dedb6.fec708",
+    "x": 85,
+    "y": 59.999969482421875,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "537702a4.cc8034"
+        "556d5856.28fc28"
       ]
     ]
   },
   {
-    "id": "537702a4.cc8034",
+    "id": "556d5856.28fc28",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1842 +22,1965 @@
     "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": 289.00000381469727,
-    "y": 125.0000171661377,
-    "z": "f29dedb6.fec708",
+    "x": 297.00000381469727,
+    "y": 131.99998664855957,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "be1e8309.4bc4c8"
+        "c0cc5c39.3c0f6"
       ]
     ]
   },
   {
-    "id": "be1e8309.4bc4c8",
+    "id": "c0cc5c39.3c0f6",
     "type": "method",
     "name": "method network-topology-operation-create",
     "xml": "<method rpc='network-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 277.0001220703125,
-    "y": 213,
-    "z": "f29dedb6.fec708",
+    "x": 285.0001220703125,
+    "y": 219.99996948242188,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "15842b75.da07e5"
+        "c2983d8a.5f39f"
       ]
     ]
   },
   {
-    "id": "15842b75.da07e5",
+    "id": "c2983d8a.5f39f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 553.0000305175781,
-    "y": 221.00001335144043,
-    "z": "f29dedb6.fec708",
+    "x": 371,
+    "y": 369.99998474121094,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "35d46a8d.e7edce",
-        "861f67a.7920b18",
-        "38a3e2ad.559ce6",
-        "39c4a2ad.6290be",
-        "56d07259.1d8cbc",
-        "5c9ca6e0.e239a",
-        "e21a9c92.1f2a28",
-        "151a4cba.fa33e3",
-        "be047f99.592428",
-        "1460f5c7.7bf212",
-        "e2d35c41.dd6f5"
+        "67d30637.3060a8",
+        "84c05eba.3e71e8",
+        "68069c64.8e3b94",
+        "701cd9ce.0eed7",
+        "2eb49ba6.65da24",
+        "7b077cdc.2f71b4",
+        "b4f42ae7.52446",
+        "ddb7afb8.346658",
+        "1ca86563.d30703",
+        "200a1605.cf89a2",
+        "8739cde1.57a17",
+        "d21a23d8.b0bee",
+        "1ae283a6.1cae6c",
+        "1e4e53c1.72218c",
+        "881693df.98a5b",
+        "8aae558c.098818"
       ]
     ]
   },
   {
-    "id": "d2fcc9e7.aec75",
+    "id": "65abf066.8e6488",
     "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": 1149.0001831054688,
-    "y": 737,
-    "z": "f29dedb6.fec708",
+    "x": 1163.0001831054688,
+    "y": 990.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       []
     ]
   },
   {
-    "id": "35d46a8d.e7edce",
+    "id": "67d30637.3060a8",
     "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": 781.0000610351562,
-    "y": 293,
-    "z": "f29dedb6.fec708",
+    "x": 786.0000610351562,
+    "y": 274.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "56d07259.1d8cbc",
+    "id": "2eb49ba6.65da24",
     "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": 838.6666259765625,
-    "y": 389.6666564941406,
-    "z": "f29dedb6.fec708",
+    "x": 846.6666259765625,
+    "y": 396.6666259765625,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "b2478f4e.7cd8b"
+        "9e4b7826.78998"
       ]
     ]
   },
   {
-    "id": "6b6b65e4.027114",
+    "id": "cc196265.e16a88",
     "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": 1120.6668701171875,
-    "y": 939.6666870117188,
-    "z": "f29dedb6.fec708",
+    "x": 1134.6668701171875,
+    "y": 1193.6666564941406,
+    "z": "b93007d5.c3e538",
     "wires": [
       []
     ]
   },
   {
-    "id": "39c4a2ad.6290be",
+    "id": "701cd9ce.0eed7",
     "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": 798.6666259765625,
-    "y": 446.66668701171875,
-    "z": "f29dedb6.fec708",
+    "x": 806.6666259765625,
+    "y": 453.6666564941406,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "96af0d.cf3c10f"
+        "cf63dd64.867b68"
       ]
     ]
   },
   {
-    "id": "96af0d.cf3c10f",
+    "id": "cf63dd64.867b68",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1023.6666259765625,
-    "y": 449.6666564941406,
-    "z": "f29dedb6.fec708",
+    "x": 1031.6666259765625,
+    "y": 456.6666259765625,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "7438ecb9.4567f4"
+        "f95a4c37.7f2c98"
       ]
     ]
   },
   {
-    "id": "7438ecb9.4567f4",
+    "id": "f95a4c37.7f2c98",
     "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": 1204.6666259765625,
-    "y": 447.6666564941406,
-    "z": "f29dedb6.fec708",
+    "x": 1212.6666259765625,
+    "y": 454.6666259765625,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "861f67a.7920b18",
+    "id": "84c05eba.3e71e8",
     "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": 850.5,
-    "y": 90,
-    "z": "f29dedb6.fec708",
+    "x": 858.5,
+    "y": 96.99996948242188,
+    "z": "b93007d5.c3e538",
     "wires": [
       []
     ]
   },
   {
-    "id": "38a3e2ad.559ce6",
+    "id": "68069c64.8e3b94",
     "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": 820.5,
-    "y": 207,
-    "z": "f29dedb6.fec708",
+    "x": 828.5,
+    "y": 213.99996948242188,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "747be621.ebaa68",
-        "e28c7994.72931",
-        "5f530a05.e03c5c"
+        "48d88da3.bdd66c",
+        "303d5a7b.9089e6",
+        "b6a02d9b.506dd"
       ]
     ]
   },
   {
-    "id": "747be621.ebaa68",
+    "id": "48d88da3.bdd66c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1145.5,
-    "y": 138,
-    "z": "f29dedb6.fec708",
+    "x": 1153.5,
+    "y": 144.99996948242188,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "270f57b4.7e9228"
+        "343e112c.24c07e"
       ]
     ]
   },
   {
-    "id": "e28c7994.72931",
+    "id": "303d5a7b.9089e6",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1148.990966796875,
-    "y": 185.57403564453125,
-    "z": "f29dedb6.fec708",
+    "x": 1156.990966796875,
+    "y": 192.57400512695312,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "b482495d.0483a"
+        "cabe423d.4d49c8"
       ]
     ]
   },
   {
-    "id": "5f530a05.e03c5c",
+    "id": "b6a02d9b.506dd",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1144.323974609375,
-    "y": 226.9073486328125,
-    "z": "f29dedb6.fec708",
+    "x": 1152.323974609375,
+    "y": 233.90731811523438,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "552e5145.a20188"
+        "e0986396.153c08"
       ]
     ]
   },
   {
-    "id": "b482495d.0483a",
+    "id": "cabe423d.4d49c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Network model is_bound_to_vpn=true but no vpn_binding is present\" />\n\n",
     "comments": "",
-    "x": 1325.5623779296875,
-    "y": 173.85977172851562,
-    "z": "f29dedb6.fec708",
+    "x": 1333.5623779296875,
+    "y": 180.8597412109375,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "552e5145.a20188",
+    "id": "e0986396.153c08",
     "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": 1332.0965309143066,
-    "y": 222.34654140472412,
-    "z": "f29dedb6.fec708",
+    "x": 1340.0965309143066,
+    "y": 229.346510887146,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "270f57b4.7e9228",
+    "id": "343e112c.24c07e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1323.705322265625,
-    "y": 130.57403564453125,
-    "z": "f29dedb6.fec708",
+    "x": 1331.705322265625,
+    "y": 137.57400512695312,
+    "z": "b93007d5.c3e538",
     "wires": [
       []
     ]
   },
   {
-    "id": "b2478f4e.7cd8b",
+    "id": "9e4b7826.78998",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1237.5,
-    "y": 396,
-    "z": "f29dedb6.fec708",
-    "wires": [
-      [
-        "92f693f1.fbeac8",
-        "fa654c60.33fc7",
-        "3c75f999.d8df1e",
-        "399d4af.75d7f36",
-        "f1384917.ec5db8",
-        "b487b0d3.26ff08",
-        "507ab3c0.3b67f4",
-        "b36084e3.ed78c",
-        "43267259.9b3cb4",
-        "2536a52a.61b14a",
-        "7ec07647.4a18e8",
-        "cc9729b3.35c9a8",
-        "72f85ed8.f54e68",
-        "b028194c.b3b988",
-        "b0ea6a25.f32ed",
-        "b7bb055e.312e1",
-        "d25d1bce.304f78",
-        "49087f87.ab7e78",
-        "6e2762a6.8272c4",
-        "5f3b0791.9b6e88",
-        "1aacfbe9.a7c6bc",
-        "f2101f18.ae2b68",
-        "ca43c6ae.b67f4",
-        "5a7334fb.eef58c",
-        "bf6d8b73.1d1d2"
-      ]
-    ]
-  },
-  {
-    "id": "92f693f1.fbeac8",
+    "x": 1245.5,
+    "y": 402.9999694824219,
+    "z": "b93007d5.c3e538",
+    "wires": [
+      [
+        "17cd2ff8.9cd04",
+        "a903bca7.693f38",
+        "b7d18627.7a1f98",
+        "e4de9a3d.119a9",
+        "606af827.bd45c",
+        "a21fe544.7750b",
+        "311c3df3.7afe92",
+        "70cc5270.0c11f4",
+        "4839bb76.6231f4",
+        "e9c22fe.7f5eb5",
+        "adf442a.303dcc",
+        "79aa13b9.189d24",
+        "5695b46b.d185b4",
+        "bace9104.ae1848",
+        "9a7061af.ca17e",
+        "659d155a.7369ac",
+        "f05ff602.95c57",
+        "fdb0c240.c67158",
+        "e5e0041.ae72a78",
+        "ee6f82cf.48e768",
+        "d210b6.498b1f48",
+        "a99d9f30.66196",
+        "4a49e3e6.b4823c",
+        "b21efe21.6a6f38",
+        "7e49a5fe.54752c"
+      ]
+    ]
+  },
+  {
+    "id": "17cd2ff8.9cd04",
     "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": 1588.5,
-    "y": 20.000030517578125,
-    "z": "f29dedb6.fec708",
+    "x": 1596.5,
+    "y": 27,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "6d73e8b1.07061"
+        "942d2fd8.72ef78"
       ]
     ]
   },
   {
-    "id": "fa654c60.33fc7",
+    "id": "a903bca7.693f38",
     "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": 1592.4999389648438,
-    "y": 81.60000610351562,
-    "z": "f29dedb6.fec708",
+    "x": 1600.4999389648438,
+    "y": 88.5999755859375,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "2301d600.a73462"
+        "b16a7f85.9ec09"
       ]
     ]
   },
   {
-    "id": "6d73e8b1.07061",
+    "id": "942d2fd8.72ef78",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1775.5,
-    "y": 20.000030517578125,
-    "z": "f29dedb6.fec708",
+    "x": 1783.5,
+    "y": 27,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "1d383b47.d3c90d"
+        "13aca61b.d25bc2"
       ]
     ]
   },
   {
-    "id": "2301d600.a73462",
+    "id": "b16a7f85.9ec09",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1777.4999389648438,
-    "y": 79.60000610351562,
-    "z": "f29dedb6.fec708",
+    "x": 1785.4999389648438,
+    "y": 86.5999755859375,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "f95d177d.930be"
+        "bc8204d0.6f0a4"
       ]
     ]
   },
   {
-    "id": "1d383b47.d3c90d",
+    "id": "13aca61b.d25bc2",
     "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": 1943.5,
-    "y": 20.60003662109375,
-    "z": "f29dedb6.fec708",
+    "x": 1951.5,
+    "y": 27.600006103515625,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "f95d177d.930be",
+    "id": "bc8204d0.6f0a4",
     "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": 1946.4999389648438,
-    "y": 77.60000610351562,
-    "z": "f29dedb6.fec708",
+    "x": 1954.4999389648438,
+    "y": 84.5999755859375,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "3c75f999.d8df1e",
+    "id": "b7d18627.7a1f98",
     "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": 1591.5,
-    "y": 143,
-    "z": "f29dedb6.fec708",
+    "x": 1599.5,
+    "y": 149.99996948242188,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "64ec1f5c.cd7588"
+        "3a89d54d.40dfe2"
       ]
     ]
   },
   {
-    "id": "399d4af.75d7f36",
+    "id": "e4de9a3d.119a9",
     "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": 1594.5,
-    "y": 196,
-    "z": "f29dedb6.fec708",
+    "x": 1602.5,
+    "y": 202.99996948242188,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "30608684.1fa91a"
+        "38e8aa2.2d9e456"
       ]
     ]
   },
   {
-    "id": "f1384917.ec5db8",
+    "id": "606af827.bd45c",
     "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": 1599.5,
-    "y": 258,
-    "z": "f29dedb6.fec708",
+    "x": 1607.5,
+    "y": 264.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "7b6affba.2f1ea8"
+        "21372c50.4a9ebc"
       ]
     ]
   },
   {
-    "id": "b487b0d3.26ff08",
+    "id": "a21fe544.7750b",
     "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": 1594.5,
-    "y": 321,
-    "z": "f29dedb6.fec708",
+    "x": 1602.5,
+    "y": 327.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "e7d8abc.3397ed8"
+        "8bf3fb5b.75eb5"
       ]
     ]
   },
   {
-    "id": "507ab3c0.3b67f4",
+    "id": "311c3df3.7afe92",
     "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": 1599.5,
-    "y": 381,
-    "z": "f29dedb6.fec708",
+    "x": 1607.5,
+    "y": 387.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "ccbb4e0a.e4624"
+        "23a5acb5.f27f04"
       ]
     ]
   },
   {
-    "id": "b36084e3.ed78c",
+    "id": "70cc5270.0c11f4",
     "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": 1594.5,
-    "y": 445,
-    "z": "f29dedb6.fec708",
+    "x": 1602.5,
+    "y": 451.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "5e7b746e.c31ebc"
+        "6950f2b5.16d88c"
       ]
     ]
   },
   {
-    "id": "43267259.9b3cb4",
+    "id": "4839bb76.6231f4",
     "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": 1599.5,
-    "y": 507,
-    "z": "f29dedb6.fec708",
+    "x": 1607.5,
+    "y": 513.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "cd97fc49.ef9428"
+        "b7f7be54.bb917"
       ]
     ]
   },
   {
-    "id": "2536a52a.61b14a",
+    "id": "e9c22fe.7f5eb5",
     "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": 1614.5,
-    "y": 567,
-    "z": "f29dedb6.fec708",
+    "x": 1622.5,
+    "y": 573.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "b43f1ee2.b85a2"
+        "a5648f25.d106a"
       ]
     ]
   },
   {
-    "id": "7ec07647.4a18e8",
+    "id": "adf442a.303dcc",
     "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": 1609.5,
-    "y": 639,
-    "z": "f29dedb6.fec708",
+    "x": 1617.5,
+    "y": 645.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "b4d9a4d.005d958"
+        "18fc875b.805949"
       ]
     ]
   },
   {
-    "id": "cc9729b3.35c9a8",
+    "id": "79aa13b9.189d24",
     "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": 1608.5,
-    "y": 698,
-    "z": "f29dedb6.fec708",
+    "x": 1616.5,
+    "y": 704.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "7dfb851.0b49cfc"
+        "ff7ff5eb.cfefc8"
       ]
     ]
   },
   {
-    "id": "72f85ed8.f54e68",
+    "id": "5695b46b.d185b4",
     "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": 1585.5,
-    "y": 761,
-    "z": "f29dedb6.fec708",
+    "x": 1593.5,
+    "y": 767.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "d713e906.7f455"
+        "3a3dab2d.a5bb8c"
       ]
     ]
   },
   {
-    "id": "b028194c.b3b988",
+    "id": "bace9104.ae1848",
     "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": 1588.5,
-    "y": 818,
-    "z": "f29dedb6.fec708",
+    "x": 1596.5,
+    "y": 824.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "973837ca.190aa8"
+        "cdd1eefe.5b85b8"
       ]
     ]
   },
   {
-    "id": "b0ea6a25.f32ed",
+    "id": "9a7061af.ca17e",
     "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": 1594.5,
-    "y": 870,
-    "z": "f29dedb6.fec708",
+    "x": 1602.5,
+    "y": 876.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "6ccb4ca1.2cd06c"
+        "1ca2f399.06573c"
       ]
     ]
   },
   {
-    "id": "b7bb055e.312e1",
+    "id": "659d155a.7369ac",
     "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": 1595.5,
-    "y": 925,
-    "z": "f29dedb6.fec708",
+    "x": 1603.5,
+    "y": 931.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "b9aa2fd2.814f48"
+        "cd2ff907.e5a52"
       ]
     ]
   },
   {
-    "id": "d25d1bce.304f78",
+    "id": "f05ff602.95c57",
     "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": 1607.5,
-    "y": 974,
-    "z": "f29dedb6.fec708",
+    "x": 1615.5,
+    "y": 980.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "7df19f10.00d63"
+        "3cb8f25c.dbdcf6"
       ]
     ]
   },
   {
-    "id": "49087f87.ab7e78",
+    "id": "fdb0c240.c67158",
     "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": 1600.5,
-    "y": 1025,
-    "z": "f29dedb6.fec708",
+    "x": 1608.5,
+    "y": 1031.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "deb16fb4.873d88"
+        "f4a0fc3d.931818"
       ]
     ]
   },
   {
-    "id": "6e2762a6.8272c4",
+    "id": "e5e0041.ae72a78",
     "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": 1593.5,
-    "y": 1083,
-    "z": "f29dedb6.fec708",
+    "x": 1601.5,
+    "y": 1089.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "d9a405e5.0fbd78"
+        "9232191b.5a644"
       ]
     ]
   },
   {
-    "id": "5f3b0791.9b6e88",
+    "id": "ee6f82cf.48e768",
     "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": 1594.5,
-    "y": 1143,
-    "z": "f29dedb6.fec708",
+    "x": 1602.5,
+    "y": 1149.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "f17cdf9a.1f70e"
+        "2ac6f78c.3593"
       ]
     ]
   },
   {
-    "id": "1aacfbe9.a7c6bc",
+    "id": "d210b6.498b1f48",
     "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": 1588.5,
-    "y": 1329,
-    "z": "f29dedb6.fec708",
+    "x": 1596.5,
+    "y": 1335.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "3676d16.bff3dae"
+        "26258b64.f3c8fc"
       ]
     ]
   },
   {
-    "id": "f2101f18.ae2b68",
+    "id": "a99d9f30.66196",
     "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": 1594.5,
-    "y": 1380,
-    "z": "f29dedb6.fec708",
+    "x": 1602.5,
+    "y": 1386.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "43e3c11a.4b0498"
+        "beea3693.1fcab"
       ]
     ]
   },
   {
-    "id": "ca43c6ae.b67f4",
+    "id": "4a49e3e6.b4823c",
     "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": 1561.5,
-    "y": 1471,
-    "z": "f29dedb6.fec708",
+    "x": 1569.5,
+    "y": 1477.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "ab13048a.b0a2"
+        "498b6cd0.790624"
       ]
     ]
   },
   {
-    "id": "64ec1f5c.cd7588",
+    "id": "3a89d54d.40dfe2",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1766.5,
-    "y": 139,
-    "z": "f29dedb6.fec708",
+    "x": 1774.5,
+    "y": 145.99996948242188,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "f1c21eed.4c6488"
+        "d4ecb14d.0a54a8"
       ]
     ]
   },
   {
-    "id": "30608684.1fa91a",
+    "id": "38e8aa2.2d9e456",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1772.5,
-    "y": 192,
-    "z": "f29dedb6.fec708",
+    "x": 1780.5,
+    "y": 198.99996948242188,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "db52bb2.d3cc7c8"
+        "f3fb2ed6.50a728"
       ]
     ]
   },
   {
-    "id": "7b6affba.2f1ea8",
+    "id": "21372c50.4a9ebc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1781.5,
-    "y": 254,
-    "z": "f29dedb6.fec708",
+    "x": 1789.5,
+    "y": 260.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "7c0e170d.30b1d"
+        "884fbf7d.a8726"
       ]
     ]
   },
   {
-    "id": "e7d8abc.3397ed8",
+    "id": "8bf3fb5b.75eb5",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1779.5,
-    "y": 317,
-    "z": "f29dedb6.fec708",
+    "x": 1787.5,
+    "y": 323.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "947c8730.9c4b48"
+        "3abb6840.ee26b"
       ]
     ]
   },
   {
-    "id": "ccbb4e0a.e4624",
+    "id": "23a5acb5.f27f04",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1784.5,
-    "y": 379,
-    "z": "f29dedb6.fec708",
+    "x": 1792.5,
+    "y": 385.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "a06ad2cd.275448"
+        "f20a7e76.25a3f"
       ]
     ]
   },
   {
-    "id": "5e7b746e.c31ebc",
+    "id": "6950f2b5.16d88c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1776.5,
-    "y": 437,
-    "z": "f29dedb6.fec708",
+    "x": 1784.5,
+    "y": 443.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "b2aa581c.5af32"
+        "d97cdc10.bd96d8"
       ]
     ]
   },
   {
-    "id": "cd97fc49.ef9428",
+    "id": "b7f7be54.bb917",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1777.5,
-    "y": 500,
-    "z": "f29dedb6.fec708",
+    "x": 1785.5,
+    "y": 506.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "72cbbe8e.f6925"
+        "427ba533.f11984"
       ]
     ]
   },
   {
-    "id": "b43f1ee2.b85a2",
+    "id": "a5648f25.d106a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1776.5,
-    "y": 569,
-    "z": "f29dedb6.fec708",
+    "x": 1784.5,
+    "y": 575.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "d9091182.9c0dc8"
+        "62408467.62a084"
       ]
     ]
   },
   {
-    "id": "b4d9a4d.005d958",
+    "id": "18fc875b.805949",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1773.5,
-    "y": 637,
-    "z": "f29dedb6.fec708",
+    "x": 1781.5,
+    "y": 643.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "ae505877.71061"
+        "85e36dea.0819c8"
       ]
     ]
   },
   {
-    "id": "7dfb851.0b49cfc",
+    "id": "ff7ff5eb.cfefc8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1772.5,
-    "y": 701,
-    "z": "f29dedb6.fec708",
+    "x": 1780.5,
+    "y": 707.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "2f24e7f6.a11b28"
+        "58007bf7.116274"
       ]
     ]
   },
   {
-    "id": "d713e906.7f455",
+    "id": "3a3dab2d.a5bb8c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1745.5,
-    "y": 759,
-    "z": "f29dedb6.fec708",
+    "x": 1753.5,
+    "y": 765.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "42443b38.340f8c"
+        "9deb79b0.29029"
       ]
     ]
   },
   {
-    "id": "973837ca.190aa8",
+    "id": "cdd1eefe.5b85b8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1747.5,
-    "y": 816,
-    "z": "f29dedb6.fec708",
+    "x": 1755.5,
+    "y": 822.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "e3ce9d5.2cdf36"
+        "8f458f7.ed1937"
       ]
     ]
   },
   {
-    "id": "6ccb4ca1.2cd06c",
+    "id": "1ca2f399.06573c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1783.5,
-    "y": 867,
-    "z": "f29dedb6.fec708",
+    "x": 1791.5,
+    "y": 873.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "7054b5f4.206a54"
+        "33671733.0dc5e"
       ]
     ]
   },
   {
-    "id": "b9aa2fd2.814f48",
+    "id": "cd2ff907.e5a52",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1788.5,
-    "y": 930,
-    "z": "f29dedb6.fec708",
+    "x": 1796.5,
+    "y": 936.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "784b972f.0e3428"
+        "a34e89a8.ee1828"
       ]
     ]
   },
   {
-    "id": "7df19f10.00d63",
+    "id": "3cb8f25c.dbdcf6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1784.5,
-    "y": 979,
-    "z": "f29dedb6.fec708",
+    "x": 1792.5,
+    "y": 985.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "206c366c.675522"
+        "886acd80.98921"
       ]
     ]
   },
   {
-    "id": "deb16fb4.873d88",
+    "id": "f4a0fc3d.931818",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1768.5,
-    "y": 1028,
-    "z": "f29dedb6.fec708",
+    "x": 1776.5,
+    "y": 1034.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "10227f41.369851"
+        "2a432c87.a87a1c"
       ]
     ]
   },
   {
-    "id": "d9a405e5.0fbd78",
+    "id": "9232191b.5a644",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1765.5,
-    "y": 1081,
-    "z": "f29dedb6.fec708",
+    "x": 1773.5,
+    "y": 1087.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "1799ee09.bb8ffa"
+        "5eed1069.6712b8"
       ]
     ]
   },
   {
-    "id": "f17cdf9a.1f70e",
+    "id": "2ac6f78c.3593",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1778.5,
-    "y": 1140,
-    "z": "f29dedb6.fec708",
+    "x": 1786.5,
+    "y": 1146.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "a6d260a1.f58c48"
+        "ef8da568.fd8118"
       ]
     ]
   },
   {
-    "id": "3676d16.bff3dae",
+    "id": "26258b64.f3c8fc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1796.5,
-    "y": 1326,
-    "z": "f29dedb6.fec708",
+    "x": 1804.5,
+    "y": 1332.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "8bd5be57.1da07"
+        "7d4dc212.e3372c"
       ]
     ]
   },
   {
-    "id": "43e3c11a.4b0498",
+    "id": "beea3693.1fcab",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1803.5,
-    "y": 1376,
-    "z": "f29dedb6.fec708",
+    "x": 1811.5,
+    "y": 1382.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "b62f8a75.a94a88"
+        "e0f4fa02.db48e"
       ]
     ]
   },
   {
-    "id": "ab13048a.b0a2",
+    "id": "498b6cd0.790624",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1765.5,
-    "y": 1480,
-    "z": "f29dedb6.fec708",
+    "x": 1773.5,
+    "y": 1486.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "d6461dbb.9360e8"
+        "5ce422b3.c65204"
       ]
     ]
   },
   {
-    "id": "f1c21eed.4c6488",
+    "id": "d4ecb14d.0a54a8",
     "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": 1961.5,
-    "y": 140,
-    "z": "f29dedb6.fec708",
+    "x": 1969.5,
+    "y": 146.99996948242188,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "db52bb2.d3cc7c8",
+    "id": "f3fb2ed6.50a728",
     "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": 1951.5,
-    "y": 194,
-    "z": "f29dedb6.fec708",
+    "x": 1959.5,
+    "y": 200.99996948242188,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "7c0e170d.30b1d",
+    "id": "884fbf7d.a8726",
     "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": 1955.5,
-    "y": 251,
-    "z": "f29dedb6.fec708",
+    "x": 1963.5,
+    "y": 257.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "947c8730.9c4b48",
+    "id": "3abb6840.ee26b",
     "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": 1958.5,
-    "y": 310,
-    "z": "f29dedb6.fec708",
+    "x": 1966.5,
+    "y": 316.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "a06ad2cd.275448",
+    "id": "f20a7e76.25a3f",
     "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": 1966.5,
-    "y": 372,
-    "z": "f29dedb6.fec708",
+    "x": 1974.5,
+    "y": 378.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "b2aa581c.5af32",
+    "id": "d97cdc10.bd96d8",
     "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": 1958.5,
-    "y": 432,
-    "z": "f29dedb6.fec708",
+    "x": 1966.5,
+    "y": 438.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "72cbbe8e.f6925",
+    "id": "427ba533.f11984",
     "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": 1955.5,
-    "y": 492,
-    "z": "f29dedb6.fec708",
+    "x": 1963.5,
+    "y": 498.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "d9091182.9c0dc8",
+    "id": "62408467.62a084",
     "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": 1951.5,
-    "y": 563,
-    "z": "f29dedb6.fec708",
+    "x": 1959.5,
+    "y": 569.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "ae505877.71061",
+    "id": "85e36dea.0819c8",
     "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": 1944.5,
-    "y": 629,
-    "z": "f29dedb6.fec708",
+    "x": 1952.5,
+    "y": 635.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "2f24e7f6.a11b28",
+    "id": "58007bf7.116274",
     "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": 1947.5,
-    "y": 696,
-    "z": "f29dedb6.fec708",
+    "x": 1955.5,
+    "y": 702.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "42443b38.340f8c",
+    "id": "9deb79b0.29029",
     "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": 1923.5,
-    "y": 762,
-    "z": "f29dedb6.fec708",
+    "x": 1931.5,
+    "y": 768.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "e3ce9d5.2cdf36",
+    "id": "8f458f7.ed1937",
     "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": 1927.5,
-    "y": 816,
-    "z": "f29dedb6.fec708",
+    "x": 1935.5,
+    "y": 822.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "7054b5f4.206a54",
+    "id": "33671733.0dc5e",
     "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": 1975.5,
-    "y": 871,
-    "z": "f29dedb6.fec708",
+    "x": 1983.5,
+    "y": 877.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "784b972f.0e3428",
+    "id": "a34e89a8.ee1828",
     "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": 1971.5,
-    "y": 926,
-    "z": "f29dedb6.fec708",
+    "x": 1979.5,
+    "y": 932.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "206c366c.675522",
+    "id": "886acd80.98921",
     "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": 1965.5,
-    "y": 981,
-    "z": "f29dedb6.fec708",
+    "x": 1973.5,
+    "y": 987.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "10227f41.369851",
+    "id": "2a432c87.a87a1c",
     "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": 1962.5,
-    "y": 1034,
-    "z": "f29dedb6.fec708",
+    "x": 1970.5,
+    "y": 1040.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "1799ee09.bb8ffa",
+    "id": "5eed1069.6712b8",
     "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": 1960.5,
-    "y": 1091,
-    "z": "f29dedb6.fec708",
+    "x": 1968.5,
+    "y": 1097.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "a6d260a1.f58c48",
+    "id": "ef8da568.fd8118",
     "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": 1969.5,
-    "y": 1143,
-    "z": "f29dedb6.fec708",
+    "x": 1977.5,
+    "y": 1149.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "8bd5be57.1da07",
+    "id": "7d4dc212.e3372c",
     "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": 2063.5,
-    "y": 1347,
-    "z": "f29dedb6.fec708",
+    "x": 2071.5,
+    "y": 1353.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "b62f8a75.a94a88",
+    "id": "e0f4fa02.db48e",
     "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": 2075.5,
-    "y": 1396,
-    "z": "f29dedb6.fec708",
+    "x": 2083.5,
+    "y": 1402.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "d6461dbb.9360e8",
+    "id": "5ce422b3.c65204",
     "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": 1959.5,
-    "y": 1490,
-    "z": "f29dedb6.fec708",
+    "x": 1967.5,
+    "y": 1496.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "5c9ca6e0.e239a",
+    "id": "7b077cdc.2f71b4",
     "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",
     "comments": "",
     "outputs": 1,
-    "x": 758,
-    "y": 741,
-    "z": "f29dedb6.fec708",
+    "x": 718,
+    "y": 988,
+    "z": "b93007d5.c3e538",
     "wires": [
       []
     ]
   },
   {
-    "id": "e21a9c92.1f2a28",
+    "id": "b4f42ae7.52446",
     "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": 683,
-    "y": 881,
-    "z": "f29dedb6.fec708",
+    "x": 699,
+    "y": 1134,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "35f4cd65.09f49a",
-        "75d7a8fd.a7b578",
-        "8c0ace1c.3759a8"
+        "ccafc029.2ca668",
+        "83222ede.275488",
+        "9be175a2.890088"
       ]
     ]
   },
   {
-    "id": "35f4cd65.09f49a",
+    "id": "ccafc029.2ca668",
     "type": "outcomeTrue",
     "name": "l3vpn-ipwan",
     "xml": "<outcome value='l3vpn-ipwan'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 669,
-    "y": 806,
-    "z": "f29dedb6.fec708",
+    "x": 685,
+    "y": 1059,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "97e69226.8d874"
+        "86e0641c.9378b8"
       ]
     ]
   },
   {
-    "id": "75d7a8fd.a7b578",
+    "id": "83222ede.275488",
     "type": "outcomeTrue",
     "name": "l3vpn-sptn",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 827,
-    "y": 949,
-    "z": "f29dedb6.fec708",
+    "x": 841,
+    "y": 1202.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "6b6b65e4.027114"
+        "cc196265.e16a88"
       ]
     ]
   },
   {
-    "id": "8c0ace1c.3759a8",
+    "id": "9be175a2.890088",
     "type": "outcomeTrue",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 825,
-    "y": 1028,
-    "z": "f29dedb6.fec708",
+    "x": 839,
+    "y": 1281.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "942583bd.a55fc8"
+        "a80e67f6.8ddf08"
       ]
     ]
   },
   {
-    "id": "942583bd.a55fc8",
+    "id": "a80e67f6.8ddf08",
     "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": 1008,
-    "y": 1027,
-    "z": "f29dedb6.fec708",
+    "x": 1022,
+    "y": 1280.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "151a4cba.fa33e3",
+    "id": "ddb7afb8.346658",
     "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": 799,
-    "y": 505,
-    "z": "f29dedb6.fec708",
+    "x": 807,
+    "y": 511.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "e0623ae9.6063c"
+        "41865338.ad795c"
       ]
     ]
   },
   {
-    "id": "e0623ae9.6063c",
+    "id": "41865338.ad795c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1024,
-    "y": 507.9999694824219,
-    "z": "f29dedb6.fec708",
+    "x": 1032,
+    "y": 514.9999389648438,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "25b266b0.918a82"
+        "983244e.df934b8"
       ]
     ]
   },
   {
-    "id": "25b266b0.918a82",
+    "id": "983244e.df934b8",
     "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": 1205,
-    "y": 505.9999694824219,
-    "z": "f29dedb6.fec708",
+    "x": 1213,
+    "y": 512.9999389648438,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "be047f99.592428",
+    "id": "1ca86563.d30703",
     "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": 785,
-    "y": 553,
-    "z": "f29dedb6.fec708",
+    "x": 793,
+    "y": 559.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "98526d9c.6760b",
+    "id": "2b5f5542.fd958a",
     "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": 2189,
-    "y": 1203,
-    "z": "f29dedb6.fec708",
+    "x": 2197,
+    "y": 1209.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "b220812e.109778",
-        "351eda30.07db16"
+        "59c48fa4.84884",
+        "d90a37bb.c237f"
       ]
     ]
   },
   {
-    "id": "bf6d8b73.1d1d2",
+    "id": "7e49a5fe.54752c",
     "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": 1590,
-    "y": 1251,
-    "z": "f29dedb6.fec708",
+    "x": 1598,
+    "y": 1257.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "7a9c17fc.2f1e08"
+        "8fa0374a.f95938"
       ]
     ]
   },
   {
-    "id": "5a7334fb.eef58c",
+    "id": "b21efe21.6a6f38",
     "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": 1591,
-    "y": 1202,
-    "z": "f29dedb6.fec708",
+    "x": 1599,
+    "y": 1208.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "56e3cd9c.43986c"
+        "338cff27.30b9f8"
       ]
     ]
   },
   {
-    "id": "56e3cd9c.43986c",
+    "id": "338cff27.30b9f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1763,
-    "y": 1200,
-    "z": "f29dedb6.fec708",
+    "x": 1771,
+    "y": 1206.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "477adf42.483428"
+        "a82ee394.90f61"
       ]
     ]
   },
   {
-    "id": "7a9c17fc.2f1e08",
+    "id": "8fa0374a.f95938",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1776,
-    "y": 1259,
-    "z": "f29dedb6.fec708",
+    "x": 1784,
+    "y": 1265.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "fc261e72.93fdd8"
+        "bf41117.64398f"
       ]
     ]
   },
   {
-    "id": "54fbb9e9.bfa918",
+    "id": "ebb40fd1.a6e278",
     "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": 2160,
-    "y": 1151,
-    "z": "f29dedb6.fec708",
+    "x": 2168,
+    "y": 1157.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "d7d47e9f.d291a8",
+    "id": "1ebecf9.6d9703",
     "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": 2158,
-    "y": 1251,
-    "z": "f29dedb6.fec708",
+    "x": 2166,
+    "y": 1257.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "8d93fa75.d66f9",
+    "id": "2c643f9e.330d9",
     "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": 2182,
-    "y": 1296,
-    "z": "f29dedb6.fec708",
+    "x": 2190,
+    "y": 1302.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "ff5e6e80.75b3d",
-        "b6c5cd5f.5be15"
+        "353346ad.e73b3a",
+        "90a1b8e5.de4168"
       ]
     ]
   },
   {
-    "id": "477adf42.483428",
+    "id": "a82ee394.90f61",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1914,
-    "y": 1200,
-    "z": "f29dedb6.fec708",
+    "x": 1922,
+    "y": 1206.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "54fbb9e9.bfa918",
-        "98526d9c.6760b"
+        "ebb40fd1.a6e278",
+        "2b5f5542.fd958a"
       ]
     ]
   },
   {
-    "id": "fc261e72.93fdd8",
+    "id": "bf41117.64398f",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1915,
-    "y": 1259,
-    "z": "f29dedb6.fec708",
+    "x": 1923,
+    "y": 1265.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "d7d47e9f.d291a8",
-        "8d93fa75.d66f9"
+        "1ebecf9.6d9703",
+        "2c643f9e.330d9"
       ]
     ]
   },
   {
-    "id": "1460f5c7.7bf212",
+    "id": "200a1605.cf89a2",
     "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": 806,
-    "y": 608,
-    "z": "f29dedb6.fec708",
+    "x": 792,
+    "y": 613,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "d4cb6331.d1fce8"
+        "ccc1c7cc.dfb0f"
       ]
     ]
   },
   {
-    "id": "e2d35c41.dd6f5",
+    "id": "8739cde1.57a17",
     "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": 806.3333740234375,
-    "y": 666.3333129882812,
-    "z": "f29dedb6.fec708",
+    "x": 789.3333740234375,
+    "y": 670.333251953125,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "aa4153ec.2a7508"
+        "6487397b.1e3fb"
       ]
     ]
   },
   {
-    "id": "aa4153ec.2a7508",
+    "id": "6487397b.1e3fb",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1031.3333740234375,
-    "y": 669.3332824707031,
-    "z": "f29dedb6.fec708",
+    "x": 1039.3333740234375,
+    "y": 676.333251953125,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "4a3bd02b.dd7f6"
+        "612da958.138ff"
       ]
     ]
   },
   {
-    "id": "d4cb6331.d1fce8",
+    "id": "ccc1c7cc.dfb0f",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1031,
-    "y": 610.9999694824219,
-    "z": "f29dedb6.fec708",
+    "x": 1039,
+    "y": 617.9999389648438,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "34c6dafd.7466b6"
+        "27463d60.ad91ba"
       ]
     ]
   },
   {
-    "id": "34c6dafd.7466b6",
+    "id": "27463d60.ad91ba",
     "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": 608.9999694824219,
-    "z": "f29dedb6.fec708",
+    "x": 1220,
+    "y": 615.9999389648438,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "4a3bd02b.dd7f6",
+    "id": "612da958.138ff",
     "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.3333740234375,
-    "y": 667.3332824707031,
-    "z": "f29dedb6.fec708",
+    "x": 1220.3333740234375,
+    "y": 674.333251953125,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "97e69226.8d874",
+    "id": "86e0641c.9378b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 848,
-    "y": 806,
-    "z": "f29dedb6.fec708",
+    "x": 864,
+    "y": 1059,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "d2fcc9e7.aec75",
-        "29a0e3d5.f4d32c",
-        "c946ab83.d974f8"
+        "65abf066.8e6488",
+        "5c181e9f.160958",
+        "5af1a08.5be54e"
       ]
     ]
   },
   {
-    "id": "29a0e3d5.f4d32c",
+    "id": "5c181e9f.160958",
     "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": 1156,
-    "y": 801,
-    "z": "f29dedb6.fec708",
+    "x": 1170,
+    "y": 1054.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       []
     ]
   },
   {
-    "id": "c946ab83.d974f8",
+    "id": "5af1a08.5be54e",
     "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": 1154,
-    "y": 872,
-    "z": "f29dedb6.fec708",
+    "x": 1168,
+    "y": 1125.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       []
     ]
   },
   {
-    "id": "b220812e.109778",
+    "id": "59c48fa4.84884",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2407,
-    "y": 1195,
-    "z": "f29dedb6.fec708",
+    "x": 2415,
+    "y": 1201.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "c61ec37b.6cd3b8"
+        "a2f6539a.f13e48"
       ]
     ]
   },
   {
-    "id": "c61ec37b.6cd3b8",
+    "id": "a2f6539a.f13e48",
     "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": 2588,
-    "y": 1193,
-    "z": "f29dedb6.fec708",
+    "x": 2596,
+    "y": 1199.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "ff5e6e80.75b3d",
+    "id": "353346ad.e73b3a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2405,
-    "y": 1297,
-    "z": "f29dedb6.fec708",
+    "x": 2413,
+    "y": 1303.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "73eb8615.8d24d8"
+        "64606169.f340a"
       ]
     ]
   },
   {
-    "id": "73eb8615.8d24d8",
+    "id": "64606169.f340a",
     "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": 2586,
-    "y": 1295,
-    "z": "f29dedb6.fec708",
+    "x": 2594,
+    "y": 1301.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "351eda30.07db16",
+    "id": "d90a37bb.c237f",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2406,
-    "y": 1129,
-    "z": "f29dedb6.fec708",
+    "x": 2414,
+    "y": 1135.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "581ab8c9.51da4"
+        "9b121e11.8e6548"
       ]
     ]
   },
   {
-    "id": "b6c5cd5f.5be15",
+    "id": "90a1b8e5.de4168",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2402,
-    "y": 1249,
-    "z": "f29dedb6.fec708",
+    "x": 2410,
+    "y": 1255.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": [
       [
-        "f0e238af.ae0bf8"
+        "798e96d1.dbe14"
       ]
     ]
   },
   {
-    "id": "581ab8c9.51da4",
+    "id": "9b121e11.8e6548",
     "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": 2613,
-    "y": 1123,
-    "z": "f29dedb6.fec708",
+    "x": 2621,
+    "y": 1129.9999694824219,
+    "z": "b93007d5.c3e538",
     "wires": []
   },
   {
-    "id": "f0e238af.ae0bf8",
+    "id": "798e96d1.dbe14",
     "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": 2613,
-    "y": 1242,
-    "z": "f29dedb6.fec708",
+    "x": 2621,
+    "y": 1248.9999694824219,
+    "z": "b93007d5.c3e538",
+    "wires": []
+  },
+  {
+    "id": "d21a23d8.b0bee",
+    "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": 848,
+    "y": 764,
+    "z": "b93007d5.c3e538",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1ae283a6.1cae6c",
+    "type": "switchNode",
+    "name": "switch service-data.networks_length",
+    "xml": "<switch test='`$service-data.networks.network_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 806,
+    "y": 845,
+    "z": "b93007d5.c3e538",
+    "wires": [
+      [
+        "2049b18f.3dcc96",
+        "f048277d.a89e68"
+      ]
+    ]
+  },
+  {
+    "id": "2049b18f.3dcc96",
+    "type": "other",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1079.8095703125,
+    "y": 813.952392578125,
+    "z": "b93007d5.c3e538",
+    "wires": [
+      [
+        "a9b3eba7.b952d"
+      ]
+    ]
+  },
+  {
+    "id": "f048277d.a89e68",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1074.666748046875,
+    "y": 859.6666870117188,
+    "z": "b93007d5.c3e538",
+    "wires": [
+      [
+        "7b2cabce.1a9454"
+      ]
+    ]
+  },
+  {
+    "id": "a9b3eba7.b952d",
+    "type": "set",
+    "name": "set nidx",
+    "xml": "<set>\n<parameter name='nidx' value='0' />\n",
+    "comments": "",
+    "x": 1232.8095703125,
+    "y": 813.5238037109375,
+    "z": "b93007d5.c3e538",
+    "wires": []
+  },
+  {
+    "id": "7b2cabce.1a9454",
+    "type": "set",
+    "name": "set nidx",
+    "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
+    "comments": "",
+    "x": 1234.2381591796875,
+    "y": 858.5238647460938,
+    "z": "b93007d5.c3e538",
+    "wires": []
+  },
+  {
+    "id": "1e4e53c1.72218c",
+    "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": 788,
+    "y": 908,
+    "z": "b93007d5.c3e538",
+    "wires": []
+  },
+  {
+    "id": "881693df.98a5b",
+    "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": 772,
+    "y": 1338,
+    "z": "b93007d5.c3e538",
+    "wires": []
+  },
+  {
+    "id": "8aae558c.098818",
+    "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": 688,
+    "y": 1395,
+    "z": "b93007d5.c3e538",
     "wires": []
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
index 08a49199..06cb3a32 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
@@ -287,6 +287,30 @@
                     </return>

                 </outcome>

             </execute>

+            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID">

+                <parameter name="ctx-destination" value="prop.l3vpn.network-id" />

+            </execute>

+            <switch test="`$service-data.networks.network_length`">

+                <outcome value="">

+                    <set>

+                        <parameter name="nidx" value="0" />

+                    </set>

+                </outcome>

+                <outcome value="Other">

+                    <set>

+                        <parameter name="nidx" value="`$service-data.networks.network_length`" />

+                    </set>

+                </outcome>

+            </switch>

+            <set>

+                <parameter name="service-data.networks.network[$nidx].network-id" value="`$prop.l3vpn.network-id`" />

+                <parameter name="service-data.networks.network[$nidx].network-data.sdnc-request-header." value="`$network-topology-operation-input.sdnc-request-header.`" />

+                <parameter name="service-data.networks.network[$nidx].network-data.request-information." value="`$network-topology-operation-input.request-information.`" />

+                <parameter name="service-data.networks.network[$nidx].network-data.service-information." value="`$network-topology-operation-input.service-information.`" />

+                <parameter name="service-data.networks.network[$nidx].network-data.network-information." value="`$network-topology-operation-input.network-information.`" />

+                <parameter name="service-data.networks.network[$nidx].network-data.network-request-input." value="`$network-topology-operation-input.network-request-input.`" />

+                <parameter name="service-data.networks.network_length" value="`$nidx+1`" />

+            </set>

             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">

                 <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log" />

                 <parameter name="Time" value="__TIMESTAMP__" />

@@ -377,6 +401,15 @@
                     </return>

                 </outcome>

             </switch>

+            <set>

+                <parameter name="networkId" value="`$prop.l3vpn.network-id`" />

+                <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/'` " />

+            </set>

+            <return status="success">

+                <parameter name="ack-final-indicator" value="Y" />

+                <parameter name="error-code" value="200" />

+                <parameter name="error-message" value="`$error-message`" />

+            </return>

         </block>

     </method>

 </service-logic>