Fixed vf-module-topology DG with valid request-action 40/86240/1
authorprakash.e <prakash.e@huawei.com>
Thu, 25 Apr 2019 07:09:58 +0000 (12:39 +0530)
committerprakash.e <prakash.e@huawei.com>
Thu, 25 Apr 2019 07:10:09 +0000 (12:40 +0530)
New request-actions added in GENERIC-RESOURCE-API.yang.
CreateSDWANSiteInstance, ActivateSDWANSiteInstance,
DeactivateSDWANSiteInstance, DeleteSDWANSiteInstance are
added and it is replaced in vf-module-topology DG

Change-Id: I0898056cb43763ff04eda0e503bc05706b283f3d
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
Former-commit-id: 4fe4dea73ef2a71b9ba04a9066c82aebafa71ca2

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