Fix SDWAN lan-port-config request action issue 98/86498/3
authorprakash.e <prakash.e@huawei.com>
Mon, 6 May 2019 06:00:32 +0000 (11:30 +0530)
committerprakash.e <prakash.e@huawei.com>
Mon, 6 May 2019 06:00:36 +0000 (11:30 +0530)
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

platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml

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