Fix async logic

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

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

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

Wed, 23 Oct 2019 12:30:32 +0000 (08:30 -0400)
author Timoney, Dan (dt5972) <dtimoney@att.com>
Mon, 21 Oct 2019 14:17:28 +0000 (10:17 -0400)
committer Timoney, Dan (dt5972) <dtimoney@att.com>
Wed, 23 Oct 2019 12:30:32 +0000 (08:30 -0400)
diff --git a/docs/release-notes.rst b/docs/release-notes.rst

index 9bf9cae..9bfac30 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -3,9 +3,9 @@
  Release Notes
  =============
  
-Version 1.7.3
+Version 1.7.4
  -------------
-:Release Date: 2019-09-30
+:Release Date: 2019-10-24
  
  El Alto release
  
@@ -21,15 +21,15 @@ The following table lists the SDNC docker containers and their versions.
  +--------------------------------+---------------------------------------------+-----------+
  | onap/service-decomposition     | POMBA : service decomposition microservice  | 1.7.3     |
  +--------------------------------+---------------------------------------------+-----------+
-| onap/sdnc-ansible-server-image | Ansible server                              | 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.3     |
+| onap/sdnc-aaf-image            | SDNC controller image, with AAF integration | 1.7.4     |
  +--------------------------------+---------------------------------------------+-----------+
-| onap/sdnc-image                | SDNC controller image, standalone (no AAF)  | 1.7.3     |
+| onap/sdnc-image                | SDNC controller image, standalone (no AAF)  | 1.7.4     |
  +--------------------------------+---------------------------------------------+-----------+
-| onap/sdnc-ueb-listener-image   | SDC listener                                | 1.7.3     |
+| onap/sdnc-ueb-listener-image   | SDC listener                                | 1.7.4     |
  +--------------------------------+---------------------------------------------+-----------+
-| onap/sdcn-dmaap-listener-image | DMAAP listener                              | 1.7.3     |
+| onap/sdcn-dmaap-listener-image | DMAAP listener                              | 1.7.4     |
  +--------------------------------+---------------------------------------------+-----------+
  
  
