updated lan-port-deactivate DG with vnf-id null check 06/85906/1
authorprakash.e <prakash.e@huawei.com>
Sun, 21 Apr 2019 07:38:21 +0000 (13:08 +0530)
committerprakash.e <prakash.e@huawei.com>
Sun, 21 Apr 2019 07:38:30 +0000 (13:08 +0530)
Added NULL check for vnf-id and updated device-name
parameter by removing quote

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

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 cb28863..5178c07 100644 (file)
@@ -1,54 +1,54 @@
 [\r
     {\r
-        "id": "3eaead5d.8a50e2",\r
+        "id": "5903e495.687e5c",\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": 252,\r
-        "y": 208,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 240.00390625,\r
+        "y": 212.58634185791016,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "de2de50e.7db098"\r
+                "4f6607f2.8abb38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba6ca55d.d04268",\r
+        "id": "16a24c83.115633",\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": 634.0000076293945,\r
-        "y": 359.4136486053467,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 622.0039138793945,\r
+        "y": 363.99999046325684,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "96bd0da6.6b228",\r
-                "d7d04d79.b116e",\r
-                "bcfd0c5e.e6103"\r
+                "38ac049b.8f28ac",\r
+                "918c4288.cf32",\r
+                "e4bed2ad.0f579"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "996651b.9ec83b",\r
+        "id": "a6d98bd3.492e98",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 171.00000381469727,\r
-        "y": 50.413658142089844,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 159.00391006469727,\r
+        "y": 55,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "509643c7.891eac"\r
+                "1152c743.415d39"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "509643c7.891eac",\r
+        "id": "1152c743.415d39",\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": 240.28570556640625,\r
-        "y": 113.65176773071289,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 228.28961181640625,\r
+        "y": 118.23810958862305,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "3eaead5d.8a50e2"\r
+                "5903e495.687e5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de2de50e.7db098",\r
+        "id": "4f6607f2.8abb38",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 252.6666717529297,\r
-        "y": 464.08036708831787,\r
-        "z": "2a0755d2.04892a",\r
-        "wires": [\r
-            [\r
-                "cd5d97be.4098b8",\r
-                "cc768085.ce4bc",\r
-                "ba6ca55d.d04268",\r
-                "582a5dfb.dfaf24",\r
-                "6331828e.70aa2c",\r
-                "60ca269e.96d878",\r
-                "ba5b2145.40753",\r
-                "d3ab3217.7d57a",\r
-                "58afb0e4.ba7df",\r
-                "2ee3209f.a1bb9",\r
-                "bfac8597.a517f8",\r
-                "b282b047.e838d",\r
-                "89ba2ad0.277798",\r
-                "e99d476c.3f3ac8",\r
-                "81163bc0.74e178",\r
-                "e8785c39.cc512",\r
-                "86da8112.f0417",\r
-                "2b5c8466.72828c",\r
-                "6c0bf23f.5303ac",\r
-                "16e6f83a.5e7ff8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "cc768085.ce4bc",\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
         "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": 578.0313873291016,\r
-        "y": 287.6828079223633,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 582.0352668762207,\r
+        "y": 221.26913261413574,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "9776f320.0567"\r
+                "906e6ab4.d1bf48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd5d97be.4098b8",\r
+        "id": "ee96d694.8e7de8",\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": 589.0000190734863,\r
-        "y": 226.41366863250732,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 593.0038986206055,\r
+        "y": 159.99999332427979,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "2debc059.5aa7"\r
+                "88ebf11b.dd6cf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2debc059.5aa7",\r
+        "id": "88ebf11b.dd6cf",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 769,\r
-        "y": 225.41365814208984,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 773.0038795471191,\r
+        "y": 158.9999828338623,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "355351ee.f9153e"\r
+                "42b4e84a.5144c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "355351ee.f9153e",\r
+        "id": "42b4e84a.5144c8",\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": 918.4287261962891,\r
-        "y": 226.55657577514648,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 922.4326057434082,\r
+        "y": 160.14290046691895,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9776f320.0567",\r
+        "id": "906e6ab4.d1bf48",\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": 807.0000152587891,\r
-        "y": 288.4136643409729,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 811.0038948059082,\r
+        "y": 221.99998903274536,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "f97986b6.bf7158"\r
+                "31ffe1c7.1814fe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f97986b6.bf7158",\r
+        "id": "31ffe1c7.1814fe",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1022,\r
-        "y": 286.41365814208984,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1026.0038795471191,\r
+        "y": 219.9999828338623,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "926d8df9.33314"\r
+                "e443968b.c056d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "926d8df9.33314",\r
+        "id": "e443968b.c056d8",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1186,\r
-        "y": 281.41365814208984,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1190.0038795471191,\r
+        "y": 214.9999828338623,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d7d04d79.b116e",\r
+        "id": "918c4288.cf32",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 856,\r
-        "y": 393.41365814208984,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 844.00390625,\r
+        "y": 398,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "511ce89.f44bb18"\r
+                "8a688447.06c508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96bd0da6.6b228",\r
+        "id": "38ac049b.8f28ac",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 860.9999961853027,\r
-        "y": 340.4136571884155,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 849.0039024353027,\r
+        "y": 344.9999990463257,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "511ce89.f44bb18"\r
+                "8a688447.06c508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "511ce89.f44bb18",\r
+        "id": "8a688447.06c508",\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": 1019,\r
-        "y": 353.41365814208984,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1007.00390625,\r
+        "y": 358,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bcfd0c5e.e6103",\r
+        "id": "e4bed2ad.0f579",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 856,\r
-        "y": 454.41365814208984,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 844.00390625,\r
+        "y": 459,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "b8a34756.728a58"\r
+                "4a56c78a.01ddc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af4bd42d.9f4868",\r
+        "id": "6a4e4809.c60518",\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": 1210.000015258789,\r
-        "y": 452.4136720895767,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1198.003921508789,\r
+        "y": 457.0000139474869,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b8a34756.728a58",\r
+        "id": "4a56c78a.01ddc8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1017.0000457763672,\r
-        "y": 451.413649559021,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1005.0039520263672,\r
+        "y": 455.99999141693115,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "af4bd42d.9f4868",\r
-                "69a184fd.28972c"\r
+                "6a4e4809.c60518",\r
+                "bc83d339.7a157"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "69a184fd.28972c",\r
+        "id": "bc83d339.7a157",\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": 1229.0000305175781,\r
-        "y": 501.41367053985596,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1217.0039367675781,\r
+        "y": 506.0000123977661,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "72e39d48.4f8944"\r
+                "f6f67e00.4f2d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72e39d48.4f8944",\r
+        "id": "f6f67e00.4f2d6",\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": 1472,\r
-        "y": 500.41365814208984,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1460.00390625,\r
+        "y": 505,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "5f38c3e.5d3ce3c"\r
+                "dd4f952e.96ea88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f38c3e.5d3ce3c",\r
+        "id": "dd4f952e.96ea88",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1670.0000286102295,\r
-        "y": 487.41366481781006,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1658.0039348602295,\r
+        "y": 492.0000066757202,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "92d909cb.ff6d68"\r
+                "daa971e2.4674d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92d909cb.ff6d68",\r
+        "id": "daa971e2.4674d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1822,\r
-        "y": 489.41365814208984,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1810.00390625,\r
+        "y": 494,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "4dec85b6.3eab5c",\r
-                "e85d666e.e8adc8",\r
-                "15a9af4c.a7f031"\r
+                "b77c5961.7e0078",\r
+                "f6edb536.7a6928",\r
+                "29517aa5.1b19a6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4dec85b6.3eab5c",\r
+        "id": "b77c5961.7e0078",\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": 2050.000114440918,\r
-        "y": 431.4136619567871,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2038.004020690918,\r
+        "y": 436.00000381469727,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e85d666e.e8adc8",\r
+        "id": "f6edb536.7a6928",\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": 2054.000114440918,\r
-        "y": 485.4136619567871,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2042.004020690918,\r
+        "y": 490.00000381469727,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "582a5dfb.dfaf24",\r
+        "id": "8d9ec798.9077a8",\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": 553.0002136230469,\r
-        "y": 1926.9149341583252,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 541.0041198730469,\r
+        "y": 1931.5012760162354,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "15a9af4c.a7f031",\r
+        "id": "29517aa5.1b19a6",\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": 2084.4551391601562,\r
-        "y": 536.4241542816162,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2072.4590454101562,\r
+        "y": 541.0104961395264,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1adddcaf.a133d3",\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": 891.2540740966797,\r
-        "y": 541.4176807403564,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 879.2579803466797,\r
+        "y": 546.0040225982666,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "8d8ac8b6.f23b18"\r
+                "58d4b8d7.026f28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc689d86.6d6b1",\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
+        "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": 1164.2543182373047,\r
-        "y": 627.417786359787,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1152.2582244873047,\r
+        "y": 632.0041282176971,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "ec201f5b.98b55"\r
+                "753161a4.e4105"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d8ac8b6.f23b18",\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": 1189.2539901733398,\r
-        "y": 544.4177227020264,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1177.2578964233398,\r
+        "y": 549.0040645599365,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "cc689d86.6d6b1"\r
+                "ffc92a35.504858"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec201f5b.98b55",\r
+        "id": "753161a4.e4105",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1378.2541313171387,\r
-        "y": 624.4177711009979,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1366.2580375671387,\r
+        "y": 629.0041129589081,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "137ad5db.05e33a"\r
+                "530b71d0.67585"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42b7ec46.f75e94",\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": 1767.254322052002,\r
-        "y": 621.4179258346558,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1755.258228302002,\r
+        "y": 626.0042676925659,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "6fa7e982.f0f398"\r
+                "e3d2d09b.6274e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6fa7e982.f0f398",\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": 2059.2542114257812,\r
-        "y": 622.4178848266602,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2047.2581176757812,\r
+        "y": 627.0042266845703,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "a93d7d08.b19f3"\r
+                "9b1b7b47.77c908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a93d7d08.b19f3",\r
+        "id": "9b1b7b47.77c908",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2258.254379272461,\r
-        "y": 620.4178848266602,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2246.258285522461,\r
+        "y": 625.0042266845703,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "8ce50095.7309f"\r
+                "6eb0efd.3e47b1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ce50095.7309f",\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": 2431.254383087158,\r
-        "y": 620.4179258346558,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2419.258289337158,\r
+        "y": 625.0042676925659,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6331828e.70aa2c",\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": 637.2539215087891,\r
-        "y": 476.4176778793335,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 625.2578277587891,\r
+        "y": 481.00401973724365,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "1adddcaf.a133d3"\r
+                "cc302ad2.335ad8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "125425fb.ef4bfa",\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": 1232.0042877197266,\r
-        "y": 748.417646408081,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1220.0081939697266,\r
+        "y": 753.0039882659912,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "7336ac27.633e24"\r
+                "d5fc4f12.f3715"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38f21693.f6208a",\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": 765.0041732788086,\r
-        "y": 819.4176635742188,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 753.0080795288086,\r
+        "y": 824.0040054321289,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "e28cdf4a.09f99"\r
+                "f0f279f1.f5aee8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58afb0e4.ba7df",\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": 629.0039825439453,\r
-        "y": 646.4175662994385,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 617.0078887939453,\r
+        "y": 651.0039081573486,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "74d2892.3a20c78"\r
+                "a69a253a.e8e958"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7336ac27.633e24",\r
+        "id": "d5fc4f12.f3715",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1454.0042037963867,\r
-        "y": 748.4177279472351,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1442.0081100463867,\r
+        "y": 753.0040698051453,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "6d31748d.e3c9bc"\r
+                "41fe08aa.15b428"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d31748d.e3c9bc",\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": 1535.2542114257812,\r
-        "y": 822.9177293777466,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1523.2581176757812,\r
+        "y": 827.5040712356567,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "7cb6a87.6e3f758"\r
+                "687fd9fe.041c58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1008121d.0f833e",\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": 1918.2545700073242,\r
-        "y": 829.9178366661072,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1906.2584762573242,\r
+        "y": 834.5041785240173,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "7c572003.6098f"\r
+                "b38ab304.d8ca8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c572003.6098f",\r
+        "id": "b38ab304.d8ca8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2095.2545890808105,\r
-        "y": 832.9176769256592,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2083.2584953308105,\r
+        "y": 837.5040187835693,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "8daf5324.de268"\r
+                "3a704ef2.91c232"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63cd961f.c156c8",\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": 2479.255096435547,\r
-        "y": 806.9177284240723,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2467.259002685547,\r
+        "y": 811.5040702819824,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8daf5324.de268",\r
+        "id": "3a704ef2.91c232",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2254.504779815674,\r
-        "y": 828.4177169799805,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2242.508686065674,\r
+        "y": 833.0040588378906,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "63cd961f.c156c8",\r
-                "4f58a0f5.56037",\r
-                "975b7faf.1862a"\r
+                "97126ca9.bd5cb",\r
+                "82be127b.4ba08",\r
+                "e04e88b3.6b7888"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89ba2ad0.277798",\r
+        "id": "37a0c49e.52f2ec",\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": 590.0039291381836,\r
-        "y": 965.9176549911499,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 578.0078353881836,\r
+        "y": 970.5039968490601,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "2d233c53.3f6be4",\r
-                "f1938aaa.240958",\r
-                "46bd4734.d48208"\r
+                "737a26fd.e1dab8",\r
+                "dacb633c.487af",\r
+                "48a17fc2.d83c5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d233c53.3f6be4",\r
+        "id": "737a26fd.e1dab8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 834.0039901733398,\r
-        "y": 929.9176549911499,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 822.0078964233398,\r
+        "y": 934.5039968490601,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "157032ce.bbb88d"\r
+                "e7e7ee2.fc0eb1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1938aaa.240958",\r
+        "id": "dacb633c.487af",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 836.494873046875,\r
-        "y": 965.4916915893555,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 824.498779296875,\r
+        "y": 970.0780334472656,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "4af9366b.00d608"\r
+                "3d818670.7778da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "46bd4734.d48208",\r
+        "id": "48a17fc2.d83c5",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 831.827880859375,\r
-        "y": 1001.8250503540039,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 819.831787109375,\r
+        "y": 1006.4113922119141,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "3961a91d.651c56"\r
+                "42fa81a1.deae7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3961a91d.651c56",\r
+        "id": "42fa81a1.deae7",\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": 985.6003723144531,\r
-        "y": 999.2641372680664,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 973.6042785644531,\r
+        "y": 1003.8504791259766,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4af9366b.00d608",\r
+        "id": "3d818670.7778da",\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": 982.0662689208984,\r
-        "y": 963.7773790359497,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 970.0701751708984,\r
+        "y": 968.3637208938599,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "157032ce.bbb88d",\r
+        "id": "e7e7ee2.fc0eb1",\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": 994.5041007995605,\r
-        "y": 927.917594909668,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 982.5080070495605,\r
+        "y": 932.5039367675781,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e99d476c.3f3ac8",\r
+        "id": "88d74976.c878b8",\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": 603.9421615600586,\r
-        "y": 1069.03874874115,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 591.9460678100586,\r
+        "y": 1073.62509059906,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "e801e029.f1d5a",\r
-                "8d93013.82561"\r
+                "76d84be1.6ba5b4",\r
+                "93f8c0dc.5b81e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e801e029.f1d5a",\r
+        "id": "76d84be1.6ba5b4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 838.9422874450684,\r
-        "y": 1055.038737297058,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 826.9461936950684,\r
+        "y": 1059.6250791549683,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "aaae6df9.4c056"\r
+                "f2b8e32a.bae75"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d93013.82561",\r
+        "id": "93f8c0dc.5b81e",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 838.1922874450684,\r
-        "y": 1090.6816444396973,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 826.1961936950684,\r
+        "y": 1095.2679862976074,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "5e0c2f7e.4b122"\r
+                "f416c022.785c9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e0c2f7e.4b122",\r
+        "id": "f416c022.785c9",\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": 986.9422950744629,\r
-        "y": 1091.4317264556885,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 974.9462013244629,\r
+        "y": 1096.0180683135986,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aaae6df9.4c056",\r
+        "id": "f2b8e32a.bae75",\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": 980.9422950744629,\r
-        "y": 1054.0387382507324,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 968.9462013244629,\r
+        "y": 1058.6250801086426,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e8785c39.cc512",\r
+        "id": "b028cd6d.5db14",\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": 630.0312576293945,\r
-        "y": 1220.4918870925903,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 618.0351638793945,\r
+        "y": 1225.0782289505005,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "552b4230.a57a2c",\r
-                "a21ab43e.f1ce68"\r
+                "fb8d6372.3f4b4",\r
+                "48c81a07.925bc4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "552b4230.a57a2c",\r
+        "id": "fb8d6372.3f4b4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 879.0313167572021,\r
-        "y": 1234.4920930862427,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 867.0352230072021,\r
+        "y": 1239.0784349441528,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "d1a4e04e.60501"\r
+                "a8972b96.6e4798"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a21ab43e.f1ce68",\r
+        "id": "48c81a07.925bc4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 879.0313167572021,\r
-        "y": 1196.491928577423,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 867.0352230072021,\r
+        "y": 1201.0782704353333,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "54a6d547.da0aec"\r
+                "2b546f30.f74b7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "54a6d547.da0aec",\r
+        "id": "2b546f30.f74b7",\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": 1023.0316505432129,\r
-        "y": 1195.491928100586,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1011.0355567932129,\r
+        "y": 1200.078269958496,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d1a4e04e.60501",\r
+        "id": "a8972b96.6e4798",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1026.031328201294,\r
-        "y": 1235.4919319152832,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1014.035234451294,\r
+        "y": 1240.0782737731934,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c5c8c91e.ca8b48",\r
+        "id": "7630dbec.718c24",\r
         "type": "comment",\r
         "name": "Delete port",\r
         "info": "",\r
         "comments": "",\r
-        "x": 531.6971969604492,\r
-        "y": 1186.9359111785889,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 519.7011032104492,\r
+        "y": 1191.522253036499,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "81163bc0.74e178",\r
+        "id": "7eaf7940.931d68",\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": 578.6971969604492,\r
-        "y": 1135.6023473739624,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 566.7011032104492,\r
+        "y": 1140.1886892318726,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a939bddc.25a0a",\r
+        "id": "ea684fc6.056a2",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1052.6815071105957,\r
-        "y": 1315.6025159358978,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1040.6854133605957,\r
+        "y": 1320.188857793808,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "991e6562.cad008",\r
-                "a675752c.fef5c8"\r
+                "3b59cd60.020932",\r
+                "c2414827.1f0308"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "991e6562.cad008",\r
+        "id": "3b59cd60.020932",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1373.6815338134766,\r
-        "y": 1332.6028363704681,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1361.6854400634766,\r
+        "y": 1337.1891782283783,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "fb3cfb9f.764a18"\r
+                "ce1097ce.dee208"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a675752c.fef5c8",\r
+        "id": "c2414827.1f0308",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1376.6815605163574,\r
-        "y": 1297.6026179790497,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1364.6854667663574,\r
+        "y": 1302.1889598369598,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "92f1575b.a1bfb8"\r
+                "eb07b224.53901"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92f1575b.a1bfb8",\r
+        "id": "eb07b224.53901",\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": 1579.6819496154785,\r
-        "y": 1293.6027252674103,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1567.6858558654785,\r
+        "y": 1298.1890671253204,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fb3cfb9f.764a18",\r
+        "id": "ce1097ce.dee208",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1580.6815147399902,\r
-        "y": 1328.602591753006,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1568.6854209899902,\r
+        "y": 1333.1889336109161,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d50d1b79.abf9a8",\r
+        "id": "fb63c3bc.ee861",\r
         "type": "comment",\r
         "name": "Create bridge domain",\r
         "info": "",\r
         "comments": "",\r
-        "x": 996.3474006652832,\r
-        "y": 1282.0467417240143,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 984.3513069152832,\r
+        "y": 1286.6330835819244,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "60ca269e.96d878",\r
+        "id": "ea24678.936eb98",\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": 561.4590759277344,\r
-        "y": 1331.2692050933838,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 549.4629821777344,\r
+        "y": 1335.855546951294,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "13b85938.8b9cd7"\r
+                "3354418d.f828fe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13b85938.8b9cd7",\r
+        "id": "3354418d.f828fe",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 749.4590034484863,\r
-        "y": 1329.3805322647095,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 737.4629096984863,\r
+        "y": 1333.9668741226196,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "a939bddc.25a0a"\r
+                "ea684fc6.056a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba5b2145.40753",\r
+        "id": "1a442450.4a365c",\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": 577.0039672851562,\r
-        "y": 1417.1676979064941,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 565.0078735351562,\r
+        "y": 1421.7540397644043,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "575235a2.fb9bbc",\r
-                "3c20212c.49fade"\r
+                "9d1d8447.931768",\r
+                "a4c1e51b.fe66b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c20212c.49fade",\r
+        "id": "a4c1e51b.fe66b8",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 778.0039863586426,\r
-        "y": 1395.1676893234253,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 766.0078926086426,\r
+        "y": 1399.7540311813354,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "bdf015ad.4678f8"\r
+                "1daa2649.cf0d8a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "575235a2.fb9bbc",\r
+        "id": "9d1d8447.931768",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 778.0039901733398,\r
-        "y": 1436.1676931381226,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 766.0078964233398,\r
+        "y": 1440.7540349960327,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "133c89f4.2a7c76"\r
+                "77f9f3ef.24297c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bdf015ad.4678f8",\r
+        "id": "1daa2649.cf0d8a",\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": 975.0040054321289,\r
-        "y": 1393.1676893234253,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 963.0079116821289,\r
+        "y": 1397.7540311813354,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "133c89f4.2a7c76",\r
+        "id": "77f9f3ef.24297c",\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": 933.0039978027344,\r
-        "y": 1433.1676921844482,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 921.0079040527344,\r
+        "y": 1437.7540340423584,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "372eb63a.83ff6a",\r
+        "id": "623ff011.75e11",\r
         "type": "comment",\r
         "name": "TODO: split ip/mask",\r
         "info": "",\r
         "comments": "",\r
-        "x": 974.0136375427246,\r
-        "y": 1355.3479614257812,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 962.0175437927246,\r
+        "y": 1359.9343032836914,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "86da8112.f0417",\r
+        "id": "b07d774b.c67f18",\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": 635.7753372192383,\r
-        "y": 1493.2885875701904,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 623.7792434692383,\r
+        "y": 1497.8749294281006,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "15bd3770.c63fa9",\r
-                "248a192b.d86396"\r
+                "fb6426f0.aef3a8",\r
+                "334c3bc2.ea5ee4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "248a192b.d86396",\r
+        "id": "334c3bc2.ea5ee4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 904.7753677368164,\r
-        "y": 1480.2885599136353,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 892.7792739868164,\r
+        "y": 1484.8749017715454,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "616ee6f.3d9a718"\r
+                "1de305ac.79165a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15bd3770.c63fa9",\r
+        "id": "fb6426f0.aef3a8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 901.7753410339355,\r
-        "y": 1515.2887783050537,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 889.7792472839355,\r
+        "y": 1519.8751201629639,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "40c5dea7.9b57"\r
+                "e16c200f.f574"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "616ee6f.3d9a718",\r
+        "id": "1de305ac.79165a",\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": 1057.775749206543,\r
-        "y": 1476.2887859344482,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1045.779655456543,\r
+        "y": 1480.8751277923584,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40c5dea7.9b57",\r
+        "id": "e16c200f.f574",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1048.7753219604492,\r
-        "y": 1516.2885341644287,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1036.7792282104492,\r
+        "y": 1520.8748760223389,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "339192eb.51711e"\r
+                "3689e594.d6f2aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "339192eb.51711e",\r
+        "id": "3689e594.d6f2aa",\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
         "comments": "",\r
-        "x": 1255.6644248962402,\r
-        "y": 1518.622000694275,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1243.6683311462402,\r
+        "y": 1523.208342552185,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6c0bf23f.5303ac",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 652.2857360839844,\r
-        "y": 1651.7474851608276,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 640.2896423339844,\r
+        "y": 1656.3338270187378,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "6503000e.7fe09",\r
-                "f95d774d.951318"\r
+                "f2309f9f.30389",\r
+                "436824e6.cfd19c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f95d774d.951318",\r
+        "id": "436824e6.cfd19c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 898.2856712341309,\r
-        "y": 1687.7468357086182,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 886.2895774841309,\r
+        "y": 1692.3331775665283,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "1f602715.4e71b9"\r
+                "cc161513.6096e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f602715.4e71b9",\r
+        "id": "cc161513.6096e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1070.2856121063232,\r
-        "y": 1701.7468520402908,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1058.2895183563232,\r
+        "y": 1706.333193898201,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7c916735.dbf778",\r
+        "id": "f1b7a0fd.a1f56",\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": 1070.2857341766357,\r
-        "y": 1657.7468520402908,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1058.2896404266357,\r
+        "y": 1662.333193898201,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6503000e.7fe09",\r
+        "id": "f2309f9f.30389",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 902.2855892181396,\r
-        "y": 1645.7468347549438,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 890.2894954681396,\r
+        "y": 1650.333176612854,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "7c916735.dbf778"\r
+                "f1b7a0fd.a1f56"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b5c8466.72828c",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 619.2841186523438,\r
-        "y": 1585.246587753296,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 607.2880249023438,\r
+        "y": 1589.832929611206,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "593d6e8d.d4036",\r
-                "22423ed9.18f8e2"\r
+                "5dca5344.cc070c",\r
+                "f5dbcc17.8c2d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22423ed9.18f8e2",\r
+        "id": "f5dbcc17.8c2d6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 844.2840175628662,\r
-        "y": 1605.246500134468,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 832.2879238128662,\r
+        "y": 1609.8328419923782,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "b88f4563.6b6768"\r
+                "ffd8c00c.52d8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b88f4563.6b6768",\r
+        "id": "ffd8c00c.52d8c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1014.28395652771,\r
-        "y": 1608.246500134468,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1002.28786277771,\r
+        "y": 1612.8328419923782,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a724847c.2c4088",\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
         "comments": "",\r
-        "x": 1014.2840785980225,\r
-        "y": 1564.246500134468,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1002.2879848480225,\r
+        "y": 1568.8328419923782,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "593d6e8d.d4036",\r
+        "id": "5dca5344.cc070c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 847.28395652771,\r
-        "y": 1564.246500134468,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 835.28786277771,\r
+        "y": 1568.8328419923782,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "a724847c.2c4088"\r
+                "60415.0a145bec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f47d1c3.9d407e",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1210.2859420776367,\r
-        "y": 869.7469148635864,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1198.2898483276367,\r
+        "y": 874.3332567214966,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "6200b940.359218"\r
+                "35e81d22.6ca8a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e28cdf4a.09f99",\r
+        "id": "f0f279f1.f5aee8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 967.6190452575684,\r
-        "y": 798.746994972229,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 955.6229515075684,\r
+        "y": 803.3333368301392,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "125425fb.ef4bfa",\r
-                "1f47d1c3.9d407e",\r
-                "712ec051.8d2a6"\r
+                "427eb2b2.29a19c",\r
+                "55cb7e10.b843e",\r
+                "ee6738c4.de8eb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6200b940.359218",\r
+        "id": "35e81d22.6ca8a2",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1305.9524536132812,\r
-        "y": 943.7469959259033,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1293.9563598632812,\r
+        "y": 948.3333377838135,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "309bb160.fe92de"\r
+                "50c0c92c.64de28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "309bb160.fe92de",\r
+        "id": "50c0c92c.64de28",\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": 1520.2023391723633,\r
-        "y": 945.2469725608826,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1508.2062454223633,\r
+        "y": 949.8333144187927,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "1ac88e91.8c9681"\r
+                "759cda21.f2dc74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1ac88e91.8c9681",\r
+        "id": "759cda21.f2dc74",\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": 1767.202377319336,\r
-        "y": 940.2470555305481,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1755.206283569336,\r
+        "y": 944.8333973884583,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "3a5e3420.dfdfbc"\r
+                "848c4744.1c01a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a5e3420.dfdfbc",\r
+        "id": "848c4744.1c01a8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1917.9523315429688,\r
-        "y": 941.7469711303711,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1905.9562377929688,\r
+        "y": 946.3333129882812,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "f542060.75c12f8"\r
+                "3b552595.502b8a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f542060.75c12f8",\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": 2091.953079223633,\r
-        "y": 941.747029542923,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2079.956985473633,\r
+        "y": 946.3333714008331,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4f58a0f5.56037",\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": 2522.2864532470703,\r
-        "y": 847.747029542923,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2510.2903594970703,\r
+        "y": 852.3333714008331,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "975b7faf.1862a",\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": 2553.286346435547,\r
-        "y": 890.7469959259033,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2541.290252685547,\r
+        "y": 895.3333377838135,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d3ab3217.7d57a",\r
+        "id": "76875429.7977ec",\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
         "comments": "",\r
-        "x": 639.2857208251953,\r
-        "y": 595.7469882965088,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 627.2896270751953,\r
+        "y": 600.333330154419,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7cb6a87.6e3f758",\r
+        "id": "687fd9fe.041c58",\r
         "type": "block",\r
         "name": "block atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1752.6193771362305,\r
-        "y": 823.7469940185547,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1740.6232833862305,\r
+        "y": 828.3333358764648,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "1008121d.0f833e",\r
-                "38f1f3d9.ea90fc",\r
-                "65c7e0ab.e924d"\r
+                "703289c8.f0d638",\r
+                "7c3e64c6.118e7c",\r
+                "fd5e762b.9175c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38f1f3d9.ea90fc",\r
+        "id": "7c3e64c6.118e7c",\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": 1914.9523086547852,\r
-        "y": 754.7469930648804,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1902.9562149047852,\r
+        "y": 759.3333349227905,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "e4b2cfb7.2be02"\r
+                "9d3d23c.1af69e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e4b2cfb7.2be02",\r
+        "id": "9d3d23c.1af69e",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2077.9523124694824,\r
-        "y": 749.7469940185547,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2065.9562187194824,\r
+        "y": 754.3333358764648,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "cbd09e2f.5bc81"\r
+                "b50c3782.0e6ad8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cbd09e2f.5bc81",\r
+        "id": "b50c3782.0e6ad8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2245.9523544311523,\r
-        "y": 743.746992111206,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2233.9562606811523,\r
+        "y": 748.3333339691162,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "3c601cb.4b2f2e4",\r
-                "2d319605.7a6e9a"\r
+                "1dffa18.8cf065f",\r
+                "4b307f30.7cc1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d319605.7a6e9a",\r
+        "id": "4b307f30.7cc1",\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": 2440.9524841308594,\r
-        "y": 704.7469835281372,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2428.9563903808594,\r
+        "y": 709.3333253860474,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "bb6dcfdd.128fa"\r
+                "fcbf0bd1.06d8d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c601cb.4b2f2e4",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2437.952590942383,\r
-        "y": 759.7469990253448,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2425.956497192383,\r
+        "y": 764.333340883255,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "b131819c.daa97"\r
+                "99c61a76.666788"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91128780.38fd08",\r
+        "id": "4a479c02.0630f4",\r
         "type": "set",\r
         "name": "set spoke role",\r
         "xml": "<set>\n<parameter name='prop.role' value=\"spoke\" />\n",\r
         "comments": "",\r
-        "x": 2770.952606201172,\r
-        "y": 698.7470293045044,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2758.956512451172,\r
+        "y": 703.3333711624146,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c4199cad.d68d",\r
+        "id": "5e79562c.63b268",\r
         "type": "set",\r
         "name": "set hub role",\r
         "xml": "<set>\n<parameter name='prop.role' value=\"hub\" />\n",\r
         "comments": "",\r
-        "x": 2769.952365875244,\r
-        "y": 753.747013092041,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2757.956272125244,\r
+        "y": 758.3333549499512,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bb6dcfdd.128fa",\r
+        "id": "fcbf0bd1.06d8d8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2610.9524536132812,\r
-        "y": 700.4136581420898,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2598.9563598632812,\r
+        "y": 705,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "91128780.38fd08"\r
+                "4a479c02.0630f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b131819c.daa97",\r
+        "id": "99c61a76.666788",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2614.9524536132812,\r
-        "y": 755.4136581420898,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2602.9563598632812,\r
+        "y": 760,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "c4199cad.d68d"\r
+                "5e79562c.63b268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "16e6f83a.5e7ff8",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 617.3170700073242,\r
-        "y": 1867.4452047348022,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 605.3209762573242,\r
+        "y": 1872.0315465927124,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "65c7e0ab.e924d",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1910.3169555664062,\r
-        "y": 698.9449081420898,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1898.3208618164062,\r
+        "y": 703.53125,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "712ec051.8d2a6",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1153.3171730041504,\r
-        "y": 699.9450273513794,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1141.3210792541504,\r
+        "y": 704.5313692092896,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "500d4c8a.78bee4",\r
+        "id": "5ab12293.b61a8c",\r
         "type": "comment",\r
         "name": "**revert the changes",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1311.316982269287,\r
-        "y": 704.4449405670166,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1299.320888519287,\r
+        "y": 709.0312824249268,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "137ad5db.05e33a",\r
+        "id": "530b71d0.67585",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1536.3333740234375,\r
-        "y": 621.6667051315308,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1524.3372802734375,\r
+        "y": 626.2530469894409,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "42b7ec46.f75e94",\r
-                "5c976c54.43c564"\r
+                "db40c5ed.6ed418",\r
+                "68d688c3.70e818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c976c54.43c564",\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
         "comments": "",\r
-        "x": 1728.0000495910645,\r
-        "y": 551.6666831970215,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1716.0039558410645,\r
+        "y": 556.2530250549316,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "74d2892.3a20c78",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 886.0003509521484,\r
-        "y": 673.0000200271606,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 874.0042572021484,\r
+        "y": 677.5863618850708,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "cfdd9f28.400e6"\r
+                "5ecfed21.a77fb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cfdd9f28.400e6",\r
+        "id": "5ecfed21.a77fb4",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 674.0005035400391,\r
-        "y": 748.0000233650208,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 662.0044097900391,\r
+        "y": 752.5863652229309,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "38f21693.f6208a"\r
+                "9c314385.3cccd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fef5106c.cc924",\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": 749.0000915527344,\r
-        "y": 845.0000410079956,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 737.0039978027344,\r
+        "y": 849.5863828659058,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2ee3209f.a1bb9",\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
         "comments": "",\r
-        "x": 605.0000915527344,\r
-        "y": 1719.6667194366455,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 593.0039978027344,\r
+        "y": 1724.2530612945557,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bfac8597.a517f8",\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
         "comments": "",\r
-        "x": 639.3032913208008,\r
-        "y": 1763.4698286056519,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 627.3071975708008,\r
+        "y": 1768.056170463562,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b282b047.e838d",\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
         "comments": "",\r
-        "x": 606.3033180236816,\r
-        "y": 1816.4698705673218,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 594.3072242736816,\r
+        "y": 1821.056212425232,\r
+        "z": "eb27f9f.1aaf508",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b36b6e5f.5d733",\r
+        "type": "switchNode",\r
+        "name": "switch vnf-index",\r
+        "xml": "<switch test='`$vnf-index`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 596.00390625,\r
+        "y": 287.00390625,\r
+        "z": "eb27f9f.1aaf508",\r
+        "wires": [\r
+            [\r
+                "eab1927d.01f0a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "eab1927d.01f0a",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 758.0039520263672,\r
+        "y": 286.0039052963257,\r
+        "z": "eb27f9f.1aaf508",\r
+        "wires": [\r
+            [\r
+                "a638e200.1e293"\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
+        "comments": "",\r
+        "x": 907.2540435791016,\r
+        "y": 283.78178310394287,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
index 77575c2..2a0a3af 100644 (file)
                     </outcome>\r
                 </switch>\r
             </for>\r
+            <switch test='`$vnf-index`'>\r
+                <outcome value=''>\r
+                    <return status='failure'>\r
+                        <parameter name='ack-final' value='Y'/>\r
+                        <parameter name="error-code" value="500" />\r
+                        <parameter name="error-message" value="vnf id not found in service-data" />\r
+                    </return>\r
+                </outcome>\r
+            </switch>\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
@@ -63,7 +72,7 @@
             <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
+                        <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