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