@@ -61,10 +61,30 @@ The full list of bug fixes in the SDNC El Alto release may be found at <https://
  **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*
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 77425c8..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,20 +1,20 @@
  [\r
      {\r
-        "id": "146a644a.d6018c",\r
+        "id": "11d4dc1b.cea77c",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 222.8720245361328,\r
-        "y": 125.72916412353516,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 156,\r
+        "y": 118.70132446289062,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "18443a18.5bbe96"\r
+                "63acf7dc.06021"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "18443a18.5bbe96",\r
+        "id": "63acf7dc.06021",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -22,1368 +22,1527 @@
          "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": 336.15773010253906,\r
-        "y": 165.96727561950684,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 269.28570556640625,\r
+        "y": 158.9394359588623,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "8fc8d312.0addc"\r
+                "4268d929.67e0a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8fc8d312.0addc",\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": 310.30065155029297,\r
-        "y": 205.72915840148926,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 243.42862701416016,\r
+        "y": 198.70131874084473,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "f83a31fb.c7ace"\r
+                "403c1585.dc6254"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "805cedaf.9da98",\r
+        "id": "ece321a9.a609b",\r
          "type": "comment",\r
          "name": "vf-module-topology-operation",\r
          "info": "",\r
          "comments": "",\r
-        "x": 540.2168579101562,\r
-        "y": 108.31550598144531,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 473.34483337402344,\r
+        "y": 101.28766632080078,\r
+        "z": "d80dfa18.577678",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f83a31fb.c7ace",\r
+        "id": "403c1585.dc6254",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 284.3720703125,\r
-        "y": 539.0893239974976,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 217.5000457763672,\r
+        "y": 532.061484336853,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "52ec0471.d31dec",\r
-                "2eeb234b.70f96c",\r
-                "fdb85777.d67288"\r
+                "18b03d2.eb1fbc3",\r
+                "fe759666.be3398",\r
+                "b0524b56.c7d9d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "52ec0471.d31dec",\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": 569.8720626831055,\r
-        "y": 712.5867128372192,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 503.00003814697266,\r
+        "y": 705.5588731765747,\r
+        "z": "d80dfa18.577678",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2eeb234b.70f96c",\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": 580.7766723632812,\r
-        "y": 537.3005485534668,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 513.9046478271484,\r
+        "y": 530.2727088928223,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "e3a4fc2b.3161c",\r
-                "7f1f0b87.a516f4",\r
-                "3be366b6.d25b3a",\r
-                "e4340a.0ef46bf8",\r
-                "5a77a3cd.db513c",\r
-                "e3513758.067c58",\r
-                "49beeb56.f0ac24",\r
-                "1ed385fc.7370aa",\r
-                "bf807bcb.c76ab8"\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": "e3a4fc2b.3161c",\r
+        "id": "196a98f8.3bd137",\r
          "type": "outcome",\r
          "name": "assign",\r
          "xml": "<outcome value='assign'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 792.2529525756836,\r
-        "y": 385.5864505767822,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 725.3809280395508,\r
+        "y": 378.5586109161377,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "e9421b98.811ad8"\r
+                "f88029fe.714ff"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7f1f0b87.a516f4",\r
+        "id": "c8596657.93e1a",\r
          "type": "outcome",\r
          "name": "unassign",\r
          "xml": "<outcome value='unassign'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 798.6339378356934,\r
-        "y": 573.7770776748657,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 731.7619132995605,\r
+        "y": 566.7492380142212,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "af035a10.7be258"\r
+                "cd4b7513.f15268"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3be366b6.d25b3a",\r
+        "id": "458d7c6b.5d0d5c",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 702.3482894897461,\r
-        "y": 1989.3007230758667,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 635.4762649536133,\r
+        "y": 1982.2728834152222,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "fcd40c7c.89fc6"\r
+                "e82e3e2c.1df298"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fcd40c7c.89fc6",\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": 896.5387153625488,\r
-        "y": 1989.3007917404175,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 829.666690826416,\r
+        "y": 1982.272952079773,\r
+        "z": "d80dfa18.577678",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fdb85777.d67288",\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": 707.9553070068359,\r
-        "y": 283.11022090911865,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 641.0832824707031,\r
+        "y": 276.0823812484741,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f078e9a1.93f268",\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": 1174.3957443237305,\r
-        "y": 523.8244934082031,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1107.5237197875977,\r
+        "y": 516.7966537475586,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "af035a10.7be258",\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": 1168.7290153503418,\r
-        "y": 573.4912128448486,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1101.856990814209,\r
+        "y": 566.4633731842041,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b4bb85e8.cecf88",\r
+        "id": "8bd129ae.83c078",\r
          "type": "outcome",\r
          "name": "deactivate",\r
          "xml": "<outcome value='deactivate'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 802.7290306091309,\r
-        "y": 524.4911670684814,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 735.857006072998,\r
+        "y": 517.4633274078369,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "f078e9a1.93f268"\r
+                "d72b4fcb.1f4c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e4340a.0ef46bf8",\r
+        "id": "4b204f7e.1b8e2",\r
          "type": "outcome",\r
          "name": "changeassign",\r
          "xml": "<outcome value='changeassign'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 813.2053527832031,\r
-        "y": 621.3958072662354,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 746.3333282470703,\r
+        "y": 614.3679676055908,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "c11d3f25.2b8ae"\r
+                "e6633d6e.ae0008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c11d3f25.2b8ae",\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": 1182.300422668457,\r
-        "y": 621.1099433898926,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1115.4283981323242,\r
+        "y": 614.082103729248,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5a77a3cd.db513c",\r
+        "id": "5096a71a.af9198",\r
          "type": "outcome",\r
          "name": "create",\r
          "xml": "<outcome value='create'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 798.8720321655273,\r
-        "y": 819.729151725769,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 732.0000076293945,\r
+        "y": 812.7013120651245,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "9fa3f7fb.d73818"\r
+                "b0678560.7104f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "46363f16.60595",\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": 1037.2056350708008,\r
-        "y": 827.3155148923397,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 970.333610534668,\r
+        "y": 820.2876752316952,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "53511ac.d85bde4",\r
-                "60e100d5.7588f",\r
-                "41615e5f.e1751",\r
-                "e2244d87.5c338",\r
-                "a2058bc6.fa69e8",\r
-                "d0130bf2.6e3448"\r
+                "38f54336.43e254",\r
+                "52b23393.43b59c",\r
+                "8b76b414.15b5e8",\r
+                "ef2f9b30.3b48d8",\r
+                "6d66a790.28c178",\r
+                "e72de08a.895418"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "60e100d5.7588f",\r
+        "id": "52b23393.43b59c",\r
          "type": "outcome",\r
          "name": "CreateSDWANSiteInstance",\r
          "xml": "<outcome value='CreateSDWANSiteInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1327.6819534301758,\r
-        "y": 735.7948837280273,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1260.809928894043,\r
+        "y": 728.7670440673828,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "a917c65f.e5c2a8"\r
+                "1d98311f.d91eb7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "53511ac.d85bde4",\r
+        "id": "38f54336.43e254",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1237.5864181518555,\r
-        "y": 911.1727781295776,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1170.7143936157227,\r
+        "y": 904.1449384689331,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "de8a37a9.53a558"\r
+                "3ba8f36d.dd4584"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9fa3f7fb.d73818",\r
+        "id": "b0678560.7104f",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 985.2055511474609,\r
-        "y": 747.3155164718628,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 918.3335266113281,\r
+        "y": 740.2876768112183,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "46363f16.60595",\r
-                "976fd046.7fe32"\r
+                "162fec09.6308b4",\r
+                "7ce1a992.f698d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a917c65f.e5c2a8",\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": 1751.205825805664,\r
-        "y": 734.3156599998474,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1684.3338012695312,\r
+        "y": 727.2878203392029,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "de8a37a9.53a558",\r
+        "id": "3ba8f36d.dd4584",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1390.8720703125,\r
-        "y": 911.2291746139526,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1324.0000457763672,\r
+        "y": 904.2013349533081,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "41615e5f.e1751",\r
+        "id": "8b76b414.15b5e8",\r
          "type": "outcome",\r
          "name": "CreateSDWANPortInstance",\r
          "xml": "<outcome value='CreateSDWANPortInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1301.5388107299805,\r
-        "y": 869.562668800354,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1234.6667861938477,\r
+        "y": 862.5348291397095,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "dab1af07.8a3cf"\r
+                "82cd1d50.2a0f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dab1af07.8a3cf",\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": 1774.0625076293945,\r
-        "y": 869.083420753479,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1707.1904830932617,\r
+        "y": 862.0555810928345,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e2244d87.5c338",\r
+        "id": "ef2f9b30.3b48d8",\r
          "type": "outcome",\r
          "name": "CreateSDWANDeviceInstance",\r
          "xml": "<outcome value='CreateSDWANDeviceInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1309.903133392334,\r
-        "y": 789.7606291770935,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1243.0311088562012,\r
+        "y": 782.732789516449,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "99f05a55.3dafe8"\r
+                "c5caf426.d828e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "99f05a55.3dafe8",\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": 1765.4269218444824,\r
-        "y": 789.2814984321594,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1698.5548973083496,\r
+        "y": 782.2536587715149,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a2058bc6.fa69e8",\r
+        "id": "6d66a790.28c178",\r
          "type": "outcome",\r
          "name": "CreateSDWANVpnInstance",\r
          "xml": "<outcome value='CreateSDWANVpnInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1339.8720512390137,\r
-        "y": 688.7292037010193,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1273.0000267028809,\r
+        "y": 681.7013640403748,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "d2406569.cc26c8"\r
+                "6e6d0477.4e8ddc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d2406569.cc26c8",\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": 1748.395824432373,\r
-        "y": 686.2499709129333,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1681.5237998962402,\r
+        "y": 679.2221312522888,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e3513758.067c58",\r
+        "id": "398477c1.9e3bb8",\r
          "type": "outcome",\r
          "name": "activate",\r
          "xml": "<outcome value='activate'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 788.8720321655273,\r
-        "y": 1015.0624647140503,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 722.0000076293945,\r
+        "y": 1008.0346250534058,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "b3da3524.611018"\r
+                "ca9d6615.d92bb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ad86b133.4fcef",\r
+        "id": "22860be6.d83544",\r
          "type": "outcome",\r
          "name": "ActivateSDWANSiteInstance",\r
          "xml": "<outcome value='ActivateSDWANSiteInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1319.0150833129883,\r
-        "y": 1017.9614181518555,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1252.1430587768555,\r
+        "y": 1010.9335784912109,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "9fb362a8.709c"\r
+                "bc6abbe4.e226c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b3da3524.611018",\r
+        "id": "ca9d6615.d92bb",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 969.5388031005859,\r
-        "y": 1010.482141494751,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 902.6667785644531,\r
+        "y": 1003.4543018341064,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "6119c1c4.7dffd"\r
+                "fd34d18f.7429b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9fb362a8.709c",\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": 1731.5389709472656,\r
-        "y": 1011.4822006225586,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1664.6669464111328,\r
+        "y": 1004.4543609619141,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "34c2f165.f848be",\r
+        "id": "fc0c8e83.b23218",\r
          "type": "outcome",\r
          "name": "ActivateSDWANDeviceInstance",\r
          "xml": "<outcome value='ActivateSDWANDeviceInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1308.2055206298828,\r
-        "y": 1063.9822068214417,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1241.33349609375,\r
+        "y": 1056.9543671607971,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "51ba2675.c49818"\r
+                "322979d6.dc748e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "51ba2675.c49818",\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": 1743.7292175292969,\r
-        "y": 1063.5029792785645,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1676.857192993164,\r
+        "y": 1056.47513961792,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4b3819e5.446868",\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": 1742.2053451538086,\r
-        "y": 1148.9821610450745,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1675.3333206176758,\r
+        "y": 1141.95432138443,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8fb0712b.8a713",\r
+        "id": "7140c1d2.7cd8a8",\r
          "type": "outcome",\r
          "name": "ActivateSDWANPortInstance",\r
          "xml": "<outcome value='ActivateSDWANPortInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1306.6816482543945,\r
-        "y": 1149.4613885879517,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1239.8096237182617,\r
+        "y": 1142.4335489273071,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "4b3819e5.446868"\r
+                "7a20602e.9c67f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6119c1c4.7dffd",\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": 1045.8720321655273,\r
-        "y": 1077.0624647140503,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 979.0000076293945,\r
+        "y": 1070.0346250534058,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "ad86b133.4fcef",\r
-                "34c2f165.f848be",\r
-                "8fb0712b.8a713",\r
-                "d07f736.adfa09",\r
-                "481790e7.43aeb",\r
-                "c64a1b07.ab47a8"\r
+                "22860be6.d83544",\r
+                "fc0c8e83.b23218",\r
+                "7140c1d2.7cd8a8",\r
+                "9e7170ba.5f9eb8",\r
+                "d7d2a998.ac94f8",\r
+                "8e69acb9.247998"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d07f736.adfa09",\r
+        "id": "9e7170ba.5f9eb8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1238.4435119628906,\r
-        "y": 1198.273973941803,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1171.5714874267578,\r
+        "y": 1191.2461342811584,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "e739bc83.63e2c"\r
+                "dab2914f.5e193"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "481790e7.43aeb",\r
+        "id": "d7d2a998.ac94f8",\r
          "type": "outcome",\r
          "name": "ActivateSDWANVpnInstance",\r
          "xml": "<outcome value='ActivateSDWANVpnInstance'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1321.8720321655273,\r
-        "y": 973.0624647140503,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1255.0000076293945,\r
+        "y": 966.0346250534058,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "e2bf4bd1.f5d2f8"\r
+                "8d564aec.b974a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e2bf4bd1.f5d2f8",\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": 1737.3958358764648,\r
-        "y": 966.5832414627075,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1670.523811340332,\r
+        "y": 959.555401802063,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "49beeb56.f0ac24",\r
+        "id": "112e016f.f82cbf",\r
          "type": "outcome",\r
          "name": "deactivate",\r
          "xml": "<outcome value='deactivate'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 772.8720245361328,\r
-        "y": 1301.0625576972961,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 706,\r
+        "y": 1294.0347180366516,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "fb50cbbf.e98648"\r
+                "379e448b.e26ed4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "676bcbf6.bf2a24",\r
+        "id": "e0dd4b1.4e4d8b8",\r
          "type": "outcome",\r
          "name": "DeactivateSDWANSiteInstance",\r
          "xml": "<outcome value='DeactivateSDWANSiteInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1311.0151443481445,\r
-        "y": 1300.9615278244019,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1244.1431198120117,\r
+        "y": 1293.9336881637573,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "2f3916a.390d7ea"\r
+                "90c2ea50.fdcfe8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fb50cbbf.e98648",\r
+        "id": "379e448b.e26ed4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 953.5387954711914,\r
-        "y": 1296.4822344779968,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 886.6667709350586,\r
+        "y": 1289.4543948173523,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "8f3e573.51225a8"\r
+                "5c04c78d.fe726"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2f3916a.390d7ea",\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": 1728.5389099121094,\r
-        "y": 1302.4822645187378,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1661.6668853759766,\r
+        "y": 1295.4544248580933,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c6530296.821ac",\r
+        "id": "3157e474.6d76bc",\r
          "type": "outcome",\r
          "name": "DeactivateSDWANDeviceInstance",\r
          "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1292.2055130004883,\r
-        "y": 1349.9822998046875,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1225.3334884643555,\r
+        "y": 1342.954460144043,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "bb595a17.77c898"\r
+                "4bcbaf21.f06a68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bb595a17.77c898",\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": 1727.7292098999023,\r
-        "y": 1349.5030722618103,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1660.8571853637695,\r
+        "y": 1342.4752326011658,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "be737f8c.bf185",\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": 1725.205421447754,\r
-        "y": 1427.982274055481,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1658.333396911621,\r
+        "y": 1420.9544343948364,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7297171e.80a088",\r
+        "id": "c5a06a95.9a73c",\r
          "type": "outcome",\r
          "name": "DeactivateSDWANPortInstance",\r
          "xml": "<outcome value='DeactivateSDWANPortInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1289.6817245483398,\r
-        "y": 1428.4615015983582,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1222.809700012207,\r
+        "y": 1421.4336619377136,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "be737f8c.bf185"\r
+                "628f7e0d.7bf12"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8f3e573.51225a8",\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": 1029.8720245361328,\r
-        "y": 1363.0625576972961,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 963,\r
+        "y": 1356.0347180366516,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "676bcbf6.bf2a24",\r
-                "c6530296.821ac",\r
-                "7297171e.80a088",\r
-                "71d7e3b7.3e65fc",\r
-                "c02ae531.4d1c08",\r
-                "443330cd.1d373"\r
+                "e0dd4b1.4e4d8b8",\r
+                "3157e474.6d76bc",\r
+                "c5a06a95.9a73c",\r
+                "e434dcb1.1a484",\r
+                "401815f5.93c05c",\r
+                "5f2a3253.15e99c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "71d7e3b7.3e65fc",\r
+        "id": "e434dcb1.1a484",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1225.443458557129,\r
-        "y": 1478.2740640640259,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1158.571434020996,\r
+        "y": 1471.2462244033813,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "e798a02b.bec1a"\r
+                "c76a7983.9d38e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c02ae531.4d1c08",\r
+        "id": "401815f5.93c05c",\r
          "type": "outcome",\r
          "name": "DeactivateSDWANVpnInstance",\r
          "xml": "<outcome value='DeactivateSDWANVpnInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1305.8720245361328,\r
-        "y": 1259.0625576972961,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1239,\r
+        "y": 1252.0347180366516,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "c1f94712.8e93d8"\r
+                "179d4c8.1c9f0b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c1f94712.8e93d8",\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": 1721.3958282470703,\r
-        "y": 1252.5833344459534,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1654.5238037109375,\r
+        "y": 1245.5554947853088,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e798a02b.bec1a",\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": 1563.8721389770508,\r
-        "y": 1478.7292747497559,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1497.000114440918,\r
+        "y": 1471.7014350891113,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e739bc83.63e2c",\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": 1568.8720245361328,\r
-        "y": 1195.7291836738586,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1502,\r
+        "y": 1188.701344013214,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "439fbd92.bc1ce4",\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": 1166.8719902038574,\r
-        "y": 474.72913932800293,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1099.9999656677246,\r
+        "y": 467.7012996673584,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "62a08c09.0b1384",\r
+        "id": "9e246b75.ae6418",\r
          "type": "outcome",\r
          "name": "activate",\r
          "xml": "<outcome value='activate'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 794.8719749450684,\r
-        "y": 475.3958168029785,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 727.9999504089355,\r
+        "y": 468.367977142334,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "439fbd92.bc1ce4"\r
+                "61081d39.89dad4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1ed385fc.7370aa",\r
+        "id": "e227c212.42fea8",\r
          "type": "outcome",\r
          "name": "delete",\r
          "xml": "<outcome value='delete'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 735.8720703125,\r
-        "y": 1646.3958864212036,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 669.0000457763672,\r
+        "y": 1639.368046760559,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "bca44a5d.cc37a8"\r
+                "681f7e70.128598"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bfb405f9.b31248",\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": 975.2055892944336,\r
-        "y": 1646.982253074646,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 908.3335647583008,\r
+        "y": 1639.9544134140015,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "425d435e.61bf0c",\r
-                "51fa15a4.dbc35c",\r
-                "7e86ba39.03f964",\r
-                "25d4d62c.6d980a",\r
-                "2a489103.e03f5e",\r
-                "21017d13.c62292"\r
+                "8e23d3e5.351a68",\r
+                "936a66dc.f198d8",\r
+                "78e52106.f9df28",\r
+                "a2426271.0aaaf",\r
+                "5d0c656.809b41c",\r
+                "afdd56ca.7b158"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "51fa15a4.dbc35c",\r
+        "id": "936a66dc.f198d8",\r
          "type": "outcome",\r
          "name": "DeleteSDWANSiteInstance",\r
          "xml": "<outcome value='DeleteSDWANSiteInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1260.6821365356445,\r
-        "y": 1580.4616527557373,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1193.8101119995117,\r
+        "y": 1573.4338130950928,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "bd63c480.3e8d18"\r
+                "d567d254.07d97"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "425d435e.61bf0c",\r
+        "id": "8e23d3e5.351a68",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1174.5864562988281,\r
-        "y": 1737.8395128250122,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1107.7144317626953,\r
+        "y": 1730.8116731643677,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "9d6e36bc.fa16b8"\r
+                "26e6234e.282244"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bca44a5d.cc37a8",\r
+        "id": "681f7e70.128598",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 922.2055892944336,\r
-        "y": 1573.9822511672974,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 855.3335647583008,\r
+        "y": 1566.9544115066528,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "bfb405f9.b31248"\r
+                "7e590f10.e3e0d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bd63c480.3e8d18",\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": 1664.2057495117188,\r
-        "y": 1575.9824976921082,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1597.333724975586,\r
+        "y": 1568.9546580314636,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9d6e36bc.fa16b8",\r
+        "id": "26e6234e.282244",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1327.8721084594727,\r
-        "y": 1737.8959093093872,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1261.0000839233398,\r
+        "y": 1730.8680696487427,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7e86ba39.03f964",\r
+        "id": "78e52106.f9df28",\r
          "type": "outcome",\r
          "name": "DeleteSDWANPortInstance",\r
          "xml": "<outcome value='DeleteSDWANPortInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1238.5388488769531,\r
-        "y": 1696.2294034957886,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1171.6668243408203,\r
+        "y": 1689.201563835144,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "566c3117.8e406"\r
+                "9ac059d9.b2b208"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "566c3117.8e406",\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": 1711.0625457763672,\r
-        "y": 1695.7501554489136,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1644.1905212402344,\r
+        "y": 1688.722315788269,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "25d4d62c.6d980a",\r
+        "id": "a2426271.0aaaf",\r
          "type": "outcome",\r
          "name": "DeleteSDWANDeviceInstance",\r
          "xml": "<outcome value='DeleteSDWANDeviceInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1262.9032440185547,\r
-        "y": 1619.42729139328,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1196.0312194824219,\r
+        "y": 1612.3994517326355,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "cac13dac.4d799"\r
+                "62bed64b.ae3228"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cac13dac.4d799",\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": 1677.4270629882812,\r
-        "y": 1614.9481959342957,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1610.5550384521484,\r
+        "y": 1607.9203562736511,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2a489103.e03f5e",\r
+        "id": "5d0c656.809b41c",\r
          "type": "outcome",\r
          "name": "DeleteSDWANVpnInstance",\r
          "xml": "<outcome value='DeleteSDWANVpnInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1266.8721008300781,\r
-        "y": 1539.3959035873413,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1200.0000762939453,\r
+        "y": 1532.3680639266968,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "a107ba80.f2c438"\r
+                "903607f5.13f68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a107ba80.f2c438",\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": 1660.3959045410156,\r
-        "y": 1539.9166712760925,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1593.5238800048828,\r
+        "y": 1532.888831615448,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "976fd046.7fe32",\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": 1126.6220321655273,\r
-        "y": 696.3194011151791,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1059.7500076293945,\r
+        "y": 689.2915614545345,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d0130bf2.6e3448",\r
+        "id": "e72de08a.895418",\r
          "type": "outcome",\r
          "name": "CreateSDWANLanPortInstance",\r
          "xml": "<outcome value='CreateSDWANLanPortInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1303.6155319213867,\r
-        "y": 830.569402217865,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1236.743507385254,\r
+        "y": 823.5415625572205,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "17a425c8.ef240a"\r
+                "31973c4d.4759e4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "17a425c8.ef240a",\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": 1776.1392288208008,\r
-        "y": 830.09015417099,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1709.267204284668,\r
+        "y": 823.0623145103455,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c64a1b07.ab47a8",\r
+        "id": "8e69acb9.247998",\r
          "type": "outcome",\r
          "name": "ActivateSDWANLanPortInstance",\r
          "xml": "<outcome value='ActivateSDWANLanPortInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1315.6155319213867,\r
-        "y": 1107.819402217865,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1248.743507385254,\r
+        "y": 1100.7915625572205,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "a795142a.2e7d78"\r
+                "948b984b.e64328"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a795142a.2e7d78",\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": 1733.1391830444336,\r
-        "y": 1107.3401637077332,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1666.2671585083008,\r
+        "y": 1100.3123240470886,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "443330cd.1d373",\r
+        "id": "5f2a3253.15e99c",\r
          "type": "outcome",\r
          "name": "DeactivateSDWANLanPortInstance",\r
          "xml": "<outcome value='DeactivateSDWANLanPortInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1301.6155319213867,\r
-        "y": 1394.069402217865,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1234.743507385254,\r
+        "y": 1387.0415625572205,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "10e14224.177fee"\r
+                "6608c35e.c94abc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "10e14224.177fee",\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": 1719.1391830444336,\r
-        "y": 1393.5901637077332,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1652.2671585083008,\r
+        "y": 1386.5623240470886,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "21017d13.c62292",\r
+        "id": "afdd56ca.7b158",\r
          "type": "outcome",\r
          "name": "DeleteSDWANLanPortInstance",\r
          "xml": "<outcome value='DeleteSDWANLanPortInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1265.6155319213867,\r
-        "y": 1657.069402217865,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1198.743507385254,\r
+        "y": 1650.0415625572205,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "bc4d8c28.5152b"\r
+                "ddf98dd7.4ad7d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bc4d8c28.5152b",\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": 1683.1391830444336,\r
-        "y": 1656.5901637077332,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1616.2671585083008,\r
+        "y": 1649.5623240470886,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "bf807bcb.c76ab8",\r
+        "id": "9300e0fc.aacde8",\r
          "type": "outcome",\r
          "name": "update",\r
          "xml": "<outcome value='update'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 706.8720321655273,\r
-        "y": 1785.3154935836792,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 640.0000076293945,\r
+        "y": 1778.2876539230347,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "4bd24679.ac0638"\r
+                "ab931d4e.ccffc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4bd24679.ac0638",\r
+        "id": "ab931d4e.ccffc8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 881.2055282592773,\r
-        "y": 1789.9019804000854,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 814.3335037231445,\r
+        "y": 1782.874140739441,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "677be846.dfdd88"\r
+                "8e86ecaa.ce6c28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "677be846.dfdd88",\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": 1037.2055282592773,\r
-        "y": 1859.9019804000854,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 970.3335037231445,\r
+        "y": 1852.874140739441,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "24961218.c1a6de",\r
-                "4da413d8.1ef91c"\r
+                "4766c849.8d9ae8",\r
+                "9cad581c.5559d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "24961218.c1a6de",\r
+        "id": "4766c849.8d9ae8",\r
          "type": "outcome",\r
          "name": "SdwanBandwidthChange",\r
          "xml": "<outcome value='SdwanBandwidthChange'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1275.8720092773438,\r
-        "y": 1815.315613746643,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1208.999984741211,\r
+        "y": 1808.2877740859985,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "a17addc8.31a34"\r
+                "6a1687c.4a82bf8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a17addc8.31a34",\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": 1669.3958129882812,\r
-        "y": 1815.8363814353943,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1602.5237884521484,\r
+        "y": 1808.8085417747498,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4da413d8.1ef91c",\r
+        "id": "9cad581c.5559d8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1201.5863647460938,\r
-        "y": 1888.759217262268,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1134.714340209961,\r
+        "y": 1881.7313776016235,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "b40cb9f3.46e0e8"\r
+                "5ff5278e.fa7178"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b40cb9f3.46e0e8",\r
+        "id": "5ff5278e.fa7178",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1354.8720169067383,\r
-        "y": 1888.815613746643,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1287.9999923706055,\r
+        "y": 1881.7877740859985,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e9421b98.811ad8",\r
+        "id": "b75894e5.8c11a",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 981.1580276489258,\r
-        "y": 386.01489448547363,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 1982.8573913574219,\r
+        "y": 318.987060546875,\r
+        "z": "d80dfa18.577678",\r
          "wires": [\r
              [\r
-                "8e441963.a45748",\r
-                "535b5f61.bae1"\r
+                "1e63ed5c.c7dce3",\r
+                "f2379115.719e5",\r
+                "c06c12dc.df2ff"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8e441963.a45748",\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": 1227.9435806274414,\r
-        "y": 362.3689384460449,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 2229.6429443359375,\r
+        "y": 295.3411045074463,\r
+        "z": "d80dfa18.577678",\r
          "wires": []\r
      },\r
      {\r
-        "id": "535b5f61.bae1",\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": 1228.3721542358398,\r
-        "y": 402.36902236938477,\r
-        "z": "efc57676.46ecd8",\r
+        "x": 2230.071517944336,\r
+        "y": 335.34118843078613,\r
+        "z": "d80dfa18.577678",\r
          "wires": []\r
+    },\r
+    {\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": 1117.4285583496094,\r
+        "y": 172.98703002929688,\r
+        "z": "d80dfa18.577678",\r
+        "wires": [\r
+            [\r
+                "81183e12.46702",\r
+                "6ea99026.2d8cd8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "81183e12.46702",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1342.4285583496094,\r
+        "y": 128.98703002929688,\r
+        "z": "d80dfa18.577678",\r
+        "wires": [\r
+            [\r
+                "7193d1b3.b667a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6ea99026.2d8cd8",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1332.4285583496094,\r
+        "y": 220.98703002929688,\r
+        "z": "d80dfa18.577678",\r
+        "wires": [\r
+            [\r
+                "30e50b5.a0612f4"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 1554.4285583496094,\r
+        "y": 221.98703002929688,\r
+        "z": "d80dfa18.577678",\r
+        "wires": [\r
+            [\r
+                "835a8fa6.6d17f",\r
+                "2771015e.b6298e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "835a8fa6.6d17f",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1794.4285583496094,\r
+        "y": 220.98703002929688,\r
+        "z": "d80dfa18.577678",\r
+        "wires": [\r
+            [\r
+                "7193d1b3.b667a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2771015e.b6298e",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1802.4285583496094,\r
+        "y": 321.9870300292969,\r
+        "z": "d80dfa18.577678",\r
+        "wires": [\r
+            [\r
+                "b75894e5.8c11a"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 2301.285858154297,\r
+        "y": 127.1298828125,\r
+        "z": "d80dfa18.577678",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\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": 1108.3376159667969,\r
+        "y": 81.81817626953125,\r
+        "z": "d80dfa18.577678",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "f88029fe.714ff",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 917.4286804199219,\r
+        "y": 80,\r
+        "z": "d80dfa18.577678",\r
+        "wires": [\r
+            [\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
  ]
 \ 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 dc9de85..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,20 +1,20 @@
  [\r
      {\r
-        "id": "2f80fd18.68d7b2",\r
+        "id": "1bd67dd4.72089a",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 143,\r
-        "y": 93.41365623474121,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 157,\r
+        "y": 190.98507690429688,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "b167e74e.06e8b8"\r
+                "38bd98bb.8764e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b167e74e.06e8b8",\r
+        "id": "38bd98bb.8764e",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -22,1170 +22,1329 @@
          "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": 218.28570556640625,\r
-        "y": 133.6517677307129,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 240.28570556640625,\r
+        "y": 252.22317504882812,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "51ced5a3.0023bc"\r
+                "6888d6c.7572228"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "51ced5a3.0023bc",\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": 211.42862701416016,\r
-        "y": 173.4136505126953,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 232.42862701416016,\r
+        "y": 314.985071182251,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "581376ca.27ca98"\r
+                "cdfeb3ad.4eaab8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2c7d4d23.7303d2",\r
+        "id": "8829dcf9.9bea6",\r
          "type": "comment",\r
          "name": "vnf-topology-operation",\r
          "info": "",\r
          "comments": "",\r
-        "x": 537.344856262207,\r
-        "y": 41,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 556.9162979125977,\r
+        "y": 34,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": []\r
      },\r
      {\r
-        "id": "581376ca.27ca98",\r
+        "id": "cdfeb3ad.4eaab8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 235.16676330566406,\r
-        "y": 503.1071767807007,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 256.16676330566406,\r
+        "y": 644.6785974502563,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "97ab685e.0bee08",\r
-                "a403694c.693328",\r
-                "9d92efc8.8d9dd"\r
+                "cc1b175b.b736c",\r
+                "a3254fe3.d47878",\r
+                "3bc78e03.8c382a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "97ab685e.0bee08",\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": 527.6667175292969,\r
-        "y": 658.2712097167969,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 548.6667175292969,\r
+        "y": 799.8426303863525,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a403694c.693328",\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": 530.5714340209961,\r
-        "y": 501.31842041015625,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 551.5714340209961,\r
+        "y": 642.8898410797119,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "18cb9c11.4e7cc4",\r
-                "1d09f34f.3f578d",\r
-                "c78cd2e8.79be5",\r
-                "aa7e294c.376318",\r
-                "a97cbafe.7cac98",\r
-                "dbf64216.490f5",\r
-                "1d72c7ae.622688"\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": "18cb9c11.4e7cc4",\r
+        "id": "a7962069.276858",\r
          "type": "outcome",\r
          "name": "assign",\r
          "xml": "<outcome value='assign'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 865.3809814453125,\r
-        "y": 328.9375305175781,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 886.3809814453125,\r
+        "y": 470.5089511871338,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "a2f63855.285858"\r
+                "f7b6e38.ff165a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1d09f34f.3f578d",\r
+        "id": "f49f6b1.024f098",\r
          "type": "outcome",\r
          "name": "unassign",\r
          "xml": "<outcome value='unassign'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 941.4287996292114,\r
-        "y": 1098.12828540802,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 962.4287996292114,\r
+        "y": 1239.6997060775757,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "cfcc432b.30488"\r
+                "ab1f503b.af03d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aa7e294c.376318",\r
+        "id": "142cb248.a61cb6",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 925.1430358886719,\r
-        "y": 1786.318512916565,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 946.1430358886719,\r
+        "y": 1927.8899335861206,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "199e650e.3f3fbb"\r
+                "7e74b0a8.45fec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "199e650e.3f3fbb",\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": 1158.3334655761719,\r
-        "y": 1786.3185739517212,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1179.3334655761719,\r
+        "y": 1927.8899946212769,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9d92efc8.8d9dd",\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": 636.4166870117188,\r
-        "y": 253.79470825195312,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 657.4166870117188,\r
+        "y": 395.3661289215088,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b843ebb5.2815d8",\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": 1747.857307434082,\r
-        "y": 1051.8423652648926,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1768.857307434082,\r
+        "y": 1193.4137859344482,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "cfcc432b.30488",\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": 1305.5239305496216,\r
-        "y": 1102.842366218567,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1326.5239305496216,\r
+        "y": 1244.4137868881226,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c78cd2e8.79be5",\r
+        "id": "8e59e6fb.c51ca8",\r
          "type": "outcome",\r
          "name": "deactivate",\r
          "xml": "<outcome value='deactivate'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 910.5238800048828,\r
-        "y": 837.5089950561523,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 931.5238800048828,\r
+        "y": 979.080415725708,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "cbf00737.e7a518"\r
+                "ae6067c.1b2fa98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f274bd69.d26a1",\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": 1704.666877746582,\r
-        "y": 711.4136543273926,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1725.666877746582,\r
+        "y": 852.9850749969482,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a97cbafe.7cac98",\r
+        "id": "751946c8.87ef38",\r
          "type": "outcome",\r
          "name": "activate",\r
          "xml": "<outcome value='activate'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 873.3333129882812,\r
-        "y": 499.0802936553955,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 894.3333129882812,\r
+        "y": 640.6517143249512,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "c898ef62.8e1d2"\r
+                "6df2d884.4ca038"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dbf64216.490f5",\r
+        "id": "ef72ca54.96aa7",\r
          "type": "outcome",\r
          "name": "create",\r
          "xml": "<outcome value='create'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 943.0002298355103,\r
-        "y": 1230.4999523162842,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 964.0002298355103,\r
+        "y": 1372.0713729858398,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "c0072f79.b63d9"\r
+                "ae139a1c.222e28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1d72c7ae.622688",\r
+        "id": "f9ac2eb4.61364",\r
          "type": "outcome",\r
          "name": "delete",\r
          "xml": "<outcome value='delete'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 936.0002288818359,\r
-        "y": 1541.4999623298645,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 957.0002288818359,\r
+        "y": 1683.0713829994202,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "19fd4172.e8d1ef"\r
+                "8c3ce117.5fae2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "242eeec0.003092",\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": 1115.0000839233398,\r
-        "y": 554.4999704360962,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1136.0000839233398,\r
+        "y": 696.0713911056519,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "3a25fdb7.746092",\r
-                "40847b80.d6efa4",\r
-                "eea8d1d0.4bdc3",\r
-                "6d89db39.aedb84",\r
-                "eaaed7a1.f78188",\r
-                "bbf1b1a0.c8198"\r
+                "7013feeb.ed049",\r
+                "20d3b5c2.f3e69a",\r
+                "3668cbba.d4faa4",\r
+                "269f5d4e.8f57b2",\r
+                "816c27b8.77c4e8",\r
+                "2047aafd.7f7996"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "40847b80.d6efa4",\r
+        "id": "20d3b5c2.f3e69a",\r
          "type": "outcome",\r
          "name": "ActivateSiteInstance",\r
          "xml": "<outcome value='ActivateSiteInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1375.4763259887695,\r
-        "y": 476.97922134399414,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1396.4763259887695,\r
+        "y": 618.5506420135498,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "10ae7d07.42ded3"\r
+                "66f830ed.1e6de"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3a25fdb7.746092",\r
+        "id": "7013feeb.ed049",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1348.3811111450195,\r
-        "y": 712.3572273254395,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1369.3811111450195,\r
+        "y": 853.9286479949951,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "f274bd69.d26a1"\r
+                "858bb800.ca206"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c898ef62.8e1d2",\r
+        "id": "6df2d884.4ca038",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1054.0000839233398,\r
-        "y": 499.4999704360962,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1075.0000839233398,\r
+        "y": 641.0713911056519,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "242eeec0.003092"\r
+                "bd1d07e9.5eedc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "10ae7d07.42ded3",\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": 1742.000129699707,\r
-        "y": 479.50000381469727,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1763.000129699707,\r
+        "y": 621.0714244842529,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ada7056f.3de5e8",\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": 1173.0001983642578,\r
-        "y": 870.4999618530273,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1194.0001983642578,\r
+        "y": 1012.071382522583,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "323f27da.ef8b58",\r
-                "eed63b9b.32ee88",\r
-                "7c8e3f2d.ec40e",\r
-                "1a7d8db.9a66c72",\r
-                "9378aa69.5e8c68",\r
-                "1c4e2957.6aa337"\r
+                "52b80951.997c28",\r
+                "62663e18.1595d8",\r
+                "f75942cd.e9cdb",\r
+                "b095d5a2.1abde",\r
+                "5974d41f.5000ac",\r
+                "767ffc3.b041d84"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eed63b9b.32ee88",\r
+        "id": "62663e18.1595d8",\r
          "type": "outcome",\r
          "name": "DeactivateSiteInstance",\r
          "xml": "<outcome value='DeactivateSiteInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1416.4763946533203,\r
-        "y": 821.9792103767395,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1437.4763946533203,\r
+        "y": 963.5506310462952,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "3d82b6d7.778aba"\r
+                "13fd7ab.e595405"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "323f27da.ef8b58",\r
+        "id": "52b80951.997c28",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1391.3811111450195,\r
-        "y": 1052.3572578430176,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1412.3811111450195,\r
+        "y": 1193.9286785125732,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "b843ebb5.2815d8"\r
+                "e3d82d2a.fc82d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cbf00737.e7a518",\r
+        "id": "ae6067c.1b2fa98",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1112.0001983642578,\r
-        "y": 815.4999618530273,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1133.0001983642578,\r
+        "y": 957.071382522583,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "ada7056f.3de5e8"\r
+                "c2449ca2.43f5b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3d82b6d7.778aba",\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": 1786.0001983642578,\r
-        "y": 819.4999928474426,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1807.0001983642578,\r
+        "y": 961.0714135169983,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2f0de599.17bcda",\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": 1141.333625793457,\r
-        "y": 1317.0862617492676,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1162.333625793457,\r
+        "y": 1458.6576824188232,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "b2ddc25f.3e0b8",\r
-                "b407b587.a49908",\r
-                "8d600b8a.4468d8",\r
-                "44feac5a.bafec4",\r
-                "75f7964e.785a28",\r
-                "265de382.3a352c"\r
+                "daa776c9.c4de78",\r
+                "ea4b7172.c374",\r
+                "f6ff4a70.3816",\r
+                "6afcca50.5f66dc",\r
+                "2f050ce4.d6732c",\r
+                "254873f2.91487c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b407b587.a49908",\r
+        "id": "ea4b7172.c374",\r
          "type": "outcome",\r
          "name": "CreateSiteInstance",\r
          "xml": "<outcome value='CreateSiteInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1396.8101167678833,\r
-        "y": 1169.5655961036682,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1417.8101167678833,\r
+        "y": 1311.1370167732239,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "5de7412.21979c"\r
+                "84d19a5a.04aa1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b2ddc25f.3e0b8",\r
+        "id": "daa776c9.c4de78",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1363.714599609375,\r
-        "y": 1390.9434814453125,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1384.714599609375,\r
+        "y": 1532.5149021148682,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "6f20c596.7e459c"\r
+                "c4ca7fde.46e428"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c0072f79.b63d9",\r
+        "id": "ae139a1c.222e28",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1125.3337144851685,\r
-        "y": 1228.0863199234009,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1146.3337144851685,\r
+        "y": 1369.6577405929565,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "2f0de599.17bcda"\r
+                "b50b7762.c568b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5de7412.21979c",\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": 1773.333821296692,\r
-        "y": 1168.0863547325134,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1794.333821296692,\r
+        "y": 1309.657775402069,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "6f20c596.7e459c",\r
+        "id": "c4ca7fde.46e428",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1504.0001754760742,\r
-        "y": 1391.9999046325684,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1525.0001754760742,\r
+        "y": 1533.571325302124,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "6a0fb3f8.c9afac",\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": 1182.000228881836,\r
-        "y": 1593.9999623298645,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1203.000228881836,\r
+        "y": 1735.5713829994202,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "901892d5.11367",\r
-                "a18742c8.67f48",\r
-                "a17c5490.82e988",\r
-                "f32a2384.53396",\r
-                "74bbe07e.451bd",\r
-                "3b13f0b3.196eb"\r
+                "15b3024f.9d2b5e",\r
+                "3848ec5b.7575f4",\r
+                "fbaa1326.1081a",\r
+                "254cc1a6.5d0cc6",\r
+                "de41704e.e02f2",\r
+                "da1c7a96.50bc1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a18742c8.67f48",\r
+        "id": "3848ec5b.7575f4",\r
          "type": "outcome",\r
          "name": "DeleteSiteInstance",\r
          "xml": "<outcome value='DeleteSiteInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1422.476448059082,\r
-        "y": 1539.479206085205,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1443.476448059082,\r
+        "y": 1681.0506267547607,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "9c4097de.217dd8"\r
+                "3da95e89.3273f2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "901892d5.11367",\r
+        "id": "15b3024f.9d2b5e",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1387.381233215332,\r
-        "y": 1789.8574409484863,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1408.381233215332,\r
+        "y": 1931.428861618042,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "340c5320.cee92c"\r
+                "28393206.2f0986"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "19fd4172.e8d1ef",\r
+        "id": "8c3ce117.5fae2",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1121.000228881836,\r
-        "y": 1538.9999623298645,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1142.000228881836,\r
+        "y": 1680.5713829994202,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "6a0fb3f8.c9afac"\r
+                "d39a24a.5273558"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c4097de.217dd8",\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": 1795.0002517700195,\r
-        "y": 1536.99995803833,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1816.0002517700195,\r
+        "y": 1678.5713787078857,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "340c5320.cee92c",\r
+        "id": "28393206.2f0986",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1527.6668090820312,\r
-        "y": 1790.9138641357422,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1548.6668090820312,\r
+        "y": 1932.4852848052979,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "eea8d1d0.4bdc3",\r
+        "id": "3668cbba.d4faa4",\r
          "type": "outcome",\r
          "name": "ActivateSDWANDeviceInstance",\r
          "xml": "<outcome value='ActivateSDWANDeviceInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1406.6667556762695,\r
-        "y": 528.0000343322754,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1427.6667556762695,\r
+        "y": 669.571455001831,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "fb048089.7fb87"\r
+                "e597143.e5430e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fb048089.7fb87",\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": 1846.1904373168945,\r
-        "y": 526.5207862854004,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1867.1904373168945,\r
+        "y": 668.092206954956,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7c8e3f2d.ec40e",\r
+        "id": "f75942cd.e9cdb",\r
          "type": "outcome",\r
          "name": "DeactivateSDWANDeviceInstance",\r
          "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1457.666633605957,\r
-        "y": 869.9999890327454,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1478.666633605957,\r
+        "y": 1011.571409702301,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "51051061.26969"\r
+                "4ef6289e.5a069"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "51051061.26969",\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": 1914.190330505371,\r
-        "y": 869.520824432373,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1935.190330505371,\r
+        "y": 1011.0922451019287,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "20880f17.cecd7",\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": 1843.666633605957,\r
-        "y": 566.9999732971191,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1864.666633605957,\r
+        "y": 708.5713939666748,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "6d89db39.aedb84",\r
+        "id": "269f5d4e.8f57b2",\r
          "type": "outcome",\r
          "name": "ActivateSDWANPortInstance",\r
          "xml": "<outcome value='ActivateSDWANPortInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1400.142951965332,\r
-        "y": 574.479190826416,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1421.142951965332,\r
+        "y": 716.0506114959717,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "20880f17.cecd7"\r
+                "42a673d5.9dc9ec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1a7d8db.9a66c72",\r
+        "id": "b095d5a2.1abde",\r
          "type": "outcome",\r
          "name": "DeactivateSDWANPortInstance",\r
          "xml": "<outcome value='DeactivateSDWANPortInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1449.6666793823242,\r
-        "y": 908.3333044052124,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1470.6666793823242,\r
+        "y": 1049.904725074768,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "c842ed89.31c14"\r
+                "822cf96e.0d9b6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c842ed89.31c14",\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": 1924.190330505371,\r
-        "y": 924.854106426239,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1945.190330505371,\r
+        "y": 1066.4255270957947,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8d600b8a.4468d8",\r
+        "id": "f6ff4a70.3816",\r
          "type": "outcome",\r
          "name": "CreateSDWANPortInstance",\r
          "xml": "<outcome value='CreateSDWANPortInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1446.6670122146606,\r
-        "y": 1258.3334305286407,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1467.6670122146606,\r
+        "y": 1399.9048511981964,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "8825b47d.66bfb8"\r
+                "2cee7114.60daa6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8825b47d.66bfb8",\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": 1903.1906328201294,\r
-        "y": 1262.8542098999023,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1924.1906328201294,\r
+        "y": 1404.425630569458,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a17c5490.82e988",\r
+        "id": "fbaa1326.1081a",\r
          "type": "outcome",\r
          "name": "DeleteSDWANPortInstance",\r
          "xml": "<outcome value='DeleteSDWANPortInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1458.3334655761719,\r
-        "y": 1650.3333506584167,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1479.3334655761719,\r
+        "y": 1791.9047713279724,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "d1bea417.250ed8"\r
+                "3a81ef6f.a21e28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d1bea417.250ed8",\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": 1884.8571853637695,\r
-        "y": 1649.854206085205,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1905.8571853637695,\r
+        "y": 1791.4256267547607,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f32a2384.53396",\r
+        "id": "254cc1a6.5d0cc6",\r
          "type": "outcome",\r
          "name": "DeleteSDWANDeviceInstance",\r
          "xml": "<outcome value='DeleteSDWANDeviceInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1467.0316162109375,\r
-        "y": 1590.5312571525574,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1488.0316162109375,\r
+        "y": 1732.102677822113,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "4c613073.dc407"\r
+                "233ef390.f379c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4c613073.dc407",\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": 1899.5552215576172,\r
-        "y": 1590.0519704818726,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1920.5552215576172,\r
+        "y": 1731.6233911514282,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "44feac5a.bafec4",\r
+        "id": "6afcca50.5f66dc",\r
          "type": "outcome",\r
          "name": "CreateSDWANDeviceInstance",\r
          "xml": "<outcome value='CreateSDWANDeviceInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1462.031361579895,\r
-        "y": 1214.5313940048218,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1483.031361579895,\r
+        "y": 1356.1028146743774,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "4888fef.c349b"\r
+                "316c4260.73720e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4888fef.c349b",\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": 1918.555027961731,\r
-        "y": 1213.0522079467773,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1939.555027961731,\r
+        "y": 1354.623628616333,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "eaaed7a1.f78188",\r
+        "id": "816c27b8.77c4e8",\r
          "type": "outcome",\r
          "name": "ActivateSDWANVpnInstance",\r
          "xml": "<outcome value='ActivateSDWANVpnInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1404.2961502075195,\r
-        "y": 623.5770454406738,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1425.2961502075195,\r
+        "y": 765.1484661102295,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "67b5956.58f626c"\r
+                "8435974d.4fc658"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bbf1b1a0.c8198",\r
+        "id": "2047aafd.7f7996",\r
          "type": "outcome",\r
          "name": "ActivateSDWANSiteInstance",\r
          "xml": "<outcome value='ActivateSDWANSiteInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1408.2961502075195,\r
-        "y": 666.2434883117676,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1429.2961502075195,\r
+        "y": 807.8149089813232,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "67b5956.58f626c"\r
+                "8435974d.4fc658"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "67b5956.58f626c",\r
+        "id": "8435974d.4fc658",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1679.296142578125,\r
-        "y": 644.2435400485992,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1700.296142578125,\r
+        "y": 785.8149607181549,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "296eee7e.c34542"\r
+                "e4988e8c.796a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "296eee7e.c34542",\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": 2057.2959899902344,\r
-        "y": 641.5771992206573,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 2078.2959899902344,\r
+        "y": 783.148619890213,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8ee4bce.d47a94",\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": 2110.3332138061523,\r
-        "y": 980.3666734695435,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 2131.3332138061523,\r
+        "y": 1121.9380941390991,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7c5238f2.d394e8",\r
+        "id": "dde515a2.eea8c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1713.3333053588867,\r
-        "y": 982.0330181121826,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1734.3333053588867,\r
+        "y": 1123.6044387817383,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "8ee4bce.d47a94"\r
+                "f6f20244.8d9308"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1c4e2957.6aa337",\r
+        "id": "767ffc3.b041d84",\r
          "type": "outcome",\r
          "name": "DeactivateSDWANSiteInstance",\r
          "xml": "<outcome value='DeactivateSDWANSiteInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1455.3332901000977,\r
-        "y": 1004.0329828262329,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1476.3332901000977,\r
+        "y": 1145.6044034957886,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "7c5238f2.d394e8"\r
+                "dde515a2.eea8c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9378aa69.5e8c68",\r
+        "id": "5974d41f.5000ac",\r
          "type": "outcome",\r
          "name": "DeactivateSDWANVpnInstance",\r
          "xml": "<outcome value='DeactivateSDWANVpnInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1449.3332595825195,\r
-        "y": 961.3665351867676,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1470.3332595825195,\r
+        "y": 1102.9379558563232,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "7c5238f2.d394e8"\r
+                "dde515a2.eea8c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "75f7964e.785a28",\r
+        "id": "2f050ce4.d6732c",\r
          "type": "outcome",\r
          "name": "CreateSDWANVpnInstance",\r
          "xml": "<outcome value='CreateSDWANVpnInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1442.851692199707,\r
-        "y": 1313.0215034484863,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1463.851692199707,\r
+        "y": 1454.592924118042,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "d9bd0e30.34f56"\r
+                "740e2dc7.31c594"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "265de382.3a352c",\r
+        "id": "254873f2.91487c",\r
          "type": "outcome",\r
          "name": "CreateSDWANSiteInstance",\r
          "xml": "<outcome value='CreateSDWANSiteInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1434.8516693115234,\r
-        "y": 1354.687891960144,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1455.8516693115234,\r
+        "y": 1496.2593126296997,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "d9bd0e30.34f56"\r
+                "740e2dc7.31c594"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d9bd0e30.34f56",\r
+        "id": "740e2dc7.31c594",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1692.8516845703125,\r
-        "y": 1332.6879272460938,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1713.8516845703125,\r
+        "y": 1474.2593479156494,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "8de8e467.90b458"\r
+                "34a062a6.1dcf1e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8de8e467.90b458",\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": 2070.851531982422,\r
-        "y": 1330.0215864181519,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 2091.851531982422,\r
+        "y": 1471.5930070877075,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "74bbe07e.451bd",\r
+        "id": "de41704e.e02f2",\r
          "type": "outcome",\r
          "name": "DeleteSDWANVpnInstance",\r
          "xml": "<outcome value='DeleteSDWANVpnInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1449.333381652832,\r
-        "y": 1697.36665725708,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1470.333381652832,\r
+        "y": 1838.9380779266357,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "3c752813.4a8be8"\r
+                "129831e9.f87ede"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3b13f0b3.196eb",\r
+        "id": "da1c7a96.50bc1",\r
          "type": "outcome",\r
          "name": "DeleteSDWANSiteInstance",\r
          "xml": "<outcome value='DeleteSDWANSiteInstance'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1449.333381652832,\r
-        "y": 1738.0332221984863,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1470.333381652832,\r
+        "y": 1879.604642868042,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "3c752813.4a8be8"\r
+                "129831e9.f87ede"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3c752813.4a8be8",\r
+        "id": "129831e9.f87ede",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1699.3333740234375,\r
-        "y": 1717.0330810546875,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 1720.3333740234375,\r
+        "y": 1858.6045017242432,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "489ba469.b5b07c"\r
+                "229550df.5e154"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "489ba469.b5b07c",\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": 2077.333221435547,\r
-        "y": 1714.3667402267456,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 2098.333221435547,\r
+        "y": 1855.9381608963013,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "df2a6c25.b6e3a",\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": 1298.8888816833496,\r
-        "y": 292.7778091430664,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 2247.0318908691406,\r
+        "y": 361.4920959472656,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5b2c165f.6d5c88",\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": 1270.6984786987305,\r
-        "y": 359.98305320739746,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 2218.841583251953,\r
+        "y": 425.8401184082031,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a2f63855.285858",\r
+        "id": "2763f43e.b7f64c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1053.6666717529297,\r
-        "y": 328.5555648803711,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 2010.3811340332031,\r
+        "y": 364.4126281738281,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": [\r
              [\r
-                "df2a6c25.b6e3a",\r
-                "5b2c165f.6d5c88"\r
+                "48008d0.96b8a74",\r
+                "92f6b1eb.ca851",\r
+                "e91c2cf.91f4f5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f5ec8f1c.ba6fb",\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": 1474.4444885253906,\r
-        "y": 386.66668605804443,\r
-        "z": "3a695320.6f0b9c",\r
+        "x": 2431.158966064453,\r
+        "y": 466.8094787597656,\r
+        "z": "4a2a8d50.48649c",\r
          "wires": []\r
+    },\r
+    {\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": 1116.2857971191406,\r
+        "y": 211.28570556640625,\r
+        "z": "4a2a8d50.48649c",\r
+        "wires": [\r
+            [\r
+                "2a95a553.f75302",\r
+                "1a29396b.d78657"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2a95a553.f75302",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1341.2857971191406,\r
+        "y": 167.28570556640625,\r
+        "z": "4a2a8d50.48649c",\r
+        "wires": [\r
+            [\r
+                "9599639c.6064a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1a29396b.d78657",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1331.2857971191406,\r
+        "y": 259.28570556640625,\r
+        "z": "4a2a8d50.48649c",\r
+        "wires": [\r
+            [\r
+                "7685fc6a.1e8e84"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 1553.2857971191406,\r
+        "y": 260.28570556640625,\r
+        "z": "4a2a8d50.48649c",\r
+        "wires": [\r
+            [\r
+                "dcc6c506.1c2e3",\r
+                "f03182d7.544448"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 2017.2857971191406,\r
+        "y": 168.28570556640625,\r
+        "z": "4a2a8d50.48649c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "dcc6c506.1c2e3",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1793.2857971191406,\r
+        "y": 259.28570556640625,\r
+        "z": "4a2a8d50.48649c",\r
+        "wires": [\r
+            [\r
+                "9599639c.6064a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f03182d7.544448",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1801.2857971191406,\r
+        "y": 360.28570556640625,\r
+        "z": "4a2a8d50.48649c",\r
+        "wires": [\r
+            [\r
+                "2763f43e.b7f64c"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 1129.6622619628906,\r
+        "y": 101.54547119140625,\r
+        "z": "4a2a8d50.48649c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "f7b6e38.ff165a",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 938.7533264160156,\r
+        "y": 99.727294921875,\r
+        "z": "4a2a8d50.48649c",\r
+        "wires": [\r
+            [\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
  ]
 \ 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 dae4b9b..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
@@ -6,13 +6,34 @@
              <call module='GENERIC-RESOURCE-API' rpc='validate-vf-module-input' mode='sync' ></call>\r
              <switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\r
                  <outcome value='assign'>\r
-                    <block atomic="true">\r
-                        <set>\r
-                            <parameter name='skip-mdsal-update' value='Y' />\r
-                        </set>\r
-                        <set>\r
-                            <parameter name='ack-final' value='N' />\r
-                        </set>\r
+                    <block>\r
+                        <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
+                            <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
+                            <parameter name='contextPrefix' value='prop' />\r
+                        </execute>\r
+                        <switch test='`length($vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\r
+                            <outcome value='true'>\r
+                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-sync' mode='sync' ></call>\r
+                            </outcome>\r
+                            <outcome value='false'>\r
+                                <switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>\r
+                                    <outcome value='true'>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-sync' mode='sync' ></call>\r
+                                    </outcome>\r
+                                    <outcome value='false'>\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name='skip-mdsal-update' value='Y' />\r
+                                            </set>\r
+                                            <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
+                            </outcome>\r
+                        </switch>\r
                      </block>\r
                  </outcome>\r
                  <outcome value='unassign'>\r
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 ecee104..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
@@ -6,13 +6,34 @@
              <call module='GENERIC-RESOURCE-API' rpc='validate-vnf-input' mode='sync' ></call>\r
              <switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\r
                  <outcome value='assign'>\r
-                    <block atomic="true">\r
-                        <set>\r
-                            <parameter name='skip-mdsal-update' value='Y' />\r
-                        </set>\r
-                        <set>\r
-                            <parameter name='ack-final' value='N' />\r
-                        </set>\r
+                    <block>\r
+                        <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
+                            <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
+                            <parameter name='contextPrefix' value='prop' />\r
+                        </execute>\r
+                        <switch test='`length($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\r
+                            <outcome value='true'>\r
+                                <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-sync' mode='sync' ></call>\r
+                            </outcome>\r
+                            <outcome value='false'>\r
+                                <switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>\r
+                                    <outcome value='true'>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-sync' mode='sync' ></call>\r
+                                    </outcome>\r
+                                    <outcome value='false'>\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name='skip-mdsal-update' value='Y' />\r
+                                            </set>\r
+                                            <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
+                            </outcome>\r
+                        </switch>\r
                      </block>\r
                  </outcome>\r
                  <outcome value='activate'>\r
author	Timoney, Dan (dt5972) <dtimoney@att.com>
	Mon, 21 Oct 2019 14:17:28 +0000 (10:17 -0400)
committer	Timoney, Dan (dt5972) <dtimoney@att.com>
	Wed, 23 Oct 2019 12:30:32 +0000 (08:30 -0400)
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