Fix vnf-topology-assign async 30/97830/2
authorTimoney, Dan (dt5972) <dtimoney@att.com>
Thu, 31 Oct 2019 21:06:46 +0000 (17:06 -0400)
committerTimoney, Dan (dt5972) <dtimoney@att.com>
Fri, 1 Nov 2019 12:04:51 +0000 (08:04 -0400)
Updated vnf-topology-operation and vf-module-topolopy-operation
not to call assign-async directly.
Updated vnf-topology-operation-async and vf-module-topology-operation-async
to call assign-async instead of assign.

Change-Id: I16900ecb2126d2fe7fc3e1dfea351345272c275f
Issue-ID: SDNC-961
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Former-commit-id: 47c7a904b9a764a2159066bff311f204fd18ce0d

platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-async.json
platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-async.json
platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
platform-logic/generic-resource-api/src/main/resources/graph.versions
platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml
platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml
platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml

index b8b048c..d9f1f20 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "58cdaf8e.9338",\r
+        "id": "a214adf2.6e9a7",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 179.8363037109375,\r
-        "y": 167.77080249786377,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 148,\r
+        "y": 131,\r
+        "z": "a1afab29.23bf58",\r
         "wires": [\r
             [\r
-                "b5c33869.bb8148"\r
+                "acad4057.f1dc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b5c33869.bb8148",\r
+        "id": "acad4057.f1dc8",\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": 293.12200927734375,\r
-        "y": 208.00891399383545,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 261.28570556640625,\r
+        "y": 171.23811149597168,\r
+        "z": "a1afab29.23bf58",\r
         "wires": [\r
             [\r
-                "34177c3d.1d3d04"\r
+                "31cfeaa.0698f16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "34177c3d.1d3d04",\r
+        "id": "31cfeaa.0698f16",\r
         "type": "method",\r
         "name": "method vf-module-topology-operation-async",\r
         "xml": "<method rpc='vf-module-topology-operation-async' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 314.7649230957031,\r
-        "y": 266.520809173584,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 282.9286193847656,\r
+        "y": 229.75000667572021,\r
+        "z": "a1afab29.23bf58",\r
         "wires": [\r
             [\r
-                "98c85507.862c28"\r
+                "8595d903.6762c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4dff986d.cfbfe8",\r
+        "id": "345b7934.bee34e",\r
         "type": "comment",\r
         "name": "vf-module-topology-operation-async",\r
         "info": "",\r
         "comments": "",\r
-        "x": 642.9311599731445,\r
-        "y": 132.85714530944824,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 611.094856262207,\r
+        "y": 96.08634281158447,\r
+        "z": "a1afab29.23bf58",\r
         "wires": []\r
     },\r
     {\r
-        "id": "98c85507.862c28",\r
+        "id": "8595d903.6762c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 637.7291793823242,\r
-        "y": 419.98814606666565,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 605.8928756713867,\r
+        "y": 383.2173435688019,\r
+        "z": "a1afab29.23bf58",\r
         "wires": [\r
             [\r
-                "9c9f62a6.868f5",\r
-                "2c41085c.8dd918",\r
-                "ccddbe0b.ddbca"\r
+                "bafb388d.d3ff18",\r
+                "b6506244.4b8f28",\r
+                "da8a0537.fb39c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c9f62a6.868f5",\r
+        "id": "bafb388d.d3ff18",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 842.038688659668,\r
-        "y": 627.2950584888458,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 810.2023849487305,\r
+        "y": 590.524255990982,\r
+        "z": "a1afab29.23bf58",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2c41085c.8dd918",\r
+        "id": "b6506244.4b8f28",\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": 848.6575927734375,\r
-        "y": 419.1517460346222,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 816.8212890625,\r
+        "y": 382.3809435367584,\r
+        "z": "a1afab29.23bf58",\r
         "wires": [\r
             [\r
-                "d8c68316.b7a72",\r
-                "b525dffc.024fb"\r
+                "421d299d.d9d868",\r
+                "9ad26040.05a2c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d8c68316.b7a72",\r
+        "id": "421d299d.d9d868",\r
         "type": "outcome",\r
         "name": "assign",\r
         "xml": "<outcome value='assign'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1062.419563293457,\r
-        "y": 309.4375765323639,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 1030.5832595825195,\r
+        "y": 272.6667740345001,\r
+        "z": "a1afab29.23bf58",\r
         "wires": [\r
             [\r
-                "45cc9d2f.beb9b4"\r
+                "6fc1719e.706bd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93f4bc38.a3c71",\r
+        "id": "6c17aa78.ce2f54",\r
         "type": "outcome",\r
         "name": "unassign",\r
         "xml": "<outcome value='unassign'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1162.0505981445312,\r
-        "y": 459.37825417518616,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 1130.2142944335938,\r
+        "y": 422.6074516773224,\r
+        "z": "a1afab29.23bf58",\r
         "wires": [\r
             [\r
-                "d491d98.b65f128"\r
+                "5f96ee10.e20a88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b525dffc.024fb",\r
+        "id": "9ad26040.05a2c8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1062.514804840088,\r
-        "y": 551.8183891773224,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 1030.6785011291504,\r
+        "y": 515.0475866794586,\r
+        "z": "a1afab29.23bf58",\r
         "wires": [\r
             [\r
-                "90ef12c9.0fcde"\r
+                "ec88d0ff.5947e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90ef12c9.0fcde",\r
+        "id": "ec88d0ff.5947e8",\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": 1256.7052307128906,\r
-        "y": 551.8184578418732,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 1224.8689270019531,\r
+        "y": 515.0476553440094,\r
+        "z": "a1afab29.23bf58",\r
         "wires": []\r
     },\r
     {\r
-        "id": "45cc9d2f.beb9b4",\r
+        "id": "6fc1719e.706bd",\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
+        "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-assign-async",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-async' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1434.5623970031738,\r
-        "y": 309.0090410709381,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 1402.7260932922363,\r
+        "y": 272.23823857307434,\r
+        "z": "a1afab29.23bf58",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dffe0c9b.30a7e",\r
+        "id": "4cf7949.73fefec",\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": 1537.8124046325684,\r
-        "y": 409.42566990852356,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 1505.9761009216309,\r
+        "y": 372.6548674106598,\r
+        "z": "a1afab29.23bf58",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d491d98.b65f128",\r
+        "id": "5f96ee10.e20a88",\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": 1532.1456756591797,\r
-        "y": 459.09238934516907,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 1500.3093719482422,\r
+        "y": 422.3215868473053,\r
+        "z": "a1afab29.23bf58",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "516083ba.09ae5c",\r
+        "id": "784769e3.ccc1d",\r
         "type": "outcome",\r
         "name": "deactivate",\r
         "xml": "<outcome value='deactivate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1166.1456909179688,\r
-        "y": 410.0923435688019,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 1134.3093872070312,\r
+        "y": 373.3215410709381,\r
+        "z": "a1afab29.23bf58",\r
         "wires": [\r
             [\r
-                "dffe0c9b.30a7e"\r
+                "4cf7949.73fefec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9428c2a3.733a6",\r
+        "id": "a1c2a7bf.2c822",\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": 1530.2886505126953,\r
-        "y": 360.33031582832336,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 1498.4523468017578,\r
+        "y": 323.5595133304596,\r
+        "z": "a1afab29.23bf58",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a8ae8c.55933178",\r
+        "id": "36c8dc56.9339c4",\r
         "type": "outcome",\r
         "name": "activate",\r
         "xml": "<outcome value='activate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1158.2886352539062,\r
-        "y": 360.99699330329895,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 1126.4523315429688,\r
+        "y": 324.2261908054352,\r
+        "z": "a1afab29.23bf58",\r
         "wires": [\r
             [\r
-                "9428c2a3.733a6"\r
+                "a1c2a7bf.2c822"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "116260cc.9bfbcf",\r
+        "id": "389bcb7f.ec6dfc",\r
         "type": "outcome",\r
         "name": "changeassign",\r
         "xml": "<outcome value='changeassign'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1176.622013092041,\r
-        "y": 506.9969837665558,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 1144.7857093811035,\r
+        "y": 470.226181268692,\r
+        "z": "a1afab29.23bf58",\r
         "wires": [\r
             [\r
-                "58e3fa70.7e8074"\r
+                "d47f4ab1.be5318"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58e3fa70.7e8074",\r
+        "id": "d47f4ab1.be5318",\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": 1545.717082977295,\r
-        "y": 506.711119890213,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 1513.8807792663574,\r
+        "y": 469.94031739234924,\r
+        "z": "a1afab29.23bf58",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ccddbe0b.ddbca",\r
+        "id": "da8a0537.fb39c8",\r
         "type": "set",\r
         "name": "set skip-mdsal-update to Y",\r
         "xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",\r
         "comments": "",\r
-        "x": 885.8481788635254,\r
-        "y": 263.24700570106506,\r
-        "z": "720e27e0.e78d88",\r
+        "x": 854.0118751525879,\r
+        "y": 226.4762032032013,\r
+        "z": "a1afab29.23bf58",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
index 7df3bc6..94207ca 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "11d4dc1b.cea77c",\r
+        "id": "33be195b.75d4fe",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 156,\r
-        "y": 118.70132446289062,\r
-        "z": "d80dfa18.577678",\r
+        "x": 180,\r
+        "y": 166.70132446289062,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "63acf7dc.06021"\r
+                "887749a.214a238"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63acf7dc.06021",\r
+        "id": "887749a.214a238",\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": 269.28570556640625,\r
-        "y": 158.9394359588623,\r
-        "z": "d80dfa18.577678",\r
+        "x": 293.28570556640625,\r
+        "y": 206.9394359588623,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "4268d929.67e0a"\r
+                "29dcb1df.dc1b8e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4268d929.67e0a",\r
+        "id": "29dcb1df.dc1b8e",\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": 243.42862701416016,\r
-        "y": 198.70131874084473,\r
-        "z": "d80dfa18.577678",\r
+        "x": 267.42862701416016,\r
+        "y": 246.70131874084473,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "403c1585.dc6254"\r
+                "5c539e88.795b58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ece321a9.a609b",\r
+        "id": "96b1a3b6.caafe8",\r
         "type": "comment",\r
         "name": "vf-module-topology-operation",\r
         "info": "",\r
         "comments": "",\r
-        "x": 473.34483337402344,\r
-        "y": 101.28766632080078,\r
-        "z": "d80dfa18.577678",\r
+        "x": 497.34483337402344,\r
+        "y": 149.28766632080078,\r
+        "z": "8b0e50c0.d902",\r
         "wires": []\r
     },\r
     {\r
-        "id": "403c1585.dc6254",\r
+        "id": "5c539e88.795b58",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 217.5000457763672,\r
-        "y": 532.061484336853,\r
-        "z": "d80dfa18.577678",\r
+        "x": 241.5000457763672,\r
+        "y": 580.061484336853,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "18b03d2.eb1fbc3",\r
-                "fe759666.be3398",\r
-                "b0524b56.c7d9d"\r
+                "40f6b5c9.a683ec",\r
+                "28b20b0b.fec1e4",\r
+                "5bcfdc4b.d00a54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "18b03d2.eb1fbc3",\r
+        "id": "40f6b5c9.a683ec",\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": 503.00003814697266,\r
-        "y": 705.5588731765747,\r
-        "z": "d80dfa18.577678",\r
+        "x": 527.0000381469727,\r
+        "y": 753.5588731765747,\r
+        "z": "8b0e50c0.d902",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fe759666.be3398",\r
+        "id": "28b20b0b.fec1e4",\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": 513.9046478271484,\r
-        "y": 530.2727088928223,\r
-        "z": "d80dfa18.577678",\r
+        "x": 537.9046478271484,\r
+        "y": 578.2727088928223,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "196a98f8.3bd137",\r
-                "c8596657.93e1a",\r
-                "458d7c6b.5d0d5c",\r
-                "4b204f7e.1b8e2",\r
-                "5096a71a.af9198",\r
-                "398477c1.9e3bb8",\r
-                "112e016f.f82cbf",\r
-                "e227c212.42fea8",\r
-                "9300e0fc.aacde8"\r
+                "caeb3334.585a08",\r
+                "24b9aded.f55092",\r
+                "ff253716.ed1",\r
+                "ecd15846.92d2a",\r
+                "b53dc71f.db6408",\r
+                "dd8d2752.a0ec3",\r
+                "18068d49.c7b22b",\r
+                "f038d95a.4f467",\r
+                "47a5544f.c67324"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "196a98f8.3bd137",\r
+        "id": "caeb3334.585a08",\r
         "type": "outcome",\r
         "name": "assign",\r
         "xml": "<outcome value='assign'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 725.3809280395508,\r
-        "y": 378.5586109161377,\r
-        "z": "d80dfa18.577678",\r
+        "x": 749.3809280395508,\r
+        "y": 426.5586109161377,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "f88029fe.714ff"\r
+                "fcc6559a.f79908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8596657.93e1a",\r
+        "id": "24b9aded.f55092",\r
         "type": "outcome",\r
         "name": "unassign",\r
         "xml": "<outcome value='unassign'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 731.7619132995605,\r
-        "y": 566.7492380142212,\r
-        "z": "d80dfa18.577678",\r
+        "x": 755.7619132995605,\r
+        "y": 614.7492380142212,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "cd4b7513.f15268"\r
+                "4899f7bf.dcc26"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "458d7c6b.5d0d5c",\r
+        "id": "ff253716.ed1",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 635.4762649536133,\r
-        "y": 1982.2728834152222,\r
-        "z": "d80dfa18.577678",\r
+        "x": 659.4762649536133,\r
+        "y": 2030.2728834152222,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "e82e3e2c.1df298"\r
+                "e5f62cf2.166b38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e82e3e2c.1df298",\r
+        "id": "e5f62cf2.166b38",\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": 829.666690826416,\r
-        "y": 1982.272952079773,\r
-        "z": "d80dfa18.577678",\r
+        "x": 853.666690826416,\r
+        "y": 2030.272952079773,\r
+        "z": "8b0e50c0.d902",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b0524b56.c7d9d",\r
+        "id": "5bcfdc4b.d00a54",\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": 641.0832824707031,\r
-        "y": 276.0823812484741,\r
-        "z": "d80dfa18.577678",\r
+        "x": 665.0832824707031,\r
+        "y": 324.0823812484741,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d72b4fcb.1f4c",\r
+        "id": "eef0ba00.12b89",\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": 1107.5237197875977,\r
-        "y": 516.7966537475586,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1131.5237197875977,\r
+        "y": 564.7966537475586,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cd4b7513.f15268",\r
+        "id": "4899f7bf.dcc26",\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": 1101.856990814209,\r
-        "y": 566.4633731842041,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1125.856990814209,\r
+        "y": 614.4633731842041,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8bd129ae.83c078",\r
+        "id": "58ba8f60.b4c0a",\r
         "type": "outcome",\r
         "name": "deactivate",\r
         "xml": "<outcome value='deactivate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 735.857006072998,\r
-        "y": 517.4633274078369,\r
-        "z": "d80dfa18.577678",\r
+        "x": 759.857006072998,\r
+        "y": 565.4633274078369,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "d72b4fcb.1f4c"\r
+                "eef0ba00.12b89"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b204f7e.1b8e2",\r
+        "id": "ecd15846.92d2a",\r
         "type": "outcome",\r
         "name": "changeassign",\r
         "xml": "<outcome value='changeassign'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 746.3333282470703,\r
-        "y": 614.3679676055908,\r
-        "z": "d80dfa18.577678",\r
+        "x": 770.3333282470703,\r
+        "y": 662.3679676055908,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "e6633d6e.ae0008"\r
+                "c288c362.34d07"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e6633d6e.ae0008",\r
+        "id": "c288c362.34d07",\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": 1115.4283981323242,\r
-        "y": 614.082103729248,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1139.4283981323242,\r
+        "y": 662.082103729248,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5096a71a.af9198",\r
+        "id": "b53dc71f.db6408",\r
         "type": "outcome",\r
         "name": "create",\r
         "xml": "<outcome value='create'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 732.0000076293945,\r
-        "y": 812.7013120651245,\r
-        "z": "d80dfa18.577678",\r
+        "x": 756.0000076293945,\r
+        "y": 860.7013120651245,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "b0678560.7104f"\r
+                "18e7ef46.d6b7b1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "162fec09.6308b4",\r
+        "id": "607a2fa9.0f2298",\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": 970.333610534668,\r
-        "y": 820.2876752316952,\r
-        "z": "d80dfa18.577678",\r
+        "x": 994.333610534668,\r
+        "y": 868.2876752316952,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "38f54336.43e254",\r
-                "52b23393.43b59c",\r
-                "8b76b414.15b5e8",\r
-                "ef2f9b30.3b48d8",\r
-                "6d66a790.28c178",\r
-                "e72de08a.895418"\r
+                "7311d758.3c29a8",\r
+                "1c43fcbc.b491cb",\r
+                "1f820a59.6cfe26",\r
+                "263d1347.d54d4c",\r
+                "70589bb7.c48cd4",\r
+                "17d2ee47.67d4f2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "52b23393.43b59c",\r
+        "id": "1c43fcbc.b491cb",\r
         "type": "outcome",\r
         "name": "CreateSDWANSiteInstance",\r
         "xml": "<outcome value='CreateSDWANSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1260.809928894043,\r
-        "y": 728.7670440673828,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1284.809928894043,\r
+        "y": 776.7670440673828,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "1d98311f.d91eb7"\r
+                "d033bd2f.c327f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38f54336.43e254",\r
+        "id": "7311d758.3c29a8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1170.7143936157227,\r
-        "y": 904.1449384689331,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1194.7143936157227,\r
+        "y": 952.1449384689331,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "3ba8f36d.dd4584"\r
+                "985190ee.26958"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b0678560.7104f",\r
+        "id": "18e7ef46.d6b7b1",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 918.3335266113281,\r
-        "y": 740.2876768112183,\r
-        "z": "d80dfa18.577678",\r
+        "x": 942.3335266113281,\r
+        "y": 788.2876768112183,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "162fec09.6308b4",\r
-                "7ce1a992.f698d8"\r
+                "607a2fa9.0f2298",\r
+                "8882f132.8ac148"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d98311f.d91eb7",\r
+        "id": "d033bd2f.c327f8",\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": 1684.3338012695312,\r
-        "y": 727.2878203392029,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1708.3338012695312,\r
+        "y": 775.2878203392029,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3ba8f36d.dd4584",\r
+        "id": "985190ee.26958",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1324.0000457763672,\r
-        "y": 904.2013349533081,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1348.0000457763672,\r
+        "y": 952.2013349533081,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8b76b414.15b5e8",\r
+        "id": "1f820a59.6cfe26",\r
         "type": "outcome",\r
         "name": "CreateSDWANPortInstance",\r
         "xml": "<outcome value='CreateSDWANPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1234.6667861938477,\r
-        "y": 862.5348291397095,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1258.6667861938477,\r
+        "y": 910.5348291397095,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "82cd1d50.2a0f4"\r
+                "10e74aca.5e9dcd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "82cd1d50.2a0f4",\r
+        "id": "10e74aca.5e9dcd",\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": 1707.1904830932617,\r
-        "y": 862.0555810928345,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1731.1904830932617,\r
+        "y": 910.0555810928345,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ef2f9b30.3b48d8",\r
+        "id": "263d1347.d54d4c",\r
         "type": "outcome",\r
         "name": "CreateSDWANDeviceInstance",\r
         "xml": "<outcome value='CreateSDWANDeviceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1243.0311088562012,\r
-        "y": 782.732789516449,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1267.0311088562012,\r
+        "y": 830.732789516449,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "c5caf426.d828e8"\r
+                "f8c54fdf.a0282"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c5caf426.d828e8",\r
+        "id": "f8c54fdf.a0282",\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": 1698.5548973083496,\r
-        "y": 782.2536587715149,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1722.5548973083496,\r
+        "y": 830.2536587715149,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6d66a790.28c178",\r
+        "id": "70589bb7.c48cd4",\r
         "type": "outcome",\r
         "name": "CreateSDWANVpnInstance",\r
         "xml": "<outcome value='CreateSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1273.0000267028809,\r
-        "y": 681.7013640403748,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1297.0000267028809,\r
+        "y": 729.7013640403748,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "6e6d0477.4e8ddc"\r
+                "69cbe655.d4531"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e6d0477.4e8ddc",\r
+        "id": "69cbe655.d4531",\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": 1681.5237998962402,\r
-        "y": 679.2221312522888,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1705.5237998962402,\r
+        "y": 727.2221312522888,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "398477c1.9e3bb8",\r
+        "id": "dd8d2752.a0ec3",\r
         "type": "outcome",\r
         "name": "activate",\r
         "xml": "<outcome value='activate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 722.0000076293945,\r
-        "y": 1008.0346250534058,\r
-        "z": "d80dfa18.577678",\r
+        "x": 746.0000076293945,\r
+        "y": 1056.0346250534058,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "ca9d6615.d92bb"\r
+                "bcb67265.e288a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22860be6.d83544",\r
+        "id": "c0fe026d.5bbbb",\r
         "type": "outcome",\r
         "name": "ActivateSDWANSiteInstance",\r
         "xml": "<outcome value='ActivateSDWANSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1252.1430587768555,\r
-        "y": 1010.9335784912109,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1276.1430587768555,\r
+        "y": 1058.933578491211,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "bc6abbe4.e226c"\r
+                "5109a3a6.561364"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca9d6615.d92bb",\r
+        "id": "bcb67265.e288a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 902.6667785644531,\r
-        "y": 1003.4543018341064,\r
-        "z": "d80dfa18.577678",\r
+        "x": 926.6667785644531,\r
+        "y": 1051.4543018341064,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "fd34d18f.7429b"\r
+                "47246527.1e56ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc6abbe4.e226c",\r
+        "id": "5109a3a6.561364",\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": 1664.6669464111328,\r
-        "y": 1004.4543609619141,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1688.6669464111328,\r
+        "y": 1052.454360961914,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fc0c8e83.b23218",\r
+        "id": "c60830d0.17f5a",\r
         "type": "outcome",\r
         "name": "ActivateSDWANDeviceInstance",\r
         "xml": "<outcome value='ActivateSDWANDeviceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1241.33349609375,\r
-        "y": 1056.9543671607971,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1265.33349609375,\r
+        "y": 1104.9543671607971,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "322979d6.dc748e"\r
+                "25d9361e.9c65ba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "322979d6.dc748e",\r
+        "id": "25d9361e.9c65ba",\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": 1676.857192993164,\r
-        "y": 1056.47513961792,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1700.857192993164,\r
+        "y": 1104.47513961792,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7a20602e.9c67f",\r
+        "id": "b6aa92f9.cdc2a8",\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": 1675.3333206176758,\r
-        "y": 1141.95432138443,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1699.3333206176758,\r
+        "y": 1189.95432138443,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7140c1d2.7cd8a8",\r
+        "id": "a18c69ab.01a818",\r
         "type": "outcome",\r
         "name": "ActivateSDWANPortInstance",\r
         "xml": "<outcome value='ActivateSDWANPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1239.8096237182617,\r
-        "y": 1142.4335489273071,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1263.8096237182617,\r
+        "y": 1190.4335489273071,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "7a20602e.9c67f"\r
+                "b6aa92f9.cdc2a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd34d18f.7429b",\r
+        "id": "47246527.1e56ec",\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": 979.0000076293945,\r
-        "y": 1070.0346250534058,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1003.0000076293945,\r
+        "y": 1118.0346250534058,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "22860be6.d83544",\r
-                "fc0c8e83.b23218",\r
-                "7140c1d2.7cd8a8",\r
-                "9e7170ba.5f9eb8",\r
-                "d7d2a998.ac94f8",\r
-                "8e69acb9.247998"\r
+                "c0fe026d.5bbbb",\r
+                "c60830d0.17f5a",\r
+                "a18c69ab.01a818",\r
+                "4eb9f891.327f5",\r
+                "90d715c6.9c265",\r
+                "f02a5298.2eefc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9e7170ba.5f9eb8",\r
+        "id": "4eb9f891.327f5",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1171.5714874267578,\r
-        "y": 1191.2461342811584,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1195.5714874267578,\r
+        "y": 1239.2461342811584,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "dab2914f.5e193"\r
+                "5d183311.69fac4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d7d2a998.ac94f8",\r
+        "id": "90d715c6.9c265",\r
         "type": "outcome",\r
         "name": "ActivateSDWANVpnInstance",\r
         "xml": "<outcome value='ActivateSDWANVpnInstance'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1255.0000076293945,\r
-        "y": 966.0346250534058,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1279.0000076293945,\r
+        "y": 1014.0346250534058,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "8d564aec.b974a8"\r
+                "88c09726.eefab8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d564aec.b974a8",\r
+        "id": "88c09726.eefab8",\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": 1670.523811340332,\r
-        "y": 959.555401802063,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1694.523811340332,\r
+        "y": 1007.555401802063,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "112e016f.f82cbf",\r
+        "id": "18068d49.c7b22b",\r
         "type": "outcome",\r
         "name": "deactivate",\r
         "xml": "<outcome value='deactivate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 706,\r
-        "y": 1294.0347180366516,\r
-        "z": "d80dfa18.577678",\r
+        "x": 730,\r
+        "y": 1342.0347180366516,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "379e448b.e26ed4"\r
+                "681e9593.4046f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e0dd4b1.4e4d8b8",\r
+        "id": "1c91b5af.7e24a2",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANSiteInstance",\r
         "xml": "<outcome value='DeactivateSDWANSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1244.1431198120117,\r
-        "y": 1293.9336881637573,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1268.1431198120117,\r
+        "y": 1341.9336881637573,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "90c2ea50.fdcfe8"\r
+                "45ef4065.1ebd28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "379e448b.e26ed4",\r
+        "id": "681e9593.4046f4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 886.6667709350586,\r
-        "y": 1289.4543948173523,\r
-        "z": "d80dfa18.577678",\r
+        "x": 910.6667709350586,\r
+        "y": 1337.4543948173523,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "5c04c78d.fe726"\r
+                "33bfb465.398c74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90c2ea50.fdcfe8",\r
+        "id": "45ef4065.1ebd28",\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": 1661.6668853759766,\r
-        "y": 1295.4544248580933,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1685.6668853759766,\r
+        "y": 1343.4544248580933,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3157e474.6d76bc",\r
+        "id": "a2c160f0.81abc8",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANDeviceInstance",\r
         "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1225.3334884643555,\r
-        "y": 1342.954460144043,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1249.3334884643555,\r
+        "y": 1390.954460144043,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "4bcbaf21.f06a68"\r
+                "6d633c2a.19ba84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4bcbaf21.f06a68",\r
+        "id": "6d633c2a.19ba84",\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": 1660.8571853637695,\r
-        "y": 1342.4752326011658,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1684.8571853637695,\r
+        "y": 1390.4752326011658,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "628f7e0d.7bf12",\r
+        "id": "534faaf3.c3270c",\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": 1658.333396911621,\r
-        "y": 1420.9544343948364,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1682.333396911621,\r
+        "y": 1468.9544343948364,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c5a06a95.9a73c",\r
+        "id": "a881781.4a03f08",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANPortInstance",\r
         "xml": "<outcome value='DeactivateSDWANPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1222.809700012207,\r
-        "y": 1421.4336619377136,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1246.809700012207,\r
+        "y": 1469.4336619377136,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "628f7e0d.7bf12"\r
+                "534faaf3.c3270c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c04c78d.fe726",\r
+        "id": "33bfb465.398c74",\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": 963,\r
-        "y": 1356.0347180366516,\r
-        "z": "d80dfa18.577678",\r
+        "x": 987,\r
+        "y": 1404.0347180366516,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "e0dd4b1.4e4d8b8",\r
-                "3157e474.6d76bc",\r
-                "c5a06a95.9a73c",\r
-                "e434dcb1.1a484",\r
-                "401815f5.93c05c",\r
-                "5f2a3253.15e99c"\r
+                "1c91b5af.7e24a2",\r
+                "a2c160f0.81abc8",\r
+                "a881781.4a03f08",\r
+                "e96ddfb5.feaf6",\r
+                "627fe7de.350708",\r
+                "824d42e5.fe91b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e434dcb1.1a484",\r
+        "id": "e96ddfb5.feaf6",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1158.571434020996,\r
-        "y": 1471.2462244033813,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1182.571434020996,\r
+        "y": 1519.2462244033813,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "c76a7983.9d38e8"\r
+                "fc7b9ae9.e004f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "401815f5.93c05c",\r
+        "id": "627fe7de.350708",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANVpnInstance",\r
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1239,\r
-        "y": 1252.0347180366516,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1263,\r
+        "y": 1300.0347180366516,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "179d4c8.1c9f0b4"\r
+                "51976a8e.a60084"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "179d4c8.1c9f0b4",\r
+        "id": "51976a8e.a60084",\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": 1654.5238037109375,\r
-        "y": 1245.5554947853088,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1678.5238037109375,\r
+        "y": 1293.5554947853088,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c76a7983.9d38e8",\r
+        "id": "fc7b9ae9.e004f8",\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": 1497.000114440918,\r
-        "y": 1471.7014350891113,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1521.000114440918,\r
+        "y": 1519.7014350891113,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dab2914f.5e193",\r
+        "id": "5d183311.69fac4",\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": 1502,\r
-        "y": 1188.701344013214,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1526,\r
+        "y": 1236.701344013214,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "61081d39.89dad4",\r
+        "id": "a5ddeebb.393828",\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.9999656677246,\r
-        "y": 467.7012996673584,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1123.9999656677246,\r
+        "y": 515.7012996673584,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9e246b75.ae6418",\r
+        "id": "d10ab8db.cf3c38",\r
         "type": "outcome",\r
         "name": "activate",\r
         "xml": "<outcome value='activate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 727.9999504089355,\r
-        "y": 468.367977142334,\r
-        "z": "d80dfa18.577678",\r
+        "x": 751.9999504089355,\r
+        "y": 516.367977142334,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "61081d39.89dad4"\r
+                "a5ddeebb.393828"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e227c212.42fea8",\r
+        "id": "f038d95a.4f467",\r
         "type": "outcome",\r
         "name": "delete",\r
         "xml": "<outcome value='delete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 669.0000457763672,\r
-        "y": 1639.368046760559,\r
-        "z": "d80dfa18.577678",\r
+        "x": 693.0000457763672,\r
+        "y": 1687.368046760559,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "681f7e70.128598"\r
+                "10193305.fa5d35"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e590f10.e3e0d",\r
+        "id": "b3ed8338.35bbd8",\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": 908.3335647583008,\r
-        "y": 1639.9544134140015,\r
-        "z": "d80dfa18.577678",\r
+        "x": 932.3335647583008,\r
+        "y": 1687.9544134140015,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "8e23d3e5.351a68",\r
-                "936a66dc.f198d8",\r
-                "78e52106.f9df28",\r
-                "a2426271.0aaaf",\r
-                "5d0c656.809b41c",\r
-                "afdd56ca.7b158"\r
+                "f639dd.e0c2962",\r
+                "2f28b183.0a3116",\r
+                "2dac1bff.bca26c",\r
+                "c2c7f7f5.8148e8",\r
+                "8661a779.b1bbc8",\r
+                "c19404b2.ac4d9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "936a66dc.f198d8",\r
+        "id": "2f28b183.0a3116",\r
         "type": "outcome",\r
         "name": "DeleteSDWANSiteInstance",\r
         "xml": "<outcome value='DeleteSDWANSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1193.8101119995117,\r
-        "y": 1573.4338130950928,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1217.8101119995117,\r
+        "y": 1621.4338130950928,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "d567d254.07d97"\r
+                "272fa7f.e3f75d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e23d3e5.351a68",\r
+        "id": "f639dd.e0c2962",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1107.7144317626953,\r
-        "y": 1730.8116731643677,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1131.7144317626953,\r
+        "y": 1778.8116731643677,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "26e6234e.282244"\r
+                "721cca52.351b1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "681f7e70.128598",\r
+        "id": "10193305.fa5d35",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 855.3335647583008,\r
-        "y": 1566.9544115066528,\r
-        "z": "d80dfa18.577678",\r
+        "x": 879.3335647583008,\r
+        "y": 1614.9544115066528,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "7e590f10.e3e0d"\r
+                "b3ed8338.35bbd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d567d254.07d97",\r
+        "id": "272fa7f.e3f75d8",\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": 1597.333724975586,\r
-        "y": 1568.9546580314636,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1621.333724975586,\r
+        "y": 1616.9546580314636,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "26e6234e.282244",\r
+        "id": "721cca52.351b1c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1261.0000839233398,\r
-        "y": 1730.8680696487427,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1285.0000839233398,\r
+        "y": 1778.8680696487427,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "78e52106.f9df28",\r
+        "id": "2dac1bff.bca26c",\r
         "type": "outcome",\r
         "name": "DeleteSDWANPortInstance",\r
         "xml": "<outcome value='DeleteSDWANPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1171.6668243408203,\r
-        "y": 1689.201563835144,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1195.6668243408203,\r
+        "y": 1737.201563835144,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "9ac059d9.b2b208"\r
+                "d36bdd40.7f4cb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ac059d9.b2b208",\r
+        "id": "d36bdd40.7f4cb",\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": 1644.1905212402344,\r
-        "y": 1688.722315788269,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1668.1905212402344,\r
+        "y": 1736.722315788269,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a2426271.0aaaf",\r
+        "id": "c2c7f7f5.8148e8",\r
         "type": "outcome",\r
         "name": "DeleteSDWANDeviceInstance",\r
         "xml": "<outcome value='DeleteSDWANDeviceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1196.0312194824219,\r
-        "y": 1612.3994517326355,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1220.0312194824219,\r
+        "y": 1660.3994517326355,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "62bed64b.ae3228"\r
+                "4e0eb9d5.aa847"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62bed64b.ae3228",\r
+        "id": "4e0eb9d5.aa847",\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": 1610.5550384521484,\r
-        "y": 1607.9203562736511,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1634.5550384521484,\r
+        "y": 1655.9203562736511,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5d0c656.809b41c",\r
+        "id": "8661a779.b1bbc8",\r
         "type": "outcome",\r
         "name": "DeleteSDWANVpnInstance",\r
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1200.0000762939453,\r
-        "y": 1532.3680639266968,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1224.0000762939453,\r
+        "y": 1580.3680639266968,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "903607f5.13f68"\r
+                "4efe6039.8a2b38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "903607f5.13f68",\r
+        "id": "4efe6039.8a2b38",\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": 1593.5238800048828,\r
-        "y": 1532.888831615448,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1617.5238800048828,\r
+        "y": 1580.888831615448,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7ce1a992.f698d8",\r
+        "id": "8882f132.8ac148",\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": 1059.7500076293945,\r
-        "y": 689.2915614545345,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1083.7500076293945,\r
+        "y": 737.2915614545345,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e72de08a.895418",\r
+        "id": "17d2ee47.67d4f2",\r
         "type": "outcome",\r
         "name": "CreateSDWANLanPortInstance",\r
         "xml": "<outcome value='CreateSDWANLanPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1236.743507385254,\r
-        "y": 823.5415625572205,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1260.743507385254,\r
+        "y": 871.5415625572205,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "31973c4d.4759e4"\r
+                "b44bb5fa.e9aaf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "31973c4d.4759e4",\r
+        "id": "b44bb5fa.e9aaf8",\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": 1709.267204284668,\r
-        "y": 823.0623145103455,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1733.267204284668,\r
+        "y": 871.0623145103455,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8e69acb9.247998",\r
+        "id": "f02a5298.2eefc",\r
         "type": "outcome",\r
         "name": "ActivateSDWANLanPortInstance",\r
         "xml": "<outcome value='ActivateSDWANLanPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1248.743507385254,\r
-        "y": 1100.7915625572205,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1272.743507385254,\r
+        "y": 1148.7915625572205,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "948b984b.e64328"\r
+                "3fa74ce7.5a3b6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "948b984b.e64328",\r
+        "id": "3fa74ce7.5a3b6c",\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": 1666.2671585083008,\r
-        "y": 1100.3123240470886,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1690.2671585083008,\r
+        "y": 1148.3123240470886,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5f2a3253.15e99c",\r
+        "id": "824d42e5.fe91b",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANLanPortInstance",\r
         "xml": "<outcome value='DeactivateSDWANLanPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1234.743507385254,\r
-        "y": 1387.0415625572205,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1258.743507385254,\r
+        "y": 1435.0415625572205,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "6608c35e.c94abc"\r
+                "c7eaff30.b937a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6608c35e.c94abc",\r
+        "id": "c7eaff30.b937a",\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": 1652.2671585083008,\r
-        "y": 1386.5623240470886,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1676.2671585083008,\r
+        "y": 1434.5623240470886,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "afdd56ca.7b158",\r
+        "id": "c19404b2.ac4d9",\r
         "type": "outcome",\r
         "name": "DeleteSDWANLanPortInstance",\r
         "xml": "<outcome value='DeleteSDWANLanPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1198.743507385254,\r
-        "y": 1650.0415625572205,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1222.743507385254,\r
+        "y": 1698.0415625572205,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "ddf98dd7.4ad7d"\r
+                "611bfd14.6cb0c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ddf98dd7.4ad7d",\r
+        "id": "611bfd14.6cb0c4",\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": 1616.2671585083008,\r
-        "y": 1649.5623240470886,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1640.2671585083008,\r
+        "y": 1697.5623240470886,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9300e0fc.aacde8",\r
+        "id": "47a5544f.c67324",\r
         "type": "outcome",\r
         "name": "update",\r
         "xml": "<outcome value='update'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 640.0000076293945,\r
-        "y": 1778.2876539230347,\r
-        "z": "d80dfa18.577678",\r
+        "x": 664.0000076293945,\r
+        "y": 1826.2876539230347,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "ab931d4e.ccffc8"\r
+                "7a09cd0b.a3ae6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab931d4e.ccffc8",\r
+        "id": "7a09cd0b.a3ae6c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 814.3335037231445,\r
-        "y": 1782.874140739441,\r
-        "z": "d80dfa18.577678",\r
+        "x": 838.3335037231445,\r
+        "y": 1830.874140739441,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "8e86ecaa.ce6c28"\r
+                "f9c37f80.58b198"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e86ecaa.ce6c28",\r
+        "id": "f9c37f80.58b198",\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": 970.3335037231445,\r
-        "y": 1852.874140739441,\r
-        "z": "d80dfa18.577678",\r
+        "x": 994.3335037231445,\r
+        "y": 1900.874140739441,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "4766c849.8d9ae8",\r
-                "9cad581c.5559d8"\r
+                "4313d5d.b934a2c",\r
+                "96008004.f3fb08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4766c849.8d9ae8",\r
+        "id": "4313d5d.b934a2c",\r
         "type": "outcome",\r
         "name": "SdwanBandwidthChange",\r
         "xml": "<outcome value='SdwanBandwidthChange'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1208.999984741211,\r
-        "y": 1808.2877740859985,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1232.999984741211,\r
+        "y": 1856.2877740859985,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "6a1687c.4a82bf8"\r
+                "4a9a8312.107f34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a1687c.4a82bf8",\r
+        "id": "4a9a8312.107f34",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-bandwidth-policy-change",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-bandwidth-policy-change' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1602.5237884521484,\r
-        "y": 1808.8085417747498,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1626.5237884521484,\r
+        "y": 1856.8085417747498,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9cad581c.5559d8",\r
+        "id": "96008004.f3fb08",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1134.714340209961,\r
-        "y": 1881.7313776016235,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1158.714340209961,\r
+        "y": 1929.7313776016235,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "5ff5278e.fa7178"\r
+                "da42a936.4d80e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ff5278e.fa7178",\r
+        "id": "da42a936.4d80e8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1287.9999923706055,\r
-        "y": 1881.7877740859985,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1311.9999923706055,\r
+        "y": 1929.7877740859985,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b75894e5.8c11a",\r
+        "id": "409c63f3.0be97c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1982.8573913574219,\r
-        "y": 318.987060546875,\r
-        "z": "d80dfa18.577678",\r
+        "x": 2006.8573913574219,\r
+        "y": 366.987060546875,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "1e63ed5c.c7dce3",\r
-                "f2379115.719e5",\r
-                "c06c12dc.df2ff"\r
+                "cb5df7e4.b1ee5",\r
+                "977a2626.95574"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e63ed5c.c7dce3",\r
+        "id": "cb5df7e4.b1ee5",\r
         "type": "set",\r
         "name": "set skip-mdsal-update to Y",\r
         "xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",\r
         "comments": "",\r
-        "x": 2229.6429443359375,\r
-        "y": 295.3411045074463,\r
-        "z": "d80dfa18.577678",\r
+        "x": 2253.6429443359375,\r
+        "y": 343.3411045074463,\r
+        "z": "8b0e50c0.d902",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f2379115.719e5",\r
+        "id": "977a2626.95574",\r
         "type": "set",\r
         "name": "set ack-final to 'N' (default)",\r
         "xml": "<set>\n<parameter name='ack-final' value='N' />\n",\r
         "comments": "",\r
-        "x": 2230.071517944336,\r
-        "y": 335.34118843078613,\r
-        "z": "d80dfa18.577678",\r
+        "x": 2254.071517944336,\r
+        "y": 383.34118843078613,\r
+        "z": "8b0e50c0.d902",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fe2f3218.57be48",\r
+        "id": "f8118221.e92548",\r
         "type": "switchNode",\r
         "name": "so-response-url empty?",\r
         "xml": "<switch test='`length($vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1117.4285583496094,\r
-        "y": 172.98703002929688,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1141.4285583496094,\r
+        "y": 220.98703002929688,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "81183e12.46702",\r
-                "6ea99026.2d8cd8"\r
+                "6aa69e65.ea868",\r
+                "8240759e.2b7448"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81183e12.46702",\r
+        "id": "6aa69e65.ea868",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1342.4285583496094,\r
-        "y": 128.98703002929688,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1366.4285583496094,\r
+        "y": 176.98703002929688,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "7193d1b3.b667a"\r
+                "327527d3.7b4b18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ea99026.2d8cd8",\r
+        "id": "8240759e.2b7448",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1332.4285583496094,\r
-        "y": 220.98703002929688,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1356.4285583496094,\r
+        "y": 268.9870300292969,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "30e50b5.a0612f4"\r
+                "7a731e6.34210e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30e50b5.a0612f4",\r
+        "id": "7a731e6.34210e",\r
         "type": "switchNode",\r
         "name": "so-response-url = ignored URL?",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1554.4285583496094,\r
-        "y": 221.98703002929688,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1578.4285583496094,\r
+        "y": 269.9870300292969,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "835a8fa6.6d17f",\r
-                "2771015e.b6298e"\r
+                "d46d074d.48dc58",\r
+                "6fce7505.b4aa9c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "835a8fa6.6d17f",\r
+        "id": "d46d074d.48dc58",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1794.4285583496094,\r
-        "y": 220.98703002929688,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1818.4285583496094,\r
+        "y": 268.9870300292969,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "7193d1b3.b667a"\r
+                "327527d3.7b4b18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2771015e.b6298e",\r
+        "id": "6fce7505.b4aa9c",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1802.4285583496094,\r
-        "y": 321.9870300292969,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1826.4285583496094,\r
+        "y": 369.9870300292969,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "b75894e5.8c11a"\r
+                "409c63f3.0be97c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7193d1b3.b667a",\r
+        "id": "327527d3.7b4b18",\r
         "type": "call",\r
         "name": "call vf-module-topology-operation-assign-sync",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-sync' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2301.285858154297,\r
-        "y": 127.1298828125,\r
-        "z": "d80dfa18.577678",\r
+        "x": 2325.285858154297,\r
+        "y": 175.1298828125,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "94a63140.3f5a9",\r
+        "id": "486c23d4.36def4",\r
         "type": "execute",\r
         "name": "execute getProperties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1108.3376159667969,\r
-        "y": 81.81817626953125,\r
-        "z": "d80dfa18.577678",\r
+        "x": 1132.3376159667969,\r
+        "y": 129.81817626953125,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f88029fe.714ff",\r
+        "id": "fcc6559a.f79908",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 917.4286804199219,\r
-        "y": 80,\r
-        "z": "d80dfa18.577678",\r
+        "x": 941.4286804199219,\r
+        "y": 128,\r
+        "z": "8b0e50c0.d902",\r
         "wires": [\r
             [\r
-                "94a63140.3f5a9",\r
-                "fe2f3218.57be48"\r
+                "486c23d4.36def4",\r
+                "f8118221.e92548"\r
             ]\r
         ]\r
-    },\r
-    {\r
-        "id": "c06c12dc.df2ff",\r
-        "type": "call",\r
-        "name": "call vf-module-topology-operation-assign-async",\r
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-async' mode='sync' >\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2268,\r
-        "y": 407,\r
-        "z": "d80dfa18.577678",\r
-        "wires": [\r
-            []\r
-        ]\r
     }\r
 ]
\ No newline at end of file
index 7206446..b085d8a 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "869164d0.22fca8",\r
+        "id": "a8562ad4.6a0458",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 177.77777099609375,\r
-        "y": 127.96921110153198,\r
-        "z": "fafe2484.405f98",\r
+        "x": 161,\r
+        "y": 103.41365623474121,\r
+        "z": "23d0140b.bcf30c",\r
         "wires": [\r
             [\r
-                "91e5b207.619a8"\r
+                "8aa2e22b.2999c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91e5b207.619a8",\r
+        "id": "8aa2e22b.2999c8",\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": 292.0634765625,\r
-        "y": 168.20732259750366,\r
-        "z": "fafe2484.405f98",\r
+        "x": 275.28570556640625,\r
+        "y": 143.6517677307129,\r
+        "z": "23d0140b.bcf30c",\r
         "wires": [\r
             [\r
-                "6e27b9bb.02b478"\r
+                "8f1fc900.bf623"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e27b9bb.02b478",\r
+        "id": "8f1fc900.bf623",\r
         "type": "method",\r
         "name": "method vnf-topology-operation-async",\r
         "xml": "<method rpc='vnf-topology-operation-async' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 265.63497161865234,\r
-        "y": 209.3977770805359,\r
-        "z": "fafe2484.405f98",\r
+        "x": 248.8572006225586,\r
+        "y": 184.84222221374512,\r
+        "z": "23d0140b.bcf30c",\r
         "wires": [\r
             [\r
-                "67687d15.90d894"\r
+                "1753c63.85e9dba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "628a912e.96075",\r
+        "id": "c9cdb08.85991d",\r
         "type": "comment",\r
         "name": "vnf-topology-operation-async",\r
         "info": "",\r
         "comments": "",\r
-        "x": 572.1226272583008,\r
-        "y": 75.55555486679077,\r
-        "z": "fafe2484.405f98",\r
+        "x": 555.344856262207,\r
+        "y": 51,\r
+        "z": "23d0140b.bcf30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "67687d15.90d894",\r
+        "id": "1753c63.85e9dba",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 290.3730583190918,\r
-        "y": 357.0913519859314,\r
-        "z": "fafe2484.405f98",\r
+        "x": 273.59528732299805,\r
+        "y": 332.5357971191406,\r
+        "z": "23d0140b.bcf30c",\r
         "wires": [\r
             [\r
-                "98b2b32c.4efe9",\r
-                "ea413579.6ab908",\r
-                "22dacf93.8c6e4"\r
+                "6fc71f07.688f6",\r
+                "60b26c36.43d504",\r
+                "a19ac06f.2f1d7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "98b2b32c.4efe9",\r
+        "id": "6fc71f07.688f6",\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": 480.015869140625,\r
-        "y": 421.5409588813782,\r
-        "z": "fafe2484.405f98",\r
+        "x": 463.23809814453125,\r
+        "y": 396.9854040145874,\r
+        "z": "23d0140b.bcf30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ea413579.6ab908",\r
+        "id": "60b26c36.43d504",\r
         "type": "switchNode",\r
         "name": "switch svc-action",\r
         "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 488.63487243652344,\r
-        "y": 358.15970182418823,\r
-        "z": "fafe2484.405f98",\r
+        "x": 471.8571014404297,\r
+        "y": 333.60414695739746,\r
+        "z": "23d0140b.bcf30c",\r
         "wires": [\r
             [\r
-                "a26e14a0.c75858",\r
-                "7d83530e.ba2efc"\r
+                "6bd9fb5a.0be96c",\r
+                "2681c253.32360e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a26e14a0.c75858",\r
+        "id": "6bd9fb5a.0be96c",\r
         "type": "outcome",\r
         "name": "assign",\r
         "xml": "<outcome value='assign'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 684.5872421264648,\r
-        "y": 335.06455087661743,\r
-        "z": "fafe2484.405f98",\r
+        "x": 667.8094711303711,\r
+        "y": 310.50899600982666,\r
+        "z": "23d0140b.bcf30c",\r
         "wires": [\r
             [\r
-                "a1897fe3.ec245"\r
+                "138714bc.ad7d9b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d83530e.ba2efc",\r
+        "id": "2681c253.32360e",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 681.9205017089844,\r
-        "y": 379.44537115097046,\r
-        "z": "fafe2484.405f98",\r
+        "x": 665.1427307128906,\r
+        "y": 354.8898162841797,\r
+        "z": "23d0140b.bcf30c",\r
         "wires": [\r
             [\r
-                "4fedef3f.f888b"\r
+                "103914f7.2438b3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4fedef3f.f888b",\r
+        "id": "103914f7.2438b3",\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": 833.8252372741699,\r
-        "y": 379.44545316696167,\r
-        "z": "fafe2484.405f98",\r
+        "x": 817.0474662780762,\r
+        "y": 354.8898983001709,\r
+        "z": "23d0140b.bcf30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "22dacf93.8c6e4",\r
+        "id": "a19ac06f.2f1d7",\r
         "type": "set",\r
         "name": "set skip-mdsal-update to Y",\r
         "xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",\r
         "comments": "",\r
-        "x": 518.254020690918,\r
-        "y": 297.69841051101685,\r
-        "z": "fafe2484.405f98",\r
+        "x": 501.4762496948242,\r
+        "y": 273.1428556442261,\r
+        "z": "23d0140b.bcf30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a1897fe3.ec245",\r
+        "id": "138714bc.ad7d9b",\r
         "type": "call",\r
-        "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-assign",\r
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign' mode='sync' >\n",\r
+        "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-assign-async",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-async' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 989.2063751220703,\r
-        "y": 335.1120238304138,\r
-        "z": "fafe2484.405f98",\r
+        "x": 972.4286041259766,\r
+        "y": 310.55646896362305,\r
+        "z": "23d0140b.bcf30c",\r
         "wires": [\r
             []\r
         ]\r
index 6850e02..1336db5 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "1bd67dd4.72089a",\r
+        "id": "7f4aec0b.5502f4",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 157,\r
-        "y": 190.98507690429688,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 330,\r
+        "y": 210.98507690429688,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "38bd98bb.8764e"\r
+                "3c7ef46a.98dca4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38bd98bb.8764e",\r
+        "id": "3c7ef46a.98dca4",\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": 240.28570556640625,\r
-        "y": 252.22317504882812,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 413.28570556640625,\r
+        "y": 272.2231750488281,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "6888d6c.7572228"\r
+                "b47a6501.64ba38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6888d6c.7572228",\r
+        "id": "b47a6501.64ba38",\r
         "type": "method",\r
         "name": "method vnf-topology-operation",\r
         "xml": "<method rpc='vnf-topology-operation' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 232.42862701416016,\r
-        "y": 314.985071182251,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 405.42862701416016,\r
+        "y": 334.985071182251,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "cdfeb3ad.4eaab8"\r
+                "76bed0c3.5ba96"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8829dcf9.9bea6",\r
+        "id": "af2b7b93.b6f818",\r
         "type": "comment",\r
         "name": "vnf-topology-operation",\r
         "info": "",\r
         "comments": "",\r
-        "x": 556.9162979125977,\r
-        "y": 34,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 729.9162979125977,\r
+        "y": 54,\r
+        "z": "f5eee496.37583",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cdfeb3ad.4eaab8",\r
+        "id": "76bed0c3.5ba96",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 256.16676330566406,\r
-        "y": 644.6785974502563,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 429.16676330566406,\r
+        "y": 664.6785974502563,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "cc1b175b.b736c",\r
-                "a3254fe3.d47878",\r
-                "3bc78e03.8c382a"\r
+                "c01d08e.c985a78",\r
+                "f3cdf661.920ac",\r
+                "33260e4d.c20b2a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc1b175b.b736c",\r
+        "id": "c01d08e.c985a78",\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": 548.6667175292969,\r
-        "y": 799.8426303863525,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 721.6667175292969,\r
+        "y": 819.8426303863525,\r
+        "z": "f5eee496.37583",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a3254fe3.d47878",\r
+        "id": "f3cdf661.920ac",\r
         "type": "switchNode",\r
         "name": "switch svc-action",\r
         "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 551.5714340209961,\r
-        "y": 642.8898410797119,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 724.5714340209961,\r
+        "y": 662.8898410797119,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "a7962069.276858",\r
-                "f49f6b1.024f098",\r
-                "8e59e6fb.c51ca8",\r
-                "142cb248.a61cb6",\r
-                "751946c8.87ef38",\r
-                "ef72ca54.96aa7",\r
-                "f9ac2eb4.61364"\r
+                "6a62e528.843adc",\r
+                "27ec3c87.0a16a4",\r
+                "141ab523.6149e3",\r
+                "8445a42.64341d8",\r
+                "baec8114.d828c8",\r
+                "90f19b33.a1e3a",\r
+                "26901c7e.371ebc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a7962069.276858",\r
+        "id": "6a62e528.843adc",\r
         "type": "outcome",\r
         "name": "assign",\r
         "xml": "<outcome value='assign'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 886.3809814453125,\r
-        "y": 470.5089511871338,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1059.3809814453125,\r
+        "y": 490.5089511871338,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "f7b6e38.ff165a"\r
+                "1151efa6.7d7988"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f49f6b1.024f098",\r
+        "id": "27ec3c87.0a16a4",\r
         "type": "outcome",\r
         "name": "unassign",\r
         "xml": "<outcome value='unassign'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 962.4287996292114,\r
-        "y": 1239.6997060775757,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1135.4287996292114,\r
+        "y": 1259.6997060775757,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "ab1f503b.af03d8"\r
+                "b7aab17f.d8737"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "142cb248.a61cb6",\r
+        "id": "8445a42.64341d8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 946.1430358886719,\r
-        "y": 1927.8899335861206,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1119.1430358886719,\r
+        "y": 1947.8899335861206,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "7e74b0a8.45fec"\r
+                "1a454130.e9b437"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e74b0a8.45fec",\r
+        "id": "1a454130.e9b437",\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": 1179.3334655761719,\r
-        "y": 1927.8899946212769,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1352.3334655761719,\r
+        "y": 1947.8899946212769,\r
+        "z": "f5eee496.37583",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3bc78e03.8c382a",\r
+        "id": "33260e4d.c20b2a",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:validate-vnf-input",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vnf-input' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 657.4166870117188,\r
-        "y": 395.3661289215088,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 830.4166870117188,\r
+        "y": 415.3661289215088,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e3d82d2a.fc82d8",\r
+        "id": "b1c75a1f.b736a",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1768.857307434082,\r
-        "y": 1193.4137859344482,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1941.857307434082,\r
+        "y": 1213.4137859344482,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ab1f503b.af03d8",\r
+        "id": "b7aab17f.d8737",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-unassign",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-unassign' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1326.5239305496216,\r
-        "y": 1244.4137868881226,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1499.5239305496216,\r
+        "y": 1264.4137868881226,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8e59e6fb.c51ca8",\r
+        "id": "141ab523.6149e3",\r
         "type": "outcome",\r
         "name": "deactivate",\r
         "xml": "<outcome value='deactivate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 931.5238800048828,\r
-        "y": 979.080415725708,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1104.5238800048828,\r
+        "y": 999.080415725708,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "ae6067c.1b2fa98"\r
+                "174a6915.f20dff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "858bb800.ca206",\r
+        "id": "9c2d6c28.9eabb8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1725.666877746582,\r
-        "y": 852.9850749969482,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1898.666877746582,\r
+        "y": 872.9850749969482,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "751946c8.87ef38",\r
+        "id": "baec8114.d828c8",\r
         "type": "outcome",\r
         "name": "activate",\r
         "xml": "<outcome value='activate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 894.3333129882812,\r
-        "y": 640.6517143249512,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1067.3333129882812,\r
+        "y": 660.6517143249512,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "6df2d884.4ca038"\r
+                "272242b5.b176e6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef72ca54.96aa7",\r
+        "id": "90f19b33.a1e3a",\r
         "type": "outcome",\r
         "name": "create",\r
         "xml": "<outcome value='create'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 964.0002298355103,\r
-        "y": 1372.0713729858398,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1137.0002298355103,\r
+        "y": 1392.0713729858398,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "ae139a1c.222e28"\r
+                "e8ab363a.a04b1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9ac2eb4.61364",\r
+        "id": "26901c7e.371ebc",\r
         "type": "outcome",\r
         "name": "delete",\r
         "xml": "<outcome value='delete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 957.0002288818359,\r
-        "y": 1683.0713829994202,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1130.000228881836,\r
+        "y": 1703.0713829994202,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "8c3ce117.5fae2"\r
+                "948c6273.9d905"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd1d07e9.5eedc",\r
+        "id": "a9e35ff1.79f4e8",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1136.0000839233398,\r
-        "y": 696.0713911056519,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1309.0000839233398,\r
+        "y": 716.0713911056519,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "7013feeb.ed049",\r
-                "20d3b5c2.f3e69a",\r
-                "3668cbba.d4faa4",\r
-                "269f5d4e.8f57b2",\r
-                "816c27b8.77c4e8",\r
-                "2047aafd.7f7996"\r
+                "f87379c.1e07488",\r
+                "c36c43cc.aeeda8",\r
+                "13164371.5de335",\r
+                "a2611719.24c7b",\r
+                "176f424b.dada06",\r
+                "39f3b84c.87449"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20d3b5c2.f3e69a",\r
+        "id": "c36c43cc.aeeda8",\r
         "type": "outcome",\r
         "name": "ActivateSiteInstance",\r
         "xml": "<outcome value='ActivateSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1396.4763259887695,\r
-        "y": 618.5506420135498,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1569.4763259887695,\r
+        "y": 638.5506420135498,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "66f830ed.1e6de"\r
+                "bb367534.ef4ec8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7013feeb.ed049",\r
+        "id": "f87379c.1e07488",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1369.3811111450195,\r
-        "y": 853.9286479949951,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1542.3811111450195,\r
+        "y": 873.9286479949951,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "858bb800.ca206"\r
+                "9c2d6c28.9eabb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6df2d884.4ca038",\r
+        "id": "272242b5.b176e6",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1075.0000839233398,\r
-        "y": 641.0713911056519,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1248.0000839233398,\r
+        "y": 661.0713911056519,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "bd1d07e9.5eedc"\r
+                "a9e35ff1.79f4e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66f830ed.1e6de",\r
+        "id": "bb367534.ef4ec8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1763.000129699707,\r
-        "y": 621.0714244842529,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1936.000129699707,\r
+        "y": 641.0714244842529,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c2449ca2.43f5b8",\r
+        "id": "bf370495.757518",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1194.0001983642578,\r
-        "y": 1012.071382522583,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1367.0001983642578,\r
+        "y": 1032.071382522583,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "52b80951.997c28",\r
-                "62663e18.1595d8",\r
-                "f75942cd.e9cdb",\r
-                "b095d5a2.1abde",\r
-                "5974d41f.5000ac",\r
-                "767ffc3.b041d84"\r
+                "49eaa74e.8c768",\r
+                "673e8d63.ef464c",\r
+                "6f7de94e.d598f",\r
+                "3bbdbf03.70f7",\r
+                "9e5f5985.9a8c28",\r
+                "12389cbe.8a7ceb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62663e18.1595d8",\r
+        "id": "673e8d63.ef464c",\r
         "type": "outcome",\r
         "name": "DeactivateSiteInstance",\r
         "xml": "<outcome value='DeactivateSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1437.4763946533203,\r
-        "y": 963.5506310462952,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1610.4763946533203,\r
+        "y": 983.5506310462952,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "13fd7ab.e595405"\r
+                "76abc0e2.85bc5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "52b80951.997c28",\r
+        "id": "49eaa74e.8c768",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1412.3811111450195,\r
-        "y": 1193.9286785125732,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1585.3811111450195,\r
+        "y": 1213.9286785125732,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "e3d82d2a.fc82d8"\r
+                "b1c75a1f.b736a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae6067c.1b2fa98",\r
+        "id": "174a6915.f20dff",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1133.0001983642578,\r
-        "y": 957.071382522583,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1306.0001983642578,\r
+        "y": 977.071382522583,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "c2449ca2.43f5b8"\r
+                "bf370495.757518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13fd7ab.e595405",\r
+        "id": "76abc0e2.85bc5",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1807.0001983642578,\r
-        "y": 961.0714135169983,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1980.0001983642578,\r
+        "y": 981.0714135169983,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b50b7762.c568b8",\r
+        "id": "6945b0fa.57898",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1162.333625793457,\r
-        "y": 1458.6576824188232,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1335.333625793457,\r
+        "y": 1478.6576824188232,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "daa776c9.c4de78",\r
-                "ea4b7172.c374",\r
-                "f6ff4a70.3816",\r
-                "6afcca50.5f66dc",\r
-                "2f050ce4.d6732c",\r
-                "254873f2.91487c"\r
+                "878cf713.a74bf",\r
+                "6f7cdd9b.38d304",\r
+                "6f40b7fc.70cde",\r
+                "40ffdf8b.d98258",\r
+                "6fc6cf80.2742",\r
+                "96eee0bd.7d8858"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea4b7172.c374",\r
+        "id": "6f7cdd9b.38d304",\r
         "type": "outcome",\r
         "name": "CreateSiteInstance",\r
         "xml": "<outcome value='CreateSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1417.8101167678833,\r
-        "y": 1311.1370167732239,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1590.8101167678833,\r
+        "y": 1331.1370167732239,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "84d19a5a.04aa1"\r
+                "b46cf4df.32707"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "daa776c9.c4de78",\r
+        "id": "878cf713.a74bf",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1384.714599609375,\r
-        "y": 1532.5149021148682,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1557.714599609375,\r
+        "y": 1552.5149021148682,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "c4ca7fde.46e428"\r
+                "2c3d033f.ef6ef4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae139a1c.222e28",\r
+        "id": "e8ab363a.a04b1",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1146.3337144851685,\r
-        "y": 1369.6577405929565,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1319.3337144851685,\r
+        "y": 1389.6577405929565,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "b50b7762.c568b8"\r
+                "6945b0fa.57898"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84d19a5a.04aa1",\r
+        "id": "b46cf4df.32707",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-create",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-create' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1794.333821296692,\r
-        "y": 1309.657775402069,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1967.333821296692,\r
+        "y": 1329.657775402069,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c4ca7fde.46e428",\r
+        "id": "2c3d033f.ef6ef4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1525.0001754760742,\r
-        "y": 1533.571325302124,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1698.0001754760742,\r
+        "y": 1553.571325302124,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d39a24a.5273558",\r
+        "id": "c7a1cbe3.987808",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1203.000228881836,\r
-        "y": 1735.5713829994202,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1376.000228881836,\r
+        "y": 1755.5713829994202,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "15b3024f.9d2b5e",\r
-                "3848ec5b.7575f4",\r
-                "fbaa1326.1081a",\r
-                "254cc1a6.5d0cc6",\r
-                "de41704e.e02f2",\r
-                "da1c7a96.50bc1"\r
+                "c62eb926.85d33",\r
+                "7a7ae529.cd458c",\r
+                "5d404aca.28015c",\r
+                "24ef76eb.fe68ca",\r
+                "d11af3be.8899c",\r
+                "e8482541.be4a68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3848ec5b.7575f4",\r
+        "id": "7a7ae529.cd458c",\r
         "type": "outcome",\r
         "name": "DeleteSiteInstance",\r
         "xml": "<outcome value='DeleteSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1443.476448059082,\r
-        "y": 1681.0506267547607,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1616.476448059082,\r
+        "y": 1701.0506267547607,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "3da95e89.3273f2"\r
+                "7f9a71f7.e7a108"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15b3024f.9d2b5e",\r
+        "id": "c62eb926.85d33",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1408.381233215332,\r
-        "y": 1931.428861618042,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1581.381233215332,\r
+        "y": 1951.428861618042,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "28393206.2f0986"\r
+                "b15da572.e87ef"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c3ce117.5fae2",\r
+        "id": "948c6273.9d905",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1142.000228881836,\r
-        "y": 1680.5713829994202,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1315.000228881836,\r
+        "y": 1700.5713829994202,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "d39a24a.5273558"\r
+                "c7a1cbe3.987808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3da95e89.3273f2",\r
+        "id": "7f9a71f7.e7a108",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-delete",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-delete' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1816.0002517700195,\r
-        "y": 1678.5713787078857,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1989.0002517700195,\r
+        "y": 1698.5713787078857,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "28393206.2f0986",\r
+        "id": "b15da572.e87ef",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1548.6668090820312,\r
-        "y": 1932.4852848052979,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1721.6668090820312,\r
+        "y": 1952.4852848052979,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3668cbba.d4faa4",\r
+        "id": "13164371.5de335",\r
         "type": "outcome",\r
         "name": "ActivateSDWANDeviceInstance",\r
         "xml": "<outcome value='ActivateSDWANDeviceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1427.6667556762695,\r
-        "y": 669.571455001831,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1600.6667556762695,\r
+        "y": 689.571455001831,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "e597143.e5430e8"\r
+                "bb7369d2.79a9b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e597143.e5430e8",\r
+        "id": "bb7369d2.79a9b",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1867.1904373168945,\r
-        "y": 668.092206954956,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2040.1904373168945,\r
+        "y": 688.092206954956,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f75942cd.e9cdb",\r
+        "id": "6f7de94e.d598f",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANDeviceInstance",\r
         "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1478.666633605957,\r
-        "y": 1011.571409702301,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1651.666633605957,\r
+        "y": 1031.571409702301,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "4ef6289e.5a069"\r
+                "5c24aa9.f8036d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ef6289e.5a069",\r
+        "id": "5c24aa9.f8036d4",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1935.190330505371,\r
-        "y": 1011.0922451019287,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2108.190330505371,\r
+        "y": 1031.0922451019287,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "42a673d5.9dc9ec",\r
+        "id": "fd3d0953.02e43",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1864.666633605957,\r
-        "y": 708.5713939666748,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2037.666633605957,\r
+        "y": 728.5713939666748,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "269f5d4e.8f57b2",\r
+        "id": "a2611719.24c7b",\r
         "type": "outcome",\r
         "name": "ActivateSDWANPortInstance",\r
         "xml": "<outcome value='ActivateSDWANPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1421.142951965332,\r
-        "y": 716.0506114959717,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1594.142951965332,\r
+        "y": 736.0506114959717,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "42a673d5.9dc9ec"\r
+                "fd3d0953.02e43"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b095d5a2.1abde",\r
+        "id": "3bbdbf03.70f7",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANPortInstance",\r
         "xml": "<outcome value='DeactivateSDWANPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1470.6666793823242,\r
-        "y": 1049.904725074768,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1643.6666793823242,\r
+        "y": 1069.904725074768,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "822cf96e.0d9b6"\r
+                "25fa8901.ea4226"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "822cf96e.0d9b6",\r
+        "id": "25fa8901.ea4226",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1945.190330505371,\r
-        "y": 1066.4255270957947,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2118.190330505371,\r
+        "y": 1086.4255270957947,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f6ff4a70.3816",\r
+        "id": "6f40b7fc.70cde",\r
         "type": "outcome",\r
         "name": "CreateSDWANPortInstance",\r
         "xml": "<outcome value='CreateSDWANPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1467.6670122146606,\r
-        "y": 1399.9048511981964,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1640.6670122146606,\r
+        "y": 1419.9048511981964,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "2cee7114.60daa6"\r
+                "cbbee8f6.313cb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2cee7114.60daa6",\r
+        "id": "cbbee8f6.313cb8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-create",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-create' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1924.1906328201294,\r
-        "y": 1404.425630569458,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2097.1906328201294,\r
+        "y": 1424.425630569458,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fbaa1326.1081a",\r
+        "id": "5d404aca.28015c",\r
         "type": "outcome",\r
         "name": "DeleteSDWANPortInstance",\r
         "xml": "<outcome value='DeleteSDWANPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1479.3334655761719,\r
-        "y": 1791.9047713279724,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1652.3334655761719,\r
+        "y": 1811.9047713279724,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "3a81ef6f.a21e28"\r
+                "15dc39bf.cd04de"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a81ef6f.a21e28",\r
+        "id": "15dc39bf.cd04de",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-delete",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-delete' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1905.8571853637695,\r
-        "y": 1791.4256267547607,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2078.8571853637695,\r
+        "y": 1811.4256267547607,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "254cc1a6.5d0cc6",\r
+        "id": "24ef76eb.fe68ca",\r
         "type": "outcome",\r
         "name": "DeleteSDWANDeviceInstance",\r
         "xml": "<outcome value='DeleteSDWANDeviceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1488.0316162109375,\r
-        "y": 1732.102677822113,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1661.0316162109375,\r
+        "y": 1752.102677822113,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "233ef390.f379c4"\r
+                "ebf4bbea.e5ce9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "233ef390.f379c4",\r
+        "id": "ebf4bbea.e5ce9",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-delete",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-delete' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1920.5552215576172,\r
-        "y": 1731.6233911514282,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2093.555221557617,\r
+        "y": 1751.6233911514282,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6afcca50.5f66dc",\r
+        "id": "40ffdf8b.d98258",\r
         "type": "outcome",\r
         "name": "CreateSDWANDeviceInstance",\r
         "xml": "<outcome value='CreateSDWANDeviceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1483.031361579895,\r
-        "y": 1356.1028146743774,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1656.031361579895,\r
+        "y": 1376.1028146743774,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "316c4260.73720e"\r
+                "618700fa.fa57e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "316c4260.73720e",\r
+        "id": "618700fa.fa57e",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-create",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-create' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1939.555027961731,\r
-        "y": 1354.623628616333,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2112.555027961731,\r
+        "y": 1374.623628616333,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "816c27b8.77c4e8",\r
+        "id": "176f424b.dada06",\r
         "type": "outcome",\r
         "name": "ActivateSDWANVpnInstance",\r
         "xml": "<outcome value='ActivateSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1425.2961502075195,\r
-        "y": 765.1484661102295,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1598.2961502075195,\r
+        "y": 785.1484661102295,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "8435974d.4fc658"\r
+                "4be7a0af.f34808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2047aafd.7f7996",\r
+        "id": "39f3b84c.87449",\r
         "type": "outcome",\r
         "name": "ActivateSDWANSiteInstance",\r
         "xml": "<outcome value='ActivateSDWANSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1429.2961502075195,\r
-        "y": 807.8149089813232,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1602.2961502075195,\r
+        "y": 827.8149089813232,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "8435974d.4fc658"\r
+                "4be7a0af.f34808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8435974d.4fc658",\r
+        "id": "4be7a0af.f34808",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1700.296142578125,\r
-        "y": 785.8149607181549,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1873.296142578125,\r
+        "y": 805.8149607181549,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "e4988e8c.796a8"\r
+                "f5fc6a61.fbff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e4988e8c.796a8",\r
+        "id": "f5fc6a61.fbff",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2078.2959899902344,\r
-        "y": 783.148619890213,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2251.2959899902344,\r
+        "y": 803.148619890213,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f6f20244.8d9308",\r
+        "id": "8713d091.3458c8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2131.3332138061523,\r
-        "y": 1121.9380941390991,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2304.3332138061523,\r
+        "y": 1141.9380941390991,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dde515a2.eea8c",\r
+        "id": "61c74aac.7351c4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1734.3333053588867,\r
-        "y": 1123.6044387817383,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1907.3333053588867,\r
+        "y": 1143.6044387817383,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "f6f20244.8d9308"\r
+                "8713d091.3458c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "767ffc3.b041d84",\r
+        "id": "12389cbe.8a7ceb",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANSiteInstance",\r
         "xml": "<outcome value='DeactivateSDWANSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1476.3332901000977,\r
-        "y": 1145.6044034957886,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1649.3332901000977,\r
+        "y": 1165.6044034957886,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "dde515a2.eea8c"\r
+                "61c74aac.7351c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5974d41f.5000ac",\r
+        "id": "9e5f5985.9a8c28",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANVpnInstance",\r
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1470.3332595825195,\r
-        "y": 1102.9379558563232,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1643.3332595825195,\r
+        "y": 1122.9379558563232,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "dde515a2.eea8c"\r
+                "61c74aac.7351c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f050ce4.d6732c",\r
+        "id": "6fc6cf80.2742",\r
         "type": "outcome",\r
         "name": "CreateSDWANVpnInstance",\r
         "xml": "<outcome value='CreateSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1463.851692199707,\r
-        "y": 1454.592924118042,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1636.851692199707,\r
+        "y": 1474.592924118042,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "740e2dc7.31c594"\r
+                "6a26d308.85095c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "254873f2.91487c",\r
+        "id": "96eee0bd.7d8858",\r
         "type": "outcome",\r
         "name": "CreateSDWANSiteInstance",\r
         "xml": "<outcome value='CreateSDWANSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1455.8516693115234,\r
-        "y": 1496.2593126296997,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1628.8516693115234,\r
+        "y": 1516.2593126296997,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "740e2dc7.31c594"\r
+                "6a26d308.85095c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "740e2dc7.31c594",\r
+        "id": "6a26d308.85095c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1713.8516845703125,\r
-        "y": 1474.2593479156494,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1886.8516845703125,\r
+        "y": 1494.2593479156494,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "34a062a6.1dcf1e"\r
+                "b45845a5.efe788"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "34a062a6.1dcf1e",\r
+        "id": "b45845a5.efe788",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-create",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2091.851531982422,\r
-        "y": 1471.5930070877075,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2264.851531982422,\r
+        "y": 1491.5930070877075,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "de41704e.e02f2",\r
+        "id": "d11af3be.8899c",\r
         "type": "outcome",\r
         "name": "DeleteSDWANVpnInstance",\r
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1470.333381652832,\r
-        "y": 1838.9380779266357,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1643.333381652832,\r
+        "y": 1858.9380779266357,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "129831e9.f87ede"\r
+                "f4a10691.8e0f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da1c7a96.50bc1",\r
+        "id": "e8482541.be4a68",\r
         "type": "outcome",\r
         "name": "DeleteSDWANSiteInstance",\r
         "xml": "<outcome value='DeleteSDWANSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1470.333381652832,\r
-        "y": 1879.604642868042,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1643.333381652832,\r
+        "y": 1899.604642868042,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "129831e9.f87ede"\r
+                "f4a10691.8e0f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "129831e9.f87ede",\r
+        "id": "f4a10691.8e0f9",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1720.3333740234375,\r
-        "y": 1858.6045017242432,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1893.3333740234375,\r
+        "y": 1878.6045017242432,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "229550df.5e154"\r
+                "ae8b0dcf.01d3b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "229550df.5e154",\r
+        "id": "ae8b0dcf.01d3b",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-delete",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-delete' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2098.333221435547,\r
-        "y": 1855.9381608963013,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2271.333221435547,\r
+        "y": 1875.9381608963013,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "48008d0.96b8a74",\r
+        "id": "90dfa10c.d03aa",\r
         "type": "set",\r
         "name": "set skip-mdsal-update to Y",\r
         "xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",\r
         "comments": "",\r
-        "x": 2247.0318908691406,\r
-        "y": 361.4920959472656,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2420.0318908691406,\r
+        "y": 381.4920959472656,\r
+        "z": "f5eee496.37583",\r
         "wires": []\r
     },\r
     {\r
-        "id": "92f6b1eb.ca851",\r
+        "id": "18cf87e0.6196e8",\r
         "type": "set",\r
         "name": "set ack-final to 'N'",\r
         "xml": "<set>\n<parameter name='ack-final' value='N' />\n",\r
         "comments": "",\r
-        "x": 2218.841583251953,\r
-        "y": 425.8401184082031,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2391.841583251953,\r
+        "y": 445.8401184082031,\r
+        "z": "f5eee496.37583",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2763f43e.b7f64c",\r
+        "id": "11b35a07.5a2e3e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2010.3811340332031,\r
-        "y": 364.4126281738281,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2183.381134033203,\r
+        "y": 384.4126281738281,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "48008d0.96b8a74",\r
-                "92f6b1eb.ca851",\r
-                "e91c2cf.91f4f5"\r
+                "90dfa10c.d03aa",\r
+                "18cf87e0.6196e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99df438b.bf111",\r
+        "id": "2b315e75.81704a",\r
         "type": "comment",\r
         "name": "ack-final=N triggers Provider to call vnf-topology-operation-aysnc DG",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2431.158966064453,\r
-        "y": 466.8094787597656,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2604.158966064453,\r
+        "y": 486.8094787597656,\r
+        "z": "f5eee496.37583",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9860bb12.14903",\r
+        "id": "14ca87f8.41176",\r
         "type": "switchNode",\r
         "name": "so-response-url empty?",\r
         "xml": "<switch test='`length($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1116.2857971191406,\r
-        "y": 211.28570556640625,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1289.2857971191406,\r
+        "y": 231.28570556640625,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "2a95a553.f75302",\r
-                "1a29396b.d78657"\r
+                "26f3c83e.94f3d",\r
+                "8cb49b5.ced0668"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a95a553.f75302",\r
+        "id": "26f3c83e.94f3d",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1341.2857971191406,\r
-        "y": 167.28570556640625,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1514.2857971191406,\r
+        "y": 187.28570556640625,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "9599639c.6064a"\r
+                "98eada69.09cbf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a29396b.d78657",\r
+        "id": "8cb49b5.ced0668",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1331.2857971191406,\r
-        "y": 259.28570556640625,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1504.2857971191406,\r
+        "y": 279.28570556640625,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "7685fc6a.1e8e84"\r
+                "7f12b283.43e464"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7685fc6a.1e8e84",\r
+        "id": "7f12b283.43e464",\r
         "type": "switchNode",\r
         "name": "so-response-url = ignored URL?",\r
         "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1553.2857971191406,\r
-        "y": 260.28570556640625,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1726.2857971191406,\r
+        "y": 280.28570556640625,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "dcc6c506.1c2e3",\r
-                "f03182d7.544448"\r
+                "d9307a61.e9cdb8",\r
+                "3106a2ed.a08146"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9599639c.6064a",\r
+        "id": "98eada69.09cbf8",\r
         "type": "call",\r
         "name": "call vnf-topology-operation-assign-sync",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-sync' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2017.2857971191406,\r
-        "y": 168.28570556640625,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 2190.2857971191406,\r
+        "y": 188.28570556640625,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dcc6c506.1c2e3",\r
+        "id": "d9307a61.e9cdb8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1793.2857971191406,\r
-        "y": 259.28570556640625,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1966.2857971191406,\r
+        "y": 279.28570556640625,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "9599639c.6064a"\r
+                "98eada69.09cbf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f03182d7.544448",\r
+        "id": "3106a2ed.a08146",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1801.2857971191406,\r
-        "y": 360.28570556640625,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1974.2857971191406,\r
+        "y": 380.28570556640625,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "2763f43e.b7f64c"\r
+                "11b35a07.5a2e3e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90549b1f.450ae",\r
+        "id": "87242f67.49446",\r
         "type": "execute",\r
         "name": "execute getProperties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1129.6622619628906,\r
-        "y": 101.54547119140625,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1302.6622619628906,\r
+        "y": 121.54547119140625,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f7b6e38.ff165a",\r
+        "id": "1151efa6.7d7988",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 938.7533264160156,\r
-        "y": 99.727294921875,\r
-        "z": "4a2a8d50.48649c",\r
+        "x": 1111.7533264160156,\r
+        "y": 119.727294921875,\r
+        "z": "f5eee496.37583",\r
         "wires": [\r
             [\r
-                "9860bb12.14903",\r
-                "90549b1f.450ae"\r
+                "14ca87f8.41176",\r
+                "87242f67.49446"\r
             ]\r
         ]\r
-    },\r
-    {\r
-        "id": "e91c2cf.91f4f5",\r
-        "type": "call",\r
-        "name": "call vnf-topology-operation-assign-async",\r
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-async' mode='sync' >\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2282,\r
-        "y": 510,\r
-        "z": "4a2a8d50.48649c",\r
-        "wires": [\r
-            []\r
-        ]\r
     }\r
 ]
\ No newline at end of file
index b56795f..cd5b820 100755 (executable)
@@ -183,6 +183,8 @@ GENERIC-RESOURCE-API vf-module-topology-operation-activate ${project.version} sy
 GENERIC-RESOURCE-API vf-module-topology-operation-assign-no-preload ${project.version} sync
 GENERIC-RESOURCE-API vf-module-topology-operation-assign-preload ${project.version} sync
 GENERIC-RESOURCE-API vf-module-topology-operation-assign ${project.version} sync
+GENERIC-RESOURCE-API vf-module-topology-operation-assign-async ${project.version} sync
+GENERIC-RESOURCE-API vf-module-topology-operation-assign-sync ${project.version} sync
 GENERIC-RESOURCE-API vf-module-topology-operation-changeassign ${project.version} sync
 GENERIC-RESOURCE-API vf-module-topology-operation-deactivate ${project.version} sync
 GENERIC-RESOURCE-API vf-module-topology-operation-unassign ${project.version} sync
@@ -196,6 +198,8 @@ GENERIC-RESOURCE-API vnf-get-resource-request ${project.version} sync
 GENERIC-RESOURCE-API vnf-topology-operation-async ${project.version} sync
 GENERIC-RESOURCE-API vnf-topology-operation-activate ${project.version} sync
 GENERIC-RESOURCE-API vnf-topology-operation-assign ${project.version} sync
+GENERIC-RESOURCE-API vnf-topology-operation-assign-async ${project.version} sync
+GENERIC-RESOURCE-API vnf-topology-operation-assign-sync ${project.version} sync
 GENERIC-RESOURCE-API vnf-topology-operation-changeassign ${project.version} sync
 GENERIC-RESOURCE-API vnf-topology-operation-deactivate ${project.version} sync
 GENERIC-RESOURCE-API vnf-topology-operation-unassign ${project.version} sync
index 4c89d83..e0527fb 100644 (file)
@@ -8,7 +8,7 @@
             </set>\r
             <switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\r
                 <outcome value='assign'>\r
-                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign' mode='sync' ></call>\r
+                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-async' mode='sync' ></call>\r
                 </outcome>\r
                 <outcome value='Other'>\r
                     <return status='failure'>\r
index dc7dc37..9258d3b 100644 (file)
@@ -28,7 +28,6 @@
                                             <set>\r
                                                 <parameter name='ack-final' value='N' />\r
                                             </set>\r
-                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-async' mode='sync' ></call>\r
                                         </block>\r
                                     </outcome>\r
                                 </switch>\r
index 69175f2..64183eb 100644 (file)
@@ -8,7 +8,7 @@
             </set>\r
             <switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\r
                 <outcome value='assign'>\r
-                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign' mode='sync' ></call>\r
+                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-async' mode='sync' ></call>\r
                 </outcome>\r
                 <outcome value='Other'>\r
                     <return status='failure'>\r
index d1cc40d..c796dd8 100644 (file)
@@ -28,7 +28,6 @@
                                             <set>\r
                                                 <parameter name='ack-final' value='N' />\r
                                             </set>\r
-                                            <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-async' mode='sync' ></call>\r
                                         </block>\r
                                     </outcome>\r
                                 </switch>\r