From 49b479f11182ca07d33ee191bb3f5f0585eb2625 Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Sun, 21 Apr 2019 13:08:21 +0530
Subject: [PATCH] updated lan-port-deactivate DG with vnf-id null check

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
---
 ...-API_sdwan-vf-operation-lanport-deactivate.json | 1298 ++++++++++----------
 ...E-API_sdwan-vf-operation-lanport-deactivate.xml |   11 +-
 2 files changed, 681 insertions(+), 628 deletions(-)

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