Fix async logic

Fix bug in vnf-topology and vf-module-topology DGs to call correct async DG (right now, not calling async DG). Change-Id: Ifdf9dd24145804af765ba2e4ac87001af0b6f283 Issue-ID: SDNC-949 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com> Former-commit-id: 464d663e89bb84963a55fef59ac35d3b10863334
author: Timoney, Dan (dt5972) <dtimoney@att.com> 2019-10-21 10:17:28 -0400
committer: Dan Timoney <dtimoney@att.com> 2019-10-22 14:44:49 +0000
commit: 7072c175934cd5755ab7b5a9a101d3c7ac7d7d47 (patch)
tree: d84ea89d56d943e61b26d5f17d273b3a78b4bf73
parent: c39c8f81cba4633015d6270440a6cd4776bb0a24 (diff)
5 files changed, 1073 insertions, 930 deletions
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 5e56c6e7..9bfac300 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -3,6 +3,117 @@
 Release Notes
 =============
 
+Version 1.7.4
+-------------
+:Release Date: 2019-10-24
+
+El Alto release
+
+**Artifact Versions**
+
+
+The following table lists the SDNC docker containers and their versions.
+
++--------------------------------+---------------------------------------------+-----------+
+| Image name                     |  Description                                | Version(s)|
++================================+=============================================+===========+
+| onap/network-discovery         | POMBA : network discovery microservice      | 1.7.3     |
++--------------------------------+---------------------------------------------+-----------+
+| onap/service-decomposition     | POMBA : service decomposition microservice  | 1.7.3     |
++--------------------------------+---------------------------------------------+-----------+
+| onap/sdnc-ansible-server-image | Ansible server                              | 1.7.4     |
++--------------------------------+---------------------------------------------+-----------+
+| onap/sdnc-aaf-image            | SDNC controller image, with AAF integration | 1.7.4     |
++--------------------------------+---------------------------------------------+-----------+
+| onap/sdnc-image                | SDNC controller image, standalone (no AAF)  | 1.7.4     |
++--------------------------------+---------------------------------------------+-----------+
+| onap/sdnc-ueb-listener-image   | SDC listener                                | 1.7.4     |
++--------------------------------+---------------------------------------------+-----------+
+| onap/sdcn-dmaap-listener-image | DMAAP listener                              | 1.7.4     |
++--------------------------------+---------------------------------------------+-----------+
+
+
+**New Features**
+
+The full list of El Alto epics and user stories for SDNC may be found at <https://jira.onap.org/issues/?filter=12044>.
+
+The following list summarizes some of the most significant epics:
+
++------------+-------------------------------------------------------------------------------------+
+| Jira #     | Abstract                                                                            |
++============+=====================================================================================+
+| [SDNC-825] | OpenDaylight Neon upgrade                                                           |
++------------+-------------------------------------------------------------------------------------+
+| [SDNC-858] | Tune OpenDaylight Java settings for NETCONF                                         |
++------------+-------------------------------------------------------------------------------------+
+| [SDNC-822] | Add aggregate-route-policy in GR-API and async changes                              |
++------------+-------------------------------------------------------------------------------------+
+| [SDNC-431] | Implement config DB and REST API                                                    |
++------------+-------------------------------------------------------------------------------------+
+| [SDNC-433] | Receive netconf notification from RAN, update config DB and publish change on DMAAP |
++------------+-------------------------------------------------------------------------------------+
+
+
+
+**Bug Fixes**
+The full list of bug fixes in the SDNC El Alto release may be found at <https://jira.onap.org/issues/?filter=12045>
+
+**Known Issues**
+The full list of known issues in SDNC may be found in the ONAP Jira at <https://jira.onap.org/issues/?filter=11119>
+
+One specific issue of concern is the following
+
++------------+---------------------------------------------------------------------------------+
+| Jira #     | Abstract                                                                        |
++============+=================================================================================+
+| [SDNC-949] | GR-API Macro Orchestration fails while waiting on vnf-topology-operation status |
++------------+---------------------------------------------------------------------------------+
+
+This issue is fixed in Gerrit, but not in the released 1.7.4 version of the SDNC docker container.  This issue
+can be manually fixed by installing the following 2 directed graphs via directed graph builder:
+
+- `GENERIC-RESOURCE-API_vf-module-topology-operation.json
+<https://gerrit.onap.org/r/gitweb?p=sdnc/oam.git;a=blob_plain;f=platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json;hb=refs/heads/elalto>`_
+- `GENERIC-RESOURCE-API_vnf-topology-operation.json
+<https://gerrit.onap.org/r/gitweb?p=sdnc/oam.git;a=blob_plain;f=platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json;hb=refs/heads/elalto>`_
+
+
+
+One item of note is that the SDNC admin portal was determined to have a number of security vulnerabilities,
+under Known Security Issues.  As a temporary remediation, the admin portal was disabled in
+Dublin.  These issues have been resolved in El Alto.
+
+
+
+**Security Notes**
+
+*Fixed Security Issues*
+
+- CVE-2019-12132 `OJSI-41 <https://jira.onap.org/browse/OJSI-41>`_ SDNC service allows for arbitrary code execution in sla/dgUpload form
+- CVE-2019-12123 `OJSI-42 <https://jira.onap.org/browse/OJSI-42>`_ SDNC service allows for arbitrary code execution in sla/printAsXml form
+- CVE-2019-12113 `OJSI-43 <https://jira.onap.org/browse/OJSI-43>`_ SDNC service allows for arbitrary code execution in sla/printAsGv form
+- `OJSI-91 <https://jira.onap.org/browse/OJSI-91>`_ SDNC exposes unprotected API for user creation
+- `OJSI-98 <https://jira.onap.org/browse/OJSI-98>`_ In default deployment SDNC (sdnc-portal) exposes HTTP port 30201 outside of cluster.
+- CVE-2019-12112 `OJSI-199 <https://jira.onap.org/browse/OJSI-199>`_ SDNC service allows for arbitrary code execution in sla/upload form
+- `OJSI-34 <https://jira.onap.org/browse/OJSI-34>`_ Multiple SQL Injection issues in SDNC
+- `OJSI-99 <https://jira.onap.org/browse/OJSI-99>`_ In default deployment SDNC (sdnc) exposes HTTP port 30202 outside of cluster.
+- `OJSI-100 <https://jira.onap.org/browse/OJSI-100>`_ In default deployment SDNC (sdnc-dgbuilder) exposes HTTP port 30203 outside of cluster.
+- `OJSI-179 <https://jira.onap.org/browse/OJSI-179>`_ dev-sdnc-sdnc exposes JDWP on port 1830 which allows for arbitrary code execution
+- `OJSI-183 <https://jira.onap.org/browse/OJSI-183>`_ SDNC exposes ssh service on port 30208
+
+*Known Security Issues*
+
+
+
+*Known Vulnerabilities in Used Modules*
+
+Quick Links:
+
+- `SDNC project page <https://wiki.onap.org/display/DW/Software+Defined+Network+Controller+Project>`_
+- `Passing Badge information for SDNC <https://bestpractices.coreinfrastructure.org/en/projects/1703>`_
+- `Project Vulnerability Review Table for Casablanca Release <https://wiki.onap.org/pages/viewpage.action?pageId=45307811>`_
+
+
 Version 1.5.4
 -------------
 :Release Date: 2019-06-13
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
index 2e0b33b6..7df3bc6c 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
@@ -1,1533 +1,1548 @@
 [
     {
-        "id": "d8863b79.72ac3",
+        "id": "11d4dc1b.cea77c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 198.57144165039062,
-        "y": 281.4285888671875,
-        "z": "35fa0037.7ea1a",
+        "x": 156,
+        "y": 118.70132446289062,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "b7575d62.19af"
+                "63acf7dc.06021"
             ]
         ]
     },
     {
-        "id": "b7575d62.19af",
+        "id": "63acf7dc.06021",
         "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API 1.7.4.patchA",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
         "version": "${project.version}",
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 311.8571472167969,
-        "y": 321.6667003631592,
-        "z": "35fa0037.7ea1a",
+        "x": 269.28570556640625,
+        "y": 158.9394359588623,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "1c61ebdc.cc317c"
+                "4268d929.67e0a"
             ]
         ]
     },
     {
-        "id": "1c61ebdc.cc317c",
+        "id": "4268d929.67e0a",
         "type": "method",
         "name": "method vf-module-topology-operation",
         "xml": "<method rpc='vf-module-topology-operation' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 286.0000686645508,
-        "y": 361.4285831451416,
-        "z": "35fa0037.7ea1a",
+        "x": 243.42862701416016,
+        "y": 198.70131874084473,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "c071c5b1.68d1b8"
+                "403c1585.dc6254"
             ]
         ]
     },
     {
-        "id": "aba04432.e3048",
+        "id": "ece321a9.a609b",
         "type": "comment",
         "name": "vf-module-topology-operation",
         "info": "",
         "comments": "",
-        "x": 515.9162750244141,
-        "y": 264.01493072509766,
-        "z": "35fa0037.7ea1a",
+        "x": 473.34483337402344,
+        "y": 101.28766632080078,
+        "z": "d80dfa18.577678",
         "wires": []
     },
     {
-        "id": "c071c5b1.68d1b8",
+        "id": "403c1585.dc6254",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 260.0714874267578,
-        "y": 694.7887487411499,
-        "z": "35fa0037.7ea1a",
+        "x": 217.5000457763672,
+        "y": 532.061484336853,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "fa029fc6.a61ef8",
-                "7392e77b.d0867",
-                "e75039ec.59be18"
+                "18b03d2.eb1fbc3",
+                "fe759666.be3398",
+                "b0524b56.c7d9d"
             ]
         ]
     },
     {
-        "id": "fa029fc6.a61ef8",
+        "id": "18b03d2.eb1fbc3",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 545.5714797973633,
-        "y": 868.2861375808716,
-        "z": "35fa0037.7ea1a",
+        "x": 503.00003814697266,
+        "y": 705.5588731765747,
+        "z": "d80dfa18.577678",
         "wires": []
     },
     {
-        "id": "7392e77b.d0867",
+        "id": "fe759666.be3398",
         "type": "switchNode",
         "name": "switch svc-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 556.4760894775391,
-        "y": 692.9999732971191,
-        "z": "35fa0037.7ea1a",
+        "x": 513.9046478271484,
+        "y": 530.2727088928223,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "9ed6ce3e.dd87",
-                "672386a2.dec5b8",
-                "eba1c39e.7672e8",
-                "4c02c1d3.6c4df8",
-                "ea811474.306be8",
-                "71c36da6.a194e4",
-                "386c4488.ce0bd4",
-                "29ab0104.2f0c7e",
-                "49d32d84.447de4"
+                "196a98f8.3bd137",
+                "c8596657.93e1a",
+                "458d7c6b.5d0d5c",
+                "4b204f7e.1b8e2",
+                "5096a71a.af9198",
+                "398477c1.9e3bb8",
+                "112e016f.f82cbf",
+                "e227c212.42fea8",
+                "9300e0fc.aacde8"
             ]
         ]
     },
     {
-        "id": "9ed6ce3e.dd87",
+        "id": "196a98f8.3bd137",
         "type": "outcome",
         "name": "assign",
         "xml": "<outcome value='assign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 767.9523696899414,
-        "y": 541.2858753204346,
-        "z": "35fa0037.7ea1a",
+        "x": 725.3809280395508,
+        "y": 378.5586109161377,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "4776cb48.9ff3c4"
+                "f88029fe.714ff"
             ]
         ]
     },
     {
-        "id": "672386a2.dec5b8",
+        "id": "c8596657.93e1a",
         "type": "outcome",
         "name": "unassign",
         "xml": "<outcome value='unassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 774.3333549499512,
-        "y": 729.4765024185181,
-        "z": "35fa0037.7ea1a",
+        "x": 731.7619132995605,
+        "y": 566.7492380142212,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "e66966c7.aa29b"
+                "cd4b7513.f15268"
             ]
         ]
     },
     {
-        "id": "eba1c39e.7672e8",
+        "id": "458d7c6b.5d0d5c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 678.0477066040039,
-        "y": 2145.000147819519,
-        "z": "35fa0037.7ea1a",
+        "x": 635.4762649536133,
+        "y": 1982.2728834152222,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "e1f38f5e.48d6f"
+                "e82e3e2c.1df298"
             ]
         ]
     },
     {
-        "id": "e1f38f5e.48d6f",
+        "id": "e82e3e2c.1df298",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
         "comments": "",
-        "x": 872.2381324768066,
-        "y": 2145.00021648407,
-        "z": "35fa0037.7ea1a",
+        "x": 829.666690826416,
+        "y": 1982.272952079773,
+        "z": "d80dfa18.577678",
         "wires": []
     },
     {
-        "id": "e75039ec.59be18",
+        "id": "b0524b56.c7d9d",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:validate-vf-module-input",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vf-module-input' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 683.6547241210938,
-        "y": 438.809645652771,
-        "z": "35fa0037.7ea1a",
+        "x": 641.0832824707031,
+        "y": 276.0823812484741,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "d642bfab.0d051",
+        "id": "d72b4fcb.1f4c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1150.0951614379883,
-        "y": 679.5239181518555,
-        "z": "35fa0037.7ea1a",
+        "x": 1107.5237197875977,
+        "y": 516.7966537475586,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "e66966c7.aa29b",
+        "id": "cd4b7513.f15268",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-unassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-unassign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1144.4284324645996,
-        "y": 729.190637588501,
-        "z": "35fa0037.7ea1a",
+        "x": 1101.856990814209,
+        "y": 566.4633731842041,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "85be0739.9279b",
+        "id": "8bd129ae.83c078",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 778.4284477233887,
-        "y": 680.1905918121338,
-        "z": "35fa0037.7ea1a",
+        "x": 735.857006072998,
+        "y": 517.4633274078369,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "d642bfab.0d051"
+                "d72b4fcb.1f4c"
             ]
         ]
     },
     {
-        "id": "4c02c1d3.6c4df8",
+        "id": "4b204f7e.1b8e2",
         "type": "outcome",
         "name": "changeassign",
         "xml": "<outcome value='changeassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 788.9047698974609,
-        "y": 777.0952320098877,
-        "z": "35fa0037.7ea1a",
+        "x": 746.3333282470703,
+        "y": 614.3679676055908,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "23889790.b25168"
+                "e6633d6e.ae0008"
             ]
         ]
     },
     {
-        "id": "23889790.b25168",
+        "id": "e6633d6e.ae0008",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-changeassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-changeassign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1157.9998397827148,
-        "y": 776.8093681335449,
-        "z": "35fa0037.7ea1a",
+        "x": 1115.4283981323242,
+        "y": 614.082103729248,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "ea811474.306be8",
+        "id": "5096a71a.af9198",
         "type": "outcome",
         "name": "create",
         "xml": "<outcome value='create'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 774.5714492797852,
-        "y": 975.4285764694214,
-        "z": "35fa0037.7ea1a",
+        "x": 732.0000076293945,
+        "y": 812.7013120651245,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "6aff563.99867a8"
+                "b0678560.7104f"
             ]
         ]
     },
     {
-        "id": "105e57a2.284a98",
+        "id": "162fec09.6308b4",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 1012.9050521850586,
-        "y": 983.014939635992,
-        "z": "35fa0037.7ea1a",
+        "x": 970.333610534668,
+        "y": 820.2876752316952,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "4f52bd4e.bf379c",
-                "10e9816f.b6da8f",
-                "125e9fce.f0aef8",
-                "eeba3cc3.46c638",
-                "cc60574.cfa14a8",
-                "a5533620.33f6f"
+                "38f54336.43e254",
+                "52b23393.43b59c",
+                "8b76b414.15b5e8",
+                "ef2f9b30.3b48d8",
+                "6d66a790.28c178",
+                "e72de08a.895418"
             ]
         ]
     },
     {
-        "id": "10e9816f.b6da8f",
+        "id": "52b23393.43b59c",
         "type": "outcome",
         "name": "CreateSDWANSiteInstance",
         "xml": "<outcome value='CreateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1303.3813705444336,
-        "y": 891.4943084716797,
-        "z": "35fa0037.7ea1a",
+        "x": 1260.809928894043,
+        "y": 728.7670440673828,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "261bb8e.7d6a2c8"
+                "1d98311f.d91eb7"
             ]
         ]
     },
     {
-        "id": "4f52bd4e.bf379c",
+        "id": "38f54336.43e254",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1213.2858352661133,
-        "y": 1066.87220287323,
-        "z": "35fa0037.7ea1a",
+        "x": 1170.7143936157227,
+        "y": 904.1449384689331,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "4934371b.47ea6"
+                "3ba8f36d.dd4584"
             ]
         ]
     },
     {
-        "id": "6aff563.99867a8",
+        "id": "b0678560.7104f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 960.9049682617188,
-        "y": 903.0149412155151,
-        "z": "35fa0037.7ea1a",
+        "x": 918.3335266113281,
+        "y": 740.2876768112183,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "105e57a2.284a98",
-                "8590a0d1.9dc318"
+                "162fec09.6308b4",
+                "7ce1a992.f698d8"
             ]
         ]
     },
     {
-        "id": "261bb8e.7d6a2c8",
+        "id": "1d98311f.d91eb7",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1726.9052429199219,
-        "y": 890.0150847434998,
-        "z": "35fa0037.7ea1a",
+        "x": 1684.3338012695312,
+        "y": 727.2878203392029,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "4934371b.47ea6",
+        "id": "3ba8f36d.dd4584",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1366.5714874267578,
-        "y": 1066.928599357605,
-        "z": "35fa0037.7ea1a",
+        "x": 1324.0000457763672,
+        "y": 904.2013349533081,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "125e9fce.f0aef8",
+        "id": "8b76b414.15b5e8",
         "type": "outcome",
         "name": "CreateSDWANPortInstance",
         "xml": "<outcome value='CreateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1277.2382278442383,
-        "y": 1025.2620935440063,
-        "z": "35fa0037.7ea1a",
+        "x": 1234.6667861938477,
+        "y": 862.5348291397095,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "58a4cffb.ddc478"
+                "82cd1d50.2a0f4"
             ]
         ]
     },
     {
-        "id": "58a4cffb.ddc478",
+        "id": "82cd1d50.2a0f4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1749.7619247436523,
-        "y": 1024.7828454971313,
-        "z": "35fa0037.7ea1a",
+        "x": 1707.1904830932617,
+        "y": 862.0555810928345,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "eeba3cc3.46c638",
+        "id": "ef2f9b30.3b48d8",
         "type": "outcome",
         "name": "CreateSDWANDeviceInstance",
         "xml": "<outcome value='CreateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1285.6025505065918,
-        "y": 945.4600539207458,
-        "z": "35fa0037.7ea1a",
+        "x": 1243.0311088562012,
+        "y": 782.732789516449,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "951eeea0.03927"
+                "c5caf426.d828e8"
             ]
         ]
     },
     {
-        "id": "951eeea0.03927",
+        "id": "c5caf426.d828e8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1741.1263389587402,
-        "y": 944.9809231758118,
-        "z": "35fa0037.7ea1a",
+        "x": 1698.5548973083496,
+        "y": 782.2536587715149,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "cc60574.cfa14a8",
+        "id": "6d66a790.28c178",
         "type": "outcome",
         "name": "CreateSDWANVpnInstance",
         "xml": "<outcome value='CreateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1315.5714683532715,
-        "y": 844.4286284446716,
-        "z": "35fa0037.7ea1a",
+        "x": 1273.0000267028809,
+        "y": 681.7013640403748,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "c861682e.7aeb18"
+                "6e6d0477.4e8ddc"
             ]
         ]
     },
     {
-        "id": "c861682e.7aeb18",
+        "id": "6e6d0477.4e8ddc",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1724.0952415466309,
-        "y": 841.9493956565857,
-        "z": "35fa0037.7ea1a",
+        "x": 1681.5237998962402,
+        "y": 679.2221312522888,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "71c36da6.a194e4",
+        "id": "398477c1.9e3bb8",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 764.5714492797852,
-        "y": 1170.7618894577026,
-        "z": "35fa0037.7ea1a",
+        "x": 722.0000076293945,
+        "y": 1008.0346250534058,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "3090823b.f377d6"
+                "ca9d6615.d92bb"
             ]
         ]
     },
     {
-        "id": "d01899b3.0e512",
+        "id": "22860be6.d83544",
         "type": "outcome",
         "name": "ActivateSDWANSiteInstance",
         "xml": "<outcome value='ActivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1294.714500427246,
-        "y": 1173.6608428955078,
-        "z": "35fa0037.7ea1a",
+        "x": 1252.1430587768555,
+        "y": 1010.9335784912109,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "254e0875.b1e7d8"
+                "bc6abbe4.e226c"
             ]
         ]
     },
     {
-        "id": "3090823b.f377d6",
+        "id": "ca9d6615.d92bb",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 945.2382202148438,
-        "y": 1166.1815662384033,
-        "z": "35fa0037.7ea1a",
+        "x": 902.6667785644531,
+        "y": 1003.4543018341064,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "c28b2c96.678fd"
+                "fd34d18f.7429b"
             ]
         ]
     },
     {
-        "id": "254e0875.b1e7d8",
+        "id": "bc6abbe4.e226c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1707.2383880615234,
-        "y": 1167.181625366211,
-        "z": "35fa0037.7ea1a",
+        "x": 1664.6669464111328,
+        "y": 1004.4543609619141,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "16ad226a.a79026",
+        "id": "fc0c8e83.b23218",
         "type": "outcome",
         "name": "ActivateSDWANDeviceInstance",
         "xml": "<outcome value='ActivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1283.9049377441406,
-        "y": 1219.681631565094,
-        "z": "35fa0037.7ea1a",
+        "x": 1241.33349609375,
+        "y": 1056.9543671607971,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "297f6b45.4a12dc"
+                "322979d6.dc748e"
             ]
         ]
     },
     {
-        "id": "297f6b45.4a12dc",
+        "id": "322979d6.dc748e",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1719.4286346435547,
-        "y": 1219.2024040222168,
-        "z": "35fa0037.7ea1a",
+        "x": 1676.857192993164,
+        "y": 1056.47513961792,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "fd91230f.55a21",
+        "id": "7a20602e.9c67f",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1717.9047622680664,
-        "y": 1304.6815857887268,
-        "z": "35fa0037.7ea1a",
+        "x": 1675.3333206176758,
+        "y": 1141.95432138443,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "386601e9.a99dbe",
+        "id": "7140c1d2.7cd8a8",
         "type": "outcome",
         "name": "ActivateSDWANPortInstance",
         "xml": "<outcome value='ActivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1282.3810653686523,
-        "y": 1305.160813331604,
-        "z": "35fa0037.7ea1a",
+        "x": 1239.8096237182617,
+        "y": 1142.4335489273071,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "fd91230f.55a21"
+                "7a20602e.9c67f"
             ]
         ]
     },
     {
-        "id": "c28b2c96.678fd",
+        "id": "fd34d18f.7429b",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 1021.5714492797852,
-        "y": 1232.7618894577026,
-        "z": "35fa0037.7ea1a",
+        "x": 979.0000076293945,
+        "y": 1070.0346250534058,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "d01899b3.0e512",
-                "16ad226a.a79026",
-                "386601e9.a99dbe",
-                "8c4e80cb.188a5",
-                "9fa77fdb.1aa598",
-                "7612835c.b27dac"
+                "22860be6.d83544",
+                "fc0c8e83.b23218",
+                "7140c1d2.7cd8a8",
+                "9e7170ba.5f9eb8",
+                "d7d2a998.ac94f8",
+                "8e69acb9.247998"
             ]
         ]
     },
     {
-        "id": "8c4e80cb.188a5",
+        "id": "9e7170ba.5f9eb8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1214.1429290771484,
-        "y": 1353.9733986854553,
-        "z": "35fa0037.7ea1a",
+        "x": 1171.5714874267578,
+        "y": 1191.2461342811584,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "e17cfcd2.c05af8"
+                "dab2914f.5e193"
             ]
         ]
     },
     {
-        "id": "9fa77fdb.1aa598",
+        "id": "d7d2a998.ac94f8",
         "type": "outcome",
         "name": "ActivateSDWANVpnInstance",
         "xml": "<outcome value='ActivateSDWANVpnInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1297.5714492797852,
-        "y": 1128.7618894577026,
-        "z": "35fa0037.7ea1a",
+        "x": 1255.0000076293945,
+        "y": 966.0346250534058,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "ee501311.c32a9"
+                "8d564aec.b974a8"
             ]
         ]
     },
     {
-        "id": "ee501311.c32a9",
+        "id": "8d564aec.b974a8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1713.0952529907227,
-        "y": 1122.2826662063599,
-        "z": "35fa0037.7ea1a",
+        "x": 1670.523811340332,
+        "y": 959.555401802063,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "386c4488.ce0bd4",
+        "id": "112e016f.f82cbf",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 748.5714416503906,
-        "y": 1456.7619824409485,
-        "z": "35fa0037.7ea1a",
+        "x": 706,
+        "y": 1294.0347180366516,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "3ea7a8f5.84205"
+                "379e448b.e26ed4"
             ]
         ]
     },
     {
-        "id": "31c82de4.730832",
+        "id": "e0dd4b1.4e4d8b8",
         "type": "outcome",
         "name": "DeactivateSDWANSiteInstance",
         "xml": "<outcome value='DeactivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1286.7145614624023,
-        "y": 1456.6609525680542,
-        "z": "35fa0037.7ea1a",
+        "x": 1244.1431198120117,
+        "y": 1293.9336881637573,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "98556c8f.10717"
+                "90c2ea50.fdcfe8"
             ]
         ]
     },
     {
-        "id": "3ea7a8f5.84205",
+        "id": "379e448b.e26ed4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 929.2382125854492,
-        "y": 1452.1816592216492,
-        "z": "35fa0037.7ea1a",
+        "x": 886.6667709350586,
+        "y": 1289.4543948173523,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "b60945d0.7e3eb8"
+                "5c04c78d.fe726"
             ]
         ]
     },
     {
-        "id": "98556c8f.10717",
+        "id": "90c2ea50.fdcfe8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1704.2383270263672,
-        "y": 1458.1816892623901,
-        "z": "35fa0037.7ea1a",
+        "x": 1661.6668853759766,
+        "y": 1295.4544248580933,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "cc930930.811ec",
+        "id": "3157e474.6d76bc",
         "type": "outcome",
         "name": "DeactivateSDWANDeviceInstance",
         "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1267.904930114746,
-        "y": 1505.6817245483398,
-        "z": "35fa0037.7ea1a",
+        "x": 1225.3334884643555,
+        "y": 1342.954460144043,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "8d2bf047.cedf5"
+                "4bcbaf21.f06a68"
             ]
         ]
     },
     {
-        "id": "8d2bf047.cedf5",
+        "id": "4bcbaf21.f06a68",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1703.4286270141602,
-        "y": 1505.2024970054626,
-        "z": "35fa0037.7ea1a",
+        "x": 1660.8571853637695,
+        "y": 1342.4752326011658,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "69b8d053.09b71",
+        "id": "628f7e0d.7bf12",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1700.9048385620117,
-        "y": 1583.6816987991333,
-        "z": "35fa0037.7ea1a",
+        "x": 1658.333396911621,
+        "y": 1420.9544343948364,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "793bcd74.11c174",
+        "id": "c5a06a95.9a73c",
         "type": "outcome",
         "name": "DeactivateSDWANPortInstance",
         "xml": "<outcome value='DeactivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1265.3811416625977,
-        "y": 1584.1609263420105,
-        "z": "35fa0037.7ea1a",
+        "x": 1222.809700012207,
+        "y": 1421.4336619377136,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "69b8d053.09b71"
+                "628f7e0d.7bf12"
             ]
         ]
     },
     {
-        "id": "b60945d0.7e3eb8",
+        "id": "5c04c78d.fe726",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 1005.5714416503906,
-        "y": 1518.7619824409485,
-        "z": "35fa0037.7ea1a",
+        "x": 963,
+        "y": 1356.0347180366516,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "31c82de4.730832",
-                "cc930930.811ec",
-                "793bcd74.11c174",
-                "f66d08bb.788bc8",
-                "27c49ffb.ddcb28",
-                "35a0ca7a.30279e"
+                "e0dd4b1.4e4d8b8",
+                "3157e474.6d76bc",
+                "c5a06a95.9a73c",
+                "e434dcb1.1a484",
+                "401815f5.93c05c",
+                "5f2a3253.15e99c"
             ]
         ]
     },
     {
-        "id": "f66d08bb.788bc8",
+        "id": "e434dcb1.1a484",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1201.1428756713867,
-        "y": 1633.9734888076782,
-        "z": "35fa0037.7ea1a",
+        "x": 1158.571434020996,
+        "y": 1471.2462244033813,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "6b04e216.87e434"
+                "c76a7983.9d38e8"
             ]
         ]
     },
     {
-        "id": "27c49ffb.ddcb28",
+        "id": "401815f5.93c05c",
         "type": "outcome",
         "name": "DeactivateSDWANVpnInstance",
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1281.5714416503906,
-        "y": 1414.7619824409485,
-        "z": "35fa0037.7ea1a",
+        "x": 1239,
+        "y": 1252.0347180366516,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "949bae04.5ee97"
+                "179d4c8.1c9f0b4"
             ]
         ]
     },
     {
-        "id": "949bae04.5ee97",
+        "id": "179d4c8.1c9f0b4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1697.0952453613281,
-        "y": 1408.2827591896057,
-        "z": "35fa0037.7ea1a",
+        "x": 1654.5238037109375,
+        "y": 1245.5554947853088,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "6b04e216.87e434",
+        "id": "c76a7983.9d38e8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1539.5715560913086,
-        "y": 1634.4286994934082,
-        "z": "35fa0037.7ea1a",
+        "x": 1497.000114440918,
+        "y": 1471.7014350891113,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "e17cfcd2.c05af8",
+        "id": "dab2914f.5e193",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1544.5714416503906,
-        "y": 1351.428608417511,
-        "z": "35fa0037.7ea1a",
+        "x": 1502,
+        "y": 1188.701344013214,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "6abfe786.4bc8a8",
+        "id": "61081d39.89dad4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1142.5714073181152,
-        "y": 630.4285640716553,
-        "z": "35fa0037.7ea1a",
+        "x": 1099.9999656677246,
+        "y": 467.7012996673584,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "d15b7bef.13655",
+        "id": "9e246b75.ae6418",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 770.5713920593262,
-        "y": 631.0952415466309,
-        "z": "35fa0037.7ea1a",
+        "x": 727.9999504089355,
+        "y": 468.367977142334,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "6abfe786.4bc8a8"
+                "61081d39.89dad4"
             ]
         ]
     },
     {
-        "id": "29ab0104.2f0c7e",
+        "id": "e227c212.42fea8",
         "type": "outcome",
         "name": "delete",
         "xml": "<outcome value='delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 711.5714874267578,
-        "y": 1802.095311164856,
-        "z": "35fa0037.7ea1a",
+        "x": 669.0000457763672,
+        "y": 1639.368046760559,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "f6c3d2e2.27ec4"
+                "681f7e70.128598"
             ]
         ]
     },
     {
-        "id": "4dd5f52b.998bdc",
+        "id": "7e590f10.e3e0d",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 950.9050064086914,
-        "y": 1802.6816778182983,
-        "z": "35fa0037.7ea1a",
+        "x": 908.3335647583008,
+        "y": 1639.9544134140015,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "c80c31b3.b38738",
-                "a18e9a5f.94b45",
-                "e8f28191.ceac88",
-                "2f71bb7c.df7ba4",
-                "230e11ea.c0d28e",
-                "eb45f166.ee119"
+                "8e23d3e5.351a68",
+                "936a66dc.f198d8",
+                "78e52106.f9df28",
+                "a2426271.0aaaf",
+                "5d0c656.809b41c",
+                "afdd56ca.7b158"
             ]
         ]
     },
     {
-        "id": "a18e9a5f.94b45",
+        "id": "936a66dc.f198d8",
         "type": "outcome",
         "name": "DeleteSDWANSiteInstance",
         "xml": "<outcome value='DeleteSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1236.3815536499023,
-        "y": 1736.1610774993896,
-        "z": "35fa0037.7ea1a",
+        "x": 1193.8101119995117,
+        "y": 1573.4338130950928,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "49a252da.c5e8dc"
+                "d567d254.07d97"
             ]
         ]
     },
     {
-        "id": "c80c31b3.b38738",
+        "id": "8e23d3e5.351a68",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1150.285873413086,
-        "y": 1893.5389375686646,
-        "z": "35fa0037.7ea1a",
+        "x": 1107.7144317626953,
+        "y": 1730.8116731643677,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "c42c5f4c.09b058"
+                "26e6234e.282244"
             ]
         ]
     },
     {
-        "id": "f6c3d2e2.27ec4",
+        "id": "681f7e70.128598",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 897.9050064086914,
-        "y": 1729.6816759109497,
-        "z": "35fa0037.7ea1a",
+        "x": 855.3335647583008,
+        "y": 1566.9544115066528,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "4dd5f52b.998bdc"
+                "7e590f10.e3e0d"
             ]
         ]
     },
     {
-        "id": "49a252da.c5e8dc",
+        "id": "d567d254.07d97",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1639.9051666259766,
-        "y": 1731.6819224357605,
-        "z": "35fa0037.7ea1a",
+        "x": 1597.333724975586,
+        "y": 1568.9546580314636,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "c42c5f4c.09b058",
+        "id": "26e6234e.282244",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1303.5715255737305,
-        "y": 1893.5953340530396,
-        "z": "35fa0037.7ea1a",
+        "x": 1261.0000839233398,
+        "y": 1730.8680696487427,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "e8f28191.ceac88",
+        "id": "78e52106.f9df28",
         "type": "outcome",
         "name": "DeleteSDWANPortInstance",
         "xml": "<outcome value='DeleteSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1214.238265991211,
-        "y": 1851.928828239441,
-        "z": "35fa0037.7ea1a",
+        "x": 1171.6668243408203,
+        "y": 1689.201563835144,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "4de4fb5f.495984"
+                "9ac059d9.b2b208"
             ]
         ]
     },
     {
-        "id": "4de4fb5f.495984",
+        "id": "9ac059d9.b2b208",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1686.761962890625,
-        "y": 1851.449580192566,
-        "z": "35fa0037.7ea1a",
+        "x": 1644.1905212402344,
+        "y": 1688.722315788269,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "2f71bb7c.df7ba4",
+        "id": "a2426271.0aaaf",
         "type": "outcome",
         "name": "DeleteSDWANDeviceInstance",
         "xml": "<outcome value='DeleteSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1238.6026611328125,
-        "y": 1775.1267161369324,
-        "z": "35fa0037.7ea1a",
+        "x": 1196.0312194824219,
+        "y": 1612.3994517326355,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "93d1c4e9.f39aa8"
+                "62bed64b.ae3228"
             ]
         ]
     },
     {
-        "id": "93d1c4e9.f39aa8",
+        "id": "62bed64b.ae3228",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1653.126480102539,
-        "y": 1770.647620677948,
-        "z": "35fa0037.7ea1a",
+        "x": 1610.5550384521484,
+        "y": 1607.9203562736511,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "230e11ea.c0d28e",
+        "id": "5d0c656.809b41c",
         "type": "outcome",
         "name": "DeleteSDWANVpnInstance",
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1242.571517944336,
-        "y": 1695.0953283309937,
-        "z": "35fa0037.7ea1a",
+        "x": 1200.0000762939453,
+        "y": 1532.3680639266968,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "da85bff5.bade88"
+                "903607f5.13f68"
             ]
         ]
     },
     {
-        "id": "da85bff5.bade88",
+        "id": "903607f5.13f68",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1636.0953216552734,
-        "y": 1695.6160960197449,
-        "z": "35fa0037.7ea1a",
+        "x": 1593.5238800048828,
+        "y": 1532.888831615448,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "8590a0d1.9dc318",
+        "id": "7ce1a992.f698d8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"request-action\"/>\n<parameter name=\"field3\" value='`$vf-module-topology-operation-input.request-information.request-action`'/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1102.3214492797852,
-        "y": 852.0188258588314,
-        "z": "35fa0037.7ea1a",
+        "x": 1059.7500076293945,
+        "y": 689.2915614545345,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "a5533620.33f6f",
+        "id": "e72de08a.895418",
         "type": "outcome",
         "name": "CreateSDWANLanPortInstance",
         "xml": "<outcome value='CreateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1279.3149490356445,
-        "y": 986.2688269615173,
-        "z": "35fa0037.7ea1a",
+        "x": 1236.743507385254,
+        "y": 823.5415625572205,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "8a52b4a3.d2e758"
+                "31973c4d.4759e4"
             ]
         ]
     },
     {
-        "id": "8a52b4a3.d2e758",
+        "id": "31973c4d.4759e4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1751.8386459350586,
-        "y": 985.7895789146423,
-        "z": "35fa0037.7ea1a",
+        "x": 1709.267204284668,
+        "y": 823.0623145103455,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "7612835c.b27dac",
+        "id": "8e69acb9.247998",
         "type": "outcome",
         "name": "ActivateSDWANLanPortInstance",
         "xml": "<outcome value='ActivateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1291.3149490356445,
-        "y": 1263.5188269615173,
-        "z": "35fa0037.7ea1a",
+        "x": 1248.743507385254,
+        "y": 1100.7915625572205,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "7e857b9d.cba4fc"
+                "948b984b.e64328"
             ]
         ]
     },
     {
-        "id": "7e857b9d.cba4fc",
+        "id": "948b984b.e64328",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1708.8386001586914,
-        "y": 1263.0395884513855,
-        "z": "35fa0037.7ea1a",
+        "x": 1666.2671585083008,
+        "y": 1100.3123240470886,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "35a0ca7a.30279e",
+        "id": "5f2a3253.15e99c",
         "type": "outcome",
         "name": "DeactivateSDWANLanPortInstance",
         "xml": "<outcome value='DeactivateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1277.3149490356445,
-        "y": 1549.7688269615173,
-        "z": "35fa0037.7ea1a",
+        "x": 1234.743507385254,
+        "y": 1387.0415625572205,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "53ce38bf.2968b"
+                "6608c35e.c94abc"
             ]
         ]
     },
     {
-        "id": "53ce38bf.2968b",
+        "id": "6608c35e.c94abc",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1694.8386001586914,
-        "y": 1549.2895884513855,
-        "z": "35fa0037.7ea1a",
+        "x": 1652.2671585083008,
+        "y": 1386.5623240470886,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "eb45f166.ee119",
+        "id": "afdd56ca.7b158",
         "type": "outcome",
         "name": "DeleteSDWANLanPortInstance",
         "xml": "<outcome value='DeleteSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1241.3149490356445,
-        "y": 1812.7688269615173,
-        "z": "35fa0037.7ea1a",
+        "x": 1198.743507385254,
+        "y": 1650.0415625572205,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "f7e2233f.a7ddf8"
+                "ddf98dd7.4ad7d"
             ]
         ]
     },
     {
-        "id": "f7e2233f.a7ddf8",
+        "id": "ddf98dd7.4ad7d",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1658.8386001586914,
-        "y": 1812.2895884513855,
-        "z": "35fa0037.7ea1a",
+        "x": 1616.2671585083008,
+        "y": 1649.5623240470886,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "49d32d84.447de4",
+        "id": "9300e0fc.aacde8",
         "type": "outcome",
         "name": "update",
         "xml": "<outcome value='update'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 682.5714492797852,
-        "y": 1941.0149183273315,
-        "z": "35fa0037.7ea1a",
+        "x": 640.0000076293945,
+        "y": 1778.2876539230347,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "b2a38ac0.0568a"
+                "ab931d4e.ccffc8"
             ]
         ]
     },
     {
-        "id": "b2a38ac0.0568a",
+        "id": "ab931d4e.ccffc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 856.9049453735352,
-        "y": 1945.6014051437378,
-        "z": "35fa0037.7ea1a",
+        "x": 814.3335037231445,
+        "y": 1782.874140739441,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "2a8f0cbf.b78cb4"
+                "8e86ecaa.ce6c28"
             ]
         ]
     },
     {
-        "id": "2a8f0cbf.b78cb4",
+        "id": "8e86ecaa.ce6c28",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 1012.9049453735352,
-        "y": 2015.6014051437378,
-        "z": "35fa0037.7ea1a",
+        "x": 970.3335037231445,
+        "y": 1852.874140739441,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "18d222d0.f454f5",
-                "d214a8c8.2b30c"
+                "4766c849.8d9ae8",
+                "9cad581c.5559d8"
             ]
         ]
     },
     {
-        "id": "18d222d0.f454f5",
+        "id": "4766c849.8d9ae8",
         "type": "outcome",
         "name": "SdwanBandwidthChange",
         "xml": "<outcome value='SdwanBandwidthChange'>",
         "comments": "",
         "outputs": 1,
-        "x": 1251.5714263916016,
-        "y": 1971.0150384902954,
-        "z": "35fa0037.7ea1a",
+        "x": 1208.999984741211,
+        "y": 1808.2877740859985,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "50e22cb4.3acdd4"
+                "6a1687c.4a82bf8"
             ]
         ]
     },
     {
-        "id": "50e22cb4.3acdd4",
+        "id": "6a1687c.4a82bf8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-bandwidth-policy-change",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-bandwidth-policy-change' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1645.095230102539,
-        "y": 1971.5358061790466,
-        "z": "35fa0037.7ea1a",
+        "x": 1602.5237884521484,
+        "y": 1808.8085417747498,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "d214a8c8.2b30c",
+        "id": "9cad581c.5559d8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1177.2857818603516,
-        "y": 2044.4586420059204,
-        "z": "35fa0037.7ea1a",
+        "x": 1134.714340209961,
+        "y": 1881.7313776016235,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "c4809a2c.1e0988"
+                "5ff5278e.fa7178"
             ]
         ]
     },
     {
-        "id": "c4809a2c.1e0988",
+        "id": "5ff5278e.fa7178",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1330.571434020996,
-        "y": 2044.5150384902954,
-        "z": "35fa0037.7ea1a",
+        "x": 1287.9999923706055,
+        "y": 1881.7877740859985,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "15fd5b78.f00935",
+        "id": "b75894e5.8c11a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2025.4288330078125,
-        "y": 481.7143249511719,
-        "z": "35fa0037.7ea1a",
+        "x": 1982.8573913574219,
+        "y": 318.987060546875,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "7dd4c10b.1c5648",
-                "ad1a3219.44837"
+                "1e63ed5c.c7dce3",
+                "f2379115.719e5",
+                "c06c12dc.df2ff"
             ]
         ]
     },
     {
-        "id": "7dd4c10b.1c5648",
+        "id": "1e63ed5c.c7dce3",
         "type": "set",
         "name": "set skip-mdsal-update to Y",
         "xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",
         "comments": "",
-        "x": 2272.214385986328,
-        "y": 458.06836891174316,
-        "z": "35fa0037.7ea1a",
+        "x": 2229.6429443359375,
+        "y": 295.3411045074463,
+        "z": "d80dfa18.577678",
         "wires": []
     },
     {
-        "id": "ad1a3219.44837",
+        "id": "f2379115.719e5",
         "type": "set",
         "name": "set ack-final to 'N' (default)",
         "xml": "<set>\n<parameter name='ack-final' value='N' />\n",
         "comments": "",
-        "x": 2272.6429595947266,
-        "y": 498.068452835083,
-        "z": "35fa0037.7ea1a",
+        "x": 2230.071517944336,
+        "y": 335.34118843078613,
+        "z": "d80dfa18.577678",
         "wires": []
     },
     {
-        "id": "a53fa465.00ece8",
+        "id": "fe2f3218.57be48",
         "type": "switchNode",
         "name": "so-response-url empty?",
         "xml": "<switch test='`length($vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1160,
-        "y": 335.71429443359375,
-        "z": "35fa0037.7ea1a",
+        "x": 1117.4285583496094,
+        "y": 172.98703002929688,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "8aa5101.3a13df",
-                "506737ac.d56bc8"
+                "81183e12.46702",
+                "6ea99026.2d8cd8"
             ]
         ]
     },
     {
-        "id": "8aa5101.3a13df",
+        "id": "81183e12.46702",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1385,
-        "y": 291.71429443359375,
-        "z": "35fa0037.7ea1a",
+        "x": 1342.4285583496094,
+        "y": 128.98703002929688,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "f5dc42cf.9662f"
+                "7193d1b3.b667a"
             ]
         ]
     },
     {
-        "id": "506737ac.d56bc8",
+        "id": "6ea99026.2d8cd8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1375,
-        "y": 383.71429443359375,
-        "z": "35fa0037.7ea1a",
+        "x": 1332.4285583496094,
+        "y": 220.98703002929688,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "c77664f4.275408"
+                "30e50b5.a0612f4"
             ]
         ]
     },
     {
-        "id": "c77664f4.275408",
+        "id": "30e50b5.a0612f4",
         "type": "switchNode",
         "name": "so-response-url = ignored URL?",
         "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1597,
-        "y": 384.71429443359375,
-        "z": "35fa0037.7ea1a",
+        "x": 1554.4285583496094,
+        "y": 221.98703002929688,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "10b9b358.9efb45",
-                "cb17b7e7.a768c"
+                "835a8fa6.6d17f",
+                "2771015e.b6298e"
             ]
         ]
     },
     {
-        "id": "10b9b358.9efb45",
+        "id": "835a8fa6.6d17f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1837,
-        "y": 383.71429443359375,
-        "z": "35fa0037.7ea1a",
+        "x": 1794.4285583496094,
+        "y": 220.98703002929688,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "f5dc42cf.9662f"
+                "7193d1b3.b667a"
             ]
         ]
     },
     {
-        "id": "cb17b7e7.a768c",
+        "id": "2771015e.b6298e",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1845,
-        "y": 484.71429443359375,
-        "z": "35fa0037.7ea1a",
+        "x": 1802.4285583496094,
+        "y": 321.9870300292969,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "15fd5b78.f00935"
+                "b75894e5.8c11a"
             ]
         ]
     },
     {
-        "id": "f5dc42cf.9662f",
+        "id": "7193d1b3.b667a",
         "type": "call",
         "name": "call vf-module-topology-operation-assign-sync",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-sync' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2343.8572998046875,
-        "y": 289.8571472167969,
-        "z": "35fa0037.7ea1a",
+        "x": 2301.285858154297,
+        "y": 127.1298828125,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "f05e354a.01d8",
+        "id": "94a63140.3f5a9",
         "type": "execute",
         "name": "execute getProperties",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1150.9090576171875,
-        "y": 244.54544067382812,
-        "z": "35fa0037.7ea1a",
+        "x": 1108.3376159667969,
+        "y": 81.81817626953125,
+        "z": "d80dfa18.577678",
         "wires": [
             []
         ]
     },
     {
-        "id": "4776cb48.9ff3c4",
+        "id": "f88029fe.714ff",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 960.0001220703125,
-        "y": 242.72726440429688,
-        "z": "35fa0037.7ea1a",
+        "x": 917.4286804199219,
+        "y": 80,
+        "z": "d80dfa18.577678",
         "wires": [
             [
-                "f05e354a.01d8",
-                "a53fa465.00ece8"
+                "94a63140.3f5a9",
+                "fe2f3218.57be48"
             ]
         ]
+    },
+    {
+        "id": "c06c12dc.df2ff",
+        "type": "call",
+        "name": "call vf-module-topology-operation-assign-async",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-async' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2268,
+        "y": 407,
+        "z": "d80dfa18.577678",
+        "wires": [
+            []
+        ]
     }
