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 b8819dd..ca33609 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": "8a97ec5a.e8724",
+        "id": "e2f973ad.8a873",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 147.01040649414062,
-        "y": 86.41365575790405,
-        "z": "85ee3913.3987f8",
+        "x": 167.00390625,
+        "y": 86.41365623474121,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "7092e500.65d96c"
+                "7f6ab737.fa2438"
             ]
         ]
     },
     {
-        "id": "7092e500.65d96c",
+        "id": "7f6ab737.fa2438",
         "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": 260.2961120605469,
-        "y": 126.65176725387573,
-        "z": "85ee3913.3987f8",
+        "x": 280.28961181640625,
+        "y": 126.65176773071289,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "975074db.12b248"
+                "df90c884.26f4c8"
             ]
         ]
     },
     {
-        "id": "975074db.12b248",
+        "id": "df90c884.26f4c8",
         "type": "method",
         "name": "method vf-module-topology-operation",
         "xml": "<method rpc='vf-module-topology-operation' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 234.43903350830078,
-        "y": 166.41365003585815,
-        "z": "85ee3913.3987f8",
+        "x": 254.43253326416016,
+        "y": 166.4136505126953,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "6ba66072.d698d"
+                "2b567398.54b65c"
             ]
         ]
     },
     {
-        "id": "c5d72244.65ac2",
+        "id": "3f06cd40.babeb2",
         "type": "comment",
         "name": "vf-module-topology-operation",
         "info": "",
         "comments": "",
-        "x": 541.3552627563477,
-        "y": 33.99999952316284,
-        "z": "85ee3913.3987f8",
+        "x": 484.34873962402344,
+        "y": 68.99999809265137,
+        "z": "62f71b5.55c86e4",
         "wires": []
     },
     {
-        "id": "6ba66072.d698d",
+        "id": "2b567398.54b65c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 216.51044464111328,
-        "y": 405.77382802963257,
-        "z": "85ee3913.3987f8",
+        "x": 236.50394439697266,
+        "y": 405.7738285064697,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "bff84223.52b62",
-                "bb77dcde.97b13",
-                "71a0804b.8983d"
+                "61e93cec.112784",
+                "fa9f0d60.462fa",
+                "d2d6e69c.591818"
             ]
         ]
     },
     {
-        "id": "bff84223.52b62",
+        "id": "61e93cec.112784",
         "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": 502.01043701171875,
-        "y": 579.2712168693542,
-        "z": "85ee3913.3987f8",
+        "x": 522.0039367675781,
+        "y": 579.2712173461914,
+        "z": "62f71b5.55c86e4",
         "wires": []
     },
     {
-        "id": "bb77dcde.97b13",
+        "id": "fa9f0d60.462fa",
         "type": "switchNode",
         "name": "switch svc-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 512.9150466918945,
-        "y": 403.9850525856018,
-        "z": "85ee3913.3987f8",
+        "x": 532.9085464477539,
+        "y": 403.98505306243896,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "d56401a4.01d66",
-                "ad92b387.5520d",
-                "9ce981c8.a135f",
-                "aabf716e.1d0df",
-                "4bf064de.ff298c",
-                "a756f30b.6c1cb",
-                "201f4d37.e91032",
-                "2b26c4c1.602edc"
+                "218f133.db017ec",
+                "ebbe7026.8821f",
+                "37c0b9bd.94d7c6",
+                "c54da833.e1f678",
+                "47601bcd.b936b4",
+                "86bac2cf.d6b39",
+                "1207cb15.bda8a5",
+                "5b101188.1d177"
             ]
         ]
     },
     {
-        "id": "d56401a4.01d66",
+        "id": "218f133.db017ec",
         "type": "outcome",
         "name": "assign",
         "xml": "<outcome value='assign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 722.3913269042969,
-        "y": 294.2708897590637,
-        "z": "85ee3913.3987f8",
+        "x": 742.3848266601562,
+        "y": 294.2708902359009,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "481f6fe3.cdf5a"
+                "b8e37d82.b39ed"
             ]
         ]
     },
     {
-        "id": "ad92b387.5520d",
+        "id": "ebbe7026.8821f",
         "type": "outcome",
         "name": "unassign",
         "xml": "<outcome value='unassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 730.7723121643066,
-        "y": 440.46158170700073,
-        "z": "85ee3913.3987f8",
+        "x": 750.765811920166,
+        "y": 440.4615821838379,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "bb1cd6a8.6e06d8"
+                "4071fcbf.00f444"
             ]
         ]
     },
     {
-        "id": "9ce981c8.a135f",
+        "id": "37c0b9bd.94d7c6",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 670.486686706543,
-        "y": 1670.985191822052,
-        "z": "85ee3913.3987f8",
+        "x": 690.4801864624023,
+        "y": 1670.9851922988892,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "c834b9f2.d6f188"
+                "ab03e6ef.4f7e98"
             ]
         ]
     },
     {
-        "id": "c834b9f2.d6f188",
+        "id": "ab03e6ef.4f7e98",
         "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": 864.6771125793457,
-        "y": 1670.9852604866028,
-        "z": "85ee3913.3987f8",
+        "x": 884.6706123352051,
+        "y": 1670.98526096344,
+        "z": "62f71b5.55c86e4",
         "wires": []
     },
     {
-        "id": "71a0804b.8983d",
+        "id": "d2d6e69c.591818",
         "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": 632.0936889648438,
-        "y": 243.79471254348755,
-        "z": "85ee3913.3987f8",
+        "x": 652.0871887207031,
+        "y": 243.7947130203247,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "481f6fe3.cdf5a",
+        "id": "b8e37d82.b39ed",
         "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": 1094.5341606140137,
-        "y": 293.84235429763794,
-        "z": "85ee3913.3987f8",
+        "x": 1114.527660369873,
+        "y": 293.8423547744751,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "a7175f3d.aa415",
+        "id": "a7b23d9b.67752",
         "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": 1106.5341186523438,
-        "y": 390.50899744033813,
-        "z": "85ee3913.3987f8",
+        "x": 1126.5276184082031,
+        "y": 390.5089979171753,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "bb1cd6a8.6e06d8",
+        "id": "4071fcbf.00f444",
         "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": 1100.867389678955,
-        "y": 440.17571687698364,
-        "z": "85ee3913.3987f8",
+        "x": 1120.8608894348145,
+        "y": 440.1757173538208,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "a7404f76.f0514",
+        "id": "9cef98f6.bb64a8",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 734.8674049377441,
-        "y": 391.17567110061646,
-        "z": "85ee3913.3987f8",
+        "x": 754.8609046936035,
+        "y": 391.1756715774536,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "a7175f3d.aa415"
+                "a7b23d9b.67752"
             ]
         ]
     },
     {
-        "id": "aabf716e.1d0df",
+        "id": "c54da833.e1f678",
         "type": "outcome",
         "name": "changeassign",
         "xml": "<outcome value='changeassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 745.3437271118164,
-        "y": 488.08031129837036,
-        "z": "85ee3913.3987f8",
+        "x": 765.3372268676758,
+        "y": 488.0803117752075,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "8e6a8b07.9cfd08"
+                "64ada87a.babb08"
             ]
         ]
     },
     {
-        "id": "8e6a8b07.9cfd08",
+        "id": "64ada87a.babb08",
         "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": 1114.4387969970703,
-        "y": 487.7944474220276,
-        "z": "85ee3913.3987f8",
+        "x": 1134.4322967529297,
+        "y": 487.79444789886475,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "4bf064de.ff298c",
+        "id": "47601bcd.b936b4",
         "type": "outcome",
         "name": "create",
         "xml": "<outcome value='create'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 731.0104064941406,
-        "y": 686.413655757904,
-        "z": "85ee3913.3987f8",
+        "x": 751.00390625,
+        "y": 686.4136562347412,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "856b20f2.dd3e"
+                "41360f4.fa56df"
             ]
         ]
     },
     {
-        "id": "4a0f3f1f.e154f",
+        "id": "24ce8e0e.e18a02",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 969.3440093994141,
-        "y": 694.0000189244747,
-        "z": "85ee3913.3987f8",
+        "x": 989.3375091552734,
+        "y": 694.0000194013119,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "61a8036d.49151c",
-                "9df20938.7cb218",
-                "e668ec20.ba224",
-                "e9946938.94da68",
-                "17aebe0e.08da62",
-                "6c28f181.61b7c"
+                "cd28feb2.78356",
+                "b0c495a7.239ed8",
+                "4e5328da.0fb598",
+                "cf0037c3.323858",
+                "9773ede5.0ea13",
+                "d780b057.46e04"
             ]
         ]
     },
     {
-        "id": "9df20938.7cb218",
+        "id": "b0c495a7.239ed8",
         "type": "outcome",
-        "name": "CreateSiteInstance",
-        "xml": "<outcome value='CreateSiteInstance'>",
+        "name": "CreateSDWANSiteInstance",
+        "xml": "<outcome value='CreateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1226.8203773498535,
-        "y": 603.4793815612793,
-        "z": "85ee3913.3987f8",
+        "x": 1279.8138275146484,
+        "y": 602.4793882369995,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "c35bc84f.6dd758"
+                "835bb83.144cf48"
             ]
         ]
     },
     {
-        "id": "61a8036d.49151c",
+        "id": "cd28feb2.78356",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1169.7247924804688,
-        "y": 777.8572821617126,
-        "z": "85ee3913.3987f8",
+        "x": 1189.7182922363281,
+        "y": 777.8572826385498,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "35631ae7.723fc6"
+                "2ac9864e.b3ecca"
             ]
         ]
     },
     {
-        "id": "856b20f2.dd3e",
+        "id": "41360f4.fa56df",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 917.3439254760742,
-        "y": 614.0000205039978,
-        "z": "85ee3913.3987f8",
+        "x": 937.3374252319336,
+        "y": 614.000020980835,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "4a0f3f1f.e154f",
-                "e795cb52.6c6f98"
+                "24ce8e0e.e18a02",
+                "cf6851c.b8328b"
             ]
         ]
     },
     {
-        "id": "c35bc84f.6dd758",
+        "id": "835bb83.144cf48",
         "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": 1683.3442001342773,
-        "y": 601.0001640319824,
-        "z": "85ee3913.3987f8",
+        "x": 1703.3376998901367,
+        "y": 601.0001645088196,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "35631ae7.723fc6",
+        "id": "2ac9864e.b3ecca",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1323.0104446411133,
-        "y": 777.9136786460876,
-        "z": "85ee3913.3987f8",
+        "x": 1343.0039443969727,
+        "y": 777.9136791229248,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "e668ec20.ba224",
+        "id": "4e5328da.0fb598",
         "type": "outcome",
         "name": "CreateSDWANPortInstance",
         "xml": "<outcome value='CreateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1233.6771850585938,
-        "y": 736.247172832489,
-        "z": "85ee3913.3987f8",
+        "x": 1253.6706848144531,
+        "y": 736.2471733093262,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "93c38881.fc6c68"
+                "60d39409.313dec"
             ]
         ]
     },
     {
-        "id": "93c38881.fc6c68",
+        "id": "60d39409.313dec",
         "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": 1706.2008819580078,
-        "y": 735.767924785614,
-        "z": "85ee3913.3987f8",
+        "x": 1726.1943817138672,
+        "y": 735.7679252624512,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "e9946938.94da68",
+        "id": "cf0037c3.323858",
         "type": "outcome",
         "name": "CreateSDWANDeviceInstance",
         "xml": "<outcome value='CreateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1242.0415077209473,
-        "y": 656.4451332092285,
-        "z": "85ee3913.3987f8",
+        "x": 1262.0350074768066,
+        "y": 656.4451336860657,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "f8aa9b06.01e4b8"
+                "aa20e20c.3c0b5"
             ]
         ]
     },
     {
-        "id": "f8aa9b06.01e4b8",
+        "id": "aa20e20c.3c0b5",
         "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": 1697.5652961730957,
-        "y": 655.9660024642944,
-        "z": "85ee3913.3987f8",
+        "x": 1717.558795928955,
+        "y": 655.9660029411316,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "17aebe0e.08da62",
+        "id": "9773ede5.0ea13",
         "type": "outcome",
         "name": "CreateSDWANVpnInstance",
         "xml": "<outcome value='CreateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1272.010425567627,
-        "y": 555.4137077331543,
-        "z": "85ee3913.3987f8",
+        "x": 1292.0039253234863,
+        "y": 555.4137082099915,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "3571e5b5.b5fc8a"
+                "7667e896.f38bf8"
             ]
         ]
     },
     {
-        "id": "3571e5b5.b5fc8a",
+        "id": "7667e896.f38bf8",
         "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": 1680.5341987609863,
-        "y": 552.9344749450684,
-        "z": "85ee3913.3987f8",
+        "x": 1700.5276985168457,
+        "y": 552.9344754219055,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "a756f30b.6c1cb",
+        "id": "86bac2cf.d6b39",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 721.0104064941406,
-        "y": 881.7469687461853,
-        "z": "85ee3913.3987f8",
+        "x": 741.00390625,
+        "y": 881.7469692230225,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "3edd603.8e265a"
+                "dcb59eb.f680a6"
             ]
         ]
     },
     {
-        "id": "a5f22e70.04f1a",
+        "id": "7ef3c11c.de325",
         "type": "outcome",
-        "name": "ActivateSiteInstance",
-        "xml": "<outcome value='ActivateSiteInstance'>",
+        "name": "ActivateSDWANSiteInstance",
+        "xml": "<outcome value='ActivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1212.153434753418,
-        "y": 881.6458888053894,
-        "z": "85ee3913.3987f8",
+        "x": 1271.146957397461,
+        "y": 884.6459226608276,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "ce7332d1.0ac03"
+                "d260e542.de2768"
             ]
         ]
     },
     {
-        "id": "3edd603.8e265a",
+        "id": "dcb59eb.f680a6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 901.6771774291992,
-        "y": 877.166645526886,
-        "z": "85ee3913.3987f8",
+        "x": 921.6706771850586,
+        "y": 877.1666460037231,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "91a235a8.4c9e08"
+                "e18a049.97ec9f8"
             ]
         ]
     },
     {
-        "id": "ce7332d1.0ac03",
+        "id": "d260e542.de2768",
         "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": 1585.6772384643555,
-        "y": 880.1666712760925,
-        "z": "85ee3913.3987f8",
+        "x": 1683.6708450317383,
+        "y": 878.1667051315308,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "f2fcfc7e.d1ffa",
+        "id": "23af3ff8.e62a2",
         "type": "outcome",
         "name": "ActivateSDWANDeviceInstance",
         "xml": "<outcome value='ActivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1240.343894958496,
-        "y": 930.6667108535767,
-        "z": "85ee3913.3987f8",
+        "x": 1260.3373947143555,
+        "y": 930.6667113304138,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "c9db1dea.dfbf5"
+                "d9fbf850.8eb808"
             ]
         ]
     },
     {
-        "id": "c9db1dea.dfbf5",
+        "id": "d9fbf850.8eb808",
         "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": 1675.8675918579102,
-        "y": 930.1874833106995,
-        "z": "85ee3913.3987f8",
+        "x": 1695.8610916137695,
+        "y": 930.1874837875366,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "f410619e.7b2af",
+        "id": "f7b99e1b.e28fb",
         "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": 1674.3437194824219,
-        "y": 1015.6666650772095,
-        "z": "85ee3913.3987f8",
+        "x": 1694.3372192382812,
+        "y": 1015.6666655540466,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "b65d5517.761218",
+        "id": "ddf229e7.82bf38",
         "type": "outcome",
         "name": "ActivateSDWANPortInstance",
         "xml": "<outcome value='ActivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1238.8200225830078,
-        "y": 1016.1458926200867,
-        "z": "85ee3913.3987f8",
+        "x": 1258.8135223388672,
+        "y": 1016.1458930969238,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "f410619e.7b2af"
+                "f7b99e1b.e28fb"
             ]
         ]
     },
     {
-        "id": "91a235a8.4c9e08",
+        "id": "e18a049.97ec9f8",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 978.0104064941406,
-        "y": 943.7469687461853,
-        "z": "85ee3913.3987f8",
+        "x": 998.00390625,
+        "y": 943.7469692230225,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "a5f22e70.04f1a",
-                "f2fcfc7e.d1ffa",
-                "b65d5517.761218",
-                "631e788a.5ef948",
-                "b5cf8a8f.31ae38",
-                "25d6d260.b0230e"
+                "7ef3c11c.de325",
+                "23af3ff8.e62a2",
+                "ddf229e7.82bf38",
+                "d6b4380a.e6fc68",
+                "bea21a7.81c0de8",
+                "346cc8c9.1c2778"
             ]
         ]
     },
     {
-        "id": "631e788a.5ef948",
+        "id": "d6b4380a.e6fc68",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1170.581886291504,
-        "y": 1064.958477973938,
-        "z": "85ee3913.3987f8",
+        "x": 1190.5753860473633,
+        "y": 1064.9584784507751,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "c987f934.5e8db8"
+                "6f89102d.f2093"
             ]
         ]
     },
     {
-        "id": "b5cf8a8f.31ae38",
+        "id": "bea21a7.81c0de8",
         "type": "outcome",
         "name": "ActivateSDWANVpnInstance",
         "xml": "<outcome value='ActivateSDWANVpnInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1254.0104064941406,
-        "y": 839.7469687461853,
-        "z": "85ee3913.3987f8",
+        "x": 1274.00390625,
+        "y": 839.7469692230225,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "e540db1.fcd5d28"
+                "938a7e9e.1488b"
             ]
         ]
     },
     {
-        "id": "e540db1.fcd5d28",
+        "id": "938a7e9e.1488b",
         "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": 1669.5342102050781,
-        "y": 833.2677454948425,
-        "z": "85ee3913.3987f8",
+        "x": 1689.5277099609375,
+        "y": 833.2677459716797,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "201f4d37.e91032",
+        "id": "1207cb15.bda8a5",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 705.0103988647461,
-        "y": 1167.7470617294312,
-        "z": "85ee3913.3987f8",
+        "x": 725.0038986206055,
+        "y": 1167.7470622062683,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "389867bf.2284f8"
+                "44d3e67.69f5d18"
             ]
         ]
     },
     {
-        "id": "c7aad7d3.fb5618",
+        "id": "257dcf4a.baf63",
         "type": "outcome",
-        "name": "DeactivateSiteInstance",
-        "xml": "<outcome value='DeactivateSiteInstance'>",
+        "name": "DeactivateSDWANSiteInstance",
+        "xml": "<outcome value='DeactivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1196.1534271240234,
-        "y": 1167.6459817886353,
-        "z": "85ee3913.3987f8",
+        "x": 1263.1470184326172,
+        "y": 1167.646032333374,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "4675b373.48835c"
+                "762704d.9dc17fc"
             ]
         ]
     },
     {
-        "id": "389867bf.2284f8",
+        "id": "44d3e67.69f5d18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 885.6771697998047,
-        "y": 1163.1667385101318,
-        "z": "85ee3913.3987f8",
+        "x": 905.6706695556641,
+        "y": 1163.166738986969,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "80dc1053.718dc"
+                "6d4f8b47.fe5794"
             ]
         ]
     },
     {
-        "id": "4675b373.48835c",
+        "id": "762704d.9dc17fc",
         "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": 1569.677230834961,
-        "y": 1166.1667642593384,
-        "z": "85ee3913.3987f8",
+        "x": 1680.670783996582,
+        "y": 1169.16676902771,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "f75c0513.6c8168",
+        "id": "75979eed.fc0b",
         "type": "outcome",
         "name": "DeactivateSDWANDeviceInstance",
         "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1224.3438873291016,
-        "y": 1216.6668038368225,
-        "z": "85ee3913.3987f8",
+        "x": 1244.337387084961,
+        "y": 1216.6668043136597,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "85958e69.f32bb"
+                "e1999526.f6ec28"
             ]
         ]
     },
     {
-        "id": "85958e69.f32bb",
+        "id": "e1999526.f6ec28",
         "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": 1659.8675842285156,
-        "y": 1216.1875762939453,
-        "z": "85ee3913.3987f8",
+        "x": 1679.861083984375,
+        "y": 1216.1875767707825,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "73d40202.c78c6c",
+        "id": "7940dddb.23f774",
         "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": 1657.3437957763672,
-        "y": 1294.666778087616,
-        "z": "85ee3913.3987f8",
+        "x": 1677.3372955322266,
+        "y": 1294.6667785644531,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "da717258.8698a",
+        "id": "b7bae25f.1012c",
         "type": "outcome",
         "name": "DeactivateSDWANPortInstance",
         "xml": "<outcome value='DeactivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1221.8200988769531,
-        "y": 1295.1460056304932,
-        "z": "85ee3913.3987f8",
+        "x": 1241.8135986328125,
+        "y": 1295.1460061073303,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "73d40202.c78c6c"
+                "7940dddb.23f774"
             ]
         ]
     },
     {
-        "id": "80dc1053.718dc",
+        "id": "6d4f8b47.fe5794",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 962.0103988647461,
-        "y": 1229.7470617294312,
-        "z": "85ee3913.3987f8",
+        "x": 982.0038986206055,
+        "y": 1229.7470622062683,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "c7aad7d3.fb5618",
-                "f75c0513.6c8168",
-                "da717258.8698a",
-                "903da395.919c3",
-                "82d33324.e23e3",
-                "1b1f1da6.c2e872"
+                "257dcf4a.baf63",
+                "75979eed.fc0b",
+                "b7bae25f.1012c",
+                "fcda1e4c.615a4",
+                "8473a82c.4877f8",
+                "1f1b01c5.6b73be"
             ]
         ]
     },
     {
-        "id": "903da395.919c3",
+        "id": "fcda1e4c.615a4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1157.5818328857422,
-        "y": 1344.958568096161,
-        "z": "85ee3913.3987f8",
+        "x": 1177.5753326416016,
+        "y": 1344.958568572998,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "e8c4be82.d0b16"
+                "33eff1fb.6065ee"
             ]
         ]
     },
     {
-        "id": "82d33324.e23e3",
+        "id": "8473a82c.4877f8",
         "type": "outcome",
         "name": "DeactivateSDWANVpnInstance",
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1238.010398864746,
-        "y": 1125.7470617294312,
-        "z": "85ee3913.3987f8",
+        "x": 1258.0038986206055,
+        "y": 1125.7470622062683,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "2b4b6274.20abbe"
+                "4ad61465.b466cc"
             ]
         ]
     },
     {
-        "id": "2b4b6274.20abbe",
+        "id": "4ad61465.b466cc",
         "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": 1653.5342025756836,
-        "y": 1119.2678384780884,
-        "z": "85ee3913.3987f8",
+        "x": 1673.527702331543,
+        "y": 1119.2678389549255,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "e8c4be82.d0b16",
+        "id": "33eff1fb.6065ee",
         "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": 1496.010513305664,
-        "y": 1345.4137787818909,
-        "z": "85ee3913.3987f8",
+        "x": 1516.0040130615234,
+        "y": 1345.413779258728,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "c987f934.5e8db8",
+        "id": "6f89102d.f2093",
         "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": 1501.010398864746,
-        "y": 1062.4136877059937,
-        "z": "85ee3913.3987f8",
+        "x": 1521.0038986206055,
+        "y": 1062.4136881828308,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "9ee92290.b08c",
+        "id": "a47671f0.7d05a",
         "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": 1099.0103645324707,
-        "y": 341.41364336013794,
-        "z": "85ee3913.3987f8",
+        "x": 1119.00386428833,
+        "y": 341.4136438369751,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "d58a6905.f3a7f8",
+        "id": "3cda3fef.0d9d8",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 727.0103492736816,
-        "y": 342.0803208351135,
-        "z": "85ee3913.3987f8",
+        "x": 747.003849029541,
+        "y": 342.0803213119507,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "9ee92290.b08c"
+                "a47671f0.7d05a"
             ]
         ]
     },
     {
-        "id": "2b26c4c1.602edc",
+        "id": "5b101188.1d177",
         "type": "outcome",
         "name": "delete",
         "xml": "<outcome value='delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 668.0104446411133,
-        "y": 1513.0803904533386,
-        "z": "85ee3913.3987f8",
+        "x": 688.0039443969727,
+        "y": 1513.0803909301758,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "b6813743.434d08"
+                "114b4b9d.5295d4"
             ]
         ]
     },
     {
-        "id": "325c1f9a.af3de",
+        "id": "ff0a1131.810f4",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 907.3439636230469,
-        "y": 1513.666757106781,
-        "z": "85ee3913.3987f8",
+        "x": 927.3374633789062,
+        "y": 1513.6667575836182,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "f978524b.49dc8",
-                "ee8589f0.103678",
-                "ef71212e.bc228",
-                "c42f06a0.286dc8",
-                "c4490e9c.34e51",
-                "747ce36c.3de7fc"
+                "1ad48c77.fd16f4",
+                "c2daaecd.bf1de",
+                "96d040fc.c73ab",
+                "61982dc8.6271b4",
+                "71ed2a12.125604",
+                "c389a69c.23d3e8"
             ]
         ]
     },
     {
-        "id": "ee8589f0.103678",
+        "id": "c2daaecd.bf1de",
         "type": "outcome",
-        "name": "DeleteSiteInstance",
-        "xml": "<outcome value='DeleteSiteInstance'>",
+        "name": "DeleteSDWANSiteInstance",
+        "xml": "<outcome value='DeleteSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1176.820457458496,
-        "y": 1447.1461582183838,
-        "z": "85ee3913.3987f8",
+        "x": 1212.8140106201172,
+        "y": 1447.1461572647095,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "e685df53.12b53"
+                "1180e635.2cc73a"
             ]
         ]
     },
     {
-        "id": "f978524b.49dc8",
+        "id": "1ad48c77.fd16f4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1106.7248306274414,
-        "y": 1604.5240168571472,
-        "z": "85ee3913.3987f8",
+        "x": 1126.7183303833008,
+        "y": 1604.5240173339844,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "9ea10b9d.acf658"
+                "f97fd7f3.6f7498"
             ]
         ]
     },
     {
-        "id": "b6813743.434d08",
+        "id": "114b4b9d.5295d4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 854.3439636230469,
-        "y": 1440.6667551994324,
-        "z": "85ee3913.3987f8",
+        "x": 874.3374633789062,
+        "y": 1440.6667556762695,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "325c1f9a.af3de"
+                "ff0a1131.810f4"
             ]
         ]
     },
     {
-        "id": "e685df53.12b53",
+        "id": "1180e635.2cc73a",
         "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": 1596.344123840332,
-        "y": 1442.6670017242432,
-        "z": "85ee3913.3987f8",
+        "x": 1616.3376235961914,
+        "y": 1442.6670022010803,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "9ea10b9d.acf658",
+        "id": "f97fd7f3.6f7498",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1260.010482788086,
-        "y": 1604.5804133415222,
-        "z": "85ee3913.3987f8",
+        "x": 1280.0039825439453,
+        "y": 1604.5804138183594,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "ef71212e.bc228",
+        "id": "96d040fc.c73ab",
         "type": "outcome",
         "name": "DeleteSDWANPortInstance",
         "xml": "<outcome value='DeleteSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1170.6772232055664,
-        "y": 1562.9139075279236,
-        "z": "85ee3913.3987f8",
+        "x": 1190.6707229614258,
+        "y": 1562.9139080047607,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "64a82c2b.8bd464"
+                "14aa28f6.f665e7"
             ]
         ]
     },
     {
-        "id": "64a82c2b.8bd464",
+        "id": "14aa28f6.f665e7",
         "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": 1643.2009201049805,
-        "y": 1562.4346594810486,
-        "z": "85ee3913.3987f8",
+        "x": 1663.1944198608398,
+        "y": 1562.4346599578857,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "c42f06a0.286dc8",
+        "id": "61982dc8.6271b4",
         "type": "outcome",
         "name": "DeleteSDWANDeviceInstance",
         "xml": "<outcome value='DeleteSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1195.041618347168,
-        "y": 1486.111795425415,
-        "z": "85ee3913.3987f8",
+        "x": 1215.0351181030273,
+        "y": 1486.1117959022522,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "4d9adbda.eda754"
+                "18b71adb.f193b5"
             ]
         ]
     },
     {
-        "id": "4d9adbda.eda754",
+        "id": "18b71adb.f193b5",
         "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": 1609.5654373168945,
-        "y": 1481.6326999664307,
-        "z": "85ee3913.3987f8",
+        "x": 1629.558937072754,
+        "y": 1481.6327004432678,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "c4490e9c.34e51",
+        "id": "71ed2a12.125604",
         "type": "outcome",
         "name": "DeleteSDWANVpnInstance",
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1199.0104751586914,
-        "y": 1406.0804076194763,
-        "z": "85ee3913.3987f8",
+        "x": 1219.0039749145508,
+        "y": 1406.0804080963135,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "8af6e006.bfec5"
+                "f0f97b33.560518"
             ]
         ]
     },
     {
-        "id": "8af6e006.bfec5",
+        "id": "f0f97b33.560518",
         "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": 1592.534278869629,
-        "y": 1406.6011753082275,
-        "z": "85ee3913.3987f8",
+        "x": 1612.5277786254883,
+        "y": 1406.6011757850647,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "e795cb52.6c6f98",
+        "id": "cf6851c.b8328b",
         "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": 1058.7604064941406,
-        "y": 563.0039051473141,
-        "z": "85ee3913.3987f8",
+        "x": 1078.75390625,
+        "y": 563.0039056241512,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "6c28f181.61b7c",
+        "id": "d780b057.46e04",
         "type": "outcome",
         "name": "CreateSDWANLanPortInstance",
         "xml": "<outcome value='CreateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1235.75390625,
-        "y": 697.25390625,
-        "z": "85ee3913.3987f8",
+        "x": 1255.7474060058594,
+        "y": 697.2539067268372,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "1169c073.b7816"
+                "87c41ab9.dcc0d8"
             ]
         ]
     },
     {
-        "id": "1169c073.b7816",
+        "id": "87c41ab9.dcc0d8",
         "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": 1708.277603149414,
-        "y": 696.774658203125,
-        "z": "85ee3913.3987f8",
+        "x": 1728.2711029052734,
+        "y": 696.7746586799622,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "25d6d260.b0230e",
+        "id": "346cc8c9.1c2778",
         "type": "outcome",
         "name": "ActivateSDWANLanPortInstance",
         "xml": "<outcome value='ActivateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1247.75390625,
-        "y": 974.50390625,
-        "z": "85ee3913.3987f8",
+        "x": 1267.7474060058594,
+        "y": 974.5039067268372,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "ec26a8f0.36bb88"
+                "c932f0f5.6bc3c"
             ]
         ]
     },
     {
-        "id": "ec26a8f0.36bb88",
+        "id": "c932f0f5.6bc3c",
         "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": 1665.2775573730469,
-        "y": 974.0246677398682,
-        "z": "85ee3913.3987f8",
+        "x": 1685.2710571289062,
+        "y": 974.0246682167053,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "1b1f1da6.c2e872",
+        "id": "1f1b01c5.6b73be",
         "type": "outcome",
         "name": "DeactivateSDWANLanPortInstance",
         "xml": "<outcome value='DeactivateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1233.75390625,
-        "y": 1260.75390625,
-        "z": "85ee3913.3987f8",
+        "x": 1253.7474060058594,
+        "y": 1260.7539067268372,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "dabaac5b.2c0a7"
+                "91614e8f.0048"
             ]
         ]
     },
     {
-        "id": "dabaac5b.2c0a7",
+        "id": "91614e8f.0048",
         "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": 1651.2775573730469,
-        "y": 1260.2746677398682,
-        "z": "85ee3913.3987f8",
+        "x": 1671.2710571289062,
+        "y": 1260.2746682167053,
+        "z": "62f71b5.55c86e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "747ce36c.3de7fc",
+        "id": "c389a69c.23d3e8",
         "type": "outcome",
         "name": "DeleteSDWANLanPortInstance",
         "xml": "<outcome value='DleteSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1197.75390625,
-        "y": 1523.75390625,
-        "z": "85ee3913.3987f8",
+        "x": 1217.7474060058594,
+        "y": 1523.7539067268372,
+        "z": "62f71b5.55c86e4",
         "wires": [
             [
-                "19220770.af1c39"
+                "9f681b9b.624d78"
             ]
         ]
     },
     {
-        "id": "19220770.af1c39",
+        "id": "9f681b9b.624d78",
         "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": 1615.2775573730469,
-        "y": 1523.2746677398682,
-        "z": "85ee3913.3987f8",
+        "x": 1635.2710571289062,
+        "y": 1523.2746682167053,
+        "z": "62f71b5.55c86e4",
         "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 fb12ca3..e9b3965 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
@@ -26,7 +26,7 @@
                             <outcome value='CreateSDWANVpnInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-create' mode='sync' ></call>
                             </outcome>
-                            <outcome value='CreateSiteInstance'>
+                            <outcome value='CreateSDWANSiteInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-create' mode='sync' ></call>
                             </outcome>
                             <outcome value='CreateSDWANDeviceInstance'>
@@ -50,7 +50,7 @@
                             <outcome value='ActivateSDWANVpnInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-activate' mode='sync' ></call>
                             </outcome>
-                            <outcome value='ActivateSiteInstance'>
+                            <outcome value='ActivateSDWANSiteInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-activate' mode='sync' ></call>
                             </outcome>
                             <outcome value='ActivateSDWANDeviceInstance'>
@@ -74,7 +74,7 @@
                             <outcome value='DeactivateSDWANVpnInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-deactivate' mode='sync' ></call>
                             </outcome>
-                            <outcome value='DeactivateSiteInstance'>
+                            <outcome value='DeactivateSDWANSiteInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-deactivate' mode='sync' ></call>
                             </outcome>
                             <outcome value='DeactivateSDWANDeviceInstance'>
@@ -98,7 +98,7 @@
                             <outcome value='DeleteSDWANVpnInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-delete' mode='sync' ></call>
                             </outcome>
-                            <outcome value='DeleteSiteInstance'>
+                            <outcome value='DeleteSDWANSiteInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-delete' mode='sync' ></call>
                             </outcome>
                             <outcome value='DeleteSDWANDeviceInstance'>