From: prakash.e <prakash.e@huawei.com>
Date: Sun, 21 Apr 2019 06:31:16 +0000 (+0530)
Subject: Fixed device-id fetch issue in sdwan-lan-port DG
X-Git-Tag: 1.5.1~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=3cd25bb1aa7ec61f63c9f9c1dd67f964057efce1

Fixed device-id fetch issue in sdwan-lan-port DG

Fixed sdwan-lan-port-activate DG by fetching deviceId
in service-data by passing device name in valid
input parameter

Change-Id: I4f5bab7f5f09f6bd35334854c490fcfef862454a
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>

Former-commit-id: c3e0c12aca66c5b5da4e0fa6a24b034aa35b03a2
---

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
index 138d31fb..861a58ae 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
@@ -1,38 +1,38 @@
 [
     {
-        "id": "cea6a9f1.279478",
+        "id": "d9c4f19e.fd2e7",
         "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": 570.7143020629883,
-        "y": 337.99999046325684,
-        "z": "2f0cf160.dc107e",
+        "x": 672.25390625,
+        "y": 347.99999046325684,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "4a89ecf7.049034",
-                "2a09fa32.63fc36",
-                "c2f1098d.e8bd38"
+                "cef58dbf.65cb",
+                "2919e925.39dec6",
+                "e1d6ced2.e1fdf"
             ]
         ]
     },
     {
-        "id": "1833f3f4.1b830c",
+        "id": "f7e66a22.01e028",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 107.71429824829102,
-        "y": 29,
-        "z": "2f0cf160.dc107e",
+        "x": 209.25390243530273,
+        "y": 39,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "181dc2fc.e539bd"
+                "c86c7fcc.d57a3"
             ]
         ]
     },
     {
-        "id": "181dc2fc.e539bd",
+        "id": "c86c7fcc.d57a3",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -40,1814 +40,1879 @@
         "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": 177,
-        "y": 92.23810958862305,
-        "z": "2f0cf160.dc107e",
+        "x": 278.5396041870117,
+        "y": 102.23810958862305,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "25791551.06845a"
+                "8a66936c.4ecc5"
             ]
         ]
     },
     {
-        "id": "25791551.06845a",
+        "id": "8a66936c.4ecc5",
         "type": "method",
         "name": "method sdwan-vf-operation-lanport-activate",
         "xml": "<method rpc='sdwan-vf-operation-lanport-activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 188.71429443359375,
-        "y": 186.58634185791016,
-        "z": "2f0cf160.dc107e",
+        "x": 290.25389862060547,
+        "y": 196.58634185791016,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "419d7afa.b1ca54"
+                "b4cb95ed.cde538"
             ]
         ]
     },
     {
-        "id": "419d7afa.b1ca54",
+        "id": "b4cb95ed.cde538",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 189.38096618652344,
-        "y": 442.666708946228,
-        "z": "2f0cf160.dc107e",
-        "wires": [
-            [
-                "f5110085.4f487",
-                "f62e0d25.9e73c",
-                "cea6a9f1.279478",
-                "76df47d2.f28eb8",
-                "3a550152.acb95e",
-                "bad651b2.12a17",
-                "a66a0a0e.fef0c8",
-                "f2a2fd31.6afea",
-                "11a6133a.d1ed1d",
-                "6bb3e148.a2b06",
-                "233d7734.c6ad18",
-                "ec89c38e.b0db3",
-                "cfe4c928.772628",
-                "307480f2.c3f12",
-                "83adcbda.9cab18",
-                "41a8aff.133475",
-                "bf4ca0a0.f719b",
-                "14cdbea6.6ff3c1",
-                "96f47da7.f3275",
-                "7299f238.fa9f1c",
-                "e4f03070.b443a",
-                "1e3434c6.db511b",
-                "56401cb0.1f0164"
-            ]
-        ]
-    },
-    {
-        "id": "f62e0d25.9e73c",
+        "x": 290.92057037353516,
+        "y": 452.666708946228,
+        "z": "d0c9a483.09f7c8",
+        "wires": [
+            [
+                "f3bcc30.03c554",
+                "ac79d525.fd1fd8",
+                "d9c4f19e.fd2e7",
+                "1bfdbcc3.c7cd93",
+                "6e8941e2.a043c",
+                "901afcf1.d22f3",
+                "ef04791b.55e268",
+                "8364ef5f.25f26",
+                "6278217c.89959",
+                "760751d.6fd76b",
+                "cd4a9b23.d614c8",
+                "44113153.ffa83",
+                "b05dede5.e0278",
+                "45f5fb20.78ea64",
+                "b07fc696.74dd68",
+                "8fa1111d.08c36",
+                "a897b863.5cfc78",
+                "9bf6789f.a0ec08",
+                "537766b1.131458",
+                "8ffe71d6.e37e5",
+                "b5fcdf55.56396",
+                "695214fd.2c4fdc",
+                "188a2b9c.34d5e4"
+            ]
+        ]
+    },
+    {
+        "id": "ac79d525.fd1fd8",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 520.7456588745117,
-        "y": 266.2691411972046,
-        "z": "2f0cf160.dc107e",
+        "x": 622.2852630615234,
+        "y": 276.2691411972046,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "b7bf67d0.4c13b8"
+                "8d9e53be.f0301"
             ]
         ]
     },
     {
-        "id": "f5110085.4f487",
+        "id": "f3bcc30.03c554",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 525.7143135070801,
-        "y": 205.00001049041748,
-        "z": "2f0cf160.dc107e",
+        "x": 627.2539176940918,
+        "y": 215.00001049041748,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "61a8d0c5.ce10b"
+                "193a9775.d88519"
             ]
         ]
     },
     {
-        "id": "61a8d0c5.ce10b",
+        "id": "193a9775.d88519",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 705.7142944335938,
-        "y": 204,
-        "z": "2f0cf160.dc107e",
+        "x": 807.2538986206055,
+        "y": 214,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "3e167156.21c02e"
+                "4b9a0abb.eb1bb4"
             ]
         ]
     },
     {
-        "id": "3e167156.21c02e",
+        "id": "4b9a0abb.eb1bb4",
         "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": 855.1430206298828,
-        "y": 205.14291763305664,
-        "z": "2f0cf160.dc107e",
+        "x": 956.6826248168945,
+        "y": 215.14291763305664,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "b7bf67d0.4c13b8",
+        "id": "8d9e53be.f0301",
         "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": 743.7143096923828,
-        "y": 267.00000619888306,
-        "z": "2f0cf160.dc107e",
+        "x": 845.2539138793945,
+        "y": 277.00000619888306,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "29696342.56f90c"
+                "835ec48b.329e88"
             ]
         ]
     },
     {
-        "id": "29696342.56f90c",
+        "id": "835ec48b.329e88",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 958.7142944335938,
-        "y": 265,
-        "z": "2f0cf160.dc107e",
+        "x": 1060.2538986206055,
+        "y": 275,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "1ba7830b.c7ea6d"
+                "38760c6e.34c224"
             ]
         ]
     },
     {
-        "id": "1ba7830b.c7ea6d",
+        "id": "38760c6e.34c224",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1122.7142944335938,
-        "y": 260,
-        "z": "2f0cf160.dc107e",
+        "x": 1224.2538986206055,
+        "y": 270,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "2a09fa32.63fc36",
+        "id": "2919e925.39dec6",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 792.7142944335938,
-        "y": 372,
-        "z": "2f0cf160.dc107e",
+        "x": 894.2538986206055,
+        "y": 382,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "4ead305d.0b806"
+                "4642ed44.17b144"
             ]
         ]
     },
     {
-        "id": "4a89ecf7.049034",
+        "id": "cef58dbf.65cb",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 797.7142906188965,
-        "y": 318.9999990463257,
-        "z": "2f0cf160.dc107e",
+        "x": 899.2538948059082,
+        "y": 328.9999990463257,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "4ead305d.0b806"
+                "4642ed44.17b144"
             ]
         ]
     },
     {
-        "id": "4ead305d.0b806",
+        "id": "4642ed44.17b144",
         "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": 955.7142944335938,
-        "y": 332,
-        "z": "2f0cf160.dc107e",
+        "x": 1057.2538986206055,
+        "y": 342,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "c2f1098d.e8bd38",
+        "id": "e1d6ced2.e1fdf",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 792.7142944335938,
-        "y": 433,
-        "z": "2f0cf160.dc107e",
+        "x": 894.2538986206055,
+        "y": 443,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "2458c219.d10e1e"
+                "1bffa38f.f0c50c"
             ]
         ]
     },
     {
-        "id": "ead36ccd.33529",
+        "id": "3daf6135.38733e",
         "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": 1146.7143096923828,
-        "y": 431.0000139474869,
-        "z": "2f0cf160.dc107e",
+        "x": 1248.2539138793945,
+        "y": 441.0000139474869,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "2458c219.d10e1e",
+        "id": "1bffa38f.f0c50c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 953.7143402099609,
-        "y": 429.99999141693115,
-        "z": "2f0cf160.dc107e",
+        "x": 1055.2539443969727,
+        "y": 439.99999141693115,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "ead36ccd.33529",
-                "386f97ee.904d48"
+                "3daf6135.38733e",
+                "ef25b392.fb9e5"
             ]
         ]
     },
     {
-        "id": "386f97ee.904d48",
+        "id": "ef25b392.fb9e5",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1165.7142791748047,
-        "y": 483.99999046325684,
-        "z": "2f0cf160.dc107e",
+        "x": 1267.2538833618164,
+        "y": 493.99999046325684,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "593c39.dc7673c8"
+                "a5aa4ea3.3a9f8"
             ]
         ]
     },
     {
-        "id": "593c39.dc7673c8",
+        "id": "a5aa4ea3.3a9f8",
         "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": 1408.7142944335938,
-        "y": 479,
-        "z": "2f0cf160.dc107e",
+        "x": 1510.2538986206055,
+        "y": 489,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "1efda74.b0eb959"
+                "291f40c7.f811f"
             ]
         ]
     },
     {
-        "id": "1efda74.b0eb959",
+        "id": "291f40c7.f811f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1606.7143230438232,
-        "y": 466.0000066757202,
-        "z": "2f0cf160.dc107e",
+        "x": 1708.253927230835,
+        "y": 476.0000066757202,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "d0b5f3a2.35747"
+                "62bd116.37066f"
             ]
         ]
     },
     {
-        "id": "d0b5f3a2.35747",
+        "id": "62bd116.37066f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1758.7142944335938,
-        "y": 468,
-        "z": "2f0cf160.dc107e",
+        "x": 1860.2538986206055,
+        "y": 478,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "1fc6559e.18634a",
-                "802dea9f.3c2848",
-                "9329a8cc.23d418"
+                "fceeafa7.b7652",
+                "767f5d19.fe3e84",
+                "f1e44e3e.f0b3c"
             ]
         ]
     },
     {
-        "id": "1fc6559e.18634a",
+        "id": "fceeafa7.b7652",
         "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": 1986.7144088745117,
-        "y": 410.00000381469727,
-        "z": "2f0cf160.dc107e",
+        "x": 2088.2540130615234,
+        "y": 420.00000381469727,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "802dea9f.3c2848",
+        "id": "767f5d19.fe3e84",
         "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": 1990.7144088745117,
-        "y": 464.00000381469727,
-        "z": "2f0cf160.dc107e",
+        "x": 2092.2540130615234,
+        "y": 474.00000381469727,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "76df47d2.f28eb8",
+        "id": "1bfdbcc3.c7cd93",
         "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": 504.714412689209,
-        "y": 2079.501151561737,
-        "z": "2f0cf160.dc107e",
+        "x": 606.2540168762207,
+        "y": 2089.501151561737,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "9329a8cc.23d418",
+        "id": "f1e44e3e.f0b3c",
         "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": 2021.16943359375,
-        "y": 515.0104961395264,
-        "z": "2f0cf160.dc107e",
+        "x": 2122.7090377807617,
+        "y": 525.0104961395264,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b2d390ae.97474",
+        "id": "aa0d1480.7f1978",
         "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": 827.9683685302734,
-        "y": 520.0040225982666,
-        "z": "2f0cf160.dc107e",
+        "x": 1379.5080871582031,
+        "y": 553.0040807723999,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "7dff73e1.0243cc"
+                "9ed7ce57.d6ce"
             ]
         ]
     },
     {
-        "id": "3f6c843d.edec8c",
+        "id": "1f605289.f2eb7d",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1100.9686126708984,
-        "y": 606.0041282176971,
-        "z": "2f0cf160.dc107e",
+        "x": 1450.50830078125,
+        "y": 626.0042104721069,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "cb455713.e1bdd8"
+                "b123da61.76e8a8"
             ]
         ]
     },
     {
-        "id": "7dff73e1.0243cc",
+        "id": "9ed7ce57.d6ce",
         "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": 1125.9682846069336,
-        "y": 523.0040645599365,
-        "z": "2f0cf160.dc107e",
+        "x": 1665.5079345703125,
+        "y": 555.0041646957397,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "3f6c843d.edec8c"
+                "f599447.9ac3fb8"
             ]
         ]
     },
     {
-        "id": "cb455713.e1bdd8",
+        "id": "b123da61.76e8a8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1314.9684257507324,
-        "y": 603.0041129589081,
-        "z": "2f0cf160.dc107e",
+        "x": 1670.5080242156982,
+        "y": 627.0042181015015,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "8c1ad275.b541"
+                "2d7f5405.e9306c"
             ]
         ]
     },
     {
-        "id": "8c1ad275.b541",
+        "id": "2d7f5405.e9306c",
         "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": 1528.9684677124023,
-        "y": 599.0040664672852,
-        "z": "2f0cf160.dc107e",
+        "x": 1915.5081024169922,
+        "y": 627.0041356086731,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "6aaf6a5c.76e9f4"
+                "faceb28.d0a9d5"
             ]
         ]
     },
     {
-        "id": "6aaf6a5c.76e9f4",
+        "id": "faceb28.d0a9d5",
         "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": 1843.9685440063477,
-        "y": 598.0040471553802,
-        "z": "2f0cf160.dc107e",
+        "x": 2223.5083770751953,
+        "y": 610.0041036605835,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "85841cc6.de2b3"
+                "ec659d9d.8002"
             ]
         ]
     },
     {
-        "id": "85841cc6.de2b3",
+        "id": "ec659d9d.8002",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2045.9686737060547,
-        "y": 596.0040481090546,
-        "z": "2f0cf160.dc107e",
+        "x": 2432.508415222168,
+        "y": 612.004096031189,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "1722d3f0.fc82dc"
+                "73ebf520.d1f88c"
             ]
         ]
     },
     {
-        "id": "1722d3f0.fc82dc",
+        "id": "73ebf520.d1f88c",
         "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": 2220.9685668945312,
-        "y": 596.004228591919,
-        "z": "2f0cf160.dc107e",
+        "x": 2609.5083808898926,
+        "y": 608.0042867660522,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "3a550152.acb95e",
+        "id": "6e8941e2.a043c",
         "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": 573.9682159423828,
-        "y": 455.00401973724365,
-        "z": "2f0cf160.dc107e",
+        "x": 633.5078125,
+        "y": 420.00404262542725,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "b2d390ae.97474"
+                "5c633f8a.ecb75"
             ]
         ]
     },
     {
-        "id": "566234f6.d57f8c",
+        "id": "415f5cb9.3a6e44",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1168.7185821533203,
-        "y": 727.0039882659912,
-        "z": "2f0cf160.dc107e",
+        "x": 1270.258186340332,
+        "y": 737.0039882659912,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "d08758a.8a9d4a8"
+                "55fab2c0.18755c"
             ]
         ]
     },
     {
-        "id": "4a6e0872.754c78",
+        "id": "ba32492c.0e54c8",
         "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": 814.7184219360352,
-        "y": 694.0040283203125,
-        "z": "2f0cf160.dc107e",
+        "x": 916.2580261230469,
+        "y": 704.0040283203125,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "2141a4d0.4ed0ac"
+                "bd374d2.a7cdcb"
             ]
         ]
     },
     {
-        "id": "83adcbda.9cab18",
+        "id": "b07fc696.74dd68",
         "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": 565.7182769775391,
-        "y": 625.0039081573486,
-        "z": "2f0cf160.dc107e",
+        "x": 667.2578811645508,
+        "y": 635.0039081573486,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "4a6e0872.754c78"
+                "ba32492c.0e54c8"
             ]
         ]
     },
     {
-        "id": "d08758a.8a9d4a8",
+        "id": "55fab2c0.18755c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1390.7184982299805,
-        "y": 727.0040698051453,
-        "z": "2f0cf160.dc107e",
+        "x": 1492.2581024169922,
+        "y": 737.0040698051453,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "5c9349a5.10cdf8"
+                "2d0cb991.e67216"
             ]
         ]
     },
     {
-        "id": "5c9349a5.10cdf8",
+        "id": "2d0cb991.e67216",
         "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": 1471.968505859375,
-        "y": 801.5040712356567,
-        "z": "2f0cf160.dc107e",
+        "x": 1573.5081100463867,
+        "y": 811.5040712356567,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "78c531f9.c452d"
+                "f98893a0.de7a4"
             ]
         ]
     },
     {
-        "id": "78502254.1e1d1c",
+        "id": "39ba7083.5ed54",
         "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": 1854.968864440918,
-        "y": 808.5041785240173,
-        "z": "2f0cf160.dc107e",
+        "x": 1956.5084686279297,
+        "y": 818.5041785240173,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "cef8d9d4.a847d8"
+                "36c8a445.c6055c"
             ]
         ]
     },
     {
-        "id": "cef8d9d4.a847d8",
+        "id": "36c8a445.c6055c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2031.9688835144043,
-        "y": 811.5040187835693,
-        "z": "2f0cf160.dc107e",
+        "x": 2133.508487701416,
+        "y": 821.5040187835693,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "57774070.165c4"
+                "cb17586e.80dbb8"
             ]
         ]
     },
     {
-        "id": "26765522.97752a",
+        "id": "cafa7b8b.465778",
         "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": 2415.9693908691406,
-        "y": 785.5040702819824,
-        "z": "2f0cf160.dc107e",
+        "x": 2517.5089950561523,
+        "y": 795.5040702819824,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "57774070.165c4",
+        "id": "cb17586e.80dbb8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2191.2190742492676,
-        "y": 807.0040588378906,
-        "z": "2f0cf160.dc107e",
+        "x": 2292.7586784362793,
+        "y": 817.0040588378906,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "26765522.97752a",
-                "18aa70c2.f51f1f",
-                "95fdece9.83f56",
-                "13d1a87e.cc7dd8"
+                "cafa7b8b.465778",
+                "9412ef29.cc029",
+                "4b9ca75a.7fc698",
+                "2f9763b5.4e87fc"
             ]
         ]
     },
     {
-        "id": "41a8aff.133475",
+        "id": "8fa1111d.08c36",
         "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": 526.7182235717773,
-        "y": 944.5039968490601,
-        "z": "2f0cf160.dc107e",
+        "x": 628.2578277587891,
+        "y": 954.5039968490601,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "9e1e759b.490ef8",
-                "587c1d85.98e364",
-                "1fecffb3.fdfc1"
+                "4a5d401e.8bf8e",
+                "1ff4f9b4.f19fb6",
+                "8afdb3bf.1d43d"
             ]
         ]
     },
     {
-        "id": "9e1e759b.490ef8",
+        "id": "4a5d401e.8bf8e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 770.7182846069336,
-        "y": 908.5039968490601,
-        "z": "2f0cf160.dc107e",
+        "x": 872.2578887939453,
+        "y": 918.5039968490601,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "1eeec00d.ea37e"
+                "ec14c17f.6e2c1"
             ]
         ]
     },
     {
-        "id": "587c1d85.98e364",
+        "id": "1ff4f9b4.f19fb6",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 773.2091674804688,
-        "y": 944.0780334472656,
-        "z": "2f0cf160.dc107e",
+        "x": 874.7487716674805,
+        "y": 954.0780334472656,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "f1f9240f.1bbe98"
+                "7501ffb3.13588"
             ]
         ]
     },
     {
-        "id": "1fecffb3.fdfc1",
+        "id": "8afdb3bf.1d43d",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 768.5421752929688,
-        "y": 980.4113922119141,
-        "z": "2f0cf160.dc107e",
+        "x": 870.0817794799805,
+        "y": 990.4113922119141,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "e9937b5c.1de1c8"
+                "26b83768.3bb758"
             ]
         ]
     },
     {
-        "id": "e9937b5c.1de1c8",
+        "id": "26b83768.3bb758",
         "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": 922.3146667480469,
-        "y": 977.8504791259766,
-        "z": "2f0cf160.dc107e",
+        "x": 1023.8542709350586,
+        "y": 987.8504791259766,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "f1f9240f.1bbe98",
+        "id": "7501ffb3.13588",
         "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": 918.7805633544922,
-        "y": 942.3637208938599,
-        "z": "2f0cf160.dc107e",
+        "x": 1020.3201675415039,
+        "y": 952.3637208938599,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "1eeec00d.ea37e",
+        "id": "ec14c17f.6e2c1",
         "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": 931.2183952331543,
-        "y": 906.5039367675781,
-        "z": "2f0cf160.dc107e",
+        "x": 1032.757999420166,
+        "y": 916.5039367675781,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "bf4ca0a0.f719b",
+        "id": "a897b863.5cfc78",
         "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": 540.6564559936523,
-        "y": 1047.62509059906,
-        "z": "2f0cf160.dc107e",
+        "x": 642.1960601806641,
+        "y": 1057.62509059906,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "d05110e4.15f05",
-                "623a881a.ebe538"
+                "b99d5bfa.8263b8",
+                "3b97c655.fec2fa"
             ]
         ]
     },
     {
-        "id": "d05110e4.15f05",
+        "id": "b99d5bfa.8263b8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 775.6565818786621,
-        "y": 1033.6250791549683,
-        "z": "2f0cf160.dc107e",
+        "x": 877.1961860656738,
+        "y": 1043.6250791549683,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "adf2584e.694ce8"
+                "da99c661.cc9138"
             ]
         ]
     },
     {
-        "id": "623a881a.ebe538",
+        "id": "3b97c655.fec2fa",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 774.9065818786621,
-        "y": 1069.2679862976074,
-        "z": "2f0cf160.dc107e",
+        "x": 876.4461860656738,
+        "y": 1079.2679862976074,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "e8c30ab5.68d3b8"
+                "d1dde0a7.dc9a2"
             ]
         ]
     },
     {
-        "id": "e8c30ab5.68d3b8",
+        "id": "d1dde0a7.dc9a2",
         "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": 923.6565895080566,
-        "y": 1070.0180683135986,
-        "z": "2f0cf160.dc107e",
+        "x": 1025.1961936950684,
+        "y": 1080.0180683135986,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "adf2584e.694ce8",
+        "id": "da99c661.cc9138",
         "type": "set",
         "name": "set token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
         "comments": "",
-        "x": 917.6565895080566,
-        "y": 1032.6250801086426,
-        "z": "2f0cf160.dc107e",
+        "x": 1019.1961936950684,
+        "y": 1042.6250801086426,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "96f47da7.f3275",
+        "id": "537766b1.131458",
         "type": "execute",
         "name": "execute RestApiCallNode device port create",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`\" />\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": 566.7455520629883,
-        "y": 1199.0782289505005,
-        "z": "2f0cf160.dc107e",
+        "x": 668.28515625,
+        "y": 1209.0782289505005,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "50af67d.1491698",
-                "bef4965a.55b458"
+                "8649541f.c916f8",
+                "490b0339.21ab4c"
             ]
         ]
     },
     {
-        "id": "50af67d.1491698",
+        "id": "8649541f.c916f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 815.7456111907959,
-        "y": 1213.0784349441528,
-        "z": "2f0cf160.dc107e",
+        "x": 917.2852153778076,
+        "y": 1223.0784349441528,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "b4a513b9.d44d6"
+                "53d53343.edd9cc"
             ]
         ]
     },
     {
-        "id": "bef4965a.55b458",
+        "id": "490b0339.21ab4c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 815.7456111907959,
-        "y": 1175.0782704353333,
-        "z": "2f0cf160.dc107e",
+        "x": 917.2852153778076,
+        "y": 1185.0782704353333,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "d695c8db.015488"
+                "bb7e9ee8.bdde5"
             ]
         ]
     },
     {
-        "id": "d695c8db.015488",
+        "id": "bb7e9ee8.bdde5",
         "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": 959.7459449768066,
-        "y": 1174.078269958496,
-        "z": "2f0cf160.dc107e",
+        "x": 1061.2855491638184,
+        "y": 1184.078269958496,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "b4a513b9.d44d6",
+        "id": "53d53343.edd9cc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 962.7456226348877,
-        "y": 1214.0782737731934,
-        "z": "2f0cf160.dc107e",
+        "x": 1064.2852268218994,
+        "y": 1224.0782737731934,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             []
         ]
     },
     {
-        "id": "bad651b2.12a17",
+        "id": "901afcf1.d22f3",
         "type": "set",
         "name": "set prop.lan.devicePortId",
         "xml": "<set>\n<parameter name='prop.lan.devicePortId' value='`$portResp.success[0].id`' />\n",
         "comments": "",
-        "x": 509.4028129577637,
-        "y": 1252.1794338226318,
-        "z": "2f0cf160.dc107e",
+        "x": 610.9424171447754,
+        "y": 1262.1794338226318,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "1d5fca27.3bbea6",
+        "id": "44729f10.35f05",
         "type": "comment",
         "name": "Create port",
         "info": "",
         "comments": "",
-        "x": 468.41149139404297,
-        "y": 1165.522253036499,
-        "z": "2f0cf160.dc107e",
+        "x": 569.9510955810547,
+        "y": 1175.522253036499,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "14cdbea6.6ff3c1",
+        "id": "9bf6789f.a0ec08",
         "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": 515.411491394043,
-        "y": 1114.1886892318726,
-        "z": "2f0cf160.dc107e",
+        "x": 616.9510955810547,
+        "y": 1124.1886892318726,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             []
         ]
     },
     {
-        "id": "f52cabac.abeb68",
+        "id": "eeb61a62.766e08",
         "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": 989.3958015441895,
-        "y": 1294.188857793808,
-        "z": "2f0cf160.dc107e",
+        "x": 1090.9354057312012,
+        "y": 1304.188857793808,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "441eed4c.baf224",
-                "fa3f1c96.1fc6d"
+                "925721ce.9c9c3",
+                "4887b469.84db6c"
             ]
         ]
     },
     {
-        "id": "441eed4c.baf224",
+        "id": "925721ce.9c9c3",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1310.3958282470703,
-        "y": 1311.1891782283783,
-        "z": "2f0cf160.dc107e",
+        "x": 1411.935432434082,
+        "y": 1321.1891782283783,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "a63cb83c.98c9e8"
+                "ae68593e.8ba108"
             ]
         ]
     },
     {
-        "id": "fa3f1c96.1fc6d",
+        "id": "4887b469.84db6c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1313.3958549499512,
-        "y": 1276.1889598369598,
-        "z": "2f0cf160.dc107e",
+        "x": 1414.935459136963,
+        "y": 1286.1889598369598,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "421c7bf9.398d94"
+                "79f2f146.ca204"
             ]
         ]
     },
     {
-        "id": "421c7bf9.398d94",
+        "id": "79f2f146.ca204",
         "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": 1516.3962440490723,
-        "y": 1272.1890671253204,
-        "z": "2f0cf160.dc107e",
+        "x": 1617.935848236084,
+        "y": 1282.1890671253204,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "a63cb83c.98c9e8",
+        "id": "ae68593e.8ba108",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1517.395809173584,
-        "y": 1307.1889336109161,
-        "z": "2f0cf160.dc107e",
+        "x": 1618.9354133605957,
+        "y": 1317.1889336109161,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             []
         ]
     },
     {
-        "id": "7044fc7.42f8204",
+        "id": "ccce6236.dc74f",
         "type": "comment",
         "name": "Create bridge domain",
         "info": "",
         "comments": "",
-        "x": 933.061695098877,
-        "y": 1260.6330835819244,
-        "z": "2f0cf160.dc107e",
+        "x": 1034.6012992858887,
+        "y": 1270.6330835819244,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "a66a0a0e.fef0c8",
+        "id": "ef04791b.55e268",
         "type": "switchNode",
         "name": "switch portSwitch",
         "xml": "<switch test=\"`$prop.lan.portSwitch == 'layer2-port'`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 489.17326736450195,
-        "y": 1295.855489730835,
-        "z": "2f0cf160.dc107e",
+        "x": 590.7128715515137,
+        "y": 1305.855489730835,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "cc6612da.43a9"
+                "c3342bc2.390e38"
             ]
         ]
     },
     {
-        "id": "cc6612da.43a9",
+        "id": "c3342bc2.390e38",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 668.1732978820801,
-        "y": 1295.966812133789,
-        "z": "2f0cf160.dc107e",
+        "x": 769.7129020690918,
+        "y": 1305.966812133789,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "f52cabac.abeb68"
+                "eeb61a62.766e08"
             ]
         ]
     },
     {
-        "id": "f2a2fd31.6afea",
+        "id": "8364ef5f.25f26",
         "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": 513.71826171875,
-        "y": 1395.7540397644043,
-        "z": "2f0cf160.dc107e",
+        "x": 615.2578659057617,
+        "y": 1405.7540397644043,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "c87ddd20.90349",
-                "aaf35528.c457d8"
+                "760fe778.7861c8",
+                "4e9c561e.4ac8b8"
             ]
         ]
     },
     {
-        "id": "aaf35528.c457d8",
+        "id": "4e9c561e.4ac8b8",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 714.7182807922363,
-        "y": 1373.7540311813354,
-        "z": "2f0cf160.dc107e",
+        "x": 816.257884979248,
+        "y": 1383.7540311813354,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "f3c46122.a1ec5"
+                "3c0ad409.f6e78c"
             ]
         ]
     },
     {
-        "id": "c87ddd20.90349",
+        "id": "760fe778.7861c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 714.7182846069336,
-        "y": 1414.7540349960327,
-        "z": "2f0cf160.dc107e",
+        "x": 816.2578887939453,
+        "y": 1424.7540349960327,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "3701541a.3aea9c"
+                "af9e51cb.86f12"
             ]
         ]
     },
     {
-        "id": "f3c46122.a1ec5",
+        "id": "3c0ad409.f6e78c",
         "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": 911.7182998657227,
-        "y": 1371.7540311813354,
-        "z": "2f0cf160.dc107e",
+        "x": 1013.2579040527344,
+        "y": 1381.7540311813354,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "3701541a.3aea9c",
+        "id": "af9e51cb.86f12",
         "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": 869.7182922363281,
-        "y": 1411.7540340423584,
-        "z": "2f0cf160.dc107e",
+        "x": 971.2578964233398,
+        "y": 1421.7540340423584,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "6cdf4550.c744bc",
+        "id": "a9e3f075.4494b",
         "type": "comment",
         "name": "Create wan port",
         "info": "",
         "comments": "",
-        "x": 486.7281379699707,
-        "y": 1348.7640895843506,
-        "z": "2f0cf160.dc107e",
+        "x": 588.2677421569824,
+        "y": 1358.7640895843506,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "2701cb4.59cff34",
+        "id": "cd240d96.e63a6",
         "type": "comment",
         "name": "TODO: split ip/mask",
         "info": "",
         "comments": "",
-        "x": 910.7279319763184,
-        "y": 1333.9343032836914,
-        "z": "2f0cf160.dc107e",
+        "x": 1012.2675361633301,
+        "y": 1343.9343032836914,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "7299f238.fa9f1c",
+        "id": "8ffe71d6.e37e5",
         "type": "execute",
         "name": "execute RestApiCallNode IPSubnets create",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-ip-subnets.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/ip-subnets'`\" />\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": 572.489631652832,
-        "y": 1471.8749294281006,
-        "z": "2f0cf160.dc107e",
+        "x": 674.0292358398438,
+        "y": 1481.8749294281006,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "fe753b01.7a4008",
-                "c50acfa.66a383"
+                "87d7037c.ae081",
+                "b63381ea.1d864"
             ]
         ]
     },
     {
-        "id": "c50acfa.66a383",
+        "id": "b63381ea.1d864",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 841.4896621704102,
-        "y": 1458.8749017715454,
-        "z": "2f0cf160.dc107e",
+        "x": 943.0292663574219,
+        "y": 1468.8749017715454,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "da685c50.c0fca"
+                "594e98d1.fab688"
             ]
         ]
     },
     {
-        "id": "fe753b01.7a4008",
+        "id": "87d7037c.ae081",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 838.4896354675293,
-        "y": 1493.8751201629639,
-        "z": "2f0cf160.dc107e",
+        "x": 940.029239654541,
+        "y": 1503.8751201629639,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "7c874cb1.b7ec64"
+                "5e9af700.a76ce8"
             ]
         ]
     },
     {
-        "id": "da685c50.c0fca",
+        "id": "594e98d1.fab688",
         "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": 994.4900436401367,
-        "y": 1454.8751277923584,
-        "z": "2f0cf160.dc107e",
+        "x": 1096.0296478271484,
+        "y": 1464.8751277923584,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "7c874cb1.b7ec64",
+        "id": "5e9af700.a76ce8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 985.489616394043,
-        "y": 1494.8748760223389,
-        "z": "2f0cf160.dc107e",
+        "x": 1087.0292205810547,
+        "y": 1504.8748760223389,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "220d830a.a3737c"
+                "4982389d.632728"
             ]
         ]
     },
     {
-        "id": "220d830a.a3737c",
+        "id": "4982389d.632728",
         "type": "set",
         "name": "set prop.lan.lanPortId",
         "xml": "<set>\n<parameter name='prop.lan.lanPortId' value='`lanPortResp.success[0].id`' />\n",
         "comments": "",
-        "x": 1192.378719329834,
-        "y": 1497.208342552185,
-        "z": "2f0cf160.dc107e",
+        "x": 1293.9183235168457,
+        "y": 1507.208342552185,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "1e3434c6.db511b",
+        "id": "695214fd.2c4fdc",
         "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": 598.0000534057617,
-        "y": 1630.333706855774,
-        "z": "2f0cf160.dc107e",
+        "x": 699.5396575927734,
+        "y": 1640.333706855774,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "dad634fb.8374a8",
-                "222fdfc3.31cbd"
+                "d46aab2e.402878",
+                "f79fe60.440a918"
             ]
         ]
     },
     {
-        "id": "222fdfc3.31cbd",
+        "id": "f79fe60.440a918",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 836.9999675750732,
-        "y": 1677.333193898201,
-        "z": "2f0cf160.dc107e",
+        "x": 938.539571762085,
+        "y": 1687.333193898201,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "a113b13a.6f74c"
+                "be3a59b0.64c5a8"
             ]
         ]
     },
     {
-        "id": "a113b13a.6f74c",
+        "id": "be3a59b0.64c5a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1006.999906539917,
-        "y": 1680.333193898201,
-        "z": "2f0cf160.dc107e",
+        "x": 1108.5395107269287,
+        "y": 1690.333193898201,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             []
         ]
     },
     {
-        "id": "66af30b.a74d8d",
+        "id": "cb1060d7.72a6a",
         "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": 1007.0000286102295,
-        "y": 1636.333193898201,
-        "z": "2f0cf160.dc107e",
+        "x": 1108.5396327972412,
+        "y": 1646.333193898201,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "dad634fb.8374a8",
+        "id": "d46aab2e.402878",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 839.999906539917,
-        "y": 1636.333193898201,
-        "z": "2f0cf160.dc107e",
+        "x": 941.5395107269287,
+        "y": 1646.333193898201,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "66af30b.a74d8d"
+                "cb1060d7.72a6a"
             ]
         ]
     },
     {
-        "id": "e4f03070.b443a",
+        "id": "b5fcdf55.56396",
         "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": 559.9984092712402,
-        "y": 1561.8328762054443,
-        "z": "2f0cf160.dc107e",
+        "x": 661.538013458252,
+        "y": 1571.8328762054443,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "93f9856d.ae6458",
-                "98bd094d.9d68c8"
+                "1dcea603.d095ca",
+                "286fea94.caec26"
             ]
         ]
     },
     {
-        "id": "98bd094d.9d68c8",
+        "id": "286fea94.caec26",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 780.99831199646,
-        "y": 1583.8328419923782,
-        "z": "2f0cf160.dc107e",
+        "x": 882.5379161834717,
+        "y": 1593.8328419923782,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "54c36251.c8076c"
+                "8857322c.003b2"
             ]
         ]
     },
     {
-        "id": "54c36251.c8076c",
+        "id": "8857322c.003b2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 950.9982509613037,
-        "y": 1586.8328419923782,
-        "z": "2f0cf160.dc107e",
+        "x": 1052.5378551483154,
+        "y": 1596.8328419923782,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             []
         ]
     },
     {
-        "id": "719bdb7c.5a10b4",
+        "id": "94eea86a.175328",
         "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": 950.9983730316162,
-        "y": 1542.8328419923782,
-        "z": "2f0cf160.dc107e",
+        "x": 1052.537977218628,
+        "y": 1552.8328419923782,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "93f9856d.ae6458",
+        "id": "1dcea603.d095ca",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 783.9982509613037,
-        "y": 1542.8328419923782,
-        "z": "2f0cf160.dc107e",
+        "x": 885.5378551483154,
+        "y": 1552.8328419923782,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "719bdb7c.5a10b4"
+                "94eea86a.175328"
             ]
         ]
     },
     {
-        "id": "cdd2e071.957e3",
+        "id": "7ec433f0.4a2dec",
         "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": 1147.0002365112305,
-        "y": 848.3332567214966,
-        "z": "2f0cf160.dc107e",
+        "x": 1248.5398406982422,
+        "y": 858.3332567214966,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "f5335833.4ba238"
+                "df6b5755.18ea68"
             ]
         ]
     },
     {
-        "id": "2141a4d0.4ed0ac",
+        "id": "bd374d2.a7cdcb",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 904.3333396911621,
-        "y": 777.3333368301392,
-        "z": "2f0cf160.dc107e",
+        "x": 1005.8729438781738,
+        "y": 787.3333368301392,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "566234f6.d57f8c",
-                "cdd2e071.957e3",
-                "785db3d8.98fb5c"
+                "415f5cb9.3a6e44",
+                "7ec433f0.4a2dec"
             ]
         ]
     },
     {
-        "id": "f5335833.4ba238",
+        "id": "df6b5755.18ea68",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1242.666748046875,
-        "y": 922.3333377838135,
-        "z": "2f0cf160.dc107e",
+        "x": 1344.2063522338867,
+        "y": 932.3333377838135,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "deda6015.73137"
+                "a2c862ed.3d8da"
             ]
         ]
     },
     {
-        "id": "deda6015.73137",
+        "id": "a2c862ed.3d8da",
         "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": 1456.916633605957,
-        "y": 923.8333144187927,
-        "z": "2f0cf160.dc107e",
+        "x": 1558.4562377929688,
+        "y": 933.8333144187927,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "6ef0c48a.c4e20c"
+                "26c3d6b7.9af80a"
             ]
         ]
     },
     {
-        "id": "6ef0c48a.c4e20c",
+        "id": "26c3d6b7.9af80a",
         "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": 1703.9166717529297,
-        "y": 918.8333973884583,
-        "z": "2f0cf160.dc107e",
+        "x": 1805.4562759399414,
+        "y": 928.8333973884583,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "45631feb.4e63d"
+                "73c96ff0.116a"
             ]
         ]
     },
     {
-        "id": "45631feb.4e63d",
+        "id": "73c96ff0.116a",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1854.6666259765625,
-        "y": 920.3333129882812,
-        "z": "2f0cf160.dc107e",
+        "x": 1956.2062301635742,
+        "y": 930.3333129882812,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "4fe0c915.7019d8"
+                "736b8a4d.4ec784"
             ]
         ]
     },
     {
-        "id": "4fe0c915.7019d8",
+        "id": "736b8a4d.4ec784",
         "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": 2028.6673736572266,
-        "y": 920.3333714008331,
-        "z": "2f0cf160.dc107e",
+        "x": 2130.2069778442383,
+        "y": 930.3333714008331,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "18aa70c2.f51f1f",
+        "id": "9412ef29.cc029",
         "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": 2459.000747680664,
-        "y": 826.3333714008331,
-        "z": "2f0cf160.dc107e",
+        "x": 2560.540351867676,
+        "y": 836.3333714008331,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "95fdece9.83f56",
+        "id": "4b9ca75a.7fc698",
         "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": 2490.0006408691406,
-        "y": 869.3333377838135,
-        "z": "2f0cf160.dc107e",
+        "x": 2591.5402450561523,
+        "y": 879.3333377838135,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "11a6133a.d1ed1d",
+        "id": "6278217c.89959",
         "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": 576.0000152587891,
-        "y": 574.333330154419,
-        "z": "2f0cf160.dc107e",
+        "x": 677.5396194458008,
+        "y": 584.333330154419,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "78c531f9.c452d",
+        "id": "f98893a0.de7a4",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1689.3336715698242,
-        "y": 802.3333358764648,
-        "z": "2f0cf160.dc107e",
+        "x": 1790.873275756836,
+        "y": 812.3333358764648,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "78502254.1e1d1c",
-                "63d66e16.071a8",
-                "5671530f.b2ba5c"
+                "39ba7083.5ed54",
+                "5110ed96.6f1424",
+                "c2809bfd.795218"
             ]
         ]
     },
     {
-        "id": "63d66e16.071a8",
+        "id": "5110ed96.6f1424",
         "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": 1851.666603088379,
-        "y": 733.3333349227905,
-        "z": "2f0cf160.dc107e",
+        "x": 1953.2062072753906,
+        "y": 743.3333349227905,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "5896f487.b2b6fc"
+                "1e253f6e.5c04c1"
             ]
         ]
     },
     {
-        "id": "5896f487.b2b6fc",
+        "id": "1e253f6e.5c04c1",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2014.6666069030762,
-        "y": 728.3333358764648,
-        "z": "2f0cf160.dc107e",
+        "x": 2116.206211090088,
+        "y": 738.3333358764648,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "21c68e35.ea4b92"
+                "76558c73.4a9c94"
             ]
         ]
     },
     {
-        "id": "21c68e35.ea4b92",
+        "id": "76558c73.4a9c94",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2182.666648864746,
-        "y": 722.3333339691162,
-        "z": "2f0cf160.dc107e",
+        "x": 2284.206253051758,
+        "y": 732.3333339691162,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "c62b7f98.336c5",
-                "2c113cab.56e434",
-                "c2240666.9ee948"
+                "7fa808fb.9dfb68",
+                "74735438.9332ac",
+                "138a0f19.6e1331"
             ]
         ]
     },
     {
-        "id": "2c113cab.56e434",
+        "id": "74735438.9332ac",
         "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": 2377.666778564453,
-        "y": 683.3333253860474,
-        "z": "2f0cf160.dc107e",
+        "x": 2479.206382751465,
+        "y": 693.3333253860474,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "ba2b297.cd792d8"
+                "201641a0.5890ce"
             ]
         ]
     },
     {
-        "id": "c62b7f98.336c5",
+        "id": "7fa808fb.9dfb68",
         "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": 2374.6668853759766,
-        "y": 738.333340883255,
-        "z": "2f0cf160.dc107e",
+        "x": 2476.2064895629883,
+        "y": 748.333340883255,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "f4f54567.510e38"
+                "f53ab0a6.6d677"
             ]
         ]
     },
     {
-        "id": "8ed96cca.37dc4",
+        "id": "69b796c5.6fe848",
         "type": "set",
         "name": "set spoke role",
         "xml": "<set>\n<parameter name='prop.role' value=\"spoke\" />\n",
         "comments": "",
-        "x": 2707.6669006347656,
-        "y": 677.3333711624146,
-        "z": "2f0cf160.dc107e",
+        "x": 2809.2065048217773,
+        "y": 687.3333711624146,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "4cf4d59c.e1707c",
+        "id": "861df320.7eae2",
         "type": "set",
         "name": "set hub role",
         "xml": "<set>\n<parameter name='prop.role' value=\"hub\" />\n",
         "comments": "",
-        "x": 2706.666660308838,
-        "y": 732.3333549499512,
-        "z": "2f0cf160.dc107e",
+        "x": 2808.2062644958496,
+        "y": 742.3333549499512,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "ba2b297.cd792d8",
+        "id": "201641a0.5890ce",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2547.666748046875,
-        "y": 679,
-        "z": "2f0cf160.dc107e",
+        "x": 2649.2063522338867,
+        "y": 689,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "8ed96cca.37dc4"
+                "69b796c5.6fe848"
             ]
         ]
     },
     {
-        "id": "f4f54567.510e38",
+        "id": "f53ab0a6.6d677",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2551.666748046875,
-        "y": 734,
-        "z": "2f0cf160.dc107e",
+        "x": 2653.2063522338867,
+        "y": 744,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             [
-                "4cf4d59c.e1707c"
+                "861df320.7eae2"
             ]
         ]
     },
     {
-        "id": "56401cb0.1f0164",
+        "id": "188a2b9c.34d5e4",
         "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='Active' />\n<parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' />",
         "comments": "",
         "outputs": 1,
-        "x": 560.0312843322754,
-        "y": 1998.031280040741,
-        "z": "2f0cf160.dc107e",
+        "x": 661.5708885192871,
+        "y": 2008.031280040741,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ec89c38e.b0db3",
+        "id": "44113153.ffa83",
         "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='Active' />\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": 556.6663017272949,
-        "y": 1941.1261107651517,
-        "z": "2f0cf160.dc107e",
+        "x": 658.2059059143066,
+        "y": 1951.1261107651517,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "233d7734.c6ad18",
+        "id": "cd4a9b23.d614c8",
         "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": 590.6663017272949,
-        "y": 1892.6261098114774,
-        "z": "2f0cf160.dc107e",
+        "x": 692.2059059143066,
+        "y": 1902.6261098114774,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "6bb3e148.a2b06",
+        "id": "760751d.6fd76b",
         "type": "set",
         "name": "copy input data in 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": 554.6662559509277,
-        "y": 1844.876064300537,
-        "z": "2f0cf160.dc107e",
+        "x": 656.2058601379395,
+        "y": 1854.876064300537,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "307480f2.c3f12",
+        "id": "45f5fb20.78ea64",
         "type": "set",
         "name": "set device PortId 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.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='devicePortId' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.lan.devicePortId`' />\n",
         "comments": "",
-        "x": 561.031322479248,
-        "y": 1738.0314636230469,
-        "z": "2f0cf160.dc107e",
+        "x": 662.5709266662598,
+        "y": 1748.0314636230469,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "cfe4c928.772628",
+        "id": "b05dede5.e0278",
         "type": "set",
         "name": "set lan PortId 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.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='lanPortId' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.lan.lanPortId`' />\n",
         "comments": "",
-        "x": 547.0312461853027,
-        "y": 1792.0312767028809,
-        "z": "2f0cf160.dc107e",
+        "x": 648.5708503723145,
+        "y": 1802.0312767028809,
+        "z": "d0c9a483.09f7c8",
         "wires": []
     },
     {
-        "id": "13d1a87e.cc7dd8",
+        "id": "2f9763b5.4e87fc",
         "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/svclogic21.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"prop.attach.siteId\"/>\n<parameter name=\"field3\" value='`$prop.attach.siteId`'/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2384.0313873291016,
-        "y": 914.5312805175781,
-        "z": "2f0cf160.dc107e",
+        "x": 2485.5709915161133,
+        "y": 924.5312805175781,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c2240666.9ee948",
+        "id": "138a0f19.6e1331",
         "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/svclogic22.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"set spoke role\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2353.0313987731934,
-        "y": 645.531247138977,
-        "z": "2f0cf160.dc107e",
+        "x": 2454.571002960205,
+        "y": 655.531247138977,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             []
         ]
     },
     {
-        "id": "5671530f.b2ba5c",
+        "id": "c2809bfd.795218",
         "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": 1847.03125,
-        "y": 677.53125,
-        "z": "2f0cf160.dc107e",
+        "x": 1948.5708541870117,
+        "y": 687.53125,
+        "z": "d0c9a483.09f7c8",
         "wires": [
             []
         ]
     },
     {
-        "id": "785db3d8.98fb5c",
-        "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",
+        "id": "a37e9bab.abd118",
+        "type": "comment",
+        "name": "**revert the changes",
+        "info": "",
+        "comments": "",
+        "x": 1349.5708808898926,
+        "y": 693.0312824249268,
+        "z": "d0c9a483.09f7c8",
+        "wires": []
+    },
+    {
+        "id": "4a795886.274f28",
+        "type": "switchNode",
+        "name": "switch vf-modules.vf-module_length",
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`\">\n\n<!--switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1096.03125,
-        "y": 686.53125,
-        "z": "2f0cf160.dc107e",
+        "x": 892.7538909912109,
+        "y": 507.25390625,
+        "z": "d0c9a483.09f7c8",
         "wires": [
-            []
+            [
+                "779d12ab.8187fc"
+            ]
         ]
     },
     {
-        "id": "bacdcf2a.07a41",
-        "type": "comment",
-        "name": "**revert the changes",
-        "info": "",
+        "id": "779d12ab.8187fc",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
-        "x": 1248.0312767028809,
-        "y": 683.0312824249268,
-        "z": "2f0cf160.dc107e",
-        "wires": []
+        "outputs": 1,
+        "x": 998.75390625,
+        "y": 558.25390625,
+        "z": "d0c9a483.09f7c8",
+        "wires": [
+            [
+                "e23c505c.41fa2"
+            ]
+        ]
+    },
+    {
+        "id": "5c633f8a.ecb75",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 693.0039138793945,
+        "y": 468.0039048194885,
+        "z": "d0c9a483.09f7c8",
+        "wires": [
+            [
+                "4a795886.274f28"
+            ]
+        ]
+    },
+    {
+        "id": "e23c505c.41fa2",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1151.003890991211,
+        "y": 555.0039281845093,
+        "z": "d0c9a483.09f7c8",
+        "wires": [
+            [
+                "aa0d1480.7f1978"
+            ]
+        ]
+    },
+    {
+        "id": "f599447.9ac3fb8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1894.7539710998535,
+        "y": 553.0039119720459,
+        "z": "d0c9a483.09f7c8",
+        "wires": [
+            [
+                "1f605289.f2eb7d"
+            ]
+        ]
     }
 ]
\ 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-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml
index 15f1e537..808070fc 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml
@@ -61,23 +61,34 @@
                 </outcome>
             </switch>
             <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'`">
-                            <outcome value='true'>
-                                <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].name == 'deviceId'`">
-                                        <outcome value='true'>
-                                            <set>
-                                                <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`' />
-                                            </set>
-                                        </outcome>
-                                    </switch>
+                <block atomic="true">
+                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`">
+                        <!--switch test="`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`"-->
+                        <outcome value='true'>
+                            <block atomic="true">
+                                <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`' >
+                                        <block atomic="true">
+                                            <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'>
+                                                    <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].name == 'deviceId'`">
+                                                            <outcome value='true'>
+                                                                <set>
+                                                                    <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`' />
+                                                                </set>
+                                                            </outcome>
+                                                        </switch>
+                                                    </for>
+                                                </outcome>
+                                            </switch>
+                                        </block>
+                                    </for>
                                 </for>
-                            </outcome>
-                        </switch>
-                    </for>
-                </for>
+                            </block>
+                        </outcome>
+                    </switch>
+                </block>
             </for>
             <set>
                 <parameter name='prop.siteAttachements_length' value='0' />
@@ -86,12 +97,6 @@
             <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`' >
                     <block>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                            <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic24.log"/>
-                            <parameter name="field1" value="__TIMESTAMP__"/>
-                            <parameter name="field2" value="request-action"/>
-                            <parameter name="field3" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action`'/>
-                        </record>
                         <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">
                             <outcome value='true'>
                                 <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`' >