Fix SDWAN lan-port deactivate DG with url change 78/86478/2
authorprakash.e <prakash.e@huawei.com>
Mon, 6 May 2019 06:11:59 +0000 (11:41 +0530)
committerprakash.e <prakash.e@huawei.com>
Mon, 6 May 2019 06:12:05 +0000 (11:42 +0530)
SDWAN lan-portdeactivate DG is fixed with correct urls
for device-port-delete, lan-port-delete and
bride-domain-delete

Change-Id: I160f219f40e67cbc153e05084a0c851b40672dae
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
Former-commit-id: ee72118f757731a3bc4f674705f00dfb49502e2a

platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.json
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.xml

index 5178c07..f299e17 100644 (file)
@@ -1,54 +1,54 @@
 [\r
     {\r
-        "id": "5903e495.687e5c",\r
+        "id": "35bbf866.78a5e8",\r
         "type": "method",\r
         "name": "method sdwan-vf-operation-lanport-deactivate",\r
         "xml": "<method rpc='sdwan-vf-operation-lanport-deactivate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 240.00390625,\r
-        "y": 212.58634185791016,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 249.00390625,\r
+        "y": 220.58633995056152,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "4f6607f2.8abb38"\r
+                "25755a25.25e4a6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "16a24c83.115633",\r
+        "id": "99c65fff.e6457",\r
         "type": "switchNode",\r
         "name": "switch vf-modules.vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 622.0039138793945,\r
-        "y": 363.99999046325684,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 646.0039138793945,\r
+        "y": 410.00000286102295,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "38ac049b.8f28ac",\r
-                "918c4288.cf32",\r
-                "e4bed2ad.0f579"\r
+                "9fd4d822.1e9bc8",\r
+                "5a6df27a.b5c33c",\r
+                "6ea0353d.247c0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6d98bd3.492e98",\r
+        "id": "4a63efcc.f1d8a",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 159.00391006469727,\r
-        "y": 55,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 168.00391006469727,\r
+        "y": 62.99999809265137,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "1152c743.415d39"\r
+                "7d33035d.b0824c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1152c743.415d39",\r
+        "id": "7d33035d.b0824c",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 228.28961181640625,\r
-        "y": 118.23810958862305,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 237.28961181640625,\r
+        "y": 126.23810768127441,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "5903e495.687e5c"\r
+                "35bbf866.78a5e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f6607f2.8abb38",\r
+        "id": "25755a25.25e4a6",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 240.6705780029297,\r
-        "y": 468.666708946228,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "ee96d694.8e7de8",\r
-                "ebce096c.09ff98",\r
-                "16a24c83.115633",\r
-                "8d9ec798.9077a8",\r
-                "1c23a104.8b10df",\r
-                "ea24678.936eb98",\r
-                "1a442450.4a365c",\r
-                "76875429.7977ec",\r
-                "c0a9943e.0b6a78",\r
-                "728a6387.ded5dc",\r
-                "d768a494.487678",\r
-                "24c5eb03.2a37b4",\r
-                "37a0c49e.52f2ec",\r
-                "88d74976.c878b8",\r
-                "7eaf7940.931d68",\r
-                "b028cd6d.5db14",\r
-                "b07d774b.c67f18",\r
-                "c2a2820.4e02d8",\r
-                "6e845a3.14ef3a4",\r
-                "715f7228.db42ac",\r
-                "b36b6e5f.5d733"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "ebce096c.09ff98",\r
+        "x": 249.6705780029297,\r
+        "y": 476.6667070388794,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "cfe3e61f.155e78",\r
+                "e5e47d7b.5e2bd",\r
+                "99c65fff.e6457",\r
+                "f0379b33.897b78",\r
+                "b3b4dc97.18506",\r
+                "92ac4604.5a24c8",\r
+                "5d312c55.693bf4",\r
+                "b6bd8ed3.859c2",\r
+                "b9a7fd1a.5768b",\r
+                "e69ff5d3.246378",\r
+                "dacb223a.3b862",\r
+                "df8f9116.6cb59",\r
+                "3e7ff409.79880c",\r
+                "f569daa2.8f9b28",\r
+                "3dfde9c2.fe1616",\r
+                "8212e1ef.d576a",\r
+                "d319cb18.70bf18",\r
+                "4e34e7e4.f09c28",\r
+                "d52b4c36.b4383",\r
+                "898196c1.4be1c8",\r
+                "84308c74.6696",\r
+                "5399251a.d1c53c",\r
+                "7ffab63e.0ceec8",\r
+                "a8ac6552.309118"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e5e47d7b.5e2bd",\r
         "type": "for",\r
         "name": "for each vnf",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 582.0352668762207,\r
-        "y": 221.26913261413574,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 591.0352668762207,\r
+        "y": 229.2691307067871,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "906e6ab4.d1bf48"\r
+                "abb41723.436e98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee96d694.8e7de8",\r
+        "id": "cfe3e61f.155e78",\r
         "type": "switchNode",\r
         "name": "switch vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 593.0038986206055,\r
-        "y": 159.99999332427979,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 602.0038986206055,\r
+        "y": 167.99999141693115,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "88ebf11b.dd6cf"\r
+                "5ecc4eea.38b52"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88ebf11b.dd6cf",\r
+        "id": "5ecc4eea.38b52",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 773.0038795471191,\r
-        "y": 158.9999828338623,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 782.0038795471191,\r
+        "y": 166.99998092651367,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "42b4e84a.5144c8"\r
+                "640fd5ea.dc5b5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42b4e84a.5144c8",\r
+        "id": "640fd5ea.dc5b5c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 922.4326057434082,\r
-        "y": 160.14290046691895,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 931.4326057434082,\r
+        "y": 168.1428985595703,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "906e6ab4.d1bf48",\r
+        "id": "abb41723.436e98",\r
         "type": "switchNode",\r
         "name": "switch this vnf-id == input vnf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 811.0038948059082,\r
-        "y": 221.99998903274536,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 820.0038948059082,\r
+        "y": 229.99998712539673,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "31ffe1c7.1814fe"\r
+                "b2038cfb.be4ff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "31ffe1c7.1814fe",\r
+        "id": "b2038cfb.be4ff",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1026.0038795471191,\r
-        "y": 219.9999828338623,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1035.0038795471191,\r
+        "y": 227.99998092651367,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "e443968b.c056d8"\r
+                "d5665599.ce1f08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e443968b.c056d8",\r
+        "id": "d5665599.ce1f08",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1190.0038795471191,\r
-        "y": 214.9999828338623,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1199.0038795471191,\r
+        "y": 222.99998092651367,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "918c4288.cf32",\r
+        "id": "5a6df27a.b5c33c",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 844.00390625,\r
-        "y": 398,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 897.0039176940918,\r
+        "y": 401.00000381469727,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "8a688447.06c508"\r
+                "6f3d1b55.996ac4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38ac049b.8f28ac",\r
+        "id": "9fd4d822.1e9bc8",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 849.0039024353027,\r
-        "y": 344.9999990463257,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 893.0039176940918,\r
+        "y": 347.0000042915344,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "8a688447.06c508"\r
+                "6f3d1b55.996ac4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8a688447.06c508",\r
+        "id": "6f3d1b55.996ac4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1007.00390625,\r
-        "y": 358,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1065.0038871765137,\r
+        "y": 363.0000047683716,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e4bed2ad.0f579",\r
+        "id": "6ea0353d.247c0c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 844.00390625,\r
-        "y": 459,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 853.00390625,\r
+        "y": 466.99999809265137,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "4a56c78a.01ddc8"\r
+                "c106227.8a742e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a4e4809.c60518",\r
+        "id": "71fb1ae1.5a6d94",\r
         "type": "set",\r
         "name": "set vf-module_length",\r
         "xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",\r
         "comments": "",\r
-        "x": 1198.003921508789,\r
-        "y": 457.0000139474869,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1207.003921508789,\r
+        "y": 465.00001204013824,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4a56c78a.01ddc8",\r
+        "id": "c106227.8a742e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1005.0039520263672,\r
-        "y": 455.99999141693115,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1014.0039520263672,\r
+        "y": 463.9999895095825,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "6a4e4809.c60518",\r
-                "bc83d339.7a157"\r
+                "71fb1ae1.5a6d94",\r
+                "53e6b05c.c8062"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc83d339.7a157",\r
+        "id": "53e6b05c.c8062",\r
         "type": "for",\r
         "name": "for each existing vf-index",\r
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1217.0039367675781,\r
-        "y": 506.0000123977661,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1226.0039367675781,\r
+        "y": 514.0000104904175,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "f6f67e00.4f2d6"\r
+                "22133afc.a97b96"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f6f67e00.4f2d6",\r
+        "id": "22133afc.a97b96",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1460.00390625,\r
-        "y": 505,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1469.00390625,\r
+        "y": 512.9999980926514,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "dd4f952e.96ea88"\r
+                "c42cf16b.ee598"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd4f952e.96ea88",\r
+        "id": "c42cf16b.ee598",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1658.0039348602295,\r
-        "y": 492.0000066757202,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1667.0039348602295,\r
+        "y": 500.0000047683716,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "daa971e2.4674d"\r
+                "52618d69.6a0a14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "daa971e2.4674d",\r
+        "id": "52618d69.6a0a14",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1810.00390625,\r
-        "y": 494,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1819.00390625,\r
+        "y": 501.99999809265137,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "b77c5961.7e0078",\r
-                "f6edb536.7a6928",\r
-                "29517aa5.1b19a6"\r
+                "8df43c37.e421c",\r
+                "e47f4a77.f0aa38",\r
+                "37f7f248.465a3e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b77c5961.7e0078",\r
+        "id": "8df43c37.e421c",\r
         "type": "set",\r
         "name": "set tmp.vidx and ctx.vnf-data",\r
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",\r
         "comments": "",\r
-        "x": 2038.004020690918,\r
-        "y": 436.00000381469727,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 2047.004020690918,\r
+        "y": 444.00000190734863,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f6edb536.7a6928",\r
+        "id": "e47f4a77.f0aa38",\r
         "type": "set",\r
         "name": "set vf-module-request-input.",\r
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",\r
         "comments": "",\r
-        "x": 2042.004020690918,\r
-        "y": 490.00000381469727,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 2051.004020690918,\r
+        "y": 498.00000190734863,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8d9ec798.9077a8",\r
+        "id": "f0379b33.897b78",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 541.0041198730469,\r
-        "y": 1931.5012760162354,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 563.0041961669922,\r
+        "y": 2464.501329421997,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "29517aa5.1b19a6",\r
+        "id": "37f7f248.465a3e",\r
         "type": "call",\r
         "name": "call sdwan-get-vf-module-lanport-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2072.4590454101562,\r
-        "y": 541.0104961395264,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 2096.459159851074,\r
+        "y": 549.0105247497559,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cc302ad2.335ad8",\r
-        "type": "for",\r
-        "name": "for vf-modules.vf-module_length",\r
-        "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 879.2579803466797,\r
-        "y": 546.0040225982666,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "58d4b8d7.026f28"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "ffc92a35.504858",\r
-        "type": "switchNode",\r
-        "name": "switch this deviceName == vf-input",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == $prop.lan.deviceName`\">\n    \n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1152.2582244873047,\r
-        "y": 632.0041282176971,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "753161a4.e4105"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "58d4b8d7.026f28",\r
-        "type": "for",\r
-        "name": "for vf-module-input-param length",\r
-        "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1177.2578964233398,\r
-        "y": 549.0040645599365,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "ffc92a35.504858"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "753161a4.e4105",\r
-        "type": "outcomeTrue",\r
-        "name": "true",\r
-        "xml": "<outcome value='true'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1366.2580375671387,\r
-        "y": 629.0041129589081,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "530b71d0.67585"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "db40c5ed.6ed418",\r
-        "type": "for",\r
-        "name": "for vf-modules.vf-module_length",\r
-        "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1755.258228302002,\r
-        "y": 626.0042676925659,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "e3d2d09b.6274e"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "e3d2d09b.6274e",\r
-        "type": "switchNode",\r
-        "name": "switch deviceId == input vf-id",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'deviceId'`\">\n    \n\n\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2047.2581176757812,\r
-        "y": 627.0042266845703,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "9b1b7b47.77c908"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "9b1b7b47.77c908",\r
-        "type": "outcomeTrue",\r
-        "name": "true",\r
-        "xml": "<outcome value='true'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2246.258285522461,\r
-        "y": 625.0042266845703,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "6eb0efd.3e47b1"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "6eb0efd.3e47b1",\r
-        "type": "set",\r
-        "name": "set prop.lan.deviceId",\r
-        "xml": "<set>\n<parameter name='prop.lan.deviceId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
-        "comments": "",\r
-        "x": 2419.258289337158,\r
-        "y": 625.0042676925659,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "1c23a104.8b10df",\r
-        "type": "for",\r
-        "name": "for service-data.vnfs.vnf_length",\r
-        "xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 625.2578277587891,\r
-        "y": 481.00401973724365,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "cc302ad2.335ad8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "427eb2b2.29a19c",\r
-        "type": "switchNode",\r
-        "name": "switch ActivateSDWANSiteInstance",\r
-        "xml": "<!--switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\"-->\n<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`\">\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1220.0081939697266,\r
-        "y": 753.0039882659912,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "d5fc4f12.f3715"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "9c314385.3cccd",\r
-        "type": "for",\r
-        "name": "for vf-modules.vf-module_length",\r
-        "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 753.0080795288086,\r
-        "y": 824.0040054321289,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "f0f279f1.f5aee8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "c0a9943e.0b6a78",\r
-        "type": "for",\r
-        "name": "for service-data.vnfs.vnf_length",\r
-        "xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 617.0078887939453,\r
-        "y": 651.0039081573486,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "a69a253a.e8e958"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "d5fc4f12.f3715",\r
-        "type": "outcomeTrue",\r
-        "name": "true",\r
-        "xml": "<outcome value='true'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1442.0081100463867,\r
-        "y": 753.0040698051453,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "41fe08aa.15b428"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "41fe08aa.15b428",\r
-        "type": "for",\r
-        "name": "for vf-modules.vf-module_length",\r
-        "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1523.2581176757812,\r
-        "y": 827.5040712356567,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "687fd9fe.041c58"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "703289c8.f0d638",\r
-        "type": "switchNode",\r
-        "name": "switch siteId",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'siteId'`\">\n    \n\n\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1906.2584762573242,\r
-        "y": 834.5041785240173,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "b38ab304.d8ca8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "b38ab304.d8ca8",\r
-        "type": "outcomeTrue",\r
-        "name": "true",\r
-        "xml": "<outcome value='true'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2083.2584953308105,\r
-        "y": 837.5040187835693,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "3a704ef2.91c232"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "97126ca9.bd5cb",\r
-        "type": "set",\r
-        "name": "set prop.attach.siteId",\r
-        "xml": "<set>\n<parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
-        "comments": "",\r
-        "x": 2467.259002685547,\r
-        "y": 811.5040702819824,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "3a704ef2.91c232",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 2242.508686065674,\r
-        "y": 833.0040588378906,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": [\r
-            [\r
-                "97126ca9.bd5cb",\r
-                "82be127b.4ba08",\r
-                "e04e88b3.6b7888"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "37a0c49e.52f2ec",\r
+        "id": "dacb223a.3b862",\r
         "type": "get-resource",\r
         "name": "get-resource esr-thirdparty-sdnc",\r
         "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 = SDWANController AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 578.0078353881836,\r
-        "y": 970.5039968490601,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 648.0079498291016,\r
+        "y": 1490.5041389465332,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "737a26fd.e1dab8",\r
-                "dacb633c.487af",\r
-                "48a17fc2.d83c5"\r
+                "c940f649.2f6038",\r
+                "e19a27.d3ada5d8",\r
+                "79fc4361.409b6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "737a26fd.e1dab8",\r
+        "id": "c940f649.2f6038",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 822.0078964233398,\r
-        "y": 934.5039968490601,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 892.0080108642578,\r
+        "y": 1454.5041389465332,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "e7e7ee2.fc0eb1"\r
+                "81501425.48b828"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dacb633c.487af",\r
+        "id": "e19a27.d3ada5d8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 824.498779296875,\r
-        "y": 970.0780334472656,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 894.498893737793,\r
+        "y": 1490.0781755447388,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "3d818670.7778da"\r
+                "d5f98dd5.bc10f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48a17fc2.d83c5",\r
+        "id": "79fc4361.409b6c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 819.831787109375,\r
-        "y": 1006.4113922119141,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 889.831901550293,\r
+        "y": 1526.4115343093872,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "42fa81a1.deae7"\r
+                "46ccd480.5b967c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42fa81a1.deae7",\r
+        "id": "46ccd480.5b967c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 973.6042785644531,\r
-        "y": 1003.8504791259766,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1043.604393005371,\r
+        "y": 1523.8506212234497,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3d818670.7778da",\r
+        "id": "d5f98dd5.bc10f",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 970.0701751708984,\r
-        "y": 968.3637208938599,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1040.0702896118164,\r
+        "y": 1488.363862991333,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e7e7ee2.fc0eb1",\r
+        "id": "81501425.48b828",\r
         "type": "set",\r
         "name": "set controller data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",\r
         "comments": "",\r
-        "x": 982.5080070495605,\r
-        "y": 932.5039367675781,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1052.5081214904785,\r
+        "y": 1452.5040788650513,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "88d74976.c878b8",\r
+        "id": "df8f9116.6cb59",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Get token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 591.9460678100586,\r
-        "y": 1073.62509059906,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 661.9461822509766,\r
+        "y": 1593.6252326965332,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "76d84be1.6ba5b4",\r
-                "93f8c0dc.5b81e"\r
+                "75ba6457.55e20c",\r
+                "7c1891ac.de4b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76d84be1.6ba5b4",\r
+        "id": "75ba6457.55e20c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 826.9461936950684,\r
-        "y": 1059.6250791549683,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 896.9463081359863,\r
+        "y": 1579.6252212524414,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "f2b8e32a.bae75"\r
+                "2888a6db.27655a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93f8c0dc.5b81e",\r
+        "id": "7c1891ac.de4b4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 826.1961936950684,\r
-        "y": 1095.2679862976074,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 896.1963081359863,\r
+        "y": 1615.2681283950806,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "f416c022.785c9"\r
+                "8ca3ace6.8f2fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f416c022.785c9",\r
+        "id": "8ca3ace6.8f2fa",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",\r
         "comments": "",\r
-        "x": 974.9462013244629,\r
-        "y": 1096.0180683135986,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1044.9463157653809,\r
+        "y": 1616.0182104110718,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f2b8e32a.bae75",\r
+        "id": "2888a6db.27655a",\r
         "type": "set",\r
         "name": "set token-id",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",\r
         "comments": "",\r
-        "x": 968.9462013244629,\r
-        "y": 1058.6250801086426,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1038.9463157653809,\r
+        "y": 1578.6252222061157,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b028cd6d.5db14",\r
+        "id": "f569daa2.8f9b28",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode device port delete",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-port-del.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports/action/batch-delete'`\" />\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=\"portResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 618.0351638793945,\r
-        "y": 1225.0782289505005,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 675.0353012084961,\r
+        "y": 1951.0783553123474,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "fb8d6372.3f4b4",\r
-                "48c81a07.925bc4"\r
+                "4d91b121.93b57",\r
+                "75531b9b.e105c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fb8d6372.3f4b4",\r
+        "id": "4d91b121.93b57",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 867.0352230072021,\r
-        "y": 1239.0784349441528,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 941.0353107452393,\r
+        "y": 1965.0785331726074,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "a8972b96.6e4798"\r
+                "dd75e498.a44248"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48c81a07.925bc4",\r
+        "id": "75531b9b.e105c4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 867.0352230072021,\r
-        "y": 1201.0782704353333,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 941.0353107452393,\r
+        "y": 1927.0783686637878,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "2b546f30.f74b7"\r
+                "e4666bb9.655488"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b546f30.f74b7",\r
+        "id": "e4666bb9.655488",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create device port rest api\" />\n",\r
         "comments": "",\r
-        "x": 1011.0355567932129,\r
-        "y": 1200.078269958496,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1085.03564453125,\r
+        "y": 1926.0783681869507,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a8972b96.6e4798",\r
+        "id": "dd75e498.a44248",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1014.035234451294,\r
-        "y": 1240.0782737731934,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1088.035322189331,\r
+        "y": 1966.078372001648,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7630dbec.718c24",\r
+        "id": "e75609bc.a3de38",\r
         "type": "comment",\r
         "name": "Delete port",\r
         "info": "",\r
         "comments": "",\r
-        "x": 519.7011032104492,\r
-        "y": 1191.522253036499,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 652.7012023925781,\r
+        "y": 1911.522358417511,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7eaf7940.931d68",\r
+        "id": "3e7ff409.79880c",\r
         "type": "call",\r
         "name": "call sdwan-get-tenant-auth",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 566.7011032104492,\r
-        "y": 1140.1886892318726,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 636.7012176513672,\r
+        "y": 1660.1888313293457,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ea684fc6.056a2",\r
+        "id": "f13eba50.3d1838",\r
         "type": "execute",\r
-        "name": "execute RestApiCallNode bridge domain create",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-bridge-domain.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/bridge-domains'`\" />\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=\"bridgeDomainResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
+        "name": "execute RestApiCallNode bridge domain delete",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-bridge-domain-del.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/bridge-domains/action/batch-delete'`\" />\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=\"bridgeDomainResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1040.6854133605957,\r
-        "y": 1320.188857793808,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1080.6854934692383,\r
+        "y": 1843.1889221668243,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "3b59cd60.020932",\r
-                "c2414827.1f0308"\r
+                "bc2da0e7.1ce4a",\r
+                "69e42e4a.84408"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b59cd60.020932",\r
+        "id": "bc2da0e7.1ce4a",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1361.6854400634766,\r
-        "y": 1337.1891782283783,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1401.6855201721191,\r
+        "y": 1860.1892426013947,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "ce1097ce.dee208"\r
+                "b57ce49e.88b5a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2414827.1f0308",\r
+        "id": "69e42e4a.84408",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1364.6854667663574,\r
-        "y": 1302.1889598369598,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1404.685546875,\r
+        "y": 1825.1890242099762,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "eb07b224.53901"\r
+                "9387ae8d.090e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eb07b224.53901",\r
+        "id": "9387ae8d.090e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create bridge domain rest api\" />\n",\r
         "comments": "",\r
-        "x": 1567.6858558654785,\r
-        "y": 1298.1890671253204,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1607.685935974121,\r
+        "y": 1821.1891314983368,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ce1097ce.dee208",\r
+        "id": "b57ce49e.88b5a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1568.6854209899902,\r
-        "y": 1333.1889336109161,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1608.6855010986328,\r
+        "y": 1856.1889979839325,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fb63c3bc.ee861",\r
+        "id": "4dae46d7.5c90d8",\r
         "type": "comment",\r
         "name": "Create bridge domain",\r
         "info": "",\r
         "comments": "",\r
-        "x": 984.3513069152832,\r
-        "y": 1286.6330835819244,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1024.3513870239258,\r
+        "y": 1809.6331479549408,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ea24678.936eb98",\r
+        "id": "b3b4dc97.18506",\r
         "type": "switchNode",\r
         "name": "switch portSwitch",\r
         "xml": "<switch test=\"`$prop.lan.portSwitch == 'layer2-port'`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 549.4629821777344,\r
-        "y": 1335.855546951294,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 589.463062286377,\r
+        "y": 1858.8556113243103,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "3354418d.f828fe"\r
+                "20eebbbe.c7cef4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3354418d.f828fe",\r
+        "id": "20eebbbe.c7cef4",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 737.4629096984863,\r
-        "y": 1333.9668741226196,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 777.4629898071289,\r
+        "y": 1856.966938495636,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "ea684fc6.056a2"\r
+                "f13eba50.3d1838"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a442450.4a365c",\r
+        "id": "92ac4604.5a24c8",\r
         "type": "execute",\r
         "name": "execute split ip and mask",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.lan.ipAddress`'/>\n<parameter name=\"regex\" value=\"/\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"ipandMask\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 565.0078735351562,\r
-        "y": 1421.7540397644043,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 633.0079803466797,\r
+        "y": 1710.754201889038,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "9d1d8447.931768",\r
-                "a4c1e51b.fe66b8"\r
+                "83755f92.869b3",\r
+                "d8dc34d5.644498"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a4c1e51b.fe66b8",\r
+        "id": "d8dc34d5.644498",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 766.0078926086426,\r
-        "y": 1399.7540311813354,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 834.007999420166,\r
+        "y": 1688.7541933059692,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "1daa2649.cf0d8a"\r
+                "800919b7.c0b4e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d1d8447.931768",\r
+        "id": "83755f92.869b3",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 766.0078964233398,\r
-        "y": 1440.7540349960327,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 834.0080032348633,\r
+        "y": 1729.7541971206665,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "77f9f3ef.24297c"\r
+                "8fbc1d19.f0f92"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1daa2649.cf0d8a",\r
+        "id": "800919b7.c0b4e8",\r
         "type": "set",\r
         "name": "set ipAddress prefixLength",\r
         "xml": "<set>\n<parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />",\r
         "comments": "",\r
-        "x": 963.0079116821289,\r
-        "y": 1397.7540311813354,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1031.0080184936523,\r
+        "y": 1686.7541933059692,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "77f9f3ef.24297c",\r
+        "id": "8fbc1d19.f0f92",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 921.0079040527344,\r
-        "y": 1437.7540340423584,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 989.0080108642578,\r
+        "y": 1726.7541961669922,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "623ff011.75e11",\r
+        "id": "535f90ba.81c84",\r
         "type": "comment",\r
         "name": "TODO: split ip/mask",\r
         "info": "",\r
         "comments": "",\r
-        "x": 962.0175437927246,\r
-        "y": 1359.9343032836914,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1002.0176239013672,\r
+        "y": 1882.9343676567078,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b07d774b.c67f18",\r
+        "id": "3dfde9c2.fe1616",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode IPSubnets delete",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-ip-subnets-del.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/ip-subnets/action/batch-delete'`\" />\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=\"lanPortResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 623.7792434692383,\r
-        "y": 1497.8749294281006,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 673.7793731689453,\r
+        "y": 1783.8751149177551,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "fb6426f0.aef3a8",\r
-                "334c3bc2.ea5ee4"\r
+                "99c4d00e.08671",\r
+                "a2e86398.f1731"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "334c3bc2.ea5ee4",\r
+        "id": "a2e86398.f1731",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 892.7792739868164,\r
-        "y": 1484.8749017715454,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 942.7794036865234,\r
+        "y": 1770.8750872612,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "1de305ac.79165a"\r
+                "af4f8529.170688"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fb6426f0.aef3a8",\r
+        "id": "99c4d00e.08671",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 889.7792472839355,\r
-        "y": 1519.8751201629639,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 939.7793769836426,\r
+        "y": 1805.8753056526184,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "e16c200f.f574"\r
+                "5fda12d3.42df1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1de305ac.79165a",\r
+        "id": "af4f8529.170688",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create device port rest api\" />\n",\r
         "comments": "",\r
-        "x": 1045.779655456543,\r
-        "y": 1480.8751277923584,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1095.77978515625,\r
+        "y": 1766.875313282013,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e16c200f.f574",\r
+        "id": "5fda12d3.42df1c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1036.7792282104492,\r
-        "y": 1520.8748760223389,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1086.7793579101562,\r
+        "y": 1806.8750615119934,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
-            [\r
-                "3689e594.d6f2aa"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "3689e594.d6f2aa",\r
+        "id": "5d312c55.693bf4",\r
         "type": "set",\r
-        "name": "set prop.lan.lanPortId",\r
-        "xml": "<set>\n<parameter name='prop.lan.lanPortId' value='`lanPortResp.success[0].id`' />\n",\r
+        "name": "set prop.siteAttachement_length=0",\r
+        "xml": "<set>\n<parameter name='prop.siteAttachements_length' value='0' />\n<parameter name='prop.siteIds_length' value='0' />\n\n\n\n",\r
         "comments": "",\r
-        "x": 1243.6683311462402,\r
-        "y": 1523.208342552185,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 588.2896728515625,\r
+        "y": 755.333324432373,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e845a3.14ef3a4",\r
-        "type": "execute",\r
-        "name": "execute RestApiCallNode create vpn topology",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn1Id + '/topology'`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
+        "id": "8212e1ef.d576a",\r
+        "type": "update",\r
+        "name": "update SDWAN VPN status to AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n      key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='PendingDelete' />\n<parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 640.2896423339844,\r
-        "y": 1656.3338270187378,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 627.3210525512695,\r
+        "y": 2405.031599998474,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
-            [\r
-                "f2309f9f.30389",\r
-                "436824e6.cfd19c"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "436824e6.cfd19c",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
+        "id": "b6bd8ed3.859c2",\r
+        "type": "set",\r
+        "name": "copy input data to service data",\r
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",\r
+        "comments": "",\r
+        "x": 615.0040740966797,\r
+        "y": 2257.2531147003174,\r
+        "z": "53bd9180.45e08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b9a7fd1a.5768b",\r
+        "type": "set",\r
+        "name": "set vf-module-id and vf-module-object-path",\r
+        "xml": "<set>\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
+        "comments": "",\r
+        "x": 649.3072738647461,\r
+        "y": 2301.0562238693237,\r
+        "z": "53bd9180.45e08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e69ff5d3.246378",\r
+        "type": "set",\r
+        "name": "set vf-module-level-oper-status",\r
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status'  value='PendingDelete' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",\r
+        "comments": "",\r
+        "x": 616.307300567627,\r
+        "y": 2354.0562658309937,\r
+        "z": "53bd9180.45e08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d319cb18.70bf18",\r
+        "type": "switchNode",\r
+        "name": "switch vnf-index",\r
+        "xml": "<switch test='`$vnf-index`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 886.2895774841309,\r
-        "y": 1692.3331775665283,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 605.00390625,\r
+        "y": 295.00390434265137,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "cc161513.6096e8"\r
+                "ef16bfb5.32205"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc161513.6096e8",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
+        "id": "ef16bfb5.32205",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1058.2895183563232,\r
-        "y": 1706.333193898201,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 767.0039520263672,\r
+        "y": 294.00390338897705,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
-            []\r
+            [\r
+                "533d6edf.10cb2"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "f1b7a0fd.a1f56",\r
+        "id": "533d6edf.10cb2",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn topology failed\" />\n",\r
+        "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=\"vnf id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1058.2896404266357,\r
-        "y": 1662.333193898201,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 916.2540435791016,\r
+        "y": 291.78178119659424,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f2309f9f.30389",\r
-        "type": "failure",\r
-        "name": "failure",\r
-        "xml": "<outcome value='failure'>\n",\r
+        "id": "4e34e7e4.f09c28",\r
+        "type": "execute",\r
+        "name": "execute Properties",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 890.2894954681396,\r
-        "y": 1650.333176612854,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 613.0039138793945,\r
+        "y": 339.00391387939453,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
-            [\r
-                "f1b7a0fd.a1f56"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "c2a2820.4e02d8",\r
-        "type": "execute",\r
-        "name": "execute RestApiCallNode create vpn ",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
+        "id": "77c41cd6.2372d4",\r
+        "type": "for",\r
+        "name": "for vf-modules.vf-module_length",\r
+        "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 607.2880249023438,\r
-        "y": 1589.832929611206,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1353.0002746582031,\r
+        "y": 673.9999980926514,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "5dca5344.cc070c",\r
-                "f5dbcc17.8c2d6"\r
+                "21611c6f.dff1a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5dbcc17.8c2d6",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
+        "id": "6125a2b2.49651c",\r
+        "type": "switchNode",\r
+        "name": "switch this deviceName == vf-input",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == $prop.lan.deviceName`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 832.2879238128662,\r
-        "y": 1609.8328419923782,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1243.00048828125,\r
+        "y": 737.0001811981201,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "ffd8c00c.52d8c"\r
+                "68612c50.e30414"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffd8c00c.52d8c",\r
+        "id": "21611c6f.dff1a4",\r
+        "type": "for",\r
+        "name": "for vf-module-input-param length",\r
+        "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1639.0001220703125,\r
+        "y": 676.0000820159912,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "d87e69ee.1345e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "68612c50.e30414",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1463.0002117156982,\r
+        "y": 738.0001888275146,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "edcb51f3.2237"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "960703be.78273",\r
+        "type": "for",\r
+        "name": "for vf-modules.vf-module_length",\r
+        "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1889.0002899169922,\r
+        "y": 748.0000529289246,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "7bbeeb0c.35b8f4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7bbeeb0c.35b8f4",\r
+        "type": "switchNode",\r
+        "name": "switch deviceId == input vf-id",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'deviceId'`\">\n    \n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2197.0005645751953,\r
+        "y": 731.000020980835,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "e133b219.33252"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e133b219.33252",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2406.000602722168,\r
+        "y": 733.0000133514404,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "e0137def.ca4f7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cfb82eaa.9abd5",\r
+        "type": "set",\r
+        "name": "set prop.lan.deviceId",\r
+        "xml": "<set>\n<parameter name='prop.lan.deviceId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
+        "comments": "",\r
+        "x": 2779.000629425049,\r
+        "y": 669.0001910924911,\r
+        "z": "53bd9180.45e08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d87e69ee.1345e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1868.2461585998535,\r
+        "y": 673.9998292922974,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "6125a2b2.49651c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e0137def.ca4f7",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2567.2461738586426,\r
+        "y": 697.7498325109482,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "cfb82eaa.9abd5",\r
+                "d20ef7d4.f5f0b8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d20ef7d4.f5f0b8",\r
+        "type": "set",\r
+        "name": "set site-vnf-index",\r
+        "xml": "<set>\n<parameter name='site-vnf-index' value='`$vnfidx`' />\n",\r
         "comments": "",\r
+        "x": 2776.24609375,\r
+        "y": 715.749822974205,\r
+        "z": "53bd9180.45e08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b9bc4317.89e3e",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1002.28786277771,\r
-        "y": 1612.8328419923782,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1124.496078491211,\r
+        "y": 675.9998455047607,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
-            []\r
+            [\r
+                "77c41cd6.2372d4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b2d8abb3.217c58",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 972.24609375,\r
+        "y": 679.2498235702515,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "b9bc4317.89e3e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f078c09.b7bad4",\r
+        "type": "switchNode",\r
+        "name": "switch vf-modules.vf-module_length",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`\">\n\n<!--switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\"-->\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 866.2460784912109,\r
+        "y": 628.2498235702515,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "b2d8abb3.217c58"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c16816f9.ad7738",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 666.4961013793945,\r
+        "y": 588.99982213974,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "f078c09.b7bad4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d52b4c36.b4383",\r
+        "type": "for",\r
+        "name": "for service-data.vnfs.vnf_length",\r
+        "xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 607,\r
+        "y": 540.9999599456787,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "c16816f9.ad7738"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "edcb51f3.2237",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1630.6666259765625,\r
+        "y": 743.9999980926514,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "960703be.78273",\r
+                "4982b8e3.7bf018"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "60415.0a145bec",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn failed\" />\n",\r
+        "id": "4982b8e3.7bf018",\r
+        "type": "set",\r
+        "name": "set prop.vnf-id",\r
+        "xml": "<set>\n<parameter name='prop.vnf-id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-id`' />\n\n",\r
+        "comments": "",\r
+        "x": 1838.666603088379,\r
+        "y": 710.9999837875366,\r
+        "z": "53bd9180.45e08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "76c5dda5.a20724",\r
+        "type": "switchNode",\r
+        "name": "switch ActivateSDWANSiteInstance",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1204.000015258789,\r
+        "y": 984.9999885559082,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "8cda715e.63dfe"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "54e7e0d7.ec4c7",\r
+        "type": "for",\r
+        "name": "for vf-modules.vf-module_length",\r
+        "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 849.9998550415039,\r
+        "y": 952.0000286102295,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "df9b68f3.e58818"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8cda715e.63dfe",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1425.9999313354492,\r
+        "y": 985.0000700950623,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "3b6a7f.d02b6582"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7bec1948.27ddc8",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2978.2502937316895,\r
+        "y": 1072.500097155571,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "d5a6d636.c92678"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b505ce84.b2b46",\r
+        "type": "set",\r
+        "name": "set prop.attach.siteId",\r
+        "xml": "<set>\n<parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].value`' />\n",\r
+        "comments": "",\r
+        "x": 3369.2509765625,\r
+        "y": 1025.5001991987228,\r
+        "z": "53bd9180.45e08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d5a6d636.c92678",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3137.5004844665527,\r
+        "y": 1068.0001372098923,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "b505ce84.b2b46",\r
+                "4da0fe6e.eebe4",\r
+                "17807948.b29547"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "73df7c27.84ca64",\r
+        "type": "switchNode",\r
+        "name": "switch ActivateSDWANVpnInstance",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1001.2816162109375,\r
+        "y": 1147.3292617797852,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "acb8bfa5.0f71a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "df9b68f3.e58818",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 939.6147727966309,\r
+        "y": 1035.3293371200562,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "76c5dda5.a20724"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "acb8bfa5.0f71a",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1234.9482421875,\r
+        "y": 1165.3293838500977,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "afc867ac.84f698"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "afc867ac.84f698",\r
+        "type": "for",\r
+        "name": "for vf-modules.vf-module_length",\r
+        "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1478.1981353759766,\r
+        "y": 1178.8293342590332,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "3989a47c.b3eb0c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8e8a391c.6736c8",\r
+        "type": "switchNode",\r
+        "name": "switch vpn-id",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`\">\n    \n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1917.1982345581055,\r
+        "y": 1230.8293769359589,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "837b3b44.ef6fa8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "837b3b44.ef6fa8",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2067.9481887817383,\r
+        "y": 1232.3292925357819,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "f9c5d7e8.6fe0f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f9c5d7e8.6fe0f8",\r
+        "type": "set",\r
+        "name": "set prop.vpn1Id",\r
+        "xml": "<set>\n<parameter name='prop.vpnId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
+        "comments": "",\r
+        "x": 2241.9489364624023,\r
+        "y": 1232.3293509483337,\r
+        "z": "53bd9180.45e08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "4da0fe6e.eebe4",\r
+        "type": "set",\r
+        "name": "Add sites to list and update length",\r
+        "xml": "<set>\n<parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n",\r
+        "comments": "",\r
+        "x": 3405.2822265625,\r
+        "y": 1080.3294657468796,\r
+        "z": "53bd9180.45e08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "17807948.b29547",\r
+        "type": "set",\r
+        "name": "Add site attachement to list and update length",\r
+        "xml": "<set>\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\n<parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n",\r
+        "comments": "",\r
+        "x": 3436.282051086426,\r
+        "y": 1130.3294161558151,\r
+        "z": "53bd9180.45e08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f9ac8f47.1e9e6",\r
+        "type": "switchNode",\r
+        "name": "switch role",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'role'`\">\n    \n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2147.948272705078,\r
+        "y": 968.329355597496,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "5c967566.19521c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5c967566.19521c",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2311.9482765197754,\r
+        "y": 968.329355597496,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "3f851d36.3fe612"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3f851d36.3fe612",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2499.948444366455,\r
+        "y": 953.3293546438217,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "45f33203.c0930c",\r
+                "7bf54e32.503a7",\r
+                "8e7a27c3.580478"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7bf54e32.503a7",\r
+        "type": "switchNode",\r
+        "name": "switch sd-wan-edge",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'sd-wan-edge'`\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2694.948574066162,\r
+        "y": 914.3293460607529,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "777af33b.674edc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "45f33203.c0930c",\r
+        "type": "switchNode",\r
+        "name": "switch dsvpn-hub",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'dsvpn-hub'`\">\n    \n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2691.9486808776855,\r
+        "y": 969.3293615579605,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "caa4c354.afd2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fdf6d987.e37e68",\r
+        "type": "set",\r
+        "name": "set spoke role",\r
+        "xml": "<set>\n<parameter name='prop.role' value=\"spoke\" />\n",\r
+        "comments": "",\r
+        "x": 3024.9486961364746,\r
+        "y": 908.32939183712,\r
+        "z": "53bd9180.45e08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "17e33b60.b53685",\r
+        "type": "set",\r
+        "name": "set hub role",\r
+        "xml": "<set>\n<parameter name='prop.role' value=\"hub\" />\n",\r
         "comments": "",\r
-        "x": 1002.2879848480225,\r
-        "y": 1568.8328419923782,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 3023.948455810547,\r
+        "y": 963.3293756246567,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5dca5344.cc070c",\r
-        "type": "failure",\r
-        "name": "failure",\r
-        "xml": "<outcome value='failure'>\n",\r
+        "id": "777af33b.674edc",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 835.28786277771,\r
-        "y": 1568.8328419923782,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 2864.948543548584,\r
+        "y": 909.9960206747055,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "60415.0a145bec"\r
+                "fdf6d987.e37e68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55cb7e10.b843e",\r
-        "type": "switchNode",\r
-        "name": "switch ActivateSDWANVpnInstance",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`\">\n",\r
+        "id": "caa4c354.afd2",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1198.2898483276367,\r
-        "y": 874.3332567214966,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 2868.948543548584,\r
+        "y": 964.9960206747055,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "35e81d22.6ca8a2"\r
+                "17e33b60.b53685"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0f279f1.f5aee8",\r
+        "id": "709b059b.1a3b4c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 955.6229515075684,\r
-        "y": 803.3333368301392,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 707.606761932373,\r
+        "y": 1287.9920058250427,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "82979871.cd6fd8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "82979871.cd6fd8",\r
+        "type": "switchNode",\r
+        "name": "switch ActivateSDWANSiteInstance",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 971.9920043945312,\r
+        "y": 1237.6626572608948,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "427eb2b2.29a19c",\r
-                "55cb7e10.b843e",\r
-                "ee6738c4.de8eb8"\r
+                "f8c88c15.90092"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "35e81d22.6ca8a2",\r
+        "id": "f8c88c15.90092",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1293.9563598632812,\r
-        "y": 948.3333377838135,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1193.9919204711914,\r
+        "y": 1237.6627388000488,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "50c0c92c.64de28"\r
+                "1c164ecd.76b921"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50c0c92c.64de28",\r
+        "id": "1c164ecd.76b921",\r
         "type": "for",\r
         "name": "for vf-modules.vf-module_length",\r
-        "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
+        "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1275.241928100586,\r
+        "y": 1312.1627402305603,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "c8fa5a58.80db78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c8fa5a58.80db78",\r
+        "type": "block",\r
+        "name": "block atomic",\r
+        "xml": "<block atomic=\"true\">\n",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1508.2062454223633,\r
-        "y": 949.8333144187927,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1492.6070938110352,\r
+        "y": 1312.9920048713684,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "759cda21.f2dc74"\r
+                "aa284cfd.de3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "759cda21.f2dc74",\r
+        "id": "aa284cfd.de3c",\r
         "type": "switchNode",\r
-        "name": "switch vpn-id",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`\">\n    \n\n\n",\r
+        "name": "switch siteId",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'siteId'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1755.206283569336,\r
-        "y": 944.8333973884583,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1658.242286682129,\r
+        "y": 1319.162847518921,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "848c4744.1c01a8"\r
+                "f702cf2b.aacec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "848c4744.1c01a8",\r
+        "id": "f702cf2b.aacec",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1905.9562377929688,\r
-        "y": 946.3333129882812,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1835.2423057556152,\r
+        "y": 1322.162687778473,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "3b552595.502b8a"\r
+                "b76df1d4.d74b6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b552595.502b8a",\r
-        "type": "set",\r
-        "name": "set prop.vpn1Id",\r
-        "xml": "<set>\n<parameter name='prop.vpn1Id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
-        "comments": "",\r
-        "x": 2079.956985473633,\r
-        "y": 946.3333714008331,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "82be127b.4ba08",\r
-        "type": "set",\r
-        "name": "Add sites to list and update length",\r
-        "xml": "<set>\n<parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n",\r
-        "comments": "",\r
-        "x": 2510.2903594970703,\r
-        "y": 852.3333714008331,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "e04e88b3.6b7888",\r
-        "type": "set",\r
-        "name": "Add site attachement to list and update length",\r
-        "xml": "<set>\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\n<parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n",\r
-        "comments": "",\r
-        "x": 2541.290252685547,\r
-        "y": 895.3333377838135,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": []\r
+        "id": "b76df1d4.d74b6",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1994.4924964904785,\r
+        "y": 1317.6627278327942,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "b312ede7.48d31"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "76875429.7977ec",\r
+        "id": "b312ede7.48d31",\r
         "type": "set",\r
-        "name": "set prop.siteAttachement_length=0",\r
-        "xml": "<set>\n<parameter name='prop.siteAttachements_length' value='0' />\n<parameter name='prop.siteIds_length' value='0' />\n\n\n\n",\r
+        "name": "set prop.attach.siteId",\r
+        "xml": "<set>\n<parameter name='prop.siteId' value='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
         "comments": "",\r
-        "x": 627.2896270751953,\r
-        "y": 600.333330154419,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 2219.2428131103516,\r
+        "y": 1296.162739276886,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "687fd9fe.041c58",\r
+        "id": "3989a47c.b3eb0c",\r
         "type": "block",\r
         "name": "block atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1740.6232833862305,\r
-        "y": 828.3333358764648,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1716.9918365478516,\r
+        "y": 1179.3293342590332,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "703289c8.f0d638",\r
-                "7c3e64c6.118e7c",\r
-                "fd5e762b.9175c8"\r
+                "8e8a391c.6736c8",\r
+                "d0a786b4.a86d48",\r
+                "56d8edb1.dcf524"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c3e64c6.118e7c",\r
+        "id": "d0a786b4.a86d48",\r
         "type": "switchNode",\r
-        "name": "switch role",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'role'`\">\n    \n\n\n",\r
+        "name": "switch name",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'name'`\">\n    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1902.9562149047852,\r
-        "y": 759.3333349227905,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1917.991844177246,\r
+        "y": 1179.3293232917786,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "9d3d23c.1af69e"\r
+                "3ed84db0.ad5f32"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d3d23c.1af69e",\r
+        "id": "3ed84db0.ad5f32",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2065.9562187194824,\r
-        "y": 754.3333358764648,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 2068.741798400879,\r
+        "y": 1180.8292388916016,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "b50c3782.0e6ad8"\r
+                "8a23eec9.2e81d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b50c3782.0e6ad8",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
+        "id": "8a23eec9.2e81d",\r
+        "type": "set",\r
+        "name": "set prop.name",\r
+        "xml": "<set>\n<parameter name='prop.name' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
+        "comments": "",\r
+        "x": 2242.742546081543,\r
+        "y": 1180.8292973041534,\r
+        "z": "53bd9180.45e08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "506103c9.e594dc",\r
+        "type": "for",\r
+        "name": "for vf-modules.vf-module_length",\r
+        "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
+        "comments": "",\r
         "outputs": 1,\r
-        "x": 2233.9562606811523,\r
-        "y": 748.3333339691162,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1910.2501907348633,\r
+        "y": 967.5001720190048,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "1dffa18.8cf065f",\r
-                "4b307f30.7cc1"\r
+                "f9ac8f47.1e9e6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b307f30.7cc1",\r
+        "id": "6f32456b.72586c",\r
         "type": "switchNode",\r
-        "name": "switch sd-wan-edge",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'sd-wan-edge'`\">\n\n",\r
+        "name": "switch siteId",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].name == 'siteId'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2428.9563903808594,\r
-        "y": 709.3333253860474,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 2801.250274658203,\r
+        "y": 1069.500256896019,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "fcbf0bd1.06d8d8"\r
+                "7bec1948.27ddc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1dffa18.8cf065f",\r
-        "type": "switchNode",\r
-        "name": "switch dsvpn-hub",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'dsvpn-hub'`\">\n    \n\n\n",\r
+        "id": "3b6a7f.d02b6582",\r
+        "type": "block",\r
+        "name": "block atomic",\r
+        "xml": "<block atomic=\"true\">\n",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2425.956497192383,\r
-        "y": 764.333340883255,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1624.5231094360352,\r
+        "y": 993.0272792577744,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "99c61a76.666788"\r
+                "506103c9.e594dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a479c02.0630f4",\r
-        "type": "set",\r
-        "name": "set spoke role",\r
-        "xml": "<set>\n<parameter name='prop.role' value=\"spoke\" />\n",\r
+        "id": "8e7a27c3.580478",\r
+        "type": "for",\r
+        "name": "for vf-modules.vf-module_length",\r
+        "xml": "<for index='sidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
         "comments": "",\r
-        "x": 2758.956512451172,\r
-        "y": 703.3333711624146,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 2554.5228729248047,\r
+        "y": 1063.02727496624,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "6f32456b.72586c"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "5e79562c.63b268",\r
-        "type": "set",\r
-        "name": "set hub role",\r
-        "xml": "<set>\n<parameter name='prop.role' value=\"hub\" />\n",\r
+        "id": "56d8edb1.dcf524",\r
+        "type": "switchNode",\r
+        "name": "switch topology",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'topology'`\">\n    \n",\r
         "comments": "",\r
-        "x": 2757.956272125244,\r
-        "y": 758.3333549499512,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 1916.495735168457,\r
+        "y": 1119.7499059438705,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "d01e6e11.a971d"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "fcbf0bd1.06d8d8",\r
+        "id": "d01e6e11.a971d",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2598.9563598632812,\r
-        "y": 705,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 2067.24568939209,\r
+        "y": 1121.2498215436935,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "4a479c02.0630f4"\r
+                "6ddbdfd6.cc626"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99c61a76.666788",\r
-        "type": "outcomeTrue",\r
-        "name": "true",\r
-        "xml": "<outcome value='true'>\n",\r
+        "id": "6ddbdfd6.cc626",\r
+        "type": "set",\r
+        "name": "set prop.topology",\r
+        "xml": "<set>\n<parameter name='prop.topology' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
+        "comments": "",\r
+        "x": 2241.246437072754,\r
+        "y": 1121.2498799562454,\r
+        "z": "53bd9180.45e08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "84308c74.6696",\r
+        "type": "for",\r
+        "name": "for vf-modules.vf-module_length",\r
+        "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2602.9563598632812,\r
-        "y": 760,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 605.9918594360352,\r
+        "y": 1191.662724018097,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "5e79562c.63b268"\r
+                "709b059b.1a3b4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "715f7228.db42ac",\r
-        "type": "update",\r
-        "name": "update SDWAN VPN status to AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n      key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='PendingDelete' />\n<parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' />",\r
+        "id": "898196c1.4be1c8",\r
+        "type": "for",\r
+        "name": "for service-data.vnfs.vnf_length",\r
+        "xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 605.3209762573242,\r
-        "y": 1872.0315465927124,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 600.9997100830078,\r
+        "y": 882.9999084472656,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
-            []\r
+            [\r
+                "1312e19.ff3371e"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "fd5e762b.9175c8",\r
-        "type": "record",\r
-        "name": "record",\r
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic23.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"param-name\"/>\n<parameter name=\"field3\" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name`'/>\n",\r
+        "id": "1312e19.ff3371e",\r
+        "type": "switchNode",\r
+        "name": "switch prop.vnf-id match",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-id == $prop.vnf-id`\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1898.3208618164062,\r
-        "y": 703.53125,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 862.0000152587891,\r
+        "y": 888.9999885559082,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
-            []\r
+            [\r
+                "e5973ada.69f578"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "ee6738c4.de8eb8",\r
-        "type": "record",\r
-        "name": "record",\r
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic24.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"request-action\"/>\n<parameter name=\"field3\" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action`'/>\n",\r
+        "id": "e5973ada.69f578",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1141.3210792541504,\r
-        "y": 704.5313692092896,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1066.0001983642578,\r
+        "y": 891.9999885559082,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
-            []\r
+            [\r
+                "54e7e0d7.ec4c7"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "5ab12293.b61a8c",\r
+        "id": "3b1cdfc0.3a554",\r
         "type": "comment",\r
-        "name": "**revert the changes",\r
+        "name": "if device-name match with the incomming device-name,  sites in this service vnf should not be included",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1299.320888519287,\r
-        "y": 709.0312824249268,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1016.0000152587891,\r
+        "y": 846.9999885559082,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "530b71d0.67585",\r
+        "id": "5399251a.d1c53c",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode create vpn topology",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpnId + '/topology'`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 658.5039520263672,\r
+        "y": 2143.5038986206055,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "fe03e503.9b1f18",\r
+                "3b9440a6.e7886"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3b9440a6.e7886",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 919.5038585662842,\r
+        "y": 2170.503242611885,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "818c55d3.807c68"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "818c55d3.807c68",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
+        "comments": "",\r
         "outputs": 1,\r
-        "x": 1524.3372802734375,\r
-        "y": 626.2530469894409,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1089.503797531128,\r
+        "y": 2173.503242611885,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
-            [\r
-                "db40c5ed.6ed418",\r
-                "68d688c3.70e818"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "68d688c3.70e818",\r
-        "type": "set",\r
-        "name": "set prop.vnf-id",\r
-        "xml": "<set>\n<parameter name='prop.vnf-id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-id`' />\n\n",\r
+        "id": "fe431e88.b86a8",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn topology failed\" />\n",\r
         "comments": "",\r
-        "x": 1716.0039558410645,\r
-        "y": 556.2530250549316,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1089.5039196014404,\r
+        "y": 2129.503242611885,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a69a253a.e8e958",\r
-        "type": "switchNode",\r
-        "name": "switch prop.vnf-id match",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-id == $prop.vnf-id`\">",\r
+        "id": "fe03e503.9b1f18",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 874.0042572021484,\r
-        "y": 677.5863618850708,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 922.5037975311279,\r
+        "y": 2129.503242611885,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "5ecfed21.a77fb4"\r
+                "fe431e88.b86a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ecfed21.a77fb4",\r
-        "type": "outcomeFalse",\r
-        "name": "false",\r
-        "xml": "<outcome value='false'>\n",\r
+        "id": "a8ac6552.309118",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode create vpn ",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 662.0044097900391,\r
-        "y": 752.5863652229309,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 640.5022888183594,\r
+        "y": 2053.0029220581055,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "9c314385.3cccd"\r
+                "ee15b935.f63c98",\r
+                "c139232f.6bd6e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "efed662f.81b6a8",\r
-        "type": "comment",\r
-        "name": "if device-name match with the incomming device-name,  sites in this service vnf should not be included",\r
-        "info": "",\r
-        "comments": "",\r
-        "x": 737.0039978027344,\r
-        "y": 849.5863828659058,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "728a6387.ded5dc",\r
-        "type": "set",\r
-        "name": "copy input data to service data",\r
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",\r
+        "id": "c139232f.6bd6e",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
-        "x": 593.0039978027344,\r
-        "y": 1724.2530612945557,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 863.5022029876709,\r
+        "y": 2077.0028907060623,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "fbcee124.bb586"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "d768a494.487678",\r
-        "type": "set",\r
-        "name": "set vf-module-id and vf-module-object-path",\r
-        "xml": "<set>\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
+        "id": "fbcee124.bb586",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
         "comments": "",\r
-        "x": 627.3071975708008,\r
-        "y": 1768.056170463562,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 1033.5021419525146,\r
+        "y": 2080.0028907060623,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            []\r
+        ]\r
     },\r
     {\r
-        "id": "24c5eb03.2a37b4",\r
-        "type": "set",\r
-        "name": "set vf-module-level-oper-status",\r
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status'  value='PendingDelete' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",\r
+        "id": "8f294b6c.2dfef8",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn failed\" />\n",\r
         "comments": "",\r
-        "x": 594.3072242736816,\r
-        "y": 1821.056212425232,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 1033.5022640228271,\r
+        "y": 2036.0028907060623,\r
+        "z": "53bd9180.45e08",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b36b6e5f.5d733",\r
-        "type": "switchNode",\r
-        "name": "switch vnf-index",\r
-        "xml": "<switch test='`$vnf-index`'>\n",\r
+        "id": "ee15b935.f63c98",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 596.00390625,\r
-        "y": 287.00390625,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 866.5021419525146,\r
+        "y": 2036.0028907060623,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "eab1927d.01f0a"\r
+                "8f294b6c.2dfef8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eab1927d.01f0a",\r
-        "type": "other",\r
-        "name": "Null",\r
-        "xml": "<outcome value=''>\n",\r
+        "id": "7ffab63e.0ceec8",\r
+        "type": "for",\r
+        "name": "for service-data.vnfs.vnf_length",\r
+        "xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 758.0039520263672,\r
-        "y": 286.0039052963257,\r
-        "z": "eb27f9f.1aaf508",\r
+        "x": 593.75390625,\r
+        "y": 1018.7539043426514,\r
+        "z": "53bd9180.45e08",\r
         "wires": [\r
             [\r
-                "a638e200.1e293"\r
+                "f2ff74c6.2d66c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a638e200.1e293",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "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=\"vnf id not found in service-data\" />\n",\r
+        "id": "f2ff74c6.2d66c8",\r
+        "type": "for",\r
+        "name": "for vf-modules.vf-module_length",\r
+        "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",\r
         "comments": "",\r
-        "x": 907.2540435791016,\r
-        "y": 283.78178310394287,\r
-        "z": "eb27f9f.1aaf508",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 728.7540435791016,\r
+        "y": 1087.754051208496,\r
+        "z": "53bd9180.45e08",\r
+        "wires": [\r
+            [\r
+                "73df7c27.84ca64"\r
+            ]\r
+        ]\r
     }\r
 ]
\ No newline at end of file
index 2a0a3af..9a81491 100644 (file)
@@ -1,6 +1,6 @@
 <service-logic\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    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}'>\r
+        xmlns='http://www.onap.org/sdnc/svclogic'\r
+        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}'>\r
     <method rpc='sdwan-vf-operation-lanport-deactivate' mode='sync'>\r
         <block atomic="true">\r
             <switch test='`$service-data.vnfs.vnf_length`'>\r
                     </return>\r
                 </outcome>\r
             </switch>\r
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
+                <parameter name='contextPrefix' value='prop' />\r
+            </execute>\r
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
                 <outcome value='0'>\r
                     <return status='failure'>\r
                 </outcome>\r
             </switch>\r
             <for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
-                <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\r
-                    <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
-                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == $prop.lan.deviceName`">\r
-                            <outcome value='true'>\r
-                                <block atomic="true">\r
-                                    <set>\r
-                                        <parameter name='prop.vnf-id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-id`' />\r
-                                    </set>\r
+                <block atomic="true">\r
+                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`">\r
+                        <!--switch test="`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`"-->\r
+                        <outcome value='true'>\r
+                            <block atomic="true">\r
+                                <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\r
                                     <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
-                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'deviceId'`">\r
-                                            <outcome value='true'>\r
-                                                <set>\r
-                                                    <parameter name='prop.lan.deviceId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
-                                                </set>\r
-                                            </outcome>\r
-                                        </switch>\r
+                                        <block atomic="true">\r
+                                            <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == $prop.lan.deviceName`">\r
+                                                <outcome value='true'>\r
+                                                    <block atomic="true">\r
+                                                        <set>\r
+                                                            <parameter name='prop.vnf-id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-id`' />\r
+                                                        </set>\r
+                                                        <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
+                                                            <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'deviceId'`">\r
+                                                                <outcome value='true'>\r
+                                                                    <block atomic="true">\r
+                                                                        <set>\r
+                                                                            <parameter name='prop.lan.deviceId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
+                                                                        </set>\r
+                                                                        <set>\r
+                                                                            <parameter name='site-vnf-index' value='`$vnfidx`' />\r
+                                                                        </set>\r
+                                                                    </block>\r
+                                                                </outcome>\r
+                                                            </switch>\r
+                                                        </for>\r
+                                                    </block>\r
+                                                </outcome>\r
+                                            </switch>\r
+                                        </block>\r
                                     </for>\r
-                                </block>\r
-                            </outcome>\r
-                        </switch>\r
-                    </for>\r
-                </for>\r
+                                </for>\r
+                            </block>\r
+                        </outcome>\r
+                    </switch>\r
+                </block>\r
             </for>\r
             <set>\r
                 <parameter name='prop.siteAttachements_length' value='0' />\r
                     <outcome value='false'>\r
                         <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\r
                             <block>\r
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic24.log"/>\r
-                                    <parameter name="field1" value="__TIMESTAMP__"/>\r
-                                    <parameter name="field2" value="request-action"/>\r
-                                    <parameter name="field3" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action`'/>\r
-                                </record>\r
-                                <!--switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`"-->\r
-                                <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`">\r
+                                <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">\r
                                     <outcome value='true'>\r
-                                        <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
-                                            <block atomic="true">\r
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic23.log"/>\r
-                                                    <parameter name="field1" value="__TIMESTAMP__"/>\r
-                                                    <parameter name="field2" value="param-name"/>\r
-                                                    <parameter name="field3" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name`'/>\r
-                                                </record>\r
+                                        <block atomic="true">\r
+                                            <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
                                                 <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'role'`">\r
                                                     <outcome value='true'>\r
                                                         <block atomic="true">\r
                                                                     </set>\r
                                                                 </outcome>\r
                                                             </switch>\r
-                                                            <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'dsvpn-hub'`">\r
+                                                            <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'dsvpn-hub'`">\r
                                                                 <outcome value='true'>\r
                                                                     <set>\r
                                                                         <parameter name='prop.role' value="hub" />\r
                                                                     </set>\r
                                                                 </outcome>\r
                                                             </switch>\r
+                                                            <for index='sidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
+                                                                <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].name == 'siteId'`">\r
+                                                                    <outcome value='true'>\r
+                                                                        <block atomic="true">\r
+                                                                            <set>\r
+                                                                                <parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].value`' />\r
+                                                                            </set>\r
+                                                                            <set>\r
+                                                                                <parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\r
+                                                                                <parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\r
+                                                                            </set>\r
+                                                                            <set>\r
+                                                                                <parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\r
+                                                                                <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\r
+                                                                                <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\r
+                                                                                <parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\r
+                                                                            </set>\r
+                                                                        </block>\r
+                                                                    </outcome>\r
+                                                                </switch>\r
+                                                            </for>\r
                                                         </block>\r
                                                     </outcome>\r
                                                 </switch>\r
-                                                <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'siteId'`">\r
-                                                    <outcome value='true'>\r
-                                                        <block atomic="true">\r
-                                                            <set>\r
-                                                                <parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
-                                                            </set>\r
-                                                            <set>\r
-                                                                <parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\r
-                                                                <parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\r
-                                                            </set>\r
-                                                            <set>\r
-                                                                <parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\r
-                                                                <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\r
-                                                                <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\r
-                                                                <parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\r
-                                                            </set>\r
-                                                        </block>\r
-                                                    </outcome>\r
-                                                </switch>\r
-                                            </block>\r
-                                        </for>\r
-                                    </outcome>\r
-                                </switch>\r
-                                <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`">\r
-                                    <outcome value='true'>\r
-                                        <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
-                                            <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`">\r
-                                                <outcome value='true'>\r
-                                                    <set>\r
-                                                        <parameter name='prop.vpn1Id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
-                                                    </set>\r
-                                                </outcome>\r
-                                            </switch>\r
-                                        </for>\r
+                                            </for>\r
+                                        </block>\r
                                     </outcome>\r
                                 </switch>\r
                             </block>\r
                     </outcome>\r
                 </switch>\r
             </for>\r
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="esr-thirdparty-sdnc" \r
-               key="esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \r
+            <for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
+                <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\r
+                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`">\r
+                        <outcome value='true'>\r
+                            <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
+                                <block atomic="true">\r
+                                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'topology'`">\r
+                                        <outcome value='true'>\r
+                                            <set>\r
+                                                <parameter name='prop.topology' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
+                                            </set>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'name'`">\r
+                                        <outcome value='true'>\r
+                                            <set>\r
+                                                <parameter name='prop.name' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
+                                            </set>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`">\r
+                                        <outcome value='true'>\r
+                                            <set>\r
+                                                <parameter name='prop.vpnId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
+                                            </set>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                </block>\r
+                            </for>\r
+                        </outcome>\r
+                    </switch>\r
+                </for>\r
+            </for>\r
+            <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module_length`' >\r
+                <block>\r
+                    <switch test="`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">\r
+                        <outcome value='true'>\r
+                            <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
+                                <block atomic="true">\r
+                                    <switch test="`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'siteId'`">\r
+                                        <outcome value='true'>\r
+                                            <block atomic="true">\r
+                                                <set>\r
+                                                    <parameter name='prop.siteId' value='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
+                                                </set>\r
+                                            </block>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                </block>\r
+                            </for>\r
+                        </outcome>\r
+                    </switch>\r
+                </block>\r
+            </for>\r
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                          resource="esr-thirdparty-sdnc"\r
+                          key="esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND\r
                     depth = '1'"\r
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\r
+                          pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\r
                 <outcome value='success'>\r
                     <set>\r
                         <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
                 </outcome>\r
             </execute>\r
             <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' ></call>\r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
+                <parameter name="original_string" value='`$prop.lan.ipAddress`'/>\r
+                <parameter name="regex" value="/"/>\r
+                <parameter name="ctx_memory_result_key" value="ipandMask"/>\r
+                <outcome value='success'>\r
+                    <set>\r
+                        <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\r
+                        <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />\r
+                    </set>\r
+                </outcome>\r
+                <outcome value='failure'>\r
+                    <return status='failure'>\r
+                        <parameter name='error-code' value='' />\r
+                        <parameter name='error-message' value="An error occured while splitting sna1_route" />\r
+                    </return>\r
+                </outcome>\r
+            </execute>\r
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-port-del.json'`" />\r
-                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports/action/batch-delete'`" />\r
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-ip-subnets-del.json'`" />\r
+                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/ip-subnets/action/batch-delete'`" />\r
                 <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                 <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
                 <parameter name="format" value="json"/>\r
                 <parameter name="httpMethod" value="post"/>\r
-                <parameter name="responsePrefix" value="portResp"/>\r
+                <parameter name="responsePrefix" value="lanPortResp"/>\r
                 <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
                 <parameter name="trustStorePassword" value="adminadmin"/>\r
                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
             <switch test="`$prop.lan.portSwitch == 'layer2-port'`">\r
                 <outcome value='true'>\r
                     <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-bridge-domain.json'`" />\r
-                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/bridge-domains'`" />\r
+                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-bridge-domain-del.json'`" />\r
+                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/bridge-domains/action/batch-delete'`" />\r
                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                         <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
                         <parameter name="format" value="json"/>\r
                     </execute>\r
                 </outcome>\r
             </switch>\r
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
-                <parameter name="original_string" value='`$prop.lan.ipAddress`'/>\r
-                <parameter name="regex" value="/"/>\r
-                <parameter name="ctx_memory_result_key" value="ipandMask"/>\r
-                <outcome value='success'>\r
-                    <set>\r
-                        <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\r
-                        <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />\r
-                    </set>\r
-                </outcome>\r
-                <outcome value='failure'>\r
-                    <return status='failure'>\r
-                        <parameter name='error-code' value='' />\r
-                        <parameter name='error-message' value="An error occured while splitting sna1_route" />\r
-                    </return>\r
-                </outcome>\r
-            </execute>\r
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-ip-subnets-del.json'`" />\r
-                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/ip-subnets/action/batch-delete'`" />\r
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-port-del.json'`" />\r
+                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports/action/batch-delete'`" />\r
                 <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                 <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
                 <parameter name="format" value="json"/>\r
                 <parameter name="httpMethod" value="post"/>\r
-                <parameter name="responsePrefix" value="lanPortResp"/>\r
+                <parameter name="responsePrefix" value="portResp"/>\r
                 <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
                 <parameter name="trustStorePassword" value="adminadmin"/>\r
                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
                     </return>\r
                 </outcome>\r
                 <outcome value='success'>\r
-                    <block atomic="true">\r
-                        <set>\r
-                            <parameter name='prop.lan.lanPortId' value='`lanPortResp.success[0].id`' />\r
-                        </set>\r
-                    </block>\r
+                    <block atomic="true"></block>\r
                 </outcome>\r
             </execute>\r
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
             </execute>\r
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`" />\r
-                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn1Id + '/topology'`" />\r
+                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpnId + '/topology'`" />\r
                 <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                 <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
                 <parameter name="format" value="json"/>\r
  + $vf-module-topology-operation-input.vf-module-information.vf-module-id\r
  + '/vf-module-data/vf-module-topology/'`"/>\r
                 <parameter name='vnf-object-path'\r
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
                          value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/vnfs/vnf/'\r
  + $service-data.vnfs.vnf[$vnf-index].vnf-id\r
  + '/vnf-data/vnf-topology/'`"/>\r
                 <parameter name='service-object-path'\r
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
                          value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/service-topology/'`"/>\r
             </set>\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\r
             </set>\r
-            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \r
-      key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\r
+            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config'\r
+                    key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\r
                 <parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\r
                 <parameter name='operational-status' value='PendingDelete' />\r
                 <parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' />\r