Merge "SDWAN wan port activate DG"
authorDan Timoney <dtimoney@att.com>
Wed, 24 Apr 2019 13:44:39 +0000 (13:44 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 24 Apr 2019 13:44:39 +0000 (13:44 +0000)
13 files changed:
installation/ansible-server/src/main/Playbooks/ansible_huawei_upgrade@0.01.yml
platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json
platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.json
platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.json
platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json
platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.xml
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml

index 5140272..4ebe69f 100644 (file)
       ne_identifier: "{{neIdentifier}}"\r
     when: neIdentifier is defined\r
 \r
+  - name: support new parameter swToBeInstalled\r
+    set_fact:\r
+      sw_to_be_installed: "{{swToBeInstalled}}"\r
+    when: swToBeInstalled is defined\r
+\r
+  - name: check if swToBeInstalled is empty\r
+    fail:\r
+    when: swToBeInstalled is defined and sw_to_be_installed | length == 0\r
+\r
+  - name: support new parameter swVersionToBeActivated\r
+    set_fact:\r
+      sw_version_to_be_activated: "{{swVersionToBeActivated}}"\r
+    when: swVersionToBeActivated is defined\r
+\r
   - name: execute downloadNESw operation\r
-    shell: ./swm/downloadNESw.sh --swToBeDownloaded {{sw_to_be_downloaded}} --neIdentifier {{ne_identifier}}\r
+    shell: ./swm/downloadNESw --swToBeDownloaded {{sw_to_be_downloaded}} --neIdentifier {{ne_identifier}}\r
     register: download_result\r
 \r
   - name: parse response of downloadNESw\r
     set_fact:\r
       download_response: "{{ download_result.stdout | from_json }}"\r
+    when: swToBeInstalled is not defined\r
 \r
   - name: fetch file of Notification notifyDownloadNESwStatusChanged\r
     fetch:\r
-      dest: /tmp/\r
-      src: /tmp/notifyDownloadNESwStatusChanged-{{download_response.downloadProcessId}}\r
+      dest: "{{inventory_dir}}"\r
+      src: "/tmp/notifyDownloadNESwStatusChanged-{{download_response.downloadProcessId}}"\r
+    when: swToBeInstalled is not defined\r
 \r
   - name: read contents of Notification notifyDownloadNESwStatusChanged\r
     set_fact:\r
-      download_notification: "{{ lookup('file', '/tmp/{{inventory_hostname}}/tmp/notifyDownloadNESwStatusChanged-{{download_response.downloadProcessId}}') | from_json }}"\r
+      download_notification: "{{ lookup('file', '{{inventory_dir}}/{{inventory_hostname}}/tmp/notifyDownloadNESwStatusChanged-{{download_response.downloadProcessId}}') | from_json }}"\r
+    when: swToBeInstalled is not defined\r
 \r
   - name: delete file of Notification notifyDownloadNESwStatusChanged\r
-    local_action: file path="/tmp/{{inventory_hostname}}/tmp/notifyDownloadNESwStatusChanged-{{download_response.downloadProcessId}}" state=absent\r
+    local_action: file path="{{inventory_dir}}/{{inventory_hostname}}/tmp/notifyDownloadNESwStatusChanged-{{download_response.downloadProcessId}}" state=absent\r
+    when: swToBeInstalled is not defined\r
+\r
+  - name: set downloadedNESwInfo\r
+    set_fact:\r
+      downloaded_ne_sw_info: "{{ download_notification.downloadedNESwInfo }}"\r
+    when: swToBeInstalled is not defined\r
 \r
   - name: execute installNESw operation\r
-    shell: ./swm/installNESw.sh --swToBeInstalled {{item}} --neIdentifier {{ne_identifier}}\r
+    shell: ./swm/installNESw --swToBeInstalled {{item}} --neIdentifier {{ne_identifier}}\r
     register: install_result\r
-    with_items: "{{ download_notification.downloadedNESwInfo }}"\r
+    with_items: "{{ downloaded_ne_sw_info | default([]) }}"\r
+\r
+  - name: execute installNESw operation using new parameter\r
+    shell: ./swm/installNESw --swToBeInstalled {{item}} --neIdentifier {{ne_identifier}}\r
+    register: install_result_new\r
+    with_items: "{{ sw_to_be_installed | default([]) }}"\r
+\r
+  - name: unify install result\r
+    set_fact:\r
+      install_result: "{{ install_result_new }}"\r
+    when: swToBeInstalled is defined\r
+\r
+  - name: set install results list\r
+    set_fact:\r
+      install_results_list: "{{ install_result.results }}"\r
+    when: swVersionToBeActivated is not defined\r
 \r
   - name: parse responses of all the installNESws\r
     set_fact:\r
       install_responses: "{{ install_responses | default([]) + [item.stdout | from_json] }}"\r
-    with_items: "{{ install_result.results }}"\r
+    with_items: "{{ install_results_list | default([]) }}"\r
 \r
   - name: fetch files of all the Notifications notifyInstallNESwStatusChanged\r
     fetch:\r
-      dest: /tmp/\r
-      src: /tmp/notifyInstallNESwStatusChanged-{{item.installProcessId}}\r
-    with_items: "{{ install_responses }}"\r
+      dest: "{{inventory_dir}}"\r
+      src: "/tmp/notifyInstallNESwStatusChanged-{{item.installProcessId}}"\r
+    with_items: "{{ install_responses | default([]) }}"\r
 \r
   - name: read contents of all the Notifications notifyInstallNESwStatusChanged\r
     set_fact:\r
-      install_notifications: "{{ install_notifications | default([]) + [lookup('file', '/tmp/{{inventory_hostname}}/tmp/notifyInstallNESwStatusChanged-{{item.installProcessId}}') | from_json] }}"\r
-    with_items: "{{ install_responses }}"\r
+      install_notifications: "{{ install_notifications | default([]) + [lookup('file', '{{inventory_dir}}/{{inventory_hostname}}/tmp/notifyInstallNESwStatusChanged-{{item.installProcessId}}') | from_json] }}"\r
+    with_items: "{{ install_responses | default([]) }}"\r
 \r
   - name: delete files of all the Notifications notifyInstallNESwStatusChanged\r
-    local_action: file path="/tmp/{{inventory_hostname}}/tmp/notifyInstallNESwStatusChanged-{{item.installProcessId}}" state=absent\r
-    with_items: "{{ install_responses }}"\r
+    local_action: file path="{{inventory_dir}}/{{inventory_hostname}}/tmp/notifyInstallNESwStatusChanged-{{item.installProcessId}}" state=absent\r
+    with_items: "{{ install_responses | default([]) }}"\r
 \r
   - name: parse all the installed NE SW info\r
     set_fact:\r
       installed_ne_sw_info: "{{ installed_ne_sw_info | default([]) + item.installedNESwInfo }}"\r
-    with_items: "{{ install_notifications }}"\r
+    with_items: "{{ install_notifications | default([]) }}"\r
 \r
   - name: execute activateNESw operation\r
-    shell: ./swm/activateNESw.sh --swVersionToBeActivated {{item}} --neIdentifier {{ne_identifier}}\r
+    shell: ./swm/activateNESw --swVersionToBeActivated {{item}} --neIdentifier {{ne_identifier}}\r
     register: activate_result\r
-    with_items: "{{ installed_ne_sw_info }}"\r
+    with_items: "{{ installed_ne_sw_info | default([]) }}"\r
+\r
+  - name: execute activateNESw operation using new parameter\r
+    shell: ./swm/activateNESw --swVersionToBeActivated {{sw_version_to_be_activated}} --neIdentifier {{ne_identifier}}\r
+    register: activate_result_new\r
+    when: swVersionToBeActivated is defined\r
+\r
+  - name: unify activate result\r
+    set_fact:\r
+      activate_result: "{{ activate_result_new }}"\r
+    when: swVersionToBeActivated is defined\r
 \r
index 138d31f..861a58a 100644 (file)
@@ -1,38 +1,38 @@
 [\r
     {\r
-        "id": "cea6a9f1.279478",\r
+        "id": "d9c4f19e.fd2e7",\r
         "type": "switchNode",\r
         "name": "switch vf-modules.vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 570.7143020629883,\r
-        "y": 337.99999046325684,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 672.25390625,\r
+        "y": 347.99999046325684,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "4a89ecf7.049034",\r
-                "2a09fa32.63fc36",\r
-                "c2f1098d.e8bd38"\r
+                "cef58dbf.65cb",\r
+                "2919e925.39dec6",\r
+                "e1d6ced2.e1fdf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1833f3f4.1b830c",\r
+        "id": "f7e66a22.01e028",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 107.71429824829102,\r
-        "y": 29,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 209.25390243530273,\r
+        "y": 39,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "181dc2fc.e539bd"\r
+                "c86c7fcc.d57a3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "181dc2fc.e539bd",\r
+        "id": "c86c7fcc.d57a3",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 177,\r
-        "y": 92.23810958862305,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 278.5396041870117,\r
+        "y": 102.23810958862305,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "25791551.06845a"\r
+                "8a66936c.4ecc5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25791551.06845a",\r
+        "id": "8a66936c.4ecc5",\r
         "type": "method",\r
         "name": "method sdwan-vf-operation-lanport-activate",\r
         "xml": "<method rpc='sdwan-vf-operation-lanport-activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 188.71429443359375,\r
-        "y": 186.58634185791016,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 290.25389862060547,\r
+        "y": 196.58634185791016,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "419d7afa.b1ca54"\r
+                "b4cb95ed.cde538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "419d7afa.b1ca54",\r
+        "id": "b4cb95ed.cde538",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 189.38096618652344,\r
-        "y": 442.666708946228,\r
-        "z": "2f0cf160.dc107e",\r
-        "wires": [\r
-            [\r
-                "f5110085.4f487",\r
-                "f62e0d25.9e73c",\r
-                "cea6a9f1.279478",\r
-                "76df47d2.f28eb8",\r
-                "3a550152.acb95e",\r
-                "bad651b2.12a17",\r
-                "a66a0a0e.fef0c8",\r
-                "f2a2fd31.6afea",\r
-                "11a6133a.d1ed1d",\r
-                "6bb3e148.a2b06",\r
-                "233d7734.c6ad18",\r
-                "ec89c38e.b0db3",\r
-                "cfe4c928.772628",\r
-                "307480f2.c3f12",\r
-                "83adcbda.9cab18",\r
-                "41a8aff.133475",\r
-                "bf4ca0a0.f719b",\r
-                "14cdbea6.6ff3c1",\r
-                "96f47da7.f3275",\r
-                "7299f238.fa9f1c",\r
-                "e4f03070.b443a",\r
-                "1e3434c6.db511b",\r
-                "56401cb0.1f0164"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "f62e0d25.9e73c",\r
+        "x": 290.92057037353516,\r
+        "y": 452.666708946228,\r
+        "z": "d0c9a483.09f7c8",\r
+        "wires": [\r
+            [\r
+                "f3bcc30.03c554",\r
+                "ac79d525.fd1fd8",\r
+                "d9c4f19e.fd2e7",\r
+                "1bfdbcc3.c7cd93",\r
+                "6e8941e2.a043c",\r
+                "901afcf1.d22f3",\r
+                "ef04791b.55e268",\r
+                "8364ef5f.25f26",\r
+                "6278217c.89959",\r
+                "760751d.6fd76b",\r
+                "cd4a9b23.d614c8",\r
+                "44113153.ffa83",\r
+                "b05dede5.e0278",\r
+                "45f5fb20.78ea64",\r
+                "b07fc696.74dd68",\r
+                "8fa1111d.08c36",\r
+                "a897b863.5cfc78",\r
+                "9bf6789f.a0ec08",\r
+                "537766b1.131458",\r
+                "8ffe71d6.e37e5",\r
+                "b5fcdf55.56396",\r
+                "695214fd.2c4fdc",\r
+                "188a2b9c.34d5e4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ac79d525.fd1fd8",\r
         "type": "for",\r
         "name": "for each vnf",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 520.7456588745117,\r
-        "y": 266.2691411972046,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 622.2852630615234,\r
+        "y": 276.2691411972046,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "b7bf67d0.4c13b8"\r
+                "8d9e53be.f0301"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5110085.4f487",\r
+        "id": "f3bcc30.03c554",\r
         "type": "switchNode",\r
         "name": "switch vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 525.7143135070801,\r
-        "y": 205.00001049041748,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 627.2539176940918,\r
+        "y": 215.00001049041748,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "61a8d0c5.ce10b"\r
+                "193a9775.d88519"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61a8d0c5.ce10b",\r
+        "id": "193a9775.d88519",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 705.7142944335938,\r
-        "y": 204,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 807.2538986206055,\r
+        "y": 214,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "3e167156.21c02e"\r
+                "4b9a0abb.eb1bb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e167156.21c02e",\r
+        "id": "4b9a0abb.eb1bb4",\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.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 855.1430206298828,\r
-        "y": 205.14291763305664,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 956.6826248168945,\r
+        "y": 215.14291763305664,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b7bf67d0.4c13b8",\r
+        "id": "8d9e53be.f0301",\r
         "type": "switchNode",\r
         "name": "switch this vnf-id == input vnf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 743.7143096923828,\r
-        "y": 267.00000619888306,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 845.2539138793945,\r
+        "y": 277.00000619888306,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "29696342.56f90c"\r
+                "835ec48b.329e88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29696342.56f90c",\r
+        "id": "835ec48b.329e88",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 958.7142944335938,\r
-        "y": 265,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1060.2538986206055,\r
+        "y": 275,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "1ba7830b.c7ea6d"\r
+                "38760c6e.34c224"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1ba7830b.c7ea6d",\r
+        "id": "38760c6e.34c224",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1122.7142944335938,\r
-        "y": 260,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1224.2538986206055,\r
+        "y": 270,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2a09fa32.63fc36",\r
+        "id": "2919e925.39dec6",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 792.7142944335938,\r
-        "y": 372,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 894.2538986206055,\r
+        "y": 382,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "4ead305d.0b806"\r
+                "4642ed44.17b144"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a89ecf7.049034",\r
+        "id": "cef58dbf.65cb",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 797.7142906188965,\r
-        "y": 318.9999990463257,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 899.2538948059082,\r
+        "y": 328.9999990463257,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "4ead305d.0b806"\r
+                "4642ed44.17b144"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ead305d.0b806",\r
+        "id": "4642ed44.17b144",\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.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 955.7142944335938,\r
-        "y": 332,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1057.2538986206055,\r
+        "y": 342,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c2f1098d.e8bd38",\r
+        "id": "e1d6ced2.e1fdf",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 792.7142944335938,\r
-        "y": 433,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 894.2538986206055,\r
+        "y": 443,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "2458c219.d10e1e"\r
+                "1bffa38f.f0c50c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ead36ccd.33529",\r
+        "id": "3daf6135.38733e",\r
         "type": "set",\r
         "name": "set vf-module_length",\r
         "xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",\r
         "comments": "",\r
-        "x": 1146.7143096923828,\r
-        "y": 431.0000139474869,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1248.2539138793945,\r
+        "y": 441.0000139474869,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2458c219.d10e1e",\r
+        "id": "1bffa38f.f0c50c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 953.7143402099609,\r
-        "y": 429.99999141693115,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1055.2539443969727,\r
+        "y": 439.99999141693115,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "ead36ccd.33529",\r
-                "386f97ee.904d48"\r
+                "3daf6135.38733e",\r
+                "ef25b392.fb9e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "386f97ee.904d48",\r
+        "id": "ef25b392.fb9e5",\r
         "type": "for",\r
         "name": "for each existing vf-index",\r
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1165.7142791748047,\r
-        "y": 483.99999046325684,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1267.2538833618164,\r
+        "y": 493.99999046325684,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "593c39.dc7673c8"\r
+                "a5aa4ea3.3a9f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "593c39.dc7673c8",\r
+        "id": "a5aa4ea3.3a9f8",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1408.7142944335938,\r
-        "y": 479,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1510.2538986206055,\r
+        "y": 489,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "1efda74.b0eb959"\r
+                "291f40c7.f811f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1efda74.b0eb959",\r
+        "id": "291f40c7.f811f",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1606.7143230438232,\r
-        "y": 466.0000066757202,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1708.253927230835,\r
+        "y": 476.0000066757202,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "d0b5f3a2.35747"\r
+                "62bd116.37066f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0b5f3a2.35747",\r
+        "id": "62bd116.37066f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1758.7142944335938,\r
-        "y": 468,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1860.2538986206055,\r
+        "y": 478,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "1fc6559e.18634a",\r
-                "802dea9f.3c2848",\r
-                "9329a8cc.23d418"\r
+                "fceeafa7.b7652",\r
+                "767f5d19.fe3e84",\r
+                "f1e44e3e.f0b3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1fc6559e.18634a",\r
+        "id": "fceeafa7.b7652",\r
         "type": "set",\r
         "name": "set tmp.vidx and ctx.vnf-data",\r
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",\r
         "comments": "",\r
-        "x": 1986.7144088745117,\r
-        "y": 410.00000381469727,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2088.2540130615234,\r
+        "y": 420.00000381469727,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "802dea9f.3c2848",\r
+        "id": "767f5d19.fe3e84",\r
         "type": "set",\r
         "name": "set vf-module-request-input.",\r
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",\r
         "comments": "",\r
-        "x": 1990.7144088745117,\r
-        "y": 464.00000381469727,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2092.2540130615234,\r
+        "y": 474.00000381469727,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "76df47d2.f28eb8",\r
+        "id": "1bfdbcc3.c7cd93",\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": 504.714412689209,\r
-        "y": 2079.501151561737,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 606.2540168762207,\r
+        "y": 2089.501151561737,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9329a8cc.23d418",\r
+        "id": "f1e44e3e.f0b3c",\r
         "type": "call",\r
         "name": "call sdwan-get-vf-module-lanport-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2021.16943359375,\r
-        "y": 515.0104961395264,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2122.7090377807617,\r
+        "y": 525.0104961395264,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b2d390ae.97474",\r
+        "id": "aa0d1480.7f1978",\r
         "type": "for",\r
         "name": "for vf-modules.vf-module_length",\r
         "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 827.9683685302734,\r
-        "y": 520.0040225982666,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1379.5080871582031,\r
+        "y": 553.0040807723999,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "7dff73e1.0243cc"\r
+                "9ed7ce57.d6ce"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f6c843d.edec8c",\r
+        "id": "1f605289.f2eb7d",\r
         "type": "switchNode",\r
         "name": "switch this deviceName == vf-input",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == '$prop.lan.deviceName'`\">\n    \n",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == $prop.lan.deviceName`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1100.9686126708984,\r
-        "y": 606.0041282176971,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1450.50830078125,\r
+        "y": 626.0042104721069,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "cb455713.e1bdd8"\r
+                "b123da61.76e8a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7dff73e1.0243cc",\r
+        "id": "9ed7ce57.d6ce",\r
         "type": "for",\r
         "name": "for vf-module-input-param length",\r
         "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1125.9682846069336,\r
-        "y": 523.0040645599365,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1665.5079345703125,\r
+        "y": 555.0041646957397,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "3f6c843d.edec8c"\r
+                "f599447.9ac3fb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb455713.e1bdd8",\r
+        "id": "b123da61.76e8a8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1314.9684257507324,\r
-        "y": 603.0041129589081,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1670.5080242156982,\r
+        "y": 627.0042181015015,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "8c1ad275.b541"\r
+                "2d7f5405.e9306c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c1ad275.b541",\r
+        "id": "2d7f5405.e9306c",\r
         "type": "for",\r
         "name": "for vf-modules.vf-module_length",\r
         "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1528.9684677124023,\r
-        "y": 599.0040664672852,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1915.5081024169922,\r
+        "y": 627.0041356086731,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "6aaf6a5c.76e9f4"\r
+                "faceb28.d0a9d5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6aaf6a5c.76e9f4",\r
+        "id": "faceb28.d0a9d5",\r
         "type": "switchNode",\r
         "name": "switch deviceId == input vf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'deviceId'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1843.9685440063477,\r
-        "y": 598.0040471553802,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2223.5083770751953,\r
+        "y": 610.0041036605835,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "85841cc6.de2b3"\r
+                "ec659d9d.8002"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "85841cc6.de2b3",\r
+        "id": "ec659d9d.8002",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2045.9686737060547,\r
-        "y": 596.0040481090546,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2432.508415222168,\r
+        "y": 612.004096031189,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "1722d3f0.fc82dc"\r
+                "73ebf520.d1f88c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1722d3f0.fc82dc",\r
+        "id": "73ebf520.d1f88c",\r
         "type": "set",\r
         "name": "set prop.lan.deviceId",\r
         "xml": "<set>\n<parameter name='prop.lan.deviceId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
         "comments": "",\r
-        "x": 2220.9685668945312,\r
-        "y": 596.004228591919,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2609.5083808898926,\r
+        "y": 608.0042867660522,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3a550152.acb95e",\r
+        "id": "6e8941e2.a043c",\r
         "type": "for",\r
         "name": "for service-data.vnfs.vnf_length",\r
         "xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 573.9682159423828,\r
-        "y": 455.00401973724365,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 633.5078125,\r
+        "y": 420.00404262542725,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "b2d390ae.97474"\r
+                "5c633f8a.ecb75"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "566234f6.d57f8c",\r
+        "id": "415f5cb9.3a6e44",\r
         "type": "switchNode",\r
         "name": "switch ActivateSDWANSiteInstance",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1168.7185821533203,\r
-        "y": 727.0039882659912,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1270.258186340332,\r
+        "y": 737.0039882659912,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "d08758a.8a9d4a8"\r
+                "55fab2c0.18755c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a6e0872.754c78",\r
+        "id": "ba32492c.0e54c8",\r
         "type": "for",\r
         "name": "for vf-modules.vf-module_length",\r
         "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 814.7184219360352,\r
-        "y": 694.0040283203125,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 916.2580261230469,\r
+        "y": 704.0040283203125,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "2141a4d0.4ed0ac"\r
+                "bd374d2.a7cdcb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83adcbda.9cab18",\r
+        "id": "b07fc696.74dd68",\r
         "type": "for",\r
         "name": "for service-data.vnfs.vnf_length",\r
         "xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 565.7182769775391,\r
-        "y": 625.0039081573486,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 667.2578811645508,\r
+        "y": 635.0039081573486,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "4a6e0872.754c78"\r
+                "ba32492c.0e54c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d08758a.8a9d4a8",\r
+        "id": "55fab2c0.18755c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1390.7184982299805,\r
-        "y": 727.0040698051453,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1492.2581024169922,\r
+        "y": 737.0040698051453,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "5c9349a5.10cdf8"\r
+                "2d0cb991.e67216"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c9349a5.10cdf8",\r
+        "id": "2d0cb991.e67216",\r
         "type": "for",\r
         "name": "for vf-modules.vf-module_length",\r
         "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1471.968505859375,\r
-        "y": 801.5040712356567,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1573.5081100463867,\r
+        "y": 811.5040712356567,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "78c531f9.c452d"\r
+                "f98893a0.de7a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "78502254.1e1d1c",\r
+        "id": "39ba7083.5ed54",\r
         "type": "switchNode",\r
         "name": "switch siteId",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'siteId'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1854.968864440918,\r
-        "y": 808.5041785240173,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1956.5084686279297,\r
+        "y": 818.5041785240173,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "cef8d9d4.a847d8"\r
+                "36c8a445.c6055c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cef8d9d4.a847d8",\r
+        "id": "36c8a445.c6055c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2031.9688835144043,\r
-        "y": 811.5040187835693,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2133.508487701416,\r
+        "y": 821.5040187835693,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "57774070.165c4"\r
+                "cb17586e.80dbb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26765522.97752a",\r
+        "id": "cafa7b8b.465778",\r
         "type": "set",\r
         "name": "set prop.attach.siteId",\r
         "xml": "<set>\n<parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
         "comments": "",\r
-        "x": 2415.9693908691406,\r
-        "y": 785.5040702819824,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2517.5089950561523,\r
+        "y": 795.5040702819824,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "57774070.165c4",\r
+        "id": "cb17586e.80dbb8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2191.2190742492676,\r
-        "y": 807.0040588378906,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2292.7586784362793,\r
+        "y": 817.0040588378906,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "26765522.97752a",\r
-                "18aa70c2.f51f1f",\r
-                "95fdece9.83f56",\r
-                "13d1a87e.cc7dd8"\r
+                "cafa7b8b.465778",\r
+                "9412ef29.cc029",\r
+                "4b9ca75a.7fc698",\r
+                "2f9763b5.4e87fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41a8aff.133475",\r
+        "id": "8fa1111d.08c36",\r
         "type": "get-resource",\r
         "name": "get-resource esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 526.7182235717773,\r
-        "y": 944.5039968490601,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 628.2578277587891,\r
+        "y": 954.5039968490601,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "9e1e759b.490ef8",\r
-                "587c1d85.98e364",\r
-                "1fecffb3.fdfc1"\r
+                "4a5d401e.8bf8e",\r
+                "1ff4f9b4.f19fb6",\r
+                "8afdb3bf.1d43d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9e1e759b.490ef8",\r
+        "id": "4a5d401e.8bf8e",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 770.7182846069336,\r
-        "y": 908.5039968490601,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 872.2578887939453,\r
+        "y": 918.5039968490601,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "1eeec00d.ea37e"\r
+                "ec14c17f.6e2c1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "587c1d85.98e364",\r
+        "id": "1ff4f9b4.f19fb6",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 773.2091674804688,\r
-        "y": 944.0780334472656,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 874.7487716674805,\r
+        "y": 954.0780334472656,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "f1f9240f.1bbe98"\r
+                "7501ffb3.13588"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1fecffb3.fdfc1",\r
+        "id": "8afdb3bf.1d43d",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 768.5421752929688,\r
-        "y": 980.4113922119141,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 870.0817794799805,\r
+        "y": 990.4113922119141,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "e9937b5c.1de1c8"\r
+                "26b83768.3bb758"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9937b5c.1de1c8",\r
+        "id": "26b83768.3bb758",\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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 922.3146667480469,\r
-        "y": 977.8504791259766,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1023.8542709350586,\r
+        "y": 987.8504791259766,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f1f9240f.1bbe98",\r
+        "id": "7501ffb3.13588",\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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 918.7805633544922,\r
-        "y": 942.3637208938599,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1020.3201675415039,\r
+        "y": 952.3637208938599,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1eeec00d.ea37e",\r
+        "id": "ec14c17f.6e2c1",\r
         "type": "set",\r
         "name": "set controller data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",\r
         "comments": "",\r
-        "x": 931.2183952331543,\r
-        "y": 906.5039367675781,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1032.757999420166,\r
+        "y": 916.5039367675781,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bf4ca0a0.f719b",\r
+        "id": "a897b863.5cfc78",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Get token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 540.6564559936523,\r
-        "y": 1047.62509059906,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 642.1960601806641,\r
+        "y": 1057.62509059906,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "d05110e4.15f05",\r
-                "623a881a.ebe538"\r
+                "b99d5bfa.8263b8",\r
+                "3b97c655.fec2fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d05110e4.15f05",\r
+        "id": "b99d5bfa.8263b8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 775.6565818786621,\r
-        "y": 1033.6250791549683,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 877.1961860656738,\r
+        "y": 1043.6250791549683,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "adf2584e.694ce8"\r
+                "da99c661.cc9138"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "623a881a.ebe538",\r
+        "id": "3b97c655.fec2fa",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 774.9065818786621,\r
-        "y": 1069.2679862976074,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 876.4461860656738,\r
+        "y": 1079.2679862976074,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "e8c30ab5.68d3b8"\r
+                "d1dde0a7.dc9a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8c30ab5.68d3b8",\r
+        "id": "d1dde0a7.dc9a2",\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=\"Error executing get token rest api\" />\n",\r
         "comments": "",\r
-        "x": 923.6565895080566,\r
-        "y": 1070.0180683135986,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1025.1961936950684,\r
+        "y": 1080.0180683135986,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "adf2584e.694ce8",\r
+        "id": "da99c661.cc9138",\r
         "type": "set",\r
         "name": "set token-id",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",\r
         "comments": "",\r
-        "x": 917.6565895080566,\r
-        "y": 1032.6250801086426,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1019.1961936950684,\r
+        "y": 1042.6250801086426,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "96f47da7.f3275",\r
+        "id": "537766b1.131458",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode device port create",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"portResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 566.7455520629883,\r
-        "y": 1199.0782289505005,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 668.28515625,\r
+        "y": 1209.0782289505005,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "50af67d.1491698",\r
-                "bef4965a.55b458"\r
+                "8649541f.c916f8",\r
+                "490b0339.21ab4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50af67d.1491698",\r
+        "id": "8649541f.c916f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 815.7456111907959,\r
-        "y": 1213.0784349441528,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 917.2852153778076,\r
+        "y": 1223.0784349441528,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "b4a513b9.d44d6"\r
+                "53d53343.edd9cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bef4965a.55b458",\r
+        "id": "490b0339.21ab4c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 815.7456111907959,\r
-        "y": 1175.0782704353333,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 917.2852153778076,\r
+        "y": 1185.0782704353333,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "d695c8db.015488"\r
+                "bb7e9ee8.bdde5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d695c8db.015488",\r
+        "id": "bb7e9ee8.bdde5",\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=\"Error executing Create device port rest api\" />\n",\r
         "comments": "",\r
-        "x": 959.7459449768066,\r
-        "y": 1174.078269958496,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1061.2855491638184,\r
+        "y": 1184.078269958496,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b4a513b9.d44d6",\r
+        "id": "53d53343.edd9cc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 962.7456226348877,\r
-        "y": 1214.0782737731934,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1064.2852268218994,\r
+        "y": 1224.0782737731934,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bad651b2.12a17",\r
+        "id": "901afcf1.d22f3",\r
         "type": "set",\r
         "name": "set prop.lan.devicePortId",\r
         "xml": "<set>\n<parameter name='prop.lan.devicePortId' value='`$portResp.success[0].id`' />\n",\r
         "comments": "",\r
-        "x": 509.4028129577637,\r
-        "y": 1252.1794338226318,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 610.9424171447754,\r
+        "y": 1262.1794338226318,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1d5fca27.3bbea6",\r
+        "id": "44729f10.35f05",\r
         "type": "comment",\r
         "name": "Create port",\r
         "info": "",\r
         "comments": "",\r
-        "x": 468.41149139404297,\r
-        "y": 1165.522253036499,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 569.9510955810547,\r
+        "y": 1175.522253036499,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "14cdbea6.6ff3c1",\r
+        "id": "9bf6789f.a0ec08",\r
         "type": "call",\r
         "name": "call sdwan-get-tenant-auth",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 515.411491394043,\r
-        "y": 1114.1886892318726,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 616.9510955810547,\r
+        "y": 1124.1886892318726,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f52cabac.abeb68",\r
+        "id": "eeb61a62.766e08",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode bridge domain create",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-bridge-domain.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/bridge-domains'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"bridgeDomainResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 989.3958015441895,\r
-        "y": 1294.188857793808,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1090.9354057312012,\r
+        "y": 1304.188857793808,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "441eed4c.baf224",\r
-                "fa3f1c96.1fc6d"\r
+                "925721ce.9c9c3",\r
+                "4887b469.84db6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "441eed4c.baf224",\r
+        "id": "925721ce.9c9c3",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1310.3958282470703,\r
-        "y": 1311.1891782283783,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1411.935432434082,\r
+        "y": 1321.1891782283783,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "a63cb83c.98c9e8"\r
+                "ae68593e.8ba108"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa3f1c96.1fc6d",\r
+        "id": "4887b469.84db6c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1313.3958549499512,\r
-        "y": 1276.1889598369598,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1414.935459136963,\r
+        "y": 1286.1889598369598,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "421c7bf9.398d94"\r
+                "79f2f146.ca204"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "421c7bf9.398d94",\r
+        "id": "79f2f146.ca204",\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=\"Error executing Create bridge domain rest api\" />\n",\r
         "comments": "",\r
-        "x": 1516.3962440490723,\r
-        "y": 1272.1890671253204,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1617.935848236084,\r
+        "y": 1282.1890671253204,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a63cb83c.98c9e8",\r
+        "id": "ae68593e.8ba108",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1517.395809173584,\r
-        "y": 1307.1889336109161,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1618.9354133605957,\r
+        "y": 1317.1889336109161,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7044fc7.42f8204",\r
+        "id": "ccce6236.dc74f",\r
         "type": "comment",\r
         "name": "Create bridge domain",\r
         "info": "",\r
         "comments": "",\r
-        "x": 933.061695098877,\r
-        "y": 1260.6330835819244,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1034.6012992858887,\r
+        "y": 1270.6330835819244,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a66a0a0e.fef0c8",\r
+        "id": "ef04791b.55e268",\r
         "type": "switchNode",\r
         "name": "switch portSwitch",\r
         "xml": "<switch test=\"`$prop.lan.portSwitch == 'layer2-port'`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 489.17326736450195,\r
-        "y": 1295.855489730835,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 590.7128715515137,\r
+        "y": 1305.855489730835,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "cc6612da.43a9"\r
+                "c3342bc2.390e38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc6612da.43a9",\r
+        "id": "c3342bc2.390e38",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 668.1732978820801,\r
-        "y": 1295.966812133789,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 769.7129020690918,\r
+        "y": 1305.966812133789,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "f52cabac.abeb68"\r
+                "eeb61a62.766e08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f2a2fd31.6afea",\r
+        "id": "8364ef5f.25f26",\r
         "type": "execute",\r
         "name": "execute split ip and mask",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.lan.ipAddress`'/>\n<parameter name=\"regex\" value=\"/\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"ipandMask\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 513.71826171875,\r
-        "y": 1395.7540397644043,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 615.2578659057617,\r
+        "y": 1405.7540397644043,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "c87ddd20.90349",\r
-                "aaf35528.c457d8"\r
+                "760fe778.7861c8",\r
+                "4e9c561e.4ac8b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aaf35528.c457d8",\r
+        "id": "4e9c561e.4ac8b8",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 714.7182807922363,\r
-        "y": 1373.7540311813354,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 816.257884979248,\r
+        "y": 1383.7540311813354,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "f3c46122.a1ec5"\r
+                "3c0ad409.f6e78c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c87ddd20.90349",\r
+        "id": "760fe778.7861c8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 714.7182846069336,\r
-        "y": 1414.7540349960327,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 816.2578887939453,\r
+        "y": 1424.7540349960327,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "3701541a.3aea9c"\r
+                "af9e51cb.86f12"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f3c46122.a1ec5",\r
+        "id": "3c0ad409.f6e78c",\r
         "type": "set",\r
         "name": "set ipAddress prefixLength",\r
         "xml": "<set>\n<parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />",\r
         "comments": "",\r
-        "x": 911.7182998657227,\r
-        "y": 1371.7540311813354,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1013.2579040527344,\r
+        "y": 1381.7540311813354,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3701541a.3aea9c",\r
+        "id": "af9e51cb.86f12",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 869.7182922363281,\r
-        "y": 1411.7540340423584,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 971.2578964233398,\r
+        "y": 1421.7540340423584,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6cdf4550.c744bc",\r
+        "id": "a9e3f075.4494b",\r
         "type": "comment",\r
         "name": "Create wan port",\r
         "info": "",\r
         "comments": "",\r
-        "x": 486.7281379699707,\r
-        "y": 1348.7640895843506,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 588.2677421569824,\r
+        "y": 1358.7640895843506,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2701cb4.59cff34",\r
+        "id": "cd240d96.e63a6",\r
         "type": "comment",\r
         "name": "TODO: split ip/mask",\r
         "info": "",\r
         "comments": "",\r
-        "x": 910.7279319763184,\r
-        "y": 1333.9343032836914,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1012.2675361633301,\r
+        "y": 1343.9343032836914,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7299f238.fa9f1c",\r
+        "id": "8ffe71d6.e37e5",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode IPSubnets create",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-ip-subnets.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/ip-subnets'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"lanPortResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 572.489631652832,\r
-        "y": 1471.8749294281006,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 674.0292358398438,\r
+        "y": 1481.8749294281006,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "fe753b01.7a4008",\r
-                "c50acfa.66a383"\r
+                "87d7037c.ae081",\r
+                "b63381ea.1d864"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c50acfa.66a383",\r
+        "id": "b63381ea.1d864",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 841.4896621704102,\r
-        "y": 1458.8749017715454,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 943.0292663574219,\r
+        "y": 1468.8749017715454,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "da685c50.c0fca"\r
+                "594e98d1.fab688"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe753b01.7a4008",\r
+        "id": "87d7037c.ae081",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 838.4896354675293,\r
-        "y": 1493.8751201629639,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 940.029239654541,\r
+        "y": 1503.8751201629639,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "7c874cb1.b7ec64"\r
+                "5e9af700.a76ce8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da685c50.c0fca",\r
+        "id": "594e98d1.fab688",\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=\"Error executing Create device port rest api\" />\n",\r
         "comments": "",\r
-        "x": 994.4900436401367,\r
-        "y": 1454.8751277923584,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1096.0296478271484,\r
+        "y": 1464.8751277923584,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7c874cb1.b7ec64",\r
+        "id": "5e9af700.a76ce8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 985.489616394043,\r
-        "y": 1494.8748760223389,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1087.0292205810547,\r
+        "y": 1504.8748760223389,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "220d830a.a3737c"\r
+                "4982389d.632728"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "220d830a.a3737c",\r
+        "id": "4982389d.632728",\r
         "type": "set",\r
         "name": "set prop.lan.lanPortId",\r
         "xml": "<set>\n<parameter name='prop.lan.lanPortId' value='`lanPortResp.success[0].id`' />\n",\r
         "comments": "",\r
-        "x": 1192.378719329834,\r
-        "y": 1497.208342552185,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1293.9183235168457,\r
+        "y": 1507.208342552185,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1e3434c6.db511b",\r
+        "id": "695214fd.2c4fdc",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode create vpn topology",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn1Id + '/topology'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 598.0000534057617,\r
-        "y": 1630.333706855774,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 699.5396575927734,\r
+        "y": 1640.333706855774,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "dad634fb.8374a8",\r
-                "222fdfc3.31cbd"\r
+                "d46aab2e.402878",\r
+                "f79fe60.440a918"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "222fdfc3.31cbd",\r
+        "id": "f79fe60.440a918",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 836.9999675750732,\r
-        "y": 1677.333193898201,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 938.539571762085,\r
+        "y": 1687.333193898201,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "a113b13a.6f74c"\r
+                "be3a59b0.64c5a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a113b13a.6f74c",\r
+        "id": "be3a59b0.64c5a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1006.999906539917,\r
-        "y": 1680.333193898201,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1108.5395107269287,\r
+        "y": 1690.333193898201,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "66af30b.a74d8d",\r
+        "id": "cb1060d7.72a6a",\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=\"Error executing Create vpn topology failed\" />\n",\r
         "comments": "",\r
-        "x": 1007.0000286102295,\r
-        "y": 1636.333193898201,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1108.5396327972412,\r
+        "y": 1646.333193898201,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dad634fb.8374a8",\r
+        "id": "d46aab2e.402878",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 839.999906539917,\r
-        "y": 1636.333193898201,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 941.5395107269287,\r
+        "y": 1646.333193898201,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "66af30b.a74d8d"\r
+                "cb1060d7.72a6a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e4f03070.b443a",\r
+        "id": "b5fcdf55.56396",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode create vpn ",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 559.9984092712402,\r
-        "y": 1561.8328762054443,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 661.538013458252,\r
+        "y": 1571.8328762054443,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "93f9856d.ae6458",\r
-                "98bd094d.9d68c8"\r
+                "1dcea603.d095ca",\r
+                "286fea94.caec26"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "98bd094d.9d68c8",\r
+        "id": "286fea94.caec26",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 780.99831199646,\r
-        "y": 1583.8328419923782,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 882.5379161834717,\r
+        "y": 1593.8328419923782,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "54c36251.c8076c"\r
+                "8857322c.003b2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "54c36251.c8076c",\r
+        "id": "8857322c.003b2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 950.9982509613037,\r
-        "y": 1586.8328419923782,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1052.5378551483154,\r
+        "y": 1596.8328419923782,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "719bdb7c.5a10b4",\r
+        "id": "94eea86a.175328",\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=\"Error executing Create vpn failed\" />\n",\r
         "comments": "",\r
-        "x": 950.9983730316162,\r
-        "y": 1542.8328419923782,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1052.537977218628,\r
+        "y": 1552.8328419923782,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "93f9856d.ae6458",\r
+        "id": "1dcea603.d095ca",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 783.9982509613037,\r
-        "y": 1542.8328419923782,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 885.5378551483154,\r
+        "y": 1552.8328419923782,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "719bdb7c.5a10b4"\r
+                "94eea86a.175328"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cdd2e071.957e3",\r
+        "id": "7ec433f0.4a2dec",\r
         "type": "switchNode",\r
         "name": "switch ActivateSDWANVpnInstance",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1147.0002365112305,\r
-        "y": 848.3332567214966,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1248.5398406982422,\r
+        "y": 858.3332567214966,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "f5335833.4ba238"\r
+                "df6b5755.18ea68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2141a4d0.4ed0ac",\r
+        "id": "bd374d2.a7cdcb",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 904.3333396911621,\r
-        "y": 777.3333368301392,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1005.8729438781738,\r
+        "y": 787.3333368301392,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "566234f6.d57f8c",\r
-                "cdd2e071.957e3",\r
-                "785db3d8.98fb5c"\r
+                "415f5cb9.3a6e44",\r
+                "7ec433f0.4a2dec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5335833.4ba238",\r
+        "id": "df6b5755.18ea68",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1242.666748046875,\r
-        "y": 922.3333377838135,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1344.2063522338867,\r
+        "y": 932.3333377838135,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "deda6015.73137"\r
+                "a2c862ed.3d8da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "deda6015.73137",\r
+        "id": "a2c862ed.3d8da",\r
         "type": "for",\r
         "name": "for vf-modules.vf-module_length",\r
         "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1456.916633605957,\r
-        "y": 923.8333144187927,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1558.4562377929688,\r
+        "y": 933.8333144187927,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "6ef0c48a.c4e20c"\r
+                "26c3d6b7.9af80a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ef0c48a.c4e20c",\r
+        "id": "26c3d6b7.9af80a",\r
         "type": "switchNode",\r
         "name": "switch vpn-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1703.9166717529297,\r
-        "y": 918.8333973884583,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1805.4562759399414,\r
+        "y": 928.8333973884583,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "45631feb.4e63d"\r
+                "73c96ff0.116a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45631feb.4e63d",\r
+        "id": "73c96ff0.116a",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1854.6666259765625,\r
-        "y": 920.3333129882812,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1956.2062301635742,\r
+        "y": 930.3333129882812,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "4fe0c915.7019d8"\r
+                "736b8a4d.4ec784"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4fe0c915.7019d8",\r
+        "id": "736b8a4d.4ec784",\r
         "type": "set",\r
         "name": "set prop.vpn1Id",\r
         "xml": "<set>\n<parameter name='prop.vpn1Id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
         "comments": "",\r
-        "x": 2028.6673736572266,\r
-        "y": 920.3333714008331,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2130.2069778442383,\r
+        "y": 930.3333714008331,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "18aa70c2.f51f1f",\r
+        "id": "9412ef29.cc029",\r
         "type": "set",\r
         "name": "Add sites to list and update length",\r
         "xml": "<set>\n<parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n",\r
         "comments": "",\r
-        "x": 2459.000747680664,\r
-        "y": 826.3333714008331,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2560.540351867676,\r
+        "y": 836.3333714008331,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "95fdece9.83f56",\r
+        "id": "4b9ca75a.7fc698",\r
         "type": "set",\r
         "name": "Add site attachement to list and update length",\r
         "xml": "<set>\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\n<parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n",\r
         "comments": "",\r
-        "x": 2490.0006408691406,\r
-        "y": 869.3333377838135,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2591.5402450561523,\r
+        "y": 879.3333377838135,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "11a6133a.d1ed1d",\r
+        "id": "6278217c.89959",\r
         "type": "set",\r
         "name": "set prop.siteAttachement_length=0",\r
         "xml": "<set>\n<parameter name='prop.siteAttachements_length' value='0' />\n<parameter name='prop.siteIds_length' value='0' />\n\n\n\n",\r
         "comments": "",\r
-        "x": 576.0000152587891,\r
-        "y": 574.333330154419,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 677.5396194458008,\r
+        "y": 584.333330154419,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "78c531f9.c452d",\r
+        "id": "f98893a0.de7a4",\r
         "type": "block",\r
         "name": "block atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1689.3336715698242,\r
-        "y": 802.3333358764648,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1790.873275756836,\r
+        "y": 812.3333358764648,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "78502254.1e1d1c",\r
-                "63d66e16.071a8",\r
-                "5671530f.b2ba5c"\r
+                "39ba7083.5ed54",\r
+                "5110ed96.6f1424",\r
+                "c2809bfd.795218"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63d66e16.071a8",\r
+        "id": "5110ed96.6f1424",\r
         "type": "switchNode",\r
         "name": "switch role",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'role'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1851.666603088379,\r
-        "y": 733.3333349227905,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1953.2062072753906,\r
+        "y": 743.3333349227905,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "5896f487.b2b6fc"\r
+                "1e253f6e.5c04c1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5896f487.b2b6fc",\r
+        "id": "1e253f6e.5c04c1",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2014.6666069030762,\r
-        "y": 728.3333358764648,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2116.206211090088,\r
+        "y": 738.3333358764648,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "21c68e35.ea4b92"\r
+                "76558c73.4a9c94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21c68e35.ea4b92",\r
+        "id": "76558c73.4a9c94",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2182.666648864746,\r
-        "y": 722.3333339691162,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2284.206253051758,\r
+        "y": 732.3333339691162,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "c62b7f98.336c5",\r
-                "2c113cab.56e434",\r
-                "c2240666.9ee948"\r
+                "7fa808fb.9dfb68",\r
+                "74735438.9332ac",\r
+                "138a0f19.6e1331"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c113cab.56e434",\r
+        "id": "74735438.9332ac",\r
         "type": "switchNode",\r
         "name": "switch sd-wan-edge",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'sd-wan-edge'`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2377.666778564453,\r
-        "y": 683.3333253860474,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2479.206382751465,\r
+        "y": 693.3333253860474,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "ba2b297.cd792d8"\r
+                "201641a0.5890ce"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c62b7f98.336c5",\r
+        "id": "7fa808fb.9dfb68",\r
         "type": "switchNode",\r
         "name": "switch dsvpn-hub",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'dsvpn-hub'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2374.6668853759766,\r
-        "y": 738.333340883255,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2476.2064895629883,\r
+        "y": 748.333340883255,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "f4f54567.510e38"\r
+                "f53ab0a6.6d677"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ed96cca.37dc4",\r
+        "id": "69b796c5.6fe848",\r
         "type": "set",\r
         "name": "set spoke role",\r
         "xml": "<set>\n<parameter name='prop.role' value=\"spoke\" />\n",\r
         "comments": "",\r
-        "x": 2707.6669006347656,\r
-        "y": 677.3333711624146,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2809.2065048217773,\r
+        "y": 687.3333711624146,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4cf4d59c.e1707c",\r
+        "id": "861df320.7eae2",\r
         "type": "set",\r
         "name": "set hub role",\r
         "xml": "<set>\n<parameter name='prop.role' value=\"hub\" />\n",\r
         "comments": "",\r
-        "x": 2706.666660308838,\r
-        "y": 732.3333549499512,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2808.2062644958496,\r
+        "y": 742.3333549499512,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ba2b297.cd792d8",\r
+        "id": "201641a0.5890ce",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2547.666748046875,\r
-        "y": 679,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2649.2063522338867,\r
+        "y": 689,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "8ed96cca.37dc4"\r
+                "69b796c5.6fe848"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4f54567.510e38",\r
+        "id": "f53ab0a6.6d677",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2551.666748046875,\r
-        "y": 734,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2653.2063522338867,\r
+        "y": 744,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             [\r
-                "4cf4d59c.e1707c"\r
+                "861df320.7eae2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56401cb0.1f0164",\r
+        "id": "188a2b9c.34d5e4",\r
         "type": "update",\r
         "name": "update SDWAN VPN status to AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n      key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='Active' />\n<parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 560.0312843322754,\r
-        "y": 1998.031280040741,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 661.5708885192871,\r
+        "y": 2008.031280040741,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ec89c38e.b0db3",\r
+        "id": "44113153.ffa83",\r
         "type": "set",\r
         "name": "set vf-module-level-oper-status",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status'  value='Active' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",\r
         "comments": "",\r
-        "x": 556.6663017272949,\r
-        "y": 1941.1261107651517,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 658.2059059143066,\r
+        "y": 1951.1261107651517,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "233d7734.c6ad18",\r
+        "id": "cd4a9b23.d614c8",\r
         "type": "set",\r
         "name": "set vf-module-id and vf-module-object-path",\r
         "xml": "<set>\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
         "comments": "",\r
-        "x": 590.6663017272949,\r
-        "y": 1892.6261098114774,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 692.2059059143066,\r
+        "y": 1902.6261098114774,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6bb3e148.a2b06",\r
+        "id": "760751d.6fd76b",\r
         "type": "set",\r
         "name": "copy input data in service-data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",\r
         "comments": "",\r
-        "x": 554.6662559509277,\r
-        "y": 1844.876064300537,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 656.2058601379395,\r
+        "y": 1854.876064300537,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "307480f2.c3f12",\r
+        "id": "45f5fb20.78ea64",\r
         "type": "set",\r
         "name": "set device PortId to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='devicePortId' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.lan.devicePortId`' />\n",\r
         "comments": "",\r
-        "x": 561.031322479248,\r
-        "y": 1738.0314636230469,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 662.5709266662598,\r
+        "y": 1748.0314636230469,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cfe4c928.772628",\r
+        "id": "b05dede5.e0278",\r
         "type": "set",\r
         "name": "set lan PortId to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='lanPortId' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.lan.lanPortId`' />\n",\r
         "comments": "",\r
-        "x": 547.0312461853027,\r
-        "y": 1792.0312767028809,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 648.5708503723145,\r
+        "y": 1802.0312767028809,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "13d1a87e.cc7dd8",\r
+        "id": "2f9763b5.4e87fc",\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/svclogic21.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"prop.attach.siteId\"/>\n<parameter name=\"field3\" value='`$prop.attach.siteId`'/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2384.0313873291016,\r
-        "y": 914.5312805175781,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2485.5709915161133,\r
+        "y": 924.5312805175781,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c2240666.9ee948",\r
+        "id": "138a0f19.6e1331",\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/svclogic22.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"set spoke role\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2353.0313987731934,\r
-        "y": 645.531247138977,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 2454.571002960205,\r
+        "y": 655.531247138977,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5671530f.b2ba5c",\r
+        "id": "c2809bfd.795218",\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/svclogic23.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"param-name\"/>\n<parameter name=\"field3\" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name`'/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1847.03125,\r
-        "y": 677.53125,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 1948.5708541870117,\r
+        "y": 687.53125,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "785db3d8.98fb5c",\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/svclogic24.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"request-action\"/>\n<parameter name=\"field3\" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action`'/>\n",\r
+        "id": "a37e9bab.abd118",\r
+        "type": "comment",\r
+        "name": "**revert the changes",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 1349.5708808898926,\r
+        "y": 693.0312824249268,\r
+        "z": "d0c9a483.09f7c8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "4a795886.274f28",\r
+        "type": "switchNode",\r
+        "name": "switch vf-modules.vf-module_length",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`\">\n\n<!--switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1096.03125,\r
-        "y": 686.53125,\r
-        "z": "2f0cf160.dc107e",\r
+        "x": 892.7538909912109,\r
+        "y": 507.25390625,\r
+        "z": "d0c9a483.09f7c8",\r
         "wires": [\r
-            []\r
+            [\r
+                "779d12ab.8187fc"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "bacdcf2a.07a41",\r
-        "type": "comment",\r
-        "name": "**revert the changes",\r
-        "info": "",\r
+        "id": "779d12ab.8187fc",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
-        "x": 1248.0312767028809,\r
-        "y": 683.0312824249268,\r
-        "z": "2f0cf160.dc107e",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 998.75390625,\r
+        "y": 558.25390625,\r
+        "z": "d0c9a483.09f7c8",\r
+        "wires": [\r
+            [\r
+                "e23c505c.41fa2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5c633f8a.ecb75",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 693.0039138793945,\r
+        "y": 468.0039048194885,\r
+        "z": "d0c9a483.09f7c8",\r
+        "wires": [\r
+            [\r
+                "4a795886.274f28"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e23c505c.41fa2",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1151.003890991211,\r
+        "y": 555.0039281845093,\r
+        "z": "d0c9a483.09f7c8",\r
+        "wires": [\r
+            [\r
+                "aa0d1480.7f1978"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f599447.9ac3fb8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1894.7539710998535,\r
+        "y": 553.0039119720459,\r
+        "z": "d0c9a483.09f7c8",\r
+        "wires": [\r
+            [\r
+                "1f605289.f2eb7d"\r
+            ]\r
+        ]\r
     }\r
 ]
\ No newline at end of file
index b4f838d..3ce166e 100644 (file)
 [\r
     {\r
-        "id": "3d343d97.916e12",\r
-        "type": "method",\r
-        "name": "sdwan-vf-operation-lanport-create",\r
-        "xml": "<method rpc='sdwan-vf-operation-lanport-create' mode='sync'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 285,\r
-        "y": 241.99999237060547,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": [\r
-            [\r
-                "72bd87e4.7210f8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "72bd87e4.7210f8",\r
+        "id": "3ecdadeb.18aa62",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 444.99999237060547,\r
-        "y": 374.9999885559082,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": [\r
-            [\r
-                "fa08bbfd.f36978",\r
-                "662c5c91.bf14f4",\r
-                "3a8662b6.7187de",\r
-                "d0f313c6.a0ddd",\r
-                "87f25b72.4b1968",\r
-                "c96f1257.64bf8",\r
-                "9ca9880e.f474f8",\r
-                "23949443.ee4acc",\r
-                "64302671.d03c08",\r
-                "305a60f0.cd87a",\r
-                "17d1be09.26b4d2",\r
-                "8ab4415a.f464b",\r
-                "b65f8656.be0f98",\r
-                "8944476b.d5f828"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "78ad706e.d12e1",\r
-        "type": "service-logic",\r
-        "name": "GENERIC-RESOURCE-API ${project.version}",\r
-        "module": "GENERIC-RESOURCE-API",\r
-        "version": "${project.version}",\r
-        "comments": "",\r
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
-        "outputs": 1,\r
-        "x": 286,\r
-        "y": 141.99999237060547,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": [\r
-            [\r
-                "3d343d97.916e12"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "7c5370ed.0ab17",\r
-        "type": "dgstart",\r
-        "name": "DGSTART",\r
-        "outputs": 1,\r
-        "x": 115.5,\r
-        "y": 53,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 432.00389862060547,\r
+        "y": 378.9999885559082,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "78ad706e.d12e1"\r
+                "b1de8da9.db8a2",\r
+                "d704787.9944088",\r
+                "c4e200e6.2e02b",\r
+                "5f812e79.2be7e",\r
+                "2b234f37.76666",\r
+                "7dbca450.42794c",\r
+                "7e93696e.840218",\r
+                "676ec3b1.844d3c",\r
+                "e3e05047.2e5b8",\r
+                "91a71daa.ef5c2",\r
+                "b3c3b183.55c72",\r
+                "d01634bb.bb46b8",\r
+                "43cde2b5.87e1ac",\r
+                "c6fbc47.00d1938",\r
+                "98c6c3b2.42b6b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa08bbfd.f36978",\r
+        "id": "b1de8da9.db8a2",\r
         "type": "for",\r
         "name": "for loop idx - VF input parameters",\r
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 791.2501525878906,\r
-        "y": 357.66665744781494,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 778.2540588378906,\r
+        "y": 361.66665744781494,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "c93f649f.0099c8"\r
+                "d245ffbf.59c6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c93f649f.0099c8",\r
+        "id": "d245ffbf.59c6c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1006.0284957885742,\r
-        "y": 355.22224140167236,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 993.0324020385742,\r
+        "y": 359.22224140167236,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "8f744d78.f7a31",\r
-                "7468dc64.d34424"\r
+                "82c635c3.382618",\r
+                "bcda53d8.f6893"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f744d78.f7a31",\r
+        "id": "82c635c3.382618",\r
         "type": "execute",\r
         "name": "execute split parameterName",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1202.2846984863281,\r
-        "y": 332.97037982940674,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1189.2886047363281,\r
+        "y": 336.97037982940674,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7468dc64.d34424",\r
+        "id": "bcda53d8.f6893",\r
         "type": "set",\r
         "name": "set parameterName",\r
         "xml": "<set>\n<parameter name=\"`vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",\r
         "comments": "",\r
-        "x": 1171.7291259765625,\r
-        "y": 369.97049617767334,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1158.7330322265625,\r
+        "y": 373.97049617767334,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "143889df.349216",\r
+        "id": "ac17a6a.af45258",\r
         "type": "comment",\r
         "name": "Take the parameter names by removing prefix",\r
         "info": "",\r
         "comments": "",\r
-        "x": 829.2503547668457,\r
-        "y": 314.3333249092102,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 816.2542610168457,\r
+        "y": 318.3333249092102,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3a8662b6.7187de",\r
+        "id": "c4e200e6.2e02b",\r
         "type": "set",\r
         "name": "set new vf-module_length",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",\r
         "comments": "",\r
-        "x": 770.186767578125,\r
-        "y": 516.1629304885864,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 757.190673828125,\r
+        "y": 520.1629304885864,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "662c5c91.bf14f4",\r
+        "id": "d704787.9944088",\r
         "type": "set",\r
         "name": "set vf-module-request-input.",\r
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",\r
         "comments": "",\r
-        "x": 770.1862945556641,\r
-        "y": 462.15421867370605,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 764.1902618408203,\r
+        "y": 415.1541962623596,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "64302671.d03c08",\r
+        "id": "7e93696e.840218",\r
         "type": "set",\r
         "name": "copy input data to service data",\r
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.lan-vf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n",\r
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' /-->\n<!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' /-->\n",\r
         "comments": "",\r
-        "x": 782.3531112670898,\r
-        "y": 624.3335423469543,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 769.3570175170898,\r
+        "y": 628.3335423469543,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "23949443.ee4acc",\r
-        "type": "execute",\r
-        "name": "execute generate-vf-module-index",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.lan-vf-index\"/>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 794.6866760253906,\r
-        "y": 570.0002617835999,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "305a60f0.cd87a",\r
+        "id": "676ec3b1.844d3c",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
-        "xml": "<set>\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
-        "comments": "",\r
-        "x": 770.500036239624,\r
-        "y": 675.8373885154724,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "17d1be09.26b4d2",\r
-        "type": "set",\r
-        "name": "set vf-module-level-oper-status",\r
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",\r
+        "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vf-id`'/> \n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
         "comments": "",\r
-        "x": 785.0000953674316,\r
-        "y": 725.837281703949,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 757.503942489624,\r
+        "y": 679.8373885154724,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8ab4415a.f464b",\r
+        "id": "e3e05047.2e5b8",\r
         "type": "save",\r
         "name": "save sdwan lan-port-config resource in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n      key='lan-port-config.lan-port-config-id = $prop.lan-vf-index' >\n<parameter name=\"lan-port-config-id\" value=\"`$prop.vnf-index`\" />\n<parameter name=\"device-id\" value=\"`$prop.lan.deviceName`\" />\n<parameter name=\"port-switch\" value=\"`$prop.lan.portSwitch`\" />\n<parameter name=\"port-type\" value=\"`$prop.lan.portType`\" />\n<parameter name=\"port-number\" value=\"`$prop.lan.portnumber`\" />\n<parameter name=\"ipv4-address\" value=\"`$prop.lan.ipAddress`\" />\n<parameter name='vlan-tag' value=\"`$prop.lan.vlanId`\" />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.site-vf-index + '/vf-module-data/'` \" />\n",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n      key='lan-port-config.lan-port-config-id = $prop.vf-id' >\n<parameter name=\"lan-port-config-id\" value=\"`$prop.vf-id`\" />\n<parameter name=\"device-id\" value='`$prop.lan.deviceName`' />\n<parameter name=\"port-switch\" value='`$prop.lan.portSwitch`' />\n<parameter name=\"port-type\" value='`$prop.lan.portType`' />\n<parameter name=\"port-number\" value='`$prop.lan.portnumber`' />\n<parameter name=\"ipv4-address\" value='`$prop.lan.ipAddress`' />\n<parameter name='vlan-tag' value='`$prop.lan.vlanId`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 817.5000152587891,\r
-        "y": 766.3373422622681,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 812.5039215087891,\r
+        "y": 772.3373708724976,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b65f8656.be0f98",\r
+        "id": "91a71daa.ef5c2",\r
         "type": "save",\r
         "name": "save service relationship in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"sdwan-vpn\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/sdwan-vpns/sdwan-vpn/' + $prop.lan-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"lan-port-config-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.lan-vf-index`\" />\n",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"lan-port-config\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/lan-port-configs/lan-port-config/' + $prop.vf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"lan-port-config-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vf-id`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 785.4999313354492,\r
-        "y": 815.3373589515686,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 772.5038375854492,\r
+        "y": 819.3373589515686,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8944476b.d5f828",\r
+        "id": "b3c3b183.55c72",\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": 736.2224769592285,\r
-        "y": 862.5112180709839,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "87f25b72.4b1968",\r
-        "type": "for",\r
-        "name": "for each vnf",\r
-        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 729,\r
-        "y": 165.99999713897705,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": [\r
-            [\r
-                "e80313cd.820e4"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "e80313cd.820e4",\r
-        "type": "switchNode",\r
-        "name": "switch this vnf-id == input vnf-id",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 981.0000915527344,\r
-        "y": 164.6666603088379,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": [\r
-            [\r
-                "b80badb7.d9753"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "8bc04fc8.d6a11",\r
-        "type": "set",\r
-        "name": "set vnf-index",\r
-        "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
-        "comments": "",\r
-        "x": 1352.6665802001953,\r
-        "y": 166.66666316986084,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 723.2263832092285,\r
+        "y": 866.5112180709839,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b80badb7.d9753",\r
-        "type": "outcomeTrue",\r
-        "name": "true",\r
-        "xml": "<outcome value='true'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1199.333408355713,\r
-        "y": 166.66664218902588,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": [\r
-            [\r
-                "8bc04fc8.d6a11"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "d0f313c6.a0ddd",\r
+        "id": "5f812e79.2be7e",\r
         "type": "switchNode",\r
         "name": "switch vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 743.4205932617188,\r
-        "y": 121.50386619567871,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 733.424467086792,\r
+        "y": 68.5038731098175,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "7ab34e25.1cd4e"\r
+                "ecb5481e.49db98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ab34e25.1cd4e",\r
+        "id": "ecb5481e.49db98",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 930.087272644043,\r
-        "y": 120.8371639251709,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 920.0911464691162,\r
+        "y": 67.83717083930969,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "984b3a64.7e1a38"\r
+                "5cc69be0.888194"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "984b3a64.7e1a38",\r
+        "id": "5cc69be0.888194",\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=\"404\" />\n    <parameter name=\"error-message\" value=\"There are no VNFs in MD-SAL\" />\n",\r
         "comments": "",\r
-        "x": 1111.7538986206055,\r
-        "y": 120.8371639251709,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1101.7577724456787,\r
+        "y": 67.83717083930969,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c96f1257.64bf8",\r
+        "id": "2b234f37.76666",\r
         "type": "switchNode",\r
         "name": "switch vf-modules.vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 784.6705827713013,\r
-        "y": 241.50386714935303,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 771.6744890213013,\r
+        "y": 245.50386714935303,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "ab6c63f4.e55a6",\r
-                "14b85aee.617c65"\r
+                "43b76269.61638c",\r
+                "80f9fdd1.5acfa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab6c63f4.e55a6",\r
+        "id": "43b76269.61638c",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1015.6705932617188,\r
-        "y": 217.50386428833008,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1002.6744995117188,\r
+        "y": 221.50386428833008,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "342d6918.bdf256"\r
+                "30daa7e7.f7d908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14b85aee.617c65",\r
+        "id": "80f9fdd1.5acfa",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1015.6705932617188,\r
-        "y": 257.5038642883301,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1002.6744995117188,\r
+        "y": 261.5038642883301,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "eedb45d.e2420b8"\r
+                "15ffa14c.a3471f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "342d6918.bdf256",\r
+        "id": "30daa7e7.f7d908",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1158.1705932617188,\r
-        "y": 217.50386428833008,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1145.1744995117188,\r
+        "y": 221.50386428833008,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eedb45d.e2420b8",\r
+        "id": "15ffa14c.a3471f",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1160.0276374816895,\r
-        "y": 257.4403762817383,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1147.0315437316895,\r
+        "y": 261.4403762817383,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "a00dcbbe.533a58",\r
-                "7019e496.422f8c"\r
+                "81c65311.3e7fa",\r
+                "1c59d473.dd26bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7019e496.422f8c",\r
+        "id": "1c59d473.dd26bc",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",\r
         "comments": "",\r
-        "x": 1312.7261123657227,\r
-        "y": 227.05947497440502,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1299.7300186157227,\r
+        "y": 231.05947497440502,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a00dcbbe.533a58",\r
+        "id": "81c65311.3e7fa",\r
         "type": "for",\r
         "name": "for each existing vf-index",\r
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1369.1546173095703,\r
-        "y": 280.2816047668457,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1356.1585235595703,\r
+        "y": 284.2816047668457,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "19e6409a.9c554f"\r
+                "aaf0ab5e.460008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f530bc4a.54c5c",\r
+        "id": "85ce8231.1cc8f",\r
         "type": "comment",\r
         "name": "make sure this network doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1592.805347442627,\r
-        "y": 238.53566217422485,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1579.809253692627,\r
+        "y": 242.53566217422485,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "19e6409a.9c554f",\r
+        "id": "aaf0ab5e.460008",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1644.4403381347656,\r
-        "y": 279.8531074523926,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1631.4442443847656,\r
+        "y": 283.8531074523926,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "24af0b91.ce5344"\r
+                "1a7eae6b.66a2b2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "24af0b91.ce5344",\r
+        "id": "1a7eae6b.66a2b2",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1545.1705360412598,\r
-        "y": 338.4245386123657,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1532.1744422912598,\r
+        "y": 342.4245386123657,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "bf4e4104.4edb"\r
+                "40223de2.189ee4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bf4e4104.4edb",\r
+        "id": "40223de2.189ee4",\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=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1692.920639038086,\r
-        "y": 338.28173068119213,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1679.924545288086,\r
+        "y": 342.28173068119213,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9ca9880e.f474f8",\r
+        "id": "7dbca450.42794c",\r
         "type": "call",\r
         "name": "call sdwan-get-vf-module-lanport-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 804.0000152587891,\r
-        "y": 408.99999809265137,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 803.0039367675781,\r
+        "y": 468.0000219345093,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "d01634bb.bb46b8",\r
+        "type": "set",\r
+        "name": "set vf-module-level-oper-status",\r
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n",\r
+        "comments": "",\r
+        "x": 774.00390625,\r
+        "y": 722.00390625,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "80c0749d.c5b758",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
+        "outputs": 1,\r
+        "x": 101.00390625,\r
+        "y": 95.00390625,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            [\r
+                "1e8e9be2.f38a84"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1e8e9be2.f38a84",\r
+        "type": "service-logic",\r
+        "name": "GENERIC-RESOURCE-API ${project.version}",\r
+        "module": "GENERIC-RESOURCE-API",\r
+        "version": "${project.version}",\r
+        "comments": "",\r
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
+        "outputs": 1,\r
+        "x": 215.50390434265137,\r
+        "y": 202.00389766693115,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            [\r
+                "441193b5.7a563c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "441193b5.7a563c",\r
+        "type": "method",\r
+        "name": "sdwan-vf-operation-lanport-create",\r
+        "xml": "<method rpc='sdwan-vf-operation-lanport-create' mode='sync'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 214.50390434265137,\r
+        "y": 302.00389766693115,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            [\r
+                "3ecdadeb.18aa62"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "43cde2b5.87e1ac",\r
+        "type": "execute",\r
+        "name": "execute generate-vf-id",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vf-id\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 756.0039520263672,\r
+        "y": 576.5038995742798,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             []\r
         ]\r
+    },\r
+    {\r
+        "id": "c6fbc47.00d1938",\r
+        "type": "for",\r
+        "name": "for each vnf",\r
+        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 723.0038871765137,\r
+        "y": 123.00390815734863,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            [\r
+                "a2640a51.5d0d78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a2640a51.5d0d78",\r
+        "type": "switchNode",\r
+        "name": "switch this vnf-id == input vnf-id",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 974.0039825439453,\r
+        "y": 118.67052865028381,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            [\r
+                "d22976f8.730608"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d22976f8.730608",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1192.3372993469238,\r
+        "y": 120.6705105304718,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            [\r
+                "92022bc5.0cdcc8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "92022bc5.0cdcc8",\r
+        "type": "set",\r
+        "name": "set vnf-index",\r
+        "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
+        "comments": "",\r
+        "x": 1345.6704711914062,\r
+        "y": 120.67053151130676,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "98c6c3b2.42b6b",\r
+        "type": "switchNode",\r
+        "name": "switch vnf-index",\r
+        "xml": "<switch test='`$vnf-index`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 737.00390625,\r
+        "y": 184.00390625,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            [\r
+                "681068c6.40fb78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "681068c6.40fb78",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 899.0039520263672,\r
+        "y": 183.00390529632568,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            [\r
+                "f9b4e412.cab938"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f9b4e412.cab938",\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 id not found in service-data\" />\n",\r
+        "comments": "",\r
+        "x": 1048.2540435791016,\r
+        "y": 180.78178310394287,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": []\r
     }\r
-]
\ No newline at end of file
+]\r
+\r
index cb28863..5178c07 100644 (file)
@@ -1,54 +1,54 @@
 [\r
     {\r
-        "id": "3eaead5d.8a50e2",\r
+        "id": "5903e495.687e5c",\r
         "type": "method",\r
         "name": "method sdwan-vf-operation-lanport-deactivate",\r
         "xml": "<method rpc='sdwan-vf-operation-lanport-deactivate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 252,\r
-        "y": 208,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 240.00390625,\r
+        "y": 212.58634185791016,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "de2de50e.7db098"\r
+                "4f6607f2.8abb38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba6ca55d.d04268",\r
+        "id": "16a24c83.115633",\r
         "type": "switchNode",\r
         "name": "switch vf-modules.vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 634.0000076293945,\r
-        "y": 359.4136486053467,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 622.0039138793945,\r
+        "y": 363.99999046325684,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "96bd0da6.6b228",\r
-                "d7d04d79.b116e",\r
-                "bcfd0c5e.e6103"\r
+                "38ac049b.8f28ac",\r
+                "918c4288.cf32",\r
+                "e4bed2ad.0f579"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "996651b.9ec83b",\r
+        "id": "a6d98bd3.492e98",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 171.00000381469727,\r
-        "y": 50.413658142089844,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 159.00391006469727,\r
+        "y": 55,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "509643c7.891eac"\r
+                "1152c743.415d39"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "509643c7.891eac",\r
+        "id": "1152c743.415d39",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 240.28570556640625,\r
-        "y": 113.65176773071289,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 228.28961181640625,\r
+        "y": 118.23810958862305,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "3eaead5d.8a50e2"\r
+                "5903e495.687e5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de2de50e.7db098",\r
+        "id": "4f6607f2.8abb38",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 252.6666717529297,\r
-        "y": 464.08036708831787,\r
-        "z": "2a0755d2.04892a",\r
-        "wires": [\r
-            [\r
-                "cd5d97be.4098b8",\r
-                "cc768085.ce4bc",\r
-                "ba6ca55d.d04268",\r
-                "582a5dfb.dfaf24",\r
-                "6331828e.70aa2c",\r
-                "60ca269e.96d878",\r
-                "ba5b2145.40753",\r
-                "d3ab3217.7d57a",\r
-                "58afb0e4.ba7df",\r
-                "2ee3209f.a1bb9",\r
-                "bfac8597.a517f8",\r
-                "b282b047.e838d",\r
-                "89ba2ad0.277798",\r
-                "e99d476c.3f3ac8",\r
-                "81163bc0.74e178",\r
-                "e8785c39.cc512",\r
-                "86da8112.f0417",\r
-                "2b5c8466.72828c",\r
-                "6c0bf23f.5303ac",\r
-                "16e6f83a.5e7ff8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "cc768085.ce4bc",\r
+        "x": 240.6705780029297,\r
+        "y": 468.666708946228,\r
+        "z": "eb27f9f.1aaf508",\r
+        "wires": [\r
+            [\r
+                "ee96d694.8e7de8",\r
+                "ebce096c.09ff98",\r
+                "16a24c83.115633",\r
+                "8d9ec798.9077a8",\r
+                "1c23a104.8b10df",\r
+                "ea24678.936eb98",\r
+                "1a442450.4a365c",\r
+                "76875429.7977ec",\r
+                "c0a9943e.0b6a78",\r
+                "728a6387.ded5dc",\r
+                "d768a494.487678",\r
+                "24c5eb03.2a37b4",\r
+                "37a0c49e.52f2ec",\r
+                "88d74976.c878b8",\r
+                "7eaf7940.931d68",\r
+                "b028cd6d.5db14",\r
+                "b07d774b.c67f18",\r
+                "c2a2820.4e02d8",\r
+                "6e845a3.14ef3a4",\r
+                "715f7228.db42ac",\r
+                "b36b6e5f.5d733"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ebce096c.09ff98",\r
         "type": "for",\r
         "name": "for each vnf",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 578.0313873291016,\r
-        "y": 287.6828079223633,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 582.0352668762207,\r
+        "y": 221.26913261413574,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "9776f320.0567"\r
+                "906e6ab4.d1bf48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd5d97be.4098b8",\r
+        "id": "ee96d694.8e7de8",\r
         "type": "switchNode",\r
         "name": "switch vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 589.0000190734863,\r
-        "y": 226.41366863250732,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 593.0038986206055,\r
+        "y": 159.99999332427979,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "2debc059.5aa7"\r
+                "88ebf11b.dd6cf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2debc059.5aa7",\r
+        "id": "88ebf11b.dd6cf",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 769,\r
-        "y": 225.41365814208984,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 773.0038795471191,\r
+        "y": 158.9999828338623,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "355351ee.f9153e"\r
+                "42b4e84a.5144c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "355351ee.f9153e",\r
+        "id": "42b4e84a.5144c8",\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.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 918.4287261962891,\r
-        "y": 226.55657577514648,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 922.4326057434082,\r
+        "y": 160.14290046691895,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9776f320.0567",\r
+        "id": "906e6ab4.d1bf48",\r
         "type": "switchNode",\r
         "name": "switch this vnf-id == input vnf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 807.0000152587891,\r
-        "y": 288.4136643409729,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 811.0038948059082,\r
+        "y": 221.99998903274536,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "f97986b6.bf7158"\r
+                "31ffe1c7.1814fe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f97986b6.bf7158",\r
+        "id": "31ffe1c7.1814fe",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1022,\r
-        "y": 286.41365814208984,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1026.0038795471191,\r
+        "y": 219.9999828338623,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "926d8df9.33314"\r
+                "e443968b.c056d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "926d8df9.33314",\r
+        "id": "e443968b.c056d8",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1186,\r
-        "y": 281.41365814208984,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1190.0038795471191,\r
+        "y": 214.9999828338623,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d7d04d79.b116e",\r
+        "id": "918c4288.cf32",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 856,\r
-        "y": 393.41365814208984,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 844.00390625,\r
+        "y": 398,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "511ce89.f44bb18"\r
+                "8a688447.06c508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96bd0da6.6b228",\r
+        "id": "38ac049b.8f28ac",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 860.9999961853027,\r
-        "y": 340.4136571884155,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 849.0039024353027,\r
+        "y": 344.9999990463257,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "511ce89.f44bb18"\r
+                "8a688447.06c508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "511ce89.f44bb18",\r
+        "id": "8a688447.06c508",\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.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1019,\r
-        "y": 353.41365814208984,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1007.00390625,\r
+        "y": 358,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bcfd0c5e.e6103",\r
+        "id": "e4bed2ad.0f579",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 856,\r
-        "y": 454.41365814208984,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 844.00390625,\r
+        "y": 459,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "b8a34756.728a58"\r
+                "4a56c78a.01ddc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af4bd42d.9f4868",\r
+        "id": "6a4e4809.c60518",\r
         "type": "set",\r
         "name": "set vf-module_length",\r
         "xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",\r
         "comments": "",\r
-        "x": 1210.000015258789,\r
-        "y": 452.4136720895767,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1198.003921508789,\r
+        "y": 457.0000139474869,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b8a34756.728a58",\r
+        "id": "4a56c78a.01ddc8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1017.0000457763672,\r
-        "y": 451.413649559021,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1005.0039520263672,\r
+        "y": 455.99999141693115,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "af4bd42d.9f4868",\r
-                "69a184fd.28972c"\r
+                "6a4e4809.c60518",\r
+                "bc83d339.7a157"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "69a184fd.28972c",\r
+        "id": "bc83d339.7a157",\r
         "type": "for",\r
         "name": "for each existing vf-index",\r
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1229.0000305175781,\r
-        "y": 501.41367053985596,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1217.0039367675781,\r
+        "y": 506.0000123977661,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "72e39d48.4f8944"\r
+                "f6f67e00.4f2d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72e39d48.4f8944",\r
+        "id": "f6f67e00.4f2d6",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1472,\r
-        "y": 500.41365814208984,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1460.00390625,\r
+        "y": 505,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "5f38c3e.5d3ce3c"\r
+                "dd4f952e.96ea88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f38c3e.5d3ce3c",\r
+        "id": "dd4f952e.96ea88",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1670.0000286102295,\r
-        "y": 487.41366481781006,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1658.0039348602295,\r
+        "y": 492.0000066757202,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "92d909cb.ff6d68"\r
+                "daa971e2.4674d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92d909cb.ff6d68",\r
+        "id": "daa971e2.4674d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1822,\r
-        "y": 489.41365814208984,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1810.00390625,\r
+        "y": 494,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "4dec85b6.3eab5c",\r
-                "e85d666e.e8adc8",\r
-                "15a9af4c.a7f031"\r
+                "b77c5961.7e0078",\r
+                "f6edb536.7a6928",\r
+                "29517aa5.1b19a6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4dec85b6.3eab5c",\r
+        "id": "b77c5961.7e0078",\r
         "type": "set",\r
         "name": "set tmp.vidx and ctx.vnf-data",\r
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",\r
         "comments": "",\r
-        "x": 2050.000114440918,\r
-        "y": 431.4136619567871,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2038.004020690918,\r
+        "y": 436.00000381469727,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e85d666e.e8adc8",\r
+        "id": "f6edb536.7a6928",\r
         "type": "set",\r
         "name": "set vf-module-request-input.",\r
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",\r
         "comments": "",\r
-        "x": 2054.000114440918,\r
-        "y": 485.4136619567871,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2042.004020690918,\r
+        "y": 490.00000381469727,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "582a5dfb.dfaf24",\r
+        "id": "8d9ec798.9077a8",\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": 553.0002136230469,\r
-        "y": 1926.9149341583252,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 541.0041198730469,\r
+        "y": 1931.5012760162354,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "15a9af4c.a7f031",\r
+        "id": "29517aa5.1b19a6",\r
         "type": "call",\r
         "name": "call sdwan-get-vf-module-lanport-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2084.4551391601562,\r
-        "y": 536.4241542816162,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2072.4590454101562,\r
+        "y": 541.0104961395264,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1adddcaf.a133d3",\r
+        "id": "cc302ad2.335ad8",\r
         "type": "for",\r
         "name": "for vf-modules.vf-module_length",\r
         "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 891.2540740966797,\r
-        "y": 541.4176807403564,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 879.2579803466797,\r
+        "y": 546.0040225982666,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "8d8ac8b6.f23b18"\r
+                "58d4b8d7.026f28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc689d86.6d6b1",\r
+        "id": "ffc92a35.504858",\r
         "type": "switchNode",\r
         "name": "switch this deviceName == vf-input",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == '$prop.lan.deviceName'`\">\n    \n",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == $prop.lan.deviceName`\">\n    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1164.2543182373047,\r
-        "y": 627.417786359787,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1152.2582244873047,\r
+        "y": 632.0041282176971,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "ec201f5b.98b55"\r
+                "753161a4.e4105"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d8ac8b6.f23b18",\r
+        "id": "58d4b8d7.026f28",\r
         "type": "for",\r
         "name": "for vf-module-input-param length",\r
         "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1189.2539901733398,\r
-        "y": 544.4177227020264,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1177.2578964233398,\r
+        "y": 549.0040645599365,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "cc689d86.6d6b1"\r
+                "ffc92a35.504858"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec201f5b.98b55",\r
+        "id": "753161a4.e4105",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1378.2541313171387,\r
-        "y": 624.4177711009979,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1366.2580375671387,\r
+        "y": 629.0041129589081,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "137ad5db.05e33a"\r
+                "530b71d0.67585"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42b7ec46.f75e94",\r
+        "id": "db40c5ed.6ed418",\r
         "type": "for",\r
         "name": "for vf-modules.vf-module_length",\r
         "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1767.254322052002,\r
-        "y": 621.4179258346558,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1755.258228302002,\r
+        "y": 626.0042676925659,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "6fa7e982.f0f398"\r
+                "e3d2d09b.6274e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6fa7e982.f0f398",\r
+        "id": "e3d2d09b.6274e",\r
         "type": "switchNode",\r
         "name": "switch deviceId == input vf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'deviceId'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2059.2542114257812,\r
-        "y": 622.4178848266602,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2047.2581176757812,\r
+        "y": 627.0042266845703,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "a93d7d08.b19f3"\r
+                "9b1b7b47.77c908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a93d7d08.b19f3",\r
+        "id": "9b1b7b47.77c908",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2258.254379272461,\r
-        "y": 620.4178848266602,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2246.258285522461,\r
+        "y": 625.0042266845703,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "8ce50095.7309f"\r
+                "6eb0efd.3e47b1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ce50095.7309f",\r
+        "id": "6eb0efd.3e47b1",\r
         "type": "set",\r
         "name": "set prop.lan.deviceId",\r
         "xml": "<set>\n<parameter name='prop.lan.deviceId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
         "comments": "",\r
-        "x": 2431.254383087158,\r
-        "y": 620.4179258346558,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2419.258289337158,\r
+        "y": 625.0042676925659,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6331828e.70aa2c",\r
+        "id": "1c23a104.8b10df",\r
         "type": "for",\r
         "name": "for service-data.vnfs.vnf_length",\r
         "xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 637.2539215087891,\r
-        "y": 476.4176778793335,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 625.2578277587891,\r
+        "y": 481.00401973724365,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "1adddcaf.a133d3"\r
+                "cc302ad2.335ad8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "125425fb.ef4bfa",\r
+        "id": "427eb2b2.29a19c",\r
         "type": "switchNode",\r
         "name": "switch ActivateSDWANSiteInstance",\r
         "xml": "<!--switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\"-->\n<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1232.0042877197266,\r
-        "y": 748.417646408081,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1220.0081939697266,\r
+        "y": 753.0039882659912,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "7336ac27.633e24"\r
+                "d5fc4f12.f3715"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38f21693.f6208a",\r
+        "id": "9c314385.3cccd",\r
         "type": "for",\r
         "name": "for vf-modules.vf-module_length",\r
         "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 765.0041732788086,\r
-        "y": 819.4176635742188,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 753.0080795288086,\r
+        "y": 824.0040054321289,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "e28cdf4a.09f99"\r
+                "f0f279f1.f5aee8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58afb0e4.ba7df",\r
+        "id": "c0a9943e.0b6a78",\r
         "type": "for",\r
         "name": "for service-data.vnfs.vnf_length",\r
         "xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 629.0039825439453,\r
-        "y": 646.4175662994385,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 617.0078887939453,\r
+        "y": 651.0039081573486,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "74d2892.3a20c78"\r
+                "a69a253a.e8e958"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7336ac27.633e24",\r
+        "id": "d5fc4f12.f3715",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1454.0042037963867,\r
-        "y": 748.4177279472351,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1442.0081100463867,\r
+        "y": 753.0040698051453,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "6d31748d.e3c9bc"\r
+                "41fe08aa.15b428"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d31748d.e3c9bc",\r
+        "id": "41fe08aa.15b428",\r
         "type": "for",\r
         "name": "for vf-modules.vf-module_length",\r
         "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1535.2542114257812,\r
-        "y": 822.9177293777466,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1523.2581176757812,\r
+        "y": 827.5040712356567,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "7cb6a87.6e3f758"\r
+                "687fd9fe.041c58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1008121d.0f833e",\r
+        "id": "703289c8.f0d638",\r
         "type": "switchNode",\r
         "name": "switch siteId",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'siteId'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1918.2545700073242,\r
-        "y": 829.9178366661072,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1906.2584762573242,\r
+        "y": 834.5041785240173,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "7c572003.6098f"\r
+                "b38ab304.d8ca8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c572003.6098f",\r
+        "id": "b38ab304.d8ca8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2095.2545890808105,\r
-        "y": 832.9176769256592,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2083.2584953308105,\r
+        "y": 837.5040187835693,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "8daf5324.de268"\r
+                "3a704ef2.91c232"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63cd961f.c156c8",\r
+        "id": "97126ca9.bd5cb",\r
         "type": "set",\r
         "name": "set prop.attach.siteId",\r
         "xml": "<set>\n<parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
         "comments": "",\r
-        "x": 2479.255096435547,\r
-        "y": 806.9177284240723,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2467.259002685547,\r
+        "y": 811.5040702819824,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8daf5324.de268",\r
+        "id": "3a704ef2.91c232",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2254.504779815674,\r
-        "y": 828.4177169799805,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2242.508686065674,\r
+        "y": 833.0040588378906,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "63cd961f.c156c8",\r
-                "4f58a0f5.56037",\r
-                "975b7faf.1862a"\r
+                "97126ca9.bd5cb",\r
+                "82be127b.4ba08",\r
+                "e04e88b3.6b7888"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89ba2ad0.277798",\r
+        "id": "37a0c49e.52f2ec",\r
         "type": "get-resource",\r
         "name": "get-resource esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 590.0039291381836,\r
-        "y": 965.9176549911499,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 578.0078353881836,\r
+        "y": 970.5039968490601,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "2d233c53.3f6be4",\r
-                "f1938aaa.240958",\r
-                "46bd4734.d48208"\r
+                "737a26fd.e1dab8",\r
+                "dacb633c.487af",\r
+                "48a17fc2.d83c5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d233c53.3f6be4",\r
+        "id": "737a26fd.e1dab8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 834.0039901733398,\r
-        "y": 929.9176549911499,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 822.0078964233398,\r
+        "y": 934.5039968490601,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "157032ce.bbb88d"\r
+                "e7e7ee2.fc0eb1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1938aaa.240958",\r
+        "id": "dacb633c.487af",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 836.494873046875,\r
-        "y": 965.4916915893555,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 824.498779296875,\r
+        "y": 970.0780334472656,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "4af9366b.00d608"\r
+                "3d818670.7778da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "46bd4734.d48208",\r
+        "id": "48a17fc2.d83c5",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 831.827880859375,\r
-        "y": 1001.8250503540039,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 819.831787109375,\r
+        "y": 1006.4113922119141,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "3961a91d.651c56"\r
+                "42fa81a1.deae7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3961a91d.651c56",\r
+        "id": "42fa81a1.deae7",\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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 985.6003723144531,\r
-        "y": 999.2641372680664,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 973.6042785644531,\r
+        "y": 1003.8504791259766,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4af9366b.00d608",\r
+        "id": "3d818670.7778da",\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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 982.0662689208984,\r
-        "y": 963.7773790359497,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 970.0701751708984,\r
+        "y": 968.3637208938599,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "157032ce.bbb88d",\r
+        "id": "e7e7ee2.fc0eb1",\r
         "type": "set",\r
         "name": "set controller data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",\r
         "comments": "",\r
-        "x": 994.5041007995605,\r
-        "y": 927.917594909668,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 982.5080070495605,\r
+        "y": 932.5039367675781,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e99d476c.3f3ac8",\r
+        "id": "88d74976.c878b8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Get token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 603.9421615600586,\r
-        "y": 1069.03874874115,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 591.9460678100586,\r
+        "y": 1073.62509059906,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "e801e029.f1d5a",\r
-                "8d93013.82561"\r
+                "76d84be1.6ba5b4",\r
+                "93f8c0dc.5b81e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e801e029.f1d5a",\r
+        "id": "76d84be1.6ba5b4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 838.9422874450684,\r
-        "y": 1055.038737297058,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 826.9461936950684,\r
+        "y": 1059.6250791549683,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "aaae6df9.4c056"\r
+                "f2b8e32a.bae75"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d93013.82561",\r
+        "id": "93f8c0dc.5b81e",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 838.1922874450684,\r
-        "y": 1090.6816444396973,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 826.1961936950684,\r
+        "y": 1095.2679862976074,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "5e0c2f7e.4b122"\r
+                "f416c022.785c9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e0c2f7e.4b122",\r
+        "id": "f416c022.785c9",\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=\"Error executing get token rest api\" />\n",\r
         "comments": "",\r
-        "x": 986.9422950744629,\r
-        "y": 1091.4317264556885,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 974.9462013244629,\r
+        "y": 1096.0180683135986,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aaae6df9.4c056",\r
+        "id": "f2b8e32a.bae75",\r
         "type": "set",\r
         "name": "set token-id",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",\r
         "comments": "",\r
-        "x": 980.9422950744629,\r
-        "y": 1054.0387382507324,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 968.9462013244629,\r
+        "y": 1058.6250801086426,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e8785c39.cc512",\r
+        "id": "b028cd6d.5db14",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode device port delete",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-port-del.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports/action/batch-delete'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"portResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 630.0312576293945,\r
-        "y": 1220.4918870925903,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 618.0351638793945,\r
+        "y": 1225.0782289505005,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "552b4230.a57a2c",\r
-                "a21ab43e.f1ce68"\r
+                "fb8d6372.3f4b4",\r
+                "48c81a07.925bc4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "552b4230.a57a2c",\r
+        "id": "fb8d6372.3f4b4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 879.0313167572021,\r
-        "y": 1234.4920930862427,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 867.0352230072021,\r
+        "y": 1239.0784349441528,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "d1a4e04e.60501"\r
+                "a8972b96.6e4798"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a21ab43e.f1ce68",\r
+        "id": "48c81a07.925bc4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 879.0313167572021,\r
-        "y": 1196.491928577423,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 867.0352230072021,\r
+        "y": 1201.0782704353333,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "54a6d547.da0aec"\r
+                "2b546f30.f74b7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "54a6d547.da0aec",\r
+        "id": "2b546f30.f74b7",\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=\"Error executing Create device port rest api\" />\n",\r
         "comments": "",\r
-        "x": 1023.0316505432129,\r
-        "y": 1195.491928100586,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1011.0355567932129,\r
+        "y": 1200.078269958496,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d1a4e04e.60501",\r
+        "id": "a8972b96.6e4798",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1026.031328201294,\r
-        "y": 1235.4919319152832,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1014.035234451294,\r
+        "y": 1240.0782737731934,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c5c8c91e.ca8b48",\r
+        "id": "7630dbec.718c24",\r
         "type": "comment",\r
         "name": "Delete port",\r
         "info": "",\r
         "comments": "",\r
-        "x": 531.6971969604492,\r
-        "y": 1186.9359111785889,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 519.7011032104492,\r
+        "y": 1191.522253036499,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "81163bc0.74e178",\r
+        "id": "7eaf7940.931d68",\r
         "type": "call",\r
         "name": "call sdwan-get-tenant-auth",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 578.6971969604492,\r
-        "y": 1135.6023473739624,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 566.7011032104492,\r
+        "y": 1140.1886892318726,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a939bddc.25a0a",\r
+        "id": "ea684fc6.056a2",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode bridge domain create",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-bridge-domain.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/bridge-domains'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"bridgeDomainResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1052.6815071105957,\r
-        "y": 1315.6025159358978,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1040.6854133605957,\r
+        "y": 1320.188857793808,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "991e6562.cad008",\r
-                "a675752c.fef5c8"\r
+                "3b59cd60.020932",\r
+                "c2414827.1f0308"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "991e6562.cad008",\r
+        "id": "3b59cd60.020932",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1373.6815338134766,\r
-        "y": 1332.6028363704681,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1361.6854400634766,\r
+        "y": 1337.1891782283783,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "fb3cfb9f.764a18"\r
+                "ce1097ce.dee208"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a675752c.fef5c8",\r
+        "id": "c2414827.1f0308",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1376.6815605163574,\r
-        "y": 1297.6026179790497,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1364.6854667663574,\r
+        "y": 1302.1889598369598,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "92f1575b.a1bfb8"\r
+                "eb07b224.53901"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92f1575b.a1bfb8",\r
+        "id": "eb07b224.53901",\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=\"Error executing Create bridge domain rest api\" />\n",\r
         "comments": "",\r
-        "x": 1579.6819496154785,\r
-        "y": 1293.6027252674103,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1567.6858558654785,\r
+        "y": 1298.1890671253204,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fb3cfb9f.764a18",\r
+        "id": "ce1097ce.dee208",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1580.6815147399902,\r
-        "y": 1328.602591753006,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1568.6854209899902,\r
+        "y": 1333.1889336109161,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d50d1b79.abf9a8",\r
+        "id": "fb63c3bc.ee861",\r
         "type": "comment",\r
         "name": "Create bridge domain",\r
         "info": "",\r
         "comments": "",\r
-        "x": 996.3474006652832,\r
-        "y": 1282.0467417240143,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 984.3513069152832,\r
+        "y": 1286.6330835819244,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "60ca269e.96d878",\r
+        "id": "ea24678.936eb98",\r
         "type": "switchNode",\r
         "name": "switch portSwitch",\r
         "xml": "<switch test=\"`$prop.lan.portSwitch == 'layer2-port'`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 561.4590759277344,\r
-        "y": 1331.2692050933838,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 549.4629821777344,\r
+        "y": 1335.855546951294,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "13b85938.8b9cd7"\r
+                "3354418d.f828fe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13b85938.8b9cd7",\r
+        "id": "3354418d.f828fe",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 749.4590034484863,\r
-        "y": 1329.3805322647095,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 737.4629096984863,\r
+        "y": 1333.9668741226196,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "a939bddc.25a0a"\r
+                "ea684fc6.056a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba5b2145.40753",\r
+        "id": "1a442450.4a365c",\r
         "type": "execute",\r
         "name": "execute split ip and mask",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.lan.ipAddress`'/>\n<parameter name=\"regex\" value=\"/\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"ipandMask\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 577.0039672851562,\r
-        "y": 1417.1676979064941,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 565.0078735351562,\r
+        "y": 1421.7540397644043,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "575235a2.fb9bbc",\r
-                "3c20212c.49fade"\r
+                "9d1d8447.931768",\r
+                "a4c1e51b.fe66b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c20212c.49fade",\r
+        "id": "a4c1e51b.fe66b8",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 778.0039863586426,\r
-        "y": 1395.1676893234253,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 766.0078926086426,\r
+        "y": 1399.7540311813354,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "bdf015ad.4678f8"\r
+                "1daa2649.cf0d8a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "575235a2.fb9bbc",\r
+        "id": "9d1d8447.931768",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 778.0039901733398,\r
-        "y": 1436.1676931381226,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 766.0078964233398,\r
+        "y": 1440.7540349960327,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "133c89f4.2a7c76"\r
+                "77f9f3ef.24297c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bdf015ad.4678f8",\r
+        "id": "1daa2649.cf0d8a",\r
         "type": "set",\r
         "name": "set ipAddress prefixLength",\r
         "xml": "<set>\n<parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />",\r
         "comments": "",\r
-        "x": 975.0040054321289,\r
-        "y": 1393.1676893234253,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 963.0079116821289,\r
+        "y": 1397.7540311813354,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "133c89f4.2a7c76",\r
+        "id": "77f9f3ef.24297c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 933.0039978027344,\r
-        "y": 1433.1676921844482,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 921.0079040527344,\r
+        "y": 1437.7540340423584,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "372eb63a.83ff6a",\r
+        "id": "623ff011.75e11",\r
         "type": "comment",\r
         "name": "TODO: split ip/mask",\r
         "info": "",\r
         "comments": "",\r
-        "x": 974.0136375427246,\r
-        "y": 1355.3479614257812,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 962.0175437927246,\r
+        "y": 1359.9343032836914,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "86da8112.f0417",\r
+        "id": "b07d774b.c67f18",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode IPSubnets delete",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-ip-subnets-del.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/ip-subnets/action/batch-delete'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"lanPortResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 635.7753372192383,\r
-        "y": 1493.2885875701904,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 623.7792434692383,\r
+        "y": 1497.8749294281006,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "15bd3770.c63fa9",\r
-                "248a192b.d86396"\r
+                "fb6426f0.aef3a8",\r
+                "334c3bc2.ea5ee4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "248a192b.d86396",\r
+        "id": "334c3bc2.ea5ee4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 904.7753677368164,\r
-        "y": 1480.2885599136353,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 892.7792739868164,\r
+        "y": 1484.8749017715454,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "616ee6f.3d9a718"\r
+                "1de305ac.79165a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15bd3770.c63fa9",\r
+        "id": "fb6426f0.aef3a8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 901.7753410339355,\r
-        "y": 1515.2887783050537,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 889.7792472839355,\r
+        "y": 1519.8751201629639,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "40c5dea7.9b57"\r
+                "e16c200f.f574"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "616ee6f.3d9a718",\r
+        "id": "1de305ac.79165a",\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=\"Error executing Create device port rest api\" />\n",\r
         "comments": "",\r
-        "x": 1057.775749206543,\r
-        "y": 1476.2887859344482,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1045.779655456543,\r
+        "y": 1480.8751277923584,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40c5dea7.9b57",\r
+        "id": "e16c200f.f574",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1048.7753219604492,\r
-        "y": 1516.2885341644287,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1036.7792282104492,\r
+        "y": 1520.8748760223389,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "339192eb.51711e"\r
+                "3689e594.d6f2aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "339192eb.51711e",\r
+        "id": "3689e594.d6f2aa",\r
         "type": "set",\r
         "name": "set prop.lan.lanPortId",\r
         "xml": "<set>\n<parameter name='prop.lan.lanPortId' value='`lanPortResp.success[0].id`' />\n",\r
         "comments": "",\r
-        "x": 1255.6644248962402,\r
-        "y": 1518.622000694275,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1243.6683311462402,\r
+        "y": 1523.208342552185,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6c0bf23f.5303ac",\r
+        "id": "6e845a3.14ef3a4",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode create vpn topology",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn1Id + '/topology'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 652.2857360839844,\r
-        "y": 1651.7474851608276,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 640.2896423339844,\r
+        "y": 1656.3338270187378,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "6503000e.7fe09",\r
-                "f95d774d.951318"\r
+                "f2309f9f.30389",\r
+                "436824e6.cfd19c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f95d774d.951318",\r
+        "id": "436824e6.cfd19c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 898.2856712341309,\r
-        "y": 1687.7468357086182,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 886.2895774841309,\r
+        "y": 1692.3331775665283,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "1f602715.4e71b9"\r
+                "cc161513.6096e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f602715.4e71b9",\r
+        "id": "cc161513.6096e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1070.2856121063232,\r
-        "y": 1701.7468520402908,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1058.2895183563232,\r
+        "y": 1706.333193898201,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7c916735.dbf778",\r
+        "id": "f1b7a0fd.a1f56",\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=\"Error executing Create vpn topology failed\" />\n",\r
         "comments": "",\r
-        "x": 1070.2857341766357,\r
-        "y": 1657.7468520402908,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1058.2896404266357,\r
+        "y": 1662.333193898201,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6503000e.7fe09",\r
+        "id": "f2309f9f.30389",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 902.2855892181396,\r
-        "y": 1645.7468347549438,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 890.2894954681396,\r
+        "y": 1650.333176612854,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "7c916735.dbf778"\r
+                "f1b7a0fd.a1f56"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b5c8466.72828c",\r
+        "id": "c2a2820.4e02d8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode create vpn ",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 619.2841186523438,\r
-        "y": 1585.246587753296,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 607.2880249023438,\r
+        "y": 1589.832929611206,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "593d6e8d.d4036",\r
-                "22423ed9.18f8e2"\r
+                "5dca5344.cc070c",\r
+                "f5dbcc17.8c2d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22423ed9.18f8e2",\r
+        "id": "f5dbcc17.8c2d6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 844.2840175628662,\r
-        "y": 1605.246500134468,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 832.2879238128662,\r
+        "y": 1609.8328419923782,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "b88f4563.6b6768"\r
+                "ffd8c00c.52d8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b88f4563.6b6768",\r
+        "id": "ffd8c00c.52d8c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1014.28395652771,\r
-        "y": 1608.246500134468,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1002.28786277771,\r
+        "y": 1612.8328419923782,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a724847c.2c4088",\r
+        "id": "60415.0a145bec",\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=\"Error executing Create vpn failed\" />\n",\r
         "comments": "",\r
-        "x": 1014.2840785980225,\r
-        "y": 1564.246500134468,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1002.2879848480225,\r
+        "y": 1568.8328419923782,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "593d6e8d.d4036",\r
+        "id": "5dca5344.cc070c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 847.28395652771,\r
-        "y": 1564.246500134468,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 835.28786277771,\r
+        "y": 1568.8328419923782,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "a724847c.2c4088"\r
+                "60415.0a145bec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f47d1c3.9d407e",\r
+        "id": "55cb7e10.b843e",\r
         "type": "switchNode",\r
         "name": "switch ActivateSDWANVpnInstance",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1210.2859420776367,\r
-        "y": 869.7469148635864,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1198.2898483276367,\r
+        "y": 874.3332567214966,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "6200b940.359218"\r
+                "35e81d22.6ca8a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e28cdf4a.09f99",\r
+        "id": "f0f279f1.f5aee8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 967.6190452575684,\r
-        "y": 798.746994972229,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 955.6229515075684,\r
+        "y": 803.3333368301392,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "125425fb.ef4bfa",\r
-                "1f47d1c3.9d407e",\r
-                "712ec051.8d2a6"\r
+                "427eb2b2.29a19c",\r
+                "55cb7e10.b843e",\r
+                "ee6738c4.de8eb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6200b940.359218",\r
+        "id": "35e81d22.6ca8a2",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1305.9524536132812,\r
-        "y": 943.7469959259033,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1293.9563598632812,\r
+        "y": 948.3333377838135,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "309bb160.fe92de"\r
+                "50c0c92c.64de28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "309bb160.fe92de",\r
+        "id": "50c0c92c.64de28",\r
         "type": "for",\r
         "name": "for vf-modules.vf-module_length",\r
         "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1520.2023391723633,\r
-        "y": 945.2469725608826,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1508.2062454223633,\r
+        "y": 949.8333144187927,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "1ac88e91.8c9681"\r
+                "759cda21.f2dc74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1ac88e91.8c9681",\r
+        "id": "759cda21.f2dc74",\r
         "type": "switchNode",\r
         "name": "switch vpn-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1767.202377319336,\r
-        "y": 940.2470555305481,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1755.206283569336,\r
+        "y": 944.8333973884583,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "3a5e3420.dfdfbc"\r
+                "848c4744.1c01a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a5e3420.dfdfbc",\r
+        "id": "848c4744.1c01a8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1917.9523315429688,\r
-        "y": 941.7469711303711,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1905.9562377929688,\r
+        "y": 946.3333129882812,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "f542060.75c12f8"\r
+                "3b552595.502b8a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f542060.75c12f8",\r
+        "id": "3b552595.502b8a",\r
         "type": "set",\r
         "name": "set prop.vpn1Id",\r
         "xml": "<set>\n<parameter name='prop.vpn1Id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
         "comments": "",\r
-        "x": 2091.953079223633,\r
-        "y": 941.747029542923,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2079.956985473633,\r
+        "y": 946.3333714008331,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4f58a0f5.56037",\r
+        "id": "82be127b.4ba08",\r
         "type": "set",\r
         "name": "Add sites to list and update length",\r
         "xml": "<set>\n<parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n",\r
         "comments": "",\r
-        "x": 2522.2864532470703,\r
-        "y": 847.747029542923,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2510.2903594970703,\r
+        "y": 852.3333714008331,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "975b7faf.1862a",\r
+        "id": "e04e88b3.6b7888",\r
         "type": "set",\r
         "name": "Add site attachement to list and update length",\r
         "xml": "<set>\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\n<parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n",\r
         "comments": "",\r
-        "x": 2553.286346435547,\r
-        "y": 890.7469959259033,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2541.290252685547,\r
+        "y": 895.3333377838135,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d3ab3217.7d57a",\r
+        "id": "76875429.7977ec",\r
         "type": "set",\r
         "name": "set prop.siteAttachement_length=0",\r
         "xml": "<set>\n<parameter name='prop.siteAttachements_length' value='0' />\n<parameter name='prop.siteIds_length' value='0' />\n\n\n\n",\r
         "comments": "",\r
-        "x": 639.2857208251953,\r
-        "y": 595.7469882965088,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 627.2896270751953,\r
+        "y": 600.333330154419,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7cb6a87.6e3f758",\r
+        "id": "687fd9fe.041c58",\r
         "type": "block",\r
         "name": "block atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1752.6193771362305,\r
-        "y": 823.7469940185547,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1740.6232833862305,\r
+        "y": 828.3333358764648,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "1008121d.0f833e",\r
-                "38f1f3d9.ea90fc",\r
-                "65c7e0ab.e924d"\r
+                "703289c8.f0d638",\r
+                "7c3e64c6.118e7c",\r
+                "fd5e762b.9175c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38f1f3d9.ea90fc",\r
+        "id": "7c3e64c6.118e7c",\r
         "type": "switchNode",\r
         "name": "switch role",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'role'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1914.9523086547852,\r
-        "y": 754.7469930648804,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1902.9562149047852,\r
+        "y": 759.3333349227905,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "e4b2cfb7.2be02"\r
+                "9d3d23c.1af69e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e4b2cfb7.2be02",\r
+        "id": "9d3d23c.1af69e",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2077.9523124694824,\r
-        "y": 749.7469940185547,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2065.9562187194824,\r
+        "y": 754.3333358764648,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "cbd09e2f.5bc81"\r
+                "b50c3782.0e6ad8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cbd09e2f.5bc81",\r
+        "id": "b50c3782.0e6ad8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2245.9523544311523,\r
-        "y": 743.746992111206,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2233.9562606811523,\r
+        "y": 748.3333339691162,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "3c601cb.4b2f2e4",\r
-                "2d319605.7a6e9a"\r
+                "1dffa18.8cf065f",\r
+                "4b307f30.7cc1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d319605.7a6e9a",\r
+        "id": "4b307f30.7cc1",\r
         "type": "switchNode",\r
         "name": "switch sd-wan-edge",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'sd-wan-edge'`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2440.9524841308594,\r
-        "y": 704.7469835281372,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2428.9563903808594,\r
+        "y": 709.3333253860474,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "bb6dcfdd.128fa"\r
+                "fcbf0bd1.06d8d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c601cb.4b2f2e4",\r
+        "id": "1dffa18.8cf065f",\r
         "type": "switchNode",\r
         "name": "switch dsvpn-hub",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'dsvpn-hub'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2437.952590942383,\r
-        "y": 759.7469990253448,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2425.956497192383,\r
+        "y": 764.333340883255,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "b131819c.daa97"\r
+                "99c61a76.666788"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91128780.38fd08",\r
+        "id": "4a479c02.0630f4",\r
         "type": "set",\r
         "name": "set spoke role",\r
         "xml": "<set>\n<parameter name='prop.role' value=\"spoke\" />\n",\r
         "comments": "",\r
-        "x": 2770.952606201172,\r
-        "y": 698.7470293045044,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2758.956512451172,\r
+        "y": 703.3333711624146,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c4199cad.d68d",\r
+        "id": "5e79562c.63b268",\r
         "type": "set",\r
         "name": "set hub role",\r
         "xml": "<set>\n<parameter name='prop.role' value=\"hub\" />\n",\r
         "comments": "",\r
-        "x": 2769.952365875244,\r
-        "y": 753.747013092041,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2757.956272125244,\r
+        "y": 758.3333549499512,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bb6dcfdd.128fa",\r
+        "id": "fcbf0bd1.06d8d8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2610.9524536132812,\r
-        "y": 700.4136581420898,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2598.9563598632812,\r
+        "y": 705,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "91128780.38fd08"\r
+                "4a479c02.0630f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b131819c.daa97",\r
+        "id": "99c61a76.666788",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2614.9524536132812,\r
-        "y": 755.4136581420898,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 2602.9563598632812,\r
+        "y": 760,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "c4199cad.d68d"\r
+                "5e79562c.63b268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "16e6f83a.5e7ff8",\r
+        "id": "715f7228.db42ac",\r
         "type": "update",\r
         "name": "update SDWAN VPN status to AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n      key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='PendingDelete' />\n<parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 617.3170700073242,\r
-        "y": 1867.4452047348022,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 605.3209762573242,\r
+        "y": 1872.0315465927124,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "65c7e0ab.e924d",\r
+        "id": "fd5e762b.9175c8",\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/svclogic23.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"param-name\"/>\n<parameter name=\"field3\" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name`'/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1910.3169555664062,\r
-        "y": 698.9449081420898,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1898.3208618164062,\r
+        "y": 703.53125,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "712ec051.8d2a6",\r
+        "id": "ee6738c4.de8eb8",\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/svclogic24.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"request-action\"/>\n<parameter name=\"field3\" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action`'/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1153.3171730041504,\r
-        "y": 699.9450273513794,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1141.3210792541504,\r
+        "y": 704.5313692092896,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "500d4c8a.78bee4",\r
+        "id": "5ab12293.b61a8c",\r
         "type": "comment",\r
         "name": "**revert the changes",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1311.316982269287,\r
-        "y": 704.4449405670166,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1299.320888519287,\r
+        "y": 709.0312824249268,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "137ad5db.05e33a",\r
+        "id": "530b71d0.67585",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1536.3333740234375,\r
-        "y": 621.6667051315308,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1524.3372802734375,\r
+        "y": 626.2530469894409,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "42b7ec46.f75e94",\r
-                "5c976c54.43c564"\r
+                "db40c5ed.6ed418",\r
+                "68d688c3.70e818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c976c54.43c564",\r
+        "id": "68d688c3.70e818",\r
         "type": "set",\r
         "name": "set prop.vnf-id",\r
         "xml": "<set>\n<parameter name='prop.vnf-id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-id`' />\n\n",\r
         "comments": "",\r
-        "x": 1728.0000495910645,\r
-        "y": 551.6666831970215,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 1716.0039558410645,\r
+        "y": 556.2530250549316,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "74d2892.3a20c78",\r
+        "id": "a69a253a.e8e958",\r
         "type": "switchNode",\r
         "name": "switch prop.vnf-id match",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-id == $prop.vnf-id`\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 886.0003509521484,\r
-        "y": 673.0000200271606,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 874.0042572021484,\r
+        "y": 677.5863618850708,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "cfdd9f28.400e6"\r
+                "5ecfed21.a77fb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cfdd9f28.400e6",\r
+        "id": "5ecfed21.a77fb4",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 674.0005035400391,\r
-        "y": 748.0000233650208,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 662.0044097900391,\r
+        "y": 752.5863652229309,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": [\r
             [\r
-                "38f21693.f6208a"\r
+                "9c314385.3cccd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fef5106c.cc924",\r
+        "id": "efed662f.81b6a8",\r
         "type": "comment",\r
         "name": "if device-name match with the incomming device-name,  sites in this service vnf should not be included",\r
         "info": "",\r
         "comments": "",\r
-        "x": 749.0000915527344,\r
-        "y": 845.0000410079956,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 737.0039978027344,\r
+        "y": 849.5863828659058,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2ee3209f.a1bb9",\r
+        "id": "728a6387.ded5dc",\r
         "type": "set",\r
         "name": "copy input data to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",\r
         "comments": "",\r
-        "x": 605.0000915527344,\r
-        "y": 1719.6667194366455,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 593.0039978027344,\r
+        "y": 1724.2530612945557,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bfac8597.a517f8",\r
+        "id": "d768a494.487678",\r
         "type": "set",\r
         "name": "set vf-module-id and vf-module-object-path",\r
         "xml": "<set>\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
         "comments": "",\r
-        "x": 639.3032913208008,\r
-        "y": 1763.4698286056519,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 627.3071975708008,\r
+        "y": 1768.056170463562,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b282b047.e838d",\r
+        "id": "24c5eb03.2a37b4",\r
         "type": "set",\r
         "name": "set vf-module-level-oper-status",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status'  value='PendingDelete' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",\r
         "comments": "",\r
-        "x": 606.3033180236816,\r
-        "y": 1816.4698705673218,\r
-        "z": "2a0755d2.04892a",\r
+        "x": 594.3072242736816,\r
+        "y": 1821.056212425232,\r
+        "z": "eb27f9f.1aaf508",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b36b6e5f.5d733",\r
+        "type": "switchNode",\r
+        "name": "switch vnf-index",\r
+        "xml": "<switch test='`$vnf-index`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 596.00390625,\r
+        "y": 287.00390625,\r
+        "z": "eb27f9f.1aaf508",\r
+        "wires": [\r
+            [\r
+                "eab1927d.01f0a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "eab1927d.01f0a",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 758.0039520263672,\r
+        "y": 286.0039052963257,\r
+        "z": "eb27f9f.1aaf508",\r
+        "wires": [\r
+            [\r
+                "a638e200.1e293"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a638e200.1e293",\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 id not found in service-data\" />\n",\r
+        "comments": "",\r
+        "x": 907.2540435791016,\r
+        "y": 283.78178310394287,\r
+        "z": "eb27f9f.1aaf508",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
index 012deec..d66530d 100644 (file)
@@ -1,22 +1,22 @@
 [\r
     {\r
-        "id": "a54d86da.b0b4c8",\r
+        "id": "5b377527.318dfc",\r
         "type": "method",\r
         "name": "method sdwan-vf-operation-lanport-delete",\r
         "xml": "<method rpc='sdwan-vf-operation-lanport-delete' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 234.00000762939453,\r
-        "y": 230.00012350082397,\r
-        "z": "1f04287d.306418",\r
+        "x": 289.00390625,\r
+        "y": 239.5863505601883,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "4d4d77e8.c38938"\r
+                "b6ef6d6.088219"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db831233.33e69",\r
+        "id": "5fa9c4d6.4ec86c",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 222.28571319580078,\r
-        "y": 130.65188121795654,\r
-        "z": "1f04287d.306418",\r
+        "x": 277.28961181640625,\r
+        "y": 140.23810827732086,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "a54d86da.b0b4c8"\r
+                "5b377527.318dfc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62c65238.af2cac",\r
+        "id": "3e4efa76.6244b6",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 143.00000762939453,\r
-        "y": 68.4137716293335,\r
-        "z": "1f04287d.306418",\r
+        "x": 198.00390625,\r
+        "y": 77.99999868869781,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "db831233.33e69"\r
+                "5fa9c4d6.4ec86c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d4d77e8.c38938",\r
+        "id": "b6ef6d6.088219",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 250.66670989990234,\r
-        "y": 459.080491065979,\r
-        "z": "1f04287d.306418",\r
+        "x": 305.6706085205078,\r
+        "y": 468.6667181253433,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "26d66719.d43da8",\r
-                "e7e6cf90.f4145",\r
-                "2040df5d.c513d",\r
-                "58084a37.394334",\r
-                "8cf55d8b.9b86e",\r
-                "6f98bfc7.8211a",\r
-                "b57e1a43.a54548",\r
-                "9d1a9cea.dd56",\r
-                "49881624.abb0c8",\r
-                "c5683ab4.530598",\r
-                "d5b959e7.7e0cc8",\r
-                "d3e08866.ee2d18"\r
+                "71f387b9.003178",\r
+                "a6a43527.61a1e8",\r
+                "4d09affd.63ec7",\r
+                "158609f4.fc8936",\r
+                "7132f9a1.7bd008",\r
+                "379a2e2e.3a8382",\r
+                "6e5f86e6.881a38",\r
+                "13d12ad9.b40a25",\r
+                "50901066.93c6f",\r
+                "71b32013.3584b",\r
+                "c59a5d45.5b06a",\r
+                "4315ff0e.d57d4",\r
+                "cd89e451.16b298"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e7e6cf90.f4145",\r
+        "id": "a6a43527.61a1e8",\r
         "type": "for",\r
         "name": "for each vnf",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 566.0313720703125,\r
-        "y": 304.6829128265381,\r
-        "z": "1f04287d.306418",\r
+        "x": 640.0352554321289,\r
+        "y": 249.26914072036743,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "7275fe1.35167"\r
+                "5c4cd934.c95538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26d66719.d43da8",\r
+        "id": "71f387b9.003178",\r
         "type": "switchNode",\r
         "name": "switch vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 571.0000267028809,\r
-        "y": 243.41378211975098,\r
-        "z": "1f04287d.306418",\r
+        "x": 645.0039100646973,\r
+        "y": 188.00001001358032,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "4f7f751d.4ffa8c"\r
+                "ec17d276.93fee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f7f751d.4ffa8c",\r
+        "id": "ec17d276.93fee",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 751.0000076293945,\r
-        "y": 242.4137716293335,\r
-        "z": "1f04287d.306418",\r
+        "x": 825.0038909912109,\r
+        "y": 186.99999952316284,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "b8464fa4.268c7"\r
+                "2a49b970.30fb16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b8464fa4.268c7",\r
+        "id": "2a49b970.30fb16",\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.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 900.4287338256836,\r
-        "y": 243.55668926239014,\r
-        "z": "1f04287d.306418",\r
+        "x": 974.4326171875,\r
+        "y": 188.14291715621948,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7275fe1.35167",\r
+        "id": "5c4cd934.c95538",\r
         "type": "switchNode",\r
         "name": "switch this vnf-id == input vnf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 789.0000228881836,\r
-        "y": 305.41377782821655,\r
-        "z": "1f04287d.306418",\r
+        "x": 863.00390625,\r
+        "y": 250.0000057220459,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "2f21af21.529ff"\r
+                "2a4d20b9.66aac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f21af21.529ff",\r
+        "id": "2a4d20b9.66aac",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1004.0000076293945,\r
-        "y": 303.4137716293335,\r
-        "z": "1f04287d.306418",\r
+        "x": 1078.003890991211,\r
+        "y": 247.99999952316284,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "a1139d12.89e01"\r
+                "991cadde.a1c2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1139d12.89e01",\r
+        "id": "991cadde.a1c2",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1168.0000076293945,\r
-        "y": 298.4137716293335,\r
-        "z": "1f04287d.306418",\r
+        "x": 1242.003890991211,\r
+        "y": 242.99999952316284,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2040df5d.c513d",\r
+        "id": "4d09affd.63ec7",\r
         "type": "switchNode",\r
         "name": "switch vf-modules.vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 637.0000419616699,\r
-        "y": 381.4137964248657,\r
-        "z": "1f04287d.306418",\r
+        "x": 692.0039405822754,\r
+        "y": 391.00002348423004,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "6da138cf.958678",\r
-                "2a607157.3c86fe",\r
-                "9b455cd1.ad8b9"\r
+                "7db8009f.80aa9",\r
+                "7fce8758.381048",\r
+                "58a4a3cc.ac1abc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a607157.3c86fe",\r
+        "id": "7fce8758.381048",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 859.0000343322754,\r
-        "y": 415.4138059616089,\r
-        "z": "1f04287d.306418",\r
+        "x": 914.0039329528809,\r
+        "y": 425.0000330209732,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "9e4075b3.63ff28"\r
+                "c31ea383.0d2c3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6da138cf.958678",\r
+        "id": "7db8009f.80aa9",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 864.0000305175781,\r
-        "y": 362.41380500793457,\r
-        "z": "1f04287d.306418",\r
+        "x": 919.0039291381836,\r
+        "y": 372.0000320672989,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "9e4075b3.63ff28"\r
+                "c31ea383.0d2c3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9e4075b3.63ff28",\r
+        "id": "c31ea383.0d2c3",\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.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1022.0000343322754,\r
-        "y": 375.4138059616089,\r
-        "z": "1f04287d.306418",\r
+        "x": 1077.0039329528809,\r
+        "y": 385.0000330209732,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9b455cd1.ad8b9",\r
+        "id": "58a4a3cc.ac1abc",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 859.0000343322754,\r
-        "y": 476.4138059616089,\r
-        "z": "1f04287d.306418",\r
+        "x": 914.0039329528809,\r
+        "y": 486.0000330209732,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "76d683a5.eebfec"\r
+                "d3465076.36c57"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f214675.09ba1a",\r
+        "id": "b0e78257.0ab82",\r
         "type": "set",\r
         "name": "set vf-module_length",\r
         "xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",\r
         "comments": "",\r
-        "x": 1213.0000495910645,\r
-        "y": 474.41381990909576,\r
-        "z": "1f04287d.306418",\r
+        "x": 1268.00394821167,\r
+        "y": 484.0000469684601,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "76d683a5.eebfec",\r
+        "id": "d3465076.36c57",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1020.0000801086426,\r
-        "y": 473.41379737854004,\r
-        "z": "1f04287d.306418",\r
+        "x": 1075.003978729248,\r
+        "y": 483.00002443790436,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "3f214675.09ba1a",\r
-                "42fcda16.d37964"\r
+                "b0e78257.0ab82",\r
+                "d9692dd.614b9d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42fcda16.d37964",\r
+        "id": "d9692dd.614b9d",\r
         "type": "for",\r
         "name": "for each existing vf-index",\r
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1232.0000190734863,\r
-        "y": 527.4137964248657,\r
-        "z": "1f04287d.306418",\r
+        "x": 1287.0039176940918,\r
+        "y": 537.00002348423,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "9de7c553.fd25f8"\r
+                "45a4bb37.a28924"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9de7c553.fd25f8",\r
+        "id": "45a4bb37.a28924",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1503.0000381469727,\r
-        "y": 528.4138336181641,\r
-        "z": "1f04287d.306418",\r
+        "x": 1558.0039367675781,\r
+        "y": 538.0000606775284,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "f61f0e52.12de6"\r
+                "a0aa45d1.8fe618"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f61f0e52.12de6",\r
+        "id": "a0aa45d1.8fe618",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1716.0001621246338,\r
-        "y": 515.4138031005859,\r
-        "z": "1f04287d.306418",\r
+        "x": 1771.0040607452393,\r
+        "y": 525.0000301599503,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "cf9e9748.fd3478"\r
+                "e8f5881c.0d1318"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf9e9748.fd3478",\r
+        "id": "e8f5881c.0d1318",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1868.0001335144043,\r
-        "y": 517.4137964248657,\r
-        "z": "1f04287d.306418",\r
+        "x": 1923.0040321350098,\r
+        "y": 527.00002348423,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "1f23fa4e.25db46",\r
-                "5446fb0a.a3b5a4",\r
-                "71d1f1bd.544fb"\r
+                "f7c8637f.374ce",\r
+                "c9be57ad.3da878",\r
+                "26312e31.67daa2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f23fa4e.25db46",\r
+        "id": "f7c8637f.374ce",\r
         "type": "set",\r
         "name": "set tmp.vidx and ctx.vnf-data",\r
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",\r
         "comments": "",\r
-        "x": 2090.0001335144043,\r
-        "y": 513.4137964248657,\r
-        "z": "1f04287d.306418",\r
+        "x": 2145.0040321350098,\r
+        "y": 523.00002348423,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5446fb0a.a3b5a4",\r
+        "id": "c9be57ad.3da878",\r
         "type": "set",\r
         "name": "set vf-module-request-input.",\r
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",\r
         "comments": "",\r
-        "x": 2096.0001335144043,\r
-        "y": 562.4137964248657,\r
-        "z": "1f04287d.306418",\r
+        "x": 2151.0040321350098,\r
+        "y": 572.00002348423,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "71d1f1bd.544fb",\r
+        "id": "26312e31.67daa2",\r
         "type": "call",\r
         "name": "call sdwan-get-vf-module-lan-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lan-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2124.0003547668457,\r
-        "y": 610.4138021469116,\r
-        "z": "1f04287d.306418",\r
+        "x": 2179.004253387451,\r
+        "y": 620.0000292062759,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "58084a37.394334",\r
+        "id": "158609f4.fc8936",\r
         "type": "switchNode",\r
         "name": "switch tmp.vidx ",\r
         "xml": "<switch test=\"`$tmp.vidx`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 576.0312538146973,\r
-        "y": 554.4298791885376,\r
-        "z": "1f04287d.306418",\r
+        "x": 631.0351524353027,\r
+        "y": 564.0161062479019,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "a8fd4f02.a0c39"\r
+                "cbb03bf0.425b98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8fd4f02.a0c39",\r
+        "id": "cbb03bf0.425b98",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 723.4598960876465,\r
-        "y": 554.0012893676758,\r
-        "z": "1f04287d.306418",\r
+        "x": 778.463794708252,\r
+        "y": 563.5875164270401,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "e19c0822.f14e78"\r
+                "6af4136a.19a86c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e19c0822.f14e78",\r
+        "id": "6af4136a.19a86c",\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.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 872.8886222839355,\r
-        "y": 555.1442070007324,\r
-        "z": "1f04287d.306418",\r
+        "x": 927.892520904541,\r
+        "y": 564.7304340600967,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8cf55d8b.9b86e",\r
+        "id": "7132f9a1.7bd008",\r
         "type": "switchNode",\r
         "name": "switch vf-module-oper-status",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 620.3294143676758,\r
-        "y": 624.7470846176147,\r
-        "z": "1f04287d.306418",\r
+        "x": 675.3333129882812,\r
+        "y": 634.3333116769791,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "56dc0c78.140284",\r
-                "7bad1343.8cb25c"\r
+                "32ea7a53.265046",\r
+                "d6d3b52a.3f5ab8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56dc0c78.140284",\r
+        "id": "32ea7a53.265046",\r
         "type": "outcome",\r
         "name": "outcome PendingDelete",\r
         "xml": "<outcome value='PendingDelete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 911.1626815795898,\r
-        "y": 628.8582077026367,\r
-        "z": "1f04287d.306418",\r
+        "x": 966.1665802001953,\r
+        "y": 638.444434762001,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "27edf28.129770e"\r
+                "6b31ad53.5727b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7bad1343.8cb25c",\r
+        "id": "d6d3b52a.3f5ab8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 878.1628189086914,\r
-        "y": 680.8582603931427,\r
-        "z": "1f04287d.306418",\r
+        "x": 933.1667175292969,\r
+        "y": 690.444487452507,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "ea590f8e.65b32"\r
+                "148355e2.614e0a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea590f8e.65b32",\r
+        "id": "148355e2.614e0a",\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 is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",\r
         "comments": "",\r
-        "x": 1037.6625862121582,\r
-        "y": 683.8582594394684,\r
-        "z": "1f04287d.306418",\r
+        "x": 1092.6664848327637,\r
+        "y": 693.4444864988327,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "27edf28.129770e",\r
+        "id": "6b31ad53.5727b4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1108.469081878662,\r
-        "y": 639.1833620071411,\r
-        "z": "1f04287d.306418",\r
+        "x": 1163.4729804992676,\r
+        "y": 648.7695890665054,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9d1a9cea.dd56",\r
+        "id": "13d12ad9.b40a25",\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": 591.4406318664551,\r
-        "y": 1071.635935306549,\r
-        "z": "1f04287d.306418",\r
+        "x": 646.4445304870605,\r
+        "y": 1081.2221623659134,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c5683ab4.530598",\r
+        "id": "71b32013.3584b",\r
         "type": "set",\r
         "name": "set prop.vnfNewidx",\r
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",\r
         "comments": "",\r
-        "x": 598.5272789001465,\r
-        "y": 695.7472534179688,\r
-        "z": "1f04287d.306418",\r
+        "x": 653.531177520752,\r
+        "y": 705.3334804773331,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "49881624.abb0c8",\r
+        "id": "50901066.93c6f",\r
         "type": "for",\r
         "name": "for lidx..service-data.vf-modules.vf-module[]",\r
         "xml": "<for index='lidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 674.5271987915039,\r
-        "y": 749.7471284866333,\r
-        "z": "1f04287d.306418",\r
+        "x": 729.5310974121094,\r
+        "y": 759.3333555459976,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "3538a71e.fcff88"\r
+                "18389e8.0583e62"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f98bfc7.8211a",\r
+        "id": "379a2e2e.3a8382",\r
         "type": "set",\r
         "name": "set new vnf length",\r
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length\" value='`$prop.vnfidxLen`'/>\n\n\t\n",\r
         "comments": "",\r
-        "x": 598.6285705566406,\r
-        "y": 802.5513463020325,\r
-        "z": "1f04287d.306418",\r
+        "x": 653.6324691772461,\r
+        "y": 812.1375733613968,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d5b959e7.7e0cc8",\r
+        "id": "c59a5d45.5b06a",\r
         "type": "set",\r
         "name": "Remove vnf from ServiceData",\r
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].\" value=\"\"/>\n",\r
         "comments": "",\r
-        "x": 639.5272369384766,\r
-        "y": 849.7472591400146,\r
-        "z": "1f04287d.306418",\r
+        "x": 694.531135559082,\r
+        "y": 859.333486199379,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3538a71e.fcff88",\r
+        "id": "18389e8.0583e62",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 934.5271892547607,\r
-        "y": 756.7469882965088,\r
-        "z": "1f04287d.306418",\r
+        "x": 989.5310878753662,\r
+        "y": 766.3332153558731,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "10631fee.66247"\r
+                "a366647e.22aaf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d3e08866.ee2d18",\r
+        "id": "4315ff0e.d57d4",\r
         "type": "delete",\r
         "name": "delete lanport vf instance configuration in AAI",\r
-        "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='lan-port-config' \n        key='site-resource.site-resource-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'>\n",\r
+        "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='lan-port-config' \n        key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 673.5276069641113,\r
-        "y": 1019.008641242981,\r
-        "z": "1f04287d.306418",\r
+        "x": 728.5315055847168,\r
+        "y": 1028.5948683023453,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "10631fee.66247",\r
+        "id": "a366647e.22aaf8",\r
         "type": "switchNode",\r
         "name": "switch vnf-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-data.vf-module-information.vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1120.527256011963,\r
-        "y": 756.7471489906311,\r
-        "z": "1f04287d.306418",\r
+        "x": 1175.5311546325684,\r
+        "y": 766.3333760499954,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "5f2f4339.fa3b9c"\r
+                "c7c20dda.52c1b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f2f4339.fa3b9c",\r
+        "id": "c7c20dda.52c1b",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1289.5272636413574,\r
-        "y": 755.7469863891602,\r
-        "z": "1f04287d.306418",\r
+        "x": 1344.531162261963,\r
+        "y": 765.3332134485245,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "282bbccf.a76394"\r
+                "72fa222d.49f9ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "282bbccf.a76394",\r
+        "id": "72fa222d.49f9ac",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1443.527102470398,\r
-        "y": 747.7469873428345,\r
-        "z": "1f04287d.306418",\r
+        "x": 1498.5310010910034,\r
+        "y": 757.3332144021988,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "15dd9ec6.9cd7d1",\r
-                "810eaf7a.70186"\r
+                "ed2c94b0.3c96e8",\r
+                "f18820dc.cc2b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15dd9ec6.9cd7d1",\r
+        "id": "ed2c94b0.3c96e8",\r
         "type": "set",\r
         "name": "set  vnf data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-data.`' />\n",\r
         "comments": "",\r
-        "x": 1608.5271978378296,\r
-        "y": 722.747142791748,\r
-        "z": "1f04287d.306418",\r
+        "x": 1663.531096458435,\r
+        "y": 732.3333698511124,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "810eaf7a.70186",\r
+        "id": "f18820dc.cc2b",\r
         "type": "set",\r
         "name": "set prop.vnfNewidx",\r
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",\r
         "comments": "",\r
-        "x": 1630.5271978378296,\r
-        "y": 778.747106552124,\r
-        "z": "1f04287d.306418",\r
+        "x": 1685.531096458435,\r
+        "y": 788.3333336114883,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b57e1a43.a54548",\r
+        "id": "6e5f86e6.881a38",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
         "xml": "<set>\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
         "comments": "",\r
-        "x": 615.3294677734375,\r
-        "y": 966.0804300308228,\r
-        "z": "1f04287d.306418",\r
+        "x": 670.333366394043,\r
+        "y": 975.6666570901871,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eeeb55b5.4909d8",\r
+        "id": "8ba40e29.5c2bb",\r
         "type": "set",\r
         "name": "Remove vnf from ServiceData",\r
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].\" value=\"\"/>\n",\r
         "comments": "",\r
-        "x": 629.3333129882812,\r
-        "y": 900,\r
-        "z": "1f04287d.306418",\r
+        "x": 684.3372116088867,\r
+        "y": 909.5862270593643,\r
+        "z": "6e499246.1345bc",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cd89e451.16b298",\r
+        "type": "switchNode",\r
+        "name": "switch vnf-index",\r
+        "xml": "<switch test='`$vnf-index`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 649.00390625,\r
+        "y": 314.00390625,\r
+        "z": "6e499246.1345bc",\r
+        "wires": [\r
+            [\r
+                "ccd2db16.3151b8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ccd2db16.3151b8",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 811.0039520263672,\r
+        "y": 313.0039052963257,\r
+        "z": "6e499246.1345bc",\r
+        "wires": [\r
+            [\r
+                "2eb95e60.9609a2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2eb95e60.9609a2",\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 id not found in service-data\" />\n",\r
+        "comments": "",\r
+        "x": 960.2540435791016,\r
+        "y": 310.78178310394287,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
index 475c093..58dcb22 100644 (file)
@@ -1,37 +1,35 @@
 [\r
     {\r
-        "id": "2464f2e7.0e2fce",\r
+        "id": "86705660.0abdc8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 450.00390625,\r
-        "y": 347.0000014305115,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 476.00390625,\r
+        "y": 401.9999997615814,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "32c4b65c.2d59aa",\r
-                "5509b148.13914",\r
-                "aad7e68e.3b6ca8",\r
-                "94574a55.b19c88",\r
-                "7de1d3e.65c652c",\r
-                "7b54ca79.4bc724",\r
-                "e23c49d7.715338",\r
-                "a50b2df2.ad39e",\r
-                "e9af352a.620918",\r
-                "bbeb53a3.c2576",\r
-                "37a48c20.31bdf4",\r
-                "c012bd48.a280b",\r
-                "3e34e572.c1fb4a",\r
-                "83fb72db.90602",\r
-                "370a2393.20ff3c"\r
+                "33a55b62.a48504",\r
+                "c9956259.20d27",\r
+                "92e109fc.d487c8",\r
+                "fa6a2af9.45d408",\r
+                "96b8a138.b9de9",\r
+                "1072d79c.c97df8",\r
+                "7fb4c42e.fff1cc",\r
+                "8252c529.c8dc08",\r
+                "d1676675.1b3088",\r
+                "80911d80.565f6",\r
+                "f1c0f2fa.5d8e8",\r
+                "69439d08.c30934",\r
+                "a6352f7.5aa86d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4af2ac42.490d34",\r
+        "id": "4414eba1.be7024",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 292.00392150878906,\r
-        "y": 130.99999284744263,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 318.00392150878906,\r
+        "y": 185.99999117851257,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "5b6c766c.98d2a8"\r
+                "665e6349.0f20bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5b6c766c.98d2a8",\r
+        "id": "665e6349.0f20bc",\r
         "type": "method",\r
         "name": "sdwan-vf-operation-vpn-create",\r
         "xml": "<method rpc='sdwan-vf-operation-vpn-create' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 291.00392150878906,\r
-        "y": 230.99999284744263,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 317.00392150878906,\r
+        "y": 285.9999911785126,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "2464f2e7.0e2fce"\r
+                "86705660.0abdc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4418c0ab.c80bf",\r
+        "id": "c5e65dcf.93a1d",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 121.50392150878906,\r
-        "y": 42.00000047683716,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 147.50392150878906,\r
+        "y": 96.9999988079071,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "4af2ac42.490d34"\r
+                "4414eba1.be7024"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32c4b65c.2d59aa",\r
-        "type": "for",\r
-        "name": "for each vnf",\r
-        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 750.3333282470703,\r
-        "y": 238.4961256980896,\r
-        "z": "4e5f9446.b42e3c",\r
-        "wires": [\r
-            [\r
-                "3161e290.49fc4e"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "3161e290.49fc4e",\r
-        "type": "switchNode",\r
-        "name": "switch this vnf-id == input vnf-id",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1002.3334197998047,\r
-        "y": 237.16278886795044,\r
-        "z": "4e5f9446.b42e3c",\r
-        "wires": [\r
-            [\r
-                "5b45671f.cd82a8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "e5b08bcc.460cf8",\r
-        "type": "set",\r
-        "name": "set vnf-index",\r
-        "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n\n",\r
-        "comments": "",\r
-        "x": 1373.9999084472656,\r
-        "y": 239.1627917289734,\r
-        "z": "4e5f9446.b42e3c",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "5b45671f.cd82a8",\r
-        "type": "outcomeTrue",\r
-        "name": "true",\r
-        "xml": "<outcome value='true'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1220.6667366027832,\r
-        "y": 239.16277074813843,\r
-        "z": "4e5f9446.b42e3c",\r
-        "wires": [\r
-            [\r
-                "e5b08bcc.460cf8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "94574a55.b19c88",\r
+        "id": "c9956259.20d27",\r
         "type": "for",\r
         "name": "for loop idx - VF input parameters",\r
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 824.2541122436523,\r
-        "y": 460.6666588783264,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 851.2541379928589,\r
+        "y": 410.66667890548706,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "213647dd.26e428"\r
+                "5f7e52d8.71003c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "213647dd.26e428",\r
+        "id": "5f7e52d8.71003c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1039.032455444336,\r
-        "y": 458.22224283218384,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1066.0324811935425,\r
+        "y": 408.2222628593445,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "501e761.bc5eb88",\r
-                "76a61aa5.aca9e4"\r
+                "b5888647.1272c8",\r
+                "f88a8224.ffbd4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "501e761.bc5eb88",\r
+        "id": "b5888647.1272c8",\r
         "type": "execute",\r
         "name": "execute split parameterName",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1235.2886581420898,\r
-        "y": 435.9703812599182,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1262.2886838912964,\r
+        "y": 385.97040128707886,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "76a61aa5.aca9e4",\r
+        "id": "f88a8224.ffbd4",\r
         "type": "set",\r
         "name": "set parameterName",\r
         "xml": "<set>\n<parameter name=\"`vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",\r
         "comments": "",\r
-        "x": 1204.7330856323242,\r
-        "y": 472.9704976081848,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1231.7331113815308,\r
+        "y": 422.97051763534546,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": []\r
     },\r
     {\r
-        "id": "801b9de7.f8983",\r
+        "id": "84649b93.490df8",\r
         "type": "comment",\r
         "name": "Take the parameter names by removing prefix",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1208.2543144226074,\r
-        "y": 395.333327293396,\r
-        "z": "4e5f9446.b42e3c",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "5509b148.13914",\r
-        "type": "switchNode",\r
-        "name": "switch vnf_length",\r
-        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 764.7539215087891,\r
-        "y": 193.99999475479126,\r
-        "z": "4e5f9446.b42e3c",\r
-        "wires": [\r
-            [\r
-                "1afa6ba0.b560d4"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "1afa6ba0.b560d4",\r
-        "type": "other",\r
-        "name": "NULL",\r
-        "xml": "<outcome value=''>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 951.4206008911133,\r
-        "y": 193.33329248428345,\r
-        "z": "4e5f9446.b42e3c",\r
-        "wires": [\r
-            [\r
-                "f6ded972.6369c8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "f6ded972.6369c8",\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=\"404\" />\n    <parameter name=\"error-message\" value=\"There are no VNFs in MD-SAL\" />\n",\r
-        "comments": "",\r
-        "x": 1133.0872268676758,\r
-        "y": 193.33329248428345,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1235.254340171814,\r
+        "y": 345.33334732055664,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aad7e68e.3b6ca8",\r
+        "id": "33a55b62.a48504",\r
         "type": "switchNode",\r
         "name": "switch vf-modules.vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 806.0039110183716,\r
-        "y": 313.9999957084656,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 833.0039367675781,\r
+        "y": 264.0000157356262,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "e139df7a.80637",\r
-                "caf10502.734168"\r
+                "5e528a3d.403a94",\r
+                "e1430919.889a48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e139df7a.80637",\r
+        "id": "5e528a3d.403a94",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1037.003921508789,\r
-        "y": 289.9999928474426,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1064.0039472579956,\r
+        "y": 240.00001287460327,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "b4a2933f.20169"\r
+                "d1fe70de.0d5a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "caf10502.734168",\r
+        "id": "e1430919.889a48",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1037.003921508789,\r
-        "y": 329.9999928474426,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1064.0039472579956,\r
+        "y": 280.00001287460327,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "63770f1.c37c1f"\r
+                "550ac6cc.1a43f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4a2933f.20169",\r
+        "id": "d1fe70de.0d5a2",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1179.503921508789,\r
-        "y": 289.9999928474426,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1206.5039472579956,\r
+        "y": 240.00001287460327,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": []\r
     },\r
     {\r
-        "id": "63770f1.c37c1f",\r
+        "id": "550ac6cc.1a43f8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1181.3609657287598,\r
-        "y": 329.93650484085083,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1208.3609914779663,\r
+        "y": 279.9365248680115,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "82e73ea.9f6d1c",\r
-                "facab090.c3497"\r
+                "2b30e41b.b2df2c",\r
+                "735539ef.d045e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "facab090.c3497",\r
+        "id": "735539ef.d045e8",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",\r
         "comments": "",\r
-        "x": 1334.059440612793,\r
-        "y": 299.55560353351757,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1361.0594663619995,\r
+        "y": 249.5556235606782,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": []\r
     },\r
     {\r
-        "id": "82e73ea.9f6d1c",\r
+        "id": "2b30e41b.b2df2c",\r
         "type": "for",\r
         "name": "for each existing vf-index",\r
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1390.4879455566406,\r
-        "y": 352.77773332595825,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1417.4879713058472,\r
+        "y": 302.7777533531189,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "df7833b0.b66c4"\r
+                "e7001097.30f29"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1cb1fc.e0fb2e",\r
+        "id": "87bb5bc0.359988",\r
         "type": "comment",\r
         "name": "make sure this network doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1614.1386756896973,\r
-        "y": 311.0317907333374,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1641.1387014389038,\r
+        "y": 261.03181076049805,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": []\r
     },\r
     {\r
-        "id": "df7833b0.b66c4",\r
+        "id": "e7001097.30f29",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1665.773666381836,\r
-        "y": 352.3492360115051,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1692.7736921310425,\r
+        "y": 302.34925603866577,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "f0bc8641.c01b88"\r
+                "c77c794f.c68788"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0bc8641.c01b88",\r
+        "id": "c77c794f.c68788",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1566.50386428833,\r
-        "y": 410.92066717147827,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1593.5038900375366,\r
+        "y": 360.9206871986389,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "ac9ea707.076ba8"\r
+                "1ae23876.21a108"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac9ea707.076ba8",\r
+        "id": "1ae23876.21a108",\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=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1714.2539672851562,\r
-        "y": 410.7778592403047,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1741.2539930343628,\r
+        "y": 360.7778792674653,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a50b2df2.ad39e",\r
+        "id": "1072d79c.c97df8",\r
         "type": "set",\r
         "name": "copy input data to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vpn-vf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n\n\n",\r
         "comments": "",\r
-        "x": 819.8571014404297,\r
-        "y": 763.4962468147278,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 846.8571271896362,\r
+        "y": 713.4962668418884,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e23c49d7.715338",\r
+        "id": "96b8a138.b9de9",\r
         "type": "execute",\r
         "name": "execute generate-vf-module-index",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-vf-index\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 831.190673828125,\r
-        "y": 716.1629490852356,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 858.1906995773315,\r
+        "y": 666.1629691123962,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7b54ca79.4bc724",\r
+        "id": "fa6a2af9.45d408",\r
         "type": "set",\r
         "name": "set new vf-module_length",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",\r
         "comments": "",\r
-        "x": 803.1907348632812,\r
-        "y": 667.1629490852356,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 830.1907606124878,\r
+        "y": 617.1629691123962,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7de1d3e.65c652c",\r
+        "id": "92e109fc.d487c8",\r
         "type": "set",\r
         "name": "set vf-module-request-input.",\r
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",\r
         "comments": "",\r
-        "x": 803.1902618408203,\r
-        "y": 613.1542372703552,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 830.1902875900269,\r
+        "y": 563.1542572975159,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e9af352a.620918",\r
+        "id": "7fb4c42e.fff1cc",\r
         "type": "set",\r
         "name": "set vf-module-level-oper-status",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",\r
         "comments": "",\r
-        "x": 813.5040893554688,\r
-        "y": 861.0000678896904,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 840.5041151046753,\r
+        "y": 811.000087916851,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": []\r
     },\r
     {\r
-        "id": "83fb72db.90602",\r
+        "id": "69439d08.c30934",\r
         "type": "save",\r
         "name": "save sdwan vpn resource in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.sdwan-vpn-id = $prop.vpn-vf-index' >\n<parameter name='sdwan-vpn-id' value='`$prop.vpn-vf-index`' />\n<parameter name='sdwan-vpn-name' value='`$prop.name`' />\n<parameter name='topology' value='`$prop.topology`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vpn-vf-index + '/vf-module-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 820.0039501190186,\r
-        "y": 906.5000157356262,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 847.0039758682251,\r
+        "y": 856.5000357627869,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bbeb53a3.c2576",\r
+        "id": "8252c529.c8dc08",\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": 767.7264232635498,\r
-        "y": 999.673906326294,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 794.7264490127563,\r
+        "y": 949.6739263534546,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": []\r
     },\r
     {\r
-        "id": "37a48c20.31bdf4",\r
+        "id": "d1676675.1b3088",\r
         "type": "for",\r
         "name": "for loop i - Network input parameters",\r
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 831.2578277587891,\r
-        "y": 549.5039067268372,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 858.2578535079956,\r
+        "y": 499.5039267539978,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "4c79fd81.204e24"\r
+                "63318660.a4e798"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4c79fd81.204e24",\r
+        "id": "63318660.a4e798",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1118.4807052612305,\r
-        "y": 549.7262206077576,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1145.480731010437,\r
+        "y": 499.7262406349182,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "6ee57e2b.017f1",\r
-                "6d15949f.a4f72c"\r
+                "1e3ec759.b2be29",\r
+                "bfacfb85.875b78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ee57e2b.017f1",\r
+        "id": "1e3ec759.b2be29",\r
         "type": "switchNode",\r
         "name": "switch name",\r
         "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1306.702548980713,\r
-        "y": 532.0595247745514,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1333.7025747299194,\r
+        "y": 482.05954480171204,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "3f65f879.eac058"\r
+                "4c3c07dc.109bb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d15949f.a4f72c",\r
+        "id": "bfacfb85.875b78",\r
         "type": "switchNode",\r
         "name": "switch topology",\r
         "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'topology'`\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1317.5422096252441,\r
-        "y": 572.0595228672028,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1344.5422353744507,\r
+        "y": 522.0595428943634,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "a2b79be1.ed04c8"\r
+                "8910bf6.fa8bd4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f65f879.eac058",\r
+        "id": "4c3c07dc.109bb8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1493.702548980713,\r
-        "y": 528.0595247745514,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1520.7025747299194,\r
+        "y": 478.05954480171204,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "2305c57e.8cca7a"\r
+                "330c74f0.0fa8ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a2b79be1.ed04c8",\r
+        "id": "8910bf6.fa8bd4",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1487.5422096252441,\r
-        "y": 568.0595228672028,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1514.5422353744507,\r
+        "y": 518.0595428943634,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             [\r
-                "4726038d.e1157c"\r
+                "c760e70.ca63518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2305c57e.8cca7a",\r
+        "id": "330c74f0.0fa8ac",\r
         "type": "set",\r
         "name": "set name",\r
         "xml": "<set>\n<parameter name='prop.name' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n\n",\r
         "comments": "",\r
-        "x": 1643.70267868042,\r
-        "y": 526.6595313549042,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1670.7027044296265,\r
+        "y": 476.6595513820648,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4726038d.e1157c",\r
+        "id": "c760e70.ca63518",\r
         "type": "set",\r
         "name": "set topology",\r
         "xml": "<set>\n<parameter name='prop.topology' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 1674.8756504058838,\r
-        "y": 566.5206797122955,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 1701.8756761550903,\r
+        "y": 516.5206997394562,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c012bd48.a280b",\r
+        "id": "80911d80.565f6",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:validate-sdwan-vf-vpn-input-parameters",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 932.5078277587891,\r
-        "y": 139.00390672683716,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 954.5077972412109,\r
+        "y": 190.0039086341858,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3e34e572.c1fb4a",\r
+        "id": "f1c0f2fa.5d8e8",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
         "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vpn-vf-index`' />\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $prop.vpn-vf-index\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
         "comments": "",\r
-        "x": 805.5039672851562,\r
-        "y": 812.0312873721123,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 832.5039930343628,\r
+        "y": 762.0313073992729,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": []\r
     },\r
     {\r
-        "id": "370a2393.20ff3c",\r
+        "id": "a6352f7.5aa86d",\r
         "type": "save",\r
         "name": "save service relationship in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"sdwan-vpn\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/sdwan-vpns/sdwan-vpn/' + $prop.vpn-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"sdwan-vpn.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vpn-vf-index`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 820.0040283203125,\r
-        "y": 954.000156879425,\r
-        "z": "4e5f9446.b42e3c",\r
+        "x": 847.004054069519,\r
+        "y": 904.0001769065857,\r
+        "z": "12e5b519.7c42cb",\r
         "wires": [\r
             []\r
         ]\r
index b081673..c5e1d74 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "d157ce03.c3288",\r
+        "id": "565ee583.5719ac",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 129,\r
-        "y": 64,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 120.00390625,\r
+        "y": 61.00390625,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "5ddc2216.ec964c"\r
+                "2253fb6a.010fd4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ddc2216.ec964c",\r
+        "id": "2253fb6a.010fd4",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 374.2857131958008,\r
-        "y": 63.23807907104492,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 365.2896194458008,\r
+        "y": 60.24198532104492,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "e97f46cc.0059c8"\r
+                "d1afaf4b.7367a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e97f46cc.0059c8",\r
+        "id": "d1afaf4b.7367a",\r
         "type": "method",\r
         "name": "validate-sdwan-vf-vpn-input-parameters",\r
         "xml": "<method rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 457.9166946411133,\r
-        "y": 198.25301837921143,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 448.9206008911133,\r
+        "y": 195.25692462921143,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "94a6ae40.767b3"\r
+                "d3d09840.859ab8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "94a6ae40.767b3",\r
+        "id": "d3d09840.859ab8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 741.9167022705078,\r
-        "y": 186.25304317474365,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 732.9206085205078,\r
+        "y": 183.25694942474365,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "c1b9af78.ff38c",\r
-                "5ab8336c.d30a1c",\r
-                "26ecbd16.18b922",\r
-                "f0d7fed2.a7f6e"\r
+                "8b6f9b12.95ea88",\r
+                "9c84b6f9.1f9628",\r
+                "257f53b6.ca8b0c",\r
+                "e33dc3b4.6bdba",\r
+                "fa0b83ce.07d0f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1b9af78.ff38c",\r
+        "id": "8b6f9b12.95ea88",\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": 1001.916633605957,\r
-        "y": 34.25303936004639,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 992.920539855957,\r
+        "y": 31.256945610046387,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "61401669.5d3bb8"\r
+                "c5870f3a.aab91"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61401669.5d3bb8",\r
+        "id": "c5870f3a.aab91",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1192.6309356689453,\r
-        "y": 35.2530403137207,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1183.6348419189453,\r
+        "y": 32.2569465637207,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "8deeb25a.a0c7a"\r
+                "255dc4d8.4591ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8deeb25a.a0c7a",\r
+        "id": "255dc4d8.4591ac",\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=\"sdnc-request-header.svc-request-id is a required input\" />\n",\r
         "comments": "",\r
-        "x": 1367.0594863891602,\r
-        "y": 34.25303268432617,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1358.0633926391602,\r
+        "y": 31.256938934326172,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5ab8336c.d30a1c",\r
+        "id": "9c84b6f9.1f9628",\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": 338.9166564941406,\r
-        "y": 457.2530336380005,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 329.9205627441406,\r
+        "y": 454.2569398880005,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "dd523414.2c6af8",\r
-                "3ab9ebd9.cb15a4",\r
-                "748e648b.48faec",\r
-                "364e12f1.bd272e",\r
-                "907aa46b.591888"\r
+                "4da03be9.a489d4",\r
+                "1cd623c5.d01cfc",\r
+                "11a6977d.d05489",\r
+                "fd6aa5e0.36c518",\r
+                "74577ecc.ef74c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd523414.2c6af8",\r
+        "id": "4da03be9.a489d4",\r
         "type": "outcome",\r
         "name": "create",\r
         "xml": "<outcome value='create'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 532.5000228881836,\r
-        "y": 286.66667079925537,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 523.5039291381836,\r
+        "y": 283.67057704925537,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "b695319.fac5ed"\r
+                "b3001ec4.96f68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b695319.fac5ed",\r
+        "id": "b3001ec4.96f68",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 693.5000228881836,\r
-        "y": 286.66667079925537,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 684.5039291381836,\r
+        "y": 283.67057704925537,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "1c93366e.75aada"\r
+                "8fa4b53.eb65f48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ab9ebd9.cb15a4",\r
+        "id": "1cd623c5.d01cfc",\r
         "type": "outcome",\r
         "name": "deactivate",\r
         "xml": "<outcome value='deactivate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 505.4920120239258,\r
-        "y": 895.428539276123,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 496.4959182739258,\r
+        "y": 892.432445526123,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "c38c9ea7.d32c"\r
+                "e6bca749.2ecd58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "748e648b.48faec",\r
+        "id": "11a6977d.d05489",\r
         "type": "outcome",\r
         "name": "delete",\r
         "xml": "<outcome value='delete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 509.20639419555664,\r
-        "y": 1066.1430969238281,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 500.21030044555664,\r
+        "y": 1063.1470031738281,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "cfdfa9d2.e72008"\r
+                "141627b0.510318"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "364e12f1.bd272e",\r
+        "id": "fd6aa5e0.36c518",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 508.9682846069336,\r
-        "y": 1239.571382522583,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 499.9721908569336,\r
+        "y": 1236.575288772583,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "1c142ebe.8cdf21"\r
+                "1eabd7f1.a915e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1c142ebe.8cdf21",\r
+        "id": "1eabd7f1.a915e8",\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=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",\r
         "comments": "",\r
-        "x": 692.5398178100586,\r
-        "y": 1240.190523147583,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 683.5437240600586,\r
+        "y": 1237.194429397583,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1c93366e.75aada",\r
+        "id": "8fa4b53.eb65f48",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 894,\r
-        "y": 284.6666797399521,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 885.00390625,\r
+        "y": 281.6705859899521,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "ee1d7ddd.46ad1",\r
-                "3d1afbf1.1b7e64"\r
+                "1fcbac14.14ab84",\r
+                "5011e60c.42d288"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee1d7ddd.46ad1",\r
+        "id": "1fcbac14.14ab84",\r
         "type": "other",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1079.4999923706055,\r
-        "y": 312.66667652130127,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1070.5038986206055,\r
+        "y": 309.67058277130127,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "efe7d43a.e3e608"\r
+                "bc3da556.5c5568"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "efe7d43a.e3e608",\r
+        "id": "bc3da556.5c5568",\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=\"request-information.request-action is required to be SOTN CreateVPNNetworkInstance for svc-action=create\" />\n",\r
         "comments": "",\r
-        "x": 1230.0000228881836,\r
-        "y": 306.66667079925537,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1221.0039291381836,\r
+        "y": 303.67057704925537,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2418184c.a14ab8",\r
+        "id": "967ffa6b.7cc5f8",\r
         "type": "other",\r
         "name": "DeleteSDWANVpnInstance",\r
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 945.0634078979492,\r
-        "y": 1062.6983680725098,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 936.0673141479492,\r
+        "y": 1059.7022743225098,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "8c2f423e.95a5"\r
+                "76f6c61a.a081c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba1e9ce4.084c2",\r
+        "id": "1f6d106b.3f479",\r
         "type": "other",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 866.6189804077148,\r
-        "y": 1138.920636177063,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 857.6228866577148,\r
+        "y": 1135.924542427063,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "29217d6f.264c52"\r
+                "649057db.a16248"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29217d6f.264c52",\r
+        "id": "649057db.a16248",\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=\"request-information.request-action is required to be SOTN DeleteVPNNetworkInstance for svc-action=delete\" />\n",\r
         "comments": "",\r
-        "x": 1026.9524002075195,\r
-        "y": 1141.0317735671997,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1017.9563064575195,\r
+        "y": 1138.0356798171997,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8c2f423e.95a5",\r
+        "id": "76f6c61a.a081c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1174.9523086547852,\r
-        "y": 1068.9206190109253,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1165.9562149047852,\r
+        "y": 1065.9245252609253,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "5a51c09f.0dc8a",\r
-                "dac4a6bf.88b598",\r
-                "607c6dc9.f58224",\r
-                "5f5b8df.a6d8d74"\r
+                "123885f7.86e85a",\r
+                "5107dc7c.bd16c4",\r
+                "d0483b54.f8cc78",\r
+                "ee1682f5.ef519"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "907aa46b.591888",\r
+        "id": "74577ecc.ef74c",\r
         "type": "outcome",\r
         "name": "activate",\r
         "xml": "<outcome value='activate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 526.4285774230957,\r
-        "y": 549.7143135070801,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 517.4324836730957,\r
+        "y": 546.7182197570801,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "eff709e7.55cc68"\r
+                "63a76ac2.a9ff44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eff709e7.55cc68",\r
+        "id": "63a76ac2.a9ff44",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 709.2857437133789,\r
-        "y": 546.8571634292603,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 700.2896499633789,\r
+        "y": 543.8610696792603,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "db4e4749.ac5c28",\r
-                "f7339987.1e66e8"\r
+                "20847c6f.c84284",\r
+                "d8768536.d2ed78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db4e4749.ac5c28",\r
+        "id": "20847c6f.c84284",\r
         "type": "other",\r
         "name": "ActivateSDWANVpnInstance",\r
         "xml": "<outcome value='ActivateSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 962.5000228881836,\r
-        "y": 526.6666707992554,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 953.5039291381836,\r
+        "y": 523.6705770492554,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "90c3027e.ce76e"\r
+                "888440a5.f74eb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7339987.1e66e8",\r
+        "id": "d8768536.d2ed78",\r
         "type": "other",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 892.5000228881836,\r
-        "y": 566.6666707992554,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 883.5039291381836,\r
+        "y": 563.6705770492554,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "58df50e9.ec50f"\r
+                "24d41f6.7d3c7e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58df50e9.ec50f",\r
+        "id": "24d41f6.7d3c7e",\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=\"request-information.request-action is required to be SOTN ActivateVPNNetworkInstance for svc-action=activate\" />\n",\r
         "comments": "",\r
-        "x": 1050.0000228881836,\r
-        "y": 566.6666707992554,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1041.0039291381836,\r
+        "y": 563.6705770492554,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "90c3027e.ce76e",\r
+        "id": "888440a5.f74eb",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1193.5000228881836,\r
-        "y": 526.6666707992554,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1184.5039291381836,\r
+        "y": 523.6705770492554,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "607c6dc9.f58224",\r
-                "5a51c09f.0dc8a",\r
-                "dac4a6bf.88b598",\r
-                "befd23a0.20fa9"\r
+                "d0483b54.f8cc78",\r
+                "123885f7.86e85a",\r
+                "5107dc7c.bd16c4",\r
+                "33a9d2fa.2f6b4e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d17bd6a.99ffe4",\r
+        "id": "9770e43b.dbcf68",\r
         "type": "other",\r
         "name": "DeactivateSDWANVpnInstance",\r
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 948.9206390380859,\r
-        "y": 897.1429328918457,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 939.9245452880859,\r
+        "y": 894.1468391418457,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "ae97c0e.69b144"\r
+                "41ce9967.86f308"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "754fd131.c0e1d",\r
+        "id": "672e2ef2.4ddd3",\r
         "type": "other",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 863.9206314086914,\r
-        "y": 966.1429405212402,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 854.9245376586914,\r
+        "y": 963.1468467712402,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "e5085bda.bb5f08"\r
+                "25186dab.68a632"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5085bda.bb5f08",\r
+        "id": "25186dab.68a632",\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=\"request-information.request-action is required to be SOTN DeactivateVPNNetworkInstance for svc-action=deactivate\" />\n",\r
         "comments": "",\r
-        "x": 1044.9206466674805,\r
-        "y": 967.1429405212402,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1035.9245529174805,\r
+        "y": 964.1468467712402,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c38c9ea7.d32c",\r
+        "id": "e6bca749.2ecd58",\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": 685.7776947021484,\r
-        "y": 899.6188039779663,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 676.7816009521484,\r
+        "y": 896.6227102279663,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "7d17bd6a.99ffe4",\r
-                "754fd131.c0e1d"\r
+                "9770e43b.dbcf68",\r
+                "672e2ef2.4ddd3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cfdfa9d2.e72008",\r
+        "id": "141627b0.510318",\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": 689.5554962158203,\r
-        "y": 1065.9523208141327,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 680.5594024658203,\r
+        "y": 1062.9562270641327,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "2418184c.a14ab8",\r
-                "ba1e9ce4.084c2"\r
+                "967ffa6b.7cc5f8",\r
+                "1f6d106b.3f479"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae97c0e.69b144",\r
+        "id": "41ce9967.86f308",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1208.888786315918,\r
-        "y": 899.9523277282715,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1199.892692565918,\r
+        "y": 896.9562339782715,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "5a51c09f.0dc8a",\r
-                "dac4a6bf.88b598",\r
-                "607c6dc9.f58224",\r
-                "2fee238f.bd0b7c"\r
+                "123885f7.86e85a",\r
+                "5107dc7c.bd16c4",\r
+                "d0483b54.f8cc78",\r
+                "f43dfee.04573"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d1afbf1.1b7e64",\r
+        "id": "5011e60c.42d288",\r
         "type": "other",\r
         "name": "CreateSDWANVpnInstance",\r
         "xml": "<outcome value='CreateSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1178.499984741211,\r
-        "y": 265.6666679382324,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1169.503890991211,\r
+        "y": 262.6705741882324,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "13930049.ada58"\r
+                "11c5bc01.23d164"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13930049.ada58",\r
+        "id": "11c5bc01.23d164",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1413.49995803833,\r
-        "y": 264.6666679382324,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1404.50386428833,\r
+        "y": 261.6705741882324,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "3daca227.0cf10e"\r
+                "9a240db8.46ca9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3daca227.0cf10e",\r
+        "id": "9a240db8.46ca9",\r
         "type": "for",\r
         "name": "for loop i - vpn vf input parameters",\r
         "xml": "<for index=\"i\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1644.000015258789,\r
-        "y": 265.6666679382324,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1635.003921508789,\r
+        "y": 262.6705741882324,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "3ad26c2a.a0e034"\r
+                "36e8517a.dc61de"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ad26c2a.a0e034",\r
+        "id": "36e8517a.dc61de",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1852.5000228881836,\r
-        "y": 266.66667079925537,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1843.5039291381836,\r
+        "y": 263.67057704925537,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "163fb823.6cab78",\r
-                "f1bf47ba.b34c38",\r
-                "c40dcf.883f423"\r
+                "5087b54.83db64c",\r
+                "58b5e6d.d150018",\r
+                "8cba0d18.e596b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "163fb823.6cab78",\r
+        "id": "5087b54.83db64c",\r
         "type": "set",\r
         "name": "clear tmp-data",\r
         "xml": "<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n",\r
         "comments": "",\r
-        "x": 2035.5000228881836,\r
-        "y": 226.66667079925537,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2026.5039291381836,\r
+        "y": 223.67057704925537,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f1bf47ba.b34c38",\r
+        "id": "58b5e6d.d150018",\r
         "type": "set",\r
         "name": "set tmp-data",\r
         "xml": "<set>\n<parameter name='tmp.name' value=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name`\"/>\n<parameter name='tmp.value' value=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`\"/>\n",\r
         "comments": "",\r
-        "x": 2030.0000228881836,\r
-        "y": 266.66667079925537,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2021.0039291381836,\r
+        "y": 263.67057704925537,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c40dcf.883f423",\r
+        "id": "8cba0d18.e596b",\r
         "type": "switchNode",\r
         "name": "switch name",\r
         "xml": "<switch test=\"`$tmp.name`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2030.0000228881836,\r
-        "y": 306.66667079925537,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2021.0039291381836,\r
+        "y": 303.67057704925537,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "1fcdbe0d.6c0992",\r
-                "9406085a.835ae8",\r
-                "bf4803e4.f6139"\r
+                "dfc6f3da.96897",\r
+                "63a216c3.211888",\r
+                "efdb7bab.2e3c18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4dd6857a.0d98dc",\r
+        "id": "b6ee6080.0801",\r
         "type": "switchNode",\r
         "name": "switch value",\r
         "xml": "<switch test=\"`$tmp.value`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2490.0001907348633,\r
-        "y": 258.66669142246246,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2481.0040969848633,\r
+        "y": 255.67059767246246,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "e0ccccd6.2db1b"\r
+                "b264801c.4e11d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bf4803e4.f6139",\r
+        "id": "efdb7bab.2e3c18",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2249.500358581543,\r
-        "y": 324.66667902469635,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2240.504264831543,\r
+        "y": 321.67058527469635,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "a6c05aa9.168a48"\r
+                "dd26b908.49f638"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6c05aa9.168a48",\r
+        "id": "dd26b908.49f638",\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=\"`'vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[' + $i + ']' + '.name is a required input'`\" />\n",\r
         "comments": "",\r
-        "x": 2424.5003623962402,\r
-        "y": 323.66667902469635,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2415.5042686462402,\r
+        "y": 320.67058527469635,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1fcdbe0d.6c0992",\r
+        "id": "dfc6f3da.96897",\r
         "type": "other",\r
         "name": "name",\r
         "xml": "<outcome value='name'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2249.500358581543,\r
-        "y": 208.66667330265045,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2240.504264831543,\r
+        "y": 205.67057955265045,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "4dd6857a.0d98dc"\r
+                "b6ee6080.0801"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9406085a.835ae8",\r
+        "id": "63a216c3.211888",\r
         "type": "other",\r
         "name": "topology",\r
         "xml": "<outcome value='topology'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2261.500114440918,\r
-        "y": 262.333335518837,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2252.504020690918,\r
+        "y": 259.337241768837,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "4dd6857a.0d98dc"\r
+                "b6ee6080.0801"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e0ccccd6.2db1b",\r
+        "id": "b264801c.4e11d",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2633.5001907348633,\r
-        "y": 258.66669142246246,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2624.5040969848633,\r
+        "y": 255.67059767246246,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "641a1c22.3dabc4"\r
+                "c8480c33.559c3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "641a1c22.3dabc4",\r
+        "id": "c8480c33.559c3",\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=\"`'vf-module-request-input.vf-module-input-parameters.param '+ $tmp.name +' is a required input'`\" />\n",\r
         "comments": "",\r
-        "x": 2791.5001907348633,\r
-        "y": 258.66669142246246,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2782.5040969848633,\r
+        "y": 255.67059767246246,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "607c6dc9.f58224",\r
+        "id": "d0483b54.f8cc78",\r
         "type": "switchNode",\r
         "name": "switch service-data.vf-modules.vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1485.3889541625977,\r
-        "y": 565.9999761581421,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1476.3928604125977,\r
+        "y": 563.0038824081421,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "9d62d332.6bdf1",\r
-                "5cba95a3.c5c61c"\r
+                "413b50b3.359c7",\r
+                "d0f5593e.7ab558"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d62d332.6bdf1",\r
+        "id": "413b50b3.359c7",\r
         "type": "other",\r
         "name": "outcome Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1754.0000228881836,\r
-        "y": 545.666711807251,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1745.0039291381836,\r
+        "y": 542.670618057251,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "55bf1151.ede2f"\r
+                "eebfb40.22c4e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55bf1151.ede2f",\r
+        "id": "eebfb40.22c4e5",\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=\"vf-module-topology-operation-input.vf-module-request-input.vf-module-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1930.0000228881836,\r
-        "y": 546.6666707992554,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1921.0039291381836,\r
+        "y": 543.6705770492554,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5cba95a3.c5c61c",\r
+        "id": "d0f5593e.7ab558",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1732.5000228881836,\r
-        "y": 586.6666707992554,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1723.5039291381836,\r
+        "y": 583.6705770492554,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "b3715a78.6bb228"\r
+                "8025be.3d50da4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3715a78.6bb228",\r
+        "id": "8025be.3d50da4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1893.5000228881836,\r
-        "y": 586.6666707992554,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1884.5039291381836,\r
+        "y": 583.6705770492554,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "c872064f.ab0aa8",\r
-                "16b4cc33.475d44"\r
+                "33b03a7.98f32c6",\r
+                "2d7d1dbe.8a6fa2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c872064f.ab0aa8",\r
+        "id": "33b03a7.98f32c6",\r
         "type": "for",\r
         "name": "for nidx..service-data.vf-modules.vf-module[]",\r
         "xml": "<for index='nidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2156.0000228881836,\r
-        "y": 566.6666707992554,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2147.0039291381836,\r
+        "y": 563.6705770492554,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "88526fe7.19ca5"\r
+                "c9190995.7b4398"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88526fe7.19ca5",\r
+        "id": "c9190995.7b4398",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n    \n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2442.0000228881836,\r
-        "y": 566.6666707992554,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2433.0039291381836,\r
+        "y": 563.6705770492554,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "100a52a1.442c1d"\r
+                "6869b345.2f4eec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "100a52a1.442c1d",\r
+        "id": "6869b345.2f4eec",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2612.5000228881836,\r
-        "y": 566.6666707992554,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2603.5039291381836,\r
+        "y": 563.6705770492554,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "8d9c0c99.1bdcb"\r
+                "434bc2ee.14a91c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7051b5d0.a337bc",\r
+        "id": "d8b2b2f3.abfe5",\r
         "type": "set",\r
         "name": "set tmp.vidx and ctx.network-data",\r
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$nidx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />\n",\r
         "comments": "",\r
-        "x": 3013.50008392334,\r
-        "y": 563.6667140722275,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 3004.50399017334,\r
+        "y": 560.6706203222275,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "683dee11.6434b",\r
+        "id": "91c3f042.9f8f6",\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=\"vf-module-topology-operation-input.vf-module-request-input.vf-module-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 2370.0000228881836,\r
-        "y": 606.6666707992554,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2361.0039291381836,\r
+        "y": 603.6705770492554,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "67a62d00.2d4ff4",\r
+        "id": "62656256.c5a38c",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2232.5000228881836,\r
-        "y": 606.6666707992554,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2223.5039291381836,\r
+        "y": 603.6705770492554,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "683dee11.6434b"\r
+                "91c3f042.9f8f6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "16b4cc33.475d44",\r
+        "id": "2d7d1dbe.8a6fa2",\r
         "type": "switchNode",\r
         "name": "switch tmp.vidx ",\r
         "xml": "<switch test=\"`$tmp.vidx`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2078.5000228881836,\r
-        "y": 606.6666707992554,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2069.5039291381836,\r
+        "y": 603.6705770492554,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "67a62d00.2d4ff4"\r
+                "62656256.c5a38c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "befd23a0.20fa9",\r
+        "id": "33a9d2fa.2f6b4e",\r
         "type": "switchNode",\r
         "name": "switch network-level-oper-status",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1457.6667098999023,\r
-        "y": 645.5555486679077,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1448.6706161499023,\r
+        "y": 642.5594549179077,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "f546c4ba.29b768",\r
-                "ad8d6fcc.bfcca"\r
+                "1058ce1e.07c3a2",\r
+                "647164c.65ef89c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f546c4ba.29b768",\r
+        "id": "1058ce1e.07c3a2",\r
         "type": "outcome",\r
         "name": "outcome Created",\r
         "xml": "<outcome value='Created'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1754.5001258850098,\r
-        "y": 645.5555467605591,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1745.5040321350098,\r
+        "y": 642.5594530105591,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "72634f47.0cc42"\r
+                "d822f664.efe8c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad8d6fcc.bfcca",\r
+        "id": "647164c.65ef89c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1722.5001258850098,\r
-        "y": 685.5555467605591,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1713.5040321350098,\r
+        "y": 682.5594530105591,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "28f836e1.3e6b7a"\r
+                "6947f2ff.46fb4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "28f836e1.3e6b7a",\r
+        "id": "6947f2ff.46fb4c",\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=\"`'vf-module is not in appropriate state for activate. Current state is ' + $service-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`\" />\n",\r
         "comments": "",\r
-        "x": 1880.0001258850098,\r
-        "y": 685.5555467605591,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1871.0040321350098,\r
+        "y": 682.5594530105591,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dac4a6bf.88b598",\r
+        "id": "5107dc7c.bd16c4",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id",\r
         "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1404.5000228881836,\r
-        "y": 506.66667079925537,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1395.5039291381836,\r
+        "y": 503.67057704925537,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "a7ac2cab.79df8"\r
+                "2868a76.8aeaf58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a7ac2cab.79df8",\r
+        "id": "2868a76.8aeaf58",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1632.5000228881836,\r
-        "y": 506.66667079925537,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1623.5039291381836,\r
+        "y": 503.67057704925537,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "b2c9eb9f.8ff438"\r
+                "ebf2eb70.fb3688"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b2c9eb9f.8ff438",\r
+        "id": "ebf2eb70.fb3688",\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=\"network-request-input.network-input-parameters.name is a required input\" />\n",\r
         "comments": "",\r
-        "x": 1770.0000228881836,\r
-        "y": 506.66667079925537,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1761.0039291381836,\r
+        "y": 503.67057704925537,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5a51c09f.0dc8a",\r
+        "id": "123885f7.86e85a",\r
         "type": "execute",\r
         "name": "execute requiredParameters",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"vf-module-topology-operation-input.vf-module-information.vf-module-id\" value=\"$vf-module-topology-operation-input.vf-module-information.vf-module-id\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1439.0000228881836,\r
-        "y": 466.66667079925537,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1430.0039291381836,\r
+        "y": 463.67057704925537,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2fee238f.bd0b7c",\r
+        "id": "f43dfee.04573",\r
         "type": "switchNode",\r
         "name": "switch network-level-oper-status",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1481.8332214355469,\r
-        "y": 895.555570602417,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1472.8371276855469,\r
+        "y": 892.559476852417,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "cdf8dd70.c0108",\r
-                "2de75da0.b5bd52"\r
+                "f3a65bdd.c67898",\r
+                "d0952c59.11171"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cdf8dd70.c0108",\r
+        "id": "f3a65bdd.c67898",\r
         "type": "outcome",\r
         "name": "outcome Active",\r
         "xml": "<outcome value='Active'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1759.166648864746,\r
-        "y": 869.9999837875366,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1750.170555114746,\r
+        "y": 867.0038900375366,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "e027e573.24bd48"\r
+                "25ff4eac.6201f2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2de75da0.b5bd52",\r
+        "id": "d0952c59.11171",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1729.166648864746,\r
-        "y": 909.9999837875366,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1720.170555114746,\r
+        "y": 907.0038900375366,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "4744b74f.6f4a88"\r
+                "446d50cf.78007"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4744b74f.6f4a88",\r
+        "id": "446d50cf.78007",\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=\"`'vf-module is not in appropriate state for deactivate. Current state is ' + $service-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`\" />\n    ",\r
         "comments": "",\r
-        "x": 1895.166648864746,\r
-        "y": 911.9999837875366,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1886.170555114746,\r
+        "y": 909.0038900375366,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5f5b8df.a6d8d74",\r
+        "id": "ee1682f5.ef519",\r
         "type": "switchNode",\r
         "name": "switch network-level-oper-status",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1474.7221908569336,\r
-        "y": 1066.6666097640991,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1465.7260971069336,\r
+        "y": 1063.6705160140991,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "e0e44b44.c9e6c8",\r
-                "fa9a403f.1ce7e"\r
+                "cb2a1ac2.d811d8",\r
+                "425f06cf.84b998"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e0e44b44.c9e6c8",\r
+        "id": "cb2a1ac2.d811d8",\r
         "type": "outcome",\r
         "name": "outcome PendingDelete",\r
         "xml": "<outcome value='PendingDelete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1774.7222518920898,\r
-        "y": 1034.444405555725,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1765.7261581420898,\r
+        "y": 1031.448311805725,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "21ef3568.35bd5a"\r
+                "bcccebbc.df0278"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa9a403f.1ce7e",\r
+        "id": "425f06cf.84b998",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1718.055564880371,\r
-        "y": 1081.1110677719116,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1709.059471130371,\r
+        "y": 1078.1149740219116,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "2bc6f464.461d3c"\r
+                "a8198043.31984"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2bc6f464.461d3c",\r
+        "id": "a8198043.31984",\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=\"`'vf-module is not in appropriate state for delete. Current state is ' + $service-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`\" />\n",\r
         "comments": "",\r
-        "x": 1884.055564880371,\r
-        "y": 1083.1110677719116,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1875.059471130371,\r
+        "y": 1080.1149740219116,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "72634f47.0cc42",\r
+        "id": "d822f664.efe8c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1946.5001029968262,\r
-        "y": 646.6666488647461,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1937.5040092468262,\r
+        "y": 643.6705551147461,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e027e573.24bd48",\r
+        "id": "25ff4eac.6201f2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1959.1665267944336,\r
-        "y": 868.1481161117554,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1950.1704330444336,\r
+        "y": 865.1520223617554,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "21ef3568.35bd5a",\r
+        "id": "bcccebbc.df0278",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1990.277732849121,\r
-        "y": 1034.8147420883179,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1981.281639099121,\r
+        "y": 1031.8186483383179,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8d9c0c99.1bdcb",\r
+        "id": "434bc2ee.14a91c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2762.666534423828,\r
-        "y": 563.0000190734863,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 2753.670440673828,\r
+        "y": 560.0039253234863,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "7051b5d0.a337bc"\r
+                "d8b2b2f3.abfe5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26ecbd16.18b922",\r
+        "id": "257f53b6.ca8b0c",\r
         "type": "switchNode",\r
         "name": "switch vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 977.0065307617188,\r
-        "y": 110.24849605560303,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 968.0104370117188,\r
+        "y": 107.25240230560303,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "a795521a.23d6f"\r
+                "ad7c2596.e39388"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a795521a.23d6f",\r
+        "id": "ad7c2596.e39388",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1157.0065116882324,\r
-        "y": 109.24848556518555,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1148.0104179382324,\r
+        "y": 106.25239181518555,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "3e0e877f.b04338"\r
+                "94667639.3621e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e0e877f.b04338",\r
+        "id": "94667639.3621e8",\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 entry not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1306.4352378845215,\r
-        "y": 110.39140319824219,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1297.4391441345215,\r
+        "y": 107.39530944824219,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f0d7fed2.a7f6e",\r
+        "id": "e33dc3b4.6bdba",\r
         "type": "for",\r
         "name": "for each vnf",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 957.0379104614258,\r
-        "y": 172.51763439178467,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 948.0418167114258,\r
+        "y": 169.52154064178467,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "c781186.35a6de8"\r
+                "30c7b890.07a568"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c781186.35a6de8",\r
+        "id": "30c7b890.07a568",\r
         "type": "switchNode",\r
         "name": "switch this vnf-id == input vnf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1195.0065269470215,\r
-        "y": 172.2484917640686,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1186.0104331970215,\r
+        "y": 169.2523980140686,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "3c97bff.ca0c74"\r
+                "659e2d6d.62e114"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c97bff.ca0c74",\r
+        "id": "659e2d6d.62e114",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1410.0065116882324,\r
-        "y": 170.24848556518555,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1401.0104179382324,\r
+        "y": 167.25239181518555,\r
+        "z": "c09ce476.40c538",\r
         "wires": [\r
             [\r
-                "daf74faa.b14cc"\r
+                "79ae665a.7603a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "daf74faa.b14cc",\r
+        "id": "79ae665a.7603a8",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1574.0065116882324,\r
-        "y": 165.24848556518555,\r
-        "z": "87aefe66.c6e82",\r
+        "x": 1565.0104179382324,\r
+        "y": 162.25239181518555,\r
+        "z": "c09ce476.40c538",\r
         "wires": []\r
+    },\r
+    {\r
+        "id": "d950638a.e6fd1",\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 id not found in service-data\" />\n",\r
+        "comments": "",\r
+        "x": 1270.00390625,\r
+        "y": 215.00390625,\r
+        "z": "c09ce476.40c538",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c45b00c9.864fa",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1120.7538146972656,\r
+        "y": 217.2260284423828,\r
+        "z": "c09ce476.40c538",\r
+        "wires": [\r
+            [\r
+                "d950638a.e6fd1"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fa0b83ce.07d0f",\r
+        "type": "switchNode",\r
+        "name": "switch vnf-index",\r
+        "xml": "<switch test='`$vnf-index`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 958.7537689208984,\r
+        "y": 218.22602939605713,\r
+        "z": "c09ce476.40c538",\r
+        "wires": [\r
+            [\r
+                "c45b00c9.864fa"\r
+            ]\r
+        ]\r
     }\r
 ]
\ No newline at end of file
index 15f1e53..808070f 100644 (file)
                 </outcome>\r
             </switch>\r
             <for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
-                <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\r
-                    <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
-                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == '$prop.lan.deviceName'`">\r
-                            <outcome value='true'>\r
-                                <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
-                                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'deviceId'`">\r
-                                        <outcome value='true'>\r
-                                            <set>\r
-                                                <parameter name='prop.lan.deviceId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
-                                            </set>\r
-                                        </outcome>\r
-                                    </switch>\r
+                <block atomic="true">\r
+                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`">\r
+                        <!--switch test="`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`"-->\r
+                        <outcome value='true'>\r
+                            <block atomic="true">\r
+                                <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\r
+                                    <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
+                                        <block atomic="true">\r
+                                            <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == $prop.lan.deviceName`">\r
+                                                <outcome value='true'>\r
+                                                    <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
+                                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'deviceId'`">\r
+                                                            <outcome value='true'>\r
+                                                                <set>\r
+                                                                    <parameter name='prop.lan.deviceId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
+                                                                </set>\r
+                                                            </outcome>\r
+                                                        </switch>\r
+                                                    </for>\r
+                                                </outcome>\r
+                                            </switch>\r
+                                        </block>\r
+                                    </for>\r
                                 </for>\r
-                            </outcome>\r
-                        </switch>\r
-                    </for>\r
-                </for>\r
+                            </block>\r
+                        </outcome>\r
+                    </switch>\r
+                </block>\r
             </for>\r
             <set>\r
                 <parameter name='prop.siteAttachements_length' value='0' />\r
             <for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
                 <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\r
                     <block>\r
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                            <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic24.log"/>\r
-                            <parameter name="field1" value="__TIMESTAMP__"/>\r
-                            <parameter name="field2" value="request-action"/>\r
-                            <parameter name="field3" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action`'/>\r
-                        </record>\r
                         <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">\r
                             <outcome value='true'>\r
                                 <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
index 607a19f..d253871 100644 (file)
                     </outcome>\r
                 </switch>\r
             </for>\r
+            <switch test='`$vnf-index`'>\r
+                <outcome value=''>\r
+                    <return status='failure'>\r
+                        <parameter name='ack-final' value='Y'/>\r
+                        <parameter name="error-code" value="500" />\r
+                        <parameter name="error-message" value="vnf id not found in service-data" />\r
+                    </return>\r
+                </outcome>\r
+            </switch>\r
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
                 <outcome value=''>\r
                     <set>\r
                     </set>\r
                 </block>\r
             </for>\r
-            <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>\r
             <set>\r
                 <parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\r
             </set>\r
+            <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>\r
             <set>\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />\r
             </set>\r
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
-                <parameter name="ctx-destination" value="prop.lan-vf-index"/>\r
+                <parameter name="ctx-destination" value="prop.vf-id"/>\r
             </execute>\r
             <set>\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.lan-vf-index`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vf-id`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\r
+                <!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' /-->\r
+                <!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' /-->\r
             </set>\r
             <set>\r
+                <parameter name='vf-module-id' value='`$prop.vf-id`'/>\r
                 <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/vnfs/vnf/'\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\r
             </set>\r
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \r
-      key='lan-port-config.lan-port-config-id = $prop.lan-vf-index' >\r
-                <parameter name="lan-port-config-id" value="`$prop.vnf-index`" />\r
-                <parameter name="device-id" value="`$prop.lan.deviceName`" />\r
-                <parameter name="port-switch" value="`$prop.lan.portSwitch`" />\r
-                <parameter name="port-type" value="`$prop.lan.portType`" />\r
-                <parameter name="port-number" value="`$prop.lan.portnumber`" />\r
-                <parameter name="ipv4-address" value="`$prop.lan.ipAddress`" />\r
-                <parameter name='vlan-tag' value="`$prop.lan.vlanId`" />\r
+      key='lan-port-config.lan-port-config-id = $prop.vf-id' >\r
+                <parameter name="lan-port-config-id" value="`$prop.vf-id`" />\r
+                <parameter name="device-id" value='`$prop.lan.deviceName`' />\r
+                <parameter name="port-switch" value='`$prop.lan.portSwitch`' />\r
+                <parameter name="port-type" value='`$prop.lan.portType`' />\r
+                <parameter name="port-number" value='`$prop.lan.portnumber`' />\r
+                <parameter name="ipv4-address" value='`$prop.lan.ipAddress`' />\r
+                <parameter name='vlan-tag' value='`$prop.lan.vlanId`' />\r
                 <parameter name='operational-status' value='Created' />\r
                 <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\r
                 <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\r
                 <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\r
-                <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.site-vf-index + '/vf-module-data/'` " />\r
+                <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` " />\r
             </save>\r
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \r
       key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \r
       force="true" pfx="tmp.AnAI-data">\r
-                <parameter name="relationship-list.relationship[0].related-to" value="sdwan-vpn" />\r
-                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/sdwan-vpns/sdwan-vpn/' + $prop.lan-vf-index`" />\r
+                <parameter name="relationship-list.relationship[0].related-to" value="lan-port-config" />\r
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/lan-port-configs/lan-port-config/' + $prop.vf-id`" />\r
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="lan-port-config-id" />\r
-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.lan-vf-index`" />\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vf-id`" />\r
             </save>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r
             </return>\r
         </block>\r
     </method>\r
-</service-logic>
\ No newline at end of file
+</service-logic>\r
+\r
index 77575c2..2a0a3af 100644 (file)
                     </outcome>\r
                 </switch>\r
             </for>\r
+            <switch test='`$vnf-index`'>\r
+                <outcome value=''>\r
+                    <return status='failure'>\r
+                        <parameter name='ack-final' value='Y'/>\r
+                        <parameter name="error-code" value="500" />\r
+                        <parameter name="error-message" value="vnf id not found in service-data" />\r
+                    </return>\r
+                </outcome>\r
+            </switch>\r
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
                 <outcome value='0'>\r
                     <return status='failure'>\r
@@ -63,7 +72,7 @@
             <for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
                 <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\r
                     <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
-                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == '$prop.lan.deviceName'`">\r
+                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == $prop.lan.deviceName`">\r
                             <outcome value='true'>\r
                                 <block atomic="true">\r
                                     <set>\r
index 5fb6735..30df6e0 100644 (file)
                     </outcome>\r
                 </switch>\r
             </for>\r
+            <switch test='`$vnf-index`'>\r
+                <outcome value=''>\r
+                    <return status='failure'>\r
+                        <parameter name='ack-final' value='Y'/>\r
+                        <parameter name="error-code" value="500" />\r
+                        <parameter name="error-message" value="vnf id not found in service-data" />\r
+                    </return>\r
+                </outcome>\r
+            </switch>\r
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
                 <outcome value='0'>\r
                     <return status='failure'>\r
  + '/service-data/service-topology/'`"/>\r
             </set>\r
             <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='lan-port-config' \r
-        key='site-resource.site-resource-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>\r
+        key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r
                 <parameter name="error-code" value="200" />\r
index 02a816b..360cb47 100644 (file)
@@ -4,24 +4,6 @@
     <method rpc='sdwan-vf-operation-vpn-create' mode='sync'>\r
         <block atomic="true">\r
             <call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync' ></call>\r
-            <switch test='`$service-data.vnfs.vnf_length`'>\r
-                <outcome value=''>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="404" />\r
-                        <parameter name="error-message" value="There are no VNFs in MD-SAL" />\r
-                    </return>\r
-                </outcome>\r
-            </switch>\r
-            <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
-                <switch test="`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`">\r
-                    <outcome value='true'>\r
-                        <set>\r
-                            <parameter name='vnf-index' value='`$idx`' />\r
-                        </set>\r
-                    </outcome>\r
-                </switch>\r
-            </for>\r
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
                 <outcome value=''>\r
                     <set>\r
index 29b26cd..60492b5 100644 (file)
                     </outcome>\r
                 </switch>\r
             </for>\r
+            <switch test='`$vnf-index`'>\r
+                <outcome value=''>\r
+                    <return status='failure'>\r
+                        <parameter name='ack-final' value='Y'/>\r
+                        <parameter name="error-code" value="500" />\r
+                        <parameter name="error-message" value="vnf id not found in service-data" />\r
+                    </return>\r
+                </outcome>\r
+            </switch>\r
             <switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\r
                 <outcome value='create'>\r
                     <block atomic="true">\r