diff options
| author |   Hesam Rahimi <hesam.rahimi@huawei.com> | 2020-05-13 05:07:55 +0000 |
|---|---|---|
| committer | Hesam Rahimi <hesam.rahimi@huawei.com> | 2020-05-13 05:07:55 +0000 |
| commit | fb18306b26c323d9f0fbe8e0b5f049e9ed85f75e (patch) | |
| tree | 6d012b378f00997d850001b1b3c10e291ab46d23 /platform-logic/datachange/src | |
| parent | 1861e0d23547acffeb5c44485104f11a40a8fda0 (diff) | |
Adding local-link-connectivity-list (llcl) information to match ttp and tp locally (to support NNI-based Service creation use-case).
- This is needed for F release
Issue-ID: SDNC-1184
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I24f1ef56884b874baed029182a984945080af769
Former-commit-id: 4ff90dd1689d772865399ab5a995119981b127e1
Diffstat (limited to 'platform-logic/datachange/src')
4 files changed, 611 insertions, 327 deletions
diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json index d87fd490..411e70d3 100644 --- a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json +++ b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json @@ -64,7 +64,8 @@ "e66d9ed0.3d3d8",
"f1256a59.e632c",
"1dca15d7.0a7a3a",
- "1c1d34a0.adaa8b"
+ "1c1d34a0.adaa8b",
+ "4469da89.6a377c"
]
]
},
@@ -89,8 +90,8 @@ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n key='pnf.pnf-name = $unique-nodeId' >\n<parameter name='pnf-name' value='`$unique-nodeId`' />\n<parameter name='pnf-id' value='`$node.node-id`' />\n<parameter name='operational-status' value='`$node.te.oper-status`' />\n<parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 905.1111450195312,
- "y": 221.11758422851562,
+ "x": 893.1111450195312,
+ "y": 502.1175842285156,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -103,8 +104,8 @@ "xml": "<for index='pidx' start='0' end='`$network.node_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 676.8888549804688,
- "y": 201.33981323242188,
+ "x": 664.8888549804688,
+ "y": 482.3398132324219,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -126,8 +127,8 @@ "name": "set node",
"xml": "<set>\n<parameter name='node.' value='`$network.node[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n\n",
"comments": "",
- "x": 910.111083984375,
- "y": 117.22871398925781,
+ "x": 898.111083984375,
+ "y": 398.2287139892578,
"z": "6d6b8a1f.be1cb4",
"wires": []
},
@@ -138,8 +139,8 @@ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n key='pnf.pnf-name = $unique-nodeId' 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/' + $tmp.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=\"`$tmp.network-id`\" />",
"comments": "",
"outputs": 1,
- "x": 1001.7779541015625,
- "y": 396.45097827911377,
+ "x": 989.7779541015625,
+ "y": 677.4509782791138,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -152,8 +153,8 @@ "xml": "<for index='tidx' start='0' end='`$node.termination-point_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1287.4444580078125,
- "y": 572.1175842285156,
+ "x": 1297.4444580078125,
+ "y": 593.1175537109375,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -171,8 +172,8 @@ "name": "set termination point",
"xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",
"comments": "",
- "x": 1557.111328125,
- "y": 555.0065612792969,
+ "x": 1567.111328125,
+ "y": 576.0065307617188,
"z": "6d6b8a1f.be1cb4",
"wires": []
},
@@ -183,8 +184,8 @@ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $unique-nodeId\n AND p-interface.interface-name = $unique-ltpId' > \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->\n<parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />\n\n",
"comments": "",
"outputs": 1,
- "x": 1551.815185546875,
- "y": 742.5621032714844,
+ "x": 1561.815185546875,
+ "y": 763.5620727539062,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -200,8 +201,8 @@ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $unique-nodeId '/p-interfaces/p-interface/' + $unique-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ltpId`\" />",
"comments": "",
"outputs": 1,
- "x": 1634.703857421875,
- "y": 899.3398742675781,
+ "x": 1382.703857421875,
+ "y": 1676.33984375,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -213,8 +214,8 @@ "name": "set unique-ltpId",
"xml": "<set>\n<parameter name='unique-ltpId' value=\"`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`\" />\n",
"comments": "",
- "x": 1541.000244140625,
- "y": 612.1175842285156,
+ "x": 1551.000244140625,
+ "y": 633.1175537109375,
"z": "6d6b8a1f.be1cb4",
"wires": []
},
@@ -239,8 +240,8 @@ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $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/' + $node.node-id`\" />\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=\"`$node.node-id`\" />\n",
"comments": "",
"outputs": 1,
- "x": 983,
- "y": 433,
+ "x": 971,
+ "y": 714,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -253,8 +254,8 @@ "xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1723.499885559082,
- "y": 729.7525787353516,
+ "x": 1733.499885559082,
+ "y": 750.7525482177734,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -269,8 +270,8 @@ "xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1717.1784744262695,
- "y": 781.966890335083,
+ "x": 1727.1784744262695,
+ "y": 802.9668598175049,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -286,8 +287,8 @@ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1874.0000457763672,
- "y": 729.0065097808838,
+ "x": 1884.0000457763672,
+ "y": 750.0064792633057,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -300,8 +301,8 @@ "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $unique-nodeId\n AND p-interface.interface-name = $unique-ltpId' > \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->\n<parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />",
"comments": "",
"outputs": 1,
- "x": 1903,
- "y": 783.0065002441406,
+ "x": 1913,
+ "y": 804.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -311,11 +312,11 @@ "id": "7077dcc4.1aa314",
"type": "save",
"name": "save tunnel-termination-point",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n key='tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n key='tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id[0]`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 1686,
- "y": 329.0065002441406,
+ "x": 1627,
+ "y": 1055.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -331,8 +332,8 @@ "xml": "<for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1349,
- "y": 317.0065002441406,
+ "x": 1290,
+ "y": 1043.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -340,7 +341,8 @@ "458ce581.77bfe4",
"7077dcc4.1aa314",
"dad1a90d.61b018",
- "7da29c03.1dbdf4"
+ "7da29c03.1dbdf4",
+ "58b65656.8480c8"
]
]
},
@@ -350,8 +352,8 @@ "name": "set tunnel termination point",
"xml": "<set>\n<parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />\n",
"comments": "",
- "x": 1684,
- "y": 237.00650024414062,
+ "x": 1625,
+ "y": 963.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": []
},
@@ -361,8 +363,8 @@ "name": "set unique-ttpId",
"xml": "<set>\n<parameter name='unique-ttpId' value=\"`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`\" />\n",
"comments": "",
- "x": 1642.888916015625,
- "y": 275.1175842285156,
+ "x": 1583.888916015625,
+ "y": 1001.1175537109375,
"z": "6d6b8a1f.be1cb4",
"wires": []
},
@@ -373,8 +375,8 @@ "xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1952,
- "y": 315.0065002441406,
+ "x": 1893,
+ "y": 1041.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -389,8 +391,8 @@ "xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1945.6785888671875,
- "y": 367.22081184387207,
+ "x": 1886.6785888671875,
+ "y": 1093.220781326294,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -406,8 +408,8 @@ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2102.500160217285,
- "y": 314.26043128967285,
+ "x": 2043.5001602172852,
+ "y": 1040.2604007720947,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -417,11 +419,11 @@ "id": "652a4eb1.3c9f7",
"type": "update",
"name": "update tunnel-termination-point",
- "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n key='tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
+ "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n key='tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id[0]`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 2183,
- "y": 369.0065002441406,
+ "x": 2124,
+ "y": 1095.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -433,8 +435,8 @@ "name": "set local variables",
"xml": "<set>\n<parameter name='unique-nodeId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`\" />\n",
"comments": "",
- "x": 935,
- "y": 164.00650024414062,
+ "x": 923,
+ "y": 445.0065002441406,
"z": "6d6b8a1f.be1cb4",
"wires": []
},
@@ -445,8 +447,8 @@ "xml": "<call module='DataChange' rpc='update-network-links-to-aai' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 619,
- "y": 327.0065002441406,
+ "x": 607,
+ "y": 608.0065002441406,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -459,8 +461,8 @@ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \n key='pnf.pnf-name = $unique-nodeId\n AND p-interface.interface-name = $unique-ltpId' 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/' + $unique-nodeId`\" />\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=\"`$unique-nodeId`\" />\n",
"comments": "",
"outputs": 1,
- "x": 1635,
- "y": 842.0065002441406,
+ "x": 1389,
+ "y": 1632.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -473,8 +475,8 @@ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"tunnel-termination-point\" />\n<!--<parameter name=\"relationship-list.relationship[$ttidx].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`\" />-->\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"tunnel-termination-point.ttp-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ttpId`\" />",
"comments": "",
"outputs": 1,
- "x": 1757,
- "y": 421.0065002441406,
+ "x": 1698,
+ "y": 1147.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -490,8 +492,8 @@ "xml": "<switch test='`$node.te.tunnel-termination-point_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 921,
- "y": 293.0065002441406,
+ "x": 862,
+ "y": 1019.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -509,8 +511,8 @@ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1269,
- "y": 245.00650024414062,
+ "x": 1210,
+ "y": 971.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -523,8 +525,8 @@ "xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1111,
- "y": 316.0065002441406,
+ "x": 1057,
+ "y": 1054.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -539,8 +541,8 @@ "xml": "<switch test='`$node.termination-point_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 901,
- "y": 548.0065002441406,
+ "x": 911,
+ "y": 569.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -557,8 +559,8 @@ "xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1080,
- "y": 500.0065002441406,
+ "x": 1090,
+ "y": 521.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -573,8 +575,8 @@ "xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1079,
- "y": 602.0065002441406,
+ "x": 1089,
+ "y": 623.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -590,8 +592,8 @@ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1235,
- "y": 500.0065002441406,
+ "x": 1245,
+ "y": 521.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -604,8 +606,8 @@ "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/onap/logTopologyDiscovery.txt\" />\n <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n <parameter name=\"field2\" value=\"sucess executing Hesam log file\" />\n <parameter name=\"field3\" value=\"`$node.te.tunnel-termination-point_length`\" />\n <parameter name=\"field4\" value=\"`$node.termination-point_length`\" />\n ",
"comments": "",
"outputs": 1,
- "x": 899,
- "y": 337.0065002441406,
+ "x": 840,
+ "y": 1063.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -618,8 +620,8 @@ "xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1109,
- "y": 179.00650024414062,
+ "x": 1050,
+ "y": 905.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -634,8 +636,8 @@ "xml": "<outcome value='0'>\n",
"comments": "",
"outputs": 1,
- "x": 1114,
- "y": 254.00650024414062,
+ "x": 1055,
+ "y": 980.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -650,8 +652,8 @@ "xml": "<outcome value='0'>\n",
"comments": "",
"outputs": 1,
- "x": 1090,
- "y": 548.0065002441406,
+ "x": 1100,
+ "y": 569.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -665,8 +667,8 @@ "name": "unset node",
"xml": "<set>\n<parameter name='node.' value='' />\n\n",
"comments": "",
- "x": 907,
- "y": 66.00650024414062,
+ "x": 895,
+ "y": 347.0065002441406,
"z": "6d6b8a1f.be1cb4",
"wires": []
},
@@ -676,8 +678,8 @@ "name": "unset termination point",
"xml": "<set>\n<parameter name='tp.' value='' />\n",
"comments": "",
- "x": 1569,
- "y": 498.0065002441406,
+ "x": 1579,
+ "y": 519.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": []
},
@@ -687,8 +689,8 @@ "name": "unset tunnel termination point",
"xml": "<set>\n<parameter name='ttp.' value='' />\n",
"comments": "",
- "x": 1684,
- "y": 189.00650024414062,
+ "x": 1625,
+ "y": 915.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": []
},
@@ -699,8 +701,8 @@ "xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2089,
- "y": 424.0065002441406,
+ "x": 2030,
+ "y": 1150.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -715,8 +717,8 @@ "xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2086,
- "y": 472.0065002441406,
+ "x": 2027,
+ "y": 1198.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -731,8 +733,8 @@ "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/onap/logTopologyDiscovery.txt\" />\n <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n <parameter name=\"field2\" value=\"sucess executing Hesam log file\" />\n <parameter name=\"field3\" value=\"`$node.te.tunnel-termination-point_length`\" />\n <parameter name=\"field4\" value=\"`$node.termination-point_length`\" />\n <parameter name=\"field5\" value=\"sucessfully saved ttp\" />\n <parameter name=\"field6\" value=\"`relationship-list.relationship[$ttidx].related-link`\" />\n ",
"comments": "",
"outputs": 1,
- "x": 2244,
- "y": 425.0065002441406,
+ "x": 2185,
+ "y": 1151.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -745,8 +747,8 @@ "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/onap/logTopologyDiscovery.txt\" />\n <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n <parameter name=\"field2\" value=\"sucess executing Hesam log file\" />\n <parameter name=\"field3\" value=\"`$node.te.tunnel-termination-point_length`\" />\n <parameter name=\"field4\" value=\"`$node.termination-point_length`\" />\n <parameter name=\"field5\" value=\"failuire on saving ttp\" />\n <parameter name=\"field6\" value=\"`relationship-list.relationship[$ttidx].related-link`\" />\n\n ",
"comments": "",
"outputs": 1,
- "x": 2245,
- "y": 473.0065002441406,
+ "x": 2186,
+ "y": 1199.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -759,8 +761,8 @@ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='base64DecodingAlgo' >\n <parameter name=\"encodedValue\" value='`$tp.te.inter-domain-plug-id`'/>\n <parameter name=\"decodedValue\" value=\"tmp.decoded-plug-id\"/>\n ",
"comments": "",
"outputs": 1,
- "x": 2035,
- "y": 667.0065002441406,
+ "x": 2045,
+ "y": 688.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -776,8 +778,8 @@ "xml": "<switch test='`length($tp.te.inter-domain-plug-id) == 0`'>\n\n",
"comments": "",
"outputs": 1,
- "x": 1605,
- "y": 668.0065002441406,
+ "x": 1615,
+ "y": 689.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -793,8 +795,8 @@ "xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1832,
- "y": 621.0065002441406,
+ "x": 1842,
+ "y": 642.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -809,8 +811,8 @@ "xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1833,
- "y": 667.0065002441406,
+ "x": 1843,
+ "y": 688.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -824,8 +826,8 @@ "name": "unset tmp.decoded-plug-id",
"xml": "<set>\n<parameter name='tmp.decoded-plug-id' value='' />\n",
"comments": "",
- "x": 2036,
- "y": 621.0065002441406,
+ "x": 2046,
+ "y": 642.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": []
},
@@ -836,8 +838,8 @@ "xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2240,
- "y": 644.0065002441406,
+ "x": 2250,
+ "y": 665.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -852,8 +854,8 @@ "xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2233.6785888671875,
- "y": 696.2208118438721,
+ "x": 2243.6785888671875,
+ "y": 717.220781326294,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -869,8 +871,8 @@ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2381,
- "y": 644.0065002441406,
+ "x": 2391,
+ "y": 665.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -882,8 +884,8 @@ "name": "unset tmp.decoded-plug-id",
"xml": "<set>\n<parameter name='tmp.decoded-plug-id' value='`$tp.te.inter-domain-plug-id`' />\n",
"comments": "",
- "x": 2440,
- "y": 696.0065002441406,
+ "x": 2450,
+ "y": 717.0064697265625,
"z": "6d6b8a1f.be1cb4",
"wires": []
},
@@ -897,5 +899,248 @@ "y": 81.00650024414062,
"z": "6d6b8a1f.be1cb4",
"wires": []
+ },
+ {
+ "id": "4469da89.6a377c",
+ "type": "get-resource",
+ "name": "get-resource esr-thirdparty-sdnc",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 736,
+ "y": 220,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "259a6f10.d859c",
+ "2643a1bc.bc0f46",
+ "7a6e0ac1.83425c"
+ ]
+ ]
+ },
+ {
+ "id": "259a6f10.d859c",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 982,
+ "y": 180,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "83c13ac.c0250c8"
+ ]
+ ]
+ },
+ {
+ "id": "2643a1bc.bc0f46",
+ "type": "not-found",
+ "name": "not-found",
+ "xml": "<outcome value='not-found'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 986,
+ "y": 220,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "7add65bd.d43c1c"
+ ]
+ ]
+ },
+ {
+ "id": "7a6e0ac1.83425c",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 978,
+ "y": 260,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "a3451a06.01294"
+ ]
+ ]
+ },
+ {
+ "id": "7add65bd.d43c1c",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+ "comments": "",
+ "x": 1136,
+ "y": 220,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": []
+ },
+ {
+ "id": "a3451a06.01294",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+ "comments": "",
+ "x": 1136,
+ "y": 260,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": []
+ },
+ {
+ "id": "83c13ac.c0250c8",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1126,
+ "y": 178,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "70f6d2fc.749b0c"
+ ]
+ ]
+ },
+ {
+ "id": "70f6d2fc.749b0c",
+ "type": "save",
+ "name": "save network-resource relationship to esr-thirdparty-sdnc",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource:relationship-list' \n key='network-resource.network-id = $tmp.network-id'\n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"esr-thirdparty-sdnc\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"esr-thirdparty-sdnc.thirdparty-sdnc-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n<!--/aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/SOTNControllerDomain2-->\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1429,
+ "y": 179,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "58b65656.8480c8",
+ "type": "switchNode",
+ "name": "switch llcl length",
+ "xml": "<switch test='`$node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity_length`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1559,
+ "y": 1319,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "cf6621ae.60449",
+ "a969fa1e.a9262",
+ "31cb7972.09206e"
+ ]
+ ]
+ },
+ {
+ "id": "cf6621ae.60449",
+ "type": "other",
+ "name": "Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1747,
+ "y": 1205,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "95b8f366.2c9b38"
+ ]
+ ]
+ },
+ {
+ "id": "a969fa1e.a9262",
+ "type": "outcome",
+ "name": "length 0",
+ "xml": "<outcome value='0'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1752,
+ "y": 1280,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "95b8f366.2c9b38"
+ ]
+ ]
+ },
+ {
+ "id": "31cb7972.09206e",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1754,
+ "y": 1354,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "df66f384.e71e78"
+ ]
+ ]
+ },
+ {
+ "id": "95b8f366.2c9b38",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1907,
+ "y": 1271,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "ba6a5053.fa9158",
+ "type": "save",
+ "name": "save ttp relationship to tp in AAI",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point:relationship-list' \n key='tunnel-termination-point.ttp-id = $unique-ttpId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-nodeId + '/p-interfaces/p-interface/' + $unique-ltpId-second`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ltpId-second`\" />",
+ "comments": "",
+ "outputs": 1,
+ "x": 2135,
+ "y": 1357,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "f20766b0.56af",
+ "type": "set",
+ "name": "set unique-ltpId second",
+ "xml": "<set>\n<parameter name='unique-ltpId-second' value=\"`$unique-nodeId + '-ltpId-' + $node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity[0].link-tp-ref`\" />\n",
+ "comments": "",
+ "x": 2084,
+ "y": 1313,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": []
+ },
+ {
+ "id": "df66f384.e71e78",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1894,
+ "y": 1350,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "f20766b0.56af",
+ "ba6a5053.fa9158"
+ ]
+ ]
}
]
\ No newline at end of file diff --git a/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json b/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json index a47bab0b..a22a5bdd 100644 --- a/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json +++ b/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json @@ -257,7 +257,7 @@ "id": "1e876a82.9683f5",
"type": "set",
"name": "set ttp-inter-layer-lock-id",
- "xml": "<set>\n<parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`' />\n",
+ "xml": "<set>\n<parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id[0]`' />\n",
"comments": "",
"x": 1931,
"y": 459,
diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml index 5a0255de..afe1fc0e 100644 --- a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml +++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml @@ -1,221 +1,263 @@ -<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='update-network-to-aai' mode='sync'>
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
+ <method rpc="update-network-to-aai" mode="sync">
<block atomic="true">
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
<parameter name="source" value="`$network.network-id`"/>
<parameter name="outputPath" value="tmp.original-network-id"/>
<parameter name="target" value="/"/>
<parameter name="replacement" value="-"/>
</execute>
<set>
- <parameter name='tmp.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`" />
+ <parameter name="tmp.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`"/>
</set>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'
- key='network-resource.network-id = $tmp.network-id' >
- <parameter name='network-id' value='`$tmp.network-id`' />
- <parameter name='client-id' value='`$network.client-id`' />
- <parameter name='te-topo-id' value='`$network.te-topology-id`' />
- <parameter name='provider-id' value='`$network.provider-id`' />
- <parameter name='network-type' value='`$network.network-types`' />
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $tmp.network-id">
+ <parameter name="network-id" value="`$tmp.network-id`"/>
+ <parameter name="client-id" value="`$network.client-id`"/>
+ <parameter name="te-topo-id" value="`$network.te-topology-id`"/>
+ <parameter name="provider-id" value="`$network.provider-id`"/>
+ <parameter name="network-type" value="`$network.network-types`"/>
</save>
- <for index='pidx' start='0' end='`$network.node_length`' >
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
+ <outcome value="success">
+ <block>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource:relationship-list" key="network-resource.network-id = $tmp.network-id" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="esr-thirdparty-sdnc"/>
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/' + $prop.sdncRestApi.thirdpartySdnc.id`"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="esr-thirdparty-sdnc.thirdparty-sdnc-id"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sdncRestApi.thirdpartySdnc.id`"/>
+ <!--
+ /aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/SOTNControllerDomain2
+ -->
+ </save>
+ </block>
+ </outcome>
+ <outcome value="not-found">
+ <return status="failure">
+ <parameter name="ack-final" value="Y"/>
+ <parameter name="error-code" value="500"/>
+ <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`"/>
+ </return>
+ </outcome>
+ <outcome value="Other">
+ <return status="failure">
+ <parameter name="ack-final" value="Y"/>
+ <parameter name="error-code" value="500"/>
+ <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`"/>
+ </return>
+ </outcome>
+ </get-resource>
+ <for index="pidx" start="0" end="`$network.node_length`">
<set>
- <parameter name='node.' value='' />
+ <parameter name="node." value=""/>
</set>
<set>
- <parameter name='node.' value='`$network.node[$pidx].`' />
- <parameter name='unique-networkId' value='`$tmp.network-id`' />
+ <parameter name="node." value="`$network.node[$pidx].`"/>
+ <parameter name="unique-networkId" value="`$tmp.network-id`"/>
</set>
<set>
- <parameter name='unique-nodeId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`" />
+ <parameter name="unique-nodeId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`"/>
</set>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf'
- key='pnf.pnf-name = $unique-nodeId' >
- <parameter name='pnf-name' value='`$unique-nodeId`' />
- <parameter name='pnf-id' value='`$node.node-id`' />
- <parameter name='operational-status' value='`$node.te.oper-status`' />
- <parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />
- <parameter name='in-maint' value='true' />
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $unique-nodeId">
+ <parameter name="pnf-name" value="`$unique-nodeId`"/>
+ <parameter name="pnf-id" value="`$node.node-id`"/>
+ <parameter name="operational-status" value="`$node.te.oper-status`"/>
+ <parameter name="admin-status" value="`$node.te.te-node-attributes.admin-status`"/>
+ <parameter name="in-maint" value="true"/>
</save>
- <switch test='`$node.te.tunnel-termination-point_length`'>
- <outcome value=''>
- <block></block>
+ <switch test="`$node.termination-point_length`">
+ <outcome value="">
+ <block/>
</outcome>
- <outcome value='0'>
- <block></block>
+ <outcome value="0">
+ <block/>
</outcome>
- <outcome value='Other'>
- <for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >
+ <outcome value="Other">
+ <for index="tidx" start="0" end="`$node.termination-point_length`">
<set>
- <parameter name='ttp.' value='' />
+ <parameter name="tp." value=""/>
</set>
<set>
- <parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />
+ <parameter name="tp." value="`$node.termination-point[$tidx].`"/>
</set>
<set>
- <parameter name='unique-ttpId' value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`" />
+ <parameter name="unique-ltpId" value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`"/>
</set>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point'
- key='tunnel-termination-point.ttp-id = $unique-ttpId' >
- <parameter name='ttp-id' value='`$unique-ttpId`' />
- <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />
- <parameter name='name' value='`$ttp.name`' />
- <parameter name='admin-status' value='`$ttp.admin-status`' />
- <parameter name='oper-status' value='`$ttp.oper-status`' />
- <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />
- <parameter name='switching-capability' value='`$ttp.switching-capability`' />
- <parameter name='protection-type' value='`$ttp.protection-type`' />
- <parameter name='encoding' value='`$ttp.encoding`' />
- <outcome value='success'>
- <block></block>
+ <switch test="`length($tp.te.inter-domain-plug-id) == 0`">
+ <outcome value="true">
+ <set>
+ <parameter name="tmp.decoded-plug-id" value=""/>
+ </set>
</outcome>
- <outcome value='failure'>
- <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point'
- key='tunnel-termination-point.ttp-id = $unique-ttpId' >
- <parameter name='ttp-id' value='`$unique-ttpId`' />
- <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />
- <parameter name='name' value='`$ttp.name`' />
- <parameter name='admin-status' value='`$ttp.admin-status`' />
- <parameter name='oper-status' value='`$ttp.oper-status`' />
- <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />
- <parameter name='switching-capability' value='`$ttp.switching-capability`' />
- <parameter name='protection-type' value='`$ttp.protection-type`' />
- <parameter name='encoding' value='`$ttp.encoding`' />
- </update>
+ <outcome value="false">
+ <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="base64DecodingAlgo">
+ <parameter name="encodedValue" value="`$tp.te.inter-domain-plug-id`"/>
+ <parameter name="decodedValue" value="tmp.decoded-plug-id"/>
+ <outcome value="success">
+ <block/>
+ </outcome>
+ <outcome value="failure">
+ <set>
+ <parameter name="tmp.decoded-plug-id" value="`$tp.te.inter-domain-plug-id`"/>
+ </set>
+ </outcome>
+ </execute>
</outcome>
- </save>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list'
- key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point" />
- <!--<parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />-->
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`" />
- <outcome value='success'>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
- <parameter name="field1" value="__TIMESTAMP__" />
- <parameter name="field2" value="sucess executing Hesam log file" />
- <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />
- <parameter name="field4" value="`$node.termination-point_length`" />
- <parameter name="field5" value="sucessfully saved ttp" />
- <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`" />
- </record>
+ </switch>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-nodeId AND p-interface.interface-name = $unique-ltpId">
+ <parameter name="interface-name" value="`$unique-ltpId`"/>
+ <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>
+ <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>
+ <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>
+ <parameter name="operational-status" value="`$tp.te.oper-status`"/>
+ <parameter name="in-maint" value="true"/>
+ <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>
+ <!--
+ <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />
+ -->
+ <parameter name="inter-domain-plug-id" value="`$tmp.decoded-plug-id`"/>
+ <outcome value="success">
+ <block/>
</outcome>
- <outcome value='failure'>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
- <parameter name="field1" value="__TIMESTAMP__" />
- <parameter name="field2" value="sucess executing Hesam log file" />
- <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />
- <parameter name="field4" value="`$node.termination-point_length`" />
- <parameter name="field5" value="failuire on saving ttp" />
- <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`" />
- </record>
+ <outcome value="failure">
+ <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-nodeId AND p-interface.interface-name = $unique-ltpId">
+ <parameter name="interface-name" value="`$unique-ltpId`"/>
+ <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>
+ <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>
+ <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>
+ <parameter name="operational-status" value="`$tp.te.oper-status`"/>
+ <parameter name="in-maint" value="true"/>
+ <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>
+ <!--
+ <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />
+ -->
+ <parameter name="inter-domain-plug-id" value="`$tmp.decoded-plug-id`"/>
+ </update>
</outcome>
</save>
</for>
</outcome>
</switch>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
- <parameter name="field1" value="__TIMESTAMP__" />
- <parameter name="field2" value="sucess executing Hesam log file" />
- <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />
- <parameter name="field4" value="`$node.termination-point_length`" />
- </record>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list'
- key='pnf.pnf-name = $unique-nodeId' 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/' + $tmp.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="`$tmp.network-id`" />
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $unique-nodeId" 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/' + $tmp.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="`$tmp.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 = $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/' + $node.node-id`" />
- <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="`$node.node-id`" />
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc:relationship-list" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $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/' + $node.node-id`"/>
+ <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="`$node.node-id`"/>
</save>
- <switch test='`$node.termination-point_length`'>
- <outcome value=''>
- <block></block>
+ <switch test="`$node.te.tunnel-termination-point_length`">
+ <outcome value="">
+ <block/>
</outcome>
- <outcome value='0'>
- <block></block>
+ <outcome value="0">
+ <block/>
</outcome>
- <outcome value='Other'>
- <for index='tidx' start='0' end='`$node.termination-point_length`' >
+ <outcome value="Other">
+ <for index="ttidx" start="0" end="`$node.te.tunnel-termination-point_length`">
<set>
- <parameter name='tp.' value='' />
+ <parameter name="ttp." value=""/>
</set>
<set>
- <parameter name='tp.' value='`$node.termination-point[$tidx].`' />
+ <parameter name="ttp." value="`$node.te.tunnel-termination-point[$ttidx].`"/>
</set>
<set>
- <parameter name='unique-ltpId' value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`" />
+ <parameter name="unique-ttpId" value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`"/>
</set>
- <switch test='`length($tp.te.inter-domain-plug-id) == 0`'>
- <outcome value='true'>
- <set>
- <parameter name='tmp.decoded-plug-id' value='' />
- </set>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $unique-ttpId">
+ <parameter name="ttp-id" value="`$unique-ttpId`"/>
+ <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>
+ <parameter name="name" value="`$ttp.name`"/>
+ <parameter name="admin-status" value="`$ttp.admin-status`"/>
+ <parameter name="oper-status" value="`$ttp.oper-status`"/>
+ <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id[0]`"/>
+ <parameter name="switching-capability" value="`$ttp.switching-capability`"/>
+ <parameter name="protection-type" value="`$ttp.protection-type`"/>
+ <parameter name="encoding" value="`$ttp.encoding`"/>
+ <outcome value="success">
+ <block/>
</outcome>
- <outcome value='false'>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='base64DecodingAlgo' >
- <parameter name="encodedValue" value='`$tp.te.inter-domain-plug-id`'/>
- <parameter name="decodedValue" value="tmp.decoded-plug-id"/>
- <outcome value='success'>
- <block></block>
- </outcome>
- <outcome value='failure'>
- <set>
- <parameter name='tmp.decoded-plug-id' value='`$tp.te.inter-domain-plug-id`' />
- </set>
- </outcome>
- </execute>
+ <outcome value="failure">
+ <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $unique-ttpId">
+ <parameter name="ttp-id" value="`$unique-ttpId`"/>
+ <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>
+ <parameter name="name" value="`$ttp.name`"/>
+ <parameter name="admin-status" value="`$ttp.admin-status`"/>
+ <parameter name="oper-status" value="`$ttp.oper-status`"/>
+ <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id[0]`"/>
+ <parameter name="switching-capability" value="`$ttp.switching-capability`"/>
+ <parameter name="protection-type" value="`$ttp.protection-type`"/>
+ <parameter name="encoding" value="`$ttp.encoding`"/>
+ </update>
</outcome>
- </switch>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
- key='pnf.pnf-name = $unique-nodeId
- AND p-interface.interface-name = $unique-ltpId' >
- <parameter name='interface-name' value='`$unique-ltpId`' />
- <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
- <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />
- <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
- <parameter name='operational-status' value='`$tp.te.oper-status`' />
- <parameter name='in-maint' value="true" />
- <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />
- <!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->
- <parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />
- <outcome value='success'>
- <block></block>
+ </save>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $unique-nodeId" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point"/>
+ <!--
+ <parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />
+ -->
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>
+ <outcome value="success">
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>
+ <parameter name="field1" value="__TIMESTAMP__"/>
+ <parameter name="field2" value="sucess executing Hesam log file"/>
+ <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>
+ <parameter name="field4" value="`$node.termination-point_length`"/>
+ <parameter name="field5" value="sucessfully saved ttp"/>
+ <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`"/>
+ </record>
</outcome>
- <outcome value='failure'>
- <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
- key='pnf.pnf-name = $unique-nodeId
- AND p-interface.interface-name = $unique-ltpId' >
- <parameter name='interface-name' value='`$unique-ltpId`' />
- <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
- <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />
- <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
- <parameter name='operational-status' value='`$tp.te.oper-status`' />
- <parameter name='in-maint' value="true" />
- <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />
- <!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->
- <parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />
- </update>
+ <outcome value="failure">
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>
+ <parameter name="field1" value="__TIMESTAMP__"/>
+ <parameter name="field2" value="sucess executing Hesam log file"/>
+ <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>
+ <parameter name="field4" value="`$node.termination-point_length`"/>
+ <parameter name="field5" value="failuire on saving ttp"/>
+ <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`"/>
+ </record>
</outcome>
</save>
+ <switch test="`$node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity_length`">
+ <outcome value="">
+ <block/>
+ </outcome>
+ <outcome value="0">
+ <block/>
+ </outcome>
+ <outcome value="Other">
+ <block>
+ <set>
+ <parameter name="unique-ltpId-second" value="`$unique-nodeId + '-ltpId-' + $node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity[0].link-tp-ref`"/>
+ </set>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point:relationship-list" key="tunnel-termination-point.ttp-id = $unique-ttpId" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="p-interface"/>
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-nodeId + '/p-interfaces/p-interface/' + $unique-ltpId-second`"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ltpId-second`"/>
+ </save>
+ </block>
+ </outcome>
+ </switch>
</for>
</outcome>
</switch>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>
+ <parameter name="field1" value="__TIMESTAMP__"/>
+ <parameter name="field2" value="sucess executing Hesam log file"/>
+ <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>
+ <parameter name="field4" value="`$node.termination-point_length`"/>
+ </record>
</for>
- <call module='DataChange' rpc='update-network-links-to-aai' mode='sync' ></call>
+ <call module="DataChange" rpc="update-network-links-to-aai" mode="sync"/>
</block>
</method>
</service-logic>
\ No newline at end of file diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml b/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml index 90396852..4ce33625 100644 --- a/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml +++ b/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml @@ -1,99 +1,96 @@ -<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='update-tp-ttp-relationship' mode='sync'>
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
+ <method rpc="update-tp-ttp-relationship" mode="sync">
<block atomic="true">
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
<parameter name="source" value="`$network-eth.network-id`"/>
<parameter name="outputPath" value="tmp.original-network-eth.network-id"/>
<parameter name="target" value="/"/>
<parameter name="replacement" value="-"/>
</execute>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
<parameter name="source" value="`$network-otn.network-id`"/>
<parameter name="outputPath" value="tmp.original-network-otn.network-id"/>
<parameter name="target" value="/"/>
<parameter name="replacement" value="-"/>
</execute>
<set>
- <parameter name='tmp.network-eth.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-eth.network-id`" />
- <parameter name='tmp.network-otn.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-otn.network-id`" />
+ <parameter name="tmp.network-eth.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-eth.network-id`"/>
+ <parameter name="tmp.network-otn.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-otn.network-id`"/>
</set>
- <for index='pethidx' start='0' end='`$network-eth.node_length`' >
+ <for index="pethidx" start="0" end="`$network-eth.node_length`">
<set>
- <parameter name='node-eth.' value='`$network-eth.node[$pethidx].`' />
+ <parameter name="node-eth." value="`$network-eth.node[$pethidx].`"/>
</set>
<set>
- <parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />
+ <parameter name="unique-network-ethId" value="`$tmp.network-eth.network-id`"/>
</set>
<set>
- <parameter name='unique-node-ethId' value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`" />
+ <parameter name="unique-node-ethId" value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`"/>
</set>
- <switch test='`$node-eth.termination-point_length`'>
- <outcome value=''>
- <block></block>
+ <switch test="`$node-eth.termination-point_length`">
+ <outcome value="">
+ <block/>
</outcome>
- <outcome value='0'>
- <block></block>
+ <outcome value="0">
+ <block/>
</outcome>
- <outcome value='Other'>
- <for index='tidx' start='0' end='`$node-eth.termination-point_length`' >
+ <outcome value="Other">
+ <for index="tidx" start="0" end="`$node-eth.termination-point_length`">
<set>
- <parameter name='tp-eth.' value='' />
+ <parameter name="tp-eth." value=""/>
</set>
<set>
- <parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />
+ <parameter name="tp-eth." value="`$node-eth.termination-point[$tidx].`"/>
</set>
<set>
- <parameter name='unique-ltpethId' value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`" />
+ <parameter name="unique-ltpethId" value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`"/>
</set>
<set>
- <parameter name='tp-inter-layer-lock-id' value='`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`' />
+ <parameter name="tp-inter-layer-lock-id" value="`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`"/>
</set>
- <for index='potnidx' start='0' end='`$network-otn.node_length`' >
+ <for index="potnidx" start="0" end="`$network-otn.node_length`">
<set>
- <parameter name='node-otn.' value='' />
- <parameter name='unique-network-otnId' value='' />
- <parameter name='unique-node-otnId' value="" />
+ <parameter name="node-otn." value=""/>
+ <parameter name="unique-network-otnId" value=""/>
+ <parameter name="unique-node-otnId" value=""/>
</set>
<set>
- <parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />
+ <parameter name="node-otn." value="`$network-otn.node[$potnidx].`"/>
</set>
<set>
- <parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />
+ <parameter name="unique-network-otnId" value="`$tmp.network-otn.network-id`"/>
</set>
<set>
- <parameter name='unique-node-otnId' value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`" />
+ <parameter name="unique-node-otnId" value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`"/>
</set>
- <switch test='`$node-otn.te.tunnel-termination-point_length`'>
- <outcome value=''>
- <block></block>
+ <switch test="`$node-otn.te.tunnel-termination-point_length`">
+ <outcome value="">
+ <block/>
</outcome>
- <outcome value='0'>
- <block></block>
+ <outcome value="0">
+ <block/>
</outcome>
- <outcome value='Other'>
- <for index='ttidx' start='0' end='`$node-otn.te.tunnel-termination-point_length`' >
+ <outcome value="Other">
+ <for index="ttidx" start="0" end="`$node-otn.te.tunnel-termination-point_length`">
<set>
- <parameter name='ttp.' value='' />
+ <parameter name="ttp." value=""/>
</set>
<set>
- <parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />
+ <parameter name="ttp." value="`$node-otn.te.tunnel-termination-point[$ttidx].`"/>
</set>
<set>
- <parameter name='unique-ttpId' value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`" />
+ <parameter name="unique-ttpId" value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`"/>
</set>
<set>
- <parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`' />
+ <parameter name="ttp-inter-layer-lock-id" value="`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id[0]`"/>
</set>
- <switch test='`$tp-inter-layer-lock-id`'>
- <outcome value='`$ttp-inter-layer-lock-id`'>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list'
- key='p-interface.interface-name = $unique-ltpethId' force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point" />
- <parameter name="relationship-list.relationship[0].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`" />
+ <switch test="`$tp-inter-layer-lock-id`">
+ <outcome value="`$ttp-inter-layer-lock-id`">
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface:relationship-list" key="p-interface.interface-name = $unique-ltpethId" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point"/>
+ <parameter name="relationship-list.relationship[0].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>
</save>
</outcome>
</switch>
|