aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwsx25289 <10200860@zte.com.cn>2018-12-06 23:34:11 -0500
committerwsx25289 <10200860@zte.com.cn>2018-12-17 20:12:03 -0500
commit63555843f7e81be2d254d730c37d502cb20f463c (patch)
tree2c465e70c98f28edb2a0018d71919d232563c1c5
parent6db72b41a86e65955cc556edd3b67b3254206d89 (diff)
fix topology discovery bug for ccvpn
Issue-ID: SDNC-546 Change-Id: Ia620a28e365f71cf0b6de8ba1cb0aaed28445a7c Signed-off-by: Wsx25289 <10200860@zte.com.cn> Former-commit-id: 70802cf8f45ecb7fd7a84cb5e094ac95c94ff1a4
Diffstat
-rw-r--r--platform-logic/datachange/src/main/json/DataChange_data-change-notification.json372
-rw-r--r--platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery-of-zte.json2006
-rw-r--r--platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json1001
-rw-r--r--platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-of-zte.json603
-rw-r--r--platform-logic/datachange/src/main/xml/DataChange_data-change-notification.xml62
-rw-r--r--platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery-of-zte.xml533
-rw-r--r--platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml133
-rw-r--r--platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-of-zte.xml124
8 files changed, 2460 insertions, 2374 deletions
diff --git a/platform-logic/datachange/src/main/json/DataChange_data-change-notification.json b/platform-logic/datachange/src/main/json/DataChange_data-change-notification.json
index eb1e8fdf..6d33aa44 100644
--- a/platform-logic/datachange/src/main/json/DataChange_data-change-notification.json
+++ b/platform-logic/datachange/src/main/json/DataChange_data-change-notification.json
@@ -1,278 +1,170 @@
[
{
- "id": "c9438469.7f9978",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 86.5,
- "y": 81,
- "z": "31e69f1c.704108",
+ "id": "4153f9c1.51e918",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 121.03125,
+ "y": 50.99999761581421,
+ "z": "351662fa.1d559e",
"wires": [
[
- "80aeb8.8187b148"
+ "c35543aa.9c0db"
]
]
- },
- {
- "id": "80aeb8.8187b148",
- "type": "service-logic",
- "name": "DataChange ${project.version}",
- "module": "DataChange",
- "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='DataChange' version='${project.version}'>",
- "outputs": 1,
- "x": 249.61114883422852,
- "y": 182.44447135925293,
- "z": "31e69f1c.704108",
- "wires": [
- [
- "b8c8b6e.8e24748"
- ]
- ]
- },
- {
- "id": "b8c8b6e.8e24748",
- "type": "method",
- "name": "method data-change-notification",
- "xml": "<method rpc='data-change-notification' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 247.0556983947754,
- "y": 346.2222566604614,
- "z": "31e69f1c.704108",
+ },
+ {
+ "id": "c35543aa.9c0db",
+ "type": "service-logic",
+ "name": "DataChange ${project.version}",
+ "module": "DataChange",
+ "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='DataChange' version='${project.version}'>",
+ "outputs": 1,
+ "x": 284.14239501953125,
+ "y": 153.44447326660156,
+ "z": "351662fa.1d559e",
"wires": [
[
- "e44b2680.5f0e1"
+ "ddb1e250.e70de"
]
]
- },
- {
- "id": "e44b2680.5f0e1",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 292.2779846191406,
- "y": 461.1113269329071,
- "z": "31e69f1c.704108",
+ },
+ {
+ "id": "ddb1e250.e70de",
+ "type": "method",
+ "name": "method data-change-notification",
+ "xml": "<method rpc='data-change-notification' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 281.5869483947754,
+ "y": 316.22225427627563,
+ "z": "351662fa.1d559e",
"wires": [
[
- "5f1a41d8.25b23",
- "7978a5db.d860ec"
+ "d8e6317c.7d1e4"
]
]
- },
- {
- "id": "5f1a41d8.25b23",
- "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": 499.8338432312012,
- "y": 548.556131362915,
- "z": "31e69f1c.704108",
- "wires": [ ]
- },
- {
- "id": "bca5a9bf.c1ce98",
- "type": "call",
- "name": "call esr-thirdparty-sdnc",
- "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1420.8341064453125,
- "y": 325.6667785644531,
- "z": "31e69f1c.704108",
- "wires": [
- [ ]
- ]
- },
- {
- "id": "7978a5db.d860ec",
- "type": "switchNode",
- "name": "switch aai-node-type",
- "xml": "<switch test='`$data-change-notification-input.aai-node-type`'>\n",
- "comments": "",
- "outputs": 1,
- "x": 503.3827209472656,
- "y": 424.88262820243835,
- "z": "31e69f1c.704108",
+ },
+ {
+ "id": "d8e6317c.7d1e4",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 326.8092346191406,
+ "y": 431.1113245487213,
+ "z": "351662fa.1d559e",
"wires": [
[
- "1e0b8434.23a404",
- "d0750bdf.e570e"
+ "3e65d07f.a9ae2",
+ "ed2d48f6.216158"
]
]
- },
- {
- "id": "1e0b8434.23a404",
- "type": "other",
- "name": "esr-thirdparty-sdnc",
- "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
- "comments": "",
- "outputs": 1,
- "x": 678.4146728515625,
- "y": 183.0572509765625,
- "z": "31e69f1c.704108",
+ },
+ {
+ "id": "3e65d07f.a9ae2",
+ "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": 534.3650932312012,
+ "y": 518.5561289787292,
+ "z": "351662fa.1d559e",
+ "wires": []
+ },
+ {
+ "id": "b5c4485f.b2ff78",
+ "type": "call",
+ "name": "call esr-thirdparty-sdnc",
+ "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1162.3653564453125,
+ "y": 152.66677856445312,
+ "z": "351662fa.1d559e",
"wires": [
- [
- "e6b3f0d5.83e4a8"
- ]
+ []
]
- },
- {
- "id": "d0750bdf.e570e",
- "type": "other",
- "name": "other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 743.3827857971191,
- "y": 423.8826608657837,
- "z": "31e69f1c.704108",
+ },
+ {
+ "id": "ed2d48f6.216158",
+ "type": "switchNode",
+ "name": "switch aai-node-type",
+ "xml": "<switch test='`$data-change-notification-input.aai-node-type`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 537.9139709472656,
+ "y": 394.88262581825256,
+ "z": "351662fa.1d559e",
"wires": [
[
- "9c41362c.9d7948"
+ "a7d7c4e8.cc6678",
+ "c25d5c15.d569e"
]
]
- },
- {
- "id": "9c41362c.9d7948",
- "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=\"AAI node type not supported\" />",
- "comments": "",
- "x": 898.8273048400879,
- "y": 423.99376010894775,
- "z": "31e69f1c.704108",
- "wires": [ ]
- },
- {
- "id": "dc8e805f.967db",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1324.500244140625,
- "y": 241.8262939453125,
- "z": "31e69f1c.704108",
+ },
+ {
+ "id": "a7d7c4e8.cc6678",
+ "type": "other",
+ "name": "esr-thirdparty-sdnc",
+ "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 712.9459228515625,
+ "y": 153.0572485923767,
+ "z": "351662fa.1d559e",
"wires": [
[
- "bca5a9bf.c1ce98"
+ "dfa0cb23.be8c58"
]
]
- },
- {
- "id": "e6b3f0d5.83e4a8",
- "type": "for",
- "name": "for",
- "xml": "<for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 865.5,
- "y": 183,
- "z": "31e69f1c.704108",
+ },
+ {
+ "id": "c25d5c15.d569e",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 777.9140357971191,
+ "y": 393.8826584815979,
+ "z": "351662fa.1d559e",
"wires": [
[
- "ba8b2793.6bb91"
+ "f4eb1449.fa4908"
]
]
- },
- {
- "id": "ba8b2793.6bb91",
- "type": "switchNode",
- "name": "switch",
- "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-value == 'ZTE'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 1005.5,
- "y": 183,
- "z": "31e69f1c.704108",
+ },
+ {
+ "id": "f4eb1449.fa4908",
+ "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=\"AAI node type not supported\" />",
+ "comments": "",
+ "x": 933.3585548400879,
+ "y": 393.99375772476196,
+ "z": "351662fa.1d559e",
+ "wires": []
+ },
+ {
+ "id": "dfa0cb23.be8c58",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 929.53125,
+ "y": 153,
+ "z": "351662fa.1d559e",
"wires": [
[
- "891233f8.add168",
- "810b885f.a9b34"
+ "b5c4485f.b2ff78"
]
]
- },
- {
- "id": "5b501f1b.fad328",
- "type": "call",
- "name": "call esr-thirdparty-sdnc-of-zte",
- "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1619.5,
- "y": 236,
- "z": "31e69f1c.704108",
- "wires": [
- [ ]
- ]
- },
- {
- "id": "891233f8.add168",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1159.5,
- "y": 183,
- "z": "31e69f1c.704108",
- "wires": [
- [
- "fb1086e7.fe9d98"
- ]
- ]
- },
- {
- "id": "810b885f.a9b34",
- "type": "outcomeFalse",
- "name": "false",
- "xml": "<outcome value='false'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1159.5,
- "y": 242,
- "z": "31e69f1c.704108",
- "wires": [
- [
- "dc8e805f.967db"
- ]
- ]
- },
- {
- "id": "fb1086e7.fe9d98",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1322,
- "y": 183,
- "z": "31e69f1c.704108",
- "wires": [
- [
- "6a42dcf4.2a86a4",
- "5b501f1b.fad328"
- ]
- ]
- },
- {
- "id": "6a42dcf4.2a86a4",
- "type": "set",
- "name": "set vendor",
- "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.vendor' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
- "comments": "",
- "x": 1547,
- "y": 183,
- "z": "31e69f1c.704108",
- "wires": [ ]
}
] \ No newline at end of file
diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery-of-zte.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery-of-zte.json
index f7332e85..4de03992 100644
--- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery-of-zte.json
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery-of-zte.json
@@ -1,1208 +1,1316 @@
[
{
- "id": "15787234.124136",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 101,
- "y": 108,
- "z": "5c3ac6a5.48ce2",
+ "id": "5f902aaa.7aa9a4",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 96,
+ "y": 111,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "65c08ccc.a64284"
+ "a24e36d1.cffe88"
]
]
- },
+ },
{
- "id": "65c08ccc.a64284",
- "type": "service-logic",
- "name": "DataChange ${project.version}",
- "module": "DataChange",
- "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='DataChange' version='${project.version}'>",
- "outputs": 1,
- "x": 205,
- "y": 197,
- "z": "5c3ac6a5.48ce2",
+ "id": "a24e36d1.cffe88",
+ "type": "service-logic",
+ "name": "DataChange ${project.version}",
+ "module": "DataChange",
+ "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='DataChange' version='${project.version}'>",
+ "outputs": 1,
+ "x": 200,
+ "y": 200,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "24732328.986984"
+ "62181046.00897"
]
]
- },
+ },
{
- "id": "24732328.986984",
- "type": "method",
- "name": "method esr-thirdparty-sdnc-discovery-of-zte",
- "xml": "<method rpc='esr-thirdparty-sdnc-discovery-of-zte' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 273,
- "y": 295,
- "z": "5c3ac6a5.48ce2",
+ "id": "62181046.00897",
+ "type": "method",
+ "name": "method esr-thirdparty-sdnc-discovery-of-zte",
+ "xml": "<method rpc='esr-thirdparty-sdnc-discovery-of-zte' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 268,
+ "y": 298,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "255730f2.067e3"
+ "bc55b20f.579c9"
]
]
- },
+ },
{
- "id": "255730f2.067e3",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic='true'>",
- "atomic": "true",
- "comments": "",
- "outputs": 1,
- "x": 197,
- "y": 402,
- "z": "5c3ac6a5.48ce2",
+ "id": "bc55b20f.579c9",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic='true'>",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 192,
+ "y": 405,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "52a3f44e.4fe8d4"
+ "f7cce3b7.da11f"
]
]
- },
+ },
{
- "id": "52a3f44e.4fe8d4",
- "type": "switchNode",
- "name": "switch aai-event-trigger",
- "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 399,
- "y": 402,
- "z": "5c3ac6a5.48ce2",
+ "id": "f7cce3b7.da11f",
+ "type": "switchNode",
+ "name": "switch aai-event-trigger",
+ "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 394,
+ "y": 405,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "a7ad4b32.3232d",
- "7ca795d2.5ae15c"
+ "feebd6bc.652fa8",
+ "274f1a37.9e7186"
]
]
- },
+ },
{
- "id": "a7ad4b32.3232d",
- "type": "outcome",
- "name": "update",
- "xml": "<outcome value='Update'>\n",
- "comments": "",
- "outputs": 1,
- "x": 627,
- "y": 357,
- "z": "5c3ac6a5.48ce2",
+ "id": "feebd6bc.652fa8",
+ "type": "outcome",
+ "name": "update",
+ "xml": "<outcome value='Update'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 622,
+ "y": 360,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "6a7a4af2.cbffc4"
+ "3a6c0212.670f4e"
]
]
- },
+ },
{
- "id": "7ca795d2.5ae15c",
- "type": "outcome",
- "name": "delete",
- "xml": "<outcome value='delete'>\n",
- "comments": "",
- "outputs": 1,
- "x": 625,
- "y": 525,
- "z": "5c3ac6a5.48ce2",
+ "id": "274f1a37.9e7186",
+ "type": "outcome",
+ "name": "delete",
+ "xml": "<outcome value='delete'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 620,
+ "y": 528,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "3084a5a8.99639a"
+ "9093c48f.404368"
]
]
- },
- {
- "id": "3084a5a8.99639a",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic='true'>",
- "atomic": "true",
- "comments": "",
- "outputs": 1,
- "x": 800,
- "y": 525,
- "z": "5c3ac6a5.48ce2",
- "wires": [
- [ ]
- ]
- },
- {
- "id": "6a7a4af2.cbffc4",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 779,
- "y": 357,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "9093c48f.404368",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic='true'>",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 795,
+ "y": 528,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "3a6c0212.670f4e",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 774,
+ "y": 360,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "9521c124.e5b908"
+ "8c1f6548.e5e568"
]
]
- },
+ },
{
- "id": "9521c124.e5b908",
- "type": "switchNode",
- "name": "switch type",
- "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 948,
- "y": 357,
- "z": "5c3ac6a5.48ce2",
+ "id": "8c1f6548.e5e568",
+ "type": "switchNode",
+ "name": "switch type",
+ "xml": "<switch test=\"`$zte.prop.sdncRestApi.type`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 943,
+ "y": 360,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "b1b8ddba.d5362",
- "b2791c8d.f92988"
+ "74951572.ebdc6c",
+ "eaaeda12.faa678"
]
]
- },
+ },
{
- "id": "b1b8ddba.d5362",
- "type": "outcome",
- "name": "SOTN",
- "xml": "<outcome value='SOTN'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1124,
- "y": 292,
- "z": "5c3ac6a5.48ce2",
+ "id": "74951572.ebdc6c",
+ "type": "outcome",
+ "name": "SOTN",
+ "xml": "<outcome value='SOTN'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1119,
+ "y": 295,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "2476cb54.ee54e4"
+ "c610ea22.d44298"
]
]
- },
+ },
{
- "id": "b2791c8d.f92988",
- "type": "outcome",
- "name": "other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1118,
- "y": 414,
- "z": "5c3ac6a5.48ce2",
+ "id": "eaaeda12.faa678",
+ "type": "outcome",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1113,
+ "y": 417,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "615692ea.bd454c"
+ "c3125ba4.7ffdb8"
]
]
- },
- {
- "id": "615692ea.bd454c",
- "type": "returnFailure",
- "name": "return failure",
- "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name='error-code' value=\"500\" />\n<parameter name='error-message' value=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n",
- "comments": "",
- "x": 1310,
- "y": 414,
- "z": "5c3ac6a5.48ce2",
- "wires": [ ]
- },
- {
- "id": "2476cb54.ee54e4",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic='true'>",
- "atomic": "true",
- "comments": "",
- "outputs": 1,
- "x": 1310,
- "y": 292,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "c3125ba4.7ffdb8",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name='error-code' value=\"500\" />\n<parameter name='error-message' value=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n",
+ "comments": "",
+ "x": 1305,
+ "y": 417,
+ "z": "540d3add.6d0b44",
+ "wires": []
+ },
+ {
+ "id": "c610ea22.d44298",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic='true'>",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 1305,
+ "y": 295,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "58ffaa94.11ecc4",
- "876baee.788865"
+ "93e42ee3.ef7c9",
+ "14a63f8c.fb75e",
+ "16563079.8d5e2"
]
]
- },
+ },
{
- "id": "58ffaa94.11ecc4",
- "type": "execute",
- "name": "execute RestApiCallNode Get ZTE Topology",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/getzteodutopotemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-topology-details'`\" />\n<parameter name=\"restapiUser\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"ztetopology\"/>",
- "comments": "",
- "outputs": 1,
- "x": 1630,
- "y": 200,
- "z": "5c3ac6a5.48ce2",
+ "id": "93e42ee3.ef7c9",
+ "type": "execute",
+ "name": "execute RestApiCallNode Get ZTE Topology",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/getzteodutopotemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-topology-details'`\" />\n<parameter name=\"restapiUser\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"ztetopology\"/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1625,
+ "y": 203,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "1cff6c99.978523",
- "8b1af88f.90711"
+ "7009dab5.0199f4",
+ "e43c55f6.204948"
]
]
- },
+ },
{
- "id": "1cff6c99.978523",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1912,
- "y": 145,
- "z": "5c3ac6a5.48ce2",
+ "id": "7009dab5.0199f4",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1907,
+ "y": 148,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "3c98a053.587f4"
+ "2945e727.0d1da8"
]
]
- },
+ },
{
- "id": "8b1af88f.90711",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1910,
- "y": 245,
- "z": "5c3ac6a5.48ce2",
+ "id": "e43c55f6.204948",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1905,
+ "y": 248,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "f7875e10.0e8698"
+ "775e4e34.10584"
]
]
- },
- {
- "id": "3c98a053.587f4",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "comments": "",
- "outputs": 1,
- "x": 2111,
- "y": 144,
- "z": "5c3ac6a5.48ce2",
- "wires": [
- [ ]
- ]
- },
- {
- "id": "f7875e10.0e8698",
- "type": "returnFailure",
- "name": "return failure",
- "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing Get odutopo rest api\" />\n",
- "comments": "",
- "x": 2106,
- "y": 245,
- "z": "5c3ac6a5.48ce2",
- "wires": [ ]
- },
- {
- "id": "876baee.788865",
- "type": "for",
- "name": "for each oduTopology",
- "xml": "<for index='nidx' start='0' end='`$ztetopology.output.topology.node-ref-id_length`' >",
- "comments": "",
- "outputs": 1,
- "x": 1538,
- "y": 333,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "2945e727.0d1da8",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 2106,
+ "y": 147,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "775e4e34.10584",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing Get odutopo rest api\" />\n",
+ "comments": "",
+ "x": 2101,
+ "y": 248,
+ "z": "540d3add.6d0b44",
+ "wires": []
+ },
+ {
+ "id": "14a63f8c.fb75e",
+ "type": "for",
+ "name": "for each topology",
+ "xml": "<for index='nidx' start='0' end='`$ztetopology.output.topology.node-ref-id_length`' >",
+ "comments": "",
+ "outputs": 1,
+ "x": 1533,
+ "y": 336,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "8b00f3a6.5f00a"
+ "5cd977af.6d2188"
]
]
- },
- {
- "id": "b480d508.259ad",
- "type": "update",
- "name": "save network-resource",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource' \n key='network-resource.network-id = $prop.zte.network-id' >\n<parameter name='network-id' value='`$prop.zte.network-id`' />\n<parameter name='client-id' value='`$prop.zte.client-id`' />\n<parameter name='te-topo-id' value='`$prop.zte.topo-id`' />\n<parameter name='provider-id' value='`$prop.zte.provider-id`' />",
- "comments": "",
- "outputs": 1,
- "x": 1993,
- "y": 381,
- "z": "5c3ac6a5.48ce2",
- "wires": [
- [ ]
- ]
- },
- {
- "id": "8b00f3a6.5f00a",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic='true'>",
- "atomic": "true",
- "comments": "",
- "outputs": 1,
- "x": 1736,
- "y": 333,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "4b8d1cd8.c32504",
+ "type": "update",
+ "name": "save network-resource",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource' \n key='network-resource.network-id = $prop.zte.network-id' >\n<parameter name='network-id' value='`$prop.zte.network-id`' />\n<parameter name='client-id' value='`$prop.zte.client-id`' />\n<parameter name='te-topo-id' value='`$prop.zte.topo-id`' />\n<parameter name='provider-id' value='`$prop.zte.provider-id`' />",
+ "comments": "",
+ "outputs": 1,
+ "x": 1637,
+ "y": 664,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "4a607014.a17fa",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1362,
+ "y": 562,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "5d5e9d41.c00664",
+ "type": "execute",
+ "name": "execute RestApiCallNode Get ZTE oduTopology",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/getzteodutoponodetemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-topology-details'`\" />\n<parameter name=\"restapiUser\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"ztetopologynode\"/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 2023,
+ "y": 414,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "5a3bb265.58783c",
- "9645ad1c.475eb",
- "b480d508.259ad"
+ "ddc8baae.4921b8",
+ "66e109c3.50ba98"
]
]
- },
+ },
{
- "id": "5a3bb265.58783c",
- "type": "execute",
- "name": "execute RestApiCallNode Get ZTE oduTopology",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/getzteodutoponodetemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-topology-details'`\" />\n<parameter name=\"restapiUser\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"ztetopologynode\"/>",
- "comments": "",
- "outputs": 1,
- "x": 2075,
- "y": 437,
- "z": "5c3ac6a5.48ce2",
+ "id": "66e109c3.50ba98",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2321,
+ "y": 495,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "942544d4.b8ec58",
- "8acdf237.4dae08"
+ "6aaa8b79.149894"
]
]
- },
+ },
{
- "id": "8acdf237.4dae08",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1509,
- "y": 689,
- "z": "5c3ac6a5.48ce2",
+ "id": "ddc8baae.4921b8",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2319,
+ "y": 414,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "6d8d547d.f1dd64"
+ "72846c1a.17d914"
]
]
- },
- {
- "id": "942544d4.b8ec58",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1510,
- "y": 564,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "72846c1a.17d914",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing Get odutopo node rest api\" />\n",
+ "comments": "",
+ "x": 2510,
+ "y": 414,
+ "z": "540d3add.6d0b44",
+ "wires": []
+ },
+ {
+ "id": "48652b97.2fedc4",
+ "type": "for",
+ "name": "for each oduTopology node",
+ "xml": "<for index='pidx' start='0' end='`$ztetopologynode.output.topology.node-ref-id_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1649,
+ "y": 749,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "faf343d1.9734d"
+ "2d5905b0.3495ea"
]
]
- },
- {
- "id": "faf343d1.9734d",
- "type": "returnFailure",
- "name": "return failure",
- "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing Get odutopo node rest api\" />\n",
- "comments": "",
- "x": 1701,
- "y": 564,
- "z": "5c3ac6a5.48ce2",
- "wires": [ ]
- },
- {
- "id": "6d8d547d.f1dd64",
- "type": "for",
- "name": "for each oduTopology node",
- "xml": "<for index='pidx' start='0' end='`$ztetopologynode.output.topology.node-ref-id_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1735,
- "y": 689,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "453fd3.8bd4502c",
+ "type": "update",
+ "name": "save pnf",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' >\n<parameter name='pnf-name' value='`$ztetopologynodedetails.output.node.uuid`' />\n<parameter name='pnf-id' value='`$ztetopologynodedetails.output.node.uuid`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='admin-status' value=\"up\" />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2738,
+ "y": 818,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "c9e69fe4.50fcd",
+ "type": "execute",
+ "name": "execute RestApiCallNode Get ZTE oduTopology Node details",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/getzteodutoponodedetailstemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-node-details'`\" />\n<parameter name=\"restapiUser\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"ztetopologynodedetails\"/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 2251,
+ "y": 748,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "a25bc521.5bb6a"
+ "e85faec3.821",
+ "68392c6a.4e1674"
]
]
- },
+ },
{
- "id": "f538452a.143d98",
- "type": "update",
- "name": "save pnf",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n key='pnf.pnf-name = $ztetopologynodedetails.node.uuid' >\n<parameter name='pnf-name' value='`$ztetopologynodedetails.node.uuid`' />\n<parameter name='pnf-id' value='`$ztetopologynodedetails.node.uuid`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='admin-status' value=\"up\" />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
- "comments": "",
- "outputs": 1,
- "x": 2743,
- "y": 815,
- "z": "5c3ac6a5.48ce2",
+ "id": "e85faec3.821",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1711,
+ "y": 833,
+ "z": "540d3add.6d0b44",
"wires": [
- [ ]
+ [
+ "854a7fc2.bfea9"
+ ]
]
- },
- {
- "id": "11d1e28b.963c9d",
- "type": "execute",
- "name": "execute RestApiCallNode Get ZTE oduTopology Node details",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/getzteodutoponodedetailstemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-node-details'`\" />\n<parameter name=\"restapiUser\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"ztetopologynodedetails\"/>",
- "comments": "",
- "outputs": 1,
- "x": 2337,
- "y": 688,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "854a7fc2.bfea9",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing Get odutopo node details rest api\" />\n",
+ "comments": "",
+ "x": 1861,
+ "y": 833,
+ "z": "540d3add.6d0b44",
+ "wires": []
+ },
+ {
+ "id": "68392c6a.4e1674",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1709,
+ "y": 938,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "55658f39.4a8e78",
- "c9a1df1.d5a80a"
+ "109fc05a.9da5c"
]
]
- },
+ },
{
- "id": "55658f39.4a8e78",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1716,
- "y": 830,
- "z": "5c3ac6a5.48ce2",
+ "id": "109fc05a.9da5c",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1892,
+ "y": 938,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "fd93d8e1.2313b"
+ "588ee473.9cb17c",
+ "6075f692.b2caa8",
+ "22a310d5.11293",
+ "7e2199ff.99b1c8"
]
]
- },
- {
- "id": "fd93d8e1.2313b",
- "type": "returnFailure",
- "name": "return failure",
- "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing Get odutopo node details rest api\" />\n",
- "comments": "",
- "x": 1866,
- "y": 830,
- "z": "5c3ac6a5.48ce2",
- "wires": [ ]
- },
- {
- "id": "c9a1df1.d5a80a",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1714,
- "y": 935,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "6075f692.b2caa8",
+ "type": "save",
+ "name": "save pnf relationship to network-resource in AAI",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $prop.zte.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-resource.network-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.zte.network-id`\" />",
+ "comments": "",
+ "outputs": 1,
+ "x": 2187,
+ "y": 1027,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "22a310d5.11293",
+ "type": "save",
+ "name": "save pnf relation with esr-thirdparty-sdnc",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $zte.prop.sdncRestApi.thirdpartySdnc.id' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $ztetopologynodedetails.output.node.uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$ztetopologynodedetails.output.node.uuid`\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2161,
+ "y": 1094,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "f00776db.4dbaf8",
+ "type": "execute",
+ "name": "execute RestApiCallNode Get ZTE oduTopology Node edge point details",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/getzteodutoponodenepdetailstemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-node-edge-point-details'`\" />\n<parameter name=\"restapiUser\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"ztetopologynodenepdetails\"/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 2792,
+ "y": 1275,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "77de9cee.930a9c"
+ "345328c1.c40d08",
+ "72be01d7.1258c"
]
]
- },
+ },
{
- "id": "77de9cee.930a9c",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1897,
- "y": 935,
- "z": "5c3ac6a5.48ce2",
+ "id": "6e627eca.00e4a",
+ "type": "for",
+ "name": "for each oduTopology node nep name",
+ "xml": "<for index='tidx' start='0' end='`$ztetopologynodenepdetails.output.node-edge-point.name_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2663,
+ "y": 1510,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "1b4283dd.592abc",
- "eecb4617.57e91",
- "7e0ea1c3.cc762",
- "61c3b72.b4d2c48"
+ "7cffba09.0e7a94"
]
]
- },
- {
- "id": "1b4283dd.592abc",
- "type": "save",
- "name": "save pnf relationship to network-resource in AAI",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n key='pnf.pnf-name = $ztetopologynodedetails.node.uuid' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"'/network/network-resources/network-resource/' + 'zteNetwork'\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-resource.network-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"zteNetwork\" />",
- "comments": "",
- "outputs": 1,
- "x": 2192,
- "y": 1024,
- "z": "5c3ac6a5.48ce2",
- "wires": [
- [ ]
- ]
- },
- {
- "id": "eecb4617.57e91",
- "type": "save",
- "name": "save pnf relation with esr-thirdparty-sdnc",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $zte.prop.sdncRestApi.thirdpartySdnc.id' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $ztetopologynodedetails.node.uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$ztetopologynodedetails.node.uuid`\" />\n",
- "comments": "",
- "outputs": 1,
- "x": 2166,
- "y": 1091,
- "z": "5c3ac6a5.48ce2",
- "wires": [
- [ ]
- ]
- },
- {
- "id": "7f6ccbfa.b45a74",
- "type": "execute",
- "name": "execute RestApiCallNode Get ZTE oduTopology Node edge point details",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/getzteodutoponodenepdetailstemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-node-edge-point-details'`\" />\n<parameter name=\"restapiUser\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"ztetopologynodenepdetails\"/>",
- "comments": "",
- "outputs": 1,
- "x": 2797,
- "y": 1272,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "7cffba09.0e7a94",
+ "type": "execute",
+ "name": "contains client",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n <parameter name=\"source\" value=\"`$ztetopologynodenepdetails.node-edge-point.name[tidx].value`\"/>\n <parameter name=\"target\" value=\"client\"/>\n ",
+ "comments": "",
+ "outputs": 1,
+ "x": 2976,
+ "y": 1510,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "38b0f2d1.620906",
- "7b5490b3.a1044"
+ "36d5c2cc.d55c4e",
+ "c6db88ea.32d128"
]
]
- },
+ },
{
- "id": "df44c30b.78cdc",
- "type": "for",
- "name": "for each oduTopology node nep name",
- "xml": "<for index='tidx' start='0' end='`$ztetopologynodenepdetails.output.node-edge-point.name_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 2687,
- "y": 1507,
- "z": "5c3ac6a5.48ce2",
+ "id": "72be01d7.1258c",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2386,
+ "y": 1510,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "a99510c.7985ef"
+ "6e627eca.00e4a"
]
]
- },
+ },
{
- "id": "a99510c.7985ef",
- "type": "execute",
- "name": "contains client",
- "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n <parameter name=\"source\" value=\"`$ztetopologynodenepdetails.node-edge-point.name[tidx].value`\"/>\n <parameter name=\"target\" value=\"client\"/>\n ",
- "comments": "",
- "outputs": 1,
- "x": 3028,
- "y": 1507,
- "z": "5c3ac6a5.48ce2",
+ "id": "345328c1.c40d08",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2386,
+ "y": 1419,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "81ab5973.689e",
- "3487141b.53f6bc"
+ "fc122084.5176a"
]
]
- },
- {
- "id": "81ab5973.689e",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 3240,
- "y": 1507,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "fc122084.5176a",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing Get odutopo node edge point details rest api\" />\n",
+ "comments": "",
+ "x": 2739,
+ "y": 1417,
+ "z": "540d3add.6d0b44",
+ "wires": []
+ },
+ {
+ "id": "2aeff331.c3498c",
+ "type": "set",
+ "name": "set zte unique-ltpId",
+ "xml": "<set>\n<parameter name='zte-unique-ltpId' value=\"`'nodeId-' + $ztetopologynodedetails.output.node.uuid + '-ltpId-' + $ztetopologynodenepdetails.output.node-edge-point.uuid`\" />\n",
+ "comments": "",
+ "x": 3687,
+ "y": 1510,
+ "z": "540d3add.6d0b44",
+ "wires": []
+ },
+ {
+ "id": "62e34399.97db9c",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 3473,
+ "y": 1510,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "ce449c28.7c7b3"
+ "2aeff331.c3498c",
+ "873e3131.8335a",
+ "f75f21b7.efa77"
]
]
- },
+ },
{
- "id": "7b5490b3.a1044",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2391,
- "y": 1507,
- "z": "5c3ac6a5.48ce2",
+ "id": "e8680f6b.26d67",
+ "type": "update",
+ "name": "save p-interface",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid\n AND p-interface.interface-name = $zte-unique-ltpId' > \n<parameter name='interface-name' value='`$zte-unique-ltpId`' />\n<parameter name='network-ref' value=\"`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`\" />\n<parameter name='transparent' value=\"true\" />\n<parameter name='speed-value' value='`$zte-bandwidth`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='in-maint' value=\"true\" />",
+ "comments": "",
+ "outputs": 1,
+ "x": 4112,
+ "y": 1702,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ [
+ "eed25adb.58f488",
+ "67b16207.7b846c"
+ ]
+ ]
+ },
+ {
+ "id": "209b7c79.7331c4",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 3469,
+ "y": 1436,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "eed25adb.58f488",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 4300,
+ "y": 1636,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "df44c30b.78cdc"
+ "e4358a9c.200a58"
]
]
- },
+ },
{
- "id": "38b0f2d1.620906",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2391,
- "y": 1416,
- "z": "5c3ac6a5.48ce2",
+ "id": "67b16207.7b846c",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 4300,
+ "y": 1701,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "e2cba4e6.c2e7a"
+ "6efad235.03a13c"
]
]
- },
- {
- "id": "e2cba4e6.c2e7a",
- "type": "returnFailure",
- "name": "return failure",
- "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing Get odutopo node edge point details rest api\" />\n",
- "comments": "",
- "x": 2763,
- "y": 1416,
- "z": "5c3ac6a5.48ce2",
- "wires": [ ]
- },
- {
- "id": "3bf4d883.90249",
- "type": "set",
- "name": "set zte unique-ltpId",
- "xml": "<set>\n<parameter name='zte-unique-ltpId' value=\"`'nodeId-' + $ztetopologynodedetails.node.uuid + '-ltpId-' + $ztetopologynodenepdetails.node-edge-point.uuid`\" />\n",
- "comments": "",
- "x": 3692,
- "y": 1507,
- "z": "5c3ac6a5.48ce2",
- "wires": [ ]
- },
- {
- "id": "ce449c28.7c7b3",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 3478,
- "y": 1507,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "e4358a9c.200a58",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 4489,
+ "y": 1635,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "588ee473.9cb17c",
+ "type": "switchNode",
+ "name": "switch",
+ "xml": "<switch test=\"`$ztetopologynodedetails.output.node.global-state-pac.operational-state == 'ENABLED'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2062,
+ "y": 937,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "3bf4d883.90249",
- "613c2ada.da8a7c",
- "ab8b449e.5887e"
+ "e2329ee1.9a7b6",
+ "eaec1cbd.8f432"
]
]
- },
+ },
{
- "id": "d2080e42.04e638",
- "type": "update",
- "name": "save p-interface",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $ztetopologynodedetails.node.uuid\n AND p-interface.interface-name = $zte-unique-ltpId' > \n<parameter name='interface-name' value='`$zte-unique-ltpId`' />\n<parameter name='network-ref' value=\"`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`\" />\n<parameter name='transparent' value=\"true\" />\n<parameter name='speed-value' value='`$zte-bandwidth`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='in-maint' value=\"true\" />\n\"`'nodeId-' + $node.node-id + '-ltpId-' + $tp.te-tp-id`\"",
- "comments": "",
- "outputs": 1,
- "x": 4117,
- "y": 1699,
- "z": "5c3ac6a5.48ce2",
+ "id": "e2329ee1.9a7b6",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2263,
+ "y": 886,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "768c64d0.f7a43c",
- "1c2dd58d.1dea72"
+ "67b87346.c6a5bc"
]
]
- },
+ },
{
- "id": "3487141b.53f6bc",
- "type": "outcomeFalse",
- "name": "false",
- "xml": "<outcome value='false'>\n",
- "comments": "",
- "outputs": 1,
- "x": 3239,
- "y": 1433,
- "z": "5c3ac6a5.48ce2",
+ "id": "eaec1cbd.8f432",
+ "type": "outcomeFalse",
+ "name": "false",
+ "xml": "<outcome value='false'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2262,
+ "y": 957,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "c0e9d951.a60da8"
+ "a037a75a.ae6708"
]
]
- },
- {
- "id": "c0e9d951.a60da8",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 3474,
- "y": 1433,
- "z": "5c3ac6a5.48ce2",
- "wires": [
- [ ]
- ]
- },
- {
- "id": "768c64d0.f7a43c",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 4305,
- "y": 1633,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "67b87346.c6a5bc",
+ "type": "switchNode",
+ "name": "switch",
+ "xml": "<switch test=\"`$ztetopologynodedetails.output.node.global-state-pac.administrative-state == 'LOCKED'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2419,
+ "y": 886,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "faf97108.30335"
+ "ba21f30c.c4435",
+ "ab98b4e0.12a4f8"
]
]
- },
+ },
{
- "id": "1c2dd58d.1dea72",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 4305,
- "y": 1698,
- "z": "5c3ac6a5.48ce2",
+ "id": "a037a75a.ae6708",
+ "type": "switchNode",
+ "name": "switch",
+ "xml": "<switch test=\"`$ztetopologynodedetails.output.node.global-state-pac.administrative-state == 'LOCKED'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2420,
+ "y": 957,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "48e7c11a.010d9"
+ "90096244.386ff",
+ "b1e15aa1.abad48"
]
]
- },
- {
- "id": "faf97108.30335",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 4494,
- "y": 1632,
- "z": "5c3ac6a5.48ce2",
- "wires": [
- [ ]
- ]
- },
- {
- "id": "7e0ea1c3.cc762",
- "type": "switchNode",
- "name": "switch",
- "xml": "<switch test=\"`$ztetopologynodedetails.node.global-state-pac.operational-state == 'ENABLED'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 2067,
- "y": 934,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "ba21f30c.c4435",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2582,
+ "y": 818,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "c9232bab.411fe",
- "a6b9bca2.6fc2b"
+ "453fd3.8bd4502c"
]
]
- },
+ },
{
- "id": "c9232bab.411fe",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2268,
- "y": 883,
- "z": "5c3ac6a5.48ce2",
+ "id": "ab98b4e0.12a4f8",
+ "type": "outcomeFalse",
+ "name": "false",
+ "xml": "<outcome value='false'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2585,
+ "y": 886,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "18266e26.721f3a"
+ "1c144406.5ea9fc"
]
]
- },
+ },
{
- "id": "a6b9bca2.6fc2b",
- "type": "outcomeFalse",
- "name": "false",
- "xml": "<outcome value='false'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2267,
- "y": 954,
- "z": "5c3ac6a5.48ce2",
+ "id": "90096244.386ff",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2586,
+ "y": 957,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "3e090a83.a9b3c6"
+ "65322994.d1f668"
]
]
- },
+ },
{
- "id": "18266e26.721f3a",
- "type": "switchNode",
- "name": "switch",
- "xml": "<switch test=\"`$ztetopologynodedetails.node.global-state-pac.administrative-state == 'LOCKED'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 2424,
- "y": 883,
- "z": "5c3ac6a5.48ce2",
+ "id": "b1e15aa1.abad48",
+ "type": "outcomeFalse",
+ "name": "false",
+ "xml": "<outcome value='false'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2587,
+ "y": 1026,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ [
+ "97879765.7b8ac8"
+ ]
+ ]
+ },
+ {
+ "id": "1c144406.5ea9fc",
+ "type": "update",
+ "name": "save pnf",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' >\n<parameter name='pnf-name' value='`$ztetopologynodedetails.output.node.uuid`' />\n<parameter name='pnf-id' value='`$ztetopologynodedetails.output.node.uuid`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='admin-status' value=\"down\" />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2738,
+ "y": 886,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "65322994.d1f668",
+ "type": "update",
+ "name": "save pnf",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' >\n<parameter name='pnf-name' value='`$ztetopologynodedetails.output.node.uuid`' />\n<parameter name='pnf-id' value='`$ztetopologynodedetails.output.node.uuid`' />\n<parameter name='operational-status' value=\"down\" />\n<parameter name='admin-status' value=\"up\" />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2735,
+ "y": 957,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "97879765.7b8ac8",
+ "type": "update",
+ "name": "save pnf",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' >\n<parameter name='pnf-name' value='`$ztetopologynodedetails.output.node.uuid`' />\n<parameter name='pnf-id' value='`$ztetopologynodedetails.output.node.uuid`' />\n<parameter name='operational-status' value=\"down\" />\n<parameter name='admin-status' value=\"down\" />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2736,
+ "y": 1026,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "873e3131.8335a",
+ "type": "switchNode",
+ "name": "test operational-state",
+ "xml": "<switch test=\"`$ztetopologynodedetails.output.node.global-state-pac.operational-state == 'ENABLED'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3687,
+ "y": 1699,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "18fde8e6.1e96f7",
- "1bdb1333.5ff0dd"
+ "dad7304e.123b4",
+ "cce973ee.e8539"
]
]
- },
+ },
{
- "id": "3e090a83.a9b3c6",
- "type": "switchNode",
- "name": "switch",
- "xml": "<switch test=\"`$ztetopologynodedetails.node.global-state-pac.administrative-state == 'LOCKED'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 2425,
- "y": 954,
- "z": "5c3ac6a5.48ce2",
+ "id": "dad7304e.123b4",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3903,
+ "y": 1702,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "9439c895.756d",
- "c071256a.4164e8"
+ "e8680f6b.26d67"
]
]
- },
+ },
{
- "id": "18fde8e6.1e96f7",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2587,
- "y": 815,
- "z": "5c3ac6a5.48ce2",
+ "id": "cce973ee.e8539",
+ "type": "outcomeFalse",
+ "name": "false",
+ "xml": "<outcome value='false'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3906,
+ "y": 1816,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "f538452a.143d98"
+ "a9bffbab.0baeb8"
]
]
- },
+ },
{
- "id": "1bdb1333.5ff0dd",
- "type": "outcomeFalse",
- "name": "false",
- "xml": "<outcome value='false'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2590,
- "y": 883,
- "z": "5c3ac6a5.48ce2",
+ "id": "a9bffbab.0baeb8",
+ "type": "update",
+ "name": "save p-interface",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid\n AND p-interface.interface-name = $zte-unique-ltpId' > \n<parameter name='interface-name' value='`$zte-unique-ltpId`' />\n<parameter name='network-ref' value=\"`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`\" />\n<parameter name='transparent' value=\"true\" />\n<parameter name='speed-value' value='`$zte-bandwidth`' />\n<parameter name='operational-status' value=\"down\" />\n<parameter name='in-maint' value=\"true\" />\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 4113,
+ "y": 1816,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "5f1efe1e.eaa66"
+ "a6acf286.7190a",
+ "655a7457.79319c"
]
]
- },
+ },
{
- "id": "9439c895.756d",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2591,
- "y": 954,
- "z": "5c3ac6a5.48ce2",
+ "id": "a6acf286.7190a",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 4301,
+ "y": 1816,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "e6e244a4.0300f"
+ "f73009af.d52ca8"
]
]
- },
+ },
{
- "id": "c071256a.4164e8",
- "type": "outcomeFalse",
- "name": "false",
- "xml": "<outcome value='false'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2592,
- "y": 1023,
- "z": "5c3ac6a5.48ce2",
+ "id": "655a7457.79319c",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 4298,
+ "y": 1877,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "79274805.8fd178"
+ "367baa79.63cc46"
]
]
- },
- {
- "id": "5f1efe1e.eaa66",
- "type": "update",
- "name": "save pnf",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n key='pnf.pnf-name = $ztetopologynodedetails.node.uuid' >\n<parameter name='pnf-name' value='`$ztetopologynodedetails.node.uuid`' />\n<parameter name='pnf-id' value='`$ztetopologynodedetails.node.uuid`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='admin-status' value=\"down\" />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
- "comments": "",
- "outputs": 1,
- "x": 2743,
- "y": 883,
- "z": "5c3ac6a5.48ce2",
- "wires": [
- [ ]
- ]
- },
- {
- "id": "e6e244a4.0300f",
- "type": "update",
- "name": "save pnf",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n key='pnf.pnf-name = $ztetopologynodedetails.node.uuid' >\n<parameter name='pnf-name' value='`$ztetopologynodedetails.node.uuid`' />\n<parameter name='pnf-id' value='`$ztetopologynodedetails.node.uuid`' />\n<parameter name='operational-status' value=\"down\" />\n<parameter name='admin-status' value=\"up\" />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
- "comments": "",
- "outputs": 1,
- "x": 2740,
- "y": 954,
- "z": "5c3ac6a5.48ce2",
- "wires": [
- [ ]
- ]
- },
- {
- "id": "79274805.8fd178",
- "type": "update",
- "name": "save pnf",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n key='pnf.pnf-name = $ztetopologynodedetails.node.uuid' >\n<parameter name='pnf-name' value='`$ztetopologynodedetails.node.uuid`' />\n<parameter name='pnf-id' value='`$ztetopologynodedetails.node.uuid`' />\n<parameter name='operational-status' value=\"down\" />\n<parameter name='admin-status' value=\"down\" />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
- "comments": "",
- "outputs": 1,
- "x": 2741,
- "y": 1023,
- "z": "5c3ac6a5.48ce2",
- "wires": [
- [ ]
- ]
- },
- {
- "id": "613c2ada.da8a7c",
- "type": "switchNode",
- "name": "test operational-state",
- "xml": "<switch test=\"`$ztetopologynodedetails.node.global-state-pac.operational-state == 'ENABLED'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 3692,
- "y": 1696,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "f73009af.d52ca8",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 4487,
+ "y": 1816,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "6efad235.03a13c",
+ "type": "update",
+ "name": "save p-interface",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid\n AND p-interface.interface-name = $zte-unique-ltpId' > \n<parameter name='interface-name' value='`$zte-unique-ltpId`' />\n<parameter name='network-ref' value=\"`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`\" />\n<parameter name='transparent' value=\"true\" />\n<parameter name='speed-value' value='`$zte-bandwidth`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='in-maint' value=\"true\" />\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 4520,
+ "y": 1701,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "367baa79.63cc46",
+ "type": "update",
+ "name": "save p-interface",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid\n AND p-interface.interface-name = $zte-unique-ltpId' > \n<parameter name='interface-name' value='`$zte-unique-ltpId`' />\n<parameter name='network-ref' value=\"`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`\" />\n<parameter name='transparent' value=\"true\" />\n<parameter name='speed-value' value='`$zte-bandwidth`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='in-maint' value=\"true\" />\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 4514,
+ "y": 1877,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "bcbc6e2c.3314",
+ "type": "set",
+ "name": "set params",
+ "xml": "<set>\n<parameter name='prop.zte.network-id' value=\"zteNetwork\" />\n<parameter name='prop.zte.client-id' value=\"zteClient1\" />\n<parameter name='prop.zte.topo-id' value=\"zteTopo1\" />\n<parameter name='prop.zte.provider-id' value=\"zteProvider1\" />\n",
+ "comments": "",
+ "x": 1604,
+ "y": 597,
+ "z": "540d3add.6d0b44",
+ "wires": []
+ },
+ {
+ "id": "2d5905b0.3495ea",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1871,
+ "y": 749,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "e65d9fab.c131f",
- "fc04748b.c0e76"
+ "c9e69fe4.50fcd",
+ "69930609.325f68"
]
]
- },
- {
- "id": "e65d9fab.c131f",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 3908,
- "y": 1699,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "69930609.325f68",
+ "type": "set",
+ "name": "set odutopo node name",
+ "xml": "<set>\n<parameter name='prop.zte.odutopo.node.name' value='`$ztetopologynode.output.topology.node-ref-id[$pidx]`' />\n",
+ "comments": "",
+ "x": 2135,
+ "y": 674,
+ "z": "540d3add.6d0b44",
+ "wires": []
+ },
+ {
+ "id": "e65cd4cb.61e0c8",
+ "type": "set",
+ "name": "set odutopo node nep uuid",
+ "xml": "<set>\n<parameter name='prop.zte.odutopo.node.nep.uuid' value='`$ztetopologynodedetails.output.node.node-edge-point-id[$ridx]`' />\n",
+ "comments": "",
+ "x": 2652,
+ "y": 1158,
+ "z": "540d3add.6d0b44",
+ "wires": []
+ },
+ {
+ "id": "7e2199ff.99b1c8",
+ "type": "for",
+ "name": "for each oduTopology node nep",
+ "xml": "<for index='ridx' start='0' end='`$ztetopologynodedetails.output.node.node-edge-point-id_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2132,
+ "y": 1159,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "d2080e42.04e638"
+ "cf240b59.497fb8"
]
]
- },
+ },
{
- "id": "fc04748b.c0e76",
- "type": "outcomeFalse",
- "name": "false",
- "xml": "<outcome value='false'>\n",
- "comments": "",
- "outputs": 1,
- "x": 3911,
- "y": 1813,
- "z": "5c3ac6a5.48ce2",
+ "id": "cf240b59.497fb8",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 2397,
+ "y": 1158,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ [
+ "e65cd4cb.61e0c8",
+ "f00776db.4dbaf8"
+ ]
+ ]
+ },
+ {
+ "id": "f75f21b7.efa77",
+ "type": "set",
+ "name": "set zte bandwidth",
+ "xml": "<set>\n<parameter name='zte-bandwidth' value='`1250000000 * $ztetopologynodenepdetails.output.node-edge-point.lp[0].odu-nep-pac.odu-capacity`' />\n",
+ "comments": "",
+ "x": 3679,
+ "y": 1598,
+ "z": "540d3add.6d0b44",
+ "wires": []
+ },
+ {
+ "id": "16563079.8d5e2",
+ "type": "execute",
+ "name": "execute Properties",
+ "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": 1551,
+ "y": 114,
+ "z": "540d3add.6d0b44",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "ca881019.9ce88",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1353,
+ "y": 664,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "278d5ea5.1b82ca"
+ "bcbc6e2c.3314",
+ "4b8d1cd8.c32504",
+ "48652b97.2fedc4"
]
]
- },
+ },
{
- "id": "278d5ea5.1b82ca",
- "type": "update",
- "name": "save p-interface",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $ztetopologynodedetails.node.uuid\n AND p-interface.interface-name = $zte-unique-ltpId' > \n<parameter name='interface-name' value='`$zte-unique-ltpId`' />\n<parameter name='network-ref' value=\"`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`\" />\n<parameter name='transparent' value=\"true\" />\n<parameter name='speed-value' value='`$zte-bandwidth`' />\n<parameter name='operational-status' value=\"down\" />\n<parameter name='in-maint' value=\"true\" />\n\n",
- "comments": "",
- "outputs": 1,
- "x": 4118,
- "y": 1813,
- "z": "5c3ac6a5.48ce2",
+ "id": "6aaa8b79.149894",
+ "type": "switchNode",
+ "name": "switch",
+ "xml": "<switch test=\"`$ztetopologynode.output.topology.layer-protocol-name[0] == 'ODU'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1059,
+ "y": 562,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "775b7d93.cb0874",
- "ee21bf18.cecaa"
+ "3cbcd27b.e8a5ce",
+ "e7e2532e.34e23"
]
]
- },
+ },
{
- "id": "775b7d93.cb0874",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 4306,
- "y": 1813,
- "z": "5c3ac6a5.48ce2",
+ "id": "e7e2532e.34e23",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1204,
+ "y": 664,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "c0aead49.1958f8"
+ "ca881019.9ce88"
]
]
- },
+ },
{
- "id": "ee21bf18.cecaa",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 4303,
- "y": 1874,
- "z": "5c3ac6a5.48ce2",
+ "id": "3cbcd27b.e8a5ce",
+ "type": "outcomeFalse",
+ "name": "false",
+ "xml": "<outcome value='false'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1206,
+ "y": 562,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "54ef23c0.7c3d8c"
+ "4a607014.a17fa"
]
]
- },
- {
- "id": "c0aead49.1958f8",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 4492,
- "y": 1813,
- "z": "5c3ac6a5.48ce2",
- "wires": [
- [ ]
- ]
- },
- {
- "id": "48e7c11a.010d9",
- "type": "update",
- "name": "save p-interface",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $ztetopologynodedetails.node.uuid\n AND p-interface.interface-name = $zte-unique-ltpId' > \n<parameter name='interface-name' value='`$zte-unique-ltpId`' />\n<parameter name='network-ref' value=\"`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`\" />\n<parameter name='transparent' value=\"true\" />\n<parameter name='speed-value' value='`$zte-bandwidth`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='in-maint' value=\"true\" />\n\n",
- "comments": "",
- "outputs": 1,
- "x": 4525,
- "y": 1698,
- "z": "5c3ac6a5.48ce2",
- "wires": [
- [ ]
- ]
- },
- {
- "id": "54ef23c0.7c3d8c",
- "type": "update",
- "name": "save p-interface",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $ztetopologynodedetails.node.uuid\n AND p-interface.interface-name = $zte-unique-ltpId' > \n<parameter name='interface-name' value='`$zte-unique-ltpId`' />\n<parameter name='network-ref' value=\"`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`\" />\n<parameter name='transparent' value=\"true\" />\n<parameter name='speed-value' value='`$zte-bandwidth`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='in-maint' value=\"true\" />\n\n",
- "comments": "",
- "outputs": 1,
- "x": 4519,
- "y": 1874,
- "z": "5c3ac6a5.48ce2",
- "wires": [
- [ ]
- ]
- },
- {
- "id": "9645ad1c.475eb",
- "type": "set",
- "name": "set params",
- "xml": "<set>\n<parameter name='prop.zte.network-id' value=\"zteNetwork\" />\n<parameter name='prop.zte.client-id' value=\"zteClient1\" />\n<parameter name='prop.zte.topo-id' value=\"zteTopo1\" />\n<parameter name='prop.zte.provider-id' value=\"zteProvider1\" />\n<parameter name='prop.zte.odutopo.name' value='`$ztetopology.output.topology.node-ref-id[$nidx]`' />\n",
- "comments": "",
- "x": 1957,
- "y": 333,
- "z": "5c3ac6a5.48ce2",
- "wires": [ ]
- },
- {
- "id": "a25bc521.5bb6a",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1957,
- "y": 689,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "9b66d171.8f74a",
+ "type": "set",
+ "name": "set topo name",
+ "xml": "<set>\n<parameter name='prop.zte.odutopo.name' value='`$ztetopology.output.topology.node-ref-id[$nidx]`' />\n",
+ "comments": "",
+ "x": 1916,
+ "y": 336,
+ "z": "540d3add.6d0b44",
+ "wires": []
+ },
+ {
+ "id": "5cd977af.6d2188",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1725,
+ "y": 336,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "11d1e28b.963c9d",
- "9403cfc0.48bae8"
+ "9b66d171.8f74a",
+ "5d5e9d41.c00664"
]
]
- },
- {
- "id": "9403cfc0.48bae8",
- "type": "set",
- "name": "set odutopo node name",
- "xml": "<set>\n<parameter name='prop.zte.odutopo.node.name' value='`$ztetopologynode.output.topology.node-ref-id[$pidx]`' />\n",
- "comments": "",
- "x": 2221,
- "y": 614,
- "z": "5c3ac6a5.48ce2",
- "wires": [ ]
- },
- {
- "id": "d1f5b2ac.93ca5",
- "type": "set",
- "name": "set odutopo node nep uuid",
- "xml": "<set>\n<parameter name='prop.zte.odutopo.node.nep.uuid' value='`$ztetopologynodedetails.output.node.node-edge-point-id[$ridx]`' />\n",
- "comments": "",
- "x": 2657,
- "y": 1155,
- "z": "5c3ac6a5.48ce2",
- "wires": [ ]
- },
- {
- "id": "61c3b72.b4d2c48",
- "type": "for",
- "name": "for each oduTopology node nep",
- "xml": "<for index='ridx' start='0' end='`$ztetopologynodedetails.output.node.node-edge-point-id_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 2137,
- "y": 1156,
- "z": "5c3ac6a5.48ce2",
+ },
+ {
+ "id": "36d5c2cc.d55c4e",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3216,
+ "y": 1510,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "ba3d5d3.bbc9ca"
+ "62e34399.97db9c"
]
]
- },
+ },
{
- "id": "ba3d5d3.bbc9ca",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 2402,
- "y": 1155,
- "z": "5c3ac6a5.48ce2",
+ "id": "c6db88ea.32d128",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3210,
+ "y": 1437,
+ "z": "540d3add.6d0b44",
"wires": [
[
- "d1f5b2ac.93ca5",
- "7f6ccbfa.b45a74"
+ "209b7c79.7331c4"
]
]
- },
- {
- "id": "ab8b449e.5887e",
- "type": "set",
- "name": "set zte bandwidth",
- "xml": "<set>\n<parameter name='zte-bandwidth' value='`1000 * 1000000 * 1.25 * $ztetopologynodenepdetails.node-edge-point.lp[0].odu-nep-pac.oducapacity`' />\n",
- "comments": "",
- "x": 3684,
- "y": 1595,
- "z": "5c3ac6a5.48ce2",
- "wires": [ ]
}
] \ No newline at end of file
diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
index aef62059..5596f882 100644
--- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
@@ -1,470 +1,533 @@
[
- {
- "id": "1d39536e.bcea8d",
- "type": "other",
- "name": "update",
- "xml": "<outcome value='Update'>\n",
- "comments": "",
- "outputs": 1,
- "x": 630.0000991821289,
- "y": 392.6666978597641,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "eb33b12.26d255"
- ]
- ]
- },
- {
- "id": "e7963432.3c05f8",
- "type": "other",
- "name": "delete",
- "xml": "<outcome value='delete'>\n",
- "comments": "",
- "outputs": 1,
- "x": 666.2222137451172,
- "y": 594.3334935903549,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "bdac689.e471598"
- ]
- ]
- },
- {
- "id": "bdac689.e471598",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 816.6668586730957,
- "y": 589.3335460424423,
- "z": "5f9799f8.016aa8",
- "wires": [
- []
- ]
- },
- {
- "id": "27946419.4db7ac",
- "type": "comment",
- "name": "TODO: Delete topology from AAI",
- "info": "",
- "comments": "",
- "x": 774.3335266113281,
- "y": 545.0001710653305,
- "z": "5f9799f8.016aa8",
- "wires": []
- },
- {
- "id": "1b12380b.1bb078",
- "type": "switchNode",
- "name": "switch aai-event-trigger",
- "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 422.5556640625,
- "y": 461.2222236394882,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "1d39536e.bcea8d",
- "e7963432.3c05f8"
- ]
- ]
- },
- {
- "id": "8b3f9b57.fb7ca8",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 1224.333854675293,
- "y": 386.11125123500824,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "6bd0a191.4d206",
- "1e8929fa.00dd96",
- "f740e66d.fb9468"
- ]
- ]
- },
- {
- "id": "d4ab9cef.99595",
- "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": 1480.9933624267578,
- "y": 248.0305026769638,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "9a5236ed.1ea128",
- "5a03214d.f8c65"
- ]
- ]
- },
- {
- "id": "9a5236ed.1ea128",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1715.9933624267578,
- "y": 226.0305026769638,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "8343226c.c2c78"
- ]
- ]
- },
- {
- "id": "5a03214d.f8c65",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1708.2433624267578,
- "y": 279.67338597774506,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "194b3286.c3d03d"
- ]
- ]
- },
- {
- "id": "8343226c.c2c78",
- "type": "set",
- "name": "set token-id",
- "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
- "comments": "",
- "x": 1869.9933624267578,
- "y": 227.0305026769638,
- "z": "5f9799f8.016aa8",
- "wires": []
- },
- {
- "id": "6bd0a191.4d206",
- "type": "execute",
- "name": "execute RestApiCallNode Get Topology",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\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=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"topology\"/>\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": 1484.326789855957,
- "y": 341.7342404127121,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "7690c31d.5032fc",
- "3ee8b658.f04c7a"
- ]
- ]
- },
- {
- "id": "7690c31d.5032fc",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1742.882122039795,
- "y": 319.7342222929001,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "5faa0ea5.47b54"
- ]
- ]
- },
- {
- "id": "5faa0ea5.47b54",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "comments": "",
- "outputs": 1,
- "x": 1918.4376525878906,
- "y": 317.40094459056854,
- "z": "5f9799f8.016aa8",
- "wires": [
- []
- ]
- },
- {
- "id": "30f38062.10fc2",
- "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 rest api\" />\n",
- "comments": "",
- "x": 1926.659927368164,
- "y": 391.6230581998825,
- "z": "5f9799f8.016aa8",
- "wires": []
- },
- {
- "id": "3ee8b658.f04c7a",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1748.3266067504883,
- "y": 390.8452876806259,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "30f38062.10fc2"
- ]
- ]
- },
- {
- "id": "d6f1376d.103958",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 77,
- "y": 168.00000381469727,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "b042ac6b.0b2f5"
- ]
- ]
- },
- {
- "id": "b042ac6b.0b2f5",
- "type": "service-logic",
- "name": "DataChange ${project.version}",
- "module": "DataChange",
- "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='DataChange' version='${project.version}'>",
- "outputs": 1,
- "x": 201.11112594604492,
- "y": 242.44445884227753,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "fa0cd6cd.4d3678"
- ]
- ]
- },
- {
- "id": "fa0cd6cd.4d3678",
- "type": "method",
- "name": "method esr-thirdparty-sdnc-discovery",
- "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 297.5556869506836,
- "y": 353.2222398519516,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "17dbe4b2.90a36b"
- ]
- ]
- },
- {
- "id": "17dbe4b2.90a36b",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 205.77791595458984,
- "y": 462.11121785640717,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "1b12380b.1bb078"
- ]
- ]
- },
- {
- "id": "1e8929fa.00dd96",
- "type": "for",
- "name": "for each Network",
- "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1416.481559753418,
- "y": 469.2221792936325,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "7ac7e4f1.ee6b4c"
- ]
- ]
- },
- {
- "id": "7ac7e4f1.ee6b4c",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1606.4815216064453,
- "y": 476.99997222423553,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "1bdd6882.262a87",
- "73f341e0.4fb9a"
- ]
- ]
- },
- {
- "id": "1bdd6882.262a87",
- "type": "call",
- "name": "call update-network-to-aai",
- "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1859.8149433135986,
- "y": 540.3333424329758,
- "z": "5f9799f8.016aa8",
- "wires": [
- []
- ]
- },
- {
- "id": "73f341e0.4fb9a",
- "type": "set",
- "name": "set network",
- "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
- "comments": "",
- "x": 1812.0370635986328,
- "y": 458.11108672618866,
- "z": "5f9799f8.016aa8",
- "wires": []
- },
- {
- "id": "194b3286.c3d03d",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1869.8147583007812,
- "y": 274.77776515483856,
- "z": "5f9799f8.016aa8",
- "wires": [
- []
- ]
- },
- {
- "id": "f5a2b8a2.ec17c8",
- "type": "comment",
- "name": "Do Nothing",
- "info": "",
- "comments": "",
- "x": 2005.3703320821123,
- "y": 273.66664090421466,
- "z": "5f9799f8.016aa8",
- "wires": []
- },
- {
- "id": "86797eba.6e658",
- "type": "switchNode",
- "name": "switch type",
- "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 905.0002479553223,
- "y": 395.00002896785736,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "5d555655.1a63b8",
- "698c0c25.f99474"
- ]
- ]
- },
- {
- "id": "eb33b12.26d255",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 760.0000839233398,
- "y": 393.00001752376556,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "86797eba.6e658"
- ]
- ]
- },
- {
- "id": "5d555655.1a63b8",
- "type": "other",
- "name": "SOTN",
- "xml": "<outcome value='SOTN'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1059.0000305175781,
- "y": 350.99999940395355,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "8b3f9b57.fb7ca8"
- ]
- ]
- },
- {
- "id": "698c0c25.f99474",
- "type": "other",
- "name": "other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1056.0000305175781,
- "y": 475.0000070333481,
- "z": "5f9799f8.016aa8",
- "wires": [
- [
- "8899e728.ec90b8"
- ]
- ]
- },
- {
- "id": "8899e728.ec90b8",
- "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=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",
- "comments": "",
- "x": 1204.7727355957031,
- "y": 474.4391750097275,
- "z": "5f9799f8.016aa8",
- "wires": []
- },
- {
- "id": "f740e66d.fb9468",
- "type": "execute",
- "name": "execute Properties",
- "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": 1423.03125,
- "y": 193.03125,
- "z": "5f9799f8.016aa8",
- "wires": [
- []
- ]
- }
-]
+ {
+ "id": "d475c812.9568",
+ "type": "other",
+ "name": "update",
+ "xml": "<outcome value='Update'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 917.5001220703125,
+ "y": 308.66668701171875,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "862fb7d.5b86948"
+ ]
+ ]
+ },
+ {
+ "id": "db86e1b3.d2fca",
+ "type": "other",
+ "name": "delete",
+ "xml": "<outcome value='delete'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 953.7222366333008,
+ "y": 510.33348274230957,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "fe617bb2.76a2f"
+ ]
+ ]
+ },
+ {
+ "id": "fe617bb2.76a2f",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 1104.1668815612793,
+ "y": 505.333535194397,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [ ]
+ ]
+ },
+ {
+ "id": "4e140ca7.1e24fc",
+ "type": "comment",
+ "name": "TODO: Delete topology from AAI",
+ "info": "",
+ "comments": "",
+ "x": 1061.8335494995117,
+ "y": 461.00016021728516,
+ "z": "17972140.ae79b7",
+ "wires": [ ]
+ },
+ {
+ "id": "e5982995.970cf8",
+ "type": "switchNode",
+ "name": "switch aai-event-trigger",
+ "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 733.0556640625,
+ "y": 366.22222900390625,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "d475c812.9568",
+ "db86e1b3.d2fca"
+ ]
+ ]
+ },
+ {
+ "id": "8a1c1f7b.785ba8",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 1647.8338623046875,
+ "y": 283.1112365722656,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "1484b190.f94a66",
+ "c753c3aa.4b9268",
+ "10dba5fc.1f2eea"
+ ]
+ ]
+ },
+ {
+ "id": "d24d0442.140af",
+ "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": 1904.4933700561523,
+ "y": 145.0304880142212,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "90c83fb.7fc86c",
+ "22fbfc42.b90c4c"
+ ]
+ ]
+ },
+ {
+ "id": "90c83fb.7fc86c",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2139.4933700561523,
+ "y": 123.03048801422119,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "1ae1babb.3695fd"
+ ]
+ ]
+ },
+ {
+ "id": "22fbfc42.b90c4c",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2131.7433700561523,
+ "y": 176.67337131500244,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "852e8da1.a42b5"
+ ]
+ ]
+ },
+ {
+ "id": "1ae1babb.3695fd",
+ "type": "set",
+ "name": "set token-id",
+ "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
+ "comments": "",
+ "x": 2293.4933700561523,
+ "y": 124.03048801422119,
+ "z": "17972140.ae79b7",
+ "wires": [ ]
+ },
+ {
+ "id": "1484b190.f94a66",
+ "type": "execute",
+ "name": "execute RestApiCallNode Get Topology",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\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=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"topology\"/>\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": 1907.8267974853516,
+ "y": 238.73422574996948,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "dbe293a7.043a2",
+ "a63584b7.766e"
+ ]
+ ]
+ },
+ {
+ "id": "dbe293a7.043a2",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2166.3821296691895,
+ "y": 216.73420763015747,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "7fa6d3d4.bce844"
+ ]
+ ]
+ },
+ {
+ "id": "7fa6d3d4.bce844",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 2341.937660217285,
+ "y": 214.40092992782593,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [ ]
+ ]
+ },
+ {
+ "id": "d0d18db8.ed66f8",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
+ "comments": "",
+ "x": 2350.1599349975586,
+ "y": 288.6230435371399,
+ "z": "17972140.ae79b7",
+ "wires": [ ]
+ },
+ {
+ "id": "a63584b7.766e",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2171.826614379883,
+ "y": 287.8452730178833,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "d0d18db8.ed66f8"
+ ]
+ ]
+ },
+ {
+ "id": "6ee6436a.1b0ed4",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 63.5,
+ "y": 89,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "4d5494e5.395574"
+ ]
+ ]
+ },
+ {
+ "id": "4d5494e5.395574",
+ "type": "service-logic",
+ "name": "DataChange ${project.version}",
+ "module": "DataChange",
+ "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='DataChange' version='${project.version}'>",
+ "outputs": 1,
+ "x": 187.61112594604492,
+ "y": 163.44445502758026,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "d235572.293ffa8"
+ ]
+ ]
+ },
+ {
+ "id": "d235572.293ffa8",
+ "type": "method",
+ "name": "method esr-thirdparty-sdnc-discovery",
+ "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 284.0556869506836,
+ "y": 274.22223603725433,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "2c06decb.37ee5a"
+ ]
+ ]
+ },
+ {
+ "id": "2c06decb.37ee5a",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 554.2779541015625,
+ "y": 274.1112060546875,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "d189d7d4.74d5b"
+ ]
+ ]
+ },
+ {
+ "id": "c753c3aa.4b9268",
+ "type": "for",
+ "name": "for each Network",
+ "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1839.9815673828125,
+ "y": 366.2221646308899,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "fad4c2c5.6c19f"
+ ]
+ ]
+ },
+ {
+ "id": "fad4c2c5.6c19f",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 2029.9815292358398,
+ "y": 373.9999575614929,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "5e7867ab.174a4",
+ "49f09644.3fa498"
+ ]
+ ]
+ },
+ {
+ "id": "5e7867ab.174a4",
+ "type": "call",
+ "name": "call update-network-to-aai",
+ "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2283.314950942993,
+ "y": 437.33332777023315,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [ ]
+ ]
+ },
+ {
+ "id": "49f09644.3fa498",
+ "type": "set",
+ "name": "set network",
+ "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
+ "comments": "",
+ "x": 2235.5370712280273,
+ "y": 355.11107206344604,
+ "z": "17972140.ae79b7",
+ "wires": [ ]
+ },
+ {
+ "id": "852e8da1.a42b5",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 2293.314765930176,
+ "y": 171.77775049209595,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [ ]
+ ]
+ },
+ {
+ "id": "11d97c9a.87eb33",
+ "type": "comment",
+ "name": "Do Nothing",
+ "info": "",
+ "comments": "",
+ "x": 1991.8703320821123,
+ "y": 194.6666370895174,
+ "z": "17972140.ae79b7",
+ "wires": [ ]
+ },
+ {
+ "id": "5d5e7563.297f54",
+ "type": "switchNode",
+ "name": "switch type",
+ "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1192.5002708435059,
+ "y": 311.000018119812,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "dd19d5ef.82e67",
+ "910a4106.a8c08"
+ ]
+ ]
+ },
+ {
+ "id": "862fb7d.5b86948",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1047.5001068115234,
+ "y": 309.0000066757202,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "5d5e7563.297f54"
+ ]
+ ]
+ },
+ {
+ "id": "dd19d5ef.82e67",
+ "type": "other",
+ "name": "SOTN",
+ "xml": "<outcome value='SOTN'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1346.5000534057617,
+ "y": 266.9999885559082,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "8a1c1f7b.785ba8"
+ ]
+ ]
+ },
+ {
+ "id": "910a4106.a8c08",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1343.5000534057617,
+ "y": 390.99999618530273,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "1d17a4fa.d8a8b3"
+ ]
+ ]
+ },
+ {
+ "id": "1d17a4fa.d8a8b3",
+ "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=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",
+ "comments": "",
+ "x": 1628.2727432250977,
+ "y": 371.43916034698486,
+ "z": "17972140.ae79b7",
+ "wires": [ ]
+ },
+ {
+ "id": "10dba5fc.1f2eea",
+ "type": "execute",
+ "name": "execute Properties",
+ "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": 1846.5312576293945,
+ "y": 90.03123533725739,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [ ]
+ ]
+ },
+ {
+ "id": "d189d7d4.74d5b",
+ "type": "switchNode",
+ "name": "switch",
+ "xml": "<switch test=\"`$prop.sdncRestApi.vendor == 'ZTE'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 319,
+ "y": 367,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "f26cd837.1040d",
+ "15dc9b27.b3cb25"
+ ]
+ ]
+ },
+ {
+ "id": "f26cd837.1040d",
+ "type": "outcomeFalse",
+ "name": "false",
+ "xml": "<outcome value='false'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 506,
+ "y": 367,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "e5982995.970cf8"
+ ]
+ ]
+ },
+ {
+ "id": "15dc9b27.b3cb25",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 507,
+ "y": 492,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [
+ "ffd3dc3f.377368"
+ ]
+ ]
+ },
+ {
+ "id": "ffd3dc3f.377368",
+ "type": "call",
+ "name": "call esr-thirdparty-sdnc-of-zte",
+ "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 736,
+ "y": 492,
+ "z": "17972140.ae79b7",
+ "wires": [
+ [ ]
+ ]
+ }
+] \ No newline at end of file
diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-of-zte.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-of-zte.json
index 4212c38a..756bc61c 100644
--- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-of-zte.json
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-of-zte.json
@@ -1,408 +1,405 @@
[
{
- "id": "78797449.a69d64",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 95,
- "y": 72,
- "z": "eab52334.be231",
+ "id": "909bed3c.217f8",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 197,
+ "y": 85,
+ "z": "6337c566.8d383c",
"wires": [
[
- "77d260.33eeb5a"
+ "42a75c1a.2a0054"
]
]
- },
+ },
{
- "id": "77d260.33eeb5a",
- "type": "service-logic",
- "name": "DataChange ${project.version}",
- "module": "DataChange",
- "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='DataChange' version='${project.version}'>",
- "outputs": 1,
- "x": 239,
- "y": 185,
- "z": "eab52334.be231",
+ "id": "42a75c1a.2a0054",
+ "type": "service-logic",
+ "name": "DataChange ${project.version}",
+ "module": "DataChange",
+ "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='DataChange' version='${project.version}'>",
+ "outputs": 1,
+ "x": 341,
+ "y": 198,
+ "z": "6337c566.8d383c",
"wires": [
[
- "63d24477.5e1d24"
+ "d3b58cb6.7be93"
]
]
- },
+ },
{
- "id": "63d24477.5e1d24",
- "type": "method",
- "name": "method esr-thirdparty-sdnc-of-zte",
- "xml": "<method rpc='esr-thirdparty-sdnc-of-zte' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 164,
- "y": 299,
- "z": "eab52334.be231",
+ "id": "d3b58cb6.7be93",
+ "type": "method",
+ "name": "method esr-thirdparty-sdnc-of-zte",
+ "xml": "<method rpc='esr-thirdparty-sdnc-of-zte' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 266,
+ "y": 312,
+ "z": "6337c566.8d383c",
"wires": [
[
- "f10c2099.6d37a"
+ "d96a4272.22b2d"
]
]
- },
+ },
{
- "id": "f10c2099.6d37a",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic='true'>",
- "atomic": "true",
- "comments": "",
- "outputs": 1,
- "x": 93,
- "y": 433,
- "z": "eab52334.be231",
+ "id": "d96a4272.22b2d",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic='true'>",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 195,
+ "y": 446,
+ "z": "6337c566.8d383c",
"wires": [
[
- "c6e14b97.61ebb8",
- "336b2c1.b23ca54",
- "ebdf7595.352788",
- "bd214a4f.a0427"
+ "81ed8292.6b82",
+ "68becb2a.3bd784",
+ "d51d2b6.59965d8",
+ "33f265dc.9b698a"
]
]
- },
+ },
{
- "id": "c6e14b97.61ebb8",
- "type": "call",
- "name": "call validate-esr-thirdparty-sdnc-input",
- "xml": "<call module='DataChange' rpc='validate-esr-thirdparty-sdnc-input' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 451,
- "y": 368,
- "z": "eab52334.be231",
- "wires": [
- [ ]
- ]
- },
- {
- "id": "336b2c1.b23ca54",
- "type": "for",
- "name": "for 0..key-data_length",
- "xml": "<for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 354,
- "y": 438,
- "z": "eab52334.be231",
+ "id": "81ed8292.6b82",
+ "type": "for",
+ "name": "for 0..key-data_length",
+ "xml": "<for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 456,
+ "y": 451,
+ "z": "6337c566.8d383c",
"wires": [
[
- "75c90043.ea9e58"
+ "f198696d.07cc58"
]
]
- },
+ },
{
- "id": "75c90043.ea9e58",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 545,
- "y": 439,
- "z": "eab52334.be231",
+ "id": "f198696d.07cc58",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 647,
+ "y": 452,
+ "z": "6337c566.8d383c",
"wires": [
[
- "128f1b66.00dc0d",
- "c1d27f5c.c264f8",
- "1a08949.79fd66b",
- "8cc1f05e.92f468",
- "25639564.010e22",
- "7b8ba016.fbb3e8"
+ "15a59c73.3ad834",
+ "557fb41a.fc54ec",
+ "2c8b7b9f.b0acf4",
+ "25227c9b.d556a4",
+ "efe677e5.fc6308",
+ "8d2d3c75.3a0c9"
]
]
- },
+ },
{
- "id": "128f1b66.00dc0d",
- "type": "switchNode",
- "name": "switch service-url",
- "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'service-url'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 754,
- "y": 370,
- "z": "eab52334.be231",
+ "id": "15a59c73.3ad834",
+ "type": "switchNode",
+ "name": "switch service-url",
+ "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'service-url'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 856,
+ "y": 383,
+ "z": "6337c566.8d383c",
"wires": [
[
- "a2c28074.c9e3a8"
+ "b5b04925.886a28"
]
]
- },
+ },
{
- "id": "c1d27f5c.c264f8",
- "type": "switchNode",
- "name": "switch user-name",
- "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'user-name'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 754,
- "y": 433,
- "z": "eab52334.be231",
+ "id": "557fb41a.fc54ec",
+ "type": "switchNode",
+ "name": "switch user-name",
+ "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'user-name'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 856,
+ "y": 446,
+ "z": "6337c566.8d383c",
"wires": [
[
- "1403e272.365546"
+ "bfe7936.c0f7f7"
]
]
- },
+ },
{
- "id": "1a08949.79fd66b",
- "type": "switchNode",
- "name": "switch password",
- "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'password'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 750,
- "y": 492,
- "z": "eab52334.be231",
+ "id": "2c8b7b9f.b0acf4",
+ "type": "switchNode",
+ "name": "switch password",
+ "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'password'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 852,
+ "y": 505,
+ "z": "6337c566.8d383c",
"wires": [
[
- "ad2ddd93.50432"
+ "3e6f0e11.6ee952"
]
]
- },
+ },
{
- "id": "8cc1f05e.92f468",
- "type": "switchNode",
- "name": "switch esr-system-info-id",
- "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 777,
- "y": 555,
- "z": "eab52334.be231",
+ "id": "25227c9b.d556a4",
+ "type": "switchNode",
+ "name": "switch esr-system-info-id",
+ "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 879,
+ "y": 568,
+ "z": "6337c566.8d383c",
"wires": [
[
- "e0b54647.aef0b8"
+ "329a080c.012238"
]
]
- },
+ },
{
- "id": "25639564.010e22",
- "type": "switchNode",
- "name": "switch thirdparty-sdnc-id",
- "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 776,
- "y": 616,
- "z": "eab52334.be231",
+ "id": "efe677e5.fc6308",
+ "type": "switchNode",
+ "name": "switch thirdparty-sdnc-id",
+ "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 878,
+ "y": 629,
+ "z": "6337c566.8d383c",
"wires": [
[
- "ec3c7d9e.1913d8"
+ "93ea3ac5.6755a8"
]
]
- },
+ },
{
- "id": "7b8ba016.fbb3e8",
- "type": "switchNode",
- "name": "switch type",
- "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'type'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 735,
- "y": 683,
- "z": "eab52334.be231",
+ "id": "8d2d3c75.3a0c9",
+ "type": "switchNode",
+ "name": "switch type",
+ "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'type'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 837,
+ "y": 696,
+ "z": "6337c566.8d383c",
"wires": [
[
- "10575d8e.fe0d6a"
+ "840db98b.49b268"
]
]
- },
+ },
{
- "id": "a2c28074.c9e3a8",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 973,
- "y": 370,
- "z": "eab52334.be231",
+ "id": "b5b04925.886a28",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1075,
+ "y": 383,
+ "z": "6337c566.8d383c",
"wires": [
[
- "767b34d1.0a080c"
+ "2d9eaf7b.6319e"
]
]
- },
+ },
{
- "id": "1403e272.365546",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 972,
- "y": 432,
- "z": "eab52334.be231",
+ "id": "bfe7936.c0f7f7",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1074,
+ "y": 445,
+ "z": "6337c566.8d383c",
"wires": [
[
- "92e73df5.564cf"
+ "2b796aae.5b34a6"
]
]
- },
+ },
{
- "id": "ad2ddd93.50432",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 972,
- "y": 491,
- "z": "eab52334.be231",
+ "id": "3e6f0e11.6ee952",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1074,
+ "y": 504,
+ "z": "6337c566.8d383c",
"wires": [
[
- "9fc08956.e0f9c"
+ "34eaee93.2338c2"
]
]
- },
+ },
{
- "id": "e0b54647.aef0b8",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 972,
- "y": 555,
- "z": "eab52334.be231",
+ "id": "329a080c.012238",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1074,
+ "y": 568,
+ "z": "6337c566.8d383c",
"wires": [
[
- "1343e358.22771d"
+ "c6a07788.15af18"
]
]
- },
+ },
{
- "id": "ec3c7d9e.1913d8",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 969,
- "y": 616,
- "z": "eab52334.be231",
+ "id": "93ea3ac5.6755a8",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1071,
+ "y": 629,
+ "z": "6337c566.8d383c",
"wires": [
[
- "223f6129.11e8ee"
+ "4b734f80.6eb31"
]
]
- },
+ },
{
- "id": "10575d8e.fe0d6a",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 968,
- "y": 682,
- "z": "eab52334.be231",
+ "id": "840db98b.49b268",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1070,
+ "y": 695,
+ "z": "6337c566.8d383c",
"wires": [
[
- "a24c3d6c.c679f8"
+ "2ea57fe6.0f677"
]
]
- },
+ },
{
- "id": "767b34d1.0a080c",
- "type": "set",
- "name": "set service-url",
- "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.url' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
- "comments": "",
- "x": 1151,
- "y": 370,
- "z": "eab52334.be231",
- "wires": [ ]
- },
+ "id": "2d9eaf7b.6319e",
+ "type": "set",
+ "name": "set service-url",
+ "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.url' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+ "comments": "",
+ "x": 1253,
+ "y": 383,
+ "z": "6337c566.8d383c",
+ "wires": []
+ },
{
- "id": "92e73df5.564cf",
- "type": "set",
- "name": "set user",
- "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.user' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
- "comments": "",
- "x": 1151,
- "y": 432,
- "z": "eab52334.be231",
- "wires": [ ]
- },
+ "id": "2b796aae.5b34a6",
+ "type": "set",
+ "name": "set user",
+ "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.user' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+ "comments": "",
+ "x": 1253,
+ "y": 445,
+ "z": "6337c566.8d383c",
+ "wires": []
+ },
{
- "id": "9fc08956.e0f9c",
- "type": "set",
- "name": "set password",
- "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.password' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
- "comments": "",
- "x": 1152,
- "y": 491,
- "z": "eab52334.be231",
- "wires": [ ]
- },
+ "id": "34eaee93.2338c2",
+ "type": "set",
+ "name": "set password",
+ "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.password' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+ "comments": "",
+ "x": 1254,
+ "y": 504,
+ "z": "6337c566.8d383c",
+ "wires": []
+ },
{
- "id": "1343e358.22771d",
- "type": "set",
- "name": "set system-info-id",
- "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
- "comments": "",
- "x": 1150,
- "y": 555,
- "z": "eab52334.be231",
- "wires": [ ]
- },
+ "id": "c6a07788.15af18",
+ "type": "set",
+ "name": "set system-info-id",
+ "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+ "comments": "",
+ "x": 1252,
+ "y": 568,
+ "z": "6337c566.8d383c",
+ "wires": []
+ },
{
- "id": "223f6129.11e8ee",
- "type": "set",
- "name": "set thirdparty-sdnc-id",
- "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
- "comments": "",
- "x": 1148,
- "y": 616,
- "z": "eab52334.be231",
- "wires": [ ]
- },
+ "id": "4b734f80.6eb31",
+ "type": "set",
+ "name": "set thirdparty-sdnc-id",
+ "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+ "comments": "",
+ "x": 1250,
+ "y": 629,
+ "z": "6337c566.8d383c",
+ "wires": []
+ },
{
- "id": "a24c3d6c.c679f8",
- "type": "set",
- "name": "set type",
- "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.type' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
- "comments": "",
- "x": 1148,
- "y": 682,
- "z": "eab52334.be231",
- "wires": [ ]
- },
+ "id": "2ea57fe6.0f677",
+ "type": "set",
+ "name": "set type",
+ "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.type' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+ "comments": "",
+ "x": 1250,
+ "y": 695,
+ "z": "6337c566.8d383c",
+ "wires": []
+ },
{
- "id": "ebdf7595.352788",
- "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/zte.svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"data-change-notification\"/>\n<parameter name=\"field3\" value=\"Config\"/>\n<parameter name=\"field4\" value=\"`service-url`\"/>\n<parameter name=\"field5\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url`\"/>\n",
- "comments": "",
- "outputs": 1,
- "x": 304,
- "y": 525,
- "z": "eab52334.be231",
+ "id": "68becb2a.3bd784",
+ "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/zte.svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"data-change-notification\"/>\n<parameter name=\"field3\" value=\"Config\"/>\n<parameter name=\"field4\" value=\"`service-url`\"/>\n<parameter name=\"field5\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url`\"/>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 406,
+ "y": 538,
+ "z": "6337c566.8d383c",
"wires": [
- [ ]
+ []
]
- },
+ },
{
- "id": "bd214a4f.a0427",
- "type": "call",
- "name": "call esr-thirdparty-sdnc-discovery-of-zte",
- "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-discovery-of-zte' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 395,
- "y": 615,
- "z": "eab52334.be231",
+ "id": "d51d2b6.59965d8",
+ "type": "call",
+ "name": "call esr-thirdparty-sdnc-discovery-of-zte",
+ "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-discovery-of-zte' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 497,
+ "y": 628,
+ "z": "6337c566.8d383c",
"wires": [
- [ ]
+ []
]
+ },
+ {
+ "id": "33f265dc.9b698a",
+ "type": "set",
+ "name": "set zte vendor",
+ "xml": "<set>\n<parameter name='prop.zte.sdncRestApi.vendor' value='`$prop.sdncRestApi.vendor`' />\n",
+ "comments": "",
+ "x": 433,
+ "y": 384,
+ "z": "6337c566.8d383c",
+ "wires": []
}
] \ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_data-change-notification.xml b/platform-logic/datachange/src/main/xml/DataChange_data-change-notification.xml
index 529b8497..76f2fe89 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_data-change-notification.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_data-change-notification.xml
@@ -1,41 +1,27 @@
<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='DataChange' version='${project.version}'>
- <method rpc='data-change-notification' mode='sync'>
- <block atomic="true">
- <switch test='`$data-change-notification-input.aai-node-type`'>
- <outcome value='esr-thirdparty-sdnc'>
- <for index='idx' start='0' end='`$data-change-notification-input.key-data_length`'>
- <switch test='`$data-change-notification-input.key-data[$idx].key-value == 'ZTE'`'>
- <outcome value='true'>
- <block atomic="true">
- <set>
- <parameter name='zte.prop.sdncRestApi.vendor' value='`$data-change-notification-input.key-data[$idx].key-value`'/>
- </set>
- <call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync'></call>
- </block>
- </outcome>
- <outcome value='false'>
- <block atomic="true">
- <call module='DataChange' rpc='esr-thirdparty-sdnc' mode='sync'></call>
- </block>
- </outcome>
+ 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='DataChange' version='${project.version}'>
+ <method rpc='data-change-notification' mode='sync'>
+ <block atomic="true">
+ <switch test='`$data-change-notification-input.aai-node-type`'>
+ <outcome value='esr-thirdparty-sdnc'>
+ <block atomic="true">
+ <call module='DataChange' rpc='esr-thirdparty-sdnc' mode='sync' ></call>
+ </block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="AAI node type not supported" />
+ </return>
+ </outcome>
</switch>
- </for>
- </outcome>
- <outcome value='Other'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500"/>
- <parameter name="error-message" value="AAI node type not supported"/>
- </return>
- </outcome>
- </switch>
- <return status='success'>
- <parameter name="ack-final-indicator" value="Y"/>
- <parameter name="error-code" value="200"/>
- <parameter name="error-message" value="`$error-message`"/>
- </return>
- </block>
- </method>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </method>
</service-logic> \ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery-of-zte.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery-of-zte.xml
index 77c83bb9..4ffb73ee 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery-of-zte.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery-of-zte.xml
@@ -1,259 +1,292 @@
-<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="DataChange" version="${project.version}">
- <method rpc="esr-thirdparty-sdnc-discovery-of-zte" mode="sync">
- <block atomic="true">
- <switch test="`$data-change-notification-input.aai-event-trigger`">
- <outcome value="Update">
- <block>
- <switch test="`$prop.sdncRestApi.type`">
- <outcome value="SOTN">
- <block atomic="true">
- <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/getzteodutopotemplate.json'`"/>
- <parameter name="restapiUrl" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-topology-details'`"/>
- <parameter name="restapiUser" value="`$zte.prop.sdncRestApi.thirdpartySdnc.user`"/>
- <parameter name="restapiPassword" value="`$zte.prop.sdncRestApi.thirdpartySdnc.password`"/>
- <parameter name="format" value="json"/>
- <parameter name="httpMethod" value="POST"/>
- <parameter name="responsePrefix" value="ztetopology"/>
- <outcome value="success">
- <block atomic="true"/>
- </outcome>
- <outcome value="failure">
- <return status="failure">
- <parameter name="ack-final" value="Y"/>
- <parameter name="error-code" value="500"/>
- <parameter name="error-message" value="Error executing Get odutopo rest api"/>
- </return>
- </outcome>
- </execute>
- <for index="nidx" start="0" end="`$ztetopology.output.topology.node-ref-id_length`">
- <block atomic="true">
- <set>
- <parameter name="prop.zte.network-id" value="zteNetwork"/>
- <parameter name="prop.zte.client-id" value="zteClient1"/>
- <parameter name="prop.zte.topo-id" value="zteTopo1"/>
- <parameter name="prop.zte.provider-id" value="zteProvider1"/>
- <parameter name="prop.zte.odutopo.name" value="`$ztetopology.output.topology.node-ref-id[$nidx]`"/>
- </set>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $prop.zte.network-id">
- <parameter name="network-id" value="`$prop.zte.network-id`"/>
- <parameter name="client-id" value="`$prop.zte.client-id`"/>
- <parameter name="te-topo-id" value="`$prop.zte.topo-id`"/>
- <parameter name="provider-id" value="`$prop.zte.provider-id`"/>
- </save>
- <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/getzteodutoponodetemplate.json'`"/>
- <parameter name="restapiUrl" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-topology-details'`"/>
- <parameter name="restapiUser" value="`$zte.prop.sdncRestApi.thirdpartySdnc.user`"/>
- <parameter name="restapiPassword" value="`$zte.prop.sdncRestApi.thirdpartySdnc.password`"/>
- <parameter name="format" value="json"/>
- <parameter name="httpMethod" value="POST"/>
- <parameter name="responsePrefix" value="ztetopologynode"/>
- <outcome value="failure">
- <return status="failure">
- <parameter name="ack-final" value="Y"/>
- <parameter name="error-code" value="500"/>
- <parameter name="error-message" value="Error executing Get odutopo node rest api"/>
- </return>
- </outcome>
- <outcome value="success">
- <for index="pidx" start="0" end="`$ztetopologynode.output.topology.node-ref-id_length`">
- <block>
- <set>
- <parameter name="prop.zte.odutopo.node.name" value="`$ztetopologynode.output.topology.node-ref-id[$pidx]`"/>
- </set>
- <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/getzteodutoponodedetailstemplate.json'`"/>
- <parameter name="restapiUrl" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-node-details'`"/>
- <parameter name="restapiUser" value="`$zte.prop.sdncRestApi.thirdpartySdnc.user`"/>
- <parameter name="restapiPassword" value="`$zte.prop.sdncRestApi.thirdpartySdnc.password`"/>
- <parameter name="format" value="json"/>
- <parameter name="httpMethod" value="POST"/>
- <parameter name="responsePrefix" value="ztetopologynodedetails"/>
- <outcome value="failure">
- <return status="failure">
- <parameter name="ack-final" value="Y"/>
- <parameter name="error-code" value="500"/>
- <parameter name="error-message" value="Error executing Get odutopo node details rest api"/>
- </return>
- </outcome>
- <outcome value="success">
- <block>
- <switch test="`$ztetopologynodedetails.node.global-state-pac.operational-state == 'ENABLED'`">
- <outcome value="true">
- <switch test="`$ztetopologynodedetails.node.global-state-pac.administrative-state == 'LOCKED'`">
- <outcome value="true">
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid">
- <parameter name="pnf-name" value="`$ztetopologynodedetails.node.uuid`"/>
- <parameter name="pnf-id" value="`$ztetopologynodedetails.node.uuid`"/>
- <parameter name="operational-status" value="up"/>
- <parameter name="admin-status" value="up"/>
- <parameter name="in-maint" value="true"/>
- </save>
- </outcome>
- <outcome value="false">
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid">
- <parameter name="pnf-name" value="`$ztetopologynodedetails.node.uuid`"/>
- <parameter name="pnf-id" value="`$ztetopologynodedetails.node.uuid`"/>
- <parameter name="operational-status" value="up"/>
- <parameter name="admin-status" value="down"/>
- <parameter name="in-maint" value="true"/>
- </save>
- </outcome>
- </switch>
- </outcome>
- <outcome value="false">
- <switch test="`$ztetopologynodedetails.node.global-state-pac.administrative-state == 'LOCKED'`">
- <outcome value="true">
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid">
- <parameter name="pnf-name" value="`$ztetopologynodedetails.node.uuid`"/>
- <parameter name="pnf-id" value="`$ztetopologynodedetails.node.uuid`"/>
- <parameter name="operational-status" value="down"/>
- <parameter name="admin-status" value="up"/>
- <parameter name="in-maint" value="true"/>
- </save>
- </outcome>
- <outcome value="false">
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid">
- <parameter name="pnf-name" value="`$ztetopologynodedetails.node.uuid`"/>
- <parameter name="pnf-id" value="`$ztetopologynodedetails.node.uuid`"/>
- <parameter name="operational-status" value="down"/>
- <parameter name="admin-status" value="down"/>
- <parameter name="in-maint" value="true"/>
- </save>
- </outcome>
- </switch>
- </outcome>
- </switch>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid" force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="network-resource"/>
- <parameter name="relationship-list.relationship[0].related-link" value="'/network/network-resources/network-resource/' + 'zteNetwork'"/>
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id"/>
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="zteNetwork"/>
- </save>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc:relationship-list" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $zte.prop.sdncRestApi.thirdpartySdnc.id" force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="pnf"/>
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $ztetopologynodedetails.node.uuid`"/>
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name"/>
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$ztetopologynodedetails.node.uuid`"/>
- </save>
- <for index="ridx" start="0" end="`$ztetopologynodedetails.output.node.node-edge-point-id_length`">
- <block>
- <set>
- <parameter name="prop.zte.odutopo.node.nep.uuid" value="`$ztetopologynodedetails.output.node.node-edge-point-id[$ridx]`"/>
- </set>
- <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/getzteodutoponodenepdetailstemplate.json'`"/>
- <parameter name="restapiUrl" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-node-edge-point-details'`"/>
- <parameter name="restapiUser" value="`$zte.prop.sdncRestApi.thirdpartySdnc.user`"/>
- <parameter name="restapiPassword" value="`$zte.prop.sdncRestApi.thirdpartySdnc.password`"/>
- <parameter name="format" value="json"/>
- <parameter name="httpMethod" value="POST"/>
- <parameter name="responsePrefix" value="ztetopologynodenepdetails"/>
- <outcome value="failure">
- <return status="failure">
- <parameter name="ack-final" value="Y"/>
- <parameter name="error-code" value="500"/>
- <parameter name="error-message" value="Error executing Get odutopo node edge point details rest api"/>
+<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='DataChange' version='${project.version}'>
+ <method rpc='esr-thirdparty-sdnc-discovery-of-zte' mode='sync'>
+ <block atomic='true'>
+ <switch test="`$data-change-notification-input.aai-event-trigger`">
+ <outcome value='Update'>
+ <block>
+ <switch test="`$zte.prop.sdncRestApi.type`">
+ <outcome value='SOTN'>
+ <block atomic='true'>
+ <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>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/getzteodutopotemplate.json'`" />
+ <parameter name="restapiUrl" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-topology-details'`" />
+ <parameter name="restapiUser" value="`$zte.prop.sdncRestApi.thirdpartySdnc.user`" />
+ <parameter name="restapiPassword" value="`$zte.prop.sdncRestApi.thirdpartySdnc.password`" />
+ <parameter name="format" value="json"/>
+ <parameter name="httpMethod" value="POST"/>
+ <parameter name="responsePrefix" value="ztetopology"/>
+ <outcome value='success'>
+ <block atomic="true"></block>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing Get odutopo rest api" />
</return>
- </outcome>
- <outcome value="success">
- <for index="tidx" start="0" end="`$ztetopologynodenepdetails.output.node-edge-point.name_length`">
- <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="contains">
- <parameter name="source" value="`$ztetopologynodenepdetails.node-edge-point.name[tidx].value`"/>
- <parameter name="target" value="client"/>
- <outcome value="false">
- <block></block>
+ </outcome>
+ </execute>
+ <for index='nidx' start='0' end='`$ztetopology.output.topology.node-ref-id_length`' >
+ <block>
+ <set>
+ <parameter name='prop.zte.odutopo.name' value='`$ztetopology.output.topology.node-ref-id[$nidx]`' />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/getzteodutoponodetemplate.json'`" />
+ <parameter name="restapiUrl" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-topology-details'`" />
+ <parameter name="restapiUser" value="`$zte.prop.sdncRestApi.thirdpartySdnc.user`" />
+ <parameter name="restapiPassword" value="`$zte.prop.sdncRestApi.thirdpartySdnc.password`" />
+ <parameter name="format" value="json"/>
+ <parameter name="httpMethod" value="POST"/>
+ <parameter name="responsePrefix" value="ztetopologynode"/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing Get odutopo node rest api" />
+ </return>
</outcome>
- <outcome value="true">
- <block>
- <set>
- <parameter name="zte-unique-ltpId" value="`'nodeId-' + $ztetopologynodedetails.node.uuid + '-ltpId-' + $ztetopologynodenepdetails.node-edge-point.uuid`"/>
- </set>
- <set>
- <parameter name="zte-bandwidth" value="`1000 * 1000000 * 1.25 * $ztetopologynodenepdetails.node-edge-point.lp[0].odu-nep-pac.oducapacity`"/>
- </set>
- <switch test="`$ztetopologynodedetails.node.global-state-pac.operational-state == 'ENABLED'`">
- <outcome value="true">
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid AND p-interface.interface-name = $zte-unique-ltpId">
- <parameter name="interface-name" value="`$zte-unique-ltpId`"/>
- <parameter name="network-ref" value="`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`"/>
- <parameter name="transparent" value="true"/>
- <parameter name="speed-value" value="`$zte-bandwidth`"/>
- <parameter name="operational-status" value="up"/>
- <parameter name="in-maint" value="true"/> "`'nodeId-' + $node.node-id + '-ltpId-' + $tp.te-tp-id`"
- <outcome value="success">
+ <outcome value='success'>
+ <switch test="`$ztetopologynode.output.topology.layer-protocol-name[0] == 'ODU'`">
+ <outcome value='false'>
<block></block>
- </outcome>
- <outcome value="failure">
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid AND p-interface.interface-name = $zte-unique-ltpId">
- <parameter name="interface-name" value="`$zte-unique-ltpId`"/>
- <parameter name="network-ref" value="`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`"/>
- <parameter name="transparent" value="true"/>
- <parameter name="speed-value" value="`$zte-bandwidth`"/>
- <parameter name="operational-status" value="up"/>
- <parameter name="in-maint" value="true"/>
- </save>
- </outcome>
- </save>
- </outcome>
- <outcome value="false">
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid AND p-interface.interface-name = $zte-unique-ltpId">
- <parameter name="interface-name" value="`$zte-unique-ltpId`"/>
- <parameter name="network-ref" value="`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`"/>
- <parameter name="transparent" value="true"/>
- <parameter name="speed-value" value="`$zte-bandwidth`"/>
- <parameter name="operational-status" value="down"/>
- <parameter name="in-maint" value="true"/>
- <outcome value="success">
- <block></block>
- </outcome>
- <outcome value="failure">
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid AND p-interface.interface-name = $zte-unique-ltpId">
- <parameter name="interface-name" value="`$zte-unique-ltpId`"/>
- <parameter name="network-ref" value="`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`"/>
- <parameter name="transparent" value="true"/>
- <parameter name="speed-value" value="`$zte-bandwidth`"/>
- <parameter name="operational-status" value="up"/>
- <parameter name="in-maint" value="true"/>
- </save>
- </outcome>
- </save>
- </outcome>
+ </outcome>
+ <outcome value='true'>
+ <block>
+ <set>
+ <parameter name='prop.zte.network-id' value="zteNetwork" />
+ <parameter name='prop.zte.client-id' value="zteClient1" />
+ <parameter name='prop.zte.topo-id' value="zteTopo1" />
+ <parameter name='prop.zte.provider-id' value="zteProvider1" />
+ </set>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'
+ key='network-resource.network-id = $prop.zte.network-id' >
+ <parameter name='network-id' value='`$prop.zte.network-id`' />
+ <parameter name='client-id' value='`$prop.zte.client-id`' />
+ <parameter name='te-topo-id' value='`$prop.zte.topo-id`' />
+ <parameter name='provider-id' value='`$prop.zte.provider-id`' />
+ </save>
+ <for index='pidx' start='0' end='`$ztetopologynode.output.topology.node-ref-id_length`' >
+ <block>
+ <set>
+ <parameter name='prop.zte.odutopo.node.name' value='`$ztetopologynode.output.topology.node-ref-id[$pidx]`' />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/getzteodutoponodedetailstemplate.json'`" />
+ <parameter name="restapiUrl" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-node-details'`" />
+ <parameter name="restapiUser" value="`$zte.prop.sdncRestApi.thirdpartySdnc.user`" />
+ <parameter name="restapiPassword" value="`$zte.prop.sdncRestApi.thirdpartySdnc.password`" />
+ <parameter name="format" value="json"/>
+ <parameter name="httpMethod" value="POST"/>
+ <parameter name="responsePrefix" value="ztetopologynodedetails"/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing Get odutopo node details rest api" />
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <block>
+ <switch test="`$ztetopologynodedetails.output.node.global-state-pac.operational-state == 'ENABLED'`">
+ <outcome value='true'>
+ <switch test="`$ztetopologynodedetails.output.node.global-state-pac.administrative-state == 'LOCKED'`">
+ <outcome value='true'>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf'
+ key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' >
+ <parameter name='pnf-name' value='`$ztetopologynodedetails.output.node.uuid`' />
+ <parameter name='pnf-id' value='`$ztetopologynodedetails.output.node.uuid`' />
+ <parameter name='operational-status' value="up" />
+ <parameter name='admin-status' value="up" />
+ <parameter name='in-maint' value='true' />
+ </save>
+ </outcome>
+ <outcome value='false'>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf'
+ key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' >
+ <parameter name='pnf-name' value='`$ztetopologynodedetails.output.node.uuid`' />
+ <parameter name='pnf-id' value='`$ztetopologynodedetails.output.node.uuid`' />
+ <parameter name='operational-status' value="up" />
+ <parameter name='admin-status' value="down" />
+ <parameter name='in-maint' value='true' />
+ </save>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='false'>
+ <switch test="`$ztetopologynodedetails.output.node.global-state-pac.administrative-state == 'LOCKED'`">
+ <outcome value='true'>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf'
+ key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' >
+ <parameter name='pnf-name' value='`$ztetopologynodedetails.output.node.uuid`' />
+ <parameter name='pnf-id' value='`$ztetopologynodedetails.output.node.uuid`' />
+ <parameter name='operational-status' value="down" />
+ <parameter name='admin-status' value="up" />
+ <parameter name='in-maint' value='true' />
+ </save>
+ </outcome>
+ <outcome value='false'>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf'
+ key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' >
+ <parameter name='pnf-name' value='`$ztetopologynodedetails.output.node.uuid`' />
+ <parameter name='pnf-id' value='`$ztetopologynodedetails.output.node.uuid`' />
+ <parameter name='operational-status' value="down" />
+ <parameter name='admin-status' value="down" />
+ <parameter name='in-maint' value='true' />
+ </save>
+ </outcome>
+ </switch>
+ </outcome>
+ </switch>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list'
+ key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="network-resource" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $prop.zte.network-id`" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.zte.network-id`" />
+ </save>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list'
+ key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $zte.prop.sdncRestApi.thirdpartySdnc.id'
+ force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="pnf" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $ztetopologynodedetails.output.node.uuid`" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$ztetopologynodedetails.output.node.uuid`" />
+ </save>
+ <for index='ridx' start='0' end='`$ztetopologynodedetails.output.node.node-edge-point-id_length`' >
+ <block>
+ <set>
+ <parameter name='prop.zte.odutopo.node.nep.uuid' value='`$ztetopologynodedetails.output.node.node-edge-point-id[$ridx]`' />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/getzteodutoponodenepdetailstemplate.json'`" />
+ <parameter name="restapiUrl" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-node-edge-point-details'`" />
+ <parameter name="restapiUser" value="`$zte.prop.sdncRestApi.thirdpartySdnc.user`" />
+ <parameter name="restapiPassword" value="`$zte.prop.sdncRestApi.thirdpartySdnc.password`" />
+ <parameter name="format" value="json"/>
+ <parameter name="httpMethod" value="POST"/>
+ <parameter name="responsePrefix" value="ztetopologynodenepdetails"/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing Get odutopo node edge point details rest api" />
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <for index='tidx' start='0' end='`$ztetopologynodenepdetails.output.node-edge-point.name_length`' >
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >
+ <parameter name="source" value="`$ztetopologynodenepdetails.node-edge-point.name[tidx].value`"/>
+ <parameter name="target" value="client"/>
+ <outcome value='failure'>
+ <block></block>
+ </outcome>
+ <outcome value='success'>
+ <block>
+ <set>
+ <parameter name='zte-unique-ltpId' value="`'nodeId-' + $ztetopologynodedetails.output.node.uuid + '-ltpId-' + $ztetopologynodenepdetails.output.node-edge-point.uuid`" />
+ </set>
+ <set>
+ <parameter name='zte-bandwidth' value='`1250000000 * $ztetopologynodenepdetails.output.node-edge-point.lp[0].odu-nep-pac.odu-capacity`' />
+ </set>
+ <switch test="`$ztetopologynodedetails.output.node.global-state-pac.operational-state == 'ENABLED'`">
+ <outcome value='true'>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
+ key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid
+ AND p-interface.interface-name = $zte-unique-ltpId' >
+ <parameter name='interface-name' value='`$zte-unique-ltpId`' />
+ <parameter name='network-ref' value="`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`" />
+ <parameter name='transparent' value="true" />
+ <parameter name='speed-value' value='`$zte-bandwidth`' />
+ <parameter name='operational-status' value="up" />
+ <parameter name='in-maint' value="true" />
+ <outcome value='success'>
+ <block></block>
+ </outcome>
+ <outcome value='failure'>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
+ key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid
+ AND p-interface.interface-name = $zte-unique-ltpId' >
+ <parameter name='interface-name' value='`$zte-unique-ltpId`' />
+ <parameter name='network-ref' value="`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`" />
+ <parameter name='transparent' value="true" />
+ <parameter name='speed-value' value='`$zte-bandwidth`' />
+ <parameter name='operational-status' value="up" />
+ <parameter name='in-maint' value="true" />
+ </save>
+ </outcome>
+ </save>
+ </outcome>
+ <outcome value='false'>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
+ key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid
+ AND p-interface.interface-name = $zte-unique-ltpId' >
+ <parameter name='interface-name' value='`$zte-unique-ltpId`' />
+ <parameter name='network-ref' value="`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`" />
+ <parameter name='transparent' value="true" />
+ <parameter name='speed-value' value='`$zte-bandwidth`' />
+ <parameter name='operational-status' value="down" />
+ <parameter name='in-maint' value="true" />
+ <outcome value='success'>
+ <block></block>
+ </outcome>
+ <outcome value='failure'>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
+ key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid
+ AND p-interface.interface-name = $zte-unique-ltpId' >
+ <parameter name='interface-name' value='`$zte-unique-ltpId`' />
+ <parameter name='network-ref' value="`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`" />
+ <parameter name='transparent' value="true" />
+ <parameter name='speed-value' value='`$zte-bandwidth`' />
+ <parameter name='operational-status' value="up" />
+ <parameter name='in-maint' value="true" />
+ </save>
+ </outcome>
+ </save>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </execute>
+ </for>
+ </outcome>
+ </execute>
+ </block>
+ </for>
+ </block>
+ </outcome>
+ </execute>
+ </block>
+ </for>
+ </block>
+ </outcome>
</switch>
- </block>
</outcome>
- </execute>
- </for>
- </outcome>
- </execute>
- </block>
+ </execute>
+ </block>
</for>
- </block>
- </outcome>
- </execute>
- </block>
- </for>
- </outcome>
- </execute>
+ </block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name='error-code' value="500" />
+ <parameter name='error-message' value="`'Unsupported type = ' + $prop.sdncRestApi.type`" />
+ </return>
+ </outcome>
+ </switch>
</block>
- </for>
- </block>
- </outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y"/>
- <parameter name="error-code" value="500"/>
- <parameter name="error-message" value="`'Unsupported type = ' + $prop.sdncRestApi.type`"/>
- </return>
- </outcome>
+ </outcome>
+ <outcome value='delete'>
+ <block atomic='true'></block>
+ </outcome>
</switch>
- </block>
- </outcome>
- <outcome value="delete">
- <block atomic="true"/>
- </outcome>
- </switch>
- </block>
- </method>
+ </block>
+ </method>
</service-logic> \ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
index 3382b996..12f63c4b 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
@@ -1,65 +1,70 @@
-<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='DataChange' version='${project.version}'>
- <method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>
- <block atomic="true">
- <switch test="`$data-change-notification-input.aai-event-trigger`">
- <outcome value='Update'>
- <block>
- <switch test="`$prop.sdncRestApi.type`">
- <outcome value='SOTN'>
- <block atomic="true">
- <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>
- <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />
- <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
- <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
- <parameter name="format" value="json"/>
- <parameter name="httpMethod" value="get"/>
- <parameter name="responsePrefix" value="topology"/>
- <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
- <parameter name="trustStorePassword" value="adminadmin"/>
- <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
- <parameter name="keyStorePassword" value="adminadmin"/>
- <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
- <outcome value='success'>
- <block atomic="true"></block>
- </outcome>
- <outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing Create vpn rest api" />
- </return>
- </outcome>
- </execute>
- <for index='nidx' start='0' end='`$topology.networks.network_length`' >
- <block>
- <set>
- <parameter name='network.' value='`$topology.networks.network[$nidx].`' />
- </set>
- <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
- </block>
- </for>
- </block>
- </outcome>
- <outcome value='Other'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Unsupported type = ' + $prop.sdncRestApi.type`" />
- </return>
- </outcome>
- </switch>
+<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="DataChange" version="${project.version}">
+ <method rpc="esr-thirdparty-sdnc-discovery" mode="sync">
+ <block atomic="true">
+ <switch test="`$prop.sdncRestApi.vendor == 'ZTE'`">
+ <outcome value="false">
+ <switch test="`$data-change-notification-input.aai-event-trigger`">
+ <outcome value="Update">
+ <block>
+ <switch test="`$prop.sdncRestApi.type`">
+ <outcome value="SOTN">
+ <block atomic="true">
+ <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>
+ <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`"/>
+ <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>
+ <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>
+ <parameter name="format" value="json"/>
+ <parameter name="httpMethod" value="get"/>
+ <parameter name="responsePrefix" value="topology"/>
+ <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+ <parameter name="trustStorePassword" value="adminadmin"/>
+ <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+ <parameter name="keyStorePassword" value="adminadmin"/>
+ <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`"/>
+ <outcome value="success">
+ <block atomic="true"/>
+ </outcome>
+ <outcome value="failure">
+ <return status="failure">
+ <parameter name="ack-final" value="Y"/>
+ <parameter name="error-code" value="500"/>
+ <parameter name="error-message" value="Error executing Create vpn rest api"/>
+ </return>
+ </outcome>
+ </execute>
+ <for index="nidx" start="0" end="`$topology.networks.network_length`">
+ <block>
+ <set>
+ <parameter name="network." value="`$topology.networks.network[$nidx].`"/>
+ </set>
+ <call module="DataChange" rpc="update-network-to-aai" mode="sync"></call>
+ </block>
+ </for>
</block>
- </outcome>
- <outcome value='delete'>
- <block atomic="true"></block>
- </outcome>
- </switch>
- </block>
- </method>
-</service-logic>
+ </outcome>
+ <outcome value="Other">
+ <return status="failure">
+ <parameter name="ack-final" value="Y"/>
+ <parameter name="error-code" value="500"/>
+ <parameter name="error-message" value="`'Unsupported type = ' + $prop.sdncRestApi.type`"/>
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ <outcome value="delete">
+ <block atomic="true"/>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value="true">
+ <call module="DataChange" rpc="esr-thirdparty-sdnc-of-zte" mode="sync"></call>
+ </outcome>
+ </switch>
+ </block>
+ </method>
+</service-logic> \ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-of-zte.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-of-zte.xml
index 25fef6b2..e98dc7b6 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-of-zte.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-of-zte.xml
@@ -1,64 +1,66 @@
<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='DataChange' version='${project.version}'>
- <method rpc='esr-thirdparty-sdnc-of-zte' mode='sync'>
- <block atomic="true">
- <call module='DataChange' rpc='validate-esr-thirdparty-sdnc-input' mode='sync'></call>
- <for index='idx' start='0' end='`$data-change-notification-input.key-data_length`'>
- <block>
- <switch test='`$data-change-notification-input.key-data[$idx].key-name == 'service-url'`'>
- <outcome value='true'>
- <set>
- <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.url' value='`$data-change-notification-input.key-data[$idx].key-value`'/>
- </set>
- </outcome>
- </switch>
- <switch test='`$data-change-notification-input.key-data[$idx].key-name == 'user-name'`'>
- <outcome value='true'>
- <set>
- <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.user' value='`$data-change-notification-input.key-data[$idx].key-value`'/>
- </set>
- </outcome>
- </switch>
- <switch test='`$data-change-notification-input.key-data[$idx].key-name == 'password'`'>
- <outcome value='true'>
- <set>
- <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.password' value='`$data-change-notification-input.key-data[$idx].key-value`'/>
- </set>
- </outcome>
- </switch>
- <switch test='`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`'>
- <outcome value='true'>
- <set>
- <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`'/>
- </set>
- </outcome>
- </switch>
- <switch test='`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`'>
- <outcome value='true'>
- <set>
- <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`'/>
- </set>
- </outcome>
- </switch>
- <switch test='`$data-change-notification-input.key-data[$idx].key-name == 'type'`'>
- <outcome value='true'>
- <set>
- <parameter name='zte.prop.sdncRestApi.type' value='`$data-change-notification-input.key-data[$idx].key-value`'/>
- </set>
- </outcome>
- </switch>
+ 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='DataChange' version='${project.version}'>
+ <method rpc='esr-thirdparty-sdnc-of-zte' mode='sync'>
+ <block atomic='true'>
+ <set>
+ <parameter name='prop.zte.sdncRestApi.vendor' value='`$prop.sdncRestApi.vendor`' />
+ </set>
+ <for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >
+ <block>
+ <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'service-url'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.url' value='`$data-change-notification-input.key-data[$idx].key-value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'user-name'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.user' value='`$data-change-notification-input.key-data[$idx].key-value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'password'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.password' value='`$data-change-notification-input.key-data[$idx].key-value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'type'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='zte.prop.sdncRestApi.type' value='`$data-change-notification-input.key-data[$idx].key-value`' />
+ </set>
+ </outcome>
+ </switch>
+ </block>
+ </for>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/opendaylight/current/data/log/zte.svclogic.log"/>
+ <parameter name="field1" value="__TIMESTAMP__"/>
+ <parameter name="field2" value="data-change-notification"/>
+ <parameter name="field3" value="Config"/>
+ <parameter name="field4" value="`service-url`"/>
+ <parameter name="field5" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url`"/>
+ </record>
+ <call module='DataChange' rpc='esr-thirdparty-sdnc-discovery-of-zte' mode='sync' ></call>
</block>
- </for>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/zte.svclogic.log"/>
- <parameter name="field1" value="__TIMESTAMP__"/>
- <parameter name="field2" value="data-change-notification"/>
- <parameter name="field3" value="Config"/>
- <parameter name="field4" value="`service-url`"/>
- <parameter name="field5" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url`"/>
- </record>
- <call module='DataChange' rpc='esr-thirdparty-sdnc-discovery-of-zte' mode='sync'></call>
- </block>
- </method>
+ </method>
</service-logic> \ No newline at end of file