From ca4345c3c42a7a4b2d721428172da538034a51cb Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Mon, 6 May 2019 11:30:32 +0530
Subject: [PATCH] Fix SDWAN lan-port-config request action issue

Fixed SDWAN lan-port-config-delete DG with correct
request-action DeleteSDWANLanPortInstance

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

Former-commit-id: a132dd2269b619a0ecb436969f2ecc51149dfa36
---
 ...-RESOURCE-API_vf-module-topology-operation.json | 804 ++++++++++-----------
 ...C-RESOURCE-API_vf-module-topology-operation.xml |   6 +-
 2 files changed, 405 insertions(+), 405 deletions(-)

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
index ca336093..d13570cc 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "e2f973ad.8a873",
+        "id": "60f8bdf7.1ecdb4",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 167.00390625,
-        "y": 86.41365623474121,
-        "z": "62f71b5.55c86e4",
+        "x": 153,
+        "y": 59.413658142089844,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "7f6ab737.fa2438"
+                "443d0508.99432c"
             ]
         ]
     },
     {
-        "id": "7f6ab737.fa2438",
+        "id": "443d0508.99432c",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1230 +22,1230 @@
         "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": 280.28961181640625,
-        "y": 126.65176773071289,
-        "z": "62f71b5.55c86e4",
+        "x": 266.28570556640625,
+        "y": 99.65176963806152,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "df90c884.26f4c8"
+                "eb94899e.b6b1a8"
             ]
         ]
     },
     {
-        "id": "df90c884.26f4c8",
+        "id": "eb94899e.b6b1a8",
         "type": "method",
         "name": "method vf-module-topology-operation",
         "xml": "<method rpc='vf-module-topology-operation' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 254.43253326416016,
-        "y": 166.4136505126953,
-        "z": "62f71b5.55c86e4",
+        "x": 240.42862701416016,
+        "y": 139.41365242004395,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "2b567398.54b65c"
+                "d840e5a2.3f7788"
             ]
         ]
     },
     {
-        "id": "3f06cd40.babeb2",
+        "id": "e2dfb49b.0a0018",
         "type": "comment",
         "name": "vf-module-topology-operation",
         "info": "",
         "comments": "",
-        "x": 484.34873962402344,
-        "y": 68.99999809265137,
-        "z": "62f71b5.55c86e4",
+        "x": 470.34483337402344,
+        "y": 42,
+        "z": "a72b1b1f.95ba58",
         "wires": []
     },
     {
-        "id": "2b567398.54b65c",
+        "id": "d840e5a2.3f7788",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 236.50394439697266,
-        "y": 405.7738285064697,
-        "z": "62f71b5.55c86e4",
+        "x": 222.50003814697266,
+        "y": 378.77383041381836,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "61e93cec.112784",
-                "fa9f0d60.462fa",
-                "d2d6e69c.591818"
+                "82c3b371.373ab",
+                "45744240.a8fecc",
+                "af8762d1.2370a"
             ]
         ]
     },
     {
-        "id": "61e93cec.112784",
+        "id": "82c3b371.373ab",
         "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": 522.0039367675781,
-        "y": 579.2712173461914,
-        "z": "62f71b5.55c86e4",
+        "x": 508.0000305175781,
+        "y": 552.27121925354,
+        "z": "a72b1b1f.95ba58",
         "wires": []
     },
     {
-        "id": "fa9f0d60.462fa",
+        "id": "45744240.a8fecc",
         "type": "switchNode",
         "name": "switch svc-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 532.9085464477539,
-        "y": 403.98505306243896,
-        "z": "62f71b5.55c86e4",
+        "x": 518.9046401977539,
+        "y": 376.9850549697876,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "218f133.db017ec",
-                "ebbe7026.8821f",
-                "37c0b9bd.94d7c6",
-                "c54da833.e1f678",
-                "47601bcd.b936b4",
-                "86bac2cf.d6b39",
-                "1207cb15.bda8a5",
-                "5b101188.1d177"
+                "400fbd10.304f54",
+                "b423bb62.fc6a38",
+                "d0eb7f3.388888",
+                "5337ec3d.0febd4",
+                "37531078.1941c",
+                "1af62602.8b12ba",
+                "dcf909ef.aba7f8",
+                "c5e2d1b7.6be4b"
             ]
         ]
     },
     {
-        "id": "218f133.db017ec",
+        "id": "400fbd10.304f54",
         "type": "outcome",
         "name": "assign",
         "xml": "<outcome value='assign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 742.3848266601562,
-        "y": 294.2708902359009,
-        "z": "62f71b5.55c86e4",
+        "x": 728.3809204101562,
+        "y": 267.2708921432495,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "b8e37d82.b39ed"
+                "826f3bce.8ed388"
             ]
         ]
     },
     {
-        "id": "ebbe7026.8821f",
+        "id": "b423bb62.fc6a38",
         "type": "outcome",
         "name": "unassign",
         "xml": "<outcome value='unassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 750.765811920166,
-        "y": 440.4615821838379,
-        "z": "62f71b5.55c86e4",
+        "x": 736.761905670166,
+        "y": 413.4615840911865,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "4071fcbf.00f444"
+                "671070dd.51814"
             ]
         ]
     },
     {
-        "id": "37c0b9bd.94d7c6",
+        "id": "d0eb7f3.388888",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 690.4801864624023,
-        "y": 1670.9851922988892,
-        "z": "62f71b5.55c86e4",
+        "x": 676.4762802124023,
+        "y": 1643.9851942062378,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "ab03e6ef.4f7e98"
+                "cae0cae7.d054f8"
             ]
         ]
     },
     {
-        "id": "ab03e6ef.4f7e98",
+        "id": "cae0cae7.d054f8",
         "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.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
         "comments": "",
-        "x": 884.6706123352051,
-        "y": 1670.98526096344,
-        "z": "62f71b5.55c86e4",
+        "x": 870.6667060852051,
+        "y": 1643.9852628707886,
+        "z": "a72b1b1f.95ba58",
         "wires": []
     },
     {
-        "id": "d2d6e69c.591818",
+        "id": "af8762d1.2370a",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:validate-vf-module-input",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vf-module-input' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 652.0871887207031,
-        "y": 243.7947130203247,
-        "z": "62f71b5.55c86e4",
+        "x": 638.0832824707031,
+        "y": 216.79471492767334,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "b8e37d82.b39ed",
+        "id": "826f3bce.8ed388",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-assign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1114.527660369873,
-        "y": 293.8423547744751,
-        "z": "62f71b5.55c86e4",
+        "x": 1100.523754119873,
+        "y": 266.84235668182373,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "a7b23d9b.67752",
+        "id": "8b23074e.0b6df8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1126.5276184082031,
-        "y": 390.5089979171753,
-        "z": "62f71b5.55c86e4",
+        "x": 1112.5237121582031,
+        "y": 363.5089998245239,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "4071fcbf.00f444",
+        "id": "671070dd.51814",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-unassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-unassign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1120.8608894348145,
-        "y": 440.1757173538208,
-        "z": "62f71b5.55c86e4",
+        "x": 1106.8569831848145,
+        "y": 413.17571926116943,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "9cef98f6.bb64a8",
+        "id": "2a162b8d.203e04",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 754.8609046936035,
-        "y": 391.1756715774536,
-        "z": "62f71b5.55c86e4",
+        "x": 740.8569984436035,
+        "y": 364.17567348480225,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "a7b23d9b.67752"
+                "8b23074e.0b6df8"
             ]
         ]
     },
     {
-        "id": "c54da833.e1f678",
+        "id": "5337ec3d.0febd4",
         "type": "outcome",
         "name": "changeassign",
         "xml": "<outcome value='changeassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 765.3372268676758,
-        "y": 488.0803117752075,
-        "z": "62f71b5.55c86e4",
+        "x": 751.3333206176758,
+        "y": 461.08031368255615,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "64ada87a.babb08"
+                "5fccb04e.7aca4"
             ]
         ]
     },
     {
-        "id": "64ada87a.babb08",
+        "id": "5fccb04e.7aca4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-changeassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-changeassign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1134.4322967529297,
-        "y": 487.79444789886475,
-        "z": "62f71b5.55c86e4",
+        "x": 1120.4283905029297,
+        "y": 460.7944498062134,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "47601bcd.b936b4",
+        "id": "37531078.1941c",
         "type": "outcome",
         "name": "create",
         "xml": "<outcome value='create'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 751.00390625,
-        "y": 686.4136562347412,
-        "z": "62f71b5.55c86e4",
+        "x": 737,
+        "y": 659.4136581420898,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "41360f4.fa56df"
+                "3ae69b6c.fc6664"
             ]
         ]
     },
     {
-        "id": "24ce8e0e.e18a02",
+        "id": "cb85e946.697488",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 989.3375091552734,
-        "y": 694.0000194013119,
-        "z": "62f71b5.55c86e4",
+        "x": 975.3336029052734,
+        "y": 667.0000213086605,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "cd28feb2.78356",
-                "b0c495a7.239ed8",
-                "4e5328da.0fb598",
-                "cf0037c3.323858",
-                "9773ede5.0ea13",
-                "d780b057.46e04"
+                "e1f46c8f.0f8ef",
+                "6d091724.521778",
+                "cd73a097.4d141",
+                "9c2f6ea9.9f71",
+                "32e42e81.923742",
+                "bb150aac.372ef8"
             ]
         ]
     },
     {
-        "id": "b0c495a7.239ed8",
+        "id": "6d091724.521778",
         "type": "outcome",
         "name": "CreateSDWANSiteInstance",
         "xml": "<outcome value='CreateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1279.8138275146484,
-        "y": 602.4793882369995,
-        "z": "62f71b5.55c86e4",
+        "x": 1265.8099212646484,
+        "y": 575.4793901443481,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "835bb83.144cf48"
+                "61f9f776.74e028"
             ]
         ]
     },
     {
-        "id": "cd28feb2.78356",
+        "id": "e1f46c8f.0f8ef",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1189.7182922363281,
-        "y": 777.8572826385498,
-        "z": "62f71b5.55c86e4",
+        "x": 1175.7143859863281,
+        "y": 750.8572845458984,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "2ac9864e.b3ecca"
+                "e7075778.492688"
             ]
         ]
     },
     {
-        "id": "41360f4.fa56df",
+        "id": "3ae69b6c.fc6664",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 937.3374252319336,
-        "y": 614.000020980835,
-        "z": "62f71b5.55c86e4",
+        "x": 923.3335189819336,
+        "y": 587.0000228881836,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "24ce8e0e.e18a02",
-                "cf6851c.b8328b"
+                "cb85e946.697488",
+                "56c1945d.3e8c8c"
             ]
         ]
     },
     {
-        "id": "835bb83.144cf48",
+        "id": "61f9f776.74e028",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1703.3376998901367,
-        "y": 601.0001645088196,
-        "z": "62f71b5.55c86e4",
+        "x": 1689.3337936401367,
+        "y": 574.0001664161682,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "2ac9864e.b3ecca",
+        "id": "e7075778.492688",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1343.0039443969727,
-        "y": 777.9136791229248,
-        "z": "62f71b5.55c86e4",
+        "x": 1329.0000381469727,
+        "y": 750.9136810302734,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "4e5328da.0fb598",
+        "id": "cd73a097.4d141",
         "type": "outcome",
         "name": "CreateSDWANPortInstance",
         "xml": "<outcome value='CreateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1253.6706848144531,
-        "y": 736.2471733093262,
-        "z": "62f71b5.55c86e4",
+        "x": 1239.6667785644531,
+        "y": 709.2471752166748,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "60d39409.313dec"
+                "5c17a60.656ff5c"
             ]
         ]
     },
     {
-        "id": "60d39409.313dec",
+        "id": "5c17a60.656ff5c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1726.1943817138672,
-        "y": 735.7679252624512,
-        "z": "62f71b5.55c86e4",
+        "x": 1712.1904754638672,
+        "y": 708.7679271697998,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "cf0037c3.323858",
+        "id": "9c2f6ea9.9f71",
         "type": "outcome",
         "name": "CreateSDWANDeviceInstance",
         "xml": "<outcome value='CreateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1262.0350074768066,
-        "y": 656.4451336860657,
-        "z": "62f71b5.55c86e4",
+        "x": 1248.0311012268066,
+        "y": 629.4451355934143,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "aa20e20c.3c0b5"
+                "eea9f4ee.a0af98"
             ]
         ]
     },
     {
-        "id": "aa20e20c.3c0b5",
+        "id": "eea9f4ee.a0af98",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1717.558795928955,
-        "y": 655.9660029411316,
-        "z": "62f71b5.55c86e4",
+        "x": 1703.554889678955,
+        "y": 628.9660048484802,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "9773ede5.0ea13",
+        "id": "32e42e81.923742",
         "type": "outcome",
         "name": "CreateSDWANVpnInstance",
         "xml": "<outcome value='CreateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1292.0039253234863,
-        "y": 555.4137082099915,
-        "z": "62f71b5.55c86e4",
+        "x": 1278.0000190734863,
+        "y": 528.4137101173401,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "7667e896.f38bf8"
+                "28c101e9.f0aa4e"
             ]
         ]
     },
     {
-        "id": "7667e896.f38bf8",
+        "id": "28c101e9.f0aa4e",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1700.5276985168457,
-        "y": 552.9344754219055,
-        "z": "62f71b5.55c86e4",
+        "x": 1686.5237922668457,
+        "y": 525.9344773292542,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "86bac2cf.d6b39",
+        "id": "1af62602.8b12ba",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 741.00390625,
-        "y": 881.7469692230225,
-        "z": "62f71b5.55c86e4",
+        "x": 727,
+        "y": 854.7469711303711,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "dcb59eb.f680a6"
+                "c0bc6360.1bcc6"
             ]
         ]
     },
     {
-        "id": "7ef3c11c.de325",
+        "id": "75a4368f.b06cb8",
         "type": "outcome",
         "name": "ActivateSDWANSiteInstance",
         "xml": "<outcome value='ActivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1271.146957397461,
-        "y": 884.6459226608276,
-        "z": "62f71b5.55c86e4",
+        "x": 1257.143051147461,
+        "y": 857.6459245681763,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "d260e542.de2768"
+                "a304d42c.96b1a8"
             ]
         ]
     },
     {
-        "id": "dcb59eb.f680a6",
+        "id": "c0bc6360.1bcc6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 921.6706771850586,
-        "y": 877.1666460037231,
-        "z": "62f71b5.55c86e4",
+        "x": 907.6667709350586,
+        "y": 850.1666479110718,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "e18a049.97ec9f8"
+                "37ab676.385ac98"
             ]
         ]
     },
     {
-        "id": "d260e542.de2768",
+        "id": "a304d42c.96b1a8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1683.6708450317383,
-        "y": 878.1667051315308,
-        "z": "62f71b5.55c86e4",
+        "x": 1669.6669387817383,
+        "y": 851.1667070388794,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "23af3ff8.e62a2",
+        "id": "1cc762ff.e3018d",
         "type": "outcome",
         "name": "ActivateSDWANDeviceInstance",
         "xml": "<outcome value='ActivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1260.3373947143555,
-        "y": 930.6667113304138,
-        "z": "62f71b5.55c86e4",
+        "x": 1246.3334884643555,
+        "y": 903.6667132377625,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "d9fbf850.8eb808"
+                "16f3b753.49c909"
             ]
         ]
     },
     {
-        "id": "d9fbf850.8eb808",
+        "id": "16f3b753.49c909",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1695.8610916137695,
-        "y": 930.1874837875366,
-        "z": "62f71b5.55c86e4",
+        "x": 1681.8571853637695,
+        "y": 903.1874856948853,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "f7b99e1b.e28fb",
+        "id": "4032b094.cc8d9",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1694.3372192382812,
-        "y": 1015.6666655540466,
-        "z": "62f71b5.55c86e4",
+        "x": 1680.3333129882812,
+        "y": 988.6666674613953,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "ddf229e7.82bf38",
+        "id": "fab9a958.f65228",
         "type": "outcome",
         "name": "ActivateSDWANPortInstance",
         "xml": "<outcome value='ActivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1258.8135223388672,
-        "y": 1016.1458930969238,
-        "z": "62f71b5.55c86e4",
+        "x": 1244.8096160888672,
+        "y": 989.1458950042725,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "f7b99e1b.e28fb"
+                "4032b094.cc8d9"
             ]
         ]
     },
     {
-        "id": "e18a049.97ec9f8",
+        "id": "37ab676.385ac98",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 998.00390625,
-        "y": 943.7469692230225,
-        "z": "62f71b5.55c86e4",
+        "x": 984,
+        "y": 916.7469711303711,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "7ef3c11c.de325",
-                "23af3ff8.e62a2",
-                "ddf229e7.82bf38",
-                "d6b4380a.e6fc68",
-                "bea21a7.81c0de8",
-                "346cc8c9.1c2778"
+                "75a4368f.b06cb8",
+                "1cc762ff.e3018d",
+                "fab9a958.f65228",
+                "a8fd2164.39975",
+                "5e8479ea.a8f1a8",
+                "38b66458.dc919c"
             ]
         ]
     },
     {
-        "id": "d6b4380a.e6fc68",
+        "id": "a8fd2164.39975",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1190.5753860473633,
-        "y": 1064.9584784507751,
-        "z": "62f71b5.55c86e4",
+        "x": 1176.5714797973633,
+        "y": 1037.9584803581238,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "6f89102d.f2093"
+                "596d0c66.ce00c4"
             ]
         ]
     },
     {
-        "id": "bea21a7.81c0de8",
+        "id": "5e8479ea.a8f1a8",
         "type": "outcome",
         "name": "ActivateSDWANVpnInstance",
         "xml": "<outcome value='ActivateSDWANVpnInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1274.00390625,
-        "y": 839.7469692230225,
-        "z": "62f71b5.55c86e4",
+        "x": 1260,
+        "y": 812.7469711303711,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "938a7e9e.1488b"
+                "75b93508.0a740c"
             ]
         ]
     },
     {
-        "id": "938a7e9e.1488b",
+        "id": "75b93508.0a740c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1689.5277099609375,
-        "y": 833.2677459716797,
-        "z": "62f71b5.55c86e4",
+        "x": 1675.5238037109375,
+        "y": 806.2677478790283,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "1207cb15.bda8a5",
+        "id": "dcf909ef.aba7f8",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 725.0038986206055,
-        "y": 1167.7470622062683,
-        "z": "62f71b5.55c86e4",
+        "x": 710.9999923706055,
+        "y": 1140.747064113617,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "44d3e67.69f5d18"
+                "ddecd7f6.9ecef8"
             ]
         ]
     },
     {
-        "id": "257dcf4a.baf63",
+        "id": "fa2b90a6.ddc62",
         "type": "outcome",
         "name": "DeactivateSDWANSiteInstance",
         "xml": "<outcome value='DeactivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1263.1470184326172,
-        "y": 1167.646032333374,
-        "z": "62f71b5.55c86e4",
+        "x": 1249.1431121826172,
+        "y": 1140.6460342407227,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "762704d.9dc17fc"
+                "d468a55.f677158"
             ]
         ]
     },
     {
-        "id": "44d3e67.69f5d18",
+        "id": "ddecd7f6.9ecef8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 905.6706695556641,
-        "y": 1163.166738986969,
-        "z": "62f71b5.55c86e4",
+        "x": 891.6667633056641,
+        "y": 1136.1667408943176,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "6d4f8b47.fe5794"
+                "e10a09ee.1e0d18"
             ]
         ]
     },
     {
-        "id": "762704d.9dc17fc",
+        "id": "d468a55.f677158",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1680.670783996582,
-        "y": 1169.16676902771,
-        "z": "62f71b5.55c86e4",
+        "x": 1666.666877746582,
+        "y": 1142.1667709350586,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "75979eed.fc0b",
+        "id": "b5211acb.613d58",
         "type": "outcome",
         "name": "DeactivateSDWANDeviceInstance",
         "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1244.337387084961,
-        "y": 1216.6668043136597,
-        "z": "62f71b5.55c86e4",
+        "x": 1230.333480834961,
+        "y": 1189.6668062210083,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "e1999526.f6ec28"
+                "b45a3e18.c78af"
             ]
         ]
     },
     {
-        "id": "e1999526.f6ec28",
+        "id": "b45a3e18.c78af",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1679.861083984375,
-        "y": 1216.1875767707825,
-        "z": "62f71b5.55c86e4",
+        "x": 1665.857177734375,
+        "y": 1189.187578678131,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "7940dddb.23f774",
+        "id": "6f5baedc.d1b98",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1677.3372955322266,
-        "y": 1294.6667785644531,
-        "z": "62f71b5.55c86e4",
+        "x": 1663.3333892822266,
+        "y": 1267.6667804718018,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "b7bae25f.1012c",
+        "id": "78ae2747.e70608",
         "type": "outcome",
         "name": "DeactivateSDWANPortInstance",
         "xml": "<outcome value='DeactivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1241.8135986328125,
-        "y": 1295.1460061073303,
-        "z": "62f71b5.55c86e4",
+        "x": 1227.8096923828125,
+        "y": 1268.146008014679,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "7940dddb.23f774"
+                "6f5baedc.d1b98"
             ]
         ]
     },
     {
-        "id": "6d4f8b47.fe5794",
+        "id": "e10a09ee.1e0d18",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 982.0038986206055,
-        "y": 1229.7470622062683,
-        "z": "62f71b5.55c86e4",
+        "x": 967.9999923706055,
+        "y": 1202.747064113617,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "257dcf4a.baf63",
-                "75979eed.fc0b",
-                "b7bae25f.1012c",
-                "fcda1e4c.615a4",
-                "8473a82c.4877f8",
-                "1f1b01c5.6b73be"
+                "fa2b90a6.ddc62",
+                "b5211acb.613d58",
+                "78ae2747.e70608",
+                "f85122c3.f22fe",
+                "d175e790.8c0a68",
+                "e6ce30bc.2212e"
             ]
         ]
     },
     {
-        "id": "fcda1e4c.615a4",
+        "id": "f85122c3.f22fe",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1177.5753326416016,
-        "y": 1344.958568572998,
-        "z": "62f71b5.55c86e4",
+        "x": 1163.5714263916016,
+        "y": 1317.9585704803467,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "33eff1fb.6065ee"
+                "27b59f76.ee972"
             ]
         ]
     },
     {
-        "id": "8473a82c.4877f8",
+        "id": "d175e790.8c0a68",
         "type": "outcome",
         "name": "DeactivateSDWANVpnInstance",
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1258.0038986206055,
-        "y": 1125.7470622062683,
-        "z": "62f71b5.55c86e4",
+        "x": 1243.9999923706055,
+        "y": 1098.747064113617,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "4ad61465.b466cc"
+                "4dcb10ca.91b76"
             ]
         ]
     },
     {
-        "id": "4ad61465.b466cc",
+        "id": "4dcb10ca.91b76",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1673.527702331543,
-        "y": 1119.2678389549255,
-        "z": "62f71b5.55c86e4",
+        "x": 1659.523796081543,
+        "y": 1092.2678408622742,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "33eff1fb.6065ee",
+        "id": "27b59f76.ee972",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1516.0040130615234,
-        "y": 1345.413779258728,
-        "z": "62f71b5.55c86e4",
+        "x": 1502.0001068115234,
+        "y": 1318.4137811660767,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "6f89102d.f2093",
+        "id": "596d0c66.ce00c4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1521.0038986206055,
-        "y": 1062.4136881828308,
-        "z": "62f71b5.55c86e4",
+        "x": 1506.9999923706055,
+        "y": 1035.4136900901794,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "a47671f0.7d05a",
+        "id": "8c5c47e5.7d7ac8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1119.00386428833,
-        "y": 341.4136438369751,
-        "z": "62f71b5.55c86e4",
+        "x": 1104.99995803833,
+        "y": 314.41364574432373,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "3cda3fef.0d9d8",
+        "id": "92267a8e.9c90e8",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 747.003849029541,
-        "y": 342.0803213119507,
-        "z": "62f71b5.55c86e4",
+        "x": 732.999942779541,
+        "y": 315.0803232192993,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "a47671f0.7d05a"
+                "8c5c47e5.7d7ac8"
             ]
         ]
     },
     {
-        "id": "5b101188.1d177",
+        "id": "c5e2d1b7.6be4b",
         "type": "outcome",
         "name": "delete",
         "xml": "<outcome value='delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 688.0039443969727,
-        "y": 1513.0803909301758,
-        "z": "62f71b5.55c86e4",
+        "x": 674.0000381469727,
+        "y": 1486.0803928375244,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "114b4b9d.5295d4"
+                "efa2965.8f0dc68"
             ]
         ]
     },
     {
-        "id": "ff0a1131.810f4",
+        "id": "44d29826.e75ef8",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 927.3374633789062,
-        "y": 1513.6667575836182,
-        "z": "62f71b5.55c86e4",
+        "x": 913.3335571289062,
+        "y": 1486.6667594909668,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "1ad48c77.fd16f4",
-                "c2daaecd.bf1de",
-                "96d040fc.c73ab",
-                "61982dc8.6271b4",
-                "71ed2a12.125604",
-                "c389a69c.23d3e8"
+                "b28c13f1.1d076",
+                "e39671f.04a299",
+                "bff79d49.ee60c",
+                "2a96734d.12075c",
+                "c0a6c4b4.41fcd8",
+                "ca85561c.80bf88"
             ]
         ]
     },
     {
-        "id": "c2daaecd.bf1de",
+        "id": "e39671f.04a299",
         "type": "outcome",
         "name": "DeleteSDWANSiteInstance",
         "xml": "<outcome value='DeleteSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1212.8140106201172,
-        "y": 1447.1461572647095,
-        "z": "62f71b5.55c86e4",
+        "x": 1198.8101043701172,
+        "y": 1420.146159172058,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "1180e635.2cc73a"
+                "c68b80f6.353d3"
             ]
         ]
     },
     {
-        "id": "1ad48c77.fd16f4",
+        "id": "b28c13f1.1d076",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1126.7183303833008,
-        "y": 1604.5240173339844,
-        "z": "62f71b5.55c86e4",
+        "x": 1112.7144241333008,
+        "y": 1577.524019241333,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "f97fd7f3.6f7498"
+                "ddab3c2b.d8382"
             ]
         ]
     },
     {
-        "id": "114b4b9d.5295d4",
+        "id": "efa2965.8f0dc68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 874.3374633789062,
-        "y": 1440.6667556762695,
-        "z": "62f71b5.55c86e4",
+        "x": 860.3335571289062,
+        "y": 1413.6667575836182,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "ff0a1131.810f4"
+                "44d29826.e75ef8"
             ]
         ]
     },
     {
-        "id": "1180e635.2cc73a",
+        "id": "c68b80f6.353d3",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1616.3376235961914,
-        "y": 1442.6670022010803,
-        "z": "62f71b5.55c86e4",
+        "x": 1602.3337173461914,
+        "y": 1415.667004108429,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "f97fd7f3.6f7498",
+        "id": "ddab3c2b.d8382",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1280.0039825439453,
-        "y": 1604.5804138183594,
-        "z": "62f71b5.55c86e4",
+        "x": 1266.0000762939453,
+        "y": 1577.580415725708,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "96d040fc.c73ab",
+        "id": "bff79d49.ee60c",
         "type": "outcome",
         "name": "DeleteSDWANPortInstance",
         "xml": "<outcome value='DeleteSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1190.6707229614258,
-        "y": 1562.9139080047607,
-        "z": "62f71b5.55c86e4",
+        "x": 1176.6668167114258,
+        "y": 1535.9139099121094,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "14aa28f6.f665e7"
+                "337fe6a3.136d9a"
             ]
         ]
     },
     {
-        "id": "14aa28f6.f665e7",
+        "id": "337fe6a3.136d9a",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1663.1944198608398,
-        "y": 1562.4346599578857,
-        "z": "62f71b5.55c86e4",
+        "x": 1649.1905136108398,
+        "y": 1535.4346618652344,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "61982dc8.6271b4",
+        "id": "2a96734d.12075c",
         "type": "outcome",
         "name": "DeleteSDWANDeviceInstance",
         "xml": "<outcome value='DeleteSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1215.0351181030273,
-        "y": 1486.1117959022522,
-        "z": "62f71b5.55c86e4",
+        "x": 1201.0312118530273,
+        "y": 1459.1117978096008,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "18b71adb.f193b5"
+                "b031ab54.0032d8"
             ]
         ]
     },
     {
-        "id": "18b71adb.f193b5",
+        "id": "b031ab54.0032d8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1629.558937072754,
-        "y": 1481.6327004432678,
-        "z": "62f71b5.55c86e4",
+        "x": 1615.555030822754,
+        "y": 1454.6327023506165,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "71ed2a12.125604",
+        "id": "c0a6c4b4.41fcd8",
         "type": "outcome",
         "name": "DeleteSDWANVpnInstance",
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1219.0039749145508,
-        "y": 1406.0804080963135,
-        "z": "62f71b5.55c86e4",
+        "x": 1205.0000686645508,
+        "y": 1379.080410003662,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "f0f97b33.560518"
+                "b82dcb91.bd0a48"
             ]
         ]
     },
     {
-        "id": "f0f97b33.560518",
+        "id": "b82dcb91.bd0a48",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1612.5277786254883,
-        "y": 1406.6011757850647,
-        "z": "62f71b5.55c86e4",
+        "x": 1598.5238723754883,
+        "y": 1379.6011776924133,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "cf6851c.b8328b",
+        "id": "56c1945d.3e8c8c",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"request-action\"/>\n<parameter name=\"field3\" value='`$vf-module-topology-operation-input.request-information.request-action`'/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1078.75390625,
-        "y": 563.0039056241512,
-        "z": "62f71b5.55c86e4",
+        "x": 1064.75,
+        "y": 536.0039075314999,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "d780b057.46e04",
+        "id": "bb150aac.372ef8",
         "type": "outcome",
         "name": "CreateSDWANLanPortInstance",
         "xml": "<outcome value='CreateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1255.7474060058594,
-        "y": 697.2539067268372,
-        "z": "62f71b5.55c86e4",
+        "x": 1241.7434997558594,
+        "y": 670.2539086341858,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "87c41ab9.dcc0d8"
+                "afa9c085.4aa7a"
             ]
         ]
     },
     {
-        "id": "87c41ab9.dcc0d8",
+        "id": "afa9c085.4aa7a",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1728.2711029052734,
-        "y": 696.7746586799622,
-        "z": "62f71b5.55c86e4",
+        "x": 1714.2671966552734,
+        "y": 669.7746605873108,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "346cc8c9.1c2778",
+        "id": "38b66458.dc919c",
         "type": "outcome",
         "name": "ActivateSDWANLanPortInstance",
         "xml": "<outcome value='ActivateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1267.7474060058594,
-        "y": 974.5039067268372,
-        "z": "62f71b5.55c86e4",
+        "x": 1253.7434997558594,
+        "y": 947.5039086341858,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "c932f0f5.6bc3c"
+                "807c782f.46b268"
             ]
         ]
     },
     {
-        "id": "c932f0f5.6bc3c",
+        "id": "807c782f.46b268",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1685.2710571289062,
-        "y": 974.0246682167053,
-        "z": "62f71b5.55c86e4",
+        "x": 1671.2671508789062,
+        "y": 947.024670124054,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "1f1b01c5.6b73be",
+        "id": "e6ce30bc.2212e",
         "type": "outcome",
         "name": "DeactivateSDWANLanPortInstance",
         "xml": "<outcome value='DeactivateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1253.7474060058594,
-        "y": 1260.7539067268372,
-        "z": "62f71b5.55c86e4",
+        "x": 1239.7434997558594,
+        "y": 1233.7539086341858,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "91614e8f.0048"
+                "226ea68a.974c4a"
             ]
         ]
     },
     {
-        "id": "91614e8f.0048",
+        "id": "226ea68a.974c4a",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1671.2710571289062,
-        "y": 1260.2746682167053,
-        "z": "62f71b5.55c86e4",
+        "x": 1657.2671508789062,
+        "y": 1233.274670124054,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
     },
     {
-        "id": "c389a69c.23d3e8",
+        "id": "ca85561c.80bf88",
         "type": "outcome",
         "name": "DeleteSDWANLanPortInstance",
-        "xml": "<outcome value='DleteSDWANLanPortInstance'>",
+        "xml": "<outcome value='DeleteSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1217.7474060058594,
-        "y": 1523.7539067268372,
-        "z": "62f71b5.55c86e4",
+        "x": 1203.7434997558594,
+        "y": 1496.7539086341858,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             [
-                "9f681b9b.624d78"
+                "372e65c0.54946a"
             ]
         ]
     },
     {
-        "id": "9f681b9b.624d78",
+        "id": "372e65c0.54946a",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1635.2710571289062,
-        "y": 1523.2746682167053,
-        "z": "62f71b5.55c86e4",
+        "x": 1621.2671508789062,
+        "y": 1496.274670124054,
+        "z": "a72b1b1f.95ba58",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
index e9b3965c..e2e986fa 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
@@ -1,6 +1,6 @@
 <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}'>
+        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}'>
     <method rpc='vf-module-topology-operation' mode='sync'>
         <block atomic="true">
             <call module='GENERIC-RESOURCE-API' rpc='validate-vf-module-input' mode='sync' ></call>
@@ -104,7 +104,7 @@
                             <outcome value='DeleteSDWANDeviceInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-delete' mode='sync' ></call>
                             </outcome>
-                            <outcome value='DleteSDWANLanPortInstance'>
+                            <outcome value='DeleteSDWANLanPortInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-delete' mode='sync' ></call>
                             </outcome>
                             <outcome value='DeleteSDWANPortInstance'>
-- 
2.16.6