diff options
| author |   Hesam Rahimi <hesam.rahimi@huawei.com> | 2019-04-17 00:02:13 +0000 |
|---|---|---|
| committer |   Dan Timoney <dtimoney@att.com> | 2020-04-20 14:42:38 +0000 |
| commit | b7af6a1d7e5c113f266547cd1fdbd4af3eccabde (patch) | |
| tree | 4d438f0e5ddc75fad74f54e341713054569e4888 | |
| parent | 379deaf8d374d74b85b6c863a6dcd61654dc1ddb (diff) | |
Bug fixing in topology discovery as part of CCVPN (Cross-Layer Cross-Domain VPN) use-case.
1. Cross-layer tp-ttp relationship update.
2. Save te-link-attribute and label-restriction and relationship between them.
3. Add 3rd party controller id into network-id to make it unique for cross-domain use case.
4. Calling Base64 converter plugin to convert inter-domain-plug-id
Issue-ID: SDNC-899
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I892249f8197ceb0e2d32b35a521fdbb1b833010c
(cherry picked from commit 45d198493727a8907f011a7eb49b2259037f690b [formerly a3603b522c83ffd8e8cfc0f6451697dc89a5a9a3])
Former-commit-id: 4e2740455ed0e9cdb5f21f7f3cd0bce2f60a4328
8 files changed, 2754 insertions, 1591 deletions
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 ca5ed7ae..81060bf3 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,242 +1,243 @@ [
{
- "id": "346770b6.e0b2e",
+ "id": "c3dc4adb.8c6008",
"type": "other",
"name": "update",
"xml": "<outcome value='Update'>\n",
"comments": "",
"outputs": 1,
- "x": 666,
- "y": 282,
- "z": "7bb5d2cb.8cfacc",
+ "x": 739,
+ "y": 311,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "ac79093c.29ec78"
+ "bd0845c9.41d478"
]
]
},
{
- "id": "2f504934.7894c6",
+ "id": "71253ee0.23906",
"type": "other",
"name": "delete",
"xml": "<outcome value='Delete'>\n",
"comments": "",
"outputs": 1,
- "x": 666,
- "y": 362,
- "z": "7bb5d2cb.8cfacc",
+ "x": 739,
+ "y": 391,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "5f23df82.9ac6e"
+ "3f0bf71e.180588"
]
]
},
{
- "id": "5f23df82.9ac6e",
+ "id": "3f0bf71e.180588",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 807.5,
- "y": 362,
- "z": "7bb5d2cb.8cfacc",
+ "x": 880.5,
+ "y": 391,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "dc10cae0.74e44"
+ "67540de7.5dd14c"
]
]
},
{
- "id": "5a242175.0e7ef",
+ "id": "de801ea6.e90758",
"type": "switchNode",
"name": "switch aai-event-trigger",
"xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
"comments": "",
"outputs": 1,
- "x": 496.5,
- "y": 322,
- "z": "7bb5d2cb.8cfacc",
+ "x": 569.5,
+ "y": 351,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "346770b6.e0b2e",
- "2f504934.7894c6"
+ "c3dc4adb.8c6008",
+ "71253ee0.23906"
]
]
},
{
- "id": "39f2e6f9.408272",
+ "id": "1007cea6.282501",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1193.5,
- "y": 193,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1266.5,
+ "y": 222,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "97074a04.9156f",
- "a612156e.6c82f",
- "af67ee77.5ddb88",
- "8f8e9805.87c3c8",
- "9d5ac624.def28"
+ "95e785b5.d067b",
+ "7a1058d1.4b2d6",
+ "558bdafc.122dbc",
+ "54848569.ec4d54",
+ "25993b47.1f060c"
]
]
},
{
- "id": "a612156e.6c82f",
+ "id": "7a1058d1.4b2d6",
"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": 1466.5001983642578,
- "y": 114.00000953674316,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1539.5001983642578,
+ "y": 143.00000953674316,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "e7c29f07.2a4d28",
- "fe96d7c9.6dc11"
+ "1f13ca65.eddc8e",
+ "fa7642f7.a126c8"
]
]
},
{
- "id": "e7c29f07.2a4d28",
+ "id": "1f13ca65.eddc8e",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1756.000244140625,
- "y": 106,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1829.000244140625,
+ "y": 135,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "9a41c115.acccd8"
+ "a5768e87.aa1bb"
]
]
},
{
- "id": "fe96d7c9.6dc11",
+ "id": "fa7642f7.a126c8",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1752.000244140625,
- "y": 146,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1825.000244140625,
+ "y": 175,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "142d0bb2.73cbec"
+ "334af206.383786"
]
]
},
{
- "id": "9a41c115.acccd8",
+ "id": "a5768e87.aa1bb",
"type": "set",
"name": "set token-id",
"xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
"comments": "",
- "x": 1906.500244140625,
- "y": 106,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1979.500244140625,
+ "y": 135,
+ "z": "fcc91756.c8d038",
"wires": []
},
{
- "id": "74c607f5.33c7f",
+ "id": "272f0d19.0aa972",
"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": 1973.500244140625,
- "y": 226,
- "z": "7bb5d2cb.8cfacc",
+ "x": 2046.500244140625,
+ "y": 255,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "46585599.99541c",
- "e4dc69e3.746e88"
+ "c0f8711f.5047d8",
+ "6134ff85.3a875"
]
]
},
{
- "id": "46585599.99541c",
+ "id": "c0f8711f.5047d8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2216.000244140625,
- "y": 246,
- "z": "7bb5d2cb.8cfacc",
+ "x": 2289.000244140625,
+ "y": 275,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "c7c89355.9ce378"
+ "f5e8d64.1d84ba8"
]
]
},
{
- "id": "c7c89355.9ce378",
+ "id": "f5e8d64.1d84ba8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 2373.500244140625,
- "y": 246,
- "z": "7bb5d2cb.8cfacc",
+ "x": 2446.500244140625,
+ "y": 275,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "b3a801bb.6b3e08"
+ "f392518f.1c82f",
+ "f7bc5da7.da31b"
]
]
},
{
- "id": "4462058b.03bf7c",
+ "id": "dd9ef895.8d06e8",
"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.000244140625,
- "y": 146,
- "z": "7bb5d2cb.8cfacc",
+ "x": 2423.000244140625,
+ "y": 175,
+ "z": "fcc91756.c8d038",
"wires": []
},
{
- "id": "e4dc69e3.746e88",
+ "id": "6134ff85.3a875",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2212.000244140625,
- "y": 146,
- "z": "7bb5d2cb.8cfacc",
+ "x": 2285.000244140625,
+ "y": 175,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "4462058b.03bf7c"
+ "dd9ef895.8d06e8"
]
]
},
{
- "id": "e48e789f.6305e8",
+ "id": "bca2c88c.f5748",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 119,
- "y": 57,
- "z": "7bb5d2cb.8cfacc",
+ "x": 192,
+ "y": 86,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "f17ff4c0.c3b85"
+ "1c8eebdb.be2d0c"
]
]
},
{
- "id": "f17ff4c0.c3b85",
+ "id": "1c8eebdb.be2d0c",
"type": "service-logic",
"name": "DataChange ${project.version}",
"module": "DataChange",
@@ -244,1017 +245,1243 @@ "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": 132,
- "y": 117,
- "z": "7bb5d2cb.8cfacc",
+ "x": 205,
+ "y": 146,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "dcee4efc.fbc398"
+ "a6fcf3ab.5f9578"
]
]
},
{
- "id": "dcee4efc.fbc398",
+ "id": "a6fcf3ab.5f9578",
"type": "method",
"name": "method esr-thirdparty-sdnc-discovery",
"xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 152,
- "y": 197,
- "z": "7bb5d2cb.8cfacc",
+ "x": 225,
+ "y": 226,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "ee1d05c.842daf8"
+ "6420c8d3.d15ee"
]
]
},
{
- "id": "ee1d05c.842daf8",
+ "id": "6420c8d3.d15ee",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 399.5,
- "y": 197,
- "z": "7bb5d2cb.8cfacc",
+ "x": 472.5,
+ "y": 226,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "289966fd.257632"
+ "39152f22.f0d4a8"
]
]
},
{
- "id": "b3a801bb.6b3e08",
+ "id": "f392518f.1c82f",
"type": "for",
"name": "for each Network",
"xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1799.500259399414,
- "y": 345.00001525878906,
- "z": "7bb5d2cb.8cfacc",
+ "x": 2665.500244140625,
+ "y": 204,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "f46be5c.444e598"
+ "48caa041.662da"
]
]
},
{
- "id": "f46be5c.444e598",
+ "id": "48caa041.662da",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1948.000259399414,
- "y": 345.00001525878906,
- "z": "7bb5d2cb.8cfacc",
+ "x": 2814.000244140625,
+ "y": 204,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "9f7c6e21.8e3448",
- "a45b31cf.5b428"
+ "f9d6723a.6cdf78",
+ "929dfcd4.4e318"
]
]
},
{
- "id": "9f7c6e21.8e3448",
+ "id": "f9d6723a.6cdf78",
"type": "call",
"name": "call update-network-to-aai",
"xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2127.000259399414,
- "y": 365.00001525878906,
- "z": "7bb5d2cb.8cfacc",
+ "x": 2993.000244140625,
+ "y": 224,
+ "z": "fcc91756.c8d038",
"wires": [
[]
]
},
{
- "id": "a45b31cf.5b428",
+ "id": "929dfcd4.4e318",
"type": "set",
"name": "set network",
"xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
"comments": "",
- "x": 2082.000259399414,
- "y": 325.00001525878906,
- "z": "7bb5d2cb.8cfacc",
+ "x": 2948.000244140625,
+ "y": 184,
+ "z": "fcc91756.c8d038",
"wires": []
},
{
- "id": "142d0bb2.73cbec",
+ "id": "334af206.383786",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1872.000244140625,
- "y": 146,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1945.000244140625,
+ "y": 175,
+ "z": "fcc91756.c8d038",
"wires": [
[]
]
},
{
- "id": "77d98c9a.bbdddc",
+ "id": "2b9bc1fc.7f9d86",
"type": "comment",
"name": "Do Nothing",
"info": "",
"comments": "",
- "x": 2042.000244140625,
- "y": 186,
- "z": "7bb5d2cb.8cfacc",
+ "x": 2115.000244140625,
+ "y": 215,
+ "z": "fcc91756.c8d038",
"wires": []
},
{
- "id": "7a5efd17.5c18a4",
+ "id": "ec977bcd.52b8a8",
"type": "switchNode",
"name": "switch type",
"xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
"comments": "",
"outputs": 1,
- "x": 919,
- "y": 282,
- "z": "7bb5d2cb.8cfacc",
+ "x": 992,
+ "y": 311,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "c610bb27.6f7938",
- "f6f15d6a.b855f8",
- "2ed61a13.0813c6",
- "ca97ad3.a311cd"
+ "e6327558.85a0e",
+ "ece3c1dc.08a25",
+ "57f0cdff.7f0d04",
+ "e6efb547.0bd5a8"
]
]
},
{
- "id": "ac79093c.29ec78",
+ "id": "bd0845c9.41d478",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 786,
- "y": 282,
- "z": "7bb5d2cb.8cfacc",
+ "x": 859,
+ "y": 311,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "7a5efd17.5c18a4"
+ "ec977bcd.52b8a8"
]
]
},
{
- "id": "c610bb27.6f7938",
+ "id": "e6327558.85a0e",
"type": "other",
"name": "SOTN",
"xml": "<outcome value='SOTN'>\n",
"comments": "",
"outputs": 1,
- "x": 1032,
- "y": 193,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1105,
+ "y": 222,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "39f2e6f9.408272"
+ "1007cea6.282501"
]
]
},
{
- "id": "f6f15d6a.b855f8",
+ "id": "ece3c1dc.08a25",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1061.5,
- "y": 654.5001220703125,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1134.5,
+ "y": 683.5001220703125,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "bacba57d.e755a8"
+ "752a836e.32daf4"
]
]
},
{
- "id": "bacba57d.e755a8",
+ "id": "752a836e.32daf4",
"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=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",
"comments": "",
- "x": 1247.75,
- "y": 680.5001220703125,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1320.75,
+ "y": 709.5001220703125,
+ "z": "fcc91756.c8d038",
"wires": []
},
{
- "id": "97074a04.9156f",
+ "id": "95e785b5.d067b",
"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": 1413.0001983642578,
- "y": 74.00000953674316,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1486.0001983642578,
+ "y": 103.00000953674316,
+ "z": "fcc91756.c8d038",
"wires": [
[]
]
},
{
- "id": "af67ee77.5ddb88",
+ "id": "558bdafc.122dbc",
"type": "switchNode",
"name": "switch prop.sdncRestApi.token_id",
"xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n",
"comments": "",
"outputs": 1,
- "x": 1459.5001983642578,
- "y": 194.00000953674316,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1532.5001983642578,
+ "y": 223.00000953674316,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "196dbf86.289fe8",
- "2e000adc.427cfe"
+ "9764857a.46386",
+ "b55a5855.1b4c4"
]
]
},
{
- "id": "196dbf86.289fe8",
+ "id": "9764857a.46386",
"type": "other",
"name": "Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1752.000244140625,
- "y": 186,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1825.000244140625,
+ "y": 215,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "58dbe772.71f75"
+ "d18413fb.5938e8"
]
]
},
{
- "id": "2e000adc.427cfe",
+ "id": "b55a5855.1b4c4",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1752.000244140625,
- "y": 226,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1825.000244140625,
+ "y": 255,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "74c607f5.33c7f"
+ "272f0d19.0aa972"
]
]
},
{
- "id": "58dbe772.71f75",
+ "id": "d18413fb.5938e8",
"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",
"comments": "",
"outputs": 1,
- "x": 1973.500244140625,
- "y": 186,
- "z": "7bb5d2cb.8cfacc",
+ "x": 2046.500244140625,
+ "y": 215,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "e4dc69e3.746e88",
- "46585599.99541c"
+ "6134ff85.3a875",
+ "c0f8711f.5047d8"
]
]
},
{
- "id": "9d5ac624.def28",
+ "id": "25993b47.1f060c",
"type": "execute",
"name": "execute RestconfDiscoveryNode",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscription' >\n<parameter name=\"subscriberId\" value=\"sotn-controller\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\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`\" />\n<parameter name=\"module\" value=\"DataChange\" />\n<parameter name=\"rpc\" value=\"sotn-notification-handler\" />\n<parameter name=\"mode\" value=\"sync\" />",
"comments": "",
"outputs": 1,
- "x": 1456.0001983642578,
- "y": 334.00000953674316,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1529.0001983642578,
+ "y": 363.00000953674316,
+ "z": "fcc91756.c8d038",
"wires": [
[]
]
},
{
- "id": "8f8e9805.87c3c8",
+ "id": "54848569.ec4d54",
"type": "set",
"name": "set encoding-format",
"xml": "<set>\n<parameter name='input' value='ietf-subscribed-notifications:establish-subscription.input.' />\n<parameter name=\"`$input + 'encoding'`\" value=\"encode-json\" />",
"comments": "",
- "x": 1416.0001983642578,
- "y": 294.00000953674316,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1489.0001983642578,
+ "y": 323.00000953674316,
+ "z": "fcc91756.c8d038",
"wires": []
},
{
- "id": "bcab4612.fb18e",
+ "id": "c147e994.7edd08",
"type": "comment",
"name": "Notification subscription",
"info": "",
"comments": "",
- "x": 1421.000343322754,
- "y": 251.00000858306885,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1494.000343322754,
+ "y": 280.00000858306885,
+ "z": "fcc91756.c8d038",
"wires": []
},
{
- "id": "289966fd.257632",
+ "id": "39152f22.f0d4a8",
"type": "switchNode",
"name": "switch",
"xml": "<switch test=\"`$prop.sdncRestApi.vendor == 'ZTE'`\">\n",
"comments": "",
"outputs": 1,
- "x": 106,
- "y": 322,
- "z": "7bb5d2cb.8cfacc",
+ "x": 179,
+ "y": 351,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "8432bc7f.958c98",
- "dbdc5153.c45968"
+ "404d2f08.96ad7",
+ "74ffd1db.2f31c8"
]
]
},
{
- "id": "8432bc7f.958c98",
+ "id": "404d2f08.96ad7",
"type": "outcomeFalse",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 293,
- "y": 322,
- "z": "7bb5d2cb.8cfacc",
+ "x": 366,
+ "y": 351,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "5a242175.0e7ef"
+ "de801ea6.e90758"
]
]
},
{
- "id": "dbdc5153.c45968",
+ "id": "74ffd1db.2f31c8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 67.00003051757812,
- "y": 1078.75,
- "z": "7bb5d2cb.8cfacc",
+ "x": 140.00003051757812,
+ "y": 1107.75,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "94027433.59821"
+ "c3886c05.a14928"
]
]
},
{
- "id": "94027433.59821",
+ "id": "c3886c05.a14928",
"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": 298.75,
- "y": 1095.5000610351562,
- "z": "7bb5d2cb.8cfacc",
+ "x": 371.75,
+ "y": 1124.5000610351562,
+ "z": "fcc91756.c8d038",
"wires": [
[]
]
},
{
- "id": "2ed61a13.0813c6",
+ "id": "57f0cdff.7f0d04",
"type": "other",
"name": "TAPI",
"xml": "<outcome value='TAPI'>\n",
"comments": "",
"outputs": 1,
- "x": 1110,
- "y": 427,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1183,
+ "y": 456,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "4691c66b.5d4a4"
+ "9159c5db.f9ecb"
]
]
},
{
- "id": "4691c66b.5d4a4",
+ "id": "9159c5db.f9ecb",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1273,
- "y": 426,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1346,
+ "y": 455,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "7dd7f464.c6c9e4"
+ "359e52a9.fb7c36"
]
]
},
{
- "id": "7dd7f464.c6c9e4",
+ "id": "359e52a9.fb7c36",
"type": "execute",
"name": "execute",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/tapi/v2/topologies?topology-id-or-name=otn'`\"/> \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=\"topologies\"/>\n <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.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": 1434,
- "y": 425,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1507,
+ "y": 454,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "4311848d.591ed4",
- "fc46f47a.aebbb"
+ "bdd5dc28.9d2908",
+ "a872bbb4.c3aec8"
]
]
},
{
- "id": "fc46f47a.aebbb",
+ "id": "a872bbb4.c3aec8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1576,
- "y": 501,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1649,
+ "y": 530,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "cc96eb4.79b6718"
+ "e24829ea.497098"
]
]
},
{
- "id": "4311848d.591ed4",
+ "id": "bdd5dc28.9d2908",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1610,
- "y": 422,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1683,
+ "y": 451,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "85a205fd.e6fe2"
+ "ba70e873.59e928"
]
]
},
{
- "id": "85a205fd.e6fe2",
+ "id": "ba70e873.59e928",
"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 topology TAPI rest api\" />\n\n",
"comments": "",
- "x": 1780,
- "y": 421,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1853,
+ "y": 450,
+ "z": "fcc91756.c8d038",
"wires": []
},
{
- "id": "cc96eb4.79b6718",
+ "id": "e24829ea.497098",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1737,
- "y": 500,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1810,
+ "y": 529,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "84ea29d7.966748"
+ "e5d11bee.6d3f3"
]
]
},
{
- "id": "84ea29d7.966748",
+ "id": "e5d11bee.6d3f3",
"type": "for",
"name": "for each topology",
"xml": "<for index='tidx' start='0' end=\"`$topologies.topology_length`\" >\n",
"comments": "",
"outputs": 1,
- "x": 1916,
- "y": 500,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1989,
+ "y": 529,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "23afbd29.52671a"
+ "f9dbd640.006d18"
]
]
},
{
- "id": "23afbd29.52671a",
+ "id": "f9dbd640.006d18",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2083,
- "y": 501,
- "z": "7bb5d2cb.8cfacc",
+ "x": 2156,
+ "y": 530,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "be671cf9.1f4a38",
- "2c9a9e44.4d4e72"
+ "c60ea7f.3bd2058",
+ "b4f9b29d.c49458"
]
]
},
{
- "id": "be671cf9.1f4a38",
+ "id": "c60ea7f.3bd2058",
"type": "set",
"name": "set topology",
"xml": "<set>\n<parameter name='topology.' value='`$topologies.topology[$tidx].`' />\n",
"comments": "",
- "x": 2242,
- "y": 502,
- "z": "7bb5d2cb.8cfacc",
+ "x": 2315,
+ "y": 531,
+ "z": "fcc91756.c8d038",
"wires": []
},
{
- "id": "2c9a9e44.4d4e72",
+ "id": "b4f9b29d.c49458",
"type": "call",
"name": "call tapi-update-network-to-aai",
"xml": "<call module='DataChange' rpc='tapi-update-network-to-aai' mode='sync' >\n\n",
"comments": "",
"outputs": 1,
- "x": 2233,
- "y": 568,
- "z": "7bb5d2cb.8cfacc",
+ "x": 2306,
+ "y": 597,
+ "z": "fcc91756.c8d038",
"wires": [
[]
]
},
{
- "id": "ca97ad3.a311cd",
+ "id": "e6efb547.0bd5a8",
"type": "outcome",
"name": "MSA",
"xml": "<outcome value='MSA'>\n",
"comments": "",
"outputs": 1,
- "x": 1080.677324295044,
- "y": 583.8993349075317,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1153.677324295044,
+ "y": 612.8993349075317,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "c2e22ff3.03e78"
+ "e1657417.9cefe8"
]
]
},
{
- "id": "c2e22ff3.03e78",
+ "id": "e1657417.9cefe8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1242.6773872375488,
- "y": 581.899335861206,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1315.6773872375488,
+ "y": 610.899335861206,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "cdc360bb.4f8c6"
+ "1f0bde0a.fa2cb2"
]
]
},
{
- "id": "cdc360bb.4f8c6",
+ "id": "1f0bde0a.fa2cb2",
"type": "execute",
"name": "execute",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/openroadm/v2/networks/otn-topology'`\"/> \n <parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/> \n <parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/> \n <parameter name=\"format\" value=\"json\"/> \n <parameter name=\"httpMethod\" value=\"get\"/> \n <parameter name=\"responsePrefix\" value=\"networks\"/>\n <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.msa.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",
"comments": "",
"outputs": 1,
- "x": 1419.6771354675293,
- "y": 573.8992919921875,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1492.6771354675293,
+ "y": 602.8992919921875,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "150d6764.a614e9",
- "1e259e4f.0e9d9a"
+ "7133cad2.99b11c",
+ "c3d837c.d0ca2c8"
]
]
},
{
- "id": "150d6764.a614e9",
+ "id": "7133cad2.99b11c",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1572.6771354675293,
- "y": 570.8992919921875,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1645.6771354675293,
+ "y": 599.8992919921875,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "a457e272.01c1b8"
+ "eab907ff.882ae8"
]
]
},
{
- "id": "a457e272.01c1b8",
+ "id": "eab907ff.882ae8",
"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 topology MSA rest api\" />\n\n",
"comments": "",
- "x": 1747.6771354675293,
- "y": 569.8992919921875,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1820.6771354675293,
+ "y": 598.8992919921875,
+ "z": "fcc91756.c8d038",
"wires": []
},
{
- "id": "1e259e4f.0e9d9a",
+ "id": "c3d837c.d0ca2c8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1578.6771354675293,
- "y": 643.8992919921875,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1651.6771354675293,
+ "y": 672.8992919921875,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "c148d343.01eac8"
+ "224d6e37.21354a"
]
]
},
{
- "id": "c148d343.01eac8",
+ "id": "224d6e37.21354a",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1762.6771354675293,
- "y": 645.8992919921875,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1835.6771354675293,
+ "y": 674.8992919921875,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "f964e642.cb1ae"
+ "622b9c10.ebdeac"
]
]
},
{
- "id": "f964e642.cb1ae",
+ "id": "622b9c10.ebdeac",
"type": "call",
"name": "call msa-update-network-to-aai",
"xml": "<call module='DataChange' rpc='msa-update-network-to-aai' mode='sync' >\n\n",
"comments": "",
"outputs": 1,
- "x": 2041.677001953125,
- "y": 643.8992919921875,
- "z": "7bb5d2cb.8cfacc",
+ "x": 2114.677001953125,
+ "y": 672.8992919921875,
+ "z": "fcc91756.c8d038",
"wires": [
[]
]
},
{
- "id": "dc10cae0.74e44",
+ "id": "67540de7.5dd14c",
"type": "switchNode",
"name": "switch type",
"xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
"comments": "",
"outputs": 1,
- "x": 212.566650390625,
- "y": 812.5666809082031,
- "z": "7bb5d2cb.8cfacc",
+ "x": 285.566650390625,
+ "y": 841.5666809082031,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "447a364c.b91ea8",
- "f7872c45.99a4e",
- "c8e48bf6.778e98"
+ "ed11f93e.13815",
+ "b9986099.553ab8",
+ "eeccf78a.d71e3"
]
]
},
{
- "id": "447a364c.b91ea8",
+ "id": "ed11f93e.13815",
"type": "outcome",
"name": "MSA",
"xml": "<outcome value='MSA'>\n",
"comments": "",
"outputs": 1,
- "x": 391.857177734375,
- "y": 729.9285888671875,
- "z": "7bb5d2cb.8cfacc",
+ "x": 464.857177734375,
+ "y": 758.9285888671875,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "a07fdc63.5a34d8"
+ "40980c29.103654"
]
]
},
{
- "id": "f7872c45.99a4e",
+ "id": "b9986099.553ab8",
"type": "other",
"name": "TAPI",
"xml": "<outcome value='TAPI'>\n",
"comments": "",
"outputs": 1,
- "x": 400.6070556640625,
- "y": 980.6428527832031,
- "z": "7bb5d2cb.8cfacc",
+ "x": 473.6070556640625,
+ "y": 1009.6428527832031,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "6d4308e1.31c5f"
+ "b9906adb.aedb"
]
]
},
{
- "id": "a07fdc63.5a34d8",
+ "id": "40980c29.103654",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 545.607177734375,
- "y": 726.7143249511719,
- "z": "7bb5d2cb.8cfacc",
+ "x": 618.607177734375,
+ "y": 755.7143249511719,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "cfc4d202.c64d78",
- "366bec81.83eddc"
+ "f4759d50.5acb",
+ "6300b23d.858844"
]
]
},
{
- "id": "6d4308e1.31c5f",
+ "id": "b9906adb.aedb",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 550,
- "y": 980.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 623,
+ "y": 1009.5,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "6a48df29.ca491",
- "62ccb800.ba59c8"
+ "ee72aef0.96b35",
+ "80047dba.a18518"
]
]
},
{
- "id": "c8e48bf6.778e98",
+ "id": "eeccf78a.d71e3",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 503,
- "y": 1144.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 576,
+ "y": 1173.5,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "ab761f62.a873d"
+ "a7ccb229.5cc45"
]
]
},
{
- "id": "ab761f62.a873d",
+ "id": "a7ccb229.5cc45",
"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=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",
"comments": "",
- "x": 665,
- "y": 1183.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 738,
+ "y": 1212.5,
+ "z": "fcc91756.c8d038",
"wires": []
},
{
- "id": "cfc4d202.c64d78",
+ "id": "f4759d50.5acb",
"type": "get-resource",
"name": "get resources from DB -controller_id",
"xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE controller_id = $controllerid'\npfx='dbcontrollerid'>\n \n \n \n \n \n \n \n \n \n\n \n \n \n \n \n \n \n \n \n \n \n \n\n \n \n \n \n \n \n \n \n \n \n",
"comments": "",
"outputs": 1,
- "x": 777.5,
- "y": 774.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 850.5,
+ "y": 803.5,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "69e5b135.13096",
- "70bf128f.7ac3cc",
- "136d8709.29f489"
+ "418351d.550fdb",
+ "5d9de12a.c40778",
+ "4f52ba75.31f414"
]
]
},
{
- "id": "366bec81.83eddc",
+ "id": "6300b23d.858844",
"type": "set",
"name": "set controller_id",
"xml": "<set>\n<parameter name='controllerid' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n\n\n",
"comments": "",
- "x": 737.5,
- "y": 708.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 810.5,
+ "y": 737.5,
+ "z": "fcc91756.c8d038",
"wires": []
},
{
- "id": "69e5b135.13096",
+ "id": "418351d.550fdb",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1016.5,
- "y": 794.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1089.5,
+ "y": 823.5,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "f7324afe.a3cb98"
+ "7d4b021f.b58864"
]
]
},
{
- "id": "f7324afe.a3cb98",
+ "id": "7d4b021f.b58864",
"type": "delete",
"name": "delete from db",
"xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n resource=\"SQL\"\n key=\"DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid\">",
"comments": "",
"outputs": 1,
- "x": 1185.5,
- "y": 801.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1258.5,
+ "y": 830.5,
+ "z": "fcc91756.c8d038",
"wires": [
[]
]
},
{
- "id": "6a48df29.ca491",
+ "id": "ee72aef0.96b35",
"type": "set",
"name": "set controller_id",
"xml": "<set>\n<parameter name='controllerid' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n\n\n",
"comments": "",
- "x": 714.5,
- "y": 936.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 787.5,
+ "y": 965.5,
+ "z": "fcc91756.c8d038",
"wires": []
},
{
- "id": "62ccb800.ba59c8",
+ "id": "80047dba.a18518",
"type": "get-resource",
"name": "get resources from DB -controller_id",
"xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE controller_id = $controllerid'\npfx='dbcontrollerid'>\n \n \n \n \n \n \n \n \n \n\n \n \n \n \n \n \n \n \n \n \n \n \n\n \n \n \n \n \n \n \n \n \n \n",
"comments": "",
"outputs": 1,
- "x": 727.5,
- "y": 1025.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 800.5,
+ "y": 1054.5,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "4cc181ad.c4d1f8",
- "85870c46.3089f",
- "d2032fdb.614ce8"
+ "193e8ffa.2d1e68",
+ "392a4087.7340c",
+ "3b51b50f.fabfaa"
]
]
},
{
- "id": "4cc181ad.c4d1f8",
+ "id": "193e8ffa.2d1e68",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 952.5,
- "y": 1040.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1025.5,
+ "y": 1069.5,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "ebe8f601.eebec8"
+ "7c3655cf.c7356c"
]
]
},
{
- "id": "ebe8f601.eebec8",
+ "id": "7c3655cf.c7356c",
"type": "delete",
"name": "delete from db",
"xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n resource=\"SQL\"\n key=\"DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid\">",
"comments": "",
"outputs": 1,
- "x": 1123.5,
- "y": 1041.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1196.5,
+ "y": 1070.5,
+ "z": "fcc91756.c8d038",
"wires": [
[]
]
},
{
- "id": "70bf128f.7ac3cc",
+ "id": "5d9de12a.c40778",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1002.5,
- "y": 873.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1075.5,
+ "y": 902.5,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "dd76e326.6dd408"
+ "44b36cb9.4f203c"
]
]
},
{
- "id": "85870c46.3089f",
+ "id": "392a4087.7340c",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 933.5,
- "y": 1113.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1006.5,
+ "y": 1142.5,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "b35680d0.668ed"
+ "568e56df.183be8"
]
]
},
{
- "id": "dd76e326.6dd408",
+ "id": "44b36cb9.4f203c",
"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=\"Failure in getting controller-id from DB\" />\n\n",
"comments": "",
- "x": 1163.5,
- "y": 878.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1236.5,
+ "y": 907.5,
+ "z": "fcc91756.c8d038",
"wires": []
},
{
- "id": "136d8709.29f489",
+ "id": "4f52ba75.31f414",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 993.5,
- "y": 933.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1066.5,
+ "y": 962.5,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "84fa6086.1cdbd"
+ "67091014.c5cb48"
]
]
},
{
- "id": "84fa6086.1cdbd",
+ "id": "67091014.c5cb48",
"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=\"controller-id could not be found in DB\" />\n\n",
"comments": "",
- "x": 1142.5,
- "y": 935.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1215.5,
+ "y": 964.5,
+ "z": "fcc91756.c8d038",
"wires": []
},
{
- "id": "b35680d0.668ed",
+ "id": "568e56df.183be8",
"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=\"Failure in getting controller-id from DB\" />\n\n",
"comments": "",
- "x": 1081.5,
- "y": 1114.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1154.5,
+ "y": 1143.5,
+ "z": "fcc91756.c8d038",
"wires": []
},
{
- "id": "d2032fdb.614ce8",
+ "id": "3b51b50f.fabfaa",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 933.5,
- "y": 1157.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1006.5,
+ "y": 1186.5,
+ "z": "fcc91756.c8d038",
"wires": [
[
- "a6db07ae.aaca38"
+ "74792395.d77524"
]
]
},
{
- "id": "a6db07ae.aaca38",
+ "id": "74792395.d77524",
"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=\"controller-id could not be found in DB\" />\n\n",
"comments": "",
- "x": 1098.5,
- "y": 1154.5,
- "z": "7bb5d2cb.8cfacc",
+ "x": 1171.5,
+ "y": 1183.5,
+ "z": "fcc91756.c8d038",
"wires": []
+ },
+ {
+ "id": "f7bc5da7.da31b",
+ "type": "switchNode",
+ "name": "switch network_length",
+ "xml": "<switch test='`$topology.networks.network_length >= 2`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2682,
+ "y": 335,
+ "z": "fcc91756.c8d038",
+ "wires": [
+ [
+ "aa4a8663.38bb68"
+ ]
+ ]
+ },
+ {
+ "id": "aa4a8663.38bb68",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2864,
+ "y": 336,
+ "z": "fcc91756.c8d038",
+ "wires": [
+ [
+ "efdac693.289728"
+ ]
+ ]
+ },
+ {
+ "id": "6a7f62ea.d32524",
+ "type": "for",
+ "name": "for each Network",
+ "xml": "<for index='netidx' start='0' end='`$topology.networks.network_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3237,
+ "y": 329,
+ "z": "fcc91756.c8d038",
+ "wires": [
+ [
+ "de962ed4.8e2558"
+ ]
+ ]
+ },
+ {
+ "id": "de962ed4.8e2558",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 3455,
+ "y": 326,
+ "z": "fcc91756.c8d038",
+ "wires": [
+ [
+ "d31ddaea.690348",
+ "bbbca45f.8e2228",
+ "acccc325.a38838"
+ ]
+ ]
+ },
+ {
+ "id": "73e20b64.41827c",
+ "type": "call",
+ "name": "call update-tp-ttp-relationship",
+ "xml": "<call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3270,
+ "y": 389,
+ "z": "fcc91756.c8d038",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "efdac693.289728",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic='true'>",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 3034,
+ "y": 332,
+ "z": "fcc91756.c8d038",
+ "wires": [
+ [
+ "6a7f62ea.d32524",
+ "73e20b64.41827c"
+ ]
+ ]
+ },
+ {
+ "id": "acccc325.a38838",
+ "type": "set",
+ "name": "unset network",
+ "xml": "<set>\n<parameter name='network.' value='' />\n",
+ "comments": "",
+ "x": 3614,
+ "y": 266,
+ "z": "fcc91756.c8d038",
+ "wires": []
+ },
+ {
+ "id": "d31ddaea.690348",
+ "type": "set",
+ "name": "set network",
+ "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$netidx].`' />\n",
+ "comments": "",
+ "x": 3608,
+ "y": 314,
+ "z": "fcc91756.c8d038",
+ "wires": []
+ },
+ {
+ "id": "bbbca45f.8e2228",
+ "type": "switchNode",
+ "name": "switch network-types with topologyId",
+ "xml": "<switch test='`$network.te-topology-id`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3685,
+ "y": 361,
+ "z": "fcc91756.c8d038",
+ "wires": [
+ [
+ "e4f22bce.03ea18",
+ "2f6da0f9.e964d8"
+ ]
+ ]
+ },
+ {
+ "id": "e4f22bce.03ea18",
+ "type": "outcome",
+ "name": "11",
+ "xml": "<outcome value='11'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3911,
+ "y": 330,
+ "z": "fcc91756.c8d038",
+ "wires": [
+ [
+ "a545d36e.f0b618"
+ ]
+ ]
+ },
+ {
+ "id": "2f6da0f9.e964d8",
+ "type": "outcome",
+ "name": "33",
+ "xml": "<outcome value='33'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3911,
+ "y": 391,
+ "z": "fcc91756.c8d038",
+ "wires": [
+ [
+ "d2ccc5d0.bc949"
+ ]
+ ]
+ },
+ {
+ "id": "dcbdf3ee.469d4",
+ "type": "set",
+ "name": "set network-otn",
+ "xml": "<set>\n<parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\n",
+ "comments": "",
+ "x": 4206,
+ "y": 330,
+ "z": "fcc91756.c8d038",
+ "wires": []
+ },
+ {
+ "id": "6a7bd0f0.92b65",
+ "type": "set",
+ "name": "set network eth",
+ "xml": "<set>\n<parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\n",
+ "comments": "",
+ "x": 4206,
+ "y": 391,
+ "z": "fcc91756.c8d038",
+ "wires": []
+ },
+ {
+ "id": "a545d36e.f0b618",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 4045,
+ "y": 330,
+ "z": "fcc91756.c8d038",
+ "wires": [
+ [
+ "dcbdf3ee.469d4"
+ ]
+ ]
+ },
+ {
+ "id": "d2ccc5d0.bc949",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 4046,
+ "y": 391,
+ "z": "fcc91756.c8d038",
+ "wires": [
+ [
+ "6a7bd0f0.92b65"
+ ]
+ ]
}
]
\ No newline at end of file diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json index fb4f302f..236bc6a3 100644 --- a/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json +++ b/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json @@ -1,20 +1,20 @@ [
{
- "id": "5858bb6c.1c5b2c",
+ "id": "eb6ce69b.3f957",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 116,
+ "x": 248,
"y": 67,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "350dfcb7.24e654"
+ "dc110d5e.a3e278"
]
]
},
{
- "id": "350dfcb7.24e654",
+ "id": "dc110d5e.a3e278",
"type": "service-logic",
"name": "DataChange ${project.version}",
"module": "DataChange",
@@ -22,1444 +22,1885 @@ "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": 173,
+ "x": 305,
"y": 146.888916015625,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "92cd3521.3e4e6"
+ "5f52c1a1.066a8"
]
]
},
{
- "id": "92cd3521.3e4e6",
+ "id": "5f52c1a1.066a8",
"type": "method",
"name": "method update-network-links-to-aai",
"xml": "<method rpc='update-network-links-to-aai' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 187,
+ "x": 319,
"y": 223.22222900390625,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "b665c6f2.69a4d"
+ "d4e648b5.a39fa8"
]
]
},
{
- "id": "b665c6f2.69a4d",
+ "id": "d4e648b5.a39fa8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 198.33343505859375,
+ "x": 330.33343505859375,
"y": 300.7779235839844,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "c59c9b79.9f8cc"
+ "e5c5d545.9d86e8"
]
]
},
{
- "id": "f41ff5d9.72c91",
+ "id": "367c2dd.186e752",
"type": "update",
"name": "save logical-link with regular id",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n key='logical-link.link-name = $unique-linkId' >\n<parameter name='link-name' value='`$unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n<parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\n\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 1159.111083984375,
- "y": 694.111083984375,
- "z": "3cbec5d5.54ea02",
+ "x": 1205.111083984375,
+ "y": 725.111083984375,
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "c59c9b79.9f8cc",
+ "id": "e5c5d545.9d86e8",
"type": "for",
"name": "for each link",
"xml": "<for index='pidx' start='0' end='`$network.link_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 226.88885498046875,
+ "x": 358.88885498046875,
"y": 394.33331298828125,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "6d5acc0f.b7df54",
- "8fbc8f1e.fe24c8",
- "915555f.abb44a8",
- "b5320c88.aa407",
- "589a9016.f198c"
+ "c535a196.07d77",
+ "2b697423.656f74",
+ "23c74055.452fd8",
+ "357884ff.889364",
+ "5d91edd1.3c2f24"
]
]
},
{
- "id": "6d5acc0f.b7df54",
+ "id": "c535a196.07d77",
"type": "set",
"name": "set network link's local variables",
"xml": "<set>\n<parameter name='link.' value='`$network.link[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n\n",
"comments": "",
- "x": 559.111083984375,
+ "x": 691.111083984375,
"y": 99.22221374511719,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": []
},
{
- "id": "7a38f4d0.9f3e6c",
+ "id": "3a0f4814.b217",
"type": "for",
"name": "for each label-restriction",
"xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1532.4444580078125,
- "y": 915.111083984375,
- "z": "3cbec5d5.54ea02",
+ "x": 1731.4444580078125,
+ "y": 945.111083984375,
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "556fc245.d19e3c",
- "d6c13a1b.e798a",
- "69e9f586.641064"
+ "2cea987d.04721",
+ "76b35791.18f63",
+ "2f963aac.304aa6",
+ "a173e4f5.f5a478",
+ "c921d18d.970b48",
+ "15c10484.c4629b"
]
]
},
{
- "id": "556fc245.d19e3c",
+ "id": "2cea987d.04721",
"type": "set",
"name": "set label-restriction's local variables",
- "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n<parameter name='unique-lrId' value=\"`$unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
+ "xml": "<set>\n<parameter name='unique-lrId' value=\"`$unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
"comments": "",
- "x": 1867.111328125,
- "y": 838.0000610351562,
- "z": "3cbec5d5.54ea02",
+ "x": 2036.111328125,
+ "y": 910.0000610351562,
+ "z": "42ade40f.4fa29c",
"wires": []
},
{
- "id": "3398d2c0.69ae06",
+ "id": "a53b765.67e4408",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2002.4998779296875,
- "y": 882.74609375,
- "z": "3cbec5d5.54ea02",
+ "x": 2149.4998779296875,
+ "y": 952.74609375,
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "abb716be.3fb59"
+ "bcb47eec.4c95d8"
]
]
},
{
- "id": "3d46f558.3e53f2",
+ "id": "987d5f9c.60006",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2010.178466796875,
- "y": 941.9604187011719,
- "z": "3cbec5d5.54ea02",
+ "x": 2157.178466796875,
+ "y": 1011.9604187011719,
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "f0df0cf2.e46b6"
+ "e46f36b.2789648"
]
]
},
{
- "id": "abb716be.3fb59",
+ "id": "bcb47eec.4c95d8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2163,
- "y": 882.0000305175781,
- "z": "3cbec5d5.54ea02",
+ "x": 2310,
+ "y": 952.0000305175781,
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "9aed5c80.54f11",
+ "id": "df8ec894.2ce188",
"type": "set",
"name": "set src-ltpId dst-ltpId",
"xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`\" />\n<parameter name='dst-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`\" />",
"comments": "",
- "x": 2586.5001220703125,
+ "x": 2718.5001220703125,
"y": 2414.545135498047,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": []
},
{
- "id": "ce693523.2da318",
+ "id": "ed966c58.9421a",
"type": "save",
"name": "save srcLTP relationship in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n key='vpn-binding.vpn-id = $tmp.vpnName' \n 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/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-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=\"`$src-ltpId`\" />\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 2620.0001220703125,
+ "x": 2752.0001220703125,
"y": 2454.545135498047,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "72343f4d.bac85",
+ "id": "c79cef0b.98c06",
"type": "save",
"name": "save dstLTP relationship in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n key='vpn-binding.vpn-id = $tmp.vpnName' \n 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/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-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=\"`$dst-ltpId`\" />",
"comments": "",
"outputs": 1,
- "x": 2620.0001220703125,
+ "x": 2752.0001220703125,
"y": 2494.545135498047,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "f0df0cf2.e46b6",
+ "id": "e46f36b.2789648",
"type": "update",
"name": "save label-restriction",
- "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n key='logical-link.link-name = $unique-linkId\n AND label-restriction.id = $unique-lrId' > \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n key='logical-link.link-name = $unique-linkId\n AND label-restriction.id = $unique-lrId' > \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
"comments": "",
"outputs": 1,
- "x": 2194,
- "y": 942.0000305175781,
- "z": "3cbec5d5.54ea02",
+ "x": 2341,
+ "y": 1012.0000305175781,
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "d6c13a1b.e798a",
+ "id": "cce10880.3add5",
"type": "save",
"name": "save link relationship to label-restriction in AAI",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n key='logical-link.link-name = $unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[$tidx].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[$tidx].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n key='logical-link.link-name = $unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
"comments": "",
"outputs": 1,
- "x": 1914,
- "y": 792,
- "z": "3cbec5d5.54ea02",
+ "x": 2052,
+ "y": 1208,
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "69e9f586.641064",
+ "id": "76b35791.18f63",
"type": "update",
"name": "save label-restriction",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n key='logical-link.link-name = $unique-linkId\n AND label-restriction.id = $unique-lrId' > \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n key='label-restriction.id = $unique-lrId' > \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
"comments": "",
"outputs": 1,
- "x": 1811.815185546875,
- "y": 914.5556640625,
- "z": "3cbec5d5.54ea02",
+ "x": 1990.815185546875,
+ "y": 984.5556640625,
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "3398d2c0.69ae06",
- "3d46f558.3e53f2"
+ "a53b765.67e4408",
+ "987d5f9c.60006"
]
]
},
{
- "id": "9c77d572.aa0dd",
+ "id": "6bd86154.f4552",
"type": "switchNode",
- "name": "switch te-link-attributes",
- "xml": "<switch test='`$link.te.te-link-attributes.label-restriction`'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1136,
- "y": 870,
- "z": "3cbec5d5.54ea02",
- "wires": [
- [
- "acb46a14.faf1b8",
- "fad2e2be.055cd8"
- ]
- ]
- },
- {
- "id": "acb46a14.faf1b8",
- "type": "outcome",
- "name": "Null",
- "xml": "<outcome value=''>\n",
- "comments": "",
- "outputs": 1,
- "x": 1321,
- "y": 868,
- "z": "3cbec5d5.54ea02",
- "wires": [
- [
- "b663d811.06fad8"
- ]
- ]
- },
- {
- "id": "b663d811.06fad8",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
+ "name": "switch te-link-attributes label-restriction_length",
+ "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 1476,
- "y": 868,
- "z": "3cbec5d5.54ea02",
- "wires": [
- []
- ]
- },
- {
- "id": "fad2e2be.055cd8",
- "type": "other",
- "name": "other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1325,
- "y": 915,
- "z": "3cbec5d5.54ea02",
+ "x": 1250,
+ "y": 945,
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "7a38f4d0.9f3e6c"
+ "6ededdc5.cf6c8c",
+ "ecaf5041.3bee8",
+ "5dbfa8d0.65ebe"
]
]
},
{
- "id": "8fbc8f1e.fe24c8",
+ "id": "2b697423.656f74",
"type": "switchNode",
"name": "switch link.destination",
"xml": "<switch test='`$link.destination.dest-node`'>\n",
"comments": "",
"outputs": 1,
- "x": 535,
+ "x": 667,
"y": 204,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "44b39c00.9558ec",
- "d8a931d0.793fd"
+ "6a7d179d.85fe8",
+ "e3266b7a.5033d8"
]
]
},
{
- "id": "44b39c00.9558ec",
+ "id": "6a7d179d.85fe8",
"type": "outcome",
"name": "Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 739,
+ "x": 871,
"y": 165,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "dd848e51.9b8178"
+ "ea7811a5.6557e"
]
]
},
{
- "id": "d8a931d0.793fd",
+ "id": "e3266b7a.5033d8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 736,
+ "x": 868,
"y": 227,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "bdffabea.a9f78"
+ "68cf703d.fdacb8"
]
]
},
{
- "id": "bdffabea.a9f78",
+ "id": "68cf703d.fdacb8",
"type": "set",
"name": "set network link's destination variables",
"xml": "<set>\n<parameter name='dst-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`\" />\n<parameter name='unique-dst-node-Id' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`\" />\n<parameter name='is-open-ended-link' value='false' />\n\n",
"comments": "",
- "x": 965,
+ "x": 1097,
"y": 190,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": []
},
{
- "id": "d1d8b826.4d04f",
+ "id": "d8b9afa9.8c7938",
"type": "set",
"name": "set is-open-ended-link",
"xml": "<set>\n<parameter name='is-open-ended-link' value='true' />\n\n",
"comments": "",
- "x": 1143,
+ "x": 1275,
"y": 65,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": []
},
{
- "id": "b17a800b.11d598",
+ "id": "4445364b.3ff31",
"type": "save",
"name": "get p-interface from aai",
"xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t key=\"pnf.pnf-name = $unique-src-node-Id\n\t and p-interface.interface-name = $src-tpId\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.p-interface\" >",
"comments": "",
"outputs": 1,
- "x": 1146,
+ "x": 1278,
"y": 150,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "698d4309.a506a4",
- "c0b09280.fde57",
- "b035740b.82c768"
+ "1fabb633.34a7e2",
+ "30ce6e4c.0b0d22",
+ "78ec6cbb.d8199c"
]
]
},
{
- "id": "698d4309.a506a4",
+ "id": "1fabb633.34a7e2",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1389,
+ "x": 1521,
"y": 145,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "944bf6fb.a03838"
+ "f6b85f73.a6bb"
]
]
},
{
- "id": "c0b09280.fde57",
+ "id": "30ce6e4c.0b0d22",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1387,
+ "x": 1519,
"y": 234,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "d42c9066.3cdb28"
+ "112ae233.6a9666"
]
]
},
{
- "id": "d4d599ee.a3913",
+ "id": "2d37b161.c87e5e",
"type": "set",
"name": "set alternative unique link id",
"xml": "<set>\n<parameter name='alt-unique-linkId' value=\"`$tmp.aai.p-interface.inter-domain-plug-id`\" />\n<!--<parameter name='alt-unique-linkId' value=\"`'networkId-' + $unique-networkId + '-linkId-' + $tmp.aai.p-interface.inter-domain-plug-id`\" />-->\n\n",
"comments": "",
- "x": 2062,
+ "x": 2194,
"y": 162,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": []
},
{
- "id": "d42c9066.3cdb28",
+ "id": "112ae233.6a9666",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
"comments": "",
- "x": 1556,
+ "x": 1688,
"y": 235,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": []
},
{
- "id": "f65cb67d.b3d368",
+ "id": "b25a39cd.f52a6",
"type": "save",
"name": "get logical-link from aai",
"xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\t key=\"logical-link.link-name = $alt-unique-linkId\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.logical-link\" >",
"comments": "",
"outputs": 1,
- "x": 854,
+ "x": 986,
"y": 671,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "48397109.a69d68",
- "efa56bf.4c6db98"
+ "2eac00b.0ddcd8",
+ "cef26741.44e878"
]
]
},
{
- "id": "b035740b.82c768",
+ "id": "78ec6cbb.d8199c",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 1398.490966796875,
+ "x": 1530.490966796875,
"y": 187.57403564453125,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "6959706d.7f87e8"
+ "cc3c7aa7.507dd8"
]
]
},
{
- "id": "6959706d.7f87e8",
+ "id": "cc3c7aa7.507dd8",
"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 pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
"comments": "",
- "x": 1552.0623779296875,
+ "x": 1684.0623779296875,
"y": 190.85977172851562,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": []
},
{
- "id": "954c1d48.971018",
+ "id": "339fe7b3.ae4e",
"type": "switchNode",
"name": "switch is-open-ended-link",
"xml": "<switch test='`$is-open-ended-link`'>\n",
"comments": "",
"outputs": 1,
- "x": 433,
+ "x": 565,
"y": 710,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "4e6e74a5.e8af4c",
- "53a87226.590744"
+ "7bffce42.060d68",
+ "601fa3d8.aedcac"
]
]
},
{
- "id": "4e6e74a5.e8af4c",
+ "id": "7bffce42.060d68",
"type": "outcomeFalse",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 650,
+ "x": 782,
"y": 732,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "2e08f3a1.53987c"
+ "d9f05462.4a8968"
]
]
},
{
- "id": "53a87226.590744",
+ "id": "601fa3d8.aedcac",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 653,
+ "x": 785,
"y": 672,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "f65cb67d.b3d368"
+ "b25a39cd.f52a6"
]
]
},
{
- "id": "48397109.a69d68",
+ "id": "2eac00b.0ddcd8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1098,
+ "x": 1230,
"y": 341,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "b240875.e435ff8"
+ "d26336.070c9cc8"
]
]
},
{
- "id": "efa56bf.4c6db98",
+ "id": "cef26741.44e878",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 1123.490966796875,
+ "x": 1255.490966796875,
"y": 536.5740356445312,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "ef51ee2a.cafb5"
+ "1417b1e7.adccae"
]
]
},
{
- "id": "842144b1.a1cb2",
+ "id": "c9f57eec.3fa43",
"type": "update",
"name": "save logical-link with alternative link id",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n key='logical-link.link-name = $alt-unique-linkId' >\n<parameter name='link-name' value='`$alt-unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n<parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\n\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 1595,
+ "x": 1727,
"y": 558,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "2e08f3a1.53987c",
+ "id": "d9f05462.4a8968",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 828,
+ "x": 960,
"y": 740,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "f41ff5d9.72c91",
- "9c77d572.aa0dd",
- "dc4f90cd.605cd",
- "a0d07820.dfe9c"
+ "367c2dd.186e752",
+ "6bd86154.f4552",
+ "8c3bc53e.020c3",
+ "3b98d33.38a2bac",
+ "9f4e28fe.9e925"
]
]
},
{
- "id": "6b973.4170168dc",
+ "id": "882e1409.701ce8",
"type": "save",
"name": "update dest TP by putting src TP of the current link",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n key='logical-link.link-name = $alt-unique-linkId' 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />-->\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=\"`$src-tpId`\" />-->\n\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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\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=\"`$src-tpId`\" />",
"comments": "",
"outputs": 1,
- "x": 2509,
+ "x": 2641,
"y": 387,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "46117ab.f8f0504",
- "46594b42.a6ff04"
+ "a1bfa8c8.032428",
+ "4552885e.7227f8"
]
]
},
{
- "id": "34901df.74cf7e2",
+ "id": "7c1006a1.c0bf28",
"type": "save",
"name": "save source and dest TP",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n key='logical-link.link-name = $unique-linkId' 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\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=\"`$src-tpId`\" />\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$dst-tpId`\" />",
"comments": "",
"outputs": 1,
- "x": 1119,
- "y": 1068,
- "z": "3cbec5d5.54ea02",
+ "x": 1190,
+ "y": 1179,
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "dd848e51.9b8178",
+ "id": "ea7811a5.6557e",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 927,
+ "x": 1059,
"y": 126,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "d1d8b826.4d04f",
- "b17a800b.11d598",
- "9d4a7a95.ca2e88"
+ "d8b9afa9.8c7938",
+ "4445364b.3ff31",
+ "78b9c95f.ae17e8"
]
]
},
{
- "id": "ef51ee2a.cafb5",
+ "id": "1417b1e7.adccae",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1312,
+ "x": 1444,
"y": 539,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "842144b1.a1cb2",
- "9ab70c9.3d83df",
- "dd8767a.3acd918"
+ "c9f57eec.3fa43",
+ "fe6e139a.88d838",
+ "1e861048.9f807",
+ "fc9bbbc9.76dd6"
]
]
},
{
- "id": "9ab70c9.3d83df",
+ "id": "fe6e139a.88d838",
"type": "save",
"name": "save source only",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n key='logical-link.link-name = $alt-unique-linkId' 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\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=\"`$src-tpId`\" />\n",
"comments": "",
"outputs": 1,
- "x": 1524,
+ "x": 1656,
"y": 619,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "ec4710d1.a4614",
+ "id": "ed1851cd.c2d2d",
"type": "for",
"name": "for each label-restriction",
"xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1930,
- "y": 702,
- "z": "3cbec5d5.54ea02",
+ "x": 2183,
+ "y": 745,
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "5f4e6661.8be42",
- "bf1c8950.f6775",
- "869edf38.84c148"
+ "bf2a36f0.0411c",
+ "1a178b14.9ad4dd",
+ "13838be4.d07ac4",
+ "ec158e78.eb2b58",
+ "a3570d8f.6b641",
+ "1375d0c1.e8bf07"
]
]
},
{
- "id": "5f4e6661.8be42",
+ "id": "bf2a36f0.0411c",
"type": "set",
"name": "set label-restriction's local variables",
- "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n<parameter name='unique-lrId' value=\"`$alt-unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
+ "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n",
"comments": "",
- "x": 2347.6669921875,
- "y": 657.8889770507812,
- "z": "3cbec5d5.54ea02",
+ "x": 2473.6669921875,
+ "y": 623.8889770507812,
+ "z": "42ade40f.4fa29c",
"wires": []
},
{
- "id": "7135b68.c08c3c8",
+ "id": "eb573572.449a5",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2483.0555419921875,
+ "x": 2615.0555419921875,
"y": 702.635009765625,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "2043dae3.034356"
+ "80720656.40f1f8"
]
]
},
{
- "id": "69007117.c84f9",
+ "id": "e5ad824b.fd1c3",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2490.734130859375,
+ "x": 2622.734130859375,
"y": 761.8493347167969,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "30f94010.a2f0b"
+ "75cc9002.94bbf8"
]
]
},
{
- "id": "2043dae3.034356",
+ "id": "80720656.40f1f8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2643.5556640625,
+ "x": 2775.5556640625,
"y": 701.8889465332031,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "30f94010.a2f0b",
+ "id": "75cc9002.94bbf8",
"type": "update",
"name": "save label-restriction",
- "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n key='logical-link.link-name = $alt-unique-linkId\n AND label-restriction.id = $unique-lrId' > \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n key='logical-link.link-name = $alt-unique-linkId\n AND label-restriction.id = $unique-lrId' > \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
"comments": "",
"outputs": 1,
- "x": 2674.5556640625,
+ "x": 2806.5556640625,
"y": 761.8889465332031,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "bf1c8950.f6775",
+ "id": "cb668db0.48c4b",
"type": "save",
"name": "save link relationship to label-restriction in AAI",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n key='logical-link.link-name = $alt-unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[$tidx].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[$tidx].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n key='logical-link.link-name = $alt-unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
"comments": "",
"outputs": 1,
- "x": 2369.5556640625,
- "y": 815.888916015625,
- "z": "3cbec5d5.54ea02",
+ "x": 2482.5556640625,
+ "y": 894.888916015625,
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "869edf38.84c148",
+ "id": "1a178b14.9ad4dd",
"type": "update",
"name": "save label-restriction",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n key='logical-link.link-name = $alt-unique-linkId\n AND label-restriction.id = $unique-lrId' > \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n key='label-restriction.id = $unique-lrId' > \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n",
"comments": "",
"outputs": 1,
- "x": 2292.370849609375,
+ "x": 2424.370849609375,
"y": 734.444580078125,
- "z": "3cbec5d5.54ea02",
- "wires": [
- [
- "7135b68.c08c3c8",
- "69007117.c84f9"
- ]
- ]
- },
- {
- "id": "dd8767a.3acd918",
- "type": "switchNode",
- "name": "switch te-link-attributes",
- "xml": "<switch test='`$link.te.te-link-attributes.label-restriction`'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1529.5555419921875,
- "y": 657.888916015625,
- "z": "3cbec5d5.54ea02",
- "wires": [
- [
- "2ac06a2f.120e4e",
- "45e6587f.a583a"
- ]
- ]
- },
- {
- "id": "2ac06a2f.120e4e",
- "type": "outcome",
- "name": "Null",
- "xml": "<outcome value=''>\n",
- "comments": "",
- "outputs": 1,
- "x": 1718.5555419921875,
- "y": 628.888916015625,
- "z": "3cbec5d5.54ea02",
- "wires": [
- [
- "5884f4a0.224604"
- ]
- ]
- },
- {
- "id": "5884f4a0.224604",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1878.5555419921875,
- "y": 627.888916015625,
- "z": "3cbec5d5.54ea02",
- "wires": [
- []
- ]
- },
- {
- "id": "45e6587f.a583a",
- "type": "other",
- "name": "other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1722.5555419921875,
- "y": 701.888916015625,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "ec4710d1.a4614"
+ "eb573572.449a5",
+ "e5ad824b.fd1c3"
]
]
},
{
- "id": "915555f.abb44a8",
+ "id": "23c74055.452fd8",
"type": "set",
"name": "set more local variables",
"xml": "<set>\n<parameter name='unique-linkId' value=\"`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`\" />\n<parameter name='src-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`\" />\n<parameter name='unique-src-node-Id' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`\" />\n",
"comments": "",
- "x": 536,
+ "x": 668,
"y": 149,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": []
},
{
- "id": "e4a47b8d.470f98",
+ "id": "93546ba2.1bedb8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1478,
+ "x": 1610,
"y": 62,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "944bf6fb.a03838",
+ "id": "f6b85f73.a6bb",
"type": "switchNode",
"name": "switch inter-domain-plug-id of the src tp",
"xml": "<switch test='`$tmp.aai.p-interface.inter-domain-plug-id`'>\n",
"comments": "",
"outputs": 1,
- "x": 1628,
+ "x": 1760,
"y": 142,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "757c7b80.d77ff4",
- "a7e52125.cd95a"
+ "905e14d2.8e13d",
+ "56d86a80.47b554"
]
]
},
{
- "id": "757c7b80.d77ff4",
+ "id": "905e14d2.8e13d",
"type": "outcome",
"name": "Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1858,
+ "x": 1990,
"y": 89,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "ed9b2776.e3f"
+ "39191ee3.a2421a"
]
]
},
{
- "id": "a7e52125.cd95a",
+ "id": "56d86a80.47b554",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1862,
+ "x": 1994,
"y": 162,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "d4d599ee.a3913"
+ "2d37b161.c87e5e"
]
]
},
{
- "id": "ed9b2776.e3f",
+ "id": "39191ee3.a2421a",
"type": "set",
"name": "unset is-open-ended-link",
"xml": "<set>\n<parameter name='is-open-ended-link' value='false' />\n<parameter name='is-invalid-open-ended-link' value='true' />\n\n",
"comments": "",
- "x": 2046,
+ "x": 2178,
"y": 85,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": []
},
{
- "id": "952d829a.9e04c8",
+ "id": "1ecef5c2.0f02ca",
"type": "save",
"name": "delete logical-link",
"xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\" \n\tkey=\"logical-link.link-name = $tmp.link-name\" >\n",
"comments": "",
"outputs": 1,
- "x": 2027,
+ "x": 2159,
"y": 34,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "b5320c88.aa407",
+ "id": "357884ff.889364",
"type": "set",
"name": "unset network link's local variables",
"xml": "<set>\n<parameter name='link.' value='' />\n<parameter name='dst-tpId' value='' />\n<parameter name='unique-dst-node-Id' value='' />\n<parameter name='is-open-ended-link' value='false' />\n<parameter name='is-invalid-open-ended-link' value='false' />\n\n",
"comments": "",
- "x": 564,
+ "x": 696,
"y": 41,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": []
},
{
- "id": "1c31f66.0ec5b8a",
+ "id": "37660aa6.c865c6",
"type": "switchNode",
"name": "switch is-invalid-open-ended-link",
"xml": "<switch test='`$is-invalid-open-ended-link`'>\n",
"comments": "",
"outputs": 1,
- "x": 715,
- "y": 1046,
- "z": "3cbec5d5.54ea02",
+ "x": 786,
+ "y": 1157,
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "59b5f613.5fe9d8",
- "a603a990.7bb358"
+ "f54e3efd.634a38",
+ "8022555f.169df8"
]
]
},
{
- "id": "a603a990.7bb358",
+ "id": "8022555f.169df8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 922,
- "y": 1014,
- "z": "3cbec5d5.54ea02",
+ "x": 993,
+ "y": 1125,
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "9ab8714a.2092f"
+ "e44bc7ce.ed35b8"
]
]
},
{
- "id": "59b5f613.5fe9d8",
+ "id": "f54e3efd.634a38",
"type": "outcomeFalse",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 919,
- "y": 1074,
- "z": "3cbec5d5.54ea02",
+ "x": 990,
+ "y": 1185,
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "34901df.74cf7e2"
+ "7c1006a1.c0bf28"
]
]
},
{
- "id": "9ab8714a.2092f",
+ "id": "e44bc7ce.ed35b8",
"type": "save",
"name": "save source only",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n key='logical-link.link-name = $unique-linkId' 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\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=\"`$src-tpId`\" />\n",
"comments": "",
"outputs": 1,
- "x": 1102,
- "y": 1013,
- "z": "3cbec5d5.54ea02",
+ "x": 1173,
+ "y": 1124,
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "5352bd62.ccf79c",
+ "id": "6e0155a0.4236dc",
"type": "switchNode",
"name": "switch relationship-list_length",
"xml": "<switch test='`$tmp.aai.logical-link.relationship-list_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 1370,
+ "x": 1502,
"y": 314,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "eff4d21d.288088",
- "37404956.35d1ce",
- "8c968f09.e16c4"
+ "c6d7c8ac.8edfe",
+ "e1f14b0f.6d7378",
+ "863a7ad.fb20188"
]
]
},
{
- "id": "2c9276d9.9299c2",
+ "id": "64886b03.3e43e4",
"type": "switchNode",
"name": "switch relationship-list_length != $src-tpId",
"xml": "<switch test='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value != $src-tpId`'>\n",
"comments": "",
"outputs": 1,
- "x": 1821,
+ "x": 1953,
"y": 328,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "267a2f8f.07cbd"
+ "b3998350.44919"
]
]
},
{
- "id": "eff4d21d.288088",
+ "id": "c6d7c8ac.8edfe",
"type": "outcome",
"name": "0",
"xml": "<outcome value='0'>\n",
"comments": "",
"outputs": 1,
- "x": 1588,
+ "x": 1720,
"y": 273,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "984dee72.e9354"
+ "ae0ebd2c.ab0408"
]
]
},
{
- "id": "37404956.35d1ce",
+ "id": "e1f14b0f.6d7378",
"type": "outcome",
"name": "1",
"xml": "<outcome value='1'>\n",
"comments": "",
"outputs": 1,
- "x": 1585,
+ "x": 1717,
"y": 310,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "2c9276d9.9299c2"
+ "64886b03.3e43e4"
]
]
},
{
- "id": "8c968f09.e16c4",
+ "id": "863a7ad.fb20188",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1595,
+ "x": 1727,
"y": 384,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "978f2fad.844c4"
+ "8fdcd683.3660b"
]
]
},
{
- "id": "978f2fad.844c4",
+ "id": "8fdcd683.3660b",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1732,
+ "x": 1864,
"y": 385,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "a65b0566.f99d28"
+ "ec1a3a53.fa7ff8"
]
]
},
{
- "id": "984dee72.e9354",
+ "id": "ae0ebd2c.ab0408",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1730,
+ "x": 1862,
"y": 281,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "3177c841.0c8"
+ "c29cb556.f4deb8"
]
]
},
{
- "id": "589a9016.f198c",
+ "id": "5d91edd1.3c2f24",
"type": "switchNode",
"name": "switch is-invalid-open-ended-link",
"xml": "<switch test='`$is-invalid-open-ended-link`'>\n",
"comments": "",
"outputs": 1,
- "x": 431,
+ "x": 563,
"y": 538,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "68d44b36.10ebc4",
- "b635b7a2.550c68"
+ "62e07412.96bbe4",
+ "db9d2b02.3f6e5"
]
]
},
{
- "id": "b635b7a2.550c68",
+ "id": "db9d2b02.3f6e5",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 638,
+ "x": 770,
"y": 506,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "a2f767e6.1afe7"
+ "7150962.0cacbe8"
]
]
},
{
- "id": "68d44b36.10ebc4",
+ "id": "62e07412.96bbe4",
"type": "outcomeFalse",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 635,
+ "x": 767,
"y": 566,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "954c1d48.971018"
+ "339fe7b3.ae4e"
]
]
},
{
- "id": "a2f767e6.1afe7",
+ "id": "7150962.0cacbe8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 789,
+ "x": 921,
"y": 506,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "dc4f90cd.605cd",
+ "id": "8c3bc53e.020c3",
"type": "save",
"name": "save source and dest TP",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n key='logical-link.link-name = $unique-linkId' 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\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=\"`$src-tpId`\" />\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$dst-tpId`\" />",
"comments": "",
"outputs": 1,
- "x": 1129,
- "y": 791,
- "z": "3cbec5d5.54ea02",
+ "x": 1188,
+ "y": 828,
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "267a2f8f.07cbd",
+ "id": "b3998350.44919",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2068,
+ "x": 2200,
"y": 319,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "a0d07820.dfe9c",
+ "id": "3b98d33.38a2bac",
"type": "record",
"name": "log file",
"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=\"uniqueLinkId\" />\n <parameter name=\"field3\" value=\"`$unique-linkId`\" />\n <parameter name=\"field4\" value=\"srcTpId\" />\n <parameter name=\"field5\" value=\"`$src-tpId`\" />\n <parameter name=\"field6\" value=\"dstTpId\" />\n <parameter name=\"field7\" value=\"`$dst-tpId`\" />\n ",
"comments": "",
"outputs": 1,
- "x": 1074,
- "y": 739,
- "z": "3cbec5d5.54ea02",
+ "x": 1133,
+ "y": 773,
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "9d4a7a95.ca2e88",
+ "id": "78b9c95f.ae17e8",
"type": "set",
"name": "unset tmp.aai.p-interface",
"xml": "<set>\n<parameter name='tmp.aai.p-interface' value='' />\n<parameter name='tmp.aai.p-interface.inter-domain-plug-id' value='' />\n\n",
"comments": "",
- "x": 1144,
+ "x": 1276,
"y": 103,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": []
},
{
- "id": "6cbb9c56.a1a2b4",
+ "id": "c7f9432f.fc4c28",
"type": "record",
"name": "log file",
"xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/onap/logMerge.txt\" />\n <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n <parameter name=\"field2\" value=\"altUniqueLinkId\" />\n <parameter name=\"field3\" value=\"`$alt-unique-linkId`\" />\n <parameter name=\"field4\" value=\"srcTpId\" />\n <parameter name=\"field5\" value=\"`$src-tpId`\" />\n <parameter name=\"field6\" value=\"relationship-value\" />\n <parameter name=\"field7\" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />\n ",
"comments": "",
"outputs": 1,
- "x": 2384,
+ "x": 2516,
"y": 291,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "b240875.e435ff8",
+ "id": "d26336.070c9cc8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2060,
+ "x": 2192,
"y": 536,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "6cbb9c56.a1a2b4",
- "6b973.4170168dc"
+ "c7f9432f.fc4c28",
+ "882e1409.701ce8",
+ "6e4bc51.b0c9dbc",
+ "7a9fabbe.629c44"
]
]
},
{
- "id": "46117ab.f8f0504",
+ "id": "a1bfa8c8.032428",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2798,
+ "x": 2930,
"y": 357,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "f6743dce.4b9b98"
+ "c9e17582.5ea8"
]
]
},
{
- "id": "46594b42.a6ff04",
+ "id": "4552885e.7227f8",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2805.6785888671875,
+ "x": 2937.6785888671875,
"y": 416.2143249511719,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "fa1c4b7d.8445b"
+ "de1c7c10.d4de68"
]
]
},
{
- "id": "f6743dce.4b9b98",
+ "id": "c9e17582.5ea8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2946,
+ "x": 3078,
"y": 352,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "1261d503.e1a3cb"
+ "747beccb.60a274"
]
]
},
{
- "id": "1261d503.e1a3cb",
+ "id": "747beccb.60a274",
"type": "record",
"name": "log file",
"xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/onap/logMergeSuccess.txt\" />\n <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n <parameter name=\"field2\" value=\"altUniqueLinkId\" />\n <parameter name=\"field3\" value=\"`$alt-unique-linkId`\" />\n <parameter name=\"field4\" value=\"srcTpId\" />\n <parameter name=\"field5\" value=\"`$src-tpId`\" />\n <parameter name=\"field6\" value=\"relationship-value\" />\n <parameter name=\"field7\" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />\n ",
"comments": "",
"outputs": 1,
- "x": 3091,
+ "x": 3223,
"y": 352,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "fa1c4b7d.8445b",
+ "id": "de1c7c10.d4de68",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2953,
+ "x": 3085,
"y": 414,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[
- "8f51aa8d.73ba38"
+ "81d2a002.7c0388"
]
]
},
{
- "id": "3177c841.0c8",
+ "id": "c29cb556.f4deb8",
"type": "record",
"name": "log file",
"xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/onap/logNoRelationship.txt\" />\n <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n <parameter name=\"field2\" value=\"noRelationshipForLink:\" />\n <parameter name=\"field3\" value=\"`$tmp.aai.logical-link.link-name`\" />",
"comments": "",
"outputs": 1,
- "x": 1866,
+ "x": 1998,
"y": 279,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "a65b0566.f99d28",
+ "id": "ec1a3a53.fa7ff8",
"type": "record",
"name": "log file",
"xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/onap/logNoRelationship.txt\" />\n <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n <parameter name=\"field2\" value=\"moreThanOneRelationshipForLink:\" />\n <parameter name=\"field3\" value=\"`$tmp.aai.logical-link.link-name`\" />\n <parameter name=\"field4\" value=\"HowMany:\" />\n <parameter name=\"field5\" value=\"`$tmp.aai.logical-link.relationship-list_length`\" />",
"comments": "",
"outputs": 1,
- "x": 1877,
+ "x": 2009,
"y": 394,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
},
{
- "id": "8f51aa8d.73ba38",
+ "id": "81d2a002.7c0388",
"type": "record",
"name": "log file",
"xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/onap/logMergeFailure.txt\" />\n <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n <parameter name=\"field2\" value=\"altUniqueLinkId\" />\n <parameter name=\"field3\" value=\"`$alt-unique-linkId`\" />\n <parameter name=\"field4\" value=\"srcTpId\" />\n <parameter name=\"field5\" value=\"`$src-tpId`\" />\n <parameter name=\"field6\" value=\"relationship-value\" />\n <parameter name=\"field7\" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />\n ",
"comments": "",
"outputs": 1,
- "x": 3098,
+ "x": 3230,
"y": 414,
- "z": "3cbec5d5.54ea02",
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "6ededdc5.cf6c8c",
+ "type": "other",
+ "name": "Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1544,
+ "y": 843,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ [
+ "13eb321c.419dee"
+ ]
+ ]
+ },
+ {
+ "id": "ecaf5041.3bee8",
+ "type": "outcome",
+ "name": "length 0",
+ "xml": "<outcome value='0'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1546,
+ "y": 891,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ [
+ "13eb321c.419dee"
+ ]
+ ]
+ },
+ {
+ "id": "5dbfa8d0.65ebe",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1543,
+ "y": 945,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ [
+ "3a0f4814.b217"
+ ]
+ ]
+ },
+ {
+ "id": "13eb321c.419dee",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1699,
+ "y": 843,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "1e861048.9f807",
+ "type": "switchNode",
+ "name": "switch te-link-attributes label-restriction_length",
+ "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1725,
+ "y": 736,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ [
+ "f4fbab89.9ba908",
+ "7dc7ac6a.dc9714",
+ "4d8c04cc.f4e3d4"
+ ]
+ ]
+ },
+ {
+ "id": "f4fbab89.9ba908",
+ "type": "other",
+ "name": "Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1997,
+ "y": 646,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ [
+ "bc7188dd.cc9d18"
+ ]
+ ]
+ },
+ {
+ "id": "bc7188dd.cc9d18",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 2152,
+ "y": 646,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "7dc7ac6a.dc9714",
+ "type": "outcome",
+ "name": "length 0",
+ "xml": "<outcome value='0'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1999,
+ "y": 694,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ [
+ "bc7188dd.cc9d18"
+ ]
+ ]
+ },
+ {
+ "id": "4d8c04cc.f4e3d4",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1998,
+ "y": 745,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ [
+ "ed1851cd.c2d2d"
+ ]
+ ]
+ },
+ {
+ "id": "13838be4.d07ac4",
+ "type": "set",
+ "name": "unset label-restriction's local variables",
+ "xml": "<set>\n<parameter name='label-restriction.' value='' />\n<parameter name='unique-lrId' value=\"\" />\n",
+ "comments": "",
+ "x": 2479,
+ "y": 572,
+ "z": "42ade40f.4fa29c",
+ "wires": []
+ },
+ {
+ "id": "2f963aac.304aa6",
+ "type": "set",
+ "name": "unset label-restriction's local variables",
+ "xml": "<set>\n<parameter name='label-restriction.' value='' />\n<parameter name='unique-lrId' value=\"\" />\n",
+ "comments": "",
+ "x": 2033,
+ "y": 799,
+ "z": "42ade40f.4fa29c",
+ "wires": []
+ },
+ {
+ "id": "6e4bc51.b0c9dbc",
+ "type": "switchNode",
+ "name": "switch te-link-attributes label-restriction_length",
+ "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2817,
+ "y": 523,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ [
+ "30a1d0ca.e887a",
+ "92fd4ff1.3a409",
+ "389e55ce.061fe2"
+ ]
+ ]
+ },
+ {
+ "id": "30a1d0ca.e887a",
+ "type": "other",
+ "name": "Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3087,
+ "y": 485,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ [
+ "5dda79fd.751e4"
+ ]
+ ]
+ },
+ {
+ "id": "5dda79fd.751e4",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 3242,
+ "y": 485,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "92fd4ff1.3a409",
+ "type": "outcome",
+ "name": "length 0",
+ "xml": "<outcome value='0'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3089,
+ "y": 533,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ [
+ "5dda79fd.751e4"
+ ]
+ ]
+ },
+ {
+ "id": "389e55ce.061fe2",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3088,
+ "y": 584,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ [
+ "bc1a2664.a26998"
+ ]
+ ]
+ },
+ {
+ "id": "bc1a2664.a26998",
+ "type": "for",
+ "name": "for each label-restriction",
+ "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3273,
+ "y": 584,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ [
+ "bc3590a8.aace38",
+ "c370620b.230e48",
+ "a5a0665d.651de8",
+ "1ab3f9a3.2d2bce",
+ "fed3d208.8682f8",
+ "864febfd.65faf"
+ ]
+ ]
+ },
+ {
+ "id": "a5a0665d.651de8",
+ "type": "set",
+ "name": "unset label-restriction's local variables",
+ "xml": "<set>\n<parameter name='label-restriction.' value='' />\n<parameter name='unique-lrId' value=\"\" />\n",
+ "comments": "",
+ "x": 3571,
+ "y": 399,
+ "z": "42ade40f.4fa29c",
+ "wires": []
+ },
+ {
+ "id": "bc3590a8.aace38",
+ "type": "set",
+ "name": "set label-restriction's local variables",
+ "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n",
+ "comments": "",
+ "x": 3560.6669921875,
+ "y": 445.88897705078125,
+ "z": "42ade40f.4fa29c",
+ "wires": []
+ },
+ {
+ "id": "c370620b.230e48",
+ "type": "update",
+ "name": "save label-restriction",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n key='label-restriction.id = $unique-lrId' > \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3514.370849609375,
+ "y": 573.444580078125,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ [
+ "fa7d62b3.003ef",
+ "8c2cda96.78942"
+ ]
+ ]
+ },
+ {
+ "id": "bad7ff54.e113a8",
+ "type": "save",
+ "name": "save link relationship to label-restriction in AAI",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n key='logical-link.link-name = $alt-unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3588.5556640625,
+ "y": 757.888916015625,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "fa7d62b3.003ef",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3705.0555419921875,
+ "y": 541.635009765625,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ [
+ "ee15e7b0.52d0f8"
+ ]
+ ]
+ },
+ {
+ "id": "8c2cda96.78942",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3712.734130859375,
+ "y": 600.8493347167969,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ [
+ "ed52377e.4eb4a"
+ ]
+ ]
+ },
+ {
+ "id": "ee15e7b0.52d0f8",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 3865.5556640625,
+ "y": 540.8889465332031,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "ed52377e.4eb4a",
+ "type": "update",
+ "name": "save label-restriction",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n key='label-restriction.id = $unique-lrId' > \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3896.5556640625,
+ "y": 600.8889465332031,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "1ab3f9a3.2d2bce",
+ "type": "set",
+ "name": "set label-restriction's local variables",
+ "xml": "<set>\n<parameter name='unique-lrId' value=\"`$alt-unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
+ "comments": "",
+ "x": 3561,
+ "y": 495,
+ "z": "42ade40f.4fa29c",
+ "wires": []
+ },
+ {
+ "id": "ec158e78.eb2b58",
+ "type": "set",
+ "name": "set label-restriction's local variables",
+ "xml": "<set>\n<parameter name='unique-lrId' value=\"`$alt-unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
+ "comments": "",
+ "x": 2475,
+ "y": 664,
+ "z": "42ade40f.4fa29c",
+ "wires": []
+ },
+ {
+ "id": "a173e4f5.f5a478",
+ "type": "set",
+ "name": "set label-restriction's local variables",
+ "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n",
+ "comments": "",
+ "x": 2030,
+ "y": 851,
+ "z": "42ade40f.4fa29c",
+ "wires": []
+ },
+ {
+ "id": "9f4e28fe.9e925",
+ "type": "update",
+ "name": "save te-link-attribute",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \n key='te-link-attribute.id = $link.te.te-link-attributes.name' > \n<parameter name='id' value='`$link.te.te-link-attributes.name`' />\n<parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1171,
+ "y": 873,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "15c10484.c4629b",
+ "type": "save",
+ "name": "save te-link-attribute relationship to label-restriction",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2062,
+ "y": 1142,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "c921d18d.970b48",
+ "type": "save",
+ "name": "save te-link-attribute relationship to logical-link in AAI",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"logical-link\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $unique-linkId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-linkId`\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2071,
+ "y": 1082,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "fc9bbbc9.76dd6",
+ "type": "update",
+ "name": "save te-link-attribute",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \n key='te-link-attribute.id = $link.te.te-link-attributes.name' > \n<parameter name='id' value='`$link.te.te-link-attributes.name`' />\n<parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1662,
+ "y": 671,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "7a9fabbe.629c44",
+ "type": "update",
+ "name": "update te-link-attribute",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \n key='te-link-attribute.id = $link.te.te-link-attributes.name' > \n<parameter name='id' value='`$link.te.te-link-attributes.name`' />\n<parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2542,
+ "y": 456,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "a3570d8f.6b641",
+ "type": "save",
+ "name": "save te-link-attribute relationship to logical-link in AAI",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"logical-link\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $alt-unique-linkId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$alt-unique-linkId`\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2507,
+ "y": 802,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "1375d0c1.e8bf07",
+ "type": "save",
+ "name": "save te-link-attribute relationship to label-restriction",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2500,
+ "y": 848,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "864febfd.65faf",
+ "type": "save",
+ "name": "save te-link-attribute relationship to label-restriction",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3597,
+ "y": 700,
+ "z": "42ade40f.4fa29c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "fed3d208.8682f8",
+ "type": "save",
+ "name": "save te-link-attribute relationship to logical-link in AAI",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"logical-link\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $alt-unique-linkId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$alt-unique-linkId`\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3604,
+ "y": 654,
+ "z": "42ade40f.4fa29c",
"wires": [
[]
]
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 786fef55..7b6731cb 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 @@ -63,7 +63,8 @@ "8c187a81.9e4d28",
"75113293.98ea0c",
"9937b93d.ff5938",
- "55dde830.cc61b8"
+ "55dde830.cc61b8",
+ "f7667eb6.ec8938"
]
]
},
@@ -159,7 +160,8 @@ "3c657cae.66477c",
"2e1dc2b9.f23686",
"8c144095.b1eaf8",
- "9abbad80.6c0f7"
+ "9abbad80.6c0f7",
+ "ef702ba5.ac71e"
]
]
},
@@ -169,8 +171,8 @@ "name": "set termination point",
"xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",
"comments": "",
- "x": 1550.111328125,
- "y": 536.0000457763672,
+ "x": 1549.111328125,
+ "y": 557.0000610351562,
"z": "6d6b8a1f.be1cb4",
"wires": []
},
@@ -178,11 +180,11 @@ "id": "8c144095.b1eaf8",
"type": "save",
"name": "save p-interface",
- "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\n",
+ "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": 1533.815185546875,
- "y": 628.5556030273438,
+ "x": 1543.815185546875,
+ "y": 744.5556030273438,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -198,8 +200,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": 1367.703857421875,
- "y": 779.3333740234375,
+ "x": 1626.703857421875,
+ "y": 901.3333740234375,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -211,8 +213,8 @@ "name": "set unique-ltpId",
"xml": "<set>\n<parameter name='unique-ltpId' value=\"`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`\" />\n",
"comments": "",
- "x": 1534.000244140625,
- "y": 570.1111145019531,
+ "x": 1533.000244140625,
+ "y": 614.111083984375,
"z": "6d6b8a1f.be1cb4",
"wires": []
},
@@ -220,11 +222,11 @@ "id": "8c187a81.9e4d28",
"type": "execute",
"name": "execute",
- "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$network.network-id`\"/>\n <parameter name=\"outputPath\" value=\"tmp.network-id\"/>\n <parameter name=\"target\" value=\"/\"/>\n <parameter name=\"replacement\" value=\"-\"/>\n ",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$network.network-id`\"/>\n <parameter name=\"outputPath\" value=\"tmp.original-network-id\"/>\n <parameter name=\"target\" value=\"/\"/>\n <parameter name=\"replacement\" value=\"-\"/>\n ",
"comments": "",
"outputs": 1,
- "x": 640.9935302734375,
- "y": 83.99349975585938,
+ "x": 641.9935302734375,
+ "y": 41.993499755859375,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -251,8 +253,8 @@ "xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1705.499885559082,
- "y": 615.7460784912109,
+ "x": 1715.499885559082,
+ "y": 731.7460784912109,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -267,8 +269,8 @@ "xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1699.1784744262695,
- "y": 667.9603900909424,
+ "x": 1709.1784744262695,
+ "y": 783.9603900909424,
"z": "6d6b8a1f.be1cb4",
"wires": [
[
@@ -284,8 +286,8 @@ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1856.0000457763672,
- "y": 615.0000095367432,
+ "x": 1866.0000457763672,
+ "y": 731.0000095367432,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -295,11 +297,11 @@ "id": "66113f50.7819f8",
"type": "update",
"name": "update p-interface",
- "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`' />",
+ "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": 1885,
- "y": 669,
+ "x": 1895,
+ "y": 785,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -457,8 +459,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": 1617,
- "y": 728,
+ "x": 1627,
+ "y": 844,
"z": "6d6b8a1f.be1cb4",
"wires": [
[]
@@ -674,8 +676,8 @@ "name": "unset termination point",
"xml": "<set>\n<parameter name='tp.' value='' />\n",
"comments": "",
- "x": 1549,
- "y": 491,
+ "x": 1561,
+ "y": 500,
"z": "6d6b8a1f.be1cb4",
"wires": []
},
@@ -749,5 +751,151 @@ "wires": [
[]
]
+ },
+ {
+ "id": "b9a378e9.3ee13",
+ "type": "execute",
+ "name": "execute Base64 Converter",
+ "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": 2027,
+ "y": 669,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "1cdf8713.954a51",
+ "3754d4b.0357eac"
+ ]
+ ]
+ },
+ {
+ "id": "ef702ba5.ac71e",
+ "type": "switchNode",
+ "name": "switch inter-domain-plug-id empty?",
+ "xml": "<switch test='`length($tp.te.inter-domain-plug-id) == 0`'>\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1597,
+ "y": 670,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "95523b36.e61fe",
+ "a2f27028.9e578"
+ ]
+ ]
+ },
+ {
+ "id": "a2f27028.9e578",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1824,
+ "y": 623,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "ce508a28.fe217"
+ ]
+ ]
+ },
+ {
+ "id": "95523b36.e61fe",
+ "type": "outcomeFalse",
+ "name": "false",
+ "xml": "<outcome value='false'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1825,
+ "y": 669,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "b9a378e9.3ee13"
+ ]
+ ]
+ },
+ {
+ "id": "ce508a28.fe217",
+ "type": "set",
+ "name": "unset tmp.decoded-plug-id",
+ "xml": "<set>\n<parameter name='tmp.decoded-plug-id' value='' />\n",
+ "comments": "",
+ "x": 2028,
+ "y": 623,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": []
+ },
+ {
+ "id": "1cdf8713.954a51",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2232,
+ "y": 646,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "611d993d.82c5c"
+ ]
+ ]
+ },
+ {
+ "id": "3754d4b.0357eac",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2225.6785888671875,
+ "y": 698.2143115997314,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "495bfe4.4b1a"
+ ]
+ ]
+ },
+ {
+ "id": "611d993d.82c5c",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 2373,
+ "y": 646,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "495bfe4.4b1a",
+ "type": "set",
+ "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": 2432,
+ "y": 698,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": []
+ },
+ {
+ "id": "f7667eb6.ec8938",
+ "type": "set",
+ "name": "set tmp.network-if",
+ "xml": "<set>\n<parameter name='tmp.network-id' value=\"`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`\" />\n\n",
+ "comments": "",
+ "x": 667,
+ "y": 83,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": []
}
]
\ 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 cec126c3..1ef85f5b 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 @@ -1,20 +1,20 @@ [
{
- "id": "f3ed8bda.981eb",
+ "id": "db76d876.619d4",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 126,
- "y": 86.00650024414062,
- "z": "8966128c.40fc9",
+ "x": 107,
+ "y": 76,
+ "z": "ffd702ea.3cd72",
"wires": [
[
- "1edaf826.be0fa"
+ "ac7d0d8e.d68168"
]
]
},
{
- "id": "1edaf826.be0fa",
+ "id": "ac7d0d8e.d68168",
"type": "service-logic",
"name": "DataChange ${project.version}",
"module": "DataChange",
@@ -22,330 +22,504 @@ "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": 215.00003051757812,
- "y": 176.89541244506836,
- "z": "8966128c.40fc9",
+ "x": 196.00003051757812,
+ "y": 166.88891220092773,
+ "z": "ffd702ea.3cd72",
"wires": [
[
- "3d56f688.012602"
+ "15add1ed.67bb06"
]
]
},
{
- "id": "3d56f688.012602",
+ "id": "15add1ed.67bb06",
"type": "method",
"name": "method update-tp-ttp-relationship",
"xml": "<method rpc='update-tp-ttp-relationship' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 251.1112518310547,
- "y": 247.2287368774414,
- "z": "8966128c.40fc9",
+ "x": 232.1112518310547,
+ "y": 237.22223663330078,
+ "z": "ffd702ea.3cd72",
"wires": [
[
- "91a7d40.f3c79b"
+ "2ef3d64c.d8633a"
]
]
},
{
- "id": "91a7d40.f3c79b",
+ "id": "2ef3d64c.d8633a",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 476.33343505859375,
- "y": 246.784423828125,
- "z": "8966128c.40fc9",
+ "x": 457.33343505859375,
+ "y": 236.77792358398438,
+ "z": "ffd702ea.3cd72",
"wires": [
[
- "44cf69ab.02fc28",
- "6f71423b.e63cac",
- "8b1ad0d7.d3282"
+ "929780.1985e88",
+ "25858afe.2b9bce",
+ "e912429a.04b788"
]
]
},
{
- "id": "6f71423b.e63cac",
+ "id": "25858afe.2b9bce",
"type": "for",
"name": "for each node in network-eth",
"xml": "<for index='pethidx' start='0' end='`$network-eth.node_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 708.8888549804688,
- "y": 201.33981323242188,
- "z": "8966128c.40fc9",
+ "x": 689.8888549804688,
+ "y": 191.33331298828125,
+ "z": "ffd702ea.3cd72",
"wires": [
[
- "c451c605.7ae0a",
- "70ab1d73.78dfa4",
- "7bcb2ba2.9953f4"
+ "9ceedf0.da974a",
+ "2a93e407.ae18bc",
+ "e6e033d7.96653"
]
]
},
{
- "id": "c451c605.7ae0a",
+ "id": "9ceedf0.da974a",
"type": "set",
"name": "set node-eth",
"xml": "<set>\n<parameter name='node-eth.' value='`$network-eth.node[$pethidx].`' />",
"comments": "",
- "x": 992.111083984375,
- "y": 108.22871398925781,
- "z": "8966128c.40fc9",
+ "x": 973.111083984375,
+ "y": 98.22221374511719,
+ "z": "ffd702ea.3cd72",
"wires": []
},
{
- "id": "70ab1d73.78dfa4",
- "type": "for",
- "name": "for each termination point",
- "xml": "<for index='tidx' start='0' end='`$node-eth.termination-point_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 941.4444580078125,
- "y": 364.1175842285156,
- "z": "8966128c.40fc9",
- "wires": [
- [
- "ae76cdd8.d0a408",
- "f5cb00b6.301068",
- "a58125ba.f3ece",
- "6948417f.bffae",
- "eb8eee0c.443eb8"
- ]
- ]
- },
- {
- "id": "ae76cdd8.d0a408",
+ "id": "79b02bc6.8ef74c",
"type": "set",
"name": "set termination point tp-eth",
"xml": "<set>\n<parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />\n",
"comments": "",
- "x": 1213.111328125,
- "y": 235.00656127929688,
- "z": "8966128c.40fc9",
+ "x": 1194.111328125,
+ "y": 225.00006103515625,
+ "z": "ffd702ea.3cd72",
"wires": []
},
{
- "id": "f5cb00b6.301068",
+ "id": "53e75306.b60214",
"type": "set",
"name": "set unique-ltpethId",
"xml": "<set>\n<parameter name='unique-ltpethId' value=\"`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`\" />\n",
"comments": "",
- "x": 1191.000244140625,
- "y": 272.1175842285156,
- "z": "8966128c.40fc9",
+ "x": 1172.000244140625,
+ "y": 262.111083984375,
+ "z": "ffd702ea.3cd72",
"wires": []
},
{
- "id": "44cf69ab.02fc28",
+ "id": "929780.1985e88",
"type": "execute",
"name": "execute set tmp.network-eth.network-id",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$network-eth.network-id`\"/>\n <parameter name=\"outputPath\" value=\"tmp.network-eth.network-id\"/>\n <parameter name=\"target\" value=\"/\"/>\n <parameter name=\"replacement\" value=\"-\"/>\n ",
"comments": "",
"outputs": 1,
- "x": 666.9935302734375,
- "y": 66,
- "z": "8966128c.40fc9",
+ "x": 647.9935302734375,
+ "y": 55.993499755859375,
+ "z": "ffd702ea.3cd72",
"wires": [
[]
]
},
{
- "id": "7bcb2ba2.9953f4",
+ "id": "2a93e407.ae18bc",
"type": "set",
"name": "set local variables",
"xml": "<set>\n<parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />\n<parameter name='unique-node-ethId' value=\"`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`\" />\n",
"comments": "",
- "x": 991,
- "y": 156.00650024414062,
- "z": "8966128c.40fc9",
+ "x": 972,
+ "y": 146,
+ "z": "ffd702ea.3cd72",
"wires": []
},
{
- "id": "8b1ad0d7.d3282",
+ "id": "e912429a.04b788",
"type": "execute",
"name": "execute set tmp.network-otn.network-id",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$network-otn.network-id`\"/>\n <parameter name=\"outputPath\" value=\"tmp.network-otn.network-id\"/>\n <parameter name=\"target\" value=\"/\"/>\n <parameter name=\"replacement\" value=\"-\"/>\n ",
"comments": "",
"outputs": 1,
- "x": 664,
- "y": 105.00650024414062,
- "z": "8966128c.40fc9",
+ "x": 645,
+ "y": 95,
+ "z": "ffd702ea.3cd72",
"wires": [
[]
]
},
{
- "id": "3e8d4c9d.81492c",
+ "id": "8be3e429.ccb7d",
"type": "for",
"name": "for each tunnel termination point in otn",
- "xml": "<for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >\n",
+ "xml": "<for index='ttidx' start='0' end='`$node-otn.te.tunnel-termination-point_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1567,
- "y": 419.0065002441406,
- "z": "8966128c.40fc9",
+ "x": 1549,
+ "y": 622,
+ "z": "ffd702ea.3cd72",
"wires": [
[
- "c8d54563.247c18",
- "5e04ba3c.b57a04",
- "f0519db1.196698",
- "86fe0338.dea2e8",
- "14bac025.125a4"
+ "f3d35e68.c9d718",
+ "3ad809f1.06ba16",
+ "4db37c69.2430a4",
+ "ec80108a.70e1d",
+ "6c3aac2e.471db4"
]
]
},
{
- "id": "c8d54563.247c18",
+ "id": "f3d35e68.c9d718",
"type": "set",
"name": "set tunnel termination point",
"xml": "<set>\n<parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />\n",
"comments": "",
- "x": 1943,
- "y": 344.0065002441406,
- "z": "8966128c.40fc9",
+ "x": 1918,
+ "y": 334,
+ "z": "ffd702ea.3cd72",
"wires": []
},
{
- "id": "5e04ba3c.b57a04",
+ "id": "3ad809f1.06ba16",
"type": "set",
"name": "set unique-ttpId",
"xml": "<set>\n<parameter name='unique-ttpId' value=\"`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`\" />\n",
"comments": "",
- "x": 1920.888916015625,
- "y": 411.1175842285156,
- "z": "8966128c.40fc9",
+ "x": 1885.888916015625,
+ "y": 398.111083984375,
+ "z": "ffd702ea.3cd72",
"wires": []
},
{
- "id": "a58125ba.f3ece",
+ "id": "7c6c9bf4.1268f4",
"type": "set",
"name": "set tp-inter-layer-lock-id",
"xml": "<set>\n<parameter name='tp-inter-layer-lock-id' value='`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`' />\n",
"comments": "",
- "x": 1231,
- "y": 312.0065002441406,
- "z": "8966128c.40fc9",
+ "x": 1212,
+ "y": 302,
+ "z": "ffd702ea.3cd72",
"wires": []
},
{
- "id": "6948417f.bffae",
+ "id": "38915841.38d1e",
"type": "for",
"name": "for each node in network-otn",
"xml": "<for index='potnidx' start='0' end='`$network-otn.node_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1249,
- "y": 361.0065002441406,
- "z": "8966128c.40fc9",
+ "x": 1230,
+ "y": 351,
+ "z": "ffd702ea.3cd72",
"wires": [
[
- "3e8d4c9d.81492c",
- "a37094cf.0ec268",
- "f9e7891b.a33b9"
+ "b1b6d531.8e8428",
+ "591e31d0.de7628",
+ "e2cb35d4.99da",
+ "32e4e342.a9f04c"
]
]
},
{
- "id": "a37094cf.0ec268",
+ "id": "b1b6d531.8e8428",
"type": "set",
"name": "set node-otn",
"xml": "<set>\n<parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />",
"comments": "",
- "x": 1543,
- "y": 331.0065002441406,
- "z": "8966128c.40fc9",
+ "x": 1524,
+ "y": 321,
+ "z": "ffd702ea.3cd72",
"wires": []
},
{
- "id": "f9e7891b.a33b9",
+ "id": "591e31d0.de7628",
"type": "set",
"name": "set local variables",
"xml": "<set>\n<parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />\n<parameter name='unique-node-otnId' value=\"`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`\" />\n",
"comments": "",
- "x": 1541.888916015625,
- "y": 378.78428649902344,
- "z": "8966128c.40fc9",
+ "x": 1522.888916015625,
+ "y": 368.7777862548828,
+ "z": "ffd702ea.3cd72",
"wires": []
},
{
- "id": "f0519db1.196698",
+ "id": "4db37c69.2430a4",
"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",
"comments": "",
- "x": 1942,
- "y": 462.0065002441406,
- "z": "8966128c.40fc9",
+ "x": 1910,
+ "y": 452,
+ "z": "ffd702ea.3cd72",
"wires": []
},
{
- "id": "86fe0338.dea2e8",
+ "id": "ec80108a.70e1d",
"type": "switchNode",
"name": "switch tp-inter-layer-lock-id",
- "xml": "<switch test='tp-inter-layer-lock-id'>\n",
+ "xml": "<switch test='`$tp-inter-layer-lock-id`'>\n",
"comments": "",
"outputs": 1,
- "x": 1885,
- "y": 517.0065002441406,
- "z": "8966128c.40fc9",
+ "x": 1917,
+ "y": 508,
+ "z": "ffd702ea.3cd72",
"wires": [
[
- "bece73d9.c8717"
+ "cf4f4a72.7d5168"
]
]
},
{
- "id": "bece73d9.c8717",
+ "id": "cf4f4a72.7d5168",
"type": "outcome",
"name": "ttp-inter-layer-lock-id",
- "xml": "<outcome value='ttp-inter-layer-lock-id'>\n",
+ "xml": "<outcome value='`$ttp-inter-layer-lock-id`'>\n",
"comments": "",
"outputs": 1,
- "x": 1994,
- "y": 614.0065002441406,
- "z": "8966128c.40fc9",
+ "x": 1975,
+ "y": 604,
+ "z": "ffd702ea.3cd72",
"wires": [
[
- "377503ca.868e7c"
+ "3d7797fd.32b9a8"
]
]
},
{
- "id": "377503ca.868e7c",
+ "id": "3d7797fd.32b9a8",
"type": "save",
"name": "save p-interface relationship to ttp in AAI",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \n key='p-interface.interface-name = $unique-ltpethId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"tunnel-termination-point\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"tunnel-termination-point.tunnel-tp-id\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$unique-ttpId`\" />\n",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \n key='p-interface.interface-name = $unique-ltpethId' 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[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.tunnel-tp-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ttpId`\" />\n",
"comments": "",
"outputs": 1,
- "x": 2312,
- "y": 614.0065002441406,
- "z": "8966128c.40fc9",
+ "x": 2293,
+ "y": 604,
+ "z": "ffd702ea.3cd72",
"wires": [
[]
]
},
{
- "id": "eb8eee0c.443eb8",
+ "id": "b8fd2648.6f854",
"type": "set",
"name": "unset termination point tp-eth",
"xml": "<set>\n<parameter name='tp-eth.' value='' />\n",
"comments": "",
- "x": 1208,
- "y": 198,
- "z": "8966128c.40fc9",
+ "x": 1189,
+ "y": 187.99349975585938,
+ "z": "ffd702ea.3cd72",
"wires": []
},
{
- "id": "14bac025.125a4",
+ "id": "6c3aac2e.471db4",
"type": "set",
"name": "unset tunnel termination point",
"xml": "<set>\n<parameter name='ttp.' value='' />\n",
"comments": "",
- "x": 1933,
- "y": 305,
- "z": "8966128c.40fc9",
+ "x": 1926,
+ "y": 280.9934997558594,
+ "z": "ffd702ea.3cd72",
"wires": []
+ },
+ {
+ "id": "e6e033d7.96653",
+ "type": "switchNode",
+ "name": "switch node-eth tp",
+ "xml": "<switch test='`$node-eth.termination-point_length`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 556,
+ "y": 370,
+ "z": "ffd702ea.3cd72",
+ "wires": [
+ [
+ "80e4765d.fcdaa8",
+ "a8cca188.f375d",
+ "b96aa4a5.384fe8"
+ ]
+ ]
+ },
+ {
+ "id": "80e4765d.fcdaa8",
+ "type": "other",
+ "name": "Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 735,
+ "y": 322,
+ "z": "ffd702ea.3cd72",
+ "wires": [
+ [
+ "adea3129.2af79"
+ ]
+ ]
+ },
+ {
+ "id": "adea3129.2af79",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 890,
+ "y": 322,
+ "z": "ffd702ea.3cd72",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "b96aa4a5.384fe8",
+ "type": "outcome",
+ "name": "length 0",
+ "xml": "<outcome value='0'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 745,
+ "y": 370,
+ "z": "ffd702ea.3cd72",
+ "wires": [
+ [
+ "adea3129.2af79"
+ ]
+ ]
+ },
+ {
+ "id": "a8cca188.f375d",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 734,
+ "y": 424,
+ "z": "ffd702ea.3cd72",
+ "wires": [
+ [
+ "2c29c804.a15ee"
+ ]
+ ]
+ },
+ {
+ "id": "2c29c804.a15ee",
+ "type": "for",
+ "name": "for each termination point",
+ "xml": "<for index='tidx' start='0' end='`$node-eth.termination-point_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 942.4444580078125,
+ "y": 394.111083984375,
+ "z": "ffd702ea.3cd72",
+ "wires": [
+ [
+ "b8fd2648.6f854",
+ "79b02bc6.8ef74c",
+ "53e75306.b60214",
+ "7c6c9bf4.1268f4",
+ "38915841.38d1e"
+ ]
+ ]
+ },
+ {
+ "id": "e2cb35d4.99da",
+ "type": "set",
+ "name": "unset node-otn",
+ "xml": "<set>\n<parameter name='node-otn.' value='' />\n<parameter name='unique-network-otnId' value='' />\n<parameter name='unique-node-otnId' value=\"\" />\n",
+ "comments": "",
+ "x": 1525,
+ "y": 270,
+ "z": "ffd702ea.3cd72",
+ "wires": []
+ },
+ {
+ "id": "32e4e342.a9f04c",
+ "type": "switchNode",
+ "name": "switch node-otn ttp",
+ "xml": "<switch test='`$node-otn.te.tunnel-termination-point_length`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1122,
+ "y": 601,
+ "z": "ffd702ea.3cd72",
+ "wires": [
+ [
+ "571c7e22.88577",
+ "c4c843ca.dc868",
+ "dcc7ee12.1af12"
+ ]
+ ]
+ },
+ {
+ "id": "571c7e22.88577",
+ "type": "other",
+ "name": "Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1310,
+ "y": 487,
+ "z": "ffd702ea.3cd72",
+ "wires": [
+ [
+ "3d4d0383.b594e4"
+ ]
+ ]
+ },
+ {
+ "id": "c4c843ca.dc868",
+ "type": "outcome",
+ "name": "length 0",
+ "xml": "<outcome value='0'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1315,
+ "y": 562,
+ "z": "ffd702ea.3cd72",
+ "wires": [
+ [
+ "3d4d0383.b594e4"
+ ]
+ ]
+ },
+ {
+ "id": "dcc7ee12.1af12",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1312,
+ "y": 624,
+ "z": "ffd702ea.3cd72",
+ "wires": [
+ [
+ "8be3e429.ccb7d"
+ ]
+ ]
+ },
+ {
+ "id": "3d4d0383.b594e4",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1470,
+ "y": 553,
+ "z": "ffd702ea.3cd72",
+ "wires": [
+ []
+ ]
}
]
\ 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 110c9f61..007f3bf5 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,23 +1,21 @@ -<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'>
+<service-logic 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'>
+ <outcome value="false">
<switch test="`$data-change-notification-input.aai-event-trigger`">
- <outcome value='Update'>
+ <outcome value="Update">
<block>
<switch test="`$prop.sdncRestApi.type`">
- <outcome value='SOTN'>
+ <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 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 + '/actokentemplate.json'`" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />
+ <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`"/>
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`"/>
<parameter name="format" value="json"/>
<parameter name="httpMethod" value="post"/>
<parameter name="responsePrefix" value="token-result"/>
@@ -25,21 +23,21 @@ <parameter name="trustStorePassword" value="adminadmin"/>
<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
<parameter name="keyStorePassword" value="adminadmin"/>
- <outcome value='success'>
+ <outcome value="success">
<set>
- <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />
+ <parameter name="prop.sdncRestApi.token_id" value="`$token-result.data.token_id`"/>
</set>
</outcome>
- <outcome value='failure'>
- <block></block>
+ <outcome value="failure">
+ <block/>
</outcome>
</execute>
<switch test="`$prop.sdncRestApi.token_id`">
- <outcome value=''>
- <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`" />
+ <outcome value="">
+ <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"/>
@@ -47,32 +45,65 @@ <parameter name="trustStorePassword" value="adminadmin"/>
<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
<parameter name="keyStorePassword" value="adminadmin"/>
- <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" />
+ <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>
- <outcome value='success'>
+ <outcome value="success">
<block atomic="true">
- <for index='nidx' start='0' end='`$topology.networks.network_length`' >
+ <for index="nidx" start="0" end="`$topology.networks.network_length`">
<block>
<set>
- <parameter name='network.' value='`$topology.networks.network[$nidx].`' />
+ <parameter name="network." value="`$topology.networks.network[$nidx].`"/>
</set>
- <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
+ <call module="DataChange" rpc="update-network-to-aai" mode="sync"/>
</block>
</for>
+ <switch test="`$topology.networks.network_length >= 2`">
+ <outcome value="true">
+ <block atomic="true">
+ <for index="netidx" start="0" end="`$topology.networks.network_length`">
+ <block>
+ <set>
+ <parameter name="network." value=""/>
+ </set>
+ <set>
+ <parameter name="network." value="`$topology.networks.network[$netidx].`"/>
+ </set>
+ <switch test="`$network.te-topology-id`">
+ <outcome value="11">
+ <block>
+ <set>
+ <parameter name="network-otn." value="`$topology.networks.network[$netidx].`"/>
+ </set>
+ </block>
+ </outcome>
+ <outcome value="33">
+ <block>
+ <set>
+ <parameter name="network-eth." value="`$topology.networks.network[$netidx].`"/>
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </for>
+ <call module="DataChange" rpc="update-tp-ttp-relationship" mode="sync"/>
+ </block>
+ </outcome>
+ </switch>
</block>
</outcome>
</execute>
</outcome>
- <outcome value='Other'>
- <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`" />
+ <outcome value="Other">
+ <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"/>
@@ -80,56 +111,89 @@ <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='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" />
+ <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`"/>
+ <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>
- <outcome value='success'>
+ <outcome value="success">
<block atomic="true">
- <for index='nidx' start='0' end='`$topology.networks.network_length`' >
+ <for index="nidx" start="0" end="`$topology.networks.network_length`">
<block>
<set>
- <parameter name='network.' value='`$topology.networks.network[$nidx].`' />
+ <parameter name="network." value="`$topology.networks.network[$nidx].`"/>
</set>
- <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
+ <call module="DataChange" rpc="update-network-to-aai" mode="sync"/>
</block>
</for>
+ <switch test="`$topology.networks.network_length >= 2`">
+ <outcome value="true">
+ <block atomic="true">
+ <for index="netidx" start="0" end="`$topology.networks.network_length`">
+ <block>
+ <set>
+ <parameter name="network." value=""/>
+ </set>
+ <set>
+ <parameter name="network." value="`$topology.networks.network[$netidx].`"/>
+ </set>
+ <switch test="`$network.te-topology-id`">
+ <outcome value="11">
+ <block>
+ <set>
+ <parameter name="network-otn." value="`$topology.networks.network[$netidx].`"/>
+ </set>
+ </block>
+ </outcome>
+ <outcome value="33">
+ <block>
+ <set>
+ <parameter name="network-eth." value="`$topology.networks.network[$netidx].`"/>
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </for>
+ <call module="DataChange" rpc="update-tp-ttp-relationship" mode="sync"/>
+ </block>
+ </outcome>
+ </switch>
</block>
</outcome>
</execute>
</outcome>
</switch>
<set>
- <parameter name='input' value='ietf-subscribed-notifications:establish-subscription.input.' />
- <parameter name="`$input + 'encoding'`" value="encode-json" />
+ <parameter name="input" value="ietf-subscribed-notifications:establish-subscription.input."/>
+ <parameter name="`$input + 'encoding'`" value="encode-json"/>
</set>
- <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscription' >
- <parameter name="subscriberId" value="sotn-controller" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
- <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
- <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
- <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`" />
- <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
- <parameter name="format" value="json" />
- <parameter name="httpMethod" value="post" />
+ <execute plugin="org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode" method="establishSubscription">
+ <parameter name="subscriberId" value="sotn-controller"/>
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`"/>
+ <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>
+ <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>
+ <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`"/>
+ <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification"/>
+ <parameter name="format" value="json"/>
+ <parameter name="httpMethod" value="post"/>
<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`" />
- <parameter name="module" value="DataChange" />
- <parameter name="rpc" value="sotn-notification-handler" />
- <parameter name="mode" value="sync" />
+ <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`"/>
+ <parameter name="module" value="DataChange"/>
+ <parameter name="rpc" value="sotn-notification-handler"/>
+ <parameter name="mode" value="sync"/>
</execute>
</block>
</outcome>
- <outcome value='TAPI'>
+ <outcome value="TAPI">
<block atomic="true">
- <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/tapi/v2/topologies?topology-id-or-name=otn'`"/>
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>
@@ -140,21 +204,21 @@ <parameter name="trustStorePassword" value="adminadmin"/>
<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
<parameter name="keyStorePassword" value="adminadmin"/>
- <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 topology TAPI rest api" />
+ <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 topology TAPI rest api"/>
</return>
</outcome>
- <outcome value='success'>
+ <outcome value="success">
<block atomic="true">
- <for index='tidx' start='0' end="`$topologies.topology_length`" >
+ <for index="tidx" start="0" end="`$topologies.topology_length`">
<block>
<set>
- <parameter name='topology.' value='`$topologies.topology[$tidx].`' />
+ <parameter name="topology." value="`$topologies.topology[$tidx].`"/>
</set>
- <call module='DataChange' rpc='tapi-update-network-to-aai' mode='sync' ></call>
+ <call module="DataChange" rpc="tapi-update-network-to-aai" mode="sync"/>
</block>
</for>
</block>
@@ -162,9 +226,9 @@ </execute>
</block>
</outcome>
- <outcome value='MSA'>
+ <outcome value="MSA">
<block atomic="true">
- <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/openroadm/v2/networks/otn-topology'`"/>
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>
@@ -175,103 +239,91 @@ <parameter name="trustStorePassword" value="adminadmin"/>
<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
<parameter name="keyStorePassword" value="adminadmin"/>
- <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 topology MSA rest api" />
+ <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 topology MSA rest api"/>
</return>
</outcome>
- <outcome value='success'>
+ <outcome value="success">
<block atomic="true">
- <call module='DataChange' rpc='msa-update-network-to-aai' mode='sync' ></call>
+ <call module="DataChange" rpc="msa-update-network-to-aai" mode="sync"/>
</block>
</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`" />
+ <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'>
+ <outcome value="Delete">
<block atomic="true">
<switch test="`$prop.sdncRestApi.type`">
- <outcome value='MSA'>
- <block atomic='true'>
+ <outcome value="MSA">
+ <block atomic="true">
<set>
- <parameter name='controllerid' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />
+ <parameter name="controllerid" value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`"/>
</set>
- <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-key='SELECT controller_id
-from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
-WHERE controller_id = $controllerid'
-pfx='dbcontrollerid'>
- <outcome value='success'>
- <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
- resource="SQL"
- key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT controller_id from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid" pfx="dbcontrollerid">
+ <outcome value="success">
+ <delete plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"/>
</outcome>
- <outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Failure in getting controller-id from DB" />
+ <outcome value="failure">
+ <return status="failure">
+ <parameter name="ack-final" value="Y"/>
+ <parameter name="error-code" value="500"/>
+ <parameter name="error-message" value="Failure in getting controller-id from DB"/>
</return>
</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="controller-id could not be found in DB" />
+ <outcome value="not-found">
+ <return status="failure">
+ <parameter name="ack-final" value="Y"/>
+ <parameter name="error-code" value="500"/>
+ <parameter name="error-message" value="controller-id could not be found in DB"/>
</return>
</outcome>
</get-resource>
</block>
</outcome>
- <outcome value='TAPI'>
+ <outcome value="TAPI">
<block>
<set>
- <parameter name='controllerid' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />
+ <parameter name="controllerid" value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`"/>
</set>
- <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-key='SELECT controller_id
-from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
-WHERE controller_id = $controllerid'
-pfx='dbcontrollerid'>
- <outcome value='success'>
- <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
- resource="SQL"
- key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT controller_id from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid" pfx="dbcontrollerid">
+ <outcome value="success">
+ <delete plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"/>
</outcome>
- <outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Failure in getting controller-id from DB" />
+ <outcome value="failure">
+ <return status="failure">
+ <parameter name="ack-final" value="Y"/>
+ <parameter name="error-code" value="500"/>
+ <parameter name="error-message" value="Failure in getting controller-id from DB"/>
</return>
</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="controller-id could not be found in DB" />
+ <outcome value="not-found">
+ <return status="failure">
+ <parameter name="ack-final" value="Y"/>
+ <parameter name="error-code" value="500"/>
+ <parameter name="error-message" value="controller-id could not be found in DB"/>
</return>
</outcome>
</get-resource>
</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`" />
+ <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>
@@ -279,8 +331,8 @@ pfx='dbcontrollerid'> </outcome>
</switch>
</outcome>
- <outcome value='true'>
- <call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' ></call>
+ <outcome value="true">
+ <call module="DataChange" rpc="esr-thirdparty-sdnc-of-zte" mode="sync"/>
</outcome>
</switch>
</block>
diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml index b867b56a..ab50abd3 100644 --- a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml +++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml @@ -1,202 +1,271 @@ -<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-links-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-links-to-aai" mode="sync">
<block atomic="true">
- <for index='pidx' start='0' end='`$network.link_length`' >
+ <for index="pidx" start="0" end="`$network.link_length`">
<set>
- <parameter name='link.' value='' />
- <parameter name='dst-tpId' value='' />
- <parameter name='unique-dst-node-Id' value='' />
- <parameter name='is-open-ended-link' value='false' />
- <parameter name='is-invalid-open-ended-link' value='false' />
+ <parameter name="link." value=""/>
+ <parameter name="dst-tpId" value=""/>
+ <parameter name="unique-dst-node-Id" value=""/>
+ <parameter name="is-open-ended-link" value="false"/>
+ <parameter name="is-invalid-open-ended-link" value="false"/>
</set>
<set>
- <parameter name='link.' value='`$network.link[$pidx].`' />
- <parameter name='unique-networkId' value='`$tmp.network-id`' />
+ <parameter name="link." value="`$network.link[$pidx].`"/>
+ <parameter name="unique-networkId" value="`$tmp.network-id`"/>
</set>
<set>
- <parameter name='unique-linkId' value="`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`" />
- <parameter name='src-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`" />
- <parameter name='unique-src-node-Id' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`" />
+ <parameter name="unique-linkId" value="`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`"/>
+ <parameter name="src-tpId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`"/>
+ <parameter name="unique-src-node-Id" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`"/>
</set>
- <switch test='`$link.destination.dest-node`'>
- <outcome value=''>
+ <switch test="`$link.destination.dest-node`">
+ <outcome value="">
<block>
<set>
- <parameter name='is-open-ended-link' value='true' />
+ <parameter name="is-open-ended-link" value="true"/>
</set>
<set>
- <parameter name='tmp.aai.p-interface' value='' />
- <parameter name='tmp.aai.p-interface.inter-domain-plug-id' value='' />
+ <parameter name="tmp.aai.p-interface" value=""/>
+ <parameter name="tmp.aai.p-interface.inter-domain-plug-id" value=""/>
</set>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
- resource="p-interface"
- key="pnf.pnf-name = $unique-src-node-Id
- and p-interface.interface-name = $src-tpId"
- local-only="false"
- pfx="tmp.aai.p-interface" >
- <outcome value='success'>
- <switch test='`$tmp.aai.p-interface.inter-domain-plug-id`'>
- <outcome value=''>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-src-node-Id and p-interface.interface-name = $src-tpId" local-only="false" pfx="tmp.aai.p-interface">
+ <outcome value="success">
+ <switch test="`$tmp.aai.p-interface.inter-domain-plug-id`">
+ <outcome value="">
<set>
- <parameter name='is-open-ended-link' value='false' />
- <parameter name='is-invalid-open-ended-link' value='true' />
+ <parameter name="is-open-ended-link" value="false"/>
+ <parameter name="is-invalid-open-ended-link" value="true"/>
</set>
</outcome>
- <outcome value='Other'>
+ <outcome value="Other">
<set>
- <parameter name='alt-unique-linkId' value="`$tmp.aai.p-interface.inter-domain-plug-id`" />
- <!--<parameter name='alt-unique-linkId' value="`'networkId-' + $unique-networkId + '-linkId-' + $tmp.aai.p-interface.inter-domain-plug-id`" />-->
+ <parameter name="alt-unique-linkId" value="`$tmp.aai.p-interface.inter-domain-plug-id`"/>
+ <!--
+ <parameter name='alt-unique-linkId' value="`'networkId-' + $unique-networkId + '-linkId-' + $tmp.aai.p-interface.inter-domain-plug-id`" />
+ -->
</set>
</outcome>
</switch>
</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 pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+ <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 pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`"/>
</return>
</outcome>
- <outcome value='failure'>
- <return status='failure'>
- <parameter name='error-code' value='' />
- <parameter name='error-message' value='' />
+ <outcome value="failure">
+ <return status="failure">
+ <parameter name="error-code" value=""/>
+ <parameter name="error-message" value=""/>
</return>
</outcome>
</get-resource>
</block>
</outcome>
- <outcome value='Other'>
+ <outcome value="Other">
<set>
- <parameter name='dst-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`" />
- <parameter name='unique-dst-node-Id' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`" />
- <parameter name='is-open-ended-link' value='false' />
+ <parameter name="dst-tpId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`"/>
+ <parameter name="unique-dst-node-Id" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`"/>
+ <parameter name="is-open-ended-link" value="false"/>
</set>
</outcome>
</switch>
- <switch test='`$is-invalid-open-ended-link`'>
- <outcome value='true'>
- <block></block>
+ <switch test="`$is-invalid-open-ended-link`">
+ <outcome value="true">
+ <block/>
</outcome>
- <outcome value='false'>
- <switch test='`$is-open-ended-link`'>
- <outcome value='true'>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
- resource="logical-link"
- key="logical-link.link-name = $alt-unique-linkId"
- local-only="false"
- pfx="tmp.aai.logical-link" >
- <outcome value='success'>
+ <outcome value="false">
+ <switch test="`$is-open-ended-link`">
+ <outcome value="true">
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $alt-unique-linkId" local-only="false" pfx="tmp.aai.logical-link">
+ <outcome value="success">
<block>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/onap/logMerge.txt" />
- <parameter name="field1" value="__TIMESTAMP__" />
- <parameter name="field2" value="altUniqueLinkId" />
- <parameter name="field3" value="`$alt-unique-linkId`" />
- <parameter name="field4" value="srcTpId" />
- <parameter name="field5" value="`$src-tpId`" />
- <parameter name="field6" value="relationship-value" />
- <parameter name="field7" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />
+ <parameter name="file" value="/opt/onap/logMerge.txt"/>
+ <parameter name="field1" value="__TIMESTAMP__"/>
+ <parameter name="field2" value="altUniqueLinkId"/>
+ <parameter name="field3" value="`$alt-unique-linkId`"/>
+ <parameter name="field4" value="srcTpId"/>
+ <parameter name="field5" value="`$src-tpId`"/>
+ <parameter name="field6" value="relationship-value"/>
+ <parameter name="field7" value="`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`"/>
</record>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
- key='logical-link.link-name = $alt-unique-linkId' 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />-->
- <!--<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="`$src-tpId`" />-->
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $alt-unique-linkId" 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />
+ -->
+ <!--
<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="`$src-tpId`" />
- <outcome value='success'>
+ -->
+ <parameter name="relationship-list.relationship[0].related-to" value="p-interface"/>
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>
+ <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="`$src-tpId`"/>
+ <outcome value="success">
<block>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/onap/logMergeSuccess.txt" />
- <parameter name="field1" value="__TIMESTAMP__" />
- <parameter name="field2" value="altUniqueLinkId" />
- <parameter name="field3" value="`$alt-unique-linkId`" />
- <parameter name="field4" value="srcTpId" />
- <parameter name="field5" value="`$src-tpId`" />
- <parameter name="field6" value="relationship-value" />
- <parameter name="field7" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />
+ <parameter name="file" value="/opt/onap/logMergeSuccess.txt"/>
+ <parameter name="field1" value="__TIMESTAMP__"/>
+ <parameter name="field2" value="altUniqueLinkId"/>
+ <parameter name="field3" value="`$alt-unique-linkId`"/>
+ <parameter name="field4" value="srcTpId"/>
+ <parameter name="field5" value="`$src-tpId`"/>
+ <parameter name="field6" value="relationship-value"/>
+ <parameter name="field7" value="`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`"/>
</record>
</block>
</outcome>
- <outcome value='failure'>
+ <outcome value="failure">
<block>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/onap/logMergeFailure.txt" />
- <parameter name="field1" value="__TIMESTAMP__" />
- <parameter name="field2" value="altUniqueLinkId" />
- <parameter name="field3" value="`$alt-unique-linkId`" />
- <parameter name="field4" value="srcTpId" />
- <parameter name="field5" value="`$src-tpId`" />
- <parameter name="field6" value="relationship-value" />
- <parameter name="field7" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />
+ <parameter name="file" value="/opt/onap/logMergeFailure.txt"/>
+ <parameter name="field1" value="__TIMESTAMP__"/>
+ <parameter name="field2" value="altUniqueLinkId"/>
+ <parameter name="field3" value="`$alt-unique-linkId`"/>
+ <parameter name="field4" value="srcTpId"/>
+ <parameter name="field5" value="`$src-tpId`"/>
+ <parameter name="field6" value="relationship-value"/>
+ <parameter name="field7" value="`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`"/>
</record>
</block>
</outcome>
</save>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute" key="te-link-attribute.id = $link.te.te-link-attributes.name">
+ <parameter name="id" value="`$link.te.te-link-attributes.name`"/>
+ <parameter name="access-type" value="`$link.te.te-link-attributes.access-type`"/>
+ </save>
+ <switch test="`$link.te.te-link-attributes.label-restriction_length`">
+ <outcome value="">
+ <block/>
+ </outcome>
+ <outcome value="0">
+ <block/>
+ </outcome>
+ <outcome value="Other">
+ <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">
+ <set>
+ <parameter name="label-restriction." value=""/>
+ <parameter name="unique-lrId" value=""/>
+ </set>
+ <set>
+ <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>
+ </set>
+ <set>
+ <parameter name="unique-lrId" value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`"/>
+ </set>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="label-restriction.id = $unique-lrId">
+ <parameter name="id" value="`$unique-lrId`"/>
+ <parameter name="label-start" value="`$label-restriction.label-start.te-label-tpn`"/>
+ <parameter name="label-end" value="`$label-restriction.label-end.te-label-tpn`"/>
+ <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+ <parameter name="label-step" value="`$label-restriction.label-step`"/>
+ <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+ <outcome value="success">
+ <block/>
+ </outcome>
+ <outcome value="failure">
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="label-restriction.id = $unique-lrId">
+ <parameter name="id" value="`$unique-lrId`"/>
+ <parameter name="label-start" value="`$label-restriction.label-start.te-label-tpn`"/>
+ <parameter name="label-end" value="`$label-restriction.label-end.te-label-tpn`"/>
+ <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+ <parameter name="label-step" value="`$label-restriction.label-step`"/>
+ <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+ </save>
+ </outcome>
+ </save>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute:relationship-list" key="te-link-attribute.id = $link.te.te-link-attributes.name" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="logical-link"/>
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $alt-unique-linkId`"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$alt-unique-linkId`"/>
+ </save>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute:relationship-list" key="te-link-attribute.id = $link.te.te-link-attributes.name" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="label-restriction"/>
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-lrId`"/>
+ </save>
+ </for>
+ </outcome>
+ </switch>
</block>
</outcome>
- <outcome value='not-found'>
- <block atomic='true'>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link'
- key='logical-link.link-name = $alt-unique-linkId' >
- <parameter name='link-name' value='`$alt-unique-linkId`' />
- <parameter name='link-id' value='`$link.link-id`' />
- <parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />
+ <outcome value="not-found">
+ <block atomic="true">
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $alt-unique-linkId">
+ <parameter name="link-name" value="`$alt-unique-linkId`"/>
+ <parameter name="link-id" value="`$link.link-id`"/>
+ <parameter name="link-type" value="`$link.te.te-link-attributes.access-type`"/>
</save>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
- key='logical-link.link-name = $alt-unique-linkId' 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />
- <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="`$src-tpId`" />
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $alt-unique-linkId" 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>
+ <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="`$src-tpId`"/>
+ </save>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute" key="te-link-attribute.id = $link.te.te-link-attributes.name">
+ <parameter name="id" value="`$link.te.te-link-attributes.name`"/>
+ <parameter name="access-type" value="`$link.te.te-link-attributes.access-type`"/>
</save>
- <switch test='`$link.te.te-link-attributes.label-restriction`'>
- <outcome value=''>
- <block></block>
+ <switch test="`$link.te.te-link-attributes.label-restriction_length`">
+ <outcome value="">
+ <block/>
</outcome>
- <outcome value='Other'>
- <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >
+ <outcome value="0">
+ <block/>
+ </outcome>
+ <outcome value="Other">
+ <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">
+ <set>
+ <parameter name="label-restriction." value=""/>
+ <parameter name="unique-lrId" value=""/>
+ </set>
+ <set>
+ <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>
+ </set>
<set>
- <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />
- <parameter name='unique-lrId' value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`" />
+ <parameter name="unique-lrId" value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`"/>
</set>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
- key='logical-link.link-name = $alt-unique-linkId
- AND label-restriction.id = $unique-lrId' >
- <parameter name='id' value='`$unique-lrId`' />
- <parameter name='label-start' value='`$label-restriction.label-start`' />
- <parameter name='label-end' value='`$label-restriction.label-end`' />
- <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
- <parameter name='label-step' value='`$label-restriction.label-step`' />
- <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
- <outcome value='success'>
- <block></block>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="label-restriction.id = $unique-lrId">
+ <parameter name="id" value="`$unique-lrId`"/>
+ <parameter name="label-start" value="`$label-restriction.label-start.te-label-tpn`"/>
+ <parameter name="label-end" value="`$label-restriction.label-end.te-label-tpn`"/>
+ <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+ <parameter name="label-step" value="`$label-restriction.label-step`"/>
+ <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+ <outcome value="success">
+ <block/>
</outcome>
- <outcome value='failure'>
- <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
- key='logical-link.link-name = $alt-unique-linkId
- AND label-restriction.id = $unique-lrId' >
- <parameter name='id' value='`$unique-lrId`' />
- <parameter name='label-start' value='`$label-restriction.label-start`' />
- <parameter name='label-end' value='`$label-restriction.label-end`' />
- <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
- <parameter name='label-step' value='`$label-restriction.label-step`' />
- <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
- </update>
+ <outcome value="failure">
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $alt-unique-linkId AND label-restriction.id = $unique-lrId">
+ <parameter name="id" value="`$unique-lrId`"/>
+ <parameter name="label-start" value="`$label-restriction.label-start`"/>
+ <parameter name="label-end" value="`$label-restriction.label-end`"/>
+ <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+ <parameter name="label-step" value="`$label-restriction.label-step`"/>
+ <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+ </save>
</outcome>
</save>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
- key='logical-link.link-name = $alt-unique-linkId' force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction" />
- <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />
- <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id" />
- <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`" />
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute:relationship-list" key="te-link-attribute.id = $link.te.te-link-attributes.name" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="logical-link"/>
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $alt-unique-linkId`"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$alt-unique-linkId`"/>
+ </save>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute:relationship-list" key="te-link-attribute.id = $link.te.te-link-attributes.name" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="label-restriction"/>
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-lrId`"/>
</save>
</for>
</outcome>
@@ -205,77 +274,89 @@ </outcome>
</get-resource>
</outcome>
- <outcome value='false'>
- <block atomic='true'>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link'
- key='logical-link.link-name = $unique-linkId' >
- <parameter name='link-name' value='`$unique-linkId`' />
- <parameter name='link-id' value='`$link.link-id`' />
- <parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />
+ <outcome value="false">
+ <block atomic="true">
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $unique-linkId">
+ <parameter name="link-name" value="`$unique-linkId`"/>
+ <parameter name="link-id" value="`$link.link-id`"/>
+ <parameter name="link-type" value="`$link.te.te-link-attributes.access-type`"/>
</save>
<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="uniqueLinkId" />
- <parameter name="field3" value="`$unique-linkId`" />
- <parameter name="field4" value="srcTpId" />
- <parameter name="field5" value="`$src-tpId`" />
- <parameter name="field6" value="dstTpId" />
- <parameter name="field7" value="`$dst-tpId`" />
+ <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>
+ <parameter name="field1" value="__TIMESTAMP__"/>
+ <parameter name="field2" value="uniqueLinkId"/>
+ <parameter name="field3" value="`$unique-linkId`"/>
+ <parameter name="field4" value="srcTpId"/>
+ <parameter name="field5" value="`$src-tpId`"/>
+ <parameter name="field6" value="dstTpId"/>
+ <parameter name="field7" value="`$dst-tpId`"/>
</record>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
- key='logical-link.link-name = $unique-linkId' 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />
- <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="`$src-tpId`" />
- <parameter name="relationship-list.relationship[1].related-to" value="p-interface" />
- <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`" />
- <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name" />
- <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`" />
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $unique-linkId" 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>
+ <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="`$src-tpId`"/>
+ <parameter name="relationship-list.relationship[1].related-to" value="p-interface"/>
+ <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`"/>
+ <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
+ <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`"/>
+ </save>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute" key="te-link-attribute.id = $link.te.te-link-attributes.name">
+ <parameter name="id" value="`$link.te.te-link-attributes.name`"/>
+ <parameter name="access-type" value="`$link.te.te-link-attributes.access-type`"/>
</save>
- <switch test='`$link.te.te-link-attributes.label-restriction`'>
- <outcome value=''>
- <block></block>
+ <switch test="`$link.te.te-link-attributes.label-restriction_length`">
+ <outcome value="">
+ <block/>
</outcome>
- <outcome value='Other'>
- <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
- key='logical-link.link-name = $unique-linkId' force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction" />
- <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />
- <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id" />
- <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`" />
- </save>
+ <outcome value="0">
+ <block/>
+ </outcome>
+ <outcome value="Other">
+ <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">
<set>
- <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />
- <parameter name='unique-lrId' value="`$unique-linkId + '-lrId-' + $label-restriction.index`" />
+ <parameter name="label-restriction." value=""/>
+ <parameter name="unique-lrId" value=""/>
</set>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
- key='logical-link.link-name = $unique-linkId
- AND label-restriction.id = $unique-lrId' >
- <parameter name='id' value='`$unique-lrId`' />
- <parameter name='label-start' value='`$label-restriction.label-start`' />
- <parameter name='label-end' value='`$label-restriction.label-end`' />
- <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
- <parameter name='label-step' value='`$label-restriction.label-step`' />
- <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
- <outcome value='success'>
- <block></block>
+ <set>
+ <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>
+ </set>
+ <set>
+ <parameter name="unique-lrId" value="`$unique-linkId + '-lrId-' + $label-restriction.index`"/>
+ </set>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="label-restriction.id = $unique-lrId">
+ <parameter name="id" value="`$unique-lrId`"/>
+ <parameter name="label-start" value="`$label-restriction.label-start.te-label-tpn`"/>
+ <parameter name="label-end" value="`$label-restriction.label-end.te-label-tpn`"/>
+ <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+ <parameter name="label-step" value="`$label-restriction.label-step`"/>
+ <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+ <outcome value="success">
+ <block/>
</outcome>
- <outcome value='failure'>
- <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
- key='logical-link.link-name = $unique-linkId
- AND label-restriction.id = $unique-lrId' >
- <parameter name='id' value='`$unique-lrId`' />
- <parameter name='label-start' value='`$label-restriction.label-start`' />
- <parameter name='label-end' value='`$label-restriction.label-end`' />
- <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
- <parameter name='label-step' value='`$label-restriction.label-step`' />
- <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
- </update>
+ <outcome value="failure">
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $unique-linkId AND label-restriction.id = $unique-lrId">
+ <parameter name="id" value="`$unique-lrId`"/>
+ <parameter name="label-start" value="`$label-restriction.label-start`"/>
+ <parameter name="label-end" value="`$label-restriction.label-end`"/>
+ <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+ <parameter name="label-step" value="`$label-restriction.label-step`"/>
+ <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+ </save>
</outcome>
</save>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute:relationship-list" key="te-link-attribute.id = $link.te.te-link-attributes.name" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="logical-link"/>
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $unique-linkId`"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-linkId`"/>
+ </save>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute:relationship-list" key="te-link-attribute.id = $link.te.te-link-attributes.name" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="label-restriction"/>
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-lrId`"/>
+ </save>
</for>
</outcome>
</switch>
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 f9b7d997..839e15de 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,115 +1,113 @@ -<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.network-id"/>
+ <parameter name="outputPath" value="tmp.original-network-id"/>
<parameter name="target" value="/"/>
<parameter name="replacement" value="-"/>
</execute>
- <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`' />
+ <set>
+ <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>
- <for index='pidx' start='0' end='`$network.node_length`' >
+ <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.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.te.tunnel-termination-point_length`' >
+ <outcome value="Other">
+ <for index="ttidx" start="0" end="`$node.te.tunnel-termination-point_length`">
<set>
- <parameter name='ttp.' value='' />
+ <parameter name="ttp." value=""/>
</set>
<set>
- <parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />
+ <parameter name="ttp." value="`$node.te.tunnel-termination-point[$ttidx].`"/>
</set>
<set>
- <parameter name='unique-ttpId' value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`" />
+ <parameter name="unique-ttpId" value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-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>
+ <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/>
</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`' />
+ <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>
</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[$ttidx].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[$ttidx].related-link`" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />
- <parameter name="`relationship-list.relationship[$ttidx].relationship-data[0].relationship-key`" value="tunnel-termination-point.ttp-id" />
- <parameter name="`relationship-list.relationship[$ttidx].relationship-data[0].relationship-value`" value="`$unique-ttpId`" />
- <outcome value='success'>
+ <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[$ttidx].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[$ttidx].related-link`" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`"/>
+ <parameter name="`relationship-list.relationship[$ttidx].relationship-data[0].relationship-key`" value="tunnel-termination-point.ttp-id"/>
+ <parameter name="`relationship-list.relationship[$ttidx].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`" />
+ <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'>
+ <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`" />
+ <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>
@@ -117,71 +115,91 @@ </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`" />
+ <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.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="tidx" start="0" end="`$node.termination-point_length`">
<set>
- <parameter name='tp.' value='' />
+ <parameter name="tp." value=""/>
</set>
<set>
- <parameter name='tp.' value='`$node.termination-point[$tidx].`' />
+ <parameter name="tp." value="`$node.termination-point[$tidx].`"/>
</set>
<set>
- <parameter name='unique-ltpId' value="`$unique-nodeId + '-ltpId-' + $tp.te-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='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]`' />
+ <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="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>
+ </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`' />
- <outcome value='success'>
- <block></block>
+ -->
+ <parameter name="inter-domain-plug-id" value="`$tmp.decoded-plug-id`"/>
+ <outcome value="success">
+ <block/>
</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]`' />
+ <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>
@@ -189,7 +207,7 @@ </outcome>
</switch>
</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 f009a801..b9dbae7a 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,76 +1,98 @@ -<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.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.network-otn.network-id"/>
<parameter name="target" value="/"/>
<parameter name="replacement" value="-"/>
</execute>
- <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-node-ethId' value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`" />
+ <parameter name="unique-network-ethId" value="`$tmp.network-eth.network-id`"/>
+ <parameter name="unique-node-ethId" value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`"/>
</set>
- <for index='tidx' start='0' end='`$node-eth.termination-point_length`' >
- <set>
- <parameter name='tp-eth.' value='' />
- </set>
- <set>
- <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`" />
- </set>
- <set>
- <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`' >
- <set>
- <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-node-otnId' value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`" />
- </set>
- <for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >
+ <switch test="`$node-eth.termination-point_length`">
+ <outcome value="">
+ <block/>
+ </outcome>
+ <outcome value="0">
+ <block/>
+ </outcome>
+ <outcome value="Other">
+ <for index="tidx" start="0" end="`$node-eth.termination-point_length`">
<set>
- <parameter name='ttp.' value='' />
+ <parameter name="tp-eth." value=""/>
</set>
<set>
- <parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />
+ <parameter name="tp-eth." value="`$node-eth.termination-point[$tidx].`"/>
</set>
<set>
- <parameter name='unique-ttpId' value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`" />
+ <parameter name="unique-ltpethId" value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-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="tp-inter-layer-lock-id" value="`$node-eth.termination-point[$tidx].te.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[1].related-to" value="tunnel-termination-point" />
- <parameter name="relationship-list.relationship[1].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`" />
- <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id" />
- <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$unique-ttpId`" />
- </save>
- </outcome>
- </switch>
+ <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=""/>
+ </set>
+ <set>
+ <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-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/>
+ </outcome>
+ <outcome value="0">
+ <block/>
+ </outcome>
+ <outcome value="Other">
+ <for index="ttidx" start="0" end="`$node-otn.te.tunnel-termination-point_length`">
+ <set>
+ <parameter name="ttp." value=""/>
+ </set>
+ <set>
+ <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`"/>
+ </set>
+ <set>
+ <parameter name="ttp-inter-layer-lock-id" value="`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`"/>
+ </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`"/>
+ </save>
+ </outcome>
+ </switch>
+ </for>
+ </outcome>
+ </switch>
+ </for>
</for>
- </for>
- </for>
+ </outcome>
+ </switch>
</for>
</block>
</method>
|