diff options
13 files changed, 2795 insertions, 2584 deletions
diff --git a/installation/ansible-server/src/main/Playbooks/ansible_huawei_upgrade@0.01.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_upgrade@0.01.yml index 51402726..4ebe69f0 100644 --- a/installation/ansible-server/src/main/Playbooks/ansible_huawei_upgrade@0.01.yml +++ b/installation/ansible-server/src/main/Playbooks/ansible_huawei_upgrade@0.01.yml @@ -22,58 +22,106 @@ ne_identifier: "{{neIdentifier}}"
when: neIdentifier is defined
+ - name: support new parameter swToBeInstalled
+ set_fact:
+ sw_to_be_installed: "{{swToBeInstalled}}"
+ when: swToBeInstalled is defined
+
+ - name: check if swToBeInstalled is empty
+ fail:
+ when: swToBeInstalled is defined and sw_to_be_installed | length == 0
+
+ - name: support new parameter swVersionToBeActivated
+ set_fact:
+ sw_version_to_be_activated: "{{swVersionToBeActivated}}"
+ when: swVersionToBeActivated is defined
+
- name: execute downloadNESw operation
- shell: ./swm/downloadNESw.sh --swToBeDownloaded {{sw_to_be_downloaded}} --neIdentifier {{ne_identifier}}
+ shell: ./swm/downloadNESw --swToBeDownloaded {{sw_to_be_downloaded}} --neIdentifier {{ne_identifier}}
register: download_result
- name: parse response of downloadNESw
set_fact:
download_response: "{{ download_result.stdout | from_json }}"
+ when: swToBeInstalled is not defined
- name: fetch file of Notification notifyDownloadNESwStatusChanged
fetch:
- dest: /tmp/
- src: /tmp/notifyDownloadNESwStatusChanged-{{download_response.downloadProcessId}}
+ dest: "{{inventory_dir}}"
+ src: "/tmp/notifyDownloadNESwStatusChanged-{{download_response.downloadProcessId}}"
+ when: swToBeInstalled is not defined
- name: read contents of Notification notifyDownloadNESwStatusChanged
set_fact:
- download_notification: "{{ lookup('file', '/tmp/{{inventory_hostname}}/tmp/notifyDownloadNESwStatusChanged-{{download_response.downloadProcessId}}') | from_json }}"
+ download_notification: "{{ lookup('file', '{{inventory_dir}}/{{inventory_hostname}}/tmp/notifyDownloadNESwStatusChanged-{{download_response.downloadProcessId}}') | from_json }}"
+ when: swToBeInstalled is not defined
- name: delete file of Notification notifyDownloadNESwStatusChanged
- local_action: file path="/tmp/{{inventory_hostname}}/tmp/notifyDownloadNESwStatusChanged-{{download_response.downloadProcessId}}" state=absent
+ local_action: file path="{{inventory_dir}}/{{inventory_hostname}}/tmp/notifyDownloadNESwStatusChanged-{{download_response.downloadProcessId}}" state=absent
+ when: swToBeInstalled is not defined
+
+ - name: set downloadedNESwInfo
+ set_fact:
+ downloaded_ne_sw_info: "{{ download_notification.downloadedNESwInfo }}"
+ when: swToBeInstalled is not defined
- name: execute installNESw operation
- shell: ./swm/installNESw.sh --swToBeInstalled {{item}} --neIdentifier {{ne_identifier}}
+ shell: ./swm/installNESw --swToBeInstalled {{item}} --neIdentifier {{ne_identifier}}
register: install_result
- with_items: "{{ download_notification.downloadedNESwInfo }}"
+ with_items: "{{ downloaded_ne_sw_info | default([]) }}"
+
+ - name: execute installNESw operation using new parameter
+ shell: ./swm/installNESw --swToBeInstalled {{item}} --neIdentifier {{ne_identifier}}
+ register: install_result_new
+ with_items: "{{ sw_to_be_installed | default([]) }}"
+
+ - name: unify install result
+ set_fact:
+ install_result: "{{ install_result_new }}"
+ when: swToBeInstalled is defined
+
+ - name: set install results list
+ set_fact:
+ install_results_list: "{{ install_result.results }}"
+ when: swVersionToBeActivated is not defined
- name: parse responses of all the installNESws
set_fact:
install_responses: "{{ install_responses | default([]) + [item.stdout | from_json] }}"
- with_items: "{{ install_result.results }}"
+ with_items: "{{ install_results_list | default([]) }}"
- name: fetch files of all the Notifications notifyInstallNESwStatusChanged
fetch:
- dest: /tmp/
- src: /tmp/notifyInstallNESwStatusChanged-{{item.installProcessId}}
- with_items: "{{ install_responses }}"
+ dest: "{{inventory_dir}}"
+ src: "/tmp/notifyInstallNESwStatusChanged-{{item.installProcessId}}"
+ with_items: "{{ install_responses | default([]) }}"
- name: read contents of all the Notifications notifyInstallNESwStatusChanged
set_fact:
- install_notifications: "{{ install_notifications | default([]) + [lookup('file', '/tmp/{{inventory_hostname}}/tmp/notifyInstallNESwStatusChanged-{{item.installProcessId}}') | from_json] }}"
- with_items: "{{ install_responses }}"
+ install_notifications: "{{ install_notifications | default([]) + [lookup('file', '{{inventory_dir}}/{{inventory_hostname}}/tmp/notifyInstallNESwStatusChanged-{{item.installProcessId}}') | from_json] }}"
+ with_items: "{{ install_responses | default([]) }}"
- name: delete files of all the Notifications notifyInstallNESwStatusChanged
- local_action: file path="/tmp/{{inventory_hostname}}/tmp/notifyInstallNESwStatusChanged-{{item.installProcessId}}" state=absent
- with_items: "{{ install_responses }}"
+ local_action: file path="{{inventory_dir}}/{{inventory_hostname}}/tmp/notifyInstallNESwStatusChanged-{{item.installProcessId}}" state=absent
+ with_items: "{{ install_responses | default([]) }}"
- name: parse all the installed NE SW info
set_fact:
installed_ne_sw_info: "{{ installed_ne_sw_info | default([]) + item.installedNESwInfo }}"
- with_items: "{{ install_notifications }}"
+ with_items: "{{ install_notifications | default([]) }}"
- name: execute activateNESw operation
- shell: ./swm/activateNESw.sh --swVersionToBeActivated {{item}} --neIdentifier {{ne_identifier}}
+ shell: ./swm/activateNESw --swVersionToBeActivated {{item}} --neIdentifier {{ne_identifier}}
register: activate_result
- with_items: "{{ installed_ne_sw_info }}"
+ with_items: "{{ installed_ne_sw_info | default([]) }}"
+
+ - name: execute activateNESw operation using new parameter
+ shell: ./swm/activateNESw --swVersionToBeActivated {{sw_version_to_be_activated}} --neIdentifier {{ne_identifier}}
+ register: activate_result_new
+ when: swVersionToBeActivated is defined
+
+ - name: unify activate result
+ set_fact:
+ activate_result: "{{ activate_result_new }}"
+ when: swVersionToBeActivated is defined
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json index 138d31fb..861a58ae 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json @@ -1,38 +1,38 @@ [
{
- "id": "cea6a9f1.279478",
+ "id": "d9c4f19e.fd2e7",
"type": "switchNode",
"name": "switch vf-modules.vf-module_length",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 570.7143020629883,
- "y": 337.99999046325684,
- "z": "2f0cf160.dc107e",
+ "x": 672.25390625,
+ "y": 347.99999046325684,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "4a89ecf7.049034",
- "2a09fa32.63fc36",
- "c2f1098d.e8bd38"
+ "cef58dbf.65cb",
+ "2919e925.39dec6",
+ "e1d6ced2.e1fdf"
]
]
},
{
- "id": "1833f3f4.1b830c",
+ "id": "f7e66a22.01e028",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 107.71429824829102,
- "y": 29,
- "z": "2f0cf160.dc107e",
+ "x": 209.25390243530273,
+ "y": 39,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "181dc2fc.e539bd"
+ "c86c7fcc.d57a3"
]
]
},
{
- "id": "181dc2fc.e539bd",
+ "id": "c86c7fcc.d57a3",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -40,1814 +40,1879 @@ "comments": "",
"xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
"outputs": 1,
- "x": 177,
- "y": 92.23810958862305,
- "z": "2f0cf160.dc107e",
+ "x": 278.5396041870117,
+ "y": 102.23810958862305,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "25791551.06845a"
+ "8a66936c.4ecc5"
]
]
},
{
- "id": "25791551.06845a",
+ "id": "8a66936c.4ecc5",
"type": "method",
"name": "method sdwan-vf-operation-lanport-activate",
"xml": "<method rpc='sdwan-vf-operation-lanport-activate' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 188.71429443359375,
- "y": 186.58634185791016,
- "z": "2f0cf160.dc107e",
+ "x": 290.25389862060547,
+ "y": 196.58634185791016,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "419d7afa.b1ca54"
+ "b4cb95ed.cde538"
]
]
},
{
- "id": "419d7afa.b1ca54",
+ "id": "b4cb95ed.cde538",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 189.38096618652344,
- "y": 442.666708946228,
- "z": "2f0cf160.dc107e",
- "wires": [
- [
- "f5110085.4f487",
- "f62e0d25.9e73c",
- "cea6a9f1.279478",
- "76df47d2.f28eb8",
- "3a550152.acb95e",
- "bad651b2.12a17",
- "a66a0a0e.fef0c8",
- "f2a2fd31.6afea",
- "11a6133a.d1ed1d",
- "6bb3e148.a2b06",
- "233d7734.c6ad18",
- "ec89c38e.b0db3",
- "cfe4c928.772628",
- "307480f2.c3f12",
- "83adcbda.9cab18",
- "41a8aff.133475",
- "bf4ca0a0.f719b",
- "14cdbea6.6ff3c1",
- "96f47da7.f3275",
- "7299f238.fa9f1c",
- "e4f03070.b443a",
- "1e3434c6.db511b",
- "56401cb0.1f0164"
- ]
- ]
- },
- {
- "id": "f62e0d25.9e73c",
+ "x": 290.92057037353516,
+ "y": 452.666708946228,
+ "z": "d0c9a483.09f7c8",
+ "wires": [
+ [
+ "f3bcc30.03c554",
+ "ac79d525.fd1fd8",
+ "d9c4f19e.fd2e7",
+ "1bfdbcc3.c7cd93",
+ "6e8941e2.a043c",
+ "901afcf1.d22f3",
+ "ef04791b.55e268",
+ "8364ef5f.25f26",
+ "6278217c.89959",
+ "760751d.6fd76b",
+ "cd4a9b23.d614c8",
+ "44113153.ffa83",
+ "b05dede5.e0278",
+ "45f5fb20.78ea64",
+ "b07fc696.74dd68",
+ "8fa1111d.08c36",
+ "a897b863.5cfc78",
+ "9bf6789f.a0ec08",
+ "537766b1.131458",
+ "8ffe71d6.e37e5",
+ "b5fcdf55.56396",
+ "695214fd.2c4fdc",
+ "188a2b9c.34d5e4"
+ ]
+ ]
+ },
+ {
+ "id": "ac79d525.fd1fd8",
"type": "for",
"name": "for each vnf",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 520.7456588745117,
- "y": 266.2691411972046,
- "z": "2f0cf160.dc107e",
+ "x": 622.2852630615234,
+ "y": 276.2691411972046,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "b7bf67d0.4c13b8"
+ "8d9e53be.f0301"
]
]
},
{
- "id": "f5110085.4f487",
+ "id": "f3bcc30.03c554",
"type": "switchNode",
"name": "switch vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 525.7143135070801,
- "y": 205.00001049041748,
- "z": "2f0cf160.dc107e",
+ "x": 627.2539176940918,
+ "y": 215.00001049041748,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "61a8d0c5.ce10b"
+ "193a9775.d88519"
]
]
},
{
- "id": "61a8d0c5.ce10b",
+ "id": "193a9775.d88519",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 705.7142944335938,
- "y": 204,
- "z": "2f0cf160.dc107e",
+ "x": 807.2538986206055,
+ "y": 214,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "3e167156.21c02e"
+ "4b9a0abb.eb1bb4"
]
]
},
{
- "id": "3e167156.21c02e",
+ "id": "4b9a0abb.eb1bb4",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 855.1430206298828,
- "y": 205.14291763305664,
- "z": "2f0cf160.dc107e",
+ "x": 956.6826248168945,
+ "y": 215.14291763305664,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "b7bf67d0.4c13b8",
+ "id": "8d9e53be.f0301",
"type": "switchNode",
"name": "switch this vnf-id == input vnf-id",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\"> \n",
"comments": "",
"outputs": 1,
- "x": 743.7143096923828,
- "y": 267.00000619888306,
- "z": "2f0cf160.dc107e",
+ "x": 845.2539138793945,
+ "y": 277.00000619888306,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "29696342.56f90c"
+ "835ec48b.329e88"
]
]
},
{
- "id": "29696342.56f90c",
+ "id": "835ec48b.329e88",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 958.7142944335938,
- "y": 265,
- "z": "2f0cf160.dc107e",
+ "x": 1060.2538986206055,
+ "y": 275,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "1ba7830b.c7ea6d"
+ "38760c6e.34c224"
]
]
},
{
- "id": "1ba7830b.c7ea6d",
+ "id": "38760c6e.34c224",
"type": "set",
"name": "set vnf-index",
"xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
"comments": "",
- "x": 1122.7142944335938,
- "y": 260,
- "z": "2f0cf160.dc107e",
+ "x": 1224.2538986206055,
+ "y": 270,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "2a09fa32.63fc36",
+ "id": "2919e925.39dec6",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 792.7142944335938,
- "y": 372,
- "z": "2f0cf160.dc107e",
+ "x": 894.2538986206055,
+ "y": 382,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "4ead305d.0b806"
+ "4642ed44.17b144"
]
]
},
{
- "id": "4a89ecf7.049034",
+ "id": "cef58dbf.65cb",
"type": "outcome",
"name": "0",
"xml": "<outcome value='0'>\n",
"comments": "",
"outputs": 1,
- "x": 797.7142906188965,
- "y": 318.9999990463257,
- "z": "2f0cf160.dc107e",
+ "x": 899.2538948059082,
+ "y": 328.9999990463257,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "4ead305d.0b806"
+ "4642ed44.17b144"
]
]
},
{
- "id": "4ead305d.0b806",
+ "id": "4642ed44.17b144",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 955.7142944335938,
- "y": 332,
- "z": "2f0cf160.dc107e",
+ "x": 1057.2538986206055,
+ "y": 342,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "c2f1098d.e8bd38",
+ "id": "e1d6ced2.e1fdf",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 792.7142944335938,
- "y": 433,
- "z": "2f0cf160.dc107e",
+ "x": 894.2538986206055,
+ "y": 443,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "2458c219.d10e1e"
+ "1bffa38f.f0c50c"
]
]
},
{
- "id": "ead36ccd.33529",
+ "id": "3daf6135.38733e",
"type": "set",
"name": "set vf-module_length",
"xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",
"comments": "",
- "x": 1146.7143096923828,
- "y": 431.0000139474869,
- "z": "2f0cf160.dc107e",
+ "x": 1248.2539138793945,
+ "y": 441.0000139474869,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "2458c219.d10e1e",
+ "id": "1bffa38f.f0c50c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 953.7143402099609,
- "y": 429.99999141693115,
- "z": "2f0cf160.dc107e",
+ "x": 1055.2539443969727,
+ "y": 439.99999141693115,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "ead36ccd.33529",
- "386f97ee.904d48"
+ "3daf6135.38733e",
+ "ef25b392.fb9e5"
]
]
},
{
- "id": "386f97ee.904d48",
+ "id": "ef25b392.fb9e5",
"type": "for",
"name": "for each existing vf-index",
"xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1165.7142791748047,
- "y": 483.99999046325684,
- "z": "2f0cf160.dc107e",
+ "x": 1267.2538833618164,
+ "y": 493.99999046325684,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "593c39.dc7673c8"
+ "a5aa4ea3.3a9f8"
]
]
},
{
- "id": "593c39.dc7673c8",
+ "id": "a5aa4ea3.3a9f8",
"type": "switchNode",
"name": "switch vf-module-id found",
"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",
"comments": "",
"outputs": 1,
- "x": 1408.7142944335938,
- "y": 479,
- "z": "2f0cf160.dc107e",
+ "x": 1510.2538986206055,
+ "y": 489,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "1efda74.b0eb959"
+ "291f40c7.f811f"
]
]
},
{
- "id": "1efda74.b0eb959",
+ "id": "291f40c7.f811f",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1606.7143230438232,
- "y": 466.0000066757202,
- "z": "2f0cf160.dc107e",
+ "x": 1708.253927230835,
+ "y": 476.0000066757202,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "d0b5f3a2.35747"
+ "62bd116.37066f"
]
]
},
{
- "id": "d0b5f3a2.35747",
+ "id": "62bd116.37066f",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1758.7142944335938,
- "y": 468,
- "z": "2f0cf160.dc107e",
+ "x": 1860.2538986206055,
+ "y": 478,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "1fc6559e.18634a",
- "802dea9f.3c2848",
- "9329a8cc.23d418"
+ "fceeafa7.b7652",
+ "767f5d19.fe3e84",
+ "f1e44e3e.f0b3c"
]
]
},
{
- "id": "1fc6559e.18634a",
+ "id": "fceeafa7.b7652",
"type": "set",
"name": "set tmp.vidx and ctx.vnf-data",
"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",
"comments": "",
- "x": 1986.7144088745117,
- "y": 410.00000381469727,
- "z": "2f0cf160.dc107e",
+ "x": 2088.2540130615234,
+ "y": 420.00000381469727,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "802dea9f.3c2848",
+ "id": "767f5d19.fe3e84",
"type": "set",
"name": "set vf-module-request-input.",
"xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",
"comments": "",
- "x": 1990.7144088745117,
- "y": 464.00000381469727,
- "z": "2f0cf160.dc107e",
+ "x": 2092.2540130615234,
+ "y": 474.00000381469727,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "76df47d2.f28eb8",
+ "id": "1bfdbcc3.c7cd93",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
"comments": "",
- "x": 504.714412689209,
- "y": 2079.501151561737,
- "z": "2f0cf160.dc107e",
+ "x": 606.2540168762207,
+ "y": 2089.501151561737,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "9329a8cc.23d418",
+ "id": "f1e44e3e.f0b3c",
"type": "call",
"name": "call sdwan-get-vf-module-lanport-param",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2021.16943359375,
- "y": 515.0104961395264,
- "z": "2f0cf160.dc107e",
+ "x": 2122.7090377807617,
+ "y": 525.0104961395264,
+ "z": "d0c9a483.09f7c8",
"wires": [
[]
]
},
{
- "id": "b2d390ae.97474",
+ "id": "aa0d1480.7f1978",
"type": "for",
"name": "for vf-modules.vf-module_length",
"xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 827.9683685302734,
- "y": 520.0040225982666,
- "z": "2f0cf160.dc107e",
+ "x": 1379.5080871582031,
+ "y": 553.0040807723999,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "7dff73e1.0243cc"
+ "9ed7ce57.d6ce"
]
]
},
{
- "id": "3f6c843d.edec8c",
+ "id": "1f605289.f2eb7d",
"type": "switchNode",
"name": "switch this deviceName == vf-input",
- "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",
+ "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",
"comments": "",
"outputs": 1,
- "x": 1100.9686126708984,
- "y": 606.0041282176971,
- "z": "2f0cf160.dc107e",
+ "x": 1450.50830078125,
+ "y": 626.0042104721069,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "cb455713.e1bdd8"
+ "b123da61.76e8a8"
]
]
},
{
- "id": "7dff73e1.0243cc",
+ "id": "9ed7ce57.d6ce",
"type": "for",
"name": "for vf-module-input-param length",
"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",
"comments": "",
"outputs": 1,
- "x": 1125.9682846069336,
- "y": 523.0040645599365,
- "z": "2f0cf160.dc107e",
+ "x": 1665.5079345703125,
+ "y": 555.0041646957397,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "3f6c843d.edec8c"
+ "f599447.9ac3fb8"
]
]
},
{
- "id": "cb455713.e1bdd8",
+ "id": "b123da61.76e8a8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1314.9684257507324,
- "y": 603.0041129589081,
- "z": "2f0cf160.dc107e",
+ "x": 1670.5080242156982,
+ "y": 627.0042181015015,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "8c1ad275.b541"
+ "2d7f5405.e9306c"
]
]
},
{
- "id": "8c1ad275.b541",
+ "id": "2d7f5405.e9306c",
"type": "for",
"name": "for vf-modules.vf-module_length",
"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",
"comments": "",
"outputs": 1,
- "x": 1528.9684677124023,
- "y": 599.0040664672852,
- "z": "2f0cf160.dc107e",
+ "x": 1915.5081024169922,
+ "y": 627.0041356086731,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "6aaf6a5c.76e9f4"
+ "faceb28.d0a9d5"
]
]
},
{
- "id": "6aaf6a5c.76e9f4",
+ "id": "faceb28.d0a9d5",
"type": "switchNode",
"name": "switch deviceId == input vf-id",
"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",
"comments": "",
"outputs": 1,
- "x": 1843.9685440063477,
- "y": 598.0040471553802,
- "z": "2f0cf160.dc107e",
+ "x": 2223.5083770751953,
+ "y": 610.0041036605835,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "85841cc6.de2b3"
+ "ec659d9d.8002"
]
]
},
{
- "id": "85841cc6.de2b3",
+ "id": "ec659d9d.8002",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2045.9686737060547,
- "y": 596.0040481090546,
- "z": "2f0cf160.dc107e",
+ "x": 2432.508415222168,
+ "y": 612.004096031189,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "1722d3f0.fc82dc"
+ "73ebf520.d1f88c"
]
]
},
{
- "id": "1722d3f0.fc82dc",
+ "id": "73ebf520.d1f88c",
"type": "set",
"name": "set prop.lan.deviceId",
"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",
"comments": "",
- "x": 2220.9685668945312,
- "y": 596.004228591919,
- "z": "2f0cf160.dc107e",
+ "x": 2609.5083808898926,
+ "y": 608.0042867660522,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "3a550152.acb95e",
+ "id": "6e8941e2.a043c",
"type": "for",
"name": "for service-data.vnfs.vnf_length",
"xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 573.9682159423828,
- "y": 455.00401973724365,
- "z": "2f0cf160.dc107e",
+ "x": 633.5078125,
+ "y": 420.00404262542725,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "b2d390ae.97474"
+ "5c633f8a.ecb75"
]
]
},
{
- "id": "566234f6.d57f8c",
+ "id": "415f5cb9.3a6e44",
"type": "switchNode",
"name": "switch ActivateSDWANSiteInstance",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1168.7185821533203,
- "y": 727.0039882659912,
- "z": "2f0cf160.dc107e",
+ "x": 1270.258186340332,
+ "y": 737.0039882659912,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "d08758a.8a9d4a8"
+ "55fab2c0.18755c"
]
]
},
{
- "id": "4a6e0872.754c78",
+ "id": "ba32492c.0e54c8",
"type": "for",
"name": "for vf-modules.vf-module_length",
"xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 814.7184219360352,
- "y": 694.0040283203125,
- "z": "2f0cf160.dc107e",
+ "x": 916.2580261230469,
+ "y": 704.0040283203125,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "2141a4d0.4ed0ac"
+ "bd374d2.a7cdcb"
]
]
},
{
- "id": "83adcbda.9cab18",
+ "id": "b07fc696.74dd68",
"type": "for",
"name": "for service-data.vnfs.vnf_length",
"xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 565.7182769775391,
- "y": 625.0039081573486,
- "z": "2f0cf160.dc107e",
+ "x": 667.2578811645508,
+ "y": 635.0039081573486,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "4a6e0872.754c78"
+ "ba32492c.0e54c8"
]
]
},
{
- "id": "d08758a.8a9d4a8",
+ "id": "55fab2c0.18755c",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1390.7184982299805,
- "y": 727.0040698051453,
- "z": "2f0cf160.dc107e",
+ "x": 1492.2581024169922,
+ "y": 737.0040698051453,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "5c9349a5.10cdf8"
+ "2d0cb991.e67216"
]
]
},
{
- "id": "5c9349a5.10cdf8",
+ "id": "2d0cb991.e67216",
"type": "for",
"name": "for vf-modules.vf-module_length",
"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",
"comments": "",
"outputs": 1,
- "x": 1471.968505859375,
- "y": 801.5040712356567,
- "z": "2f0cf160.dc107e",
+ "x": 1573.5081100463867,
+ "y": 811.5040712356567,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "78c531f9.c452d"
+ "f98893a0.de7a4"
]
]
},
{
- "id": "78502254.1e1d1c",
+ "id": "39ba7083.5ed54",
"type": "switchNode",
"name": "switch siteId",
"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",
"comments": "",
"outputs": 1,
- "x": 1854.968864440918,
- "y": 808.5041785240173,
- "z": "2f0cf160.dc107e",
+ "x": 1956.5084686279297,
+ "y": 818.5041785240173,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "cef8d9d4.a847d8"
+ "36c8a445.c6055c"
]
]
},
{
- "id": "cef8d9d4.a847d8",
+ "id": "36c8a445.c6055c",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2031.9688835144043,
- "y": 811.5040187835693,
- "z": "2f0cf160.dc107e",
+ "x": 2133.508487701416,
+ "y": 821.5040187835693,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "57774070.165c4"
+ "cb17586e.80dbb8"
]
]
},
{
- "id": "26765522.97752a",
+ "id": "cafa7b8b.465778",
"type": "set",
"name": "set prop.attach.siteId",
"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",
"comments": "",
- "x": 2415.9693908691406,
- "y": 785.5040702819824,
- "z": "2f0cf160.dc107e",
+ "x": 2517.5089950561523,
+ "y": 795.5040702819824,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "57774070.165c4",
+ "id": "cb17586e.80dbb8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2191.2190742492676,
- "y": 807.0040588378906,
- "z": "2f0cf160.dc107e",
+ "x": 2292.7586784362793,
+ "y": 817.0040588378906,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "26765522.97752a",
- "18aa70c2.f51f1f",
- "95fdece9.83f56",
- "13d1a87e.cc7dd8"
+ "cafa7b8b.465778",
+ "9412ef29.cc029",
+ "4b9ca75a.7fc698",
+ "2f9763b5.4e87fc"
]
]
},
{
- "id": "41a8aff.133475",
+ "id": "8fa1111d.08c36",
"type": "get-resource",
"name": "get-resource esr-thirdparty-sdnc",
"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",
"comments": "",
"outputs": 1,
- "x": 526.7182235717773,
- "y": 944.5039968490601,
- "z": "2f0cf160.dc107e",
+ "x": 628.2578277587891,
+ "y": 954.5039968490601,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "9e1e759b.490ef8",
- "587c1d85.98e364",
- "1fecffb3.fdfc1"
+ "4a5d401e.8bf8e",
+ "1ff4f9b4.f19fb6",
+ "8afdb3bf.1d43d"
]
]
},
{
- "id": "9e1e759b.490ef8",
+ "id": "4a5d401e.8bf8e",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 770.7182846069336,
- "y": 908.5039968490601,
- "z": "2f0cf160.dc107e",
+ "x": 872.2578887939453,
+ "y": 918.5039968490601,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "1eeec00d.ea37e"
+ "ec14c17f.6e2c1"
]
]
},
{
- "id": "587c1d85.98e364",
+ "id": "1ff4f9b4.f19fb6",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 773.2091674804688,
- "y": 944.0780334472656,
- "z": "2f0cf160.dc107e",
+ "x": 874.7487716674805,
+ "y": 954.0780334472656,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "f1f9240f.1bbe98"
+ "7501ffb3.13588"
]
]
},
{
- "id": "1fecffb3.fdfc1",
+ "id": "8afdb3bf.1d43d",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 768.5421752929688,
- "y": 980.4113922119141,
- "z": "2f0cf160.dc107e",
+ "x": 870.0817794799805,
+ "y": 990.4113922119141,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "e9937b5c.1de1c8"
+ "26b83768.3bb758"
]
]
},
{
- "id": "e9937b5c.1de1c8",
+ "id": "26b83768.3bb758",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
"comments": "",
- "x": 922.3146667480469,
- "y": 977.8504791259766,
- "z": "2f0cf160.dc107e",
+ "x": 1023.8542709350586,
+ "y": 987.8504791259766,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "f1f9240f.1bbe98",
+ "id": "7501ffb3.13588",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
"comments": "",
- "x": 918.7805633544922,
- "y": 942.3637208938599,
- "z": "2f0cf160.dc107e",
+ "x": 1020.3201675415039,
+ "y": 952.3637208938599,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "1eeec00d.ea37e",
+ "id": "ec14c17f.6e2c1",
"type": "set",
"name": "set controller data",
"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",
"comments": "",
- "x": 931.2183952331543,
- "y": 906.5039367675781,
- "z": "2f0cf160.dc107e",
+ "x": 1032.757999420166,
+ "y": 916.5039367675781,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "bf4ca0a0.f719b",
+ "id": "a897b863.5cfc78",
"type": "execute",
"name": "execute RestApiCallNode Get token",
"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\"/>",
"comments": "",
"outputs": 1,
- "x": 540.6564559936523,
- "y": 1047.62509059906,
- "z": "2f0cf160.dc107e",
+ "x": 642.1960601806641,
+ "y": 1057.62509059906,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "d05110e4.15f05",
- "623a881a.ebe538"
+ "b99d5bfa.8263b8",
+ "3b97c655.fec2fa"
]
]
},
{
- "id": "d05110e4.15f05",
+ "id": "b99d5bfa.8263b8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 775.6565818786621,
- "y": 1033.6250791549683,
- "z": "2f0cf160.dc107e",
+ "x": 877.1961860656738,
+ "y": 1043.6250791549683,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "adf2584e.694ce8"
+ "da99c661.cc9138"
]
]
},
{
- "id": "623a881a.ebe538",
+ "id": "3b97c655.fec2fa",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 774.9065818786621,
- "y": 1069.2679862976074,
- "z": "2f0cf160.dc107e",
+ "x": 876.4461860656738,
+ "y": 1079.2679862976074,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "e8c30ab5.68d3b8"
+ "d1dde0a7.dc9a2"
]
]
},
{
- "id": "e8c30ab5.68d3b8",
+ "id": "d1dde0a7.dc9a2",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",
"comments": "",
- "x": 923.6565895080566,
- "y": 1070.0180683135986,
- "z": "2f0cf160.dc107e",
+ "x": 1025.1961936950684,
+ "y": 1080.0180683135986,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "adf2584e.694ce8",
+ "id": "da99c661.cc9138",
"type": "set",
"name": "set token-id",
"xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
"comments": "",
- "x": 917.6565895080566,
- "y": 1032.6250801086426,
- "z": "2f0cf160.dc107e",
+ "x": 1019.1961936950684,
+ "y": 1042.6250801086426,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "96f47da7.f3275",
+ "id": "537766b1.131458",
"type": "execute",
"name": "execute RestApiCallNode device port create",
"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`\" />",
"comments": "",
"outputs": 1,
- "x": 566.7455520629883,
- "y": 1199.0782289505005,
- "z": "2f0cf160.dc107e",
+ "x": 668.28515625,
+ "y": 1209.0782289505005,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "50af67d.1491698",
- "bef4965a.55b458"
+ "8649541f.c916f8",
+ "490b0339.21ab4c"
]
]
},
{
- "id": "50af67d.1491698",
+ "id": "8649541f.c916f8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 815.7456111907959,
- "y": 1213.0784349441528,
- "z": "2f0cf160.dc107e",
+ "x": 917.2852153778076,
+ "y": 1223.0784349441528,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "b4a513b9.d44d6"
+ "53d53343.edd9cc"
]
]
},
{
- "id": "bef4965a.55b458",
+ "id": "490b0339.21ab4c",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 815.7456111907959,
- "y": 1175.0782704353333,
- "z": "2f0cf160.dc107e",
+ "x": 917.2852153778076,
+ "y": 1185.0782704353333,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "d695c8db.015488"
+ "bb7e9ee8.bdde5"
]
]
},
{
- "id": "d695c8db.015488",
+ "id": "bb7e9ee8.bdde5",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing Create device port rest api\" />\n",
"comments": "",
- "x": 959.7459449768066,
- "y": 1174.078269958496,
- "z": "2f0cf160.dc107e",
+ "x": 1061.2855491638184,
+ "y": 1184.078269958496,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "b4a513b9.d44d6",
+ "id": "53d53343.edd9cc",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 962.7456226348877,
- "y": 1214.0782737731934,
- "z": "2f0cf160.dc107e",
+ "x": 1064.2852268218994,
+ "y": 1224.0782737731934,
+ "z": "d0c9a483.09f7c8",
"wires": [
[]
]
},
{
- "id": "bad651b2.12a17",
+ "id": "901afcf1.d22f3",
"type": "set",
"name": "set prop.lan.devicePortId",
"xml": "<set>\n<parameter name='prop.lan.devicePortId' value='`$portResp.success[0].id`' />\n",
"comments": "",
- "x": 509.4028129577637,
- "y": 1252.1794338226318,
- "z": "2f0cf160.dc107e",
+ "x": 610.9424171447754,
+ "y": 1262.1794338226318,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "1d5fca27.3bbea6",
+ "id": "44729f10.35f05",
"type": "comment",
"name": "Create port",
"info": "",
"comments": "",
- "x": 468.41149139404297,
- "y": 1165.522253036499,
- "z": "2f0cf160.dc107e",
+ "x": 569.9510955810547,
+ "y": 1175.522253036499,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "14cdbea6.6ff3c1",
+ "id": "9bf6789f.a0ec08",
"type": "call",
"name": "call sdwan-get-tenant-auth",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 515.411491394043,
- "y": 1114.1886892318726,
- "z": "2f0cf160.dc107e",
+ "x": 616.9510955810547,
+ "y": 1124.1886892318726,
+ "z": "d0c9a483.09f7c8",
"wires": [
[]
]
},
{
- "id": "f52cabac.abeb68",
+ "id": "eeb61a62.766e08",
"type": "execute",
"name": "execute RestApiCallNode bridge domain create",
"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`\" />",
"comments": "",
"outputs": 1,
- "x": 989.3958015441895,
- "y": 1294.188857793808,
- "z": "2f0cf160.dc107e",
+ "x": 1090.9354057312012,
+ "y": 1304.188857793808,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "441eed4c.baf224",
- "fa3f1c96.1fc6d"
+ "925721ce.9c9c3",
+ "4887b469.84db6c"
]
]
},
{
- "id": "441eed4c.baf224",
+ "id": "925721ce.9c9c3",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1310.3958282470703,
- "y": 1311.1891782283783,
- "z": "2f0cf160.dc107e",
+ "x": 1411.935432434082,
+ "y": 1321.1891782283783,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "a63cb83c.98c9e8"
+ "ae68593e.8ba108"
]
]
},
{
- "id": "fa3f1c96.1fc6d",
+ "id": "4887b469.84db6c",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1313.3958549499512,
- "y": 1276.1889598369598,
- "z": "2f0cf160.dc107e",
+ "x": 1414.935459136963,
+ "y": 1286.1889598369598,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "421c7bf9.398d94"
+ "79f2f146.ca204"
]
]
},
{
- "id": "421c7bf9.398d94",
+ "id": "79f2f146.ca204",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing Create bridge domain rest api\" />\n",
"comments": "",
- "x": 1516.3962440490723,
- "y": 1272.1890671253204,
- "z": "2f0cf160.dc107e",
+ "x": 1617.935848236084,
+ "y": 1282.1890671253204,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "a63cb83c.98c9e8",
+ "id": "ae68593e.8ba108",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1517.395809173584,
- "y": 1307.1889336109161,
- "z": "2f0cf160.dc107e",
+ "x": 1618.9354133605957,
+ "y": 1317.1889336109161,
+ "z": "d0c9a483.09f7c8",
"wires": [
[]
]
},
{
- "id": "7044fc7.42f8204",
+ "id": "ccce6236.dc74f",
"type": "comment",
"name": "Create bridge domain",
"info": "",
"comments": "",
- "x": 933.061695098877,
- "y": 1260.6330835819244,
- "z": "2f0cf160.dc107e",
+ "x": 1034.6012992858887,
+ "y": 1270.6330835819244,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "a66a0a0e.fef0c8",
+ "id": "ef04791b.55e268",
"type": "switchNode",
"name": "switch portSwitch",
"xml": "<switch test=\"`$prop.lan.portSwitch == 'layer2-port'`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 489.17326736450195,
- "y": 1295.855489730835,
- "z": "2f0cf160.dc107e",
+ "x": 590.7128715515137,
+ "y": 1305.855489730835,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "cc6612da.43a9"
+ "c3342bc2.390e38"
]
]
},
{
- "id": "cc6612da.43a9",
+ "id": "c3342bc2.390e38",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 668.1732978820801,
- "y": 1295.966812133789,
- "z": "2f0cf160.dc107e",
+ "x": 769.7129020690918,
+ "y": 1305.966812133789,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "f52cabac.abeb68"
+ "eeb61a62.766e08"
]
]
},
{
- "id": "f2a2fd31.6afea",
+ "id": "8364ef5f.25f26",
"type": "execute",
"name": "execute split ip and mask",
"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",
"comments": "",
"outputs": 1,
- "x": 513.71826171875,
- "y": 1395.7540397644043,
- "z": "2f0cf160.dc107e",
+ "x": 615.2578659057617,
+ "y": 1405.7540397644043,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "c87ddd20.90349",
- "aaf35528.c457d8"
+ "760fe778.7861c8",
+ "4e9c561e.4ac8b8"
]
]
},
{
- "id": "aaf35528.c457d8",
+ "id": "4e9c561e.4ac8b8",
"type": "failure",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 714.7182807922363,
- "y": 1373.7540311813354,
- "z": "2f0cf160.dc107e",
+ "x": 816.257884979248,
+ "y": 1383.7540311813354,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "f3c46122.a1ec5"
+ "3c0ad409.f6e78c"
]
]
},
{
- "id": "c87ddd20.90349",
+ "id": "760fe778.7861c8",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 714.7182846069336,
- "y": 1414.7540349960327,
- "z": "2f0cf160.dc107e",
+ "x": 816.2578887939453,
+ "y": 1424.7540349960327,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "3701541a.3aea9c"
+ "af9e51cb.86f12"
]
]
},
{
- "id": "f3c46122.a1ec5",
+ "id": "3c0ad409.f6e78c",
"type": "set",
"name": "set ipAddress prefixLength",
"xml": "<set>\n<parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />",
"comments": "",
- "x": 911.7182998657227,
- "y": 1371.7540311813354,
- "z": "2f0cf160.dc107e",
+ "x": 1013.2579040527344,
+ "y": 1381.7540311813354,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "3701541a.3aea9c",
+ "id": "af9e51cb.86f12",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
"comments": "",
- "x": 869.7182922363281,
- "y": 1411.7540340423584,
- "z": "2f0cf160.dc107e",
+ "x": 971.2578964233398,
+ "y": 1421.7540340423584,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "6cdf4550.c744bc",
+ "id": "a9e3f075.4494b",
"type": "comment",
"name": "Create wan port",
"info": "",
"comments": "",
- "x": 486.7281379699707,
- "y": 1348.7640895843506,
- "z": "2f0cf160.dc107e",
+ "x": 588.2677421569824,
+ "y": 1358.7640895843506,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "2701cb4.59cff34",
+ "id": "cd240d96.e63a6",
"type": "comment",
"name": "TODO: split ip/mask",
"info": "",
"comments": "",
- "x": 910.7279319763184,
- "y": 1333.9343032836914,
- "z": "2f0cf160.dc107e",
+ "x": 1012.2675361633301,
+ "y": 1343.9343032836914,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "7299f238.fa9f1c",
+ "id": "8ffe71d6.e37e5",
"type": "execute",
"name": "execute RestApiCallNode IPSubnets create",
"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`\" />",
"comments": "",
"outputs": 1,
- "x": 572.489631652832,
- "y": 1471.8749294281006,
- "z": "2f0cf160.dc107e",
+ "x": 674.0292358398438,
+ "y": 1481.8749294281006,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "fe753b01.7a4008",
- "c50acfa.66a383"
+ "87d7037c.ae081",
+ "b63381ea.1d864"
]
]
},
{
- "id": "c50acfa.66a383",
+ "id": "b63381ea.1d864",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 841.4896621704102,
- "y": 1458.8749017715454,
- "z": "2f0cf160.dc107e",
+ "x": 943.0292663574219,
+ "y": 1468.8749017715454,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "da685c50.c0fca"
+ "594e98d1.fab688"
]
]
},
{
- "id": "fe753b01.7a4008",
+ "id": "87d7037c.ae081",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 838.4896354675293,
- "y": 1493.8751201629639,
- "z": "2f0cf160.dc107e",
+ "x": 940.029239654541,
+ "y": 1503.8751201629639,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "7c874cb1.b7ec64"
+ "5e9af700.a76ce8"
]
]
},
{
- "id": "da685c50.c0fca",
+ "id": "594e98d1.fab688",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing Create device port rest api\" />\n",
"comments": "",
- "x": 994.4900436401367,
- "y": 1454.8751277923584,
- "z": "2f0cf160.dc107e",
+ "x": 1096.0296478271484,
+ "y": 1464.8751277923584,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "7c874cb1.b7ec64",
+ "id": "5e9af700.a76ce8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 985.489616394043,
- "y": 1494.8748760223389,
- "z": "2f0cf160.dc107e",
+ "x": 1087.0292205810547,
+ "y": 1504.8748760223389,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "220d830a.a3737c"
+ "4982389d.632728"
]
]
},
{
- "id": "220d830a.a3737c",
+ "id": "4982389d.632728",
"type": "set",
"name": "set prop.lan.lanPortId",
"xml": "<set>\n<parameter name='prop.lan.lanPortId' value='`lanPortResp.success[0].id`' />\n",
"comments": "",
- "x": 1192.378719329834,
- "y": 1497.208342552185,
- "z": "2f0cf160.dc107e",
+ "x": 1293.9183235168457,
+ "y": 1507.208342552185,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "1e3434c6.db511b",
+ "id": "695214fd.2c4fdc",
"type": "execute",
"name": "execute RestApiCallNode create vpn topology",
"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`\" />",
"comments": "",
"outputs": 1,
- "x": 598.0000534057617,
- "y": 1630.333706855774,
- "z": "2f0cf160.dc107e",
+ "x": 699.5396575927734,
+ "y": 1640.333706855774,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "dad634fb.8374a8",
- "222fdfc3.31cbd"
+ "d46aab2e.402878",
+ "f79fe60.440a918"
]
]
},
{
- "id": "222fdfc3.31cbd",
+ "id": "f79fe60.440a918",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 836.9999675750732,
- "y": 1677.333193898201,
- "z": "2f0cf160.dc107e",
+ "x": 938.539571762085,
+ "y": 1687.333193898201,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "a113b13a.6f74c"
+ "be3a59b0.64c5a8"
]
]
},
{
- "id": "a113b13a.6f74c",
+ "id": "be3a59b0.64c5a8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1006.999906539917,
- "y": 1680.333193898201,
- "z": "2f0cf160.dc107e",
+ "x": 1108.5395107269287,
+ "y": 1690.333193898201,
+ "z": "d0c9a483.09f7c8",
"wires": [
[]
]
},
{
- "id": "66af30b.a74d8d",
+ "id": "cb1060d7.72a6a",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing Create vpn topology failed\" />\n",
"comments": "",
- "x": 1007.0000286102295,
- "y": 1636.333193898201,
- "z": "2f0cf160.dc107e",
+ "x": 1108.5396327972412,
+ "y": 1646.333193898201,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "dad634fb.8374a8",
+ "id": "d46aab2e.402878",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 839.999906539917,
- "y": 1636.333193898201,
- "z": "2f0cf160.dc107e",
+ "x": 941.5395107269287,
+ "y": 1646.333193898201,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "66af30b.a74d8d"
+ "cb1060d7.72a6a"
]
]
},
{
- "id": "e4f03070.b443a",
+ "id": "b5fcdf55.56396",
"type": "execute",
"name": "execute RestApiCallNode create vpn ",
"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`\" />",
"comments": "",
"outputs": 1,
- "x": 559.9984092712402,
- "y": 1561.8328762054443,
- "z": "2f0cf160.dc107e",
+ "x": 661.538013458252,
+ "y": 1571.8328762054443,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "93f9856d.ae6458",
- "98bd094d.9d68c8"
+ "1dcea603.d095ca",
+ "286fea94.caec26"
]
]
},
{
- "id": "98bd094d.9d68c8",
+ "id": "286fea94.caec26",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 780.99831199646,
- "y": 1583.8328419923782,
- "z": "2f0cf160.dc107e",
+ "x": 882.5379161834717,
+ "y": 1593.8328419923782,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "54c36251.c8076c"
+ "8857322c.003b2"
]
]
},
{
- "id": "54c36251.c8076c",
+ "id": "8857322c.003b2",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 950.9982509613037,
- "y": 1586.8328419923782,
- "z": "2f0cf160.dc107e",
+ "x": 1052.5378551483154,
+ "y": 1596.8328419923782,
+ "z": "d0c9a483.09f7c8",
"wires": [
[]
]
},
{
- "id": "719bdb7c.5a10b4",
+ "id": "94eea86a.175328",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing Create vpn failed\" />\n",
"comments": "",
- "x": 950.9983730316162,
- "y": 1542.8328419923782,
- "z": "2f0cf160.dc107e",
+ "x": 1052.537977218628,
+ "y": 1552.8328419923782,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "93f9856d.ae6458",
+ "id": "1dcea603.d095ca",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 783.9982509613037,
- "y": 1542.8328419923782,
- "z": "2f0cf160.dc107e",
+ "x": 885.5378551483154,
+ "y": 1552.8328419923782,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "719bdb7c.5a10b4"
+ "94eea86a.175328"
]
]
},
{
- "id": "cdd2e071.957e3",
+ "id": "7ec433f0.4a2dec",
"type": "switchNode",
"name": "switch ActivateSDWANVpnInstance",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1147.0002365112305,
- "y": 848.3332567214966,
- "z": "2f0cf160.dc107e",
+ "x": 1248.5398406982422,
+ "y": 858.3332567214966,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "f5335833.4ba238"
+ "df6b5755.18ea68"
]
]
},
{
- "id": "2141a4d0.4ed0ac",
+ "id": "bd374d2.a7cdcb",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 904.3333396911621,
- "y": 777.3333368301392,
- "z": "2f0cf160.dc107e",
+ "x": 1005.8729438781738,
+ "y": 787.3333368301392,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "566234f6.d57f8c",
- "cdd2e071.957e3",
- "785db3d8.98fb5c"
+ "415f5cb9.3a6e44",
+ "7ec433f0.4a2dec"
]
]
},
{
- "id": "f5335833.4ba238",
+ "id": "df6b5755.18ea68",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1242.666748046875,
- "y": 922.3333377838135,
- "z": "2f0cf160.dc107e",
+ "x": 1344.2063522338867,
+ "y": 932.3333377838135,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "deda6015.73137"
+ "a2c862ed.3d8da"
]
]
},
{
- "id": "deda6015.73137",
+ "id": "a2c862ed.3d8da",
"type": "for",
"name": "for vf-modules.vf-module_length",
"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",
"comments": "",
"outputs": 1,
- "x": 1456.916633605957,
- "y": 923.8333144187927,
- "z": "2f0cf160.dc107e",
+ "x": 1558.4562377929688,
+ "y": 933.8333144187927,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "6ef0c48a.c4e20c"
+ "26c3d6b7.9af80a"
]
]
},
{
- "id": "6ef0c48a.c4e20c",
+ "id": "26c3d6b7.9af80a",
"type": "switchNode",
"name": "switch vpn-id",
"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",
"comments": "",
"outputs": 1,
- "x": 1703.9166717529297,
- "y": 918.8333973884583,
- "z": "2f0cf160.dc107e",
+ "x": 1805.4562759399414,
+ "y": 928.8333973884583,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "45631feb.4e63d"
+ "73c96ff0.116a"
]
]
},
{
- "id": "45631feb.4e63d",
+ "id": "73c96ff0.116a",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1854.6666259765625,
- "y": 920.3333129882812,
- "z": "2f0cf160.dc107e",
+ "x": 1956.2062301635742,
+ "y": 930.3333129882812,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "4fe0c915.7019d8"
+ "736b8a4d.4ec784"
]
]
},
{
- "id": "4fe0c915.7019d8",
+ "id": "736b8a4d.4ec784",
"type": "set",
"name": "set prop.vpn1Id",
"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",
"comments": "",
- "x": 2028.6673736572266,
- "y": 920.3333714008331,
- "z": "2f0cf160.dc107e",
+ "x": 2130.2069778442383,
+ "y": 930.3333714008331,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "18aa70c2.f51f1f",
+ "id": "9412ef29.cc029",
"type": "set",
"name": "Add sites to list and update length",
"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",
"comments": "",
- "x": 2459.000747680664,
- "y": 826.3333714008331,
- "z": "2f0cf160.dc107e",
+ "x": 2560.540351867676,
+ "y": 836.3333714008331,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "95fdece9.83f56",
+ "id": "4b9ca75a.7fc698",
"type": "set",
"name": "Add site attachement to list and update length",
"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",
"comments": "",
- "x": 2490.0006408691406,
- "y": 869.3333377838135,
- "z": "2f0cf160.dc107e",
+ "x": 2591.5402450561523,
+ "y": 879.3333377838135,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "11a6133a.d1ed1d",
+ "id": "6278217c.89959",
"type": "set",
"name": "set prop.siteAttachement_length=0",
"xml": "<set>\n<parameter name='prop.siteAttachements_length' value='0' />\n<parameter name='prop.siteIds_length' value='0' />\n\n\n\n",
"comments": "",
- "x": 576.0000152587891,
- "y": 574.333330154419,
- "z": "2f0cf160.dc107e",
+ "x": 677.5396194458008,
+ "y": 584.333330154419,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "78c531f9.c452d",
+ "id": "f98893a0.de7a4",
"type": "block",
"name": "block atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1689.3336715698242,
- "y": 802.3333358764648,
- "z": "2f0cf160.dc107e",
+ "x": 1790.873275756836,
+ "y": 812.3333358764648,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "78502254.1e1d1c",
- "63d66e16.071a8",
- "5671530f.b2ba5c"
+ "39ba7083.5ed54",
+ "5110ed96.6f1424",
+ "c2809bfd.795218"
]
]
},
{
- "id": "63d66e16.071a8",
+ "id": "5110ed96.6f1424",
"type": "switchNode",
"name": "switch role",
"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",
"comments": "",
"outputs": 1,
- "x": 1851.666603088379,
- "y": 733.3333349227905,
- "z": "2f0cf160.dc107e",
+ "x": 1953.2062072753906,
+ "y": 743.3333349227905,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "5896f487.b2b6fc"
+ "1e253f6e.5c04c1"
]
]
},
{
- "id": "5896f487.b2b6fc",
+ "id": "1e253f6e.5c04c1",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2014.6666069030762,
- "y": 728.3333358764648,
- "z": "2f0cf160.dc107e",
+ "x": 2116.206211090088,
+ "y": 738.3333358764648,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "21c68e35.ea4b92"
+ "76558c73.4a9c94"
]
]
},
{
- "id": "21c68e35.ea4b92",
+ "id": "76558c73.4a9c94",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2182.666648864746,
- "y": 722.3333339691162,
- "z": "2f0cf160.dc107e",
+ "x": 2284.206253051758,
+ "y": 732.3333339691162,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "c62b7f98.336c5",
- "2c113cab.56e434",
- "c2240666.9ee948"
+ "7fa808fb.9dfb68",
+ "74735438.9332ac",
+ "138a0f19.6e1331"
]
]
},
{
- "id": "2c113cab.56e434",
+ "id": "74735438.9332ac",
"type": "switchNode",
"name": "switch sd-wan-edge",
"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",
"comments": "",
"outputs": 1,
- "x": 2377.666778564453,
- "y": 683.3333253860474,
- "z": "2f0cf160.dc107e",
+ "x": 2479.206382751465,
+ "y": 693.3333253860474,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "ba2b297.cd792d8"
+ "201641a0.5890ce"
]
]
},
{
- "id": "c62b7f98.336c5",
+ "id": "7fa808fb.9dfb68",
"type": "switchNode",
"name": "switch dsvpn-hub",
"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",
"comments": "",
"outputs": 1,
- "x": 2374.6668853759766,
- "y": 738.333340883255,
- "z": "2f0cf160.dc107e",
+ "x": 2476.2064895629883,
+ "y": 748.333340883255,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "f4f54567.510e38"
+ "f53ab0a6.6d677"
]
]
},
{
- "id": "8ed96cca.37dc4",
+ "id": "69b796c5.6fe848",
"type": "set",
"name": "set spoke role",
"xml": "<set>\n<parameter name='prop.role' value=\"spoke\" />\n",
"comments": "",
- "x": 2707.6669006347656,
- "y": 677.3333711624146,
- "z": "2f0cf160.dc107e",
+ "x": 2809.2065048217773,
+ "y": 687.3333711624146,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "4cf4d59c.e1707c",
+ "id": "861df320.7eae2",
"type": "set",
"name": "set hub role",
"xml": "<set>\n<parameter name='prop.role' value=\"hub\" />\n",
"comments": "",
- "x": 2706.666660308838,
- "y": 732.3333549499512,
- "z": "2f0cf160.dc107e",
+ "x": 2808.2062644958496,
+ "y": 742.3333549499512,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "ba2b297.cd792d8",
+ "id": "201641a0.5890ce",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2547.666748046875,
- "y": 679,
- "z": "2f0cf160.dc107e",
+ "x": 2649.2063522338867,
+ "y": 689,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "8ed96cca.37dc4"
+ "69b796c5.6fe848"
]
]
},
{
- "id": "f4f54567.510e38",
+ "id": "f53ab0a6.6d677",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2551.666748046875,
- "y": 734,
- "z": "2f0cf160.dc107e",
+ "x": 2653.2063522338867,
+ "y": 744,
+ "z": "d0c9a483.09f7c8",
"wires": [
[
- "4cf4d59c.e1707c"
+ "861df320.7eae2"
]
]
},
{
- "id": "56401cb0.1f0164",
+ "id": "188a2b9c.34d5e4",
"type": "update",
"name": "update SDWAN VPN status to AAI",
"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`' />",
"comments": "",
"outputs": 1,
- "x": 560.0312843322754,
- "y": 1998.031280040741,
- "z": "2f0cf160.dc107e",
+ "x": 661.5708885192871,
+ "y": 2008.031280040741,
+ "z": "d0c9a483.09f7c8",
"wires": [
[]
]
},
{
- "id": "ec89c38e.b0db3",
+ "id": "44113153.ffa83",
"type": "set",
"name": "set vf-module-level-oper-status",
"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`' />",
"comments": "",
- "x": 556.6663017272949,
- "y": 1941.1261107651517,
- "z": "2f0cf160.dc107e",
+ "x": 658.2059059143066,
+ "y": 1951.1261107651517,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "233d7734.c6ad18",
+ "id": "cd4a9b23.d614c8",
"type": "set",
"name": "set vf-module-id and vf-module-object-path",
"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",
"comments": "",
- "x": 590.6663017272949,
- "y": 1892.6261098114774,
- "z": "2f0cf160.dc107e",
+ "x": 692.2059059143066,
+ "y": 1902.6261098114774,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "6bb3e148.a2b06",
+ "id": "760751d.6fd76b",
"type": "set",
"name": "copy input data in service-data",
"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",
"comments": "",
- "x": 554.6662559509277,
- "y": 1844.876064300537,
- "z": "2f0cf160.dc107e",
+ "x": 656.2058601379395,
+ "y": 1854.876064300537,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "307480f2.c3f12",
+ "id": "45f5fb20.78ea64",
"type": "set",
"name": "set device PortId to service data",
"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",
"comments": "",
- "x": 561.031322479248,
- "y": 1738.0314636230469,
- "z": "2f0cf160.dc107e",
+ "x": 662.5709266662598,
+ "y": 1748.0314636230469,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "cfe4c928.772628",
+ "id": "b05dede5.e0278",
"type": "set",
"name": "set lan PortId to service data",
"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",
"comments": "",
- "x": 547.0312461853027,
- "y": 1792.0312767028809,
- "z": "2f0cf160.dc107e",
+ "x": 648.5708503723145,
+ "y": 1802.0312767028809,
+ "z": "d0c9a483.09f7c8",
"wires": []
},
{
- "id": "13d1a87e.cc7dd8",
+ "id": "2f9763b5.4e87fc",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/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",
"comments": "",
"outputs": 1,
- "x": 2384.0313873291016,
- "y": 914.5312805175781,
- "z": "2f0cf160.dc107e",
+ "x": 2485.5709915161133,
+ "y": 924.5312805175781,
+ "z": "d0c9a483.09f7c8",
"wires": [
[]
]
},
{
- "id": "c2240666.9ee948",
+ "id": "138a0f19.6e1331",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic22.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"set spoke role\"/>\n",
"comments": "",
"outputs": 1,
- "x": 2353.0313987731934,
- "y": 645.531247138977,
- "z": "2f0cf160.dc107e",
+ "x": 2454.571002960205,
+ "y": 655.531247138977,
+ "z": "d0c9a483.09f7c8",
"wires": [
[]
]
},
{
- "id": "5671530f.b2ba5c",
+ "id": "c2809bfd.795218",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/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",
"comments": "",
"outputs": 1,
- "x": 1847.03125,
- "y": 677.53125,
- "z": "2f0cf160.dc107e",
+ "x": 1948.5708541870117,
+ "y": 687.53125,
+ "z": "d0c9a483.09f7c8",
"wires": [
[]
]
},
{
- "id": "785db3d8.98fb5c",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/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",
+ "id": "a37e9bab.abd118",
+ "type": "comment",
+ "name": "**revert the changes",
+ "info": "",
+ "comments": "",
+ "x": 1349.5708808898926,
+ "y": 693.0312824249268,
+ "z": "d0c9a483.09f7c8",
+ "wires": []
+ },
+ {
+ "id": "4a795886.274f28",
+ "type": "switchNode",
+ "name": "switch vf-modules.vf-module_length",
+ "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",
"comments": "",
"outputs": 1,
- "x": 1096.03125,
- "y": 686.53125,
- "z": "2f0cf160.dc107e",
+ "x": 892.7538909912109,
+ "y": 507.25390625,
+ "z": "d0c9a483.09f7c8",
"wires": [
- []
+ [
+ "779d12ab.8187fc"
+ ]
]
},
{
- "id": "bacdcf2a.07a41",
- "type": "comment",
- "name": "**revert the changes",
- "info": "",
+ "id": "779d12ab.8187fc",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
"comments": "",
- "x": 1248.0312767028809,
- "y": 683.0312824249268,
- "z": "2f0cf160.dc107e",
- "wires": []
+ "outputs": 1,
+ "x": 998.75390625,
+ "y": 558.25390625,
+ "z": "d0c9a483.09f7c8",
+ "wires": [
+ [
+ "e23c505c.41fa2"
+ ]
+ ]
+ },
+ {
+ "id": "5c633f8a.ecb75",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 693.0039138793945,
+ "y": 468.0039048194885,
+ "z": "d0c9a483.09f7c8",
+ "wires": [
+ [
+ "4a795886.274f28"
+ ]
+ ]
+ },
+ {
+ "id": "e23c505c.41fa2",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 1151.003890991211,
+ "y": 555.0039281845093,
+ "z": "d0c9a483.09f7c8",
+ "wires": [
+ [
+ "aa0d1480.7f1978"
+ ]
+ ]
+ },
+ {
+ "id": "f599447.9ac3fb8",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 1894.7539710998535,
+ "y": 553.0039119720459,
+ "z": "d0c9a483.09f7c8",
+ "wires": [
+ [
+ "1f605289.f2eb7d"
+ ]
+ ]
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json index b4f838d0..3ce166ee 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json @@ -1,533 +1,578 @@ [
{
- "id": "3d343d97.916e12",
- "type": "method",
- "name": "sdwan-vf-operation-lanport-create",
- "xml": "<method rpc='sdwan-vf-operation-lanport-create' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 285,
- "y": 241.99999237060547,
- "z": "be7b9c9c.26b5d",
- "wires": [
- [
- "72bd87e4.7210f8"
- ]
- ]
- },
- {
- "id": "72bd87e4.7210f8",
+ "id": "3ecdadeb.18aa62",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 444.99999237060547,
- "y": 374.9999885559082,
- "z": "be7b9c9c.26b5d",
- "wires": [
- [
- "fa08bbfd.f36978",
- "662c5c91.bf14f4",
- "3a8662b6.7187de",
- "d0f313c6.a0ddd",
- "87f25b72.4b1968",
- "c96f1257.64bf8",
- "9ca9880e.f474f8",
- "23949443.ee4acc",
- "64302671.d03c08",
- "305a60f0.cd87a",
- "17d1be09.26b4d2",
- "8ab4415a.f464b",
- "b65f8656.be0f98",
- "8944476b.d5f828"
- ]
- ]
- },
- {
- "id": "78ad706e.d12e1",
- "type": "service-logic",
- "name": "GENERIC-RESOURCE-API ${project.version}",
- "module": "GENERIC-RESOURCE-API",
- "version": "${project.version}",
- "comments": "",
- "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
- "outputs": 1,
- "x": 286,
- "y": 141.99999237060547,
- "z": "be7b9c9c.26b5d",
- "wires": [
- [
- "3d343d97.916e12"
- ]
- ]
- },
- {
- "id": "7c5370ed.0ab17",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 115.5,
- "y": 53,
- "z": "be7b9c9c.26b5d",
+ "x": 432.00389862060547,
+ "y": 378.9999885559082,
+ "z": "dfb806d8.8899e8",
"wires": [
[
- "78ad706e.d12e1"
+ "b1de8da9.db8a2",
+ "d704787.9944088",
+ "c4e200e6.2e02b",
+ "5f812e79.2be7e",
+ "2b234f37.76666",
+ "7dbca450.42794c",
+ "7e93696e.840218",
+ "676ec3b1.844d3c",
+ "e3e05047.2e5b8",
+ "91a71daa.ef5c2",
+ "b3c3b183.55c72",
+ "d01634bb.bb46b8",
+ "43cde2b5.87e1ac",
+ "c6fbc47.00d1938",
+ "98c6c3b2.42b6b"
]
]
},
{
- "id": "fa08bbfd.f36978",
+ "id": "b1de8da9.db8a2",
"type": "for",
"name": "for loop idx - VF input parameters",
"xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 791.2501525878906,
- "y": 357.66665744781494,
- "z": "be7b9c9c.26b5d",
+ "x": 778.2540588378906,
+ "y": 361.66665744781494,
+ "z": "dfb806d8.8899e8",
"wires": [
[
- "c93f649f.0099c8"
+ "d245ffbf.59c6c"
]
]
},
{
- "id": "c93f649f.0099c8",
+ "id": "d245ffbf.59c6c",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1006.0284957885742,
- "y": 355.22224140167236,
- "z": "be7b9c9c.26b5d",
+ "x": 993.0324020385742,
+ "y": 359.22224140167236,
+ "z": "dfb806d8.8899e8",
"wires": [
[
- "8f744d78.f7a31",
- "7468dc64.d34424"
+ "82c635c3.382618",
+ "bcda53d8.f6893"
]
]
},
{
- "id": "8f744d78.f7a31",
+ "id": "82c635c3.382618",
"type": "execute",
"name": "execute split parameterName",
"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",
"comments": "",
"outputs": 1,
- "x": 1202.2846984863281,
- "y": 332.97037982940674,
- "z": "be7b9c9c.26b5d",
+ "x": 1189.2886047363281,
+ "y": 336.97037982940674,
+ "z": "dfb806d8.8899e8",
"wires": [
[]
]
},
{
- "id": "7468dc64.d34424",
+ "id": "bcda53d8.f6893",
"type": "set",
"name": "set parameterName",
"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",
"comments": "",
- "x": 1171.7291259765625,
- "y": 369.97049617767334,
- "z": "be7b9c9c.26b5d",
+ "x": 1158.7330322265625,
+ "y": 373.97049617767334,
+ "z": "dfb806d8.8899e8",
"wires": []
},
{
- "id": "143889df.349216",
+ "id": "ac17a6a.af45258",
"type": "comment",
"name": "Take the parameter names by removing prefix",
"info": "",
"comments": "",
- "x": 829.2503547668457,
- "y": 314.3333249092102,
- "z": "be7b9c9c.26b5d",
+ "x": 816.2542610168457,
+ "y": 318.3333249092102,
+ "z": "dfb806d8.8899e8",
"wires": []
},
{
- "id": "3a8662b6.7187de",
+ "id": "c4e200e6.2e02b",
"type": "set",
"name": "set new vf-module_length",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",
"comments": "",
- "x": 770.186767578125,
- "y": 516.1629304885864,
- "z": "be7b9c9c.26b5d",
+ "x": 757.190673828125,
+ "y": 520.1629304885864,
+ "z": "dfb806d8.8899e8",
"wires": []
},
{
- "id": "662c5c91.bf14f4",
+ "id": "d704787.9944088",
"type": "set",
"name": "set vf-module-request-input.",
"xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",
"comments": "",
- "x": 770.1862945556641,
- "y": 462.15421867370605,
- "z": "be7b9c9c.26b5d",
+ "x": 764.1902618408203,
+ "y": 415.1541962623596,
+ "z": "dfb806d8.8899e8",
"wires": []
},
{
- "id": "64302671.d03c08",
+ "id": "7e93696e.840218",
"type": "set",
"name": "copy input data to service data",
- "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",
+ "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",
"comments": "",
- "x": 782.3531112670898,
- "y": 624.3335423469543,
- "z": "be7b9c9c.26b5d",
+ "x": 769.3570175170898,
+ "y": 628.3335423469543,
+ "z": "dfb806d8.8899e8",
"wires": []
},
{
- "id": "23949443.ee4acc",
- "type": "execute",
- "name": "execute generate-vf-module-index",
- "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.lan-vf-index\"/>\n",
- "comments": "",
- "outputs": 1,
- "x": 794.6866760253906,
- "y": 570.0002617835999,
- "z": "be7b9c9c.26b5d",
- "wires": [
- []
- ]
- },
- {
- "id": "305a60f0.cd87a",
+ "id": "676ec3b1.844d3c",
"type": "set",
"name": "set vf-module-object-path",
- "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",
- "comments": "",
- "x": 770.500036239624,
- "y": 675.8373885154724,
- "z": "be7b9c9c.26b5d",
- "wires": []
- },
- {
- "id": "17d1be09.26b4d2",
- "type": "set",
- "name": "set vf-module-level-oper-status",
- "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`' />",
+ "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",
"comments": "",
- "x": 785.0000953674316,
- "y": 725.837281703949,
- "z": "be7b9c9c.26b5d",
+ "x": 757.503942489624,
+ "y": 679.8373885154724,
+ "z": "dfb806d8.8899e8",
"wires": []
},
{
- "id": "8ab4415a.f464b",
+ "id": "e3e05047.2e5b8",
"type": "save",
"name": "save sdwan lan-port-config resource in AAI",
- "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",
+ "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",
"comments": "",
"outputs": 1,
- "x": 817.5000152587891,
- "y": 766.3373422622681,
- "z": "be7b9c9c.26b5d",
+ "x": 812.5039215087891,
+ "y": 772.3373708724976,
+ "z": "dfb806d8.8899e8",
"wires": [
[]
]
},
{
- "id": "b65f8656.be0f98",
+ "id": "91a71daa.ef5c2",
"type": "save",
"name": "save service relationship in AAI",
- "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",
+ "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",
"comments": "",
"outputs": 1,
- "x": 785.4999313354492,
- "y": 815.3373589515686,
- "z": "be7b9c9c.26b5d",
+ "x": 772.5038375854492,
+ "y": 819.3373589515686,
+ "z": "dfb806d8.8899e8",
"wires": [
[]
]
},
{
- "id": "8944476b.d5f828",
+ "id": "b3c3b183.55c72",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
"comments": "",
- "x": 736.2224769592285,
- "y": 862.5112180709839,
- "z": "be7b9c9c.26b5d",
- "wires": []
- },
- {
- "id": "87f25b72.4b1968",
- "type": "for",
- "name": "for each vnf",
- "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 729,
- "y": 165.99999713897705,
- "z": "be7b9c9c.26b5d",
- "wires": [
- [
- "e80313cd.820e4"
- ]
- ]
- },
- {
- "id": "e80313cd.820e4",
- "type": "switchNode",
- "name": "switch this vnf-id == input vnf-id",
- "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\"> \n",
- "comments": "",
- "outputs": 1,
- "x": 981.0000915527344,
- "y": 164.6666603088379,
- "z": "be7b9c9c.26b5d",
- "wires": [
- [
- "b80badb7.d9753"
- ]
- ]
- },
- {
- "id": "8bc04fc8.d6a11",
- "type": "set",
- "name": "set vnf-index",
- "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
- "comments": "",
- "x": 1352.6665802001953,
- "y": 166.66666316986084,
- "z": "be7b9c9c.26b5d",
+ "x": 723.2263832092285,
+ "y": 866.5112180709839,
+ "z": "dfb806d8.8899e8",
"wires": []
},
{
- "id": "b80badb7.d9753",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1199.333408355713,
- "y": 166.66664218902588,
- "z": "be7b9c9c.26b5d",
- "wires": [
- [
- "8bc04fc8.d6a11"
- ]
- ]
- },
- {
- "id": "d0f313c6.a0ddd",
+ "id": "5f812e79.2be7e",
"type": "switchNode",
"name": "switch vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 743.4205932617188,
- "y": 121.50386619567871,
- "z": "be7b9c9c.26b5d",
+ "x": 733.424467086792,
+ "y": 68.5038731098175,
+ "z": "dfb806d8.8899e8",
"wires": [
[
- "7ab34e25.1cd4e"
+ "ecb5481e.49db98"
]
]
},
{
- "id": "7ab34e25.1cd4e",
+ "id": "ecb5481e.49db98",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 930.087272644043,
- "y": 120.8371639251709,
- "z": "be7b9c9c.26b5d",
+ "x": 920.0911464691162,
+ "y": 67.83717083930969,
+ "z": "dfb806d8.8899e8",
"wires": [
[
- "984b3a64.7e1a38"
+ "5cc69be0.888194"
]
]
},
{
- "id": "984b3a64.7e1a38",
+ "id": "5cc69be0.888194",
"type": "returnFailure",
"name": "return failure",
"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",
"comments": "",
- "x": 1111.7538986206055,
- "y": 120.8371639251709,
- "z": "be7b9c9c.26b5d",
+ "x": 1101.7577724456787,
+ "y": 67.83717083930969,
+ "z": "dfb806d8.8899e8",
"wires": []
},
{
- "id": "c96f1257.64bf8",
+ "id": "2b234f37.76666",
"type": "switchNode",
"name": "switch vf-modules.vf-module_length",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 784.6705827713013,
- "y": 241.50386714935303,
- "z": "be7b9c9c.26b5d",
+ "x": 771.6744890213013,
+ "y": 245.50386714935303,
+ "z": "dfb806d8.8899e8",
"wires": [
[
- "ab6c63f4.e55a6",
- "14b85aee.617c65"
+ "43b76269.61638c",
+ "80f9fdd1.5acfa"
]
]
},
{
- "id": "ab6c63f4.e55a6",
+ "id": "43b76269.61638c",
"type": "other",
"name": "Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1015.6705932617188,
- "y": 217.50386428833008,
- "z": "be7b9c9c.26b5d",
+ "x": 1002.6744995117188,
+ "y": 221.50386428833008,
+ "z": "dfb806d8.8899e8",
"wires": [
[
- "342d6918.bdf256"
+ "30daa7e7.f7d908"
]
]
},
{
- "id": "14b85aee.617c65",
+ "id": "80f9fdd1.5acfa",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1015.6705932617188,
- "y": 257.5038642883301,
- "z": "be7b9c9c.26b5d",
+ "x": 1002.6744995117188,
+ "y": 261.5038642883301,
+ "z": "dfb806d8.8899e8",
"wires": [
[
- "eedb45d.e2420b8"
+ "15ffa14c.a3471f"
]
]
},
{
- "id": "342d6918.bdf256",
+ "id": "30daa7e7.f7d908",
"type": "set",
"name": "set vf-index",
"xml": "<set>\n<parameter name='vf-index' value='0' />\n",
"comments": "",
- "x": 1158.1705932617188,
- "y": 217.50386428833008,
- "z": "be7b9c9c.26b5d",
+ "x": 1145.1744995117188,
+ "y": 221.50386428833008,
+ "z": "dfb806d8.8899e8",
"wires": []
},
{
- "id": "eedb45d.e2420b8",
+ "id": "15ffa14c.a3471f",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1160.0276374816895,
- "y": 257.4403762817383,
- "z": "be7b9c9c.26b5d",
+ "x": 1147.0315437316895,
+ "y": 261.4403762817383,
+ "z": "dfb806d8.8899e8",
"wires": [
[
- "a00dcbbe.533a58",
- "7019e496.422f8c"
+ "81c65311.3e7fa",
+ "1c59d473.dd26bc"
]
]
},
{
- "id": "7019e496.422f8c",
+ "id": "1c59d473.dd26bc",
"type": "set",
"name": "set vf-index",
"xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",
"comments": "",
- "x": 1312.7261123657227,
- "y": 227.05947497440502,
- "z": "be7b9c9c.26b5d",
+ "x": 1299.7300186157227,
+ "y": 231.05947497440502,
+ "z": "dfb806d8.8899e8",
"wires": []
},
{
- "id": "a00dcbbe.533a58",
+ "id": "81c65311.3e7fa",
"type": "for",
"name": "for each existing vf-index",
"xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
"comments": "",
"outputs": 1,
- "x": 1369.1546173095703,
- "y": 280.2816047668457,
- "z": "be7b9c9c.26b5d",
+ "x": 1356.1585235595703,
+ "y": 284.2816047668457,
+ "z": "dfb806d8.8899e8",
"wires": [
[
- "19e6409a.9c554f"
+ "aaf0ab5e.460008"
]
]
},
{
- "id": "f530bc4a.54c5c",
+ "id": "85ce8231.1cc8f",
"type": "comment",
"name": "make sure this network doesn't exist already",
"info": "",
"comments": "",
- "x": 1592.805347442627,
- "y": 238.53566217422485,
- "z": "be7b9c9c.26b5d",
+ "x": 1579.809253692627,
+ "y": 242.53566217422485,
+ "z": "dfb806d8.8899e8",
"wires": []
},
{
- "id": "19e6409a.9c554f",
+ "id": "aaf0ab5e.460008",
"type": "switchNode",
"name": "switch vf-module-id found",
"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",
"comments": "",
"outputs": 1,
- "x": 1644.4403381347656,
- "y": 279.8531074523926,
- "z": "be7b9c9c.26b5d",
+ "x": 1631.4442443847656,
+ "y": 283.8531074523926,
+ "z": "dfb806d8.8899e8",
"wires": [
[
- "24af0b91.ce5344"
+ "1a7eae6b.66a2b2"
]
]
},
{
- "id": "24af0b91.ce5344",
+ "id": "1a7eae6b.66a2b2",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1545.1705360412598,
- "y": 338.4245386123657,
- "z": "be7b9c9c.26b5d",
+ "x": 1532.1744422912598,
+ "y": 342.4245386123657,
+ "z": "dfb806d8.8899e8",
"wires": [
[
- "bf4e4104.4edb"
+ "40223de2.189ee4"
]
]
},
{
- "id": "bf4e4104.4edb",
+ "id": "40223de2.189ee4",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",
"comments": "",
- "x": 1692.920639038086,
- "y": 338.28173068119213,
- "z": "be7b9c9c.26b5d",
+ "x": 1679.924545288086,
+ "y": 342.28173068119213,
+ "z": "dfb806d8.8899e8",
"wires": []
},
{
- "id": "9ca9880e.f474f8",
+ "id": "7dbca450.42794c",
"type": "call",
"name": "call sdwan-get-vf-module-lanport-param",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 804.0000152587891,
- "y": 408.99999809265137,
- "z": "be7b9c9c.26b5d",
+ "x": 803.0039367675781,
+ "y": 468.0000219345093,
+ "z": "dfb806d8.8899e8",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "d01634bb.bb46b8",
+ "type": "set",
+ "name": "set vf-module-level-oper-status",
+ "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",
+ "comments": "",
+ "x": 774.00390625,
+ "y": 722.00390625,
+ "z": "dfb806d8.8899e8",
+ "wires": []
+ },
+ {
+ "id": "80c0749d.c5b758",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 101.00390625,
+ "y": 95.00390625,
+ "z": "dfb806d8.8899e8",
+ "wires": [
+ [
+ "1e8e9be2.f38a84"
+ ]
+ ]
+ },
+ {
+ "id": "1e8e9be2.f38a84",
+ "type": "service-logic",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
+ "module": "GENERIC-RESOURCE-API",
+ "version": "${project.version}",
+ "comments": "",
+ "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+ "outputs": 1,
+ "x": 215.50390434265137,
+ "y": 202.00389766693115,
+ "z": "dfb806d8.8899e8",
+ "wires": [
+ [
+ "441193b5.7a563c"
+ ]
+ ]
+ },
+ {
+ "id": "441193b5.7a563c",
+ "type": "method",
+ "name": "sdwan-vf-operation-lanport-create",
+ "xml": "<method rpc='sdwan-vf-operation-lanport-create' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 214.50390434265137,
+ "y": 302.00389766693115,
+ "z": "dfb806d8.8899e8",
+ "wires": [
+ [
+ "3ecdadeb.18aa62"
+ ]
+ ]
+ },
+ {
+ "id": "43cde2b5.87e1ac",
+ "type": "execute",
+ "name": "execute generate-vf-id",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vf-id\"/>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 756.0039520263672,
+ "y": 576.5038995742798,
+ "z": "dfb806d8.8899e8",
"wires": [
[]
]
+ },
+ {
+ "id": "c6fbc47.00d1938",
+ "type": "for",
+ "name": "for each vnf",
+ "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 723.0038871765137,
+ "y": 123.00390815734863,
+ "z": "dfb806d8.8899e8",
+ "wires": [
+ [
+ "a2640a51.5d0d78"
+ ]
+ ]
+ },
+ {
+ "id": "a2640a51.5d0d78",
+ "type": "switchNode",
+ "name": "switch this vnf-id == input vnf-id",
+ "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\"> \n",
+ "comments": "",
+ "outputs": 1,
+ "x": 974.0039825439453,
+ "y": 118.67052865028381,
+ "z": "dfb806d8.8899e8",
+ "wires": [
+ [
+ "d22976f8.730608"
+ ]
+ ]
+ },
+ {
+ "id": "d22976f8.730608",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1192.3372993469238,
+ "y": 120.6705105304718,
+ "z": "dfb806d8.8899e8",
+ "wires": [
+ [
+ "92022bc5.0cdcc8"
+ ]
+ ]
+ },
+ {
+ "id": "92022bc5.0cdcc8",
+ "type": "set",
+ "name": "set vnf-index",
+ "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
+ "comments": "",
+ "x": 1345.6704711914062,
+ "y": 120.67053151130676,
+ "z": "dfb806d8.8899e8",
+ "wires": []
+ },
+ {
+ "id": "98c6c3b2.42b6b",
+ "type": "switchNode",
+ "name": "switch vnf-index",
+ "xml": "<switch test='`$vnf-index`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 737.00390625,
+ "y": 184.00390625,
+ "z": "dfb806d8.8899e8",
+ "wires": [
+ [
+ "681068c6.40fb78"
+ ]
+ ]
+ },
+ {
+ "id": "681068c6.40fb78",
+ "type": "other",
+ "name": "Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 899.0039520263672,
+ "y": 183.00390529632568,
+ "z": "dfb806d8.8899e8",
+ "wires": [
+ [
+ "f9b4e412.cab938"
+ ]
+ ]
+ },
+ {
+ "id": "f9b4e412.cab938",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf id not found in service-data\" />\n",
+ "comments": "",
+ "x": 1048.2540435791016,
+ "y": 180.78178310394287,
+ "z": "dfb806d8.8899e8",
+ "wires": []
}
-]
\ No newline at end of file +]
+
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.json index cb288630..5178c07f 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.json @@ -1,54 +1,54 @@ [
{
- "id": "3eaead5d.8a50e2",
+ "id": "5903e495.687e5c",
"type": "method",
"name": "method sdwan-vf-operation-lanport-deactivate",
"xml": "<method rpc='sdwan-vf-operation-lanport-deactivate' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 252,
- "y": 208,
- "z": "2a0755d2.04892a",
+ "x": 240.00390625,
+ "y": 212.58634185791016,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "de2de50e.7db098"
+ "4f6607f2.8abb38"
]
]
},
{
- "id": "ba6ca55d.d04268",
+ "id": "16a24c83.115633",
"type": "switchNode",
"name": "switch vf-modules.vf-module_length",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 634.0000076293945,
- "y": 359.4136486053467,
- "z": "2a0755d2.04892a",
+ "x": 622.0039138793945,
+ "y": 363.99999046325684,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "96bd0da6.6b228",
- "d7d04d79.b116e",
- "bcfd0c5e.e6103"
+ "38ac049b.8f28ac",
+ "918c4288.cf32",
+ "e4bed2ad.0f579"
]
]
},
{
- "id": "996651b.9ec83b",
+ "id": "a6d98bd3.492e98",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 171.00000381469727,
- "y": 50.413658142089844,
- "z": "2a0755d2.04892a",
+ "x": 159.00391006469727,
+ "y": 55,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "509643c7.891eac"
+ "1152c743.415d39"
]
]
},
{
- "id": "509643c7.891eac",
+ "id": "1152c743.415d39",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -56,1792 +56,1836 @@ "comments": "",
"xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
"outputs": 1,
- "x": 240.28570556640625,
- "y": 113.65176773071289,
- "z": "2a0755d2.04892a",
+ "x": 228.28961181640625,
+ "y": 118.23810958862305,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "3eaead5d.8a50e2"
+ "5903e495.687e5c"
]
]
},
{
- "id": "de2de50e.7db098",
+ "id": "4f6607f2.8abb38",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 252.6666717529297,
- "y": 464.08036708831787,
- "z": "2a0755d2.04892a",
- "wires": [
- [
- "cd5d97be.4098b8",
- "cc768085.ce4bc",
- "ba6ca55d.d04268",
- "582a5dfb.dfaf24",
- "6331828e.70aa2c",
- "60ca269e.96d878",
- "ba5b2145.40753",
- "d3ab3217.7d57a",
- "58afb0e4.ba7df",
- "2ee3209f.a1bb9",
- "bfac8597.a517f8",
- "b282b047.e838d",
- "89ba2ad0.277798",
- "e99d476c.3f3ac8",
- "81163bc0.74e178",
- "e8785c39.cc512",
- "86da8112.f0417",
- "2b5c8466.72828c",
- "6c0bf23f.5303ac",
- "16e6f83a.5e7ff8"
- ]
- ]
- },
- {
- "id": "cc768085.ce4bc",
+ "x": 240.6705780029297,
+ "y": 468.666708946228,
+ "z": "eb27f9f.1aaf508",
+ "wires": [
+ [
+ "ee96d694.8e7de8",
+ "ebce096c.09ff98",
+ "16a24c83.115633",
+ "8d9ec798.9077a8",
+ "1c23a104.8b10df",
+ "ea24678.936eb98",
+ "1a442450.4a365c",
+ "76875429.7977ec",
+ "c0a9943e.0b6a78",
+ "728a6387.ded5dc",
+ "d768a494.487678",
+ "24c5eb03.2a37b4",
+ "37a0c49e.52f2ec",
+ "88d74976.c878b8",
+ "7eaf7940.931d68",
+ "b028cd6d.5db14",
+ "b07d774b.c67f18",
+ "c2a2820.4e02d8",
+ "6e845a3.14ef3a4",
+ "715f7228.db42ac",
+ "b36b6e5f.5d733"
+ ]
+ ]
+ },
+ {
+ "id": "ebce096c.09ff98",
"type": "for",
"name": "for each vnf",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 578.0313873291016,
- "y": 287.6828079223633,
- "z": "2a0755d2.04892a",
+ "x": 582.0352668762207,
+ "y": 221.26913261413574,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "9776f320.0567"
+ "906e6ab4.d1bf48"
]
]
},
{
- "id": "cd5d97be.4098b8",
+ "id": "ee96d694.8e7de8",
"type": "switchNode",
"name": "switch vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 589.0000190734863,
- "y": 226.41366863250732,
- "z": "2a0755d2.04892a",
+ "x": 593.0038986206055,
+ "y": 159.99999332427979,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "2debc059.5aa7"
+ "88ebf11b.dd6cf"
]
]
},
{
- "id": "2debc059.5aa7",
+ "id": "88ebf11b.dd6cf",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 769,
- "y": 225.41365814208984,
- "z": "2a0755d2.04892a",
+ "x": 773.0038795471191,
+ "y": 158.9999828338623,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "355351ee.f9153e"
+ "42b4e84a.5144c8"
]
]
},
{
- "id": "355351ee.f9153e",
+ "id": "42b4e84a.5144c8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 918.4287261962891,
- "y": 226.55657577514648,
- "z": "2a0755d2.04892a",
+ "x": 922.4326057434082,
+ "y": 160.14290046691895,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "9776f320.0567",
+ "id": "906e6ab4.d1bf48",
"type": "switchNode",
"name": "switch this vnf-id == input vnf-id",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\"> \n",
"comments": "",
"outputs": 1,
- "x": 807.0000152587891,
- "y": 288.4136643409729,
- "z": "2a0755d2.04892a",
+ "x": 811.0038948059082,
+ "y": 221.99998903274536,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "f97986b6.bf7158"
+ "31ffe1c7.1814fe"
]
]
},
{
- "id": "f97986b6.bf7158",
+ "id": "31ffe1c7.1814fe",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1022,
- "y": 286.41365814208984,
- "z": "2a0755d2.04892a",
+ "x": 1026.0038795471191,
+ "y": 219.9999828338623,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "926d8df9.33314"
+ "e443968b.c056d8"
]
]
},
{
- "id": "926d8df9.33314",
+ "id": "e443968b.c056d8",
"type": "set",
"name": "set vnf-index",
"xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
"comments": "",
- "x": 1186,
- "y": 281.41365814208984,
- "z": "2a0755d2.04892a",
+ "x": 1190.0038795471191,
+ "y": 214.9999828338623,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "d7d04d79.b116e",
+ "id": "918c4288.cf32",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 856,
- "y": 393.41365814208984,
- "z": "2a0755d2.04892a",
+ "x": 844.00390625,
+ "y": 398,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "511ce89.f44bb18"
+ "8a688447.06c508"
]
]
},
{
- "id": "96bd0da6.6b228",
+ "id": "38ac049b.8f28ac",
"type": "outcome",
"name": "0",
"xml": "<outcome value='0'>\n",
"comments": "",
"outputs": 1,
- "x": 860.9999961853027,
- "y": 340.4136571884155,
- "z": "2a0755d2.04892a",
+ "x": 849.0039024353027,
+ "y": 344.9999990463257,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "511ce89.f44bb18"
+ "8a688447.06c508"
]
]
},
{
- "id": "511ce89.f44bb18",
+ "id": "8a688447.06c508",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 1019,
- "y": 353.41365814208984,
- "z": "2a0755d2.04892a",
+ "x": 1007.00390625,
+ "y": 358,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "bcfd0c5e.e6103",
+ "id": "e4bed2ad.0f579",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 856,
- "y": 454.41365814208984,
- "z": "2a0755d2.04892a",
+ "x": 844.00390625,
+ "y": 459,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "b8a34756.728a58"
+ "4a56c78a.01ddc8"
]
]
},
{
- "id": "af4bd42d.9f4868",
+ "id": "6a4e4809.c60518",
"type": "set",
"name": "set vf-module_length",
"xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",
"comments": "",
- "x": 1210.000015258789,
- "y": 452.4136720895767,
- "z": "2a0755d2.04892a",
+ "x": 1198.003921508789,
+ "y": 457.0000139474869,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "b8a34756.728a58",
+ "id": "4a56c78a.01ddc8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1017.0000457763672,
- "y": 451.413649559021,
- "z": "2a0755d2.04892a",
+ "x": 1005.0039520263672,
+ "y": 455.99999141693115,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "af4bd42d.9f4868",
- "69a184fd.28972c"
+ "6a4e4809.c60518",
+ "bc83d339.7a157"
]
]
},
{
- "id": "69a184fd.28972c",
+ "id": "bc83d339.7a157",
"type": "for",
"name": "for each existing vf-index",
"xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1229.0000305175781,
- "y": 501.41367053985596,
- "z": "2a0755d2.04892a",
+ "x": 1217.0039367675781,
+ "y": 506.0000123977661,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "72e39d48.4f8944"
+ "f6f67e00.4f2d6"
]
]
},
{
- "id": "72e39d48.4f8944",
+ "id": "f6f67e00.4f2d6",
"type": "switchNode",
"name": "switch vf-module-id found",
"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",
"comments": "",
"outputs": 1,
- "x": 1472,
- "y": 500.41365814208984,
- "z": "2a0755d2.04892a",
+ "x": 1460.00390625,
+ "y": 505,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "5f38c3e.5d3ce3c"
+ "dd4f952e.96ea88"
]
]
},
{
- "id": "5f38c3e.5d3ce3c",
+ "id": "dd4f952e.96ea88",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1670.0000286102295,
- "y": 487.41366481781006,
- "z": "2a0755d2.04892a",
+ "x": 1658.0039348602295,
+ "y": 492.0000066757202,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "92d909cb.ff6d68"
+ "daa971e2.4674d"
]
]
},
{
- "id": "92d909cb.ff6d68",
+ "id": "daa971e2.4674d",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1822,
- "y": 489.41365814208984,
- "z": "2a0755d2.04892a",
+ "x": 1810.00390625,
+ "y": 494,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "4dec85b6.3eab5c",
- "e85d666e.e8adc8",
- "15a9af4c.a7f031"
+ "b77c5961.7e0078",
+ "f6edb536.7a6928",
+ "29517aa5.1b19a6"
]
]
},
{
- "id": "4dec85b6.3eab5c",
+ "id": "b77c5961.7e0078",
"type": "set",
"name": "set tmp.vidx and ctx.vnf-data",
"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",
"comments": "",
- "x": 2050.000114440918,
- "y": 431.4136619567871,
- "z": "2a0755d2.04892a",
+ "x": 2038.004020690918,
+ "y": 436.00000381469727,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "e85d666e.e8adc8",
+ "id": "f6edb536.7a6928",
"type": "set",
"name": "set vf-module-request-input.",
"xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",
"comments": "",
- "x": 2054.000114440918,
- "y": 485.4136619567871,
- "z": "2a0755d2.04892a",
+ "x": 2042.004020690918,
+ "y": 490.00000381469727,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "582a5dfb.dfaf24",
+ "id": "8d9ec798.9077a8",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
"comments": "",
- "x": 553.0002136230469,
- "y": 1926.9149341583252,
- "z": "2a0755d2.04892a",
+ "x": 541.0041198730469,
+ "y": 1931.5012760162354,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "15a9af4c.a7f031",
+ "id": "29517aa5.1b19a6",
"type": "call",
"name": "call sdwan-get-vf-module-lanport-param",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2084.4551391601562,
- "y": 536.4241542816162,
- "z": "2a0755d2.04892a",
+ "x": 2072.4590454101562,
+ "y": 541.0104961395264,
+ "z": "eb27f9f.1aaf508",
"wires": [
[]
]
},
{
- "id": "1adddcaf.a133d3",
+ "id": "cc302ad2.335ad8",
"type": "for",
"name": "for vf-modules.vf-module_length",
"xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 891.2540740966797,
- "y": 541.4176807403564,
- "z": "2a0755d2.04892a",
+ "x": 879.2579803466797,
+ "y": 546.0040225982666,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "8d8ac8b6.f23b18"
+ "58d4b8d7.026f28"
]
]
},
{
- "id": "cc689d86.6d6b1",
+ "id": "ffc92a35.504858",
"type": "switchNode",
"name": "switch this deviceName == vf-input",
- "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",
+ "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",
"comments": "",
"outputs": 1,
- "x": 1164.2543182373047,
- "y": 627.417786359787,
- "z": "2a0755d2.04892a",
+ "x": 1152.2582244873047,
+ "y": 632.0041282176971,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "ec201f5b.98b55"
+ "753161a4.e4105"
]
]
},
{
- "id": "8d8ac8b6.f23b18",
+ "id": "58d4b8d7.026f28",
"type": "for",
"name": "for vf-module-input-param length",
"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",
"comments": "",
"outputs": 1,
- "x": 1189.2539901733398,
- "y": 544.4177227020264,
- "z": "2a0755d2.04892a",
+ "x": 1177.2578964233398,
+ "y": 549.0040645599365,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "cc689d86.6d6b1"
+ "ffc92a35.504858"
]
]
},
{
- "id": "ec201f5b.98b55",
+ "id": "753161a4.e4105",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1378.2541313171387,
- "y": 624.4177711009979,
- "z": "2a0755d2.04892a",
+ "x": 1366.2580375671387,
+ "y": 629.0041129589081,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "137ad5db.05e33a"
+ "530b71d0.67585"
]
]
},
{
- "id": "42b7ec46.f75e94",
+ "id": "db40c5ed.6ed418",
"type": "for",
"name": "for vf-modules.vf-module_length",
"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",
"comments": "",
"outputs": 1,
- "x": 1767.254322052002,
- "y": 621.4179258346558,
- "z": "2a0755d2.04892a",
+ "x": 1755.258228302002,
+ "y": 626.0042676925659,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "6fa7e982.f0f398"
+ "e3d2d09b.6274e"
]
]
},
{
- "id": "6fa7e982.f0f398",
+ "id": "e3d2d09b.6274e",
"type": "switchNode",
"name": "switch deviceId == input vf-id",
"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",
"comments": "",
"outputs": 1,
- "x": 2059.2542114257812,
- "y": 622.4178848266602,
- "z": "2a0755d2.04892a",
+ "x": 2047.2581176757812,
+ "y": 627.0042266845703,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "a93d7d08.b19f3"
+ "9b1b7b47.77c908"
]
]
},
{
- "id": "a93d7d08.b19f3",
+ "id": "9b1b7b47.77c908",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2258.254379272461,
- "y": 620.4178848266602,
- "z": "2a0755d2.04892a",
+ "x": 2246.258285522461,
+ "y": 625.0042266845703,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "8ce50095.7309f"
+ "6eb0efd.3e47b1"
]
]
},
{
- "id": "8ce50095.7309f",
+ "id": "6eb0efd.3e47b1",
"type": "set",
"name": "set prop.lan.deviceId",
"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",
"comments": "",
- "x": 2431.254383087158,
- "y": 620.4179258346558,
- "z": "2a0755d2.04892a",
+ "x": 2419.258289337158,
+ "y": 625.0042676925659,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "6331828e.70aa2c",
+ "id": "1c23a104.8b10df",
"type": "for",
"name": "for service-data.vnfs.vnf_length",
"xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 637.2539215087891,
- "y": 476.4176778793335,
- "z": "2a0755d2.04892a",
+ "x": 625.2578277587891,
+ "y": 481.00401973724365,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "1adddcaf.a133d3"
+ "cc302ad2.335ad8"
]
]
},
{
- "id": "125425fb.ef4bfa",
+ "id": "427eb2b2.29a19c",
"type": "switchNode",
"name": "switch ActivateSDWANSiteInstance",
"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",
"comments": "",
"outputs": 1,
- "x": 1232.0042877197266,
- "y": 748.417646408081,
- "z": "2a0755d2.04892a",
+ "x": 1220.0081939697266,
+ "y": 753.0039882659912,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "7336ac27.633e24"
+ "d5fc4f12.f3715"
]
]
},
{
- "id": "38f21693.f6208a",
+ "id": "9c314385.3cccd",
"type": "for",
"name": "for vf-modules.vf-module_length",
"xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 765.0041732788086,
- "y": 819.4176635742188,
- "z": "2a0755d2.04892a",
+ "x": 753.0080795288086,
+ "y": 824.0040054321289,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "e28cdf4a.09f99"
+ "f0f279f1.f5aee8"
]
]
},
{
- "id": "58afb0e4.ba7df",
+ "id": "c0a9943e.0b6a78",
"type": "for",
"name": "for service-data.vnfs.vnf_length",
"xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 629.0039825439453,
- "y": 646.4175662994385,
- "z": "2a0755d2.04892a",
+ "x": 617.0078887939453,
+ "y": 651.0039081573486,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "74d2892.3a20c78"
+ "a69a253a.e8e958"
]
]
},
{
- "id": "7336ac27.633e24",
+ "id": "d5fc4f12.f3715",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1454.0042037963867,
- "y": 748.4177279472351,
- "z": "2a0755d2.04892a",
+ "x": 1442.0081100463867,
+ "y": 753.0040698051453,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "6d31748d.e3c9bc"
+ "41fe08aa.15b428"
]
]
},
{
- "id": "6d31748d.e3c9bc",
+ "id": "41fe08aa.15b428",
"type": "for",
"name": "for vf-modules.vf-module_length",
"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",
"comments": "",
"outputs": 1,
- "x": 1535.2542114257812,
- "y": 822.9177293777466,
- "z": "2a0755d2.04892a",
+ "x": 1523.2581176757812,
+ "y": 827.5040712356567,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "7cb6a87.6e3f758"
+ "687fd9fe.041c58"
]
]
},
{
- "id": "1008121d.0f833e",
+ "id": "703289c8.f0d638",
"type": "switchNode",
"name": "switch siteId",
"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",
"comments": "",
"outputs": 1,
- "x": 1918.2545700073242,
- "y": 829.9178366661072,
- "z": "2a0755d2.04892a",
+ "x": 1906.2584762573242,
+ "y": 834.5041785240173,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "7c572003.6098f"
+ "b38ab304.d8ca8"
]
]
},
{
- "id": "7c572003.6098f",
+ "id": "b38ab304.d8ca8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2095.2545890808105,
- "y": 832.9176769256592,
- "z": "2a0755d2.04892a",
+ "x": 2083.2584953308105,
+ "y": 837.5040187835693,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "8daf5324.de268"
+ "3a704ef2.91c232"
]
]
},
{
- "id": "63cd961f.c156c8",
+ "id": "97126ca9.bd5cb",
"type": "set",
"name": "set prop.attach.siteId",
"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",
"comments": "",
- "x": 2479.255096435547,
- "y": 806.9177284240723,
- "z": "2a0755d2.04892a",
+ "x": 2467.259002685547,
+ "y": 811.5040702819824,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "8daf5324.de268",
+ "id": "3a704ef2.91c232",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2254.504779815674,
- "y": 828.4177169799805,
- "z": "2a0755d2.04892a",
+ "x": 2242.508686065674,
+ "y": 833.0040588378906,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "63cd961f.c156c8",
- "4f58a0f5.56037",
- "975b7faf.1862a"
+ "97126ca9.bd5cb",
+ "82be127b.4ba08",
+ "e04e88b3.6b7888"
]
]
},
{
- "id": "89ba2ad0.277798",
+ "id": "37a0c49e.52f2ec",
"type": "get-resource",
"name": "get-resource esr-thirdparty-sdnc",
"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",
"comments": "",
"outputs": 1,
- "x": 590.0039291381836,
- "y": 965.9176549911499,
- "z": "2a0755d2.04892a",
+ "x": 578.0078353881836,
+ "y": 970.5039968490601,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "2d233c53.3f6be4",
- "f1938aaa.240958",
- "46bd4734.d48208"
+ "737a26fd.e1dab8",
+ "dacb633c.487af",
+ "48a17fc2.d83c5"
]
]
},
{
- "id": "2d233c53.3f6be4",
+ "id": "737a26fd.e1dab8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 834.0039901733398,
- "y": 929.9176549911499,
- "z": "2a0755d2.04892a",
+ "x": 822.0078964233398,
+ "y": 934.5039968490601,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "157032ce.bbb88d"
+ "e7e7ee2.fc0eb1"
]
]
},
{
- "id": "f1938aaa.240958",
+ "id": "dacb633c.487af",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 836.494873046875,
- "y": 965.4916915893555,
- "z": "2a0755d2.04892a",
+ "x": 824.498779296875,
+ "y": 970.0780334472656,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "4af9366b.00d608"
+ "3d818670.7778da"
]
]
},
{
- "id": "46bd4734.d48208",
+ "id": "48a17fc2.d83c5",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 831.827880859375,
- "y": 1001.8250503540039,
- "z": "2a0755d2.04892a",
+ "x": 819.831787109375,
+ "y": 1006.4113922119141,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "3961a91d.651c56"
+ "42fa81a1.deae7"
]
]
},
{
- "id": "3961a91d.651c56",
+ "id": "42fa81a1.deae7",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
"comments": "",
- "x": 985.6003723144531,
- "y": 999.2641372680664,
- "z": "2a0755d2.04892a",
+ "x": 973.6042785644531,
+ "y": 1003.8504791259766,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "4af9366b.00d608",
+ "id": "3d818670.7778da",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
"comments": "",
- "x": 982.0662689208984,
- "y": 963.7773790359497,
- "z": "2a0755d2.04892a",
+ "x": 970.0701751708984,
+ "y": 968.3637208938599,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "157032ce.bbb88d",
+ "id": "e7e7ee2.fc0eb1",
"type": "set",
"name": "set controller data",
"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",
"comments": "",
- "x": 994.5041007995605,
- "y": 927.917594909668,
- "z": "2a0755d2.04892a",
+ "x": 982.5080070495605,
+ "y": 932.5039367675781,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "e99d476c.3f3ac8",
+ "id": "88d74976.c878b8",
"type": "execute",
"name": "execute RestApiCallNode Get token",
"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\"/>",
"comments": "",
"outputs": 1,
- "x": 603.9421615600586,
- "y": 1069.03874874115,
- "z": "2a0755d2.04892a",
+ "x": 591.9460678100586,
+ "y": 1073.62509059906,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "e801e029.f1d5a",
- "8d93013.82561"
+ "76d84be1.6ba5b4",
+ "93f8c0dc.5b81e"
]
]
},
{
- "id": "e801e029.f1d5a",
+ "id": "76d84be1.6ba5b4",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 838.9422874450684,
- "y": 1055.038737297058,
- "z": "2a0755d2.04892a",
+ "x": 826.9461936950684,
+ "y": 1059.6250791549683,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "aaae6df9.4c056"
+ "f2b8e32a.bae75"
]
]
},
{
- "id": "8d93013.82561",
+ "id": "93f8c0dc.5b81e",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 838.1922874450684,
- "y": 1090.6816444396973,
- "z": "2a0755d2.04892a",
+ "x": 826.1961936950684,
+ "y": 1095.2679862976074,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "5e0c2f7e.4b122"
+ "f416c022.785c9"
]
]
},
{
- "id": "5e0c2f7e.4b122",
+ "id": "f416c022.785c9",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",
"comments": "",
- "x": 986.9422950744629,
- "y": 1091.4317264556885,
- "z": "2a0755d2.04892a",
+ "x": 974.9462013244629,
+ "y": 1096.0180683135986,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "aaae6df9.4c056",
+ "id": "f2b8e32a.bae75",
"type": "set",
"name": "set token-id",
"xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
"comments": "",
- "x": 980.9422950744629,
- "y": 1054.0387382507324,
- "z": "2a0755d2.04892a",
+ "x": 968.9462013244629,
+ "y": 1058.6250801086426,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "e8785c39.cc512",
+ "id": "b028cd6d.5db14",
"type": "execute",
"name": "execute RestApiCallNode device port delete",
"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`\" />",
"comments": "",
"outputs": 1,
- "x": 630.0312576293945,
- "y": 1220.4918870925903,
- "z": "2a0755d2.04892a",
+ "x": 618.0351638793945,
+ "y": 1225.0782289505005,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "552b4230.a57a2c",
- "a21ab43e.f1ce68"
+ "fb8d6372.3f4b4",
+ "48c81a07.925bc4"
]
]
},
{
- "id": "552b4230.a57a2c",
+ "id": "fb8d6372.3f4b4",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 879.0313167572021,
- "y": 1234.4920930862427,
- "z": "2a0755d2.04892a",
+ "x": 867.0352230072021,
+ "y": 1239.0784349441528,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "d1a4e04e.60501"
+ "a8972b96.6e4798"
]
]
},
{
- "id": "a21ab43e.f1ce68",
+ "id": "48c81a07.925bc4",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 879.0313167572021,
- "y": 1196.491928577423,
- "z": "2a0755d2.04892a",
+ "x": 867.0352230072021,
+ "y": 1201.0782704353333,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "54a6d547.da0aec"
+ "2b546f30.f74b7"
]
]
},
{
- "id": "54a6d547.da0aec",
+ "id": "2b546f30.f74b7",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing Create device port rest api\" />\n",
"comments": "",
- "x": 1023.0316505432129,
- "y": 1195.491928100586,
- "z": "2a0755d2.04892a",
+ "x": 1011.0355567932129,
+ "y": 1200.078269958496,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "d1a4e04e.60501",
+ "id": "a8972b96.6e4798",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1026.031328201294,
- "y": 1235.4919319152832,
- "z": "2a0755d2.04892a",
+ "x": 1014.035234451294,
+ "y": 1240.0782737731934,
+ "z": "eb27f9f.1aaf508",
"wires": [
[]
]
},
{
- "id": "c5c8c91e.ca8b48",
+ "id": "7630dbec.718c24",
"type": "comment",
"name": "Delete port",
"info": "",
"comments": "",
- "x": 531.6971969604492,
- "y": 1186.9359111785889,
- "z": "2a0755d2.04892a",
+ "x": 519.7011032104492,
+ "y": 1191.522253036499,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "81163bc0.74e178",
+ "id": "7eaf7940.931d68",
"type": "call",
"name": "call sdwan-get-tenant-auth",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 578.6971969604492,
- "y": 1135.6023473739624,
- "z": "2a0755d2.04892a",
+ "x": 566.7011032104492,
+ "y": 1140.1886892318726,
+ "z": "eb27f9f.1aaf508",
"wires": [
[]
]
},
{
- "id": "a939bddc.25a0a",
+ "id": "ea684fc6.056a2",
"type": "execute",
"name": "execute RestApiCallNode bridge domain create",
"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`\" />",
"comments": "",
"outputs": 1,
- "x": 1052.6815071105957,
- "y": 1315.6025159358978,
- "z": "2a0755d2.04892a",
+ "x": 1040.6854133605957,
+ "y": 1320.188857793808,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "991e6562.cad008",
- "a675752c.fef5c8"
+ "3b59cd60.020932",
+ "c2414827.1f0308"
]
]
},
{
- "id": "991e6562.cad008",
+ "id": "3b59cd60.020932",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1373.6815338134766,
- "y": 1332.6028363704681,
- "z": "2a0755d2.04892a",
+ "x": 1361.6854400634766,
+ "y": 1337.1891782283783,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "fb3cfb9f.764a18"
+ "ce1097ce.dee208"
]
]
},
{
- "id": "a675752c.fef5c8",
+ "id": "c2414827.1f0308",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1376.6815605163574,
- "y": 1297.6026179790497,
- "z": "2a0755d2.04892a",
+ "x": 1364.6854667663574,
+ "y": 1302.1889598369598,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "92f1575b.a1bfb8"
+ "eb07b224.53901"
]
]
},
{
- "id": "92f1575b.a1bfb8",
+ "id": "eb07b224.53901",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing Create bridge domain rest api\" />\n",
"comments": "",
- "x": 1579.6819496154785,
- "y": 1293.6027252674103,
- "z": "2a0755d2.04892a",
+ "x": 1567.6858558654785,
+ "y": 1298.1890671253204,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "fb3cfb9f.764a18",
+ "id": "ce1097ce.dee208",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1580.6815147399902,
- "y": 1328.602591753006,
- "z": "2a0755d2.04892a",
+ "x": 1568.6854209899902,
+ "y": 1333.1889336109161,
+ "z": "eb27f9f.1aaf508",
"wires": [
[]
]
},
{
- "id": "d50d1b79.abf9a8",
+ "id": "fb63c3bc.ee861",
"type": "comment",
"name": "Create bridge domain",
"info": "",
"comments": "",
- "x": 996.3474006652832,
- "y": 1282.0467417240143,
- "z": "2a0755d2.04892a",
+ "x": 984.3513069152832,
+ "y": 1286.6330835819244,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "60ca269e.96d878",
+ "id": "ea24678.936eb98",
"type": "switchNode",
"name": "switch portSwitch",
"xml": "<switch test=\"`$prop.lan.portSwitch == 'layer2-port'`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 561.4590759277344,
- "y": 1331.2692050933838,
- "z": "2a0755d2.04892a",
+ "x": 549.4629821777344,
+ "y": 1335.855546951294,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "13b85938.8b9cd7"
+ "3354418d.f828fe"
]
]
},
{
- "id": "13b85938.8b9cd7",
+ "id": "3354418d.f828fe",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 749.4590034484863,
- "y": 1329.3805322647095,
- "z": "2a0755d2.04892a",
+ "x": 737.4629096984863,
+ "y": 1333.9668741226196,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "a939bddc.25a0a"
+ "ea684fc6.056a2"
]
]
},
{
- "id": "ba5b2145.40753",
+ "id": "1a442450.4a365c",
"type": "execute",
"name": "execute split ip and mask",
"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",
"comments": "",
"outputs": 1,
- "x": 577.0039672851562,
- "y": 1417.1676979064941,
- "z": "2a0755d2.04892a",
+ "x": 565.0078735351562,
+ "y": 1421.7540397644043,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "575235a2.fb9bbc",
- "3c20212c.49fade"
+ "9d1d8447.931768",
+ "a4c1e51b.fe66b8"
]
]
},
{
- "id": "3c20212c.49fade",
+ "id": "a4c1e51b.fe66b8",
"type": "failure",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 778.0039863586426,
- "y": 1395.1676893234253,
- "z": "2a0755d2.04892a",
+ "x": 766.0078926086426,
+ "y": 1399.7540311813354,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "bdf015ad.4678f8"
+ "1daa2649.cf0d8a"
]
]
},
{
- "id": "575235a2.fb9bbc",
+ "id": "9d1d8447.931768",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 778.0039901733398,
- "y": 1436.1676931381226,
- "z": "2a0755d2.04892a",
+ "x": 766.0078964233398,
+ "y": 1440.7540349960327,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "133c89f4.2a7c76"
+ "77f9f3ef.24297c"
]
]
},
{
- "id": "bdf015ad.4678f8",
+ "id": "1daa2649.cf0d8a",
"type": "set",
"name": "set ipAddress prefixLength",
"xml": "<set>\n<parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />",
"comments": "",
- "x": 975.0040054321289,
- "y": 1393.1676893234253,
- "z": "2a0755d2.04892a",
+ "x": 963.0079116821289,
+ "y": 1397.7540311813354,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "133c89f4.2a7c76",
+ "id": "77f9f3ef.24297c",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
"comments": "",
- "x": 933.0039978027344,
- "y": 1433.1676921844482,
- "z": "2a0755d2.04892a",
+ "x": 921.0079040527344,
+ "y": 1437.7540340423584,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "372eb63a.83ff6a",
+ "id": "623ff011.75e11",
"type": "comment",
"name": "TODO: split ip/mask",
"info": "",
"comments": "",
- "x": 974.0136375427246,
- "y": 1355.3479614257812,
- "z": "2a0755d2.04892a",
+ "x": 962.0175437927246,
+ "y": 1359.9343032836914,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "86da8112.f0417",
+ "id": "b07d774b.c67f18",
"type": "execute",
"name": "execute RestApiCallNode IPSubnets delete",
"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`\" />",
"comments": "",
"outputs": 1,
- "x": 635.7753372192383,
- "y": 1493.2885875701904,
- "z": "2a0755d2.04892a",
+ "x": 623.7792434692383,
+ "y": 1497.8749294281006,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "15bd3770.c63fa9",
- "248a192b.d86396"
+ "fb6426f0.aef3a8",
+ "334c3bc2.ea5ee4"
]
]
},
{
- "id": "248a192b.d86396",
+ "id": "334c3bc2.ea5ee4",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 904.7753677368164,
- "y": 1480.2885599136353,
- "z": "2a0755d2.04892a",
+ "x": 892.7792739868164,
+ "y": 1484.8749017715454,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "616ee6f.3d9a718"
+ "1de305ac.79165a"
]
]
},
{
- "id": "15bd3770.c63fa9",
+ "id": "fb6426f0.aef3a8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 901.7753410339355,
- "y": 1515.2887783050537,
- "z": "2a0755d2.04892a",
+ "x": 889.7792472839355,
+ "y": 1519.8751201629639,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "40c5dea7.9b57"
+ "e16c200f.f574"
]
]
},
{
- "id": "616ee6f.3d9a718",
+ "id": "1de305ac.79165a",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing Create device port rest api\" />\n",
"comments": "",
- "x": 1057.775749206543,
- "y": 1476.2887859344482,
- "z": "2a0755d2.04892a",
+ "x": 1045.779655456543,
+ "y": 1480.8751277923584,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "40c5dea7.9b57",
+ "id": "e16c200f.f574",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1048.7753219604492,
- "y": 1516.2885341644287,
- "z": "2a0755d2.04892a",
+ "x": 1036.7792282104492,
+ "y": 1520.8748760223389,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "339192eb.51711e"
+ "3689e594.d6f2aa"
]
]
},
{
- "id": "339192eb.51711e",
+ "id": "3689e594.d6f2aa",
"type": "set",
"name": "set prop.lan.lanPortId",
"xml": "<set>\n<parameter name='prop.lan.lanPortId' value='`lanPortResp.success[0].id`' />\n",
"comments": "",
- "x": 1255.6644248962402,
- "y": 1518.622000694275,
- "z": "2a0755d2.04892a",
+ "x": 1243.6683311462402,
+ "y": 1523.208342552185,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "6c0bf23f.5303ac",
+ "id": "6e845a3.14ef3a4",
"type": "execute",
"name": "execute RestApiCallNode create vpn topology",
"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`\" />",
"comments": "",
"outputs": 1,
- "x": 652.2857360839844,
- "y": 1651.7474851608276,
- "z": "2a0755d2.04892a",
+ "x": 640.2896423339844,
+ "y": 1656.3338270187378,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "6503000e.7fe09",
- "f95d774d.951318"
+ "f2309f9f.30389",
+ "436824e6.cfd19c"
]
]
},
{
- "id": "f95d774d.951318",
+ "id": "436824e6.cfd19c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 898.2856712341309,
- "y": 1687.7468357086182,
- "z": "2a0755d2.04892a",
+ "x": 886.2895774841309,
+ "y": 1692.3331775665283,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "1f602715.4e71b9"
+ "cc161513.6096e8"
]
]
},
{
- "id": "1f602715.4e71b9",
+ "id": "cc161513.6096e8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1070.2856121063232,
- "y": 1701.7468520402908,
- "z": "2a0755d2.04892a",
+ "x": 1058.2895183563232,
+ "y": 1706.333193898201,
+ "z": "eb27f9f.1aaf508",
"wires": [
[]
]
},
{
- "id": "7c916735.dbf778",
+ "id": "f1b7a0fd.a1f56",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing Create vpn topology failed\" />\n",
"comments": "",
- "x": 1070.2857341766357,
- "y": 1657.7468520402908,
- "z": "2a0755d2.04892a",
+ "x": 1058.2896404266357,
+ "y": 1662.333193898201,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "6503000e.7fe09",
+ "id": "f2309f9f.30389",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 902.2855892181396,
- "y": 1645.7468347549438,
- "z": "2a0755d2.04892a",
+ "x": 890.2894954681396,
+ "y": 1650.333176612854,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "7c916735.dbf778"
+ "f1b7a0fd.a1f56"
]
]
},
{
- "id": "2b5c8466.72828c",
+ "id": "c2a2820.4e02d8",
"type": "execute",
"name": "execute RestApiCallNode create vpn ",
"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`\" />",
"comments": "",
"outputs": 1,
- "x": 619.2841186523438,
- "y": 1585.246587753296,
- "z": "2a0755d2.04892a",
+ "x": 607.2880249023438,
+ "y": 1589.832929611206,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "593d6e8d.d4036",
- "22423ed9.18f8e2"
+ "5dca5344.cc070c",
+ "f5dbcc17.8c2d6"
]
]
},
{
- "id": "22423ed9.18f8e2",
+ "id": "f5dbcc17.8c2d6",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 844.2840175628662,
- "y": 1605.246500134468,
- "z": "2a0755d2.04892a",
+ "x": 832.2879238128662,
+ "y": 1609.8328419923782,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "b88f4563.6b6768"
+ "ffd8c00c.52d8c"
]
]
},
{
- "id": "b88f4563.6b6768",
+ "id": "ffd8c00c.52d8c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1014.28395652771,
- "y": 1608.246500134468,
- "z": "2a0755d2.04892a",
+ "x": 1002.28786277771,
+ "y": 1612.8328419923782,
+ "z": "eb27f9f.1aaf508",
"wires": [
[]
]
},
{
- "id": "a724847c.2c4088",
+ "id": "60415.0a145bec",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing Create vpn failed\" />\n",
"comments": "",
- "x": 1014.2840785980225,
- "y": 1564.246500134468,
- "z": "2a0755d2.04892a",
+ "x": 1002.2879848480225,
+ "y": 1568.8328419923782,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "593d6e8d.d4036",
+ "id": "5dca5344.cc070c",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 847.28395652771,
- "y": 1564.246500134468,
- "z": "2a0755d2.04892a",
+ "x": 835.28786277771,
+ "y": 1568.8328419923782,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "a724847c.2c4088"
+ "60415.0a145bec"
]
]
},
{
- "id": "1f47d1c3.9d407e",
+ "id": "55cb7e10.b843e",
"type": "switchNode",
"name": "switch ActivateSDWANVpnInstance",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1210.2859420776367,
- "y": 869.7469148635864,
- "z": "2a0755d2.04892a",
+ "x": 1198.2898483276367,
+ "y": 874.3332567214966,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "6200b940.359218"
+ "35e81d22.6ca8a2"
]
]
},
{
- "id": "e28cdf4a.09f99",
+ "id": "f0f279f1.f5aee8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 967.6190452575684,
- "y": 798.746994972229,
- "z": "2a0755d2.04892a",
+ "x": 955.6229515075684,
+ "y": 803.3333368301392,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "125425fb.ef4bfa",
- "1f47d1c3.9d407e",
- "712ec051.8d2a6"
+ "427eb2b2.29a19c",
+ "55cb7e10.b843e",
+ "ee6738c4.de8eb8"
]
]
},
{
- "id": "6200b940.359218",
+ "id": "35e81d22.6ca8a2",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1305.9524536132812,
- "y": 943.7469959259033,
- "z": "2a0755d2.04892a",
+ "x": 1293.9563598632812,
+ "y": 948.3333377838135,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "309bb160.fe92de"
+ "50c0c92c.64de28"
]
]
},
{
- "id": "309bb160.fe92de",
+ "id": "50c0c92c.64de28",
"type": "for",
"name": "for vf-modules.vf-module_length",
"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",
"comments": "",
"outputs": 1,
- "x": 1520.2023391723633,
- "y": 945.2469725608826,
- "z": "2a0755d2.04892a",
+ "x": 1508.2062454223633,
+ "y": 949.8333144187927,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "1ac88e91.8c9681"
+ "759cda21.f2dc74"
]
]
},
{
- "id": "1ac88e91.8c9681",
+ "id": "759cda21.f2dc74",
"type": "switchNode",
"name": "switch vpn-id",
"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",
"comments": "",
"outputs": 1,
- "x": 1767.202377319336,
- "y": 940.2470555305481,
- "z": "2a0755d2.04892a",
+ "x": 1755.206283569336,
+ "y": 944.8333973884583,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "3a5e3420.dfdfbc"
+ "848c4744.1c01a8"
]
]
},
{
- "id": "3a5e3420.dfdfbc",
+ "id": "848c4744.1c01a8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1917.9523315429688,
- "y": 941.7469711303711,
- "z": "2a0755d2.04892a",
+ "x": 1905.9562377929688,
+ "y": 946.3333129882812,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "f542060.75c12f8"
+ "3b552595.502b8a"
]
]
},
{
- "id": "f542060.75c12f8",
+ "id": "3b552595.502b8a",
"type": "set",
"name": "set prop.vpn1Id",
"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",
"comments": "",
- "x": 2091.953079223633,
- "y": 941.747029542923,
- "z": "2a0755d2.04892a",
+ "x": 2079.956985473633,
+ "y": 946.3333714008331,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "4f58a0f5.56037",
+ "id": "82be127b.4ba08",
"type": "set",
"name": "Add sites to list and update length",
"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",
"comments": "",
- "x": 2522.2864532470703,
- "y": 847.747029542923,
- "z": "2a0755d2.04892a",
+ "x": 2510.2903594970703,
+ "y": 852.3333714008331,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "975b7faf.1862a",
+ "id": "e04e88b3.6b7888",
"type": "set",
"name": "Add site attachement to list and update length",
"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",
"comments": "",
- "x": 2553.286346435547,
- "y": 890.7469959259033,
- "z": "2a0755d2.04892a",
+ "x": 2541.290252685547,
+ "y": 895.3333377838135,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "d3ab3217.7d57a",
+ "id": "76875429.7977ec",
"type": "set",
"name": "set prop.siteAttachement_length=0",
"xml": "<set>\n<parameter name='prop.siteAttachements_length' value='0' />\n<parameter name='prop.siteIds_length' value='0' />\n\n\n\n",
"comments": "",
- "x": 639.2857208251953,
- "y": 595.7469882965088,
- "z": "2a0755d2.04892a",
+ "x": 627.2896270751953,
+ "y": 600.333330154419,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "7cb6a87.6e3f758",
+ "id": "687fd9fe.041c58",
"type": "block",
"name": "block atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1752.6193771362305,
- "y": 823.7469940185547,
- "z": "2a0755d2.04892a",
+ "x": 1740.6232833862305,
+ "y": 828.3333358764648,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "1008121d.0f833e",
- "38f1f3d9.ea90fc",
- "65c7e0ab.e924d"
+ "703289c8.f0d638",
+ "7c3e64c6.118e7c",
+ "fd5e762b.9175c8"
]
]
},
{
- "id": "38f1f3d9.ea90fc",
+ "id": "7c3e64c6.118e7c",
"type": "switchNode",
"name": "switch role",
"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",
"comments": "",
"outputs": 1,
- "x": 1914.9523086547852,
- "y": 754.7469930648804,
- "z": "2a0755d2.04892a",
+ "x": 1902.9562149047852,
+ "y": 759.3333349227905,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "e4b2cfb7.2be02"
+ "9d3d23c.1af69e"
]
]
},
{
- "id": "e4b2cfb7.2be02",
+ "id": "9d3d23c.1af69e",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2077.9523124694824,
- "y": 749.7469940185547,
- "z": "2a0755d2.04892a",
+ "x": 2065.9562187194824,
+ "y": 754.3333358764648,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "cbd09e2f.5bc81"
+ "b50c3782.0e6ad8"
]
]
},
{
- "id": "cbd09e2f.5bc81",
+ "id": "b50c3782.0e6ad8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2245.9523544311523,
- "y": 743.746992111206,
- "z": "2a0755d2.04892a",
+ "x": 2233.9562606811523,
+ "y": 748.3333339691162,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "3c601cb.4b2f2e4",
- "2d319605.7a6e9a"
+ "1dffa18.8cf065f",
+ "4b307f30.7cc1"
]
]
},
{
- "id": "2d319605.7a6e9a",
+ "id": "4b307f30.7cc1",
"type": "switchNode",
"name": "switch sd-wan-edge",
"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",
"comments": "",
"outputs": 1,
- "x": 2440.9524841308594,
- "y": 704.7469835281372,
- "z": "2a0755d2.04892a",
+ "x": 2428.9563903808594,
+ "y": 709.3333253860474,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "bb6dcfdd.128fa"
+ "fcbf0bd1.06d8d8"
]
]
},
{
- "id": "3c601cb.4b2f2e4",
+ "id": "1dffa18.8cf065f",
"type": "switchNode",
"name": "switch dsvpn-hub",
"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",
"comments": "",
"outputs": 1,
- "x": 2437.952590942383,
- "y": 759.7469990253448,
- "z": "2a0755d2.04892a",
+ "x": 2425.956497192383,
+ "y": 764.333340883255,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "b131819c.daa97"
+ "99c61a76.666788"
]
]
},
{
- "id": "91128780.38fd08",
+ "id": "4a479c02.0630f4",
"type": "set",
"name": "set spoke role",
"xml": "<set>\n<parameter name='prop.role' value=\"spoke\" />\n",
"comments": "",
- "x": 2770.952606201172,
- "y": 698.7470293045044,
- "z": "2a0755d2.04892a",
+ "x": 2758.956512451172,
+ "y": 703.3333711624146,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "c4199cad.d68d",
+ "id": "5e79562c.63b268",
"type": "set",
"name": "set hub role",
"xml": "<set>\n<parameter name='prop.role' value=\"hub\" />\n",
"comments": "",
- "x": 2769.952365875244,
- "y": 753.747013092041,
- "z": "2a0755d2.04892a",
+ "x": 2757.956272125244,
+ "y": 758.3333549499512,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "bb6dcfdd.128fa",
+ "id": "fcbf0bd1.06d8d8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2610.9524536132812,
- "y": 700.4136581420898,
- "z": "2a0755d2.04892a",
+ "x": 2598.9563598632812,
+ "y": 705,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "91128780.38fd08"
+ "4a479c02.0630f4"
]
]
},
{
- "id": "b131819c.daa97",
+ "id": "99c61a76.666788",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2614.9524536132812,
- "y": 755.4136581420898,
- "z": "2a0755d2.04892a",
+ "x": 2602.9563598632812,
+ "y": 760,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "c4199cad.d68d"
+ "5e79562c.63b268"
]
]
},
{
- "id": "16e6f83a.5e7ff8",
+ "id": "715f7228.db42ac",
"type": "update",
"name": "update SDWAN VPN status to AAI",
"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`' />",
"comments": "",
"outputs": 1,
- "x": 617.3170700073242,
- "y": 1867.4452047348022,
- "z": "2a0755d2.04892a",
+ "x": 605.3209762573242,
+ "y": 1872.0315465927124,
+ "z": "eb27f9f.1aaf508",
"wires": [
[]
]
},
{
- "id": "65c7e0ab.e924d",
+ "id": "fd5e762b.9175c8",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/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",
"comments": "",
"outputs": 1,
- "x": 1910.3169555664062,
- "y": 698.9449081420898,
- "z": "2a0755d2.04892a",
+ "x": 1898.3208618164062,
+ "y": 703.53125,
+ "z": "eb27f9f.1aaf508",
"wires": [
[]
]
},
{
- "id": "712ec051.8d2a6",
+ "id": "ee6738c4.de8eb8",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/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",
"comments": "",
"outputs": 1,
- "x": 1153.3171730041504,
- "y": 699.9450273513794,
- "z": "2a0755d2.04892a",
+ "x": 1141.3210792541504,
+ "y": 704.5313692092896,
+ "z": "eb27f9f.1aaf508",
"wires": [
[]
]
},
{
- "id": "500d4c8a.78bee4",
+ "id": "5ab12293.b61a8c",
"type": "comment",
"name": "**revert the changes",
"info": "",
"comments": "",
- "x": 1311.316982269287,
- "y": 704.4449405670166,
- "z": "2a0755d2.04892a",
+ "x": 1299.320888519287,
+ "y": 709.0312824249268,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "137ad5db.05e33a",
+ "id": "530b71d0.67585",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1536.3333740234375,
- "y": 621.6667051315308,
- "z": "2a0755d2.04892a",
+ "x": 1524.3372802734375,
+ "y": 626.2530469894409,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "42b7ec46.f75e94",
- "5c976c54.43c564"
+ "db40c5ed.6ed418",
+ "68d688c3.70e818"
]
]
},
{
- "id": "5c976c54.43c564",
+ "id": "68d688c3.70e818",
"type": "set",
"name": "set prop.vnf-id",
"xml": "<set>\n<parameter name='prop.vnf-id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-id`' />\n\n",
"comments": "",
- "x": 1728.0000495910645,
- "y": 551.6666831970215,
- "z": "2a0755d2.04892a",
+ "x": 1716.0039558410645,
+ "y": 556.2530250549316,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "74d2892.3a20c78",
+ "id": "a69a253a.e8e958",
"type": "switchNode",
"name": "switch prop.vnf-id match",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-id == $prop.vnf-id`\">",
"comments": "",
"outputs": 1,
- "x": 886.0003509521484,
- "y": 673.0000200271606,
- "z": "2a0755d2.04892a",
+ "x": 874.0042572021484,
+ "y": 677.5863618850708,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "cfdd9f28.400e6"
+ "5ecfed21.a77fb4"
]
]
},
{
- "id": "cfdd9f28.400e6",
+ "id": "5ecfed21.a77fb4",
"type": "outcomeFalse",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 674.0005035400391,
- "y": 748.0000233650208,
- "z": "2a0755d2.04892a",
+ "x": 662.0044097900391,
+ "y": 752.5863652229309,
+ "z": "eb27f9f.1aaf508",
"wires": [
[
- "38f21693.f6208a"
+ "9c314385.3cccd"
]
]
},
{
- "id": "fef5106c.cc924",
+ "id": "efed662f.81b6a8",
"type": "comment",
"name": "if device-name match with the incomming device-name, sites in this service vnf should not be included",
"info": "",
"comments": "",
- "x": 749.0000915527344,
- "y": 845.0000410079956,
- "z": "2a0755d2.04892a",
+ "x": 737.0039978027344,
+ "y": 849.5863828659058,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "2ee3209f.a1bb9",
+ "id": "728a6387.ded5dc",
"type": "set",
"name": "copy input data to service data",
"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",
"comments": "",
- "x": 605.0000915527344,
- "y": 1719.6667194366455,
- "z": "2a0755d2.04892a",
+ "x": 593.0039978027344,
+ "y": 1724.2530612945557,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "bfac8597.a517f8",
+ "id": "d768a494.487678",
"type": "set",
"name": "set vf-module-id and vf-module-object-path",
"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",
"comments": "",
- "x": 639.3032913208008,
- "y": 1763.4698286056519,
- "z": "2a0755d2.04892a",
+ "x": 627.3071975708008,
+ "y": 1768.056170463562,
+ "z": "eb27f9f.1aaf508",
"wires": []
},
{
- "id": "b282b047.e838d",
+ "id": "24c5eb03.2a37b4",
"type": "set",
"name": "set vf-module-level-oper-status",
"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`' />",
"comments": "",
- "x": 606.3033180236816,
- "y": 1816.4698705673218,
- "z": "2a0755d2.04892a",
+ "x": 594.3072242736816,
+ "y": 1821.056212425232,
+ "z": "eb27f9f.1aaf508",
+ "wires": []
+ },
+ {
+ "id": "b36b6e5f.5d733",
+ "type": "switchNode",
+ "name": "switch vnf-index",
+ "xml": "<switch test='`$vnf-index`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 596.00390625,
+ "y": 287.00390625,
+ "z": "eb27f9f.1aaf508",
+ "wires": [
+ [
+ "eab1927d.01f0a"
+ ]
+ ]
+ },
+ {
+ "id": "eab1927d.01f0a",
+ "type": "other",
+ "name": "Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 758.0039520263672,
+ "y": 286.0039052963257,
+ "z": "eb27f9f.1aaf508",
+ "wires": [
+ [
+ "a638e200.1e293"
+ ]
+ ]
+ },
+ {
+ "id": "a638e200.1e293",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf id not found in service-data\" />\n",
+ "comments": "",
+ "x": 907.2540435791016,
+ "y": 283.78178310394287,
+ "z": "eb27f9f.1aaf508",
"wires": []
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.json index 012deec8..d66530dd 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.json @@ -1,22 +1,22 @@ [
{
- "id": "a54d86da.b0b4c8",
+ "id": "5b377527.318dfc",
"type": "method",
"name": "method sdwan-vf-operation-lanport-delete",
"xml": "<method rpc='sdwan-vf-operation-lanport-delete' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 234.00000762939453,
- "y": 230.00012350082397,
- "z": "1f04287d.306418",
+ "x": 289.00390625,
+ "y": 239.5863505601883,
+ "z": "6e499246.1345bc",
"wires": [
[
- "4d4d77e8.c38938"
+ "b6ef6d6.088219"
]
]
},
{
- "id": "db831233.33e69",
+ "id": "5fa9c4d6.4ec86c",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -24,663 +24,707 @@ "comments": "",
"xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
"outputs": 1,
- "x": 222.28571319580078,
- "y": 130.65188121795654,
- "z": "1f04287d.306418",
+ "x": 277.28961181640625,
+ "y": 140.23810827732086,
+ "z": "6e499246.1345bc",
"wires": [
[
- "a54d86da.b0b4c8"
+ "5b377527.318dfc"
]
]
},
{
- "id": "62c65238.af2cac",
+ "id": "3e4efa76.6244b6",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 143.00000762939453,
- "y": 68.4137716293335,
- "z": "1f04287d.306418",
+ "x": 198.00390625,
+ "y": 77.99999868869781,
+ "z": "6e499246.1345bc",
"wires": [
[
- "db831233.33e69"
+ "5fa9c4d6.4ec86c"
]
]
},
{
- "id": "4d4d77e8.c38938",
+ "id": "b6ef6d6.088219",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 250.66670989990234,
- "y": 459.080491065979,
- "z": "1f04287d.306418",
+ "x": 305.6706085205078,
+ "y": 468.6667181253433,
+ "z": "6e499246.1345bc",
"wires": [
[
- "26d66719.d43da8",
- "e7e6cf90.f4145",
- "2040df5d.c513d",
- "58084a37.394334",
- "8cf55d8b.9b86e",
- "6f98bfc7.8211a",
- "b57e1a43.a54548",
- "9d1a9cea.dd56",
- "49881624.abb0c8",
- "c5683ab4.530598",
- "d5b959e7.7e0cc8",
- "d3e08866.ee2d18"
+ "71f387b9.003178",
+ "a6a43527.61a1e8",
+ "4d09affd.63ec7",
+ "158609f4.fc8936",
+ "7132f9a1.7bd008",
+ "379a2e2e.3a8382",
+ "6e5f86e6.881a38",
+ "13d12ad9.b40a25",
+ "50901066.93c6f",
+ "71b32013.3584b",
+ "c59a5d45.5b06a",
+ "4315ff0e.d57d4",
+ "cd89e451.16b298"
]
]
},
{
- "id": "e7e6cf90.f4145",
+ "id": "a6a43527.61a1e8",
"type": "for",
"name": "for each vnf",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 566.0313720703125,
- "y": 304.6829128265381,
- "z": "1f04287d.306418",
+ "x": 640.0352554321289,
+ "y": 249.26914072036743,
+ "z": "6e499246.1345bc",
"wires": [
[
- "7275fe1.35167"
+ "5c4cd934.c95538"
]
]
},
{
- "id": "26d66719.d43da8",
+ "id": "71f387b9.003178",
"type": "switchNode",
"name": "switch vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 571.0000267028809,
- "y": 243.41378211975098,
- "z": "1f04287d.306418",
+ "x": 645.0039100646973,
+ "y": 188.00001001358032,
+ "z": "6e499246.1345bc",
"wires": [
[
- "4f7f751d.4ffa8c"
+ "ec17d276.93fee"
]
]
},
{
- "id": "4f7f751d.4ffa8c",
+ "id": "ec17d276.93fee",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 751.0000076293945,
- "y": 242.4137716293335,
- "z": "1f04287d.306418",
+ "x": 825.0038909912109,
+ "y": 186.99999952316284,
+ "z": "6e499246.1345bc",
"wires": [
[
- "b8464fa4.268c7"
+ "2a49b970.30fb16"
]
]
},
{
- "id": "b8464fa4.268c7",
+ "id": "2a49b970.30fb16",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 900.4287338256836,
- "y": 243.55668926239014,
- "z": "1f04287d.306418",
+ "x": 974.4326171875,
+ "y": 188.14291715621948,
+ "z": "6e499246.1345bc",
"wires": []
},
{
- "id": "7275fe1.35167",
+ "id": "5c4cd934.c95538",
"type": "switchNode",
"name": "switch this vnf-id == input vnf-id",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\"> \n",
"comments": "",
"outputs": 1,
- "x": 789.0000228881836,
- "y": 305.41377782821655,
- "z": "1f04287d.306418",
+ "x": 863.00390625,
+ "y": 250.0000057220459,
+ "z": "6e499246.1345bc",
"wires": [
[
- "2f21af21.529ff"
+ "2a4d20b9.66aac"
]
]
},
{
- "id": "2f21af21.529ff",
+ "id": "2a4d20b9.66aac",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1004.0000076293945,
- "y": 303.4137716293335,
- "z": "1f04287d.306418",
+ "x": 1078.003890991211,
+ "y": 247.99999952316284,
+ "z": "6e499246.1345bc",
"wires": [
[
- "a1139d12.89e01"
+ "991cadde.a1c2"
]
]
},
{
- "id": "a1139d12.89e01",
+ "id": "991cadde.a1c2",
"type": "set",
"name": "set vnf-index",
"xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
"comments": "",
- "x": 1168.0000076293945,
- "y": 298.4137716293335,
- "z": "1f04287d.306418",
+ "x": 1242.003890991211,
+ "y": 242.99999952316284,
+ "z": "6e499246.1345bc",
"wires": []
},
{
- "id": "2040df5d.c513d",
+ "id": "4d09affd.63ec7",
"type": "switchNode",
"name": "switch vf-modules.vf-module_length",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 637.0000419616699,
- "y": 381.4137964248657,
- "z": "1f04287d.306418",
+ "x": 692.0039405822754,
+ "y": 391.00002348423004,
+ "z": "6e499246.1345bc",
"wires": [
[
- "6da138cf.958678",
- "2a607157.3c86fe",
- "9b455cd1.ad8b9"
+ "7db8009f.80aa9",
+ "7fce8758.381048",
+ "58a4a3cc.ac1abc"
]
]
},
{
- "id": "2a607157.3c86fe",
+ "id": "7fce8758.381048",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 859.0000343322754,
- "y": 415.4138059616089,
- "z": "1f04287d.306418",
+ "x": 914.0039329528809,
+ "y": 425.0000330209732,
+ "z": "6e499246.1345bc",
"wires": [
[
- "9e4075b3.63ff28"
+ "c31ea383.0d2c3"
]
]
},
{
- "id": "6da138cf.958678",
+ "id": "7db8009f.80aa9",
"type": "outcome",
"name": "0",
"xml": "<outcome value='0'>\n",
"comments": "",
"outputs": 1,
- "x": 864.0000305175781,
- "y": 362.41380500793457,
- "z": "1f04287d.306418",
+ "x": 919.0039291381836,
+ "y": 372.0000320672989,
+ "z": "6e499246.1345bc",
"wires": [
[
- "9e4075b3.63ff28"
+ "c31ea383.0d2c3"
]
]
},
{
- "id": "9e4075b3.63ff28",
+ "id": "c31ea383.0d2c3",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 1022.0000343322754,
- "y": 375.4138059616089,
- "z": "1f04287d.306418",
+ "x": 1077.0039329528809,
+ "y": 385.0000330209732,
+ "z": "6e499246.1345bc",
"wires": []
},
{
- "id": "9b455cd1.ad8b9",
+ "id": "58a4a3cc.ac1abc",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 859.0000343322754,
- "y": 476.4138059616089,
- "z": "1f04287d.306418",
+ "x": 914.0039329528809,
+ "y": 486.0000330209732,
+ "z": "6e499246.1345bc",
"wires": [
[
- "76d683a5.eebfec"
+ "d3465076.36c57"
]
]
},
{
- "id": "3f214675.09ba1a",
+ "id": "b0e78257.0ab82",
"type": "set",
"name": "set vf-module_length",
"xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",
"comments": "",
- "x": 1213.0000495910645,
- "y": 474.41381990909576,
- "z": "1f04287d.306418",
+ "x": 1268.00394821167,
+ "y": 484.0000469684601,
+ "z": "6e499246.1345bc",
"wires": []
},
{
- "id": "76d683a5.eebfec",
+ "id": "d3465076.36c57",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1020.0000801086426,
- "y": 473.41379737854004,
- "z": "1f04287d.306418",
+ "x": 1075.003978729248,
+ "y": 483.00002443790436,
+ "z": "6e499246.1345bc",
"wires": [
[
- "3f214675.09ba1a",
- "42fcda16.d37964"
+ "b0e78257.0ab82",
+ "d9692dd.614b9d"
]
]
},
{
- "id": "42fcda16.d37964",
+ "id": "d9692dd.614b9d",
"type": "for",
"name": "for each existing vf-index",
"xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1232.0000190734863,
- "y": 527.4137964248657,
- "z": "1f04287d.306418",
+ "x": 1287.0039176940918,
+ "y": 537.00002348423,
+ "z": "6e499246.1345bc",
"wires": [
[
- "9de7c553.fd25f8"
+ "45a4bb37.a28924"
]
]
},
{
- "id": "9de7c553.fd25f8",
+ "id": "45a4bb37.a28924",
"type": "switchNode",
"name": "switch vf-module-id found",
"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",
"comments": "",
"outputs": 1,
- "x": 1503.0000381469727,
- "y": 528.4138336181641,
- "z": "1f04287d.306418",
+ "x": 1558.0039367675781,
+ "y": 538.0000606775284,
+ "z": "6e499246.1345bc",
"wires": [
[
- "f61f0e52.12de6"
+ "a0aa45d1.8fe618"
]
]
},
{
- "id": "f61f0e52.12de6",
+ "id": "a0aa45d1.8fe618",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1716.0001621246338,
- "y": 515.4138031005859,
- "z": "1f04287d.306418",
+ "x": 1771.0040607452393,
+ "y": 525.0000301599503,
+ "z": "6e499246.1345bc",
"wires": [
[
- "cf9e9748.fd3478"
+ "e8f5881c.0d1318"
]
]
},
{
- "id": "cf9e9748.fd3478",
+ "id": "e8f5881c.0d1318",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1868.0001335144043,
- "y": 517.4137964248657,
- "z": "1f04287d.306418",
+ "x": 1923.0040321350098,
+ "y": 527.00002348423,
+ "z": "6e499246.1345bc",
"wires": [
[
- "1f23fa4e.25db46",
- "5446fb0a.a3b5a4",
- "71d1f1bd.544fb"
+ "f7c8637f.374ce",
+ "c9be57ad.3da878",
+ "26312e31.67daa2"
]
]
},
{
- "id": "1f23fa4e.25db46",
+ "id": "f7c8637f.374ce",
"type": "set",
"name": "set tmp.vidx and ctx.vnf-data",
"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",
"comments": "",
- "x": 2090.0001335144043,
- "y": 513.4137964248657,
- "z": "1f04287d.306418",
+ "x": 2145.0040321350098,
+ "y": 523.00002348423,
+ "z": "6e499246.1345bc",
"wires": []
},
{
- "id": "5446fb0a.a3b5a4",
+ "id": "c9be57ad.3da878",
"type": "set",
"name": "set vf-module-request-input.",
"xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",
"comments": "",
- "x": 2096.0001335144043,
- "y": 562.4137964248657,
- "z": "1f04287d.306418",
+ "x": 2151.0040321350098,
+ "y": 572.00002348423,
+ "z": "6e499246.1345bc",
"wires": []
},
{
- "id": "71d1f1bd.544fb",
+ "id": "26312e31.67daa2",
"type": "call",
"name": "call sdwan-get-vf-module-lan-param",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lan-param' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2124.0003547668457,
- "y": 610.4138021469116,
- "z": "1f04287d.306418",
+ "x": 2179.004253387451,
+ "y": 620.0000292062759,
+ "z": "6e499246.1345bc",
"wires": [
[]
]
},
{
- "id": "58084a37.394334",
+ "id": "158609f4.fc8936",
"type": "switchNode",
"name": "switch tmp.vidx ",
"xml": "<switch test=\"`$tmp.vidx`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 576.0312538146973,
- "y": 554.4298791885376,
- "z": "1f04287d.306418",
+ "x": 631.0351524353027,
+ "y": 564.0161062479019,
+ "z": "6e499246.1345bc",
"wires": [
[
- "a8fd4f02.a0c39"
+ "cbb03bf0.425b98"
]
]
},
{
- "id": "a8fd4f02.a0c39",
+ "id": "cbb03bf0.425b98",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 723.4598960876465,
- "y": 554.0012893676758,
- "z": "1f04287d.306418",
+ "x": 778.463794708252,
+ "y": 563.5875164270401,
+ "z": "6e499246.1345bc",
"wires": [
[
- "e19c0822.f14e78"
+ "6af4136a.19a86c"
]
]
},
{
- "id": "e19c0822.f14e78",
+ "id": "6af4136a.19a86c",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 872.8886222839355,
- "y": 555.1442070007324,
- "z": "1f04287d.306418",
+ "x": 927.892520904541,
+ "y": 564.7304340600967,
+ "z": "6e499246.1345bc",
"wires": []
},
{
- "id": "8cf55d8b.9b86e",
+ "id": "7132f9a1.7bd008",
"type": "switchNode",
"name": "switch vf-module-oper-status",
"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",
"comments": "",
"outputs": 1,
- "x": 620.3294143676758,
- "y": 624.7470846176147,
- "z": "1f04287d.306418",
+ "x": 675.3333129882812,
+ "y": 634.3333116769791,
+ "z": "6e499246.1345bc",
"wires": [
[
- "56dc0c78.140284",
- "7bad1343.8cb25c"
+ "32ea7a53.265046",
+ "d6d3b52a.3f5ab8"
]
]
},
{
- "id": "56dc0c78.140284",
+ "id": "32ea7a53.265046",
"type": "outcome",
"name": "outcome PendingDelete",
"xml": "<outcome value='PendingDelete'>\n",
"comments": "",
"outputs": 1,
- "x": 911.1626815795898,
- "y": 628.8582077026367,
- "z": "1f04287d.306418",
+ "x": 966.1665802001953,
+ "y": 638.444434762001,
+ "z": "6e499246.1345bc",
"wires": [
[
- "27edf28.129770e"
+ "6b31ad53.5727b4"
]
]
},
{
- "id": "7bad1343.8cb25c",
+ "id": "d6d3b52a.3f5ab8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 878.1628189086914,
- "y": 680.8582603931427,
- "z": "1f04287d.306418",
+ "x": 933.1667175292969,
+ "y": 690.444487452507,
+ "z": "6e499246.1345bc",
"wires": [
[
- "ea590f8e.65b32"
+ "148355e2.614e0a"
]
]
},
{
- "id": "ea590f8e.65b32",
+ "id": "148355e2.614e0a",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",
"comments": "",
- "x": 1037.6625862121582,
- "y": 683.8582594394684,
- "z": "1f04287d.306418",
+ "x": 1092.6664848327637,
+ "y": 693.4444864988327,
+ "z": "6e499246.1345bc",
"wires": []
},
{
- "id": "27edf28.129770e",
+ "id": "6b31ad53.5727b4",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1108.469081878662,
- "y": 639.1833620071411,
- "z": "1f04287d.306418",
+ "x": 1163.4729804992676,
+ "y": 648.7695890665054,
+ "z": "6e499246.1345bc",
"wires": [
[]
]
},
{
- "id": "9d1a9cea.dd56",
+ "id": "13d12ad9.b40a25",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
"comments": "",
- "x": 591.4406318664551,
- "y": 1071.635935306549,
- "z": "1f04287d.306418",
+ "x": 646.4445304870605,
+ "y": 1081.2221623659134,
+ "z": "6e499246.1345bc",
"wires": []
},
{
- "id": "c5683ab4.530598",
+ "id": "71b32013.3584b",
"type": "set",
"name": "set prop.vnfNewidx",
"xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",
"comments": "",
- "x": 598.5272789001465,
- "y": 695.7472534179688,
- "z": "1f04287d.306418",
+ "x": 653.531177520752,
+ "y": 705.3334804773331,
+ "z": "6e499246.1345bc",
"wires": []
},
{
- "id": "49881624.abb0c8",
+ "id": "50901066.93c6f",
"type": "for",
"name": "for lidx..service-data.vf-modules.vf-module[]",
"xml": "<for index='lidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 674.5271987915039,
- "y": 749.7471284866333,
- "z": "1f04287d.306418",
+ "x": 729.5310974121094,
+ "y": 759.3333555459976,
+ "z": "6e499246.1345bc",
"wires": [
[
- "3538a71e.fcff88"
+ "18389e8.0583e62"
]
]
},
{
- "id": "6f98bfc7.8211a",
+ "id": "379a2e2e.3a8382",
"type": "set",
"name": "set new vnf length",
"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",
"comments": "",
- "x": 598.6285705566406,
- "y": 802.5513463020325,
- "z": "1f04287d.306418",
+ "x": 653.6324691772461,
+ "y": 812.1375733613968,
+ "z": "6e499246.1345bc",
"wires": []
},
{
- "id": "d5b959e7.7e0cc8",
+ "id": "c59a5d45.5b06a",
"type": "set",
"name": "Remove vnf from ServiceData",
"xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].\" value=\"\"/>\n",
"comments": "",
- "x": 639.5272369384766,
- "y": 849.7472591400146,
- "z": "1f04287d.306418",
+ "x": 694.531135559082,
+ "y": 859.333486199379,
+ "z": "6e499246.1345bc",
"wires": []
},
{
- "id": "3538a71e.fcff88",
+ "id": "18389e8.0583e62",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 934.5271892547607,
- "y": 756.7469882965088,
- "z": "1f04287d.306418",
+ "x": 989.5310878753662,
+ "y": 766.3332153558731,
+ "z": "6e499246.1345bc",
"wires": [
[
- "10631fee.66247"
+ "a366647e.22aaf8"
]
]
},
{
- "id": "d3e08866.ee2d18",
+ "id": "4315ff0e.d57d4",
"type": "delete",
"name": "delete lanport vf instance configuration in AAI",
- "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",
+ "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",
"comments": "",
"outputs": 1,
- "x": 673.5276069641113,
- "y": 1019.008641242981,
- "z": "1f04287d.306418",
+ "x": 728.5315055847168,
+ "y": 1028.5948683023453,
+ "z": "6e499246.1345bc",
"wires": [
[]
]
},
{
- "id": "10631fee.66247",
+ "id": "a366647e.22aaf8",
"type": "switchNode",
"name": "switch vnf-id found",
"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",
"comments": "",
"outputs": 1,
- "x": 1120.527256011963,
- "y": 756.7471489906311,
- "z": "1f04287d.306418",
+ "x": 1175.5311546325684,
+ "y": 766.3333760499954,
+ "z": "6e499246.1345bc",
"wires": [
[
- "5f2f4339.fa3b9c"
+ "c7c20dda.52c1b"
]
]
},
{
- "id": "5f2f4339.fa3b9c",
+ "id": "c7c20dda.52c1b",
"type": "outcomeFalse",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1289.5272636413574,
- "y": 755.7469863891602,
- "z": "1f04287d.306418",
+ "x": 1344.531162261963,
+ "y": 765.3332134485245,
+ "z": "6e499246.1345bc",
"wires": [
[
- "282bbccf.a76394"
+ "72fa222d.49f9ac"
]
]
},
{
- "id": "282bbccf.a76394",
+ "id": "72fa222d.49f9ac",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1443.527102470398,
- "y": 747.7469873428345,
- "z": "1f04287d.306418",
+ "x": 1498.5310010910034,
+ "y": 757.3332144021988,
+ "z": "6e499246.1345bc",
"wires": [
[
- "15dd9ec6.9cd7d1",
- "810eaf7a.70186"
+ "ed2c94b0.3c96e8",
+ "f18820dc.cc2b"
]
]
},
{
- "id": "15dd9ec6.9cd7d1",
+ "id": "ed2c94b0.3c96e8",
"type": "set",
"name": "set vnf data",
"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",
"comments": "",
- "x": 1608.5271978378296,
- "y": 722.747142791748,
- "z": "1f04287d.306418",
+ "x": 1663.531096458435,
+ "y": 732.3333698511124,
+ "z": "6e499246.1345bc",
"wires": []
},
{
- "id": "810eaf7a.70186",
+ "id": "f18820dc.cc2b",
"type": "set",
"name": "set prop.vnfNewidx",
"xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",
"comments": "",
- "x": 1630.5271978378296,
- "y": 778.747106552124,
- "z": "1f04287d.306418",
+ "x": 1685.531096458435,
+ "y": 788.3333336114883,
+ "z": "6e499246.1345bc",
"wires": []
},
{
- "id": "b57e1a43.a54548",
+ "id": "6e5f86e6.881a38",
"type": "set",
"name": "set vf-module-object-path",
"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",
"comments": "",
- "x": 615.3294677734375,
- "y": 966.0804300308228,
- "z": "1f04287d.306418",
+ "x": 670.333366394043,
+ "y": 975.6666570901871,
+ "z": "6e499246.1345bc",
"wires": []
},
{
- "id": "eeeb55b5.4909d8",
+ "id": "8ba40e29.5c2bb",
"type": "set",
"name": "Remove vnf from ServiceData",
"xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].\" value=\"\"/>\n",
"comments": "",
- "x": 629.3333129882812,
- "y": 900,
- "z": "1f04287d.306418",
+ "x": 684.3372116088867,
+ "y": 909.5862270593643,
+ "z": "6e499246.1345bc",
+ "wires": []
+ },
+ {
+ "id": "cd89e451.16b298",
+ "type": "switchNode",
+ "name": "switch vnf-index",
+ "xml": "<switch test='`$vnf-index`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 649.00390625,
+ "y": 314.00390625,
+ "z": "6e499246.1345bc",
+ "wires": [
+ [
+ "ccd2db16.3151b8"
+ ]
+ ]
+ },
+ {
+ "id": "ccd2db16.3151b8",
+ "type": "other",
+ "name": "Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 811.0039520263672,
+ "y": 313.0039052963257,
+ "z": "6e499246.1345bc",
+ "wires": [
+ [
+ "2eb95e60.9609a2"
+ ]
+ ]
+ },
+ {
+ "id": "2eb95e60.9609a2",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf id not found in service-data\" />\n",
+ "comments": "",
+ "x": 960.2540435791016,
+ "y": 310.78178310394287,
+ "z": "6e499246.1345bc",
"wires": []
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json index 475c093d..58dcb220 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json @@ -1,37 +1,35 @@ [
{
- "id": "2464f2e7.0e2fce",
+ "id": "86705660.0abdc8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 450.00390625,
- "y": 347.0000014305115,
- "z": "4e5f9446.b42e3c",
+ "x": 476.00390625,
+ "y": 401.9999997615814,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "32c4b65c.2d59aa",
- "5509b148.13914",
- "aad7e68e.3b6ca8",
- "94574a55.b19c88",
- "7de1d3e.65c652c",
- "7b54ca79.4bc724",
- "e23c49d7.715338",
- "a50b2df2.ad39e",
- "e9af352a.620918",
- "bbeb53a3.c2576",
- "37a48c20.31bdf4",
- "c012bd48.a280b",
- "3e34e572.c1fb4a",
- "83fb72db.90602",
- "370a2393.20ff3c"
+ "33a55b62.a48504",
+ "c9956259.20d27",
+ "92e109fc.d487c8",
+ "fa6a2af9.45d408",
+ "96b8a138.b9de9",
+ "1072d79c.c97df8",
+ "7fb4c42e.fff1cc",
+ "8252c529.c8dc08",
+ "d1676675.1b3088",
+ "80911d80.565f6",
+ "f1c0f2fa.5d8e8",
+ "69439d08.c30934",
+ "a6352f7.5aa86d"
]
]
},
{
- "id": "4af2ac42.490d34",
+ "id": "4414eba1.be7024",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -39,614 +37,512 @@ "comments": "",
"xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
"outputs": 1,
- "x": 292.00392150878906,
- "y": 130.99999284744263,
- "z": "4e5f9446.b42e3c",
+ "x": 318.00392150878906,
+ "y": 185.99999117851257,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "5b6c766c.98d2a8"
+ "665e6349.0f20bc"
]
]
},
{
- "id": "5b6c766c.98d2a8",
+ "id": "665e6349.0f20bc",
"type": "method",
"name": "sdwan-vf-operation-vpn-create",
"xml": "<method rpc='sdwan-vf-operation-vpn-create' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 291.00392150878906,
- "y": 230.99999284744263,
- "z": "4e5f9446.b42e3c",
+ "x": 317.00392150878906,
+ "y": 285.9999911785126,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "2464f2e7.0e2fce"
+ "86705660.0abdc8"
]
]
},
{
- "id": "4418c0ab.c80bf",
+ "id": "c5e65dcf.93a1d",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 121.50392150878906,
- "y": 42.00000047683716,
- "z": "4e5f9446.b42e3c",
+ "x": 147.50392150878906,
+ "y": 96.9999988079071,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "4af2ac42.490d34"
+ "4414eba1.be7024"
]
]
},
{
- "id": "32c4b65c.2d59aa",
- "type": "for",
- "name": "for each vnf",
- "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 750.3333282470703,
- "y": 238.4961256980896,
- "z": "4e5f9446.b42e3c",
- "wires": [
- [
- "3161e290.49fc4e"
- ]
- ]
- },
- {
- "id": "3161e290.49fc4e",
- "type": "switchNode",
- "name": "switch this vnf-id == input vnf-id",
- "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\"> \n",
- "comments": "",
- "outputs": 1,
- "x": 1002.3334197998047,
- "y": 237.16278886795044,
- "z": "4e5f9446.b42e3c",
- "wires": [
- [
- "5b45671f.cd82a8"
- ]
- ]
- },
- {
- "id": "e5b08bcc.460cf8",
- "type": "set",
- "name": "set vnf-index",
- "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n\n",
- "comments": "",
- "x": 1373.9999084472656,
- "y": 239.1627917289734,
- "z": "4e5f9446.b42e3c",
- "wires": []
- },
- {
- "id": "5b45671f.cd82a8",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1220.6667366027832,
- "y": 239.16277074813843,
- "z": "4e5f9446.b42e3c",
- "wires": [
- [
- "e5b08bcc.460cf8"
- ]
- ]
- },
- {
- "id": "94574a55.b19c88",
+ "id": "c9956259.20d27",
"type": "for",
"name": "for loop idx - VF input parameters",
"xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 824.2541122436523,
- "y": 460.6666588783264,
- "z": "4e5f9446.b42e3c",
+ "x": 851.2541379928589,
+ "y": 410.66667890548706,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "213647dd.26e428"
+ "5f7e52d8.71003c"
]
]
},
{
- "id": "213647dd.26e428",
+ "id": "5f7e52d8.71003c",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1039.032455444336,
- "y": 458.22224283218384,
- "z": "4e5f9446.b42e3c",
+ "x": 1066.0324811935425,
+ "y": 408.2222628593445,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "501e761.bc5eb88",
- "76a61aa5.aca9e4"
+ "b5888647.1272c8",
+ "f88a8224.ffbd4"
]
]
},
{
- "id": "501e761.bc5eb88",
+ "id": "b5888647.1272c8",
"type": "execute",
"name": "execute split parameterName",
"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",
"comments": "",
"outputs": 1,
- "x": 1235.2886581420898,
- "y": 435.9703812599182,
- "z": "4e5f9446.b42e3c",
+ "x": 1262.2886838912964,
+ "y": 385.97040128707886,
+ "z": "12e5b519.7c42cb",
"wires": [
[]
]
},
{
- "id": "76a61aa5.aca9e4",
+ "id": "f88a8224.ffbd4",
"type": "set",
"name": "set parameterName",
"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",
"comments": "",
- "x": 1204.7330856323242,
- "y": 472.9704976081848,
- "z": "4e5f9446.b42e3c",
+ "x": 1231.7331113815308,
+ "y": 422.97051763534546,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "801b9de7.f8983",
+ "id": "84649b93.490df8",
"type": "comment",
"name": "Take the parameter names by removing prefix",
"info": "",
"comments": "",
- "x": 1208.2543144226074,
- "y": 395.333327293396,
- "z": "4e5f9446.b42e3c",
- "wires": []
- },
- {
- "id": "5509b148.13914",
- "type": "switchNode",
- "name": "switch vnf_length",
- "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
- "comments": "",
- "outputs": 1,
- "x": 764.7539215087891,
- "y": 193.99999475479126,
- "z": "4e5f9446.b42e3c",
- "wires": [
- [
- "1afa6ba0.b560d4"
- ]
- ]
- },
- {
- "id": "1afa6ba0.b560d4",
- "type": "other",
- "name": "NULL",
- "xml": "<outcome value=''>\n",
- "comments": "",
- "outputs": 1,
- "x": 951.4206008911133,
- "y": 193.33329248428345,
- "z": "4e5f9446.b42e3c",
- "wires": [
- [
- "f6ded972.6369c8"
- ]
- ]
- },
- {
- "id": "f6ded972.6369c8",
- "type": "returnFailure",
- "name": "return failure",
- "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",
- "comments": "",
- "x": 1133.0872268676758,
- "y": 193.33329248428345,
- "z": "4e5f9446.b42e3c",
+ "x": 1235.254340171814,
+ "y": 345.33334732055664,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "aad7e68e.3b6ca8",
+ "id": "33a55b62.a48504",
"type": "switchNode",
"name": "switch vf-modules.vf-module_length",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 806.0039110183716,
- "y": 313.9999957084656,
- "z": "4e5f9446.b42e3c",
+ "x": 833.0039367675781,
+ "y": 264.0000157356262,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "e139df7a.80637",
- "caf10502.734168"
+ "5e528a3d.403a94",
+ "e1430919.889a48"
]
]
},
{
- "id": "e139df7a.80637",
+ "id": "5e528a3d.403a94",
"type": "other",
"name": "Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1037.003921508789,
- "y": 289.9999928474426,
- "z": "4e5f9446.b42e3c",
+ "x": 1064.0039472579956,
+ "y": 240.00001287460327,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "b4a2933f.20169"
+ "d1fe70de.0d5a2"
]
]
},
{
- "id": "caf10502.734168",
+ "id": "e1430919.889a48",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1037.003921508789,
- "y": 329.9999928474426,
- "z": "4e5f9446.b42e3c",
+ "x": 1064.0039472579956,
+ "y": 280.00001287460327,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "63770f1.c37c1f"
+ "550ac6cc.1a43f8"
]
]
},
{
- "id": "b4a2933f.20169",
+ "id": "d1fe70de.0d5a2",
"type": "set",
"name": "set vf-index",
"xml": "<set>\n<parameter name='vf-index' value='0' />\n",
"comments": "",
- "x": 1179.503921508789,
- "y": 289.9999928474426,
- "z": "4e5f9446.b42e3c",
+ "x": 1206.5039472579956,
+ "y": 240.00001287460327,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "63770f1.c37c1f",
+ "id": "550ac6cc.1a43f8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1181.3609657287598,
- "y": 329.93650484085083,
- "z": "4e5f9446.b42e3c",
+ "x": 1208.3609914779663,
+ "y": 279.9365248680115,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "82e73ea.9f6d1c",
- "facab090.c3497"
+ "2b30e41b.b2df2c",
+ "735539ef.d045e8"
]
]
},
{
- "id": "facab090.c3497",
+ "id": "735539ef.d045e8",
"type": "set",
"name": "set vf-index",
"xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",
"comments": "",
- "x": 1334.059440612793,
- "y": 299.55560353351757,
- "z": "4e5f9446.b42e3c",
+ "x": 1361.0594663619995,
+ "y": 249.5556235606782,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "82e73ea.9f6d1c",
+ "id": "2b30e41b.b2df2c",
"type": "for",
"name": "for each existing vf-index",
"xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
"comments": "",
"outputs": 1,
- "x": 1390.4879455566406,
- "y": 352.77773332595825,
- "z": "4e5f9446.b42e3c",
+ "x": 1417.4879713058472,
+ "y": 302.7777533531189,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "df7833b0.b66c4"
+ "e7001097.30f29"
]
]
},
{
- "id": "f1cb1fc.e0fb2e",
+ "id": "87bb5bc0.359988",
"type": "comment",
"name": "make sure this network doesn't exist already",
"info": "",
"comments": "",
- "x": 1614.1386756896973,
- "y": 311.0317907333374,
- "z": "4e5f9446.b42e3c",
+ "x": 1641.1387014389038,
+ "y": 261.03181076049805,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "df7833b0.b66c4",
+ "id": "e7001097.30f29",
"type": "switchNode",
"name": "switch vf-module-id found",
"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",
"comments": "",
"outputs": 1,
- "x": 1665.773666381836,
- "y": 352.3492360115051,
- "z": "4e5f9446.b42e3c",
+ "x": 1692.7736921310425,
+ "y": 302.34925603866577,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "f0bc8641.c01b88"
+ "c77c794f.c68788"
]
]
},
{
- "id": "f0bc8641.c01b88",
+ "id": "c77c794f.c68788",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1566.50386428833,
- "y": 410.92066717147827,
- "z": "4e5f9446.b42e3c",
+ "x": 1593.5038900375366,
+ "y": 360.9206871986389,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "ac9ea707.076ba8"
+ "1ae23876.21a108"
]
]
},
{
- "id": "ac9ea707.076ba8",
+ "id": "1ae23876.21a108",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",
"comments": "",
- "x": 1714.2539672851562,
- "y": 410.7778592403047,
- "z": "4e5f9446.b42e3c",
+ "x": 1741.2539930343628,
+ "y": 360.7778792674653,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "a50b2df2.ad39e",
+ "id": "1072d79c.c97df8",
"type": "set",
"name": "copy input data to service data",
"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",
"comments": "",
- "x": 819.8571014404297,
- "y": 763.4962468147278,
- "z": "4e5f9446.b42e3c",
+ "x": 846.8571271896362,
+ "y": 713.4962668418884,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "e23c49d7.715338",
+ "id": "96b8a138.b9de9",
"type": "execute",
"name": "execute generate-vf-module-index",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-vf-index\"/>\n",
"comments": "",
"outputs": 1,
- "x": 831.190673828125,
- "y": 716.1629490852356,
- "z": "4e5f9446.b42e3c",
+ "x": 858.1906995773315,
+ "y": 666.1629691123962,
+ "z": "12e5b519.7c42cb",
"wires": [
[]
]
},
{
- "id": "7b54ca79.4bc724",
+ "id": "fa6a2af9.45d408",
"type": "set",
"name": "set new vf-module_length",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",
"comments": "",
- "x": 803.1907348632812,
- "y": 667.1629490852356,
- "z": "4e5f9446.b42e3c",
+ "x": 830.1907606124878,
+ "y": 617.1629691123962,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "7de1d3e.65c652c",
+ "id": "92e109fc.d487c8",
"type": "set",
"name": "set vf-module-request-input.",
"xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",
"comments": "",
- "x": 803.1902618408203,
- "y": 613.1542372703552,
- "z": "4e5f9446.b42e3c",
+ "x": 830.1902875900269,
+ "y": 563.1542572975159,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "e9af352a.620918",
+ "id": "7fb4c42e.fff1cc",
"type": "set",
"name": "set vf-module-level-oper-status",
"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`' />",
"comments": "",
- "x": 813.5040893554688,
- "y": 861.0000678896904,
- "z": "4e5f9446.b42e3c",
+ "x": 840.5041151046753,
+ "y": 811.000087916851,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "83fb72db.90602",
+ "id": "69439d08.c30934",
"type": "save",
"name": "save sdwan vpn resource in AAI",
"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",
"comments": "",
"outputs": 1,
- "x": 820.0039501190186,
- "y": 906.5000157356262,
- "z": "4e5f9446.b42e3c",
+ "x": 847.0039758682251,
+ "y": 856.5000357627869,
+ "z": "12e5b519.7c42cb",
"wires": [
[]
]
},
{
- "id": "bbeb53a3.c2576",
+ "id": "8252c529.c8dc08",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
"comments": "",
- "x": 767.7264232635498,
- "y": 999.673906326294,
- "z": "4e5f9446.b42e3c",
+ "x": 794.7264490127563,
+ "y": 949.6739263534546,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "37a48c20.31bdf4",
+ "id": "d1676675.1b3088",
"type": "for",
"name": "for loop i - Network input parameters",
"xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
"comments": "",
"outputs": 1,
- "x": 831.2578277587891,
- "y": 549.5039067268372,
- "z": "4e5f9446.b42e3c",
+ "x": 858.2578535079956,
+ "y": 499.5039267539978,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "4c79fd81.204e24"
+ "63318660.a4e798"
]
]
},
{
- "id": "4c79fd81.204e24",
+ "id": "63318660.a4e798",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1118.4807052612305,
- "y": 549.7262206077576,
- "z": "4e5f9446.b42e3c",
+ "x": 1145.480731010437,
+ "y": 499.7262406349182,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "6ee57e2b.017f1",
- "6d15949f.a4f72c"
+ "1e3ec759.b2be29",
+ "bfacfb85.875b78"
]
]
},
{
- "id": "6ee57e2b.017f1",
+ "id": "1e3ec759.b2be29",
"type": "switchNode",
"name": "switch name",
"xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 1306.702548980713,
- "y": 532.0595247745514,
- "z": "4e5f9446.b42e3c",
+ "x": 1333.7025747299194,
+ "y": 482.05954480171204,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "3f65f879.eac058"
+ "4c3c07dc.109bb8"
]
]
},
{
- "id": "6d15949f.a4f72c",
+ "id": "bfacfb85.875b78",
"type": "switchNode",
"name": "switch topology",
"xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'topology'`\">",
"comments": "",
"outputs": 1,
- "x": 1317.5422096252441,
- "y": 572.0595228672028,
- "z": "4e5f9446.b42e3c",
+ "x": 1344.5422353744507,
+ "y": 522.0595428943634,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "a2b79be1.ed04c8"
+ "8910bf6.fa8bd4"
]
]
},
{
- "id": "3f65f879.eac058",
+ "id": "4c3c07dc.109bb8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1493.702548980713,
- "y": 528.0595247745514,
- "z": "4e5f9446.b42e3c",
+ "x": 1520.7025747299194,
+ "y": 478.05954480171204,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "2305c57e.8cca7a"
+ "330c74f0.0fa8ac"
]
]
},
{
- "id": "a2b79be1.ed04c8",
+ "id": "8910bf6.fa8bd4",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1487.5422096252441,
- "y": 568.0595228672028,
- "z": "4e5f9446.b42e3c",
+ "x": 1514.5422353744507,
+ "y": 518.0595428943634,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "4726038d.e1157c"
+ "c760e70.ca63518"
]
]
},
{
- "id": "2305c57e.8cca7a",
+ "id": "330c74f0.0fa8ac",
"type": "set",
"name": "set name",
"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",
"comments": "",
- "x": 1643.70267868042,
- "y": 526.6595313549042,
- "z": "4e5f9446.b42e3c",
+ "x": 1670.7027044296265,
+ "y": 476.6595513820648,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "4726038d.e1157c",
+ "id": "c760e70.ca63518",
"type": "set",
"name": "set topology",
"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",
"comments": "",
- "x": 1674.8756504058838,
- "y": 566.5206797122955,
- "z": "4e5f9446.b42e3c",
+ "x": 1701.8756761550903,
+ "y": 516.5206997394562,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "c012bd48.a280b",
+ "id": "80911d80.565f6",
"type": "call",
"name": "call GENERIC-RESOURCE-API:validate-sdwan-vf-vpn-input-parameters",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 932.5078277587891,
- "y": 139.00390672683716,
- "z": "4e5f9446.b42e3c",
+ "x": 954.5077972412109,
+ "y": 190.0039086341858,
+ "z": "12e5b519.7c42cb",
"wires": [
[]
]
},
{
- "id": "3e34e572.c1fb4a",
+ "id": "f1c0f2fa.5d8e8",
"type": "set",
"name": "set vf-module-object-path",
"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",
"comments": "",
- "x": 805.5039672851562,
- "y": 812.0312873721123,
- "z": "4e5f9446.b42e3c",
+ "x": 832.5039930343628,
+ "y": 762.0313073992729,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "370a2393.20ff3c",
+ "id": "a6352f7.5aa86d",
"type": "save",
"name": "save service relationship in AAI",
"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",
"comments": "",
"outputs": 1,
- "x": 820.0040283203125,
- "y": 954.000156879425,
- "z": "4e5f9446.b42e3c",
+ "x": 847.004054069519,
+ "y": 904.0001769065857,
+ "z": "12e5b519.7c42cb",
"wires": [
[]
]
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json index b0816734..c5e1d74e 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json @@ -1,20 +1,20 @@ [
{
- "id": "d157ce03.c3288",
+ "id": "565ee583.5719ac",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 129,
- "y": 64,
- "z": "87aefe66.c6e82",
+ "x": 120.00390625,
+ "y": 61.00390625,
+ "z": "c09ce476.40c538",
"wires": [
[
- "5ddc2216.ec964c"
+ "2253fb6a.010fd4"
]
]
},
{
- "id": "5ddc2216.ec964c",
+ "id": "2253fb6a.010fd4",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,1284 +22,1328 @@ "comments": "",
"xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
"outputs": 1,
- "x": 374.2857131958008,
- "y": 63.23807907104492,
- "z": "87aefe66.c6e82",
+ "x": 365.2896194458008,
+ "y": 60.24198532104492,
+ "z": "c09ce476.40c538",
"wires": [
[
- "e97f46cc.0059c8"
+ "d1afaf4b.7367a"
]
]
},
{
- "id": "e97f46cc.0059c8",
+ "id": "d1afaf4b.7367a",
"type": "method",
"name": "validate-sdwan-vf-vpn-input-parameters",
"xml": "<method rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 457.9166946411133,
- "y": 198.25301837921143,
- "z": "87aefe66.c6e82",
+ "x": 448.9206008911133,
+ "y": 195.25692462921143,
+ "z": "c09ce476.40c538",
"wires": [
[
- "94a6ae40.767b3"
+ "d3d09840.859ab8"
]
]
},
{
- "id": "94a6ae40.767b3",
+ "id": "d3d09840.859ab8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 741.9167022705078,
- "y": 186.25304317474365,
- "z": "87aefe66.c6e82",
+ "x": 732.9206085205078,
+ "y": 183.25694942474365,
+ "z": "c09ce476.40c538",
"wires": [
[
- "c1b9af78.ff38c",
- "5ab8336c.d30a1c",
- "26ecbd16.18b922",
- "f0d7fed2.a7f6e"
+ "8b6f9b12.95ea88",
+ "9c84b6f9.1f9628",
+ "257f53b6.ca8b0c",
+ "e33dc3b4.6bdba",
+ "fa0b83ce.07d0f"
]
]
},
{
- "id": "c1b9af78.ff38c",
+ "id": "8b6f9b12.95ea88",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 1001.916633605957,
- "y": 34.25303936004639,
- "z": "87aefe66.c6e82",
+ "x": 992.920539855957,
+ "y": 31.256945610046387,
+ "z": "c09ce476.40c538",
"wires": [
[
- "61401669.5d3bb8"
+ "c5870f3a.aab91"
]
]
},
{
- "id": "61401669.5d3bb8",
+ "id": "c5870f3a.aab91",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 1192.6309356689453,
- "y": 35.2530403137207,
- "z": "87aefe66.c6e82",
+ "x": 1183.6348419189453,
+ "y": 32.2569465637207,
+ "z": "c09ce476.40c538",
"wires": [
[
- "8deeb25a.a0c7a"
+ "255dc4d8.4591ac"
]
]
},
{
- "id": "8deeb25a.a0c7a",
+ "id": "255dc4d8.4591ac",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"sdnc-request-header.svc-request-id is a required input\" />\n",
"comments": "",
- "x": 1367.0594863891602,
- "y": 34.25303268432617,
- "z": "87aefe66.c6e82",
+ "x": 1358.0633926391602,
+ "y": 31.256938934326172,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "5ab8336c.d30a1c",
+ "id": "9c84b6f9.1f9628",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 338.9166564941406,
- "y": 457.2530336380005,
- "z": "87aefe66.c6e82",
+ "x": 329.9205627441406,
+ "y": 454.2569398880005,
+ "z": "c09ce476.40c538",
"wires": [
[
- "dd523414.2c6af8",
- "3ab9ebd9.cb15a4",
- "748e648b.48faec",
- "364e12f1.bd272e",
- "907aa46b.591888"
+ "4da03be9.a489d4",
+ "1cd623c5.d01cfc",
+ "11a6977d.d05489",
+ "fd6aa5e0.36c518",
+ "74577ecc.ef74c"
]
]
},
{
- "id": "dd523414.2c6af8",
+ "id": "4da03be9.a489d4",
"type": "outcome",
"name": "create",
"xml": "<outcome value='create'>\n",
"comments": "",
"outputs": 1,
- "x": 532.5000228881836,
- "y": 286.66667079925537,
- "z": "87aefe66.c6e82",
+ "x": 523.5039291381836,
+ "y": 283.67057704925537,
+ "z": "c09ce476.40c538",
"wires": [
[
- "b695319.fac5ed"
+ "b3001ec4.96f68"
]
]
},
{
- "id": "b695319.fac5ed",
+ "id": "b3001ec4.96f68",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 693.5000228881836,
- "y": 286.66667079925537,
- "z": "87aefe66.c6e82",
+ "x": 684.5039291381836,
+ "y": 283.67057704925537,
+ "z": "c09ce476.40c538",
"wires": [
[
- "1c93366e.75aada"
+ "8fa4b53.eb65f48"
]
]
},
{
- "id": "3ab9ebd9.cb15a4",
+ "id": "1cd623c5.d01cfc",
"type": "outcome",
"name": "deactivate",
"xml": "<outcome value='deactivate'>\n",
"comments": "",
"outputs": 1,
- "x": 505.4920120239258,
- "y": 895.428539276123,
- "z": "87aefe66.c6e82",
+ "x": 496.4959182739258,
+ "y": 892.432445526123,
+ "z": "c09ce476.40c538",
"wires": [
[
- "c38c9ea7.d32c"
+ "e6bca749.2ecd58"
]
]
},
{
- "id": "748e648b.48faec",
+ "id": "11a6977d.d05489",
"type": "outcome",
"name": "delete",
"xml": "<outcome value='delete'>\n",
"comments": "",
"outputs": 1,
- "x": 509.20639419555664,
- "y": 1066.1430969238281,
- "z": "87aefe66.c6e82",
+ "x": 500.21030044555664,
+ "y": 1063.1470031738281,
+ "z": "c09ce476.40c538",
"wires": [
[
- "cfdfa9d2.e72008"
+ "141627b0.510318"
]
]
},
{
- "id": "364e12f1.bd272e",
+ "id": "fd6aa5e0.36c518",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 508.9682846069336,
- "y": 1239.571382522583,
- "z": "87aefe66.c6e82",
+ "x": 499.9721908569336,
+ "y": 1236.575288772583,
+ "z": "c09ce476.40c538",
"wires": [
[
- "1c142ebe.8cdf21"
+ "1eabd7f1.a915e8"
]
]
},
{
- "id": "1c142ebe.8cdf21",
+ "id": "1eabd7f1.a915e8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
"comments": "",
- "x": 692.5398178100586,
- "y": 1240.190523147583,
- "z": "87aefe66.c6e82",
+ "x": 683.5437240600586,
+ "y": 1237.194429397583,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "1c93366e.75aada",
+ "id": "8fa4b53.eb65f48",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 894,
- "y": 284.6666797399521,
- "z": "87aefe66.c6e82",
+ "x": 885.00390625,
+ "y": 281.6705859899521,
+ "z": "c09ce476.40c538",
"wires": [
[
- "ee1d7ddd.46ad1",
- "3d1afbf1.1b7e64"
+ "1fcbac14.14ab84",
+ "5011e60c.42d288"
]
]
},
{
- "id": "ee1d7ddd.46ad1",
+ "id": "1fcbac14.14ab84",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 1079.4999923706055,
- "y": 312.66667652130127,
- "z": "87aefe66.c6e82",
+ "x": 1070.5038986206055,
+ "y": 309.67058277130127,
+ "z": "c09ce476.40c538",
"wires": [
[
- "efe7d43a.e3e608"
+ "bc3da556.5c5568"
]
]
},
{
- "id": "efe7d43a.e3e608",
+ "id": "bc3da556.5c5568",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"request-information.request-action is required to be SOTN CreateVPNNetworkInstance for svc-action=create\" />\n",
"comments": "",
- "x": 1230.0000228881836,
- "y": 306.66667079925537,
- "z": "87aefe66.c6e82",
+ "x": 1221.0039291381836,
+ "y": 303.67057704925537,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "2418184c.a14ab8",
+ "id": "967ffa6b.7cc5f8",
"type": "other",
"name": "DeleteSDWANVpnInstance",
"xml": "<outcome value='DeleteSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 945.0634078979492,
- "y": 1062.6983680725098,
- "z": "87aefe66.c6e82",
+ "x": 936.0673141479492,
+ "y": 1059.7022743225098,
+ "z": "c09ce476.40c538",
"wires": [
[
- "8c2f423e.95a5"
+ "76f6c61a.a081c8"
]
]
},
{
- "id": "ba1e9ce4.084c2",
+ "id": "1f6d106b.3f479",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 866.6189804077148,
- "y": 1138.920636177063,
- "z": "87aefe66.c6e82",
+ "x": 857.6228866577148,
+ "y": 1135.924542427063,
+ "z": "c09ce476.40c538",
"wires": [
[
- "29217d6f.264c52"
+ "649057db.a16248"
]
]
},
{
- "id": "29217d6f.264c52",
+ "id": "649057db.a16248",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"request-information.request-action is required to be SOTN DeleteVPNNetworkInstance for svc-action=delete\" />\n",
"comments": "",
- "x": 1026.9524002075195,
- "y": 1141.0317735671997,
- "z": "87aefe66.c6e82",
+ "x": 1017.9563064575195,
+ "y": 1138.0356798171997,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "8c2f423e.95a5",
+ "id": "76f6c61a.a081c8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1174.9523086547852,
- "y": 1068.9206190109253,
- "z": "87aefe66.c6e82",
+ "x": 1165.9562149047852,
+ "y": 1065.9245252609253,
+ "z": "c09ce476.40c538",
"wires": [
[
- "5a51c09f.0dc8a",
- "dac4a6bf.88b598",
- "607c6dc9.f58224",
- "5f5b8df.a6d8d74"
+ "123885f7.86e85a",
+ "5107dc7c.bd16c4",
+ "d0483b54.f8cc78",
+ "ee1682f5.ef519"
]
]
},
{
- "id": "907aa46b.591888",
+ "id": "74577ecc.ef74c",
"type": "outcome",
"name": "activate",
"xml": "<outcome value='activate'>\n",
"comments": "",
"outputs": 1,
- "x": 526.4285774230957,
- "y": 549.7143135070801,
- "z": "87aefe66.c6e82",
+ "x": 517.4324836730957,
+ "y": 546.7182197570801,
+ "z": "c09ce476.40c538",
"wires": [
[
- "eff709e7.55cc68"
+ "63a76ac2.a9ff44"
]
]
},
{
- "id": "eff709e7.55cc68",
+ "id": "63a76ac2.a9ff44",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 709.2857437133789,
- "y": 546.8571634292603,
- "z": "87aefe66.c6e82",
+ "x": 700.2896499633789,
+ "y": 543.8610696792603,
+ "z": "c09ce476.40c538",
"wires": [
[
- "db4e4749.ac5c28",
- "f7339987.1e66e8"
+ "20847c6f.c84284",
+ "d8768536.d2ed78"
]
]
},
{
- "id": "db4e4749.ac5c28",
+ "id": "20847c6f.c84284",
"type": "other",
"name": "ActivateSDWANVpnInstance",
"xml": "<outcome value='ActivateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 962.5000228881836,
- "y": 526.6666707992554,
- "z": "87aefe66.c6e82",
+ "x": 953.5039291381836,
+ "y": 523.6705770492554,
+ "z": "c09ce476.40c538",
"wires": [
[
- "90c3027e.ce76e"
+ "888440a5.f74eb"
]
]
},
{
- "id": "f7339987.1e66e8",
+ "id": "d8768536.d2ed78",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 892.5000228881836,
- "y": 566.6666707992554,
- "z": "87aefe66.c6e82",
+ "x": 883.5039291381836,
+ "y": 563.6705770492554,
+ "z": "c09ce476.40c538",
"wires": [
[
- "58df50e9.ec50f"
+ "24d41f6.7d3c7e"
]
]
},
{
- "id": "58df50e9.ec50f",
+ "id": "24d41f6.7d3c7e",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"request-information.request-action is required to be SOTN ActivateVPNNetworkInstance for svc-action=activate\" />\n",
"comments": "",
- "x": 1050.0000228881836,
- "y": 566.6666707992554,
- "z": "87aefe66.c6e82",
+ "x": 1041.0039291381836,
+ "y": 563.6705770492554,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "90c3027e.ce76e",
+ "id": "888440a5.f74eb",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1193.5000228881836,
- "y": 526.6666707992554,
- "z": "87aefe66.c6e82",
+ "x": 1184.5039291381836,
+ "y": 523.6705770492554,
+ "z": "c09ce476.40c538",
"wires": [
[
- "607c6dc9.f58224",
- "5a51c09f.0dc8a",
- "dac4a6bf.88b598",
- "befd23a0.20fa9"
+ "d0483b54.f8cc78",
+ "123885f7.86e85a",
+ "5107dc7c.bd16c4",
+ "33a9d2fa.2f6b4e"
]
]
},
{
- "id": "7d17bd6a.99ffe4",
+ "id": "9770e43b.dbcf68",
"type": "other",
"name": "DeactivateSDWANVpnInstance",
"xml": "<outcome value='DeactivateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 948.9206390380859,
- "y": 897.1429328918457,
- "z": "87aefe66.c6e82",
+ "x": 939.9245452880859,
+ "y": 894.1468391418457,
+ "z": "c09ce476.40c538",
"wires": [
[
- "ae97c0e.69b144"
+ "41ce9967.86f308"
]
]
},
{
- "id": "754fd131.c0e1d",
+ "id": "672e2ef2.4ddd3",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 863.9206314086914,
- "y": 966.1429405212402,
- "z": "87aefe66.c6e82",
+ "x": 854.9245376586914,
+ "y": 963.1468467712402,
+ "z": "c09ce476.40c538",
"wires": [
[
- "e5085bda.bb5f08"
+ "25186dab.68a632"
]
]
},
{
- "id": "e5085bda.bb5f08",
+ "id": "25186dab.68a632",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"request-information.request-action is required to be SOTN DeactivateVPNNetworkInstance for svc-action=deactivate\" />\n",
"comments": "",
- "x": 1044.9206466674805,
- "y": 967.1429405212402,
- "z": "87aefe66.c6e82",
+ "x": 1035.9245529174805,
+ "y": 964.1468467712402,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "c38c9ea7.d32c",
+ "id": "e6bca749.2ecd58",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 685.7776947021484,
- "y": 899.6188039779663,
- "z": "87aefe66.c6e82",
+ "x": 676.7816009521484,
+ "y": 896.6227102279663,
+ "z": "c09ce476.40c538",
"wires": [
[
- "7d17bd6a.99ffe4",
- "754fd131.c0e1d"
+ "9770e43b.dbcf68",
+ "672e2ef2.4ddd3"
]
]
},
{
- "id": "cfdfa9d2.e72008",
+ "id": "141627b0.510318",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 689.5554962158203,
- "y": 1065.9523208141327,
- "z": "87aefe66.c6e82",
+ "x": 680.5594024658203,
+ "y": 1062.9562270641327,
+ "z": "c09ce476.40c538",
"wires": [
[
- "2418184c.a14ab8",
- "ba1e9ce4.084c2"
+ "967ffa6b.7cc5f8",
+ "1f6d106b.3f479"
]
]
},
{
- "id": "ae97c0e.69b144",
+ "id": "41ce9967.86f308",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1208.888786315918,
- "y": 899.9523277282715,
- "z": "87aefe66.c6e82",
+ "x": 1199.892692565918,
+ "y": 896.9562339782715,
+ "z": "c09ce476.40c538",
"wires": [
[
- "5a51c09f.0dc8a",
- "dac4a6bf.88b598",
- "607c6dc9.f58224",
- "2fee238f.bd0b7c"
+ "123885f7.86e85a",
+ "5107dc7c.bd16c4",
+ "d0483b54.f8cc78",
+ "f43dfee.04573"
]
]
},
{
- "id": "3d1afbf1.1b7e64",
+ "id": "5011e60c.42d288",
"type": "other",
"name": "CreateSDWANVpnInstance",
"xml": "<outcome value='CreateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1178.499984741211,
- "y": 265.6666679382324,
- "z": "87aefe66.c6e82",
+ "x": 1169.503890991211,
+ "y": 262.6705741882324,
+ "z": "c09ce476.40c538",
"wires": [
[
- "13930049.ada58"
+ "11c5bc01.23d164"
]
]
},
{
- "id": "13930049.ada58",
+ "id": "11c5bc01.23d164",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1413.49995803833,
- "y": 264.6666679382324,
- "z": "87aefe66.c6e82",
+ "x": 1404.50386428833,
+ "y": 261.6705741882324,
+ "z": "c09ce476.40c538",
"wires": [
[
- "3daca227.0cf10e"
+ "9a240db8.46ca9"
]
]
},
{
- "id": "3daca227.0cf10e",
+ "id": "9a240db8.46ca9",
"type": "for",
"name": "for loop i - vpn vf input parameters",
"xml": "<for index=\"i\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
"comments": "",
"outputs": 1,
- "x": 1644.000015258789,
- "y": 265.6666679382324,
- "z": "87aefe66.c6e82",
+ "x": 1635.003921508789,
+ "y": 262.6705741882324,
+ "z": "c09ce476.40c538",
"wires": [
[
- "3ad26c2a.a0e034"
+ "36e8517a.dc61de"
]
]
},
{
- "id": "3ad26c2a.a0e034",
+ "id": "36e8517a.dc61de",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1852.5000228881836,
- "y": 266.66667079925537,
- "z": "87aefe66.c6e82",
+ "x": 1843.5039291381836,
+ "y": 263.67057704925537,
+ "z": "c09ce476.40c538",
"wires": [
[
- "163fb823.6cab78",
- "f1bf47ba.b34c38",
- "c40dcf.883f423"
+ "5087b54.83db64c",
+ "58b5e6d.d150018",
+ "8cba0d18.e596b"
]
]
},
{
- "id": "163fb823.6cab78",
+ "id": "5087b54.83db64c",
"type": "set",
"name": "clear tmp-data",
"xml": "<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n",
"comments": "",
- "x": 2035.5000228881836,
- "y": 226.66667079925537,
- "z": "87aefe66.c6e82",
+ "x": 2026.5039291381836,
+ "y": 223.67057704925537,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "f1bf47ba.b34c38",
+ "id": "58b5e6d.d150018",
"type": "set",
"name": "set tmp-data",
"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",
"comments": "",
- "x": 2030.0000228881836,
- "y": 266.66667079925537,
- "z": "87aefe66.c6e82",
+ "x": 2021.0039291381836,
+ "y": 263.67057704925537,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "c40dcf.883f423",
+ "id": "8cba0d18.e596b",
"type": "switchNode",
"name": "switch name",
"xml": "<switch test=\"`$tmp.name`\">\n",
"comments": "",
"outputs": 1,
- "x": 2030.0000228881836,
- "y": 306.66667079925537,
- "z": "87aefe66.c6e82",
+ "x": 2021.0039291381836,
+ "y": 303.67057704925537,
+ "z": "c09ce476.40c538",
"wires": [
[
- "1fcdbe0d.6c0992",
- "9406085a.835ae8",
- "bf4803e4.f6139"
+ "dfc6f3da.96897",
+ "63a216c3.211888",
+ "efdb7bab.2e3c18"
]
]
},
{
- "id": "4dd6857a.0d98dc",
+ "id": "b6ee6080.0801",
"type": "switchNode",
"name": "switch value",
"xml": "<switch test=\"`$tmp.value`\">\n",
"comments": "",
"outputs": 1,
- "x": 2490.0001907348633,
- "y": 258.66669142246246,
- "z": "87aefe66.c6e82",
+ "x": 2481.0040969848633,
+ "y": 255.67059767246246,
+ "z": "c09ce476.40c538",
"wires": [
[
- "e0ccccd6.2db1b"
+ "b264801c.4e11d"
]
]
},
{
- "id": "bf4803e4.f6139",
+ "id": "efdb7bab.2e3c18",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2249.500358581543,
- "y": 324.66667902469635,
- "z": "87aefe66.c6e82",
+ "x": 2240.504264831543,
+ "y": 321.67058527469635,
+ "z": "c09ce476.40c538",
"wires": [
[
- "a6c05aa9.168a48"
+ "dd26b908.49f638"
]
]
},
{
- "id": "a6c05aa9.168a48",
+ "id": "dd26b908.49f638",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[' + $i + ']' + '.name is a required input'`\" />\n",
"comments": "",
- "x": 2424.5003623962402,
- "y": 323.66667902469635,
- "z": "87aefe66.c6e82",
+ "x": 2415.5042686462402,
+ "y": 320.67058527469635,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "1fcdbe0d.6c0992",
+ "id": "dfc6f3da.96897",
"type": "other",
"name": "name",
"xml": "<outcome value='name'>",
"comments": "",
"outputs": 1,
- "x": 2249.500358581543,
- "y": 208.66667330265045,
- "z": "87aefe66.c6e82",
+ "x": 2240.504264831543,
+ "y": 205.67057955265045,
+ "z": "c09ce476.40c538",
"wires": [
[
- "4dd6857a.0d98dc"
+ "b6ee6080.0801"
]
]
},
{
- "id": "9406085a.835ae8",
+ "id": "63a216c3.211888",
"type": "other",
"name": "topology",
"xml": "<outcome value='topology'>",
"comments": "",
"outputs": 1,
- "x": 2261.500114440918,
- "y": 262.333335518837,
- "z": "87aefe66.c6e82",
+ "x": 2252.504020690918,
+ "y": 259.337241768837,
+ "z": "c09ce476.40c538",
"wires": [
[
- "4dd6857a.0d98dc"
+ "b6ee6080.0801"
]
]
},
{
- "id": "e0ccccd6.2db1b",
+ "id": "b264801c.4e11d",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2633.5001907348633,
- "y": 258.66669142246246,
- "z": "87aefe66.c6e82",
+ "x": 2624.5040969848633,
+ "y": 255.67059767246246,
+ "z": "c09ce476.40c538",
"wires": [
[
- "641a1c22.3dabc4"
+ "c8480c33.559c3"
]
]
},
{
- "id": "641a1c22.3dabc4",
+ "id": "c8480c33.559c3",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'vf-module-request-input.vf-module-input-parameters.param '+ $tmp.name +' is a required input'`\" />\n",
"comments": "",
- "x": 2791.5001907348633,
- "y": 258.66669142246246,
- "z": "87aefe66.c6e82",
+ "x": 2782.5040969848633,
+ "y": 255.67059767246246,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "607c6dc9.f58224",
+ "id": "d0483b54.f8cc78",
"type": "switchNode",
"name": "switch service-data.vf-modules.vf-module_length",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 1485.3889541625977,
- "y": 565.9999761581421,
- "z": "87aefe66.c6e82",
+ "x": 1476.3928604125977,
+ "y": 563.0038824081421,
+ "z": "c09ce476.40c538",
"wires": [
[
- "9d62d332.6bdf1",
- "5cba95a3.c5c61c"
+ "413b50b3.359c7",
+ "d0f5593e.7ab558"
]
]
},
{
- "id": "9d62d332.6bdf1",
+ "id": "413b50b3.359c7",
"type": "other",
"name": "outcome Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1754.0000228881836,
- "y": 545.666711807251,
- "z": "87aefe66.c6e82",
+ "x": 1745.0039291381836,
+ "y": 542.670618057251,
+ "z": "c09ce476.40c538",
"wires": [
[
- "55bf1151.ede2f"
+ "eebfb40.22c4e5"
]
]
},
{
- "id": "55bf1151.ede2f",
+ "id": "eebfb40.22c4e5",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vf-module-topology-operation-input.vf-module-request-input.vf-module-id not found in service-data\" />\n",
"comments": "",
- "x": 1930.0000228881836,
- "y": 546.6666707992554,
- "z": "87aefe66.c6e82",
+ "x": 1921.0039291381836,
+ "y": 543.6705770492554,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "5cba95a3.c5c61c",
+ "id": "d0f5593e.7ab558",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1732.5000228881836,
- "y": 586.6666707992554,
- "z": "87aefe66.c6e82",
+ "x": 1723.5039291381836,
+ "y": 583.6705770492554,
+ "z": "c09ce476.40c538",
"wires": [
[
- "b3715a78.6bb228"
+ "8025be.3d50da4"
]
]
},
{
- "id": "b3715a78.6bb228",
+ "id": "8025be.3d50da4",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1893.5000228881836,
- "y": 586.6666707992554,
- "z": "87aefe66.c6e82",
+ "x": 1884.5039291381836,
+ "y": 583.6705770492554,
+ "z": "c09ce476.40c538",
"wires": [
[
- "c872064f.ab0aa8",
- "16b4cc33.475d44"
+ "33b03a7.98f32c6",
+ "2d7d1dbe.8a6fa2"
]
]
},
{
- "id": "c872064f.ab0aa8",
+ "id": "33b03a7.98f32c6",
"type": "for",
"name": "for nidx..service-data.vf-modules.vf-module[]",
"xml": "<for index='nidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 2156.0000228881836,
- "y": 566.6666707992554,
- "z": "87aefe66.c6e82",
+ "x": 2147.0039291381836,
+ "y": 563.6705770492554,
+ "z": "c09ce476.40c538",
"wires": [
[
- "88526fe7.19ca5"
+ "c9190995.7b4398"
]
]
},
{
- "id": "88526fe7.19ca5",
+ "id": "c9190995.7b4398",
"type": "switchNode",
"name": "switch vf-module-id found",
"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",
"comments": "",
"outputs": 1,
- "x": 2442.0000228881836,
- "y": 566.6666707992554,
- "z": "87aefe66.c6e82",
+ "x": 2433.0039291381836,
+ "y": 563.6705770492554,
+ "z": "c09ce476.40c538",
"wires": [
[
- "100a52a1.442c1d"
+ "6869b345.2f4eec"
]
]
},
{
- "id": "100a52a1.442c1d",
+ "id": "6869b345.2f4eec",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2612.5000228881836,
- "y": 566.6666707992554,
- "z": "87aefe66.c6e82",
+ "x": 2603.5039291381836,
+ "y": 563.6705770492554,
+ "z": "c09ce476.40c538",
"wires": [
[
- "8d9c0c99.1bdcb"
+ "434bc2ee.14a91c"
]
]
},
{
- "id": "7051b5d0.a337bc",
+ "id": "d8b2b2f3.abfe5",
"type": "set",
"name": "set tmp.vidx and ctx.network-data",
"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",
"comments": "",
- "x": 3013.50008392334,
- "y": 563.6667140722275,
- "z": "87aefe66.c6e82",
+ "x": 3004.50399017334,
+ "y": 560.6706203222275,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "683dee11.6434b",
+ "id": "91c3f042.9f8f6",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vf-module-topology-operation-input.vf-module-request-input.vf-module-id not found in service-data\" />\n",
"comments": "",
- "x": 2370.0000228881836,
- "y": 606.6666707992554,
- "z": "87aefe66.c6e82",
+ "x": 2361.0039291381836,
+ "y": 603.6705770492554,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "67a62d00.2d4ff4",
+ "id": "62656256.c5a38c",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 2232.5000228881836,
- "y": 606.6666707992554,
- "z": "87aefe66.c6e82",
+ "x": 2223.5039291381836,
+ "y": 603.6705770492554,
+ "z": "c09ce476.40c538",
"wires": [
[
- "683dee11.6434b"
+ "91c3f042.9f8f6"
]
]
},
{
- "id": "16b4cc33.475d44",
+ "id": "2d7d1dbe.8a6fa2",
"type": "switchNode",
"name": "switch tmp.vidx ",
"xml": "<switch test=\"`$tmp.vidx`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 2078.5000228881836,
- "y": 606.6666707992554,
- "z": "87aefe66.c6e82",
+ "x": 2069.5039291381836,
+ "y": 603.6705770492554,
+ "z": "c09ce476.40c538",
"wires": [
[
- "67a62d00.2d4ff4"
+ "62656256.c5a38c"
]
]
},
{
- "id": "befd23a0.20fa9",
+ "id": "33a9d2fa.2f6b4e",
"type": "switchNode",
"name": "switch network-level-oper-status",
"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",
"comments": "",
"outputs": 1,
- "x": 1457.6667098999023,
- "y": 645.5555486679077,
- "z": "87aefe66.c6e82",
+ "x": 1448.6706161499023,
+ "y": 642.5594549179077,
+ "z": "c09ce476.40c538",
"wires": [
[
- "f546c4ba.29b768",
- "ad8d6fcc.bfcca"
+ "1058ce1e.07c3a2",
+ "647164c.65ef89c"
]
]
},
{
- "id": "f546c4ba.29b768",
+ "id": "1058ce1e.07c3a2",
"type": "outcome",
"name": "outcome Created",
"xml": "<outcome value='Created'>\n",
"comments": "",
"outputs": 1,
- "x": 1754.5001258850098,
- "y": 645.5555467605591,
- "z": "87aefe66.c6e82",
+ "x": 1745.5040321350098,
+ "y": 642.5594530105591,
+ "z": "c09ce476.40c538",
"wires": [
[
- "72634f47.0cc42"
+ "d822f664.efe8c8"
]
]
},
{
- "id": "ad8d6fcc.bfcca",
+ "id": "647164c.65ef89c",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1722.5001258850098,
- "y": 685.5555467605591,
- "z": "87aefe66.c6e82",
+ "x": 1713.5040321350098,
+ "y": 682.5594530105591,
+ "z": "c09ce476.40c538",
"wires": [
[
- "28f836e1.3e6b7a"
+ "6947f2ff.46fb4c"
]
]
},
{
- "id": "28f836e1.3e6b7a",
+ "id": "6947f2ff.46fb4c",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'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",
"comments": "",
- "x": 1880.0001258850098,
- "y": 685.5555467605591,
- "z": "87aefe66.c6e82",
+ "x": 1871.0040321350098,
+ "y": 682.5594530105591,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "dac4a6bf.88b598",
+ "id": "5107dc7c.bd16c4",
"type": "switchNode",
"name": "switch vf-module-id",
"xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
"comments": "",
"outputs": 1,
- "x": 1404.5000228881836,
- "y": 506.66667079925537,
- "z": "87aefe66.c6e82",
+ "x": 1395.5039291381836,
+ "y": 503.67057704925537,
+ "z": "c09ce476.40c538",
"wires": [
[
- "a7ac2cab.79df8"
+ "2868a76.8aeaf58"
]
]
},
{
- "id": "a7ac2cab.79df8",
+ "id": "2868a76.8aeaf58",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 1632.5000228881836,
- "y": 506.66667079925537,
- "z": "87aefe66.c6e82",
+ "x": 1623.5039291381836,
+ "y": 503.67057704925537,
+ "z": "c09ce476.40c538",
"wires": [
[
- "b2c9eb9f.8ff438"
+ "ebf2eb70.fb3688"
]
]
},
{
- "id": "b2c9eb9f.8ff438",
+ "id": "ebf2eb70.fb3688",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"network-request-input.network-input-parameters.name is a required input\" />\n",
"comments": "",
- "x": 1770.0000228881836,
- "y": 506.66667079925537,
- "z": "87aefe66.c6e82",
+ "x": 1761.0039291381836,
+ "y": 503.67057704925537,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "5a51c09f.0dc8a",
+ "id": "123885f7.86e85a",
"type": "execute",
"name": "execute requiredParameters",
"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",
"comments": "",
"outputs": 1,
- "x": 1439.0000228881836,
- "y": 466.66667079925537,
- "z": "87aefe66.c6e82",
+ "x": 1430.0039291381836,
+ "y": 463.67057704925537,
+ "z": "c09ce476.40c538",
"wires": [
[]
]
},
{
- "id": "2fee238f.bd0b7c",
+ "id": "f43dfee.04573",
"type": "switchNode",
"name": "switch network-level-oper-status",
"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",
"comments": "",
"outputs": 1,
- "x": 1481.8332214355469,
- "y": 895.555570602417,
- "z": "87aefe66.c6e82",
+ "x": 1472.8371276855469,
+ "y": 892.559476852417,
+ "z": "c09ce476.40c538",
"wires": [
[
- "cdf8dd70.c0108",
- "2de75da0.b5bd52"
+ "f3a65bdd.c67898",
+ "d0952c59.11171"
]
]
},
{
- "id": "cdf8dd70.c0108",
+ "id": "f3a65bdd.c67898",
"type": "outcome",
"name": "outcome Active",
"xml": "<outcome value='Active'>\n",
"comments": "",
"outputs": 1,
- "x": 1759.166648864746,
- "y": 869.9999837875366,
- "z": "87aefe66.c6e82",
+ "x": 1750.170555114746,
+ "y": 867.0038900375366,
+ "z": "c09ce476.40c538",
"wires": [
[
- "e027e573.24bd48"
+ "25ff4eac.6201f2"
]
]
},
{
- "id": "2de75da0.b5bd52",
+ "id": "d0952c59.11171",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1729.166648864746,
- "y": 909.9999837875366,
- "z": "87aefe66.c6e82",
+ "x": 1720.170555114746,
+ "y": 907.0038900375366,
+ "z": "c09ce476.40c538",
"wires": [
[
- "4744b74f.6f4a88"
+ "446d50cf.78007"
]
]
},
{
- "id": "4744b74f.6f4a88",
+ "id": "446d50cf.78007",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'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 ",
"comments": "",
- "x": 1895.166648864746,
- "y": 911.9999837875366,
- "z": "87aefe66.c6e82",
+ "x": 1886.170555114746,
+ "y": 909.0038900375366,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "5f5b8df.a6d8d74",
+ "id": "ee1682f5.ef519",
"type": "switchNode",
"name": "switch network-level-oper-status",
"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",
"comments": "",
"outputs": 1,
- "x": 1474.7221908569336,
- "y": 1066.6666097640991,
- "z": "87aefe66.c6e82",
+ "x": 1465.7260971069336,
+ "y": 1063.6705160140991,
+ "z": "c09ce476.40c538",
"wires": [
[
- "e0e44b44.c9e6c8",
- "fa9a403f.1ce7e"
+ "cb2a1ac2.d811d8",
+ "425f06cf.84b998"
]
]
},
{
- "id": "e0e44b44.c9e6c8",
+ "id": "cb2a1ac2.d811d8",
"type": "outcome",
"name": "outcome PendingDelete",
"xml": "<outcome value='PendingDelete'>\n",
"comments": "",
"outputs": 1,
- "x": 1774.7222518920898,
- "y": 1034.444405555725,
- "z": "87aefe66.c6e82",
+ "x": 1765.7261581420898,
+ "y": 1031.448311805725,
+ "z": "c09ce476.40c538",
"wires": [
[
- "21ef3568.35bd5a"
+ "bcccebbc.df0278"
]
]
},
{
- "id": "fa9a403f.1ce7e",
+ "id": "425f06cf.84b998",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1718.055564880371,
- "y": 1081.1110677719116,
- "z": "87aefe66.c6e82",
+ "x": 1709.059471130371,
+ "y": 1078.1149740219116,
+ "z": "c09ce476.40c538",
"wires": [
[
- "2bc6f464.461d3c"
+ "a8198043.31984"
]
]
},
{
- "id": "2bc6f464.461d3c",
+ "id": "a8198043.31984",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'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",
"comments": "",
- "x": 1884.055564880371,
- "y": 1083.1110677719116,
- "z": "87aefe66.c6e82",
+ "x": 1875.059471130371,
+ "y": 1080.1149740219116,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "72634f47.0cc42",
+ "id": "d822f664.efe8c8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1946.5001029968262,
- "y": 646.6666488647461,
- "z": "87aefe66.c6e82",
+ "x": 1937.5040092468262,
+ "y": 643.6705551147461,
+ "z": "c09ce476.40c538",
"wires": [
[]
]
},
{
- "id": "e027e573.24bd48",
+ "id": "25ff4eac.6201f2",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1959.1665267944336,
- "y": 868.1481161117554,
- "z": "87aefe66.c6e82",
+ "x": 1950.1704330444336,
+ "y": 865.1520223617554,
+ "z": "c09ce476.40c538",
"wires": [
[]
]
},
{
- "id": "21ef3568.35bd5a",
+ "id": "bcccebbc.df0278",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1990.277732849121,
- "y": 1034.8147420883179,
- "z": "87aefe66.c6e82",
+ "x": 1981.281639099121,
+ "y": 1031.8186483383179,
+ "z": "c09ce476.40c538",
"wires": [
[]
]
},
{
- "id": "8d9c0c99.1bdcb",
+ "id": "434bc2ee.14a91c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2762.666534423828,
- "y": 563.0000190734863,
- "z": "87aefe66.c6e82",
+ "x": 2753.670440673828,
+ "y": 560.0039253234863,
+ "z": "c09ce476.40c538",
"wires": [
[
- "7051b5d0.a337bc"
+ "d8b2b2f3.abfe5"
]
]
},
{
- "id": "26ecbd16.18b922",
+ "id": "257f53b6.ca8b0c",
"type": "switchNode",
"name": "switch vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 977.0065307617188,
- "y": 110.24849605560303,
- "z": "87aefe66.c6e82",
+ "x": 968.0104370117188,
+ "y": 107.25240230560303,
+ "z": "c09ce476.40c538",
"wires": [
[
- "a795521a.23d6f"
+ "ad7c2596.e39388"
]
]
},
{
- "id": "a795521a.23d6f",
+ "id": "ad7c2596.e39388",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1157.0065116882324,
- "y": 109.24848556518555,
- "z": "87aefe66.c6e82",
+ "x": 1148.0104179382324,
+ "y": 106.25239181518555,
+ "z": "c09ce476.40c538",
"wires": [
[
- "3e0e877f.b04338"
+ "94667639.3621e8"
]
]
},
{
- "id": "3e0e877f.b04338",
+ "id": "94667639.3621e8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf entry not found in service-data\" />\n",
"comments": "",
- "x": 1306.4352378845215,
- "y": 110.39140319824219,
- "z": "87aefe66.c6e82",
+ "x": 1297.4391441345215,
+ "y": 107.39530944824219,
+ "z": "c09ce476.40c538",
"wires": []
},
{
- "id": "f0d7fed2.a7f6e",
+ "id": "e33dc3b4.6bdba",
"type": "for",
"name": "for each vnf",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 957.0379104614258,
- "y": 172.51763439178467,
- "z": "87aefe66.c6e82",
+ "x": 948.0418167114258,
+ "y": 169.52154064178467,
+ "z": "c09ce476.40c538",
"wires": [
[
- "c781186.35a6de8"
+ "30c7b890.07a568"
]
]
},
{
- "id": "c781186.35a6de8",
+ "id": "30c7b890.07a568",
"type": "switchNode",
"name": "switch this vnf-id == input vnf-id",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\"> \n",
"comments": "",
"outputs": 1,
- "x": 1195.0065269470215,
- "y": 172.2484917640686,
- "z": "87aefe66.c6e82",
+ "x": 1186.0104331970215,
+ "y": 169.2523980140686,
+ "z": "c09ce476.40c538",
"wires": [
[
- "3c97bff.ca0c74"
+ "659e2d6d.62e114"
]
]
},
{
- "id": "3c97bff.ca0c74",
+ "id": "659e2d6d.62e114",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1410.0065116882324,
- "y": 170.24848556518555,
- "z": "87aefe66.c6e82",
+ "x": 1401.0104179382324,
+ "y": 167.25239181518555,
+ "z": "c09ce476.40c538",
"wires": [
[
- "daf74faa.b14cc"
+ "79ae665a.7603a8"
]
]
},
{
- "id": "daf74faa.b14cc",
+ "id": "79ae665a.7603a8",
"type": "set",
"name": "set vnf-index",
"xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
"comments": "",
- "x": 1574.0065116882324,
- "y": 165.24848556518555,
- "z": "87aefe66.c6e82",
+ "x": 1565.0104179382324,
+ "y": 162.25239181518555,
+ "z": "c09ce476.40c538",
"wires": []
+ },
+ {
+ "id": "d950638a.e6fd1",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf id not found in service-data\" />\n",
+ "comments": "",
+ "x": 1270.00390625,
+ "y": 215.00390625,
+ "z": "c09ce476.40c538",
+ "wires": []
+ },
+ {
+ "id": "c45b00c9.864fa",
+ "type": "other",
+ "name": "Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1120.7538146972656,
+ "y": 217.2260284423828,
+ "z": "c09ce476.40c538",
+ "wires": [
+ [
+ "d950638a.e6fd1"
+ ]
+ ]
+ },
+ {
+ "id": "fa0b83ce.07d0f",
+ "type": "switchNode",
+ "name": "switch vnf-index",
+ "xml": "<switch test='`$vnf-index`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 958.7537689208984,
+ "y": 218.22602939605713,
+ "z": "c09ce476.40c538",
+ "wires": [
+ [
+ "c45b00c9.864fa"
+ ]
+ ]
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml index 15f1e537..808070fc 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml @@ -61,23 +61,34 @@ </outcome>
</switch>
<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >
- <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >
- <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`' >
- <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'`">
- <outcome value='true'>
- <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`' >
- <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'`">
- <outcome value='true'>
- <set>
- <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`' />
- </set>
- </outcome>
- </switch>
+ <block atomic="true">
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`">
+ <!--switch test="`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`"-->
+ <outcome value='true'>
+ <block atomic="true">
+ <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >
+ <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`' >
+ <block atomic="true">
+ <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`">
+ <outcome value='true'>
+ <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`' >
+ <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'`">
+ <outcome value='true'>
+ <set>
+ <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`' />
+ </set>
+ </outcome>
+ </switch>
+ </for>
+ </outcome>
+ </switch>
+ </block>
+ </for>
</for>
- </outcome>
- </switch>
- </for>
- </for>
+ </block>
+ </outcome>
+ </switch>
+ </block>
</for>
<set>
<parameter name='prop.siteAttachements_length' value='0' />
@@ -86,12 +97,6 @@ <for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >
<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >
<block>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic24.log"/>
- <parameter name="field1" value="__TIMESTAMP__"/>
- <parameter name="field2" value="request-action"/>
- <parameter name="field3" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action`'/>
- </record>
<switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">
<outcome value='true'>
<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`' >
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml index 607a19f6..d2538710 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml @@ -21,6 +21,15 @@ </outcome>
</switch>
</for>
+ <switch test='`$vnf-index`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="vnf id not found in service-data" />
+ </return>
+ </outcome>
+ </switch>
<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>
<outcome value=''>
<set>
@@ -58,28 +67,29 @@ </set>
</block>
</for>
- <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>
<set>
<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />
</set>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
- <parameter name="ctx-destination" value="prop.lan-vf-index"/>
+ <parameter name="ctx-destination" value="prop.vf-id"/>
</execute>
<set>
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.lan-vf-index`' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vf-id`' />
<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.`' />
<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.`' />
<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.`' />
<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.`' />
<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.`' />
<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.`' />
- <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.`' />
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />
+ <!--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.`' /-->
+ <!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' /-->
</set>
<set>
+ <parameter name='vf-module-id' value='`$prop.vf-id`'/>
<parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ $vf-module-topology-operation-input.service-information.service-instance-id
+ '/service-data/vnfs/vnf/'
@@ -104,27 +114,27 @@ <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`' />
</set>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config'
- key='lan-port-config.lan-port-config-id = $prop.lan-vf-index' >
- <parameter name="lan-port-config-id" value="`$prop.vnf-index`" />
- <parameter name="device-id" value="`$prop.lan.deviceName`" />
- <parameter name="port-switch" value="`$prop.lan.portSwitch`" />
- <parameter name="port-type" value="`$prop.lan.portType`" />
- <parameter name="port-number" value="`$prop.lan.portnumber`" />
- <parameter name="ipv4-address" value="`$prop.lan.ipAddress`" />
- <parameter name='vlan-tag' value="`$prop.lan.vlanId`" />
+ key='lan-port-config.lan-port-config-id = $prop.vf-id' >
+ <parameter name="lan-port-config-id" value="`$prop.vf-id`" />
+ <parameter name="device-id" value='`$prop.lan.deviceName`' />
+ <parameter name="port-switch" value='`$prop.lan.portSwitch`' />
+ <parameter name="port-type" value='`$prop.lan.portType`' />
+ <parameter name="port-number" value='`$prop.lan.portnumber`' />
+ <parameter name="ipv4-address" value='`$prop.lan.ipAddress`' />
+ <parameter name='vlan-tag' value='`$prop.lan.vlanId`' />
<parameter name='operational-status' value='Created' />
<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />
- <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/'` " />
+ <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/'` " />
</save>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list'
key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id'
force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="sdwan-vpn" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/sdwan-vpns/sdwan-vpn/' + $prop.lan-vf-index`" />
+ <parameter name="relationship-list.relationship[0].related-to" value="lan-port-config" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/lan-port-configs/lan-port-config/' + $prop.vf-id`" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="lan-port-config-id" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.lan-vf-index`" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vf-id`" />
</save>
<return status='success'>
<parameter name="ack-final-indicator" value="Y" />
@@ -133,4 +143,5 @@ </return>
</block>
</method>
-</service-logic>
\ No newline at end of file +</service-logic>
+
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.xml index 77575c2f..2a0a3af1 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.xml @@ -21,6 +21,15 @@ </outcome>
</switch>
</for>
+ <switch test='`$vnf-index`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="vnf id not found in service-data" />
+ </return>
+ </outcome>
+ </switch>
<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>
<outcome value='0'>
<return status='failure'>
@@ -63,7 +72,7 @@ <for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >
<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >
<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`' >
- <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'`">
+ <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`">
<outcome value='true'>
<block atomic="true">
<set>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml index 5fb67357..30df6e08 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml @@ -21,6 +21,15 @@ </outcome>
</switch>
</for>
+ <switch test='`$vnf-index`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="vnf id not found in service-data" />
+ </return>
+ </outcome>
+ </switch>
<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>
<outcome value='0'>
<return status='failure'>
@@ -127,7 +136,7 @@ + '/service-data/service-topology/'`"/>
</set>
<delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='lan-port-config'
- key='site-resource.site-resource-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>
+ key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>
<return status='success'>
<parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml index 02a816bd..360cb476 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml @@ -4,24 +4,6 @@ <method rpc='sdwan-vf-operation-vpn-create' mode='sync'>
<block atomic="true">
<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync' ></call>
- <switch test='`$service-data.vnfs.vnf_length`'>
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="404" />
- <parameter name="error-message" value="There are no VNFs in MD-SAL" />
- </return>
- </outcome>
- </switch>
- <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >
- <switch test="`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`">
- <outcome value='true'>
- <set>
- <parameter name='vnf-index' value='`$idx`' />
- </set>
- </outcome>
- </switch>
- </for>
<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>
<outcome value=''>
<set>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml index 29b26cd9..60492b5b 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml @@ -30,6 +30,15 @@ </outcome>
</switch>
</for>
+ <switch test='`$vnf-index`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="vnf id not found in service-data" />
+ </return>
+ </outcome>
+ </switch>
<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>
<outcome value='create'>
<block atomic="true">
|