-]
+]
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
index ce8a9acb..6850e027 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
@@ -1,1335 +1,1350 @@
 [
     {
-        "id": "319fac65.55f6ec",
+        "id": "1bd67dd4.72089a",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 173.42855834960938,
-        "y": 307.9850769042969,
-        "z": "5e1485c9.cf5eac",
+        "x": 157,
+        "y": 190.98507690429688,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "ab638f22.a6d9e8"
+                "38bd98bb.8764e"
             ]
         ]
     },
     {
-        "id": "ab638f22.a6d9e8",
+        "id": "38bd98bb.8764e",
         "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API 1.7.4.patchA",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
         "version": "${project.version}",
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 248.71426391601562,
-        "y": 348.22318840026855,
-        "z": "5e1485c9.cf5eac",
+        "x": 240.28570556640625,
+        "y": 252.22317504882812,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "ae993040.f03f"
+                "6888d6c.7572228"
             ]
         ]
     },
     {
-        "id": "ae993040.f03f",
+        "id": "6888d6c.7572228",
         "type": "method",
         "name": "method vnf-topology-operation",
         "xml": "<method rpc='vnf-topology-operation' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 241.85718536376953,
-        "y": 387.985071182251,
-        "z": "5e1485c9.cf5eac",
+        "x": 232.42862701416016,
+        "y": 314.985071182251,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "c2e9ac2b.748c2"
+                "cdfeb3ad.4eaab8"
             ]
         ]
     },
     {
-        "id": "93240b63.eafa8",
+        "id": "8829dcf9.9bea6",
         "type": "comment",
         "name": "vnf-topology-operation",
         "info": "",
         "comments": "",
-        "x": 566.344856262207,
-        "y": 107,
-        "z": "5e1485c9.cf5eac",
+        "x": 556.9162979125977,
+        "y": 34,
+        "z": "4a2a8d50.48649c",
         "wires": []
     },
     {
-        "id": "c2e9ac2b.748c2",
+        "id": "cdfeb3ad.4eaab8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 265.59532165527344,
-        "y": 717.6785974502563,
-        "z": "5e1485c9.cf5eac",
+        "x": 256.16676330566406,
+        "y": 644.6785974502563,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "367e2b3.fdb61d4",
-                "26a8accc.6d3204",
-                "3ad1c357.57c244"
+                "cc1b175b.b736c",
+                "a3254fe3.d47878",
+                "3bc78e03.8c382a"
             ]
         ]
     },
     {
-        "id": "367e2b3.fdb61d4",
+        "id": "cc1b175b.b736c",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 558.0952758789062,
-        "y": 872.8426303863525,
-        "z": "5e1485c9.cf5eac",
+        "x": 548.6667175292969,
+        "y": 799.8426303863525,
+        "z": "4a2a8d50.48649c",
         "wires": []
     },
     {
-        "id": "26a8accc.6d3204",
+        "id": "a3254fe3.d47878",
         "type": "switchNode",
         "name": "switch svc-action",
         "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 560.9999923706055,
-        "y": 715.8898410797119,
-        "z": "5e1485c9.cf5eac",
+        "x": 551.5714340209961,
+        "y": 642.8898410797119,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "8656217f.57ada8",
-                "8c6bc76.0806c38",
-                "a65920b5.922c48",
-                "c2564bfa.0aee5",
-                "a2add1d5.b3e6d8",
-                "39ee125f.14e7ce",
-                "affa7d5d.7501f"
+                "a7962069.276858",
+                "f49f6b1.024f098",
+                "8e59e6fb.c51ca8",
+                "142cb248.a61cb6",
+                "751946c8.87ef38",
+                "ef72ca54.96aa7",
+                "f9ac2eb4.61364"
             ]
         ]
     },
     {
-        "id": "8656217f.57ada8",
+        "id": "a7962069.276858",
         "type": "outcome",
         "name": "assign",
         "xml": "<outcome value='assign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 895.8095397949219,
-        "y": 543.5089511871338,
-        "z": "5e1485c9.cf5eac",
+        "x": 886.3809814453125,
+        "y": 470.5089511871338,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "ca6e900f.5d2de"
+                "f7b6e38.ff165a"
             ]
         ]
     },
     {
-        "id": "8c6bc76.0806c38",
+        "id": "f49f6b1.024f098",
         "type": "outcome",
         "name": "unassign",
         "xml": "<outcome value='unassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 971.8573579788208,
-        "y": 1312.6997060775757,
-        "z": "5e1485c9.cf5eac",
+        "x": 962.4287996292114,
+        "y": 1239.6997060775757,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "ed423e31.fe988"
+                "ab1f503b.af03d8"
             ]
         ]
     },
     {
-        "id": "c2564bfa.0aee5",
+        "id": "142cb248.a61cb6",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 955.5715942382812,
-        "y": 2000.8899335861206,
-        "z": "5e1485c9.cf5eac",
+        "x": 946.1430358886719,
+        "y": 1927.8899335861206,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "fb85aff3.e6cc4"
+                "7e74b0a8.45fec"
             ]
         ]
     },
     {
-        "id": "fb85aff3.e6cc4",
+        "id": "7e74b0a8.45fec",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
         "comments": "",
-        "x": 1188.7620239257812,
-        "y": 2000.8899946212769,
-        "z": "5e1485c9.cf5eac",
+        "x": 1179.3334655761719,
+        "y": 1927.8899946212769,
+        "z": "4a2a8d50.48649c",
         "wires": []
     },
     {
-        "id": "3ad1c357.57c244",
+        "id": "3bc78e03.8c382a",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:validate-vnf-input",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vnf-input' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 666.8452453613281,
-        "y": 468.3661289215088,
-        "z": "5e1485c9.cf5eac",
+        "x": 657.4166870117188,
+        "y": 395.3661289215088,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "3c352e28.943d22",
+        "id": "e3d82d2a.fc82d8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1778.2858657836914,
-        "y": 1266.4137859344482,
-        "z": "5e1485c9.cf5eac",
+        "x": 1768.857307434082,
+        "y": 1193.4137859344482,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "ed423e31.fe988",
+        "id": "ab1f503b.af03d8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-unassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-unassign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1335.952488899231,
-        "y": 1317.4137868881226,
-        "z": "5e1485c9.cf5eac",
+        "x": 1326.5239305496216,
+        "y": 1244.4137868881226,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "a65920b5.922c48",
+        "id": "8e59e6fb.c51ca8",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 940.9524383544922,
-        "y": 1052.080415725708,
-        "z": "5e1485c9.cf5eac",
+        "x": 931.5238800048828,
+        "y": 979.080415725708,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "5485b1d6.415608"
+                "ae6067c.1b2fa98"
             ]
         ]
     },
     {
-        "id": "e058b2f5.eb87f8",
+        "id": "858bb800.ca206",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1735.0954360961914,
-        "y": 925.9850749969482,
-        "z": "5e1485c9.cf5eac",
+        "x": 1725.666877746582,
+        "y": 852.9850749969482,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "a2add1d5.b3e6d8",
+        "id": "751946c8.87ef38",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 903.7618713378906,
-        "y": 713.6517143249512,
-        "z": "5e1485c9.cf5eac",
+        "x": 894.3333129882812,
+        "y": 640.6517143249512,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "fa8fc629.d5b22"
+                "6df2d884.4ca038"
             ]
         ]
     },
     {
-        "id": "39ee125f.14e7ce",
+        "id": "ef72ca54.96aa7",
         "type": "outcome",
         "name": "create",
         "xml": "<outcome value='create'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 973.4287881851196,
-        "y": 1445.0713729858398,
-        "z": "5e1485c9.cf5eac",
+        "x": 964.0002298355103,
+        "y": 1372.0713729858398,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "f5b9a1f0.e5267"
+                "ae139a1c.222e28"
             ]
         ]
     },
     {
-        "id": "affa7d5d.7501f",
+        "id": "f9ac2eb4.61364",
         "type": "outcome",
         "name": "delete",
         "xml": "<outcome value='delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 966.4287872314453,
-        "y": 1756.0713829994202,
-        "z": "5e1485c9.cf5eac",
+        "x": 957.0002288818359,
+        "y": 1683.0713829994202,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "b22bfc0.f157988"
+                "8c3ce117.5fae2"
             ]
         ]
     },
     {
-        "id": "a9c24cb7.8c401",
+        "id": "bd1d07e9.5eedc",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1145.4286422729492,
-        "y": 769.0713911056519,
-        "z": "5e1485c9.cf5eac",
+        "x": 1136.0000839233398,
+        "y": 696.0713911056519,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "40e55c45.ee7394",
-                "bccf290c.c628d8",
-                "4b706ba.7740d14",
-                "4f066da3.11c274",
-                "f885de43.3998e",
-                "6b9292e.b0ebe6c"
+                "7013feeb.ed049",
+                "20d3b5c2.f3e69a",
+                "3668cbba.d4faa4",
+                "269f5d4e.8f57b2",
+                "816c27b8.77c4e8",
+                "2047aafd.7f7996"
             ]
         ]
     },
     {
-        "id": "bccf290c.c628d8",
+        "id": "20d3b5c2.f3e69a",
         "type": "outcome",
         "name": "ActivateSiteInstance",
         "xml": "<outcome value='ActivateSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1405.904884338379,
-        "y": 691.5506420135498,
-        "z": "5e1485c9.cf5eac",
+        "x": 1396.4763259887695,
+        "y": 618.5506420135498,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "9cd4770a.88b948"
+                "66f830ed.1e6de"
             ]
         ]
     },
     {
-        "id": "40e55c45.ee7394",
+        "id": "7013feeb.ed049",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1378.809669494629,
-        "y": 926.9286479949951,
-        "z": "5e1485c9.cf5eac",
+        "x": 1369.3811111450195,
+        "y": 853.9286479949951,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "e058b2f5.eb87f8"
+                "858bb800.ca206"
             ]
         ]
     },
     {
-        "id": "fa8fc629.d5b22",
+        "id": "6df2d884.4ca038",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1084.4286422729492,
-        "y": 714.0713911056519,
-        "z": "5e1485c9.cf5eac",
+        "x": 1075.0000839233398,
+        "y": 641.0713911056519,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "a9c24cb7.8c401"
+                "bd1d07e9.5eedc"
             ]
         ]
     },
     {
-        "id": "9cd4770a.88b948",
+        "id": "66f830ed.1e6de",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1772.4286880493164,
-        "y": 694.0714244842529,
-        "z": "5e1485c9.cf5eac",
+        "x": 1763.000129699707,
+        "y": 621.0714244842529,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "4eb53511.605784",
+        "id": "c2449ca2.43f5b8",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1203.4287567138672,
-        "y": 1085.071382522583,
-        "z": "5e1485c9.cf5eac",
+        "x": 1194.0001983642578,
+        "y": 1012.071382522583,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "a3647659.eb8f",
-                "8ac27d1b.c555a",
-                "411ee2be.ec918c",
-                "b6e640cc.0df1f",
-                "c74f5862.b743e8",
-                "8e23587c.b352c8"
+                "52b80951.997c28",
+                "62663e18.1595d8",
+                "f75942cd.e9cdb",
+                "b095d5a2.1abde",
+                "5974d41f.5000ac",
+                "767ffc3.b041d84"
             ]
         ]
     },
     {
-        "id": "8ac27d1b.c555a",
+        "id": "62663e18.1595d8",
         "type": "outcome",
         "name": "DeactivateSiteInstance",
         "xml": "<outcome value='DeactivateSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1446.9049530029297,
-        "y": 1036.5506310462952,
-        "z": "5e1485c9.cf5eac",
+        "x": 1437.4763946533203,
+        "y": 963.5506310462952,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "e9f9484a.69f858"
+                "13fd7ab.e595405"
             ]
         ]
     },
     {
-        "id": "a3647659.eb8f",
+        "id": "52b80951.997c28",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1421.809669494629,
-        "y": 1266.9286785125732,
-        "z": "5e1485c9.cf5eac",
+        "x": 1412.3811111450195,
+        "y": 1193.9286785125732,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "3c352e28.943d22"
+                "e3d82d2a.fc82d8"
             ]
         ]
     },
     {
-        "id": "5485b1d6.415608",
+        "id": "ae6067c.1b2fa98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1142.4287567138672,
-        "y": 1030.071382522583,
-        "z": "5e1485c9.cf5eac",
+        "x": 1133.0001983642578,
+        "y": 957.071382522583,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "4eb53511.605784"
+                "c2449ca2.43f5b8"
             ]
         ]
     },
     {
-        "id": "e9f9484a.69f858",
+        "id": "13fd7ab.e595405",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1816.4287567138672,
-        "y": 1034.0714135169983,
-        "z": "5e1485c9.cf5eac",
+        "x": 1807.0001983642578,
+        "y": 961.0714135169983,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "a323c550.68c2d8",
+        "id": "b50b7762.c568b8",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1171.7621841430664,
-        "y": 1531.6576824188232,
-        "z": "5e1485c9.cf5eac",
+        "x": 1162.333625793457,
+        "y": 1458.6576824188232,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "a6120efe.0a2c7",
-                "11e5a2c0.e79535",
-                "e9342911.e555a",
-                "21f0e26d.3cb426",
-                "eec6f232.28cd18",
-                "d6b4617d.0f2f58"
+                "daa776c9.c4de78",
+                "ea4b7172.c374",
+                "f6ff4a70.3816",
+                "6afcca50.5f66dc",
+                "2f050ce4.d6732c",
+                "254873f2.91487c"
             ]
         ]
     },
     {
-        "id": "11e5a2c0.e79535",
+        "id": "ea4b7172.c374",
         "type": "outcome",
         "name": "CreateSiteInstance",
         "xml": "<outcome value='CreateSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1427.2386751174927,
-        "y": 1384.1370167732239,
-        "z": "5e1485c9.cf5eac",
+        "x": 1417.8101167678833,
+        "y": 1311.1370167732239,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "d1473d49.80db78"
+                "84d19a5a.04aa1"
             ]
         ]
     },
     {
-        "id": "a6120efe.0a2c7",
+        "id": "daa776c9.c4de78",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1394.1431579589844,
-        "y": 1605.5149021148682,
-        "z": "5e1485c9.cf5eac",
+        "x": 1384.714599609375,
+        "y": 1532.5149021148682,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "e6432caf.eec14"
+                "c4ca7fde.46e428"
             ]
         ]
     },
     {
-        "id": "f5b9a1f0.e5267",
+        "id": "ae139a1c.222e28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1155.7622728347778,
-        "y": 1442.6577405929565,
-        "z": "5e1485c9.cf5eac",
+        "x": 1146.3337144851685,
+        "y": 1369.6577405929565,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "a323c550.68c2d8"
+                "b50b7762.c568b8"
             ]
         ]
     },
     {
-        "id": "d1473d49.80db78",
+        "id": "84d19a5a.04aa1",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1803.7623796463013,
-        "y": 1382.657775402069,
-        "z": "5e1485c9.cf5eac",
+        "x": 1794.333821296692,
+        "y": 1309.657775402069,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "e6432caf.eec14",
+        "id": "c4ca7fde.46e428",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1534.4287338256836,
-        "y": 1606.571325302124,
-        "z": "5e1485c9.cf5eac",
+        "x": 1525.0001754760742,
+        "y": 1533.571325302124,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "2b15b268.dcf43e",
+        "id": "d39a24a.5273558",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1212.4287872314453,
-        "y": 1808.5713829994202,
-        "z": "5e1485c9.cf5eac",
+        "x": 1203.000228881836,
+        "y": 1735.5713829994202,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "c4394430.141bf8",
-                "9b44ea44.777ca8",
-                "ecf62cf7.1ca33",
-                "2c7b6f3.166a81",
-                "ec897ad4.1d68c8",
-                "b0e41ce0.ba1c2"
+                "15b3024f.9d2b5e",
+                "3848ec5b.7575f4",
+                "fbaa1326.1081a",
+                "254cc1a6.5d0cc6",
+                "de41704e.e02f2",
+                "da1c7a96.50bc1"
             ]
         ]
     },
     {
-        "id": "9b44ea44.777ca8",
+        "id": "3848ec5b.7575f4",
         "type": "outcome",
         "name": "DeleteSiteInstance",
         "xml": "<outcome value='DeleteSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1452.9050064086914,
-        "y": 1754.0506267547607,
-        "z": "5e1485c9.cf5eac",
+        "x": 1443.476448059082,
+        "y": 1681.0506267547607,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "1e204fe1.1eadf8"
+                "3da95e89.3273f2"
             ]
         ]
     },
     {
-        "id": "c4394430.141bf8",
+        "id": "15b3024f.9d2b5e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1417.8097915649414,
-        "y": 2004.428861618042,
-        "z": "5e1485c9.cf5eac",
+        "x": 1408.381233215332,
+        "y": 1931.428861618042,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "efce0b5a.f9d12"
+                "28393206.2f0986"
             ]
         ]
     },
     {
-        "id": "b22bfc0.f157988",
+        "id": "8c3ce117.5fae2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1151.4287872314453,
-        "y": 1753.5713829994202,
-        "z": "5e1485c9.cf5eac",
+        "x": 1142.000228881836,
+        "y": 1680.5713829994202,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "2b15b268.dcf43e"
+                "d39a24a.5273558"
             ]
         ]
     },
     {
-        "id": "1e204fe1.1eadf8",
+        "id": "3da95e89.3273f2",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1825.428810119629,
-        "y": 1751.5713787078857,
-        "z": "5e1485c9.cf5eac",
+        "x": 1816.0002517700195,
+        "y": 1678.5713787078857,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "efce0b5a.f9d12",
+        "id": "28393206.2f0986",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1558.0953674316406,
-        "y": 2005.4852848052979,
-        "z": "5e1485c9.cf5eac",
+        "x": 1548.6668090820312,
+        "y": 1932.4852848052979,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "4b706ba.7740d14",
+        "id": "3668cbba.d4faa4",
         "type": "outcome",
         "name": "ActivateSDWANDeviceInstance",
         "xml": "<outcome value='ActivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1437.095314025879,
-        "y": 742.571455001831,
-        "z": "5e1485c9.cf5eac",
+        "x": 1427.6667556762695,
+        "y": 669.571455001831,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "679570af.9bc068"
+                "e597143.e5430e8"
             ]
         ]
     },
     {
-        "id": "679570af.9bc068",
+        "id": "e597143.e5430e8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1876.618995666504,
-        "y": 741.092206954956,
-        "z": "5e1485c9.cf5eac",
+        "x": 1867.1904373168945,
+        "y": 668.092206954956,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "411ee2be.ec918c",
+        "id": "f75942cd.e9cdb",
         "type": "outcome",
         "name": "DeactivateSDWANDeviceInstance",
         "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1488.0951919555664,
-        "y": 1084.571409702301,
-        "z": "5e1485c9.cf5eac",
+        "x": 1478.666633605957,
+        "y": 1011.571409702301,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "30bdea0.6cd7f96"
+                "4ef6289e.5a069"
             ]
         ]
     },
     {
-        "id": "30bdea0.6cd7f96",
+        "id": "4ef6289e.5a069",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1944.6188888549805,
-        "y": 1084.0922451019287,
-        "z": "5e1485c9.cf5eac",
+        "x": 1935.190330505371,
+        "y": 1011.0922451019287,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "5ef91d74.276e54",
+        "id": "42a673d5.9dc9ec",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1874.0951919555664,
-        "y": 781.5713939666748,
-        "z": "5e1485c9.cf5eac",
+        "x": 1864.666633605957,
+        "y": 708.5713939666748,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "4f066da3.11c274",
+        "id": "269f5d4e.8f57b2",
         "type": "outcome",
         "name": "ActivateSDWANPortInstance",
         "xml": "<outcome value='ActivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1430.5715103149414,
-        "y": 789.0506114959717,
-        "z": "5e1485c9.cf5eac",
+        "x": 1421.142951965332,
+        "y": 716.0506114959717,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "5ef91d74.276e54"
+                "42a673d5.9dc9ec"
             ]
         ]
     },
     {
-        "id": "b6e640cc.0df1f",
+        "id": "b095d5a2.1abde",
         "type": "outcome",
         "name": "DeactivateSDWANPortInstance",
         "xml": "<outcome value='DeactivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1480.0952377319336,
-        "y": 1122.904725074768,
-        "z": "5e1485c9.cf5eac",
+        "x": 1470.6666793823242,
+        "y": 1049.904725074768,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "b644319b.6890b"
+                "822cf96e.0d9b6"
             ]
         ]
     },
     {
-        "id": "b644319b.6890b",
+        "id": "822cf96e.0d9b6",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1954.6188888549805,
-        "y": 1139.4255270957947,
-        "z": "5e1485c9.cf5eac",
+        "x": 1945.190330505371,
+        "y": 1066.4255270957947,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "e9342911.e555a",
+        "id": "f6ff4a70.3816",
         "type": "outcome",
         "name": "CreateSDWANPortInstance",
         "xml": "<outcome value='CreateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1477.09557056427,
-        "y": 1472.9048511981964,
-        "z": "5e1485c9.cf5eac",
+        "x": 1467.6670122146606,
+        "y": 1399.9048511981964,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "1f96773c.700b39"
+                "2cee7114.60daa6"
             ]
         ]
     },
     {
-        "id": "1f96773c.700b39",
+        "id": "2cee7114.60daa6",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1933.6191911697388,
-        "y": 1477.425630569458,
-        "z": "5e1485c9.cf5eac",
+        "x": 1924.1906328201294,
+        "y": 1404.425630569458,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "ecf62cf7.1ca33",
+        "id": "fbaa1326.1081a",
         "type": "outcome",
         "name": "DeleteSDWANPortInstance",
         "xml": "<outcome value='DeleteSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1488.7620239257812,
-        "y": 1864.9047713279724,
-        "z": "5e1485c9.cf5eac",
+        "x": 1479.3334655761719,
+        "y": 1791.9047713279724,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "7865f7ca.1408"
+                "3a81ef6f.a21e28"
             ]
         ]
     },
     {
-        "id": "7865f7ca.1408",
+        "id": "3a81ef6f.a21e28",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1915.285743713379,
-        "y": 1864.4256267547607,
-        "z": "5e1485c9.cf5eac",
+        "x": 1905.8571853637695,
+        "y": 1791.4256267547607,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "2c7b6f3.166a81",
+        "id": "254cc1a6.5d0cc6",
         "type": "outcome",
         "name": "DeleteSDWANDeviceInstance",
         "xml": "<outcome value='DeleteSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1497.4601745605469,
-        "y": 1805.102677822113,
-        "z": "5e1485c9.cf5eac",
+        "x": 1488.0316162109375,
+        "y": 1732.102677822113,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "9cbcc99f.b5b0a"
+                "233ef390.f379c4"
             ]
         ]
     },
     {
-        "id": "9cbcc99f.b5b0a",
+        "id": "233ef390.f379c4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1929.9837799072266,
-        "y": 1804.6233911514282,
-        "z": "5e1485c9.cf5eac",
+        "x": 1920.5552215576172,
+        "y": 1731.6233911514282,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "21f0e26d.3cb426",
+        "id": "6afcca50.5f66dc",
         "type": "outcome",
         "name": "CreateSDWANDeviceInstance",
         "xml": "<outcome value='CreateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1492.4599199295044,
-        "y": 1429.1028146743774,
-        "z": "5e1485c9.cf5eac",
+        "x": 1483.031361579895,
+        "y": 1356.1028146743774,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "30fab97f.f7434e"
+                "316c4260.73720e"
             ]
         ]
     },
     {
-        "id": "30fab97f.f7434e",
+        "id": "316c4260.73720e",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1948.9835863113403,
-        "y": 1427.623628616333,
-        "z": "5e1485c9.cf5eac",
+        "x": 1939.555027961731,
+        "y": 1354.623628616333,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "f885de43.3998e",
+        "id": "816c27b8.77c4e8",
         "type": "outcome",
         "name": "ActivateSDWANVpnInstance",
         "xml": "<outcome value='ActivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1434.724708557129,
-        "y": 838.1484661102295,
-        "z": "5e1485c9.cf5eac",
+        "x": 1425.2961502075195,
+        "y": 765.1484661102295,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "bd9ef6ef.c1cde"
+                "8435974d.4fc658"
             ]
         ]
     },
     {
-        "id": "6b9292e.b0ebe6c",
+        "id": "2047aafd.7f7996",
         "type": "outcome",
         "name": "ActivateSDWANSiteInstance",
         "xml": "<outcome value='ActivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1438.724708557129,
-        "y": 880.8149089813232,
-        "z": "5e1485c9.cf5eac",
+        "x": 1429.2961502075195,
+        "y": 807.8149089813232,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "bd9ef6ef.c1cde"
+                "8435974d.4fc658"
             ]
         ]
     },
     {
-        "id": "bd9ef6ef.c1cde",
+        "id": "8435974d.4fc658",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1709.7247009277344,
-        "y": 858.8149607181549,
-        "z": "5e1485c9.cf5eac",
+        "x": 1700.296142578125,
+        "y": 785.8149607181549,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "cb57f1d.266e79"
+                "e4988e8c.796a8"
             ]
         ]
     },
     {
-        "id": "cb57f1d.266e79",
+        "id": "e4988e8c.796a8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2087.7245483398438,
-        "y": 856.148619890213,
-        "z": "5e1485c9.cf5eac",
+        "x": 2078.2959899902344,
+        "y": 783.148619890213,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "c8928e2a.b53548",
+        "id": "f6f20244.8d9308",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2140.7617721557617,
-        "y": 1194.9380941390991,
-        "z": "5e1485c9.cf5eac",
+        "x": 2131.3332138061523,
+        "y": 1121.9380941390991,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "cedbd22e.64ab3",
+        "id": "dde515a2.eea8c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1743.761863708496,
-        "y": 1196.6044387817383,
-        "z": "5e1485c9.cf5eac",
+        "x": 1734.3333053588867,
+        "y": 1123.6044387817383,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "c8928e2a.b53548"
+                "f6f20244.8d9308"
             ]
         ]
     },
     {
-        "id": "8e23587c.b352c8",
+        "id": "767ffc3.b041d84",
         "type": "outcome",
         "name": "DeactivateSDWANSiteInstance",
         "xml": "<outcome value='DeactivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1485.761848449707,
-        "y": 1218.6044034957886,
-        "z": "5e1485c9.cf5eac",
+        "x": 1476.3332901000977,
+        "y": 1145.6044034957886,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "cedbd22e.64ab3"
+                "dde515a2.eea8c"
             ]
         ]
     },
     {
-        "id": "c74f5862.b743e8",
+        "id": "5974d41f.5000ac",
         "type": "outcome",
         "name": "DeactivateSDWANVpnInstance",
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1479.761817932129,
-        "y": 1175.9379558563232,
-        "z": "5e1485c9.cf5eac",
+        "x": 1470.3332595825195,
+        "y": 1102.9379558563232,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "cedbd22e.64ab3"
+                "dde515a2.eea8c"
             ]
         ]
     },
     {
-        "id": "eec6f232.28cd18",
+        "id": "2f050ce4.d6732c",
         "type": "outcome",
         "name": "CreateSDWANVpnInstance",
         "xml": "<outcome value='CreateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1473.2802505493164,
-        "y": 1527.592924118042,
-        "z": "5e1485c9.cf5eac",
+        "x": 1463.851692199707,
+        "y": 1454.592924118042,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "fd392d05.c85a98"
+                "740e2dc7.31c594"
             ]
         ]
     },
     {
-        "id": "d6b4617d.0f2f58",
+        "id": "254873f2.91487c",
         "type": "outcome",
         "name": "CreateSDWANSiteInstance",
         "xml": "<outcome value='CreateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1465.2802276611328,
-        "y": 1569.2593126296997,
-        "z": "5e1485c9.cf5eac",
+        "x": 1455.8516693115234,
+        "y": 1496.2593126296997,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "fd392d05.c85a98"
+                "740e2dc7.31c594"
             ]
         ]
     },
     {
-        "id": "fd392d05.c85a98",
+        "id": "740e2dc7.31c594",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1723.2802429199219,
-        "y": 1547.2593479156494,
-        "z": "5e1485c9.cf5eac",
+        "x": 1713.8516845703125,
+        "y": 1474.2593479156494,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "6c611166.72f42"
+                "34a062a6.1dcf1e"
             ]
         ]
     },
     {
-        "id": "6c611166.72f42",
+        "id": "34a062a6.1dcf1e",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2101.2800903320312,
-        "y": 1544.5930070877075,
-        "z": "5e1485c9.cf5eac",
+        "x": 2091.851531982422,
+        "y": 1471.5930070877075,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "ec897ad4.1d68c8",
+        "id": "de41704e.e02f2",
         "type": "outcome",
         "name": "DeleteSDWANVpnInstance",
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1479.7619400024414,
-        "y": 1911.9380779266357,
-        "z": "5e1485c9.cf5eac",
+        "x": 1470.333381652832,
+        "y": 1838.9380779266357,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "3fda0bf7.7e360c"
+                "129831e9.f87ede"
             ]
         ]
     },
     {
-        "id": "b0e41ce0.ba1c2",
+        "id": "da1c7a96.50bc1",
         "type": "outcome",
         "name": "DeleteSDWANSiteInstance",
         "xml": "<outcome value='DeleteSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1479.7619400024414,
-        "y": 1952.604642868042,
-        "z": "5e1485c9.cf5eac",
+        "x": 1470.333381652832,
+        "y": 1879.604642868042,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "3fda0bf7.7e360c"
+                "129831e9.f87ede"
             ]
         ]
     },
     {
-        "id": "3fda0bf7.7e360c",
+        "id": "129831e9.f87ede",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1729.7619323730469,
-        "y": 1931.6045017242432,
-        "z": "5e1485c9.cf5eac",
+        "x": 1720.3333740234375,
+        "y": 1858.6045017242432,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "fbed204a.bd1728"
+                "229550df.5e154"
             ]
         ]
     },
     {
-        "id": "fbed204a.bd1728",
+        "id": "229550df.5e154",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2107.7617797851562,
-        "y": 1928.9381608963013,
-        "z": "5e1485c9.cf5eac",
+        "x": 2098.333221435547,
+        "y": 1855.9381608963013,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "bb3c82b4.c1325",
+        "id": "48008d0.96b8a74",
         "type": "set",
         "name": "set skip-mdsal-update to Y",
         "xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",
         "comments": "",
-        "x": 2256.46044921875,
-        "y": 434.4920959472656,
-        "z": "5e1485c9.cf5eac",
+        "x": 2247.0318908691406,
+        "y": 361.4920959472656,
+        "z": "4a2a8d50.48649c",
         "wires": []
     },
     {
-        "id": "e5f7f319.bf835",
+        "id": "92f6b1eb.ca851",
         "type": "set",
         "name": "set ack-final to 'N'",
         "xml": "<set>\n<parameter name='ack-final' value='N' />\n",
         "comments": "",
-        "x": 2228.2701416015625,
-        "y": 498.8401184082031,
-        "z": "5e1485c9.cf5eac",
+        "x": 2218.841583251953,
+        "y": 425.8401184082031,
+        "z": "4a2a8d50.48649c",
         "wires": []
     },
     {
-        "id": "90c6121f.d44d08",
+        "id": "2763f43e.b7f64c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2019.8096923828125,
-        "y": 437.4126281738281,
-        "z": "5e1485c9.cf5eac",
+        "x": 2010.3811340332031,
+        "y": 364.4126281738281,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "bb3c82b4.c1325",
-                "e5f7f319.bf835"
+                "48008d0.96b8a74",
+                "92f6b1eb.ca851",
+                "e91c2cf.91f4f5"
             ]
         ]
     },
     {
-        "id": "410ae358.7ed294",
+        "id": "99df438b.bf111",
         "type": "comment",
         "name": "ack-final=N triggers Provider to call vnf-topology-operation-aysnc DG",
         "info": "",
         "comments": "",
-        "x": 2440.5875244140625,
-        "y": 539.8094787597656,
-        "z": "5e1485c9.cf5eac",
+        "x": 2431.158966064453,
+        "y": 466.8094787597656,
+        "z": "4a2a8d50.48649c",
         "wires": []
     },
     {
-        "id": "78881e52.ac5cf",
+        "id": "9860bb12.14903",
         "type": "switchNode",
         "name": "so-response-url empty?",
         "xml": "<switch test='`length($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1125.71435546875,
-        "y": 284.28570556640625,
-        "z": "5e1485c9.cf5eac",
+        "x": 1116.2857971191406,
+        "y": 211.28570556640625,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "9d3f85b7.4f108",
-                "81cc9b69.e96138"
+                "2a95a553.f75302",
+                "1a29396b.d78657"
             ]
         ]
     },
     {
-        "id": "9d3f85b7.4f108",
+        "id": "2a95a553.f75302",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1350.71435546875,
-        "y": 240.28570556640625,
-        "z": "5e1485c9.cf5eac",
+        "x": 1341.2857971191406,
+        "y": 167.28570556640625,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "d6da011c.b6e428"
+                "9599639c.6064a"
             ]
         ]
     },
     {
-        "id": "81cc9b69.e96138",
+        "id": "1a29396b.d78657",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1340.71435546875,
-        "y": 332.28570556640625,
-        "z": "5e1485c9.cf5eac",
+        "x": 1331.2857971191406,
+        "y": 259.28570556640625,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "a9d5472.2cb9538"
+                "7685fc6a.1e8e84"
             ]
         ]
     },
     {
-        "id": "a9d5472.2cb9538",
+        "id": "7685fc6a.1e8e84",
         "type": "switchNode",
         "name": "so-response-url = ignored URL?",
         "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1562.71435546875,
-        "y": 333.28570556640625,
-        "z": "5e1485c9.cf5eac",
+        "x": 1553.2857971191406,
+        "y": 260.28570556640625,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "5910e93.911c398",
-                "9cb12d89.d5848"
+                "dcc6c506.1c2e3",
+                "f03182d7.544448"
             ]
         ]
     },
     {
-        "id": "d6da011c.b6e428",
+        "id": "9599639c.6064a",
         "type": "call",
         "name": "call vnf-topology-operation-assign-sync",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-sync' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2026.71435546875,
-        "y": 241.28570556640625,
-        "z": "5e1485c9.cf5eac",
+        "x": 2017.2857971191406,
+        "y": 168.28570556640625,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "5910e93.911c398",
+        "id": "dcc6c506.1c2e3",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1802.71435546875,
-        "y": 332.28570556640625,
-        "z": "5e1485c9.cf5eac",
+        "x": 1793.2857971191406,
+        "y": 259.28570556640625,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "d6da011c.b6e428"
+                "9599639c.6064a"
             ]
         ]
     },
     {
-        "id": "9cb12d89.d5848",
+        "id": "f03182d7.544448",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1810.71435546875,
-        "y": 433.28570556640625,
-        "z": "5e1485c9.cf5eac",
+        "x": 1801.2857971191406,
+        "y": 360.28570556640625,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "90c6121f.d44d08"
+                "2763f43e.b7f64c"
             ]
         ]
     },
     {
-        "id": "eae4dc8b.0676a",
+        "id": "90549b1f.450ae",
         "type": "execute",
         "name": "execute getProperties",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1139.0908203125,
-        "y": 174.54547119140625,
-        "z": "5e1485c9.cf5eac",
+        "x": 1129.6622619628906,
+        "y": 101.54547119140625,
+        "z": "4a2a8d50.48649c",
         "wires": [
             []
         ]
     },
     {
-        "id": "ca6e900f.5d2de",
+        "id": "f7b6e38.ff165a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 948.181884765625,
-        "y": 172.727294921875,
-        "z": "5e1485c9.cf5eac",
+        "x": 938.7533264160156,
+        "y": 99.727294921875,
+        "z": "4a2a8d50.48649c",
         "wires": [
             [
-                "78881e52.ac5cf",
-                "eae4dc8b.0676a"
+                "9860bb12.14903",
+                "90549b1f.450ae"
             ]
         ]
+    },
+    {
+        "id": "e91c2cf.91f4f5",
+        "type": "call",
+        "name": "call vnf-topology-operation-assign-async",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-async' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2282,
+        "y": 510,
+        "z": "4a2a8d50.48649c",
+        "wires": [
+            []
+        ]
     }
