Fix async logic

author Timoney, Dan (dt5972) <dtimoney@att.com>

Mon, 21 Oct 2019 14:17:28 +0000 (10:17 -0400)

committer Dan Timoney <dtimoney@att.com>

Tue, 22 Oct 2019 14:44:49 +0000 (14:44 +0000)
author Timoney, Dan (dt5972) <dtimoney@att.com>
Mon, 21 Oct 2019 14:17:28 +0000 (10:17 -0400)
committer Dan Timoney <dtimoney@att.com>
Tue, 22 Oct 2019 14:44:49 +0000 (14:44 +0000)
diff --git a/docs/release-notes.rst b/docs/release-notes.rst

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