-]
+]
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
index d3b704ca..dc7dc371 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
@@ -28,6 +28,7 @@
                                             <set>
                                                 <parameter name='ack-final' value='N' />
                                             </set>
+                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-async' mode='sync' ></call>
                                         </block>
                                     </outcome>
                                 </switch>
@@ -170,4 +171,4 @@
             </return>
         </block>
     </method>
-</service-logic>
+</service-logic>
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
index c96c98ab..d1cc40d7 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
@@ -28,6 +28,7 @@
                                             <set>
                                                 <parameter name='ack-final' value='N' />
                                             </set>
+                                            <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-async' mode='sync' ></call>
                                         </block>
                                     </outcome>
                                 </switch>
@@ -165,4 +166,4 @@
             </return>
         </block>
     </method>
-</service-logic>
+</service-logic>
+\ No newline at end of file
author	Timoney, Dan (dt5972) <dtimoney@att.com>	2019-10-21 10:17:28 -0400
committer	Dan Timoney <dtimoney@att.com>	2019-10-22 14:44:49 +0000
commit	7072c175934cd5755ab7b5a9a101d3c7ac7d7d47 (patch)
tree	d84ea89d56d943e61b26d5f17d273b3a78b4bf73
parent	c39c8f81cba4633015d6270440a6cd4776bb0a24 (diff)