Bug fixing in topology discovery as part of CCVPN (Cross-Layer Cross-Domain VPN)...

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

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 ca5ed7a..81060bf 100644 (file)
--- 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 @@
 [\r
     {\r
-        "id": "346770b6.e0b2e",\r
+        "id": "c3dc4adb.8c6008",\r
         "type": "other",\r
         "name": "update",\r
         "xml": "<outcome value='Update'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 666,\r
-        "y": 282,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 739,\r
+        "y": 311,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "ac79093c.29ec78"\r
+                "bd0845c9.41d478"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f504934.7894c6",\r
+        "id": "71253ee0.23906",\r
         "type": "other",\r
         "name": "delete",\r
         "xml": "<outcome value='Delete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 666,\r
-        "y": 362,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 739,\r
+        "y": 391,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "5f23df82.9ac6e"\r
+                "3f0bf71e.180588"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f23df82.9ac6e",\r
+        "id": "3f0bf71e.180588",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 807.5,\r
-        "y": 362,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 880.5,\r
+        "y": 391,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "dc10cae0.74e44"\r
+                "67540de7.5dd14c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a242175.0e7ef",\r
+        "id": "de801ea6.e90758",\r
         "type": "switchNode",\r
         "name": "switch aai-event-trigger",\r
         "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 496.5,\r
-        "y": 322,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 569.5,\r
+        "y": 351,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "346770b6.e0b2e",\r
-                "2f504934.7894c6"\r
+                "c3dc4adb.8c6008",\r
+                "71253ee0.23906"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39f2e6f9.408272",\r
+        "id": "1007cea6.282501",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1193.5,\r
-        "y": 193,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1266.5,\r
+        "y": 222,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "97074a04.9156f",\r
-                "a612156e.6c82f",\r
-                "af67ee77.5ddb88",\r
-                "8f8e9805.87c3c8",\r
-                "9d5ac624.def28"\r
+                "95e785b5.d067b",\r
+                "7a1058d1.4b2d6",\r
+                "558bdafc.122dbc",\r
+                "54848569.ec4d54",\r
+                "25993b47.1f060c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a612156e.6c82f",\r
+        "id": "7a1058d1.4b2d6",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Get token",\r
         "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\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1466.5001983642578,\r
-        "y": 114.00000953674316,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1539.5001983642578,\r
+        "y": 143.00000953674316,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "e7c29f07.2a4d28",\r
-                "fe96d7c9.6dc11"\r
+                "1f13ca65.eddc8e",\r
+                "fa7642f7.a126c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e7c29f07.2a4d28",\r
+        "id": "1f13ca65.eddc8e",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1756.000244140625,\r
-        "y": 106,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1829.000244140625,\r
+        "y": 135,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "9a41c115.acccd8"\r
+                "a5768e87.aa1bb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe96d7c9.6dc11",\r
+        "id": "fa7642f7.a126c8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1752.000244140625,\r
-        "y": 146,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1825.000244140625,\r
+        "y": 175,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "142d0bb2.73cbec"\r
+                "334af206.383786"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a41c115.acccd8",\r
+        "id": "a5768e87.aa1bb",\r
         "type": "set",\r
         "name": "set token-id",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",\r
         "comments": "",\r
-        "x": 1906.500244140625,\r
-        "y": 106,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1979.500244140625,\r
+        "y": 135,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
     },\r
     {\r
-        "id": "74c607f5.33c7f",\r
+        "id": "272f0d19.0aa972",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Get Topology",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1973.500244140625,\r
-        "y": 226,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 2046.500244140625,\r
+        "y": 255,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "46585599.99541c",\r
-                "e4dc69e3.746e88"\r
+                "c0f8711f.5047d8",\r
+                "6134ff85.3a875"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "46585599.99541c",\r
+        "id": "c0f8711f.5047d8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2216.000244140625,\r
-        "y": 246,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 2289.000244140625,\r
+        "y": 275,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "c7c89355.9ce378"\r
+                "f5e8d64.1d84ba8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7c89355.9ce378",\r
+        "id": "f5e8d64.1d84ba8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2373.500244140625,\r
-        "y": 246,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 2446.500244140625,\r
+        "y": 275,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "b3a801bb.6b3e08"\r
+                "f392518f.1c82f",\r
+                "f7bc5da7.da31b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4462058b.03bf7c",\r
+        "id": "dd9ef895.8d06e8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2350.000244140625,\r
-        "y": 146,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 2423.000244140625,\r
+        "y": 175,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e4dc69e3.746e88",\r
+        "id": "6134ff85.3a875",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2212.000244140625,\r
-        "y": 146,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 2285.000244140625,\r
+        "y": 175,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "4462058b.03bf7c"\r
+                "dd9ef895.8d06e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e48e789f.6305e8",\r
+        "id": "bca2c88c.f5748",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 119,\r
-        "y": 57,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 192,\r
+        "y": 86,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "f17ff4c0.c3b85"\r
+                "1c8eebdb.be2d0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f17ff4c0.c3b85",\r
+        "id": "1c8eebdb.be2d0c",\r
         "type": "service-logic",\r
         "name": "DataChange ${project.version}",\r
         "module": "DataChange",\r
@@ -244,1017 +245,1243 @@
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 132,\r
-        "y": 117,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 205,\r
+        "y": 146,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "dcee4efc.fbc398"\r
+                "a6fcf3ab.5f9578"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dcee4efc.fbc398",\r
+        "id": "a6fcf3ab.5f9578",\r
         "type": "method",\r
         "name": "method esr-thirdparty-sdnc-discovery",\r
         "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 152,\r
-        "y": 197,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 225,\r
+        "y": 226,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "ee1d05c.842daf8"\r
+                "6420c8d3.d15ee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee1d05c.842daf8",\r
+        "id": "6420c8d3.d15ee",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 399.5,\r
-        "y": 197,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 472.5,\r
+        "y": 226,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "289966fd.257632"\r
+                "39152f22.f0d4a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3a801bb.6b3e08",\r
+        "id": "f392518f.1c82f",\r
         "type": "for",\r
         "name": "for each Network",\r
         "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1799.500259399414,\r
-        "y": 345.00001525878906,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 2665.500244140625,\r
+        "y": 204,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "f46be5c.444e598"\r
+                "48caa041.662da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f46be5c.444e598",\r
+        "id": "48caa041.662da",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1948.000259399414,\r
-        "y": 345.00001525878906,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 2814.000244140625,\r
+        "y": 204,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "9f7c6e21.8e3448",\r
-                "a45b31cf.5b428"\r
+                "f9d6723a.6cdf78",\r
+                "929dfcd4.4e318"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9f7c6e21.8e3448",\r
+        "id": "f9d6723a.6cdf78",\r
         "type": "call",\r
         "name": "call update-network-to-aai",\r
         "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2127.000259399414,\r
-        "y": 365.00001525878906,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 2993.000244140625,\r
+        "y": 224,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a45b31cf.5b428",\r
+        "id": "929dfcd4.4e318",\r
         "type": "set",\r
         "name": "set network",\r
         "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",\r
         "comments": "",\r
-        "x": 2082.000259399414,\r
-        "y": 325.00001525878906,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 2948.000244140625,\r
+        "y": 184,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
     },\r
     {\r
-        "id": "142d0bb2.73cbec",\r
+        "id": "334af206.383786",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1872.000244140625,\r
-        "y": 146,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1945.000244140625,\r
+        "y": 175,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "77d98c9a.bbdddc",\r
+        "id": "2b9bc1fc.7f9d86",\r
         "type": "comment",\r
         "name": "Do Nothing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2042.000244140625,\r
-        "y": 186,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 2115.000244140625,\r
+        "y": 215,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7a5efd17.5c18a4",\r
+        "id": "ec977bcd.52b8a8",\r
         "type": "switchNode",\r
         "name": "switch type",\r
         "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 919,\r
-        "y": 282,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 992,\r
+        "y": 311,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "c610bb27.6f7938",\r
-                "f6f15d6a.b855f8",\r
-                "2ed61a13.0813c6",\r
-                "ca97ad3.a311cd"\r
+                "e6327558.85a0e",\r
+                "ece3c1dc.08a25",\r
+                "57f0cdff.7f0d04",\r
+                "e6efb547.0bd5a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac79093c.29ec78",\r
+        "id": "bd0845c9.41d478",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 786,\r
-        "y": 282,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 859,\r
+        "y": 311,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "7a5efd17.5c18a4"\r
+                "ec977bcd.52b8a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c610bb27.6f7938",\r
+        "id": "e6327558.85a0e",\r
         "type": "other",\r
         "name": "SOTN",\r
         "xml": "<outcome value='SOTN'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1032,\r
-        "y": 193,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1105,\r
+        "y": 222,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "39f2e6f9.408272"\r
+                "1007cea6.282501"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f6f15d6a.b855f8",\r
+        "id": "ece3c1dc.08a25",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1061.5,\r
-        "y": 654.5001220703125,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1134.5,\r
+        "y": 683.5001220703125,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "bacba57d.e755a8"\r
+                "752a836e.32daf4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bacba57d.e755a8",\r
+        "id": "752a836e.32daf4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1247.75,\r
-        "y": 680.5001220703125,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1320.75,\r
+        "y": 709.5001220703125,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
     },\r
     {\r
-        "id": "97074a04.9156f",\r
+        "id": "95e785b5.d067b",\r
         "type": "execute",\r
         "name": "execute Properties",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1413.0001983642578,\r
-        "y": 74.00000953674316,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1486.0001983642578,\r
+        "y": 103.00000953674316,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "af67ee77.5ddb88",\r
+        "id": "558bdafc.122dbc",\r
         "type": "switchNode",\r
         "name": "switch prop.sdncRestApi.token_id",\r
         "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1459.5001983642578,\r
-        "y": 194.00000953674316,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1532.5001983642578,\r
+        "y": 223.00000953674316,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "196dbf86.289fe8",\r
-                "2e000adc.427cfe"\r
+                "9764857a.46386",\r
+                "b55a5855.1b4c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "196dbf86.289fe8",\r
+        "id": "9764857a.46386",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1752.000244140625,\r
-        "y": 186,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1825.000244140625,\r
+        "y": 215,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "58dbe772.71f75"\r
+                "d18413fb.5938e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e000adc.427cfe",\r
+        "id": "b55a5855.1b4c4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1752.000244140625,\r
-        "y": 226,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1825.000244140625,\r
+        "y": 255,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "74c607f5.33c7f"\r
+                "272f0d19.0aa972"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58dbe772.71f75",\r
+        "id": "d18413fb.5938e8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Get Topology",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1973.500244140625,\r
-        "y": 186,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 2046.500244140625,\r
+        "y": 215,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "e4dc69e3.746e88",\r
-                "46585599.99541c"\r
+                "6134ff85.3a875",\r
+                "c0f8711f.5047d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d5ac624.def28",\r
+        "id": "25993b47.1f060c",\r
         "type": "execute",\r
         "name": "execute RestconfDiscoveryNode",\r
         "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\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1456.0001983642578,\r
-        "y": 334.00000953674316,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1529.0001983642578,\r
+        "y": 363.00000953674316,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8f8e9805.87c3c8",\r
+        "id": "54848569.ec4d54",\r
         "type": "set",\r
         "name": "set encoding-format",\r
         "xml": "<set>\n<parameter name='input' value='ietf-subscribed-notifications:establish-subscription.input.' />\n<parameter name=\"`$input + 'encoding'`\" value=\"encode-json\" />",\r
         "comments": "",\r
-        "x": 1416.0001983642578,\r
-        "y": 294.00000953674316,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1489.0001983642578,\r
+        "y": 323.00000953674316,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bcab4612.fb18e",\r
+        "id": "c147e994.7edd08",\r
         "type": "comment",\r
         "name": "Notification subscription",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1421.000343322754,\r
-        "y": 251.00000858306885,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1494.000343322754,\r
+        "y": 280.00000858306885,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
     },\r
     {\r
-        "id": "289966fd.257632",\r
+        "id": "39152f22.f0d4a8",\r
         "type": "switchNode",\r
         "name": "switch",\r
         "xml": "<switch test=\"`$prop.sdncRestApi.vendor == 'ZTE'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 106,\r
-        "y": 322,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 179,\r
+        "y": 351,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "8432bc7f.958c98",\r
-                "dbdc5153.c45968"\r
+                "404d2f08.96ad7",\r
+                "74ffd1db.2f31c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8432bc7f.958c98",\r
+        "id": "404d2f08.96ad7",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 293,\r
-        "y": 322,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 366,\r
+        "y": 351,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "5a242175.0e7ef"\r
+                "de801ea6.e90758"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dbdc5153.c45968",\r
+        "id": "74ffd1db.2f31c8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 67.00003051757812,\r
-        "y": 1078.75,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 140.00003051757812,\r
+        "y": 1107.75,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "94027433.59821"\r
+                "c3886c05.a14928"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "94027433.59821",\r
+        "id": "c3886c05.a14928",\r
         "type": "call",\r
         "name": "call esr-thirdparty-sdnc-of-zte",\r
         "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 298.75,\r
-        "y": 1095.5000610351562,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 371.75,\r
+        "y": 1124.5000610351562,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2ed61a13.0813c6",\r
+        "id": "57f0cdff.7f0d04",\r
         "type": "other",\r
         "name": "TAPI",\r
         "xml": "<outcome value='TAPI'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1110,\r
-        "y": 427,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1183,\r
+        "y": 456,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "4691c66b.5d4a4"\r
+                "9159c5db.f9ecb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4691c66b.5d4a4",\r
+        "id": "9159c5db.f9ecb",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1273,\r
-        "y": 426,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1346,\r
+        "y": 455,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "7dd7f464.c6c9e4"\r
+                "359e52a9.fb7c36"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7dd7f464.c6c9e4",\r
+        "id": "359e52a9.fb7c36",\r
         "type": "execute",\r
         "name": "execute",\r
         "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\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1434,\r
-        "y": 425,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1507,\r
+        "y": 454,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "4311848d.591ed4",\r
-                "fc46f47a.aebbb"\r
+                "bdd5dc28.9d2908",\r
+                "a872bbb4.c3aec8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc46f47a.aebbb",\r
+        "id": "a872bbb4.c3aec8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1576,\r
-        "y": 501,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1649,\r
+        "y": 530,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "cc96eb4.79b6718"\r
+                "e24829ea.497098"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4311848d.591ed4",\r
+        "id": "bdd5dc28.9d2908",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1610,\r
-        "y": 422,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1683,\r
+        "y": 451,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "85a205fd.e6fe2"\r
+                "ba70e873.59e928"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "85a205fd.e6fe2",\r
+        "id": "ba70e873.59e928",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1780,\r
-        "y": 421,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1853,\r
+        "y": 450,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cc96eb4.79b6718",\r
+        "id": "e24829ea.497098",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1737,\r
-        "y": 500,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1810,\r
+        "y": 529,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "84ea29d7.966748"\r
+                "e5d11bee.6d3f3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84ea29d7.966748",\r
+        "id": "e5d11bee.6d3f3",\r
         "type": "for",\r
         "name": "for each topology",\r
         "xml": "<for index='tidx' start='0' end=\"`$topologies.topology_length`\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1916,\r
-        "y": 500,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1989,\r
+        "y": 529,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "23afbd29.52671a"\r
+                "f9dbd640.006d18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "23afbd29.52671a",\r
+        "id": "f9dbd640.006d18",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2083,\r
-        "y": 501,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 2156,\r
+        "y": 530,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "be671cf9.1f4a38",\r
-                "2c9a9e44.4d4e72"\r
+                "c60ea7f.3bd2058",\r
+                "b4f9b29d.c49458"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "be671cf9.1f4a38",\r
+        "id": "c60ea7f.3bd2058",\r
         "type": "set",\r
         "name": "set topology",\r
         "xml": "<set>\n<parameter name='topology.' value='`$topologies.topology[$tidx].`' />\n",\r
         "comments": "",\r
-        "x": 2242,\r
-        "y": 502,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 2315,\r
+        "y": 531,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2c9a9e44.4d4e72",\r
+        "id": "b4f9b29d.c49458",\r
         "type": "call",\r
         "name": "call tapi-update-network-to-aai",\r
         "xml": "<call module='DataChange' rpc='tapi-update-network-to-aai' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2233,\r
-        "y": 568,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 2306,\r
+        "y": 597,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ca97ad3.a311cd",\r
+        "id": "e6efb547.0bd5a8",\r
         "type": "outcome",\r
         "name": "MSA",\r
         "xml": "<outcome value='MSA'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1080.677324295044,\r
-        "y": 583.8993349075317,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1153.677324295044,\r
+        "y": 612.8993349075317,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "c2e22ff3.03e78"\r
+                "e1657417.9cefe8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2e22ff3.03e78",\r
+        "id": "e1657417.9cefe8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1242.6773872375488,\r
-        "y": 581.899335861206,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1315.6773872375488,\r
+        "y": 610.899335861206,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "cdc360bb.4f8c6"\r
+                "1f0bde0a.fa2cb2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cdc360bb.4f8c6",\r
+        "id": "1f0bde0a.fa2cb2",\r
         "type": "execute",\r
         "name": "execute",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1419.6771354675293,\r
-        "y": 573.8992919921875,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1492.6771354675293,\r
+        "y": 602.8992919921875,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "150d6764.a614e9",\r
-                "1e259e4f.0e9d9a"\r
+                "7133cad2.99b11c",\r
+                "c3d837c.d0ca2c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "150d6764.a614e9",\r
+        "id": "7133cad2.99b11c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1572.6771354675293,\r
-        "y": 570.8992919921875,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1645.6771354675293,\r
+        "y": 599.8992919921875,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "a457e272.01c1b8"\r
+                "eab907ff.882ae8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a457e272.01c1b8",\r
+        "id": "eab907ff.882ae8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1747.6771354675293,\r
-        "y": 569.8992919921875,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1820.6771354675293,\r
+        "y": 598.8992919921875,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1e259e4f.0e9d9a",\r
+        "id": "c3d837c.d0ca2c8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1578.6771354675293,\r
-        "y": 643.8992919921875,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1651.6771354675293,\r
+        "y": 672.8992919921875,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "c148d343.01eac8"\r
+                "224d6e37.21354a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c148d343.01eac8",\r
+        "id": "224d6e37.21354a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1762.6771354675293,\r
-        "y": 645.8992919921875,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1835.6771354675293,\r
+        "y": 674.8992919921875,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "f964e642.cb1ae"\r
+                "622b9c10.ebdeac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f964e642.cb1ae",\r
+        "id": "622b9c10.ebdeac",\r
         "type": "call",\r
         "name": "call msa-update-network-to-aai",\r
         "xml": "<call module='DataChange' rpc='msa-update-network-to-aai' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2041.677001953125,\r
-        "y": 643.8992919921875,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 2114.677001953125,\r
+        "y": 672.8992919921875,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dc10cae0.74e44",\r
+        "id": "67540de7.5dd14c",\r
         "type": "switchNode",\r
         "name": "switch type",\r
         "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 212.566650390625,\r
-        "y": 812.5666809082031,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 285.566650390625,\r
+        "y": 841.5666809082031,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "447a364c.b91ea8",\r
-                "f7872c45.99a4e",\r
-                "c8e48bf6.778e98"\r
+                "ed11f93e.13815",\r
+                "b9986099.553ab8",\r
+                "eeccf78a.d71e3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "447a364c.b91ea8",\r
+        "id": "ed11f93e.13815",\r
         "type": "outcome",\r
         "name": "MSA",\r
         "xml": "<outcome value='MSA'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 391.857177734375,\r
-        "y": 729.9285888671875,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 464.857177734375,\r
+        "y": 758.9285888671875,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "a07fdc63.5a34d8"\r
+                "40980c29.103654"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7872c45.99a4e",\r
+        "id": "b9986099.553ab8",\r
         "type": "other",\r
         "name": "TAPI",\r
         "xml": "<outcome value='TAPI'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 400.6070556640625,\r
-        "y": 980.6428527832031,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 473.6070556640625,\r
+        "y": 1009.6428527832031,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "6d4308e1.31c5f"\r
+                "b9906adb.aedb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a07fdc63.5a34d8",\r
+        "id": "40980c29.103654",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 545.607177734375,\r
-        "y": 726.7143249511719,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 618.607177734375,\r
+        "y": 755.7143249511719,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "cfc4d202.c64d78",\r
-                "366bec81.83eddc"\r
+                "f4759d50.5acb",\r
+                "6300b23d.858844"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d4308e1.31c5f",\r
+        "id": "b9906adb.aedb",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 550,\r
-        "y": 980.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 623,\r
+        "y": 1009.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "6a48df29.ca491",\r
-                "62ccb800.ba59c8"\r
+                "ee72aef0.96b35",\r
+                "80047dba.a18518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8e48bf6.778e98",\r
+        "id": "eeccf78a.d71e3",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 503,\r
-        "y": 1144.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 576,\r
+        "y": 1173.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "ab761f62.a873d"\r
+                "a7ccb229.5cc45"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab761f62.a873d",\r
+        "id": "a7ccb229.5cc45",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 665,\r
-        "y": 1183.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 738,\r
+        "y": 1212.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cfc4d202.c64d78",\r
+        "id": "f4759d50.5acb",\r
         "type": "get-resource",\r
         "name": "get resources from DB -controller_id",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 777.5,\r
-        "y": 774.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 850.5,\r
+        "y": 803.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "69e5b135.13096",\r
-                "70bf128f.7ac3cc",\r
-                "136d8709.29f489"\r
+                "418351d.550fdb",\r
+                "5d9de12a.c40778",\r
+                "4f52ba75.31f414"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "366bec81.83eddc",\r
+        "id": "6300b23d.858844",\r
         "type": "set",\r
         "name": "set controller_id",\r
         "xml": "<set>\n<parameter name='controllerid' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n\n\n",\r
         "comments": "",\r
-        "x": 737.5,\r
-        "y": 708.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 810.5,\r
+        "y": 737.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
     },\r
     {\r
-        "id": "69e5b135.13096",\r
+        "id": "418351d.550fdb",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1016.5,\r
-        "y": 794.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1089.5,\r
+        "y": 823.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "f7324afe.a3cb98"\r
+                "7d4b021f.b58864"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7324afe.a3cb98",\r
+        "id": "7d4b021f.b58864",\r
         "type": "delete",\r
         "name": "delete from db",\r
         "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\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1185.5,\r
-        "y": 801.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1258.5,\r
+        "y": 830.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6a48df29.ca491",\r
+        "id": "ee72aef0.96b35",\r
         "type": "set",\r
         "name": "set controller_id",\r
         "xml": "<set>\n<parameter name='controllerid' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n\n\n",\r
         "comments": "",\r
-        "x": 714.5,\r
-        "y": 936.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 787.5,\r
+        "y": 965.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
     },\r
     {\r
-        "id": "62ccb800.ba59c8",\r
+        "id": "80047dba.a18518",\r
         "type": "get-resource",\r
         "name": "get resources from DB -controller_id",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 727.5,\r
-        "y": 1025.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 800.5,\r
+        "y": 1054.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "4cc181ad.c4d1f8",\r
-                "85870c46.3089f",\r
-                "d2032fdb.614ce8"\r
+                "193e8ffa.2d1e68",\r
+                "392a4087.7340c",\r
+                "3b51b50f.fabfaa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4cc181ad.c4d1f8",\r
+        "id": "193e8ffa.2d1e68",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 952.5,\r
-        "y": 1040.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1025.5,\r
+        "y": 1069.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "ebe8f601.eebec8"\r
+                "7c3655cf.c7356c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ebe8f601.eebec8",\r
+        "id": "7c3655cf.c7356c",\r
         "type": "delete",\r
         "name": "delete from db",\r
         "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\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1123.5,\r
-        "y": 1041.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1196.5,\r
+        "y": 1070.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "70bf128f.7ac3cc",\r
+        "id": "5d9de12a.c40778",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1002.5,\r
-        "y": 873.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1075.5,\r
+        "y": 902.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "dd76e326.6dd408"\r
+                "44b36cb9.4f203c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "85870c46.3089f",\r
+        "id": "392a4087.7340c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 933.5,\r
-        "y": 1113.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1006.5,\r
+        "y": 1142.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "b35680d0.668ed"\r
+                "568e56df.183be8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd76e326.6dd408",\r
+        "id": "44b36cb9.4f203c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1163.5,\r
-        "y": 878.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1236.5,\r
+        "y": 907.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
     },\r
     {\r
-        "id": "136d8709.29f489",\r
+        "id": "4f52ba75.31f414",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 993.5,\r
-        "y": 933.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1066.5,\r
+        "y": 962.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "84fa6086.1cdbd"\r
+                "67091014.c5cb48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84fa6086.1cdbd",\r
+        "id": "67091014.c5cb48",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1142.5,\r
-        "y": 935.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1215.5,\r
+        "y": 964.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b35680d0.668ed",\r
+        "id": "568e56df.183be8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1081.5,\r
-        "y": 1114.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1154.5,\r
+        "y": 1143.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d2032fdb.614ce8",\r
+        "id": "3b51b50f.fabfaa",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 933.5,\r
-        "y": 1157.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1006.5,\r
+        "y": 1186.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": [\r
             [\r
-                "a6db07ae.aaca38"\r
+                "74792395.d77524"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6db07ae.aaca38",\r
+        "id": "74792395.d77524",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1098.5,\r
-        "y": 1154.5,\r
-        "z": "7bb5d2cb.8cfacc",\r
+        "x": 1171.5,\r
+        "y": 1183.5,\r
+        "z": "fcc91756.c8d038",\r
         "wires": []\r
+    },\r
+    {\r
+        "id": "f7bc5da7.da31b",\r
+        "type": "switchNode",\r
+        "name": "switch network_length",\r
+        "xml": "<switch test='`$topology.networks.network_length >= 2`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2682,\r
+        "y": 335,\r
+        "z": "fcc91756.c8d038",\r
+        "wires": [\r
+            [\r
+                "aa4a8663.38bb68"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "aa4a8663.38bb68",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2864,\r
+        "y": 336,\r
+        "z": "fcc91756.c8d038",\r
+        "wires": [\r
+            [\r
+                "efdac693.289728"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6a7f62ea.d32524",\r
+        "type": "for",\r
+        "name": "for each Network",\r
+        "xml": "<for index='netidx' start='0' end='`$topology.networks.network_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3237,\r
+        "y": 329,\r
+        "z": "fcc91756.c8d038",\r
+        "wires": [\r
+            [\r
+                "de962ed4.8e2558"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "de962ed4.8e2558",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3455,\r
+        "y": 326,\r
+        "z": "fcc91756.c8d038",\r
+        "wires": [\r
+            [\r
+                "d31ddaea.690348",\r
+                "bbbca45f.8e2228",\r
+                "acccc325.a38838"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "73e20b64.41827c",\r
+        "type": "call",\r
+        "name": "call update-tp-ttp-relationship",\r
+        "xml": "<call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3270,\r
+        "y": 389,\r
+        "z": "fcc91756.c8d038",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "efdac693.289728",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3034,\r
+        "y": 332,\r
+        "z": "fcc91756.c8d038",\r
+        "wires": [\r
+            [\r
+                "6a7f62ea.d32524",\r
+                "73e20b64.41827c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "acccc325.a38838",\r
+        "type": "set",\r
+        "name": "unset network",\r
+        "xml": "<set>\n<parameter name='network.' value='' />\n",\r
+        "comments": "",\r
+        "x": 3614,\r
+        "y": 266,\r
+        "z": "fcc91756.c8d038",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d31ddaea.690348",\r
+        "type": "set",\r
+        "name": "set network",\r
+        "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$netidx].`' />\n",\r
+        "comments": "",\r
+        "x": 3608,\r
+        "y": 314,\r
+        "z": "fcc91756.c8d038",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "bbbca45f.8e2228",\r
+        "type": "switchNode",\r
+        "name": "switch network-types with topologyId",\r
+        "xml": "<switch test='`$network.te-topology-id`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3685,\r
+        "y": 361,\r
+        "z": "fcc91756.c8d038",\r
+        "wires": [\r
+            [\r
+                "e4f22bce.03ea18",\r
+                "2f6da0f9.e964d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e4f22bce.03ea18",\r
+        "type": "outcome",\r
+        "name": "11",\r
+        "xml": "<outcome value='11'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3911,\r
+        "y": 330,\r
+        "z": "fcc91756.c8d038",\r
+        "wires": [\r
+            [\r
+                "a545d36e.f0b618"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2f6da0f9.e964d8",\r
+        "type": "outcome",\r
+        "name": "33",\r
+        "xml": "<outcome value='33'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3911,\r
+        "y": 391,\r
+        "z": "fcc91756.c8d038",\r
+        "wires": [\r
+            [\r
+                "d2ccc5d0.bc949"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dcbdf3ee.469d4",\r
+        "type": "set",\r
+        "name": "set network-otn",\r
+        "xml": "<set>\n<parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\n",\r
+        "comments": "",\r
+        "x": 4206,\r
+        "y": 330,\r
+        "z": "fcc91756.c8d038",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6a7bd0f0.92b65",\r
+        "type": "set",\r
+        "name": "set network eth",\r
+        "xml": "<set>\n<parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\n",\r
+        "comments": "",\r
+        "x": 4206,\r
+        "y": 391,\r
+        "z": "fcc91756.c8d038",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a545d36e.f0b618",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4045,\r
+        "y": 330,\r
+        "z": "fcc91756.c8d038",\r
+        "wires": [\r
+            [\r
+                "dcbdf3ee.469d4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d2ccc5d0.bc949",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4046,\r
+        "y": 391,\r
+        "z": "fcc91756.c8d038",\r
+        "wires": [\r
+            [\r
+                "6a7bd0f0.92b65"\r
+            ]\r
+        ]\r
     }\r
 ]
\ 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 fb4f302..236bc6a 100644 (file)
--- 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 @@
 [\r
     {\r
-        "id": "5858bb6c.1c5b2c",\r
+        "id": "eb6ce69b.3f957",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 116,\r
+        "x": 248,\r
         "y": 67,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "350dfcb7.24e654"\r
+                "dc110d5e.a3e278"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "350dfcb7.24e654",\r
+        "id": "dc110d5e.a3e278",\r
         "type": "service-logic",\r
         "name": "DataChange ${project.version}",\r
         "module": "DataChange",\r
@@ -22,1444 +22,1885 @@
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 173,\r
+        "x": 305,\r
         "y": 146.888916015625,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "92cd3521.3e4e6"\r
+                "5f52c1a1.066a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92cd3521.3e4e6",\r
+        "id": "5f52c1a1.066a8",\r
         "type": "method",\r
         "name": "method update-network-links-to-aai",\r
         "xml": "<method rpc='update-network-links-to-aai' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 187,\r
+        "x": 319,\r
         "y": 223.22222900390625,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "b665c6f2.69a4d"\r
+                "d4e648b5.a39fa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b665c6f2.69a4d",\r
+        "id": "d4e648b5.a39fa8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 198.33343505859375,\r
+        "x": 330.33343505859375,\r
         "y": 300.7779235839844,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "c59c9b79.9f8cc"\r
+                "e5c5d545.9d86e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f41ff5d9.72c91",\r
+        "id": "367c2dd.186e752",\r
         "type": "update",\r
         "name": "save logical-link with regular id",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1159.111083984375,\r
-        "y": 694.111083984375,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 1205.111083984375,\r
+        "y": 725.111083984375,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c59c9b79.9f8cc",\r
+        "id": "e5c5d545.9d86e8",\r
         "type": "for",\r
         "name": "for each link",\r
         "xml": "<for index='pidx' start='0' end='`$network.link_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 226.88885498046875,\r
+        "x": 358.88885498046875,\r
         "y": 394.33331298828125,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "6d5acc0f.b7df54",\r
-                "8fbc8f1e.fe24c8",\r
-                "915555f.abb44a8",\r
-                "b5320c88.aa407",\r
-                "589a9016.f198c"\r
+                "c535a196.07d77",\r
+                "2b697423.656f74",\r
+                "23c74055.452fd8",\r
+                "357884ff.889364",\r
+                "5d91edd1.3c2f24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d5acc0f.b7df54",\r
+        "id": "c535a196.07d77",\r
         "type": "set",\r
         "name": "set network link's local variables",\r
         "xml": "<set>\n<parameter name='link.' value='`$network.link[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n\n",\r
         "comments": "",\r
-        "x": 559.111083984375,\r
+        "x": 691.111083984375,\r
         "y": 99.22221374511719,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7a38f4d0.9f3e6c",\r
+        "id": "3a0f4814.b217",\r
         "type": "for",\r
         "name": "for each label-restriction",\r
         "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1532.4444580078125,\r
-        "y": 915.111083984375,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 1731.4444580078125,\r
+        "y": 945.111083984375,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "556fc245.d19e3c",\r
-                "d6c13a1b.e798a",\r
-                "69e9f586.641064"\r
+                "2cea987d.04721",\r
+                "76b35791.18f63",\r
+                "2f963aac.304aa6",\r
+                "a173e4f5.f5a478",\r
+                "c921d18d.970b48",\r
+                "15c10484.c4629b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "556fc245.d19e3c",\r
+        "id": "2cea987d.04721",\r
         "type": "set",\r
         "name": "set label-restriction's local variables",\r
-        "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",\r
+        "xml": "<set>\n<parameter name='unique-lrId' value=\"`$unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",\r
         "comments": "",\r
-        "x": 1867.111328125,\r
-        "y": 838.0000610351562,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 2036.111328125,\r
+        "y": 910.0000610351562,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3398d2c0.69ae06",\r
+        "id": "a53b765.67e4408",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2002.4998779296875,\r
-        "y": 882.74609375,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 2149.4998779296875,\r
+        "y": 952.74609375,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "abb716be.3fb59"\r
+                "bcb47eec.4c95d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d46f558.3e53f2",\r
+        "id": "987d5f9c.60006",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2010.178466796875,\r
-        "y": 941.9604187011719,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 2157.178466796875,\r
+        "y": 1011.9604187011719,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "f0df0cf2.e46b6"\r
+                "e46f36b.2789648"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "abb716be.3fb59",\r
+        "id": "bcb47eec.4c95d8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2163,\r
-        "y": 882.0000305175781,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 2310,\r
+        "y": 952.0000305175781,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9aed5c80.54f11",\r
+        "id": "df8ec894.2ce188",\r
         "type": "set",\r
         "name": "set src-ltpId dst-ltpId",\r
         "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`\" />",\r
         "comments": "",\r
-        "x": 2586.5001220703125,\r
+        "x": 2718.5001220703125,\r
         "y": 2414.545135498047,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ce693523.2da318",\r
+        "id": "ed966c58.9421a",\r
         "type": "save",\r
         "name": "save srcLTP relationship in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2620.0001220703125,\r
+        "x": 2752.0001220703125,\r
         "y": 2454.545135498047,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "72343f4d.bac85",\r
+        "id": "c79cef0b.98c06",\r
         "type": "save",\r
         "name": "save dstLTP relationship in AAI",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2620.0001220703125,\r
+        "x": 2752.0001220703125,\r
         "y": 2494.545135498047,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f0df0cf2.e46b6",\r
+        "id": "e46f36b.2789648",\r
         "type": "update",\r
         "name": "save label-restriction",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2194,\r
-        "y": 942.0000305175781,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 2341,\r
+        "y": 1012.0000305175781,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d6c13a1b.e798a",\r
+        "id": "cce10880.3add5",\r
         "type": "save",\r
         "name": "save link relationship to label-restriction in AAI",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1914,\r
-        "y": 792,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 2052,\r
+        "y": 1208,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "69e9f586.641064",\r
+        "id": "76b35791.18f63",\r
         "type": "update",\r
         "name": "save label-restriction",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1811.815185546875,\r
-        "y": 914.5556640625,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 1990.815185546875,\r
+        "y": 984.5556640625,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "3398d2c0.69ae06",\r
-                "3d46f558.3e53f2"\r
+                "a53b765.67e4408",\r
+                "987d5f9c.60006"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c77d572.aa0dd",\r
+        "id": "6bd86154.f4552",\r
         "type": "switchNode",\r
-        "name": "switch te-link-attributes",\r
-        "xml": "<switch test='`$link.te.te-link-attributes.label-restriction`'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1136,\r
-        "y": 870,\r
-        "z": "3cbec5d5.54ea02",\r
-        "wires": [\r
-            [\r
-                "acb46a14.faf1b8",\r
-                "fad2e2be.055cd8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "acb46a14.faf1b8",\r
-        "type": "outcome",\r
-        "name": "Null",\r
-        "xml": "<outcome value=''>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1321,\r
-        "y": 868,\r
-        "z": "3cbec5d5.54ea02",\r
-        "wires": [\r
-            [\r
-                "b663d811.06fad8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "b663d811.06fad8",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>\n",\r
-        "atomic": "false",\r
+        "name": "switch te-link-attributes label-restriction_length",\r
+        "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1476,\r
-        "y": 868,\r
-        "z": "3cbec5d5.54ea02",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "fad2e2be.055cd8",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1325,\r
-        "y": 915,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 1250,\r
+        "y": 945,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "7a38f4d0.9f3e6c"\r
+                "6ededdc5.cf6c8c",\r
+                "ecaf5041.3bee8",\r
+                "5dbfa8d0.65ebe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8fbc8f1e.fe24c8",\r
+        "id": "2b697423.656f74",\r
         "type": "switchNode",\r
         "name": "switch link.destination",\r
         "xml": "<switch test='`$link.destination.dest-node`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 535,\r
+        "x": 667,\r
         "y": 204,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "44b39c00.9558ec",\r
-                "d8a931d0.793fd"\r
+                "6a7d179d.85fe8",\r
+                "e3266b7a.5033d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44b39c00.9558ec",\r
+        "id": "6a7d179d.85fe8",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 739,\r
+        "x": 871,\r
         "y": 165,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "dd848e51.9b8178"\r
+                "ea7811a5.6557e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d8a931d0.793fd",\r
+        "id": "e3266b7a.5033d8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 736,\r
+        "x": 868,\r
         "y": 227,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "bdffabea.a9f78"\r
+                "68cf703d.fdacb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bdffabea.a9f78",\r
+        "id": "68cf703d.fdacb8",\r
         "type": "set",\r
         "name": "set network link's destination variables",\r
         "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",\r
         "comments": "",\r
-        "x": 965,\r
+        "x": 1097,\r
         "y": 190,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d1d8b826.4d04f",\r
+        "id": "d8b9afa9.8c7938",\r
         "type": "set",\r
         "name": "set is-open-ended-link",\r
         "xml": "<set>\n<parameter name='is-open-ended-link' value='true' />\n\n",\r
         "comments": "",\r
-        "x": 1143,\r
+        "x": 1275,\r
         "y": 65,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b17a800b.11d598",\r
+        "id": "4445364b.3ff31",\r
         "type": "save",\r
         "name": "get p-interface from aai",\r
         "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\" >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1146,\r
+        "x": 1278,\r
         "y": 150,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "698d4309.a506a4",\r
-                "c0b09280.fde57",\r
-                "b035740b.82c768"\r
+                "1fabb633.34a7e2",\r
+                "30ce6e4c.0b0d22",\r
+                "78ec6cbb.d8199c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "698d4309.a506a4",\r
+        "id": "1fabb633.34a7e2",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1389,\r
+        "x": 1521,\r
         "y": 145,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "944bf6fb.a03838"\r
+                "f6b85f73.a6bb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c0b09280.fde57",\r
+        "id": "30ce6e4c.0b0d22",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1387,\r
+        "x": 1519,\r
         "y": 234,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "d42c9066.3cdb28"\r
+                "112ae233.6a9666"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4d599ee.a3913",\r
+        "id": "2d37b161.c87e5e",\r
         "type": "set",\r
         "name": "set alternative unique link id",\r
         "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",\r
         "comments": "",\r
-        "x": 2062,\r
+        "x": 2194,\r
         "y": 162,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d42c9066.3cdb28",\r
+        "id": "112ae233.6a9666",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1556,\r
+        "x": 1688,\r
         "y": 235,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f65cb67d.b3d368",\r
+        "id": "b25a39cd.f52a6",\r
         "type": "save",\r
         "name": "get logical-link from aai",\r
         "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\" >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 854,\r
+        "x": 986,\r
         "y": 671,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "48397109.a69d68",\r
-                "efa56bf.4c6db98"\r
+                "2eac00b.0ddcd8",\r
+                "cef26741.44e878"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b035740b.82c768",\r
+        "id": "78ec6cbb.d8199c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1398.490966796875,\r
+        "x": 1530.490966796875,\r
         "y": 187.57403564453125,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "6959706d.7f87e8"\r
+                "cc3c7aa7.507dd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6959706d.7f87e8",\r
+        "id": "cc3c7aa7.507dd8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1552.0623779296875,\r
+        "x": 1684.0623779296875,\r
         "y": 190.85977172851562,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "954c1d48.971018",\r
+        "id": "339fe7b3.ae4e",\r
         "type": "switchNode",\r
         "name": "switch is-open-ended-link",\r
         "xml": "<switch test='`$is-open-ended-link`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 433,\r
+        "x": 565,\r
         "y": 710,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "4e6e74a5.e8af4c",\r
-                "53a87226.590744"\r
+                "7bffce42.060d68",\r
+                "601fa3d8.aedcac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e6e74a5.e8af4c",\r
+        "id": "7bffce42.060d68",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 650,\r
+        "x": 782,\r
         "y": 732,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "2e08f3a1.53987c"\r
+                "d9f05462.4a8968"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "53a87226.590744",\r
+        "id": "601fa3d8.aedcac",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 653,\r
+        "x": 785,\r
         "y": 672,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "f65cb67d.b3d368"\r
+                "b25a39cd.f52a6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48397109.a69d68",\r
+        "id": "2eac00b.0ddcd8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1098,\r
+        "x": 1230,\r
         "y": 341,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "b240875.e435ff8"\r
+                "d26336.070c9cc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "efa56bf.4c6db98",\r
+        "id": "cef26741.44e878",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1123.490966796875,\r
+        "x": 1255.490966796875,\r
         "y": 536.5740356445312,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "ef51ee2a.cafb5"\r
+                "1417b1e7.adccae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "842144b1.a1cb2",\r
+        "id": "c9f57eec.3fa43",\r
         "type": "update",\r
         "name": "save logical-link with alternative link id",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1595,\r
+        "x": 1727,\r
         "y": 558,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2e08f3a1.53987c",\r
+        "id": "d9f05462.4a8968",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 828,\r
+        "x": 960,\r
         "y": 740,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "f41ff5d9.72c91",\r
-                "9c77d572.aa0dd",\r
-                "dc4f90cd.605cd",\r
-                "a0d07820.dfe9c"\r
+                "367c2dd.186e752",\r
+                "6bd86154.f4552",\r
+                "8c3bc53e.020c3",\r
+                "3b98d33.38a2bac",\r
+                "9f4e28fe.9e925"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b973.4170168dc",\r
+        "id": "882e1409.701ce8",\r
         "type": "save",\r
         "name": "update dest TP by putting src TP of the current link",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2509,\r
+        "x": 2641,\r
         "y": 387,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "46117ab.f8f0504",\r
-                "46594b42.a6ff04"\r
+                "a1bfa8c8.032428",\r
+                "4552885e.7227f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "34901df.74cf7e2",\r
+        "id": "7c1006a1.c0bf28",\r
         "type": "save",\r
         "name": "save source and dest TP",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1119,\r
-        "y": 1068,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 1190,\r
+        "y": 1179,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dd848e51.9b8178",\r
+        "id": "ea7811a5.6557e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 927,\r
+        "x": 1059,\r
         "y": 126,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "d1d8b826.4d04f",\r
-                "b17a800b.11d598",\r
-                "9d4a7a95.ca2e88"\r
+                "d8b9afa9.8c7938",\r
+                "4445364b.3ff31",\r
+                "78b9c95f.ae17e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef51ee2a.cafb5",\r
+        "id": "1417b1e7.adccae",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1312,\r
+        "x": 1444,\r
         "y": 539,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "842144b1.a1cb2",\r
-                "9ab70c9.3d83df",\r
-                "dd8767a.3acd918"\r
+                "c9f57eec.3fa43",\r
+                "fe6e139a.88d838",\r
+                "1e861048.9f807",\r
+                "fc9bbbc9.76dd6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ab70c9.3d83df",\r
+        "id": "fe6e139a.88d838",\r
         "type": "save",\r
         "name": "save source only",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1524,\r
+        "x": 1656,\r
         "y": 619,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ec4710d1.a4614",\r
+        "id": "ed1851cd.c2d2d",\r
         "type": "for",\r
         "name": "for each label-restriction",\r
         "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1930,\r
-        "y": 702,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 2183,\r
+        "y": 745,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "5f4e6661.8be42",\r
-                "bf1c8950.f6775",\r
-                "869edf38.84c148"\r
+                "bf2a36f0.0411c",\r
+                "1a178b14.9ad4dd",\r
+                "13838be4.d07ac4",\r
+                "ec158e78.eb2b58",\r
+                "a3570d8f.6b641",\r
+                "1375d0c1.e8bf07"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f4e6661.8be42",\r
+        "id": "bf2a36f0.0411c",\r
         "type": "set",\r
         "name": "set label-restriction's local variables",\r
-        "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",\r
+        "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n",\r
         "comments": "",\r
-        "x": 2347.6669921875,\r
-        "y": 657.8889770507812,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 2473.6669921875,\r
+        "y": 623.8889770507812,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7135b68.c08c3c8",\r
+        "id": "eb573572.449a5",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2483.0555419921875,\r
+        "x": 2615.0555419921875,\r
         "y": 702.635009765625,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "2043dae3.034356"\r
+                "80720656.40f1f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "69007117.c84f9",\r
+        "id": "e5ad824b.fd1c3",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2490.734130859375,\r
+        "x": 2622.734130859375,\r
         "y": 761.8493347167969,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "30f94010.a2f0b"\r
+                "75cc9002.94bbf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2043dae3.034356",\r
+        "id": "80720656.40f1f8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2643.5556640625,\r
+        "x": 2775.5556640625,\r
         "y": 701.8889465332031,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "30f94010.a2f0b",\r
+        "id": "75cc9002.94bbf8",\r
         "type": "update",\r
         "name": "save label-restriction",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2674.5556640625,\r
+        "x": 2806.5556640625,\r
         "y": 761.8889465332031,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bf1c8950.f6775",\r
+        "id": "cb668db0.48c4b",\r
         "type": "save",\r
         "name": "save link relationship to label-restriction in AAI",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2369.5556640625,\r
-        "y": 815.888916015625,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 2482.5556640625,\r
+        "y": 894.888916015625,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "869edf38.84c148",\r
+        "id": "1a178b14.9ad4dd",\r
         "type": "update",\r
         "name": "save label-restriction",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2292.370849609375,\r
+        "x": 2424.370849609375,\r
         "y": 734.444580078125,\r
-        "z": "3cbec5d5.54ea02",\r
-        "wires": [\r
-            [\r
-                "7135b68.c08c3c8",\r
-                "69007117.c84f9"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "dd8767a.3acd918",\r
-        "type": "switchNode",\r
-        "name": "switch te-link-attributes",\r
-        "xml": "<switch test='`$link.te.te-link-attributes.label-restriction`'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1529.5555419921875,\r
-        "y": 657.888916015625,\r
-        "z": "3cbec5d5.54ea02",\r
-        "wires": [\r
-            [\r
-                "2ac06a2f.120e4e",\r
-                "45e6587f.a583a"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "2ac06a2f.120e4e",\r
-        "type": "outcome",\r
-        "name": "Null",\r
-        "xml": "<outcome value=''>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1718.5555419921875,\r
-        "y": 628.888916015625,\r
-        "z": "3cbec5d5.54ea02",\r
-        "wires": [\r
-            [\r
-                "5884f4a0.224604"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "5884f4a0.224604",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>\n",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1878.5555419921875,\r
-        "y": 627.888916015625,\r
-        "z": "3cbec5d5.54ea02",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "45e6587f.a583a",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1722.5555419921875,\r
-        "y": 701.888916015625,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "ec4710d1.a4614"\r
+                "eb573572.449a5",\r
+                "e5ad824b.fd1c3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "915555f.abb44a8",\r
+        "id": "23c74055.452fd8",\r
         "type": "set",\r
         "name": "set more local variables",\r
         "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",\r
         "comments": "",\r
-        "x": 536,\r
+        "x": 668,\r
         "y": 149,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e4a47b8d.470f98",\r
+        "id": "93546ba2.1bedb8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1478,\r
+        "x": 1610,\r
         "y": 62,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "944bf6fb.a03838",\r
+        "id": "f6b85f73.a6bb",\r
         "type": "switchNode",\r
         "name": "switch inter-domain-plug-id of the src tp",\r
         "xml": "<switch test='`$tmp.aai.p-interface.inter-domain-plug-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1628,\r
+        "x": 1760,\r
         "y": 142,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "757c7b80.d77ff4",\r
-                "a7e52125.cd95a"\r
+                "905e14d2.8e13d",\r
+                "56d86a80.47b554"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "757c7b80.d77ff4",\r
+        "id": "905e14d2.8e13d",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1858,\r
+        "x": 1990,\r
         "y": 89,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "ed9b2776.e3f"\r
+                "39191ee3.a2421a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a7e52125.cd95a",\r
+        "id": "56d86a80.47b554",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1862,\r
+        "x": 1994,\r
         "y": 162,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "d4d599ee.a3913"\r
+                "2d37b161.c87e5e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ed9b2776.e3f",\r
+        "id": "39191ee3.a2421a",\r
         "type": "set",\r
         "name": "unset is-open-ended-link",\r
         "xml": "<set>\n<parameter name='is-open-ended-link' value='false' />\n<parameter name='is-invalid-open-ended-link' value='true' />\n\n",\r
         "comments": "",\r
-        "x": 2046,\r
+        "x": 2178,\r
         "y": 85,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "952d829a.9e04c8",\r
+        "id": "1ecef5c2.0f02ca",\r
         "type": "save",\r
         "name": "delete logical-link",\r
         "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\" \n\tkey=\"logical-link.link-name = $tmp.link-name\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2027,\r
+        "x": 2159,\r
         "y": 34,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b5320c88.aa407",\r
+        "id": "357884ff.889364",\r
         "type": "set",\r
         "name": "unset network link's local variables",\r
         "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",\r
         "comments": "",\r
-        "x": 564,\r
+        "x": 696,\r
         "y": 41,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1c31f66.0ec5b8a",\r
+        "id": "37660aa6.c865c6",\r
         "type": "switchNode",\r
         "name": "switch is-invalid-open-ended-link",\r
         "xml": "<switch test='`$is-invalid-open-ended-link`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 715,\r
-        "y": 1046,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 786,\r
+        "y": 1157,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "59b5f613.5fe9d8",\r
-                "a603a990.7bb358"\r
+                "f54e3efd.634a38",\r
+                "8022555f.169df8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a603a990.7bb358",\r
+        "id": "8022555f.169df8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 922,\r
-        "y": 1014,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 993,\r
+        "y": 1125,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "9ab8714a.2092f"\r
+                "e44bc7ce.ed35b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "59b5f613.5fe9d8",\r
+        "id": "f54e3efd.634a38",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 919,\r
-        "y": 1074,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 990,\r
+        "y": 1185,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "34901df.74cf7e2"\r
+                "7c1006a1.c0bf28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ab8714a.2092f",\r
+        "id": "e44bc7ce.ed35b8",\r
         "type": "save",\r
         "name": "save source only",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1102,\r
-        "y": 1013,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 1173,\r
+        "y": 1124,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5352bd62.ccf79c",\r
+        "id": "6e0155a0.4236dc",\r
         "type": "switchNode",\r
         "name": "switch relationship-list_length",\r
         "xml": "<switch test='`$tmp.aai.logical-link.relationship-list_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1370,\r
+        "x": 1502,\r
         "y": 314,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "eff4d21d.288088",\r
-                "37404956.35d1ce",\r
-                "8c968f09.e16c4"\r
+                "c6d7c8ac.8edfe",\r
+                "e1f14b0f.6d7378",\r
+                "863a7ad.fb20188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c9276d9.9299c2",\r
+        "id": "64886b03.3e43e4",\r
         "type": "switchNode",\r
         "name": "switch relationship-list_length != $src-tpId",\r
         "xml": "<switch test='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value != $src-tpId`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1821,\r
+        "x": 1953,\r
         "y": 328,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "267a2f8f.07cbd"\r
+                "b3998350.44919"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eff4d21d.288088",\r
+        "id": "c6d7c8ac.8edfe",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1588,\r
+        "x": 1720,\r
         "y": 273,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "984dee72.e9354"\r
+                "ae0ebd2c.ab0408"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37404956.35d1ce",\r
+        "id": "e1f14b0f.6d7378",\r
         "type": "outcome",\r
         "name": "1",\r
         "xml": "<outcome value='1'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1585,\r
+        "x": 1717,\r
         "y": 310,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "2c9276d9.9299c2"\r
+                "64886b03.3e43e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c968f09.e16c4",\r
+        "id": "863a7ad.fb20188",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1595,\r
+        "x": 1727,\r
         "y": 384,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "978f2fad.844c4"\r
+                "8fdcd683.3660b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "978f2fad.844c4",\r
+        "id": "8fdcd683.3660b",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1732,\r
+        "x": 1864,\r
         "y": 385,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "a65b0566.f99d28"\r
+                "ec1a3a53.fa7ff8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "984dee72.e9354",\r
+        "id": "ae0ebd2c.ab0408",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1730,\r
+        "x": 1862,\r
         "y": 281,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "3177c841.0c8"\r
+                "c29cb556.f4deb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "589a9016.f198c",\r
+        "id": "5d91edd1.3c2f24",\r
         "type": "switchNode",\r
         "name": "switch is-invalid-open-ended-link",\r
         "xml": "<switch test='`$is-invalid-open-ended-link`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 431,\r
+        "x": 563,\r
         "y": 538,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "68d44b36.10ebc4",\r
-                "b635b7a2.550c68"\r
+                "62e07412.96bbe4",\r
+                "db9d2b02.3f6e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b635b7a2.550c68",\r
+        "id": "db9d2b02.3f6e5",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 638,\r
+        "x": 770,\r
         "y": 506,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "a2f767e6.1afe7"\r
+                "7150962.0cacbe8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "68d44b36.10ebc4",\r
+        "id": "62e07412.96bbe4",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 635,\r
+        "x": 767,\r
         "y": 566,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "954c1d48.971018"\r
+                "339fe7b3.ae4e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a2f767e6.1afe7",\r
+        "id": "7150962.0cacbe8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 789,\r
+        "x": 921,\r
         "y": 506,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dc4f90cd.605cd",\r
+        "id": "8c3bc53e.020c3",\r
         "type": "save",\r
         "name": "save source and dest TP",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1129,\r
-        "y": 791,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 1188,\r
+        "y": 828,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "267a2f8f.07cbd",\r
+        "id": "b3998350.44919",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2068,\r
+        "x": 2200,\r
         "y": 319,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a0d07820.dfe9c",\r
+        "id": "3b98d33.38a2bac",\r
         "type": "record",\r
         "name": "log file",\r
         "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    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1074,\r
-        "y": 739,\r
-        "z": "3cbec5d5.54ea02",\r
+        "x": 1133,\r
+        "y": 773,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9d4a7a95.ca2e88",\r
+        "id": "78b9c95f.ae17e8",\r
         "type": "set",\r
         "name": "unset tmp.aai.p-interface",\r
         "xml": "<set>\n<parameter name='tmp.aai.p-interface' value='' />\n<parameter name='tmp.aai.p-interface.inter-domain-plug-id' value='' />\n\n",\r
         "comments": "",\r
-        "x": 1144,\r
+        "x": 1276,\r
         "y": 103,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6cbb9c56.a1a2b4",\r
+        "id": "c7f9432f.fc4c28",\r
         "type": "record",\r
         "name": "log file",\r
         "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    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2384,\r
+        "x": 2516,\r
         "y": 291,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b240875.e435ff8",\r
+        "id": "d26336.070c9cc8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2060,\r
+        "x": 2192,\r
         "y": 536,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "6cbb9c56.a1a2b4",\r
-                "6b973.4170168dc"\r
+                "c7f9432f.fc4c28",\r
+                "882e1409.701ce8",\r
+                "6e4bc51.b0c9dbc",\r
+                "7a9fabbe.629c44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "46117ab.f8f0504",\r
+        "id": "a1bfa8c8.032428",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2798,\r
+        "x": 2930,\r
         "y": 357,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "f6743dce.4b9b98"\r
+                "c9e17582.5ea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "46594b42.a6ff04",\r
+        "id": "4552885e.7227f8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2805.6785888671875,\r
+        "x": 2937.6785888671875,\r
         "y": 416.2143249511719,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "fa1c4b7d.8445b"\r
+                "de1c7c10.d4de68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f6743dce.4b9b98",\r
+        "id": "c9e17582.5ea8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2946,\r
+        "x": 3078,\r
         "y": 352,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "1261d503.e1a3cb"\r
+                "747beccb.60a274"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1261d503.e1a3cb",\r
+        "id": "747beccb.60a274",\r
         "type": "record",\r
         "name": "log file",\r
         "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    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3091,\r
+        "x": 3223,\r
         "y": 352,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fa1c4b7d.8445b",\r
+        "id": "de1c7c10.d4de68",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2953,\r
+        "x": 3085,\r
         "y": 414,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             [\r
-                "8f51aa8d.73ba38"\r
+                "81d2a002.7c0388"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3177c841.0c8",\r
+        "id": "c29cb556.f4deb8",\r
         "type": "record",\r
         "name": "log file",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1866,\r
+        "x": 1998,\r
         "y": 279,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a65b0566.f99d28",\r
+        "id": "ec1a3a53.fa7ff8",\r
         "type": "record",\r
         "name": "log file",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1877,\r
+        "x": 2009,\r
         "y": 394,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8f51aa8d.73ba38",\r
+        "id": "81d2a002.7c0388",\r
         "type": "record",\r
         "name": "log file",\r
         "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    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3098,\r
+        "x": 3230,\r
         "y": 414,\r
-        "z": "3cbec5d5.54ea02",\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "6ededdc5.cf6c8c",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1544,\r
+        "y": 843,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            [\r
+                "13eb321c.419dee"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ecaf5041.3bee8",\r
+        "type": "outcome",\r
+        "name": "length 0",\r
+        "xml": "<outcome value='0'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1546,\r
+        "y": 891,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            [\r
+                "13eb321c.419dee"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5dbfa8d0.65ebe",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1543,\r
+        "y": 945,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            [\r
+                "3a0f4814.b217"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "13eb321c.419dee",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1699,\r
+        "y": 843,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "1e861048.9f807",\r
+        "type": "switchNode",\r
+        "name": "switch te-link-attributes label-restriction_length",\r
+        "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1725,\r
+        "y": 736,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            [\r
+                "f4fbab89.9ba908",\r
+                "7dc7ac6a.dc9714",\r
+                "4d8c04cc.f4e3d4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f4fbab89.9ba908",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1997,\r
+        "y": 646,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            [\r
+                "bc7188dd.cc9d18"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bc7188dd.cc9d18",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2152,\r
+        "y": 646,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "7dc7ac6a.dc9714",\r
+        "type": "outcome",\r
+        "name": "length 0",\r
+        "xml": "<outcome value='0'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1999,\r
+        "y": 694,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            [\r
+                "bc7188dd.cc9d18"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4d8c04cc.f4e3d4",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1998,\r
+        "y": 745,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            [\r
+                "ed1851cd.c2d2d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "13838be4.d07ac4",\r
+        "type": "set",\r
+        "name": "unset label-restriction's local variables",\r
+        "xml": "<set>\n<parameter name='label-restriction.' value='' />\n<parameter name='unique-lrId' value=\"\" />\n",\r
+        "comments": "",\r
+        "x": 2479,\r
+        "y": 572,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "2f963aac.304aa6",\r
+        "type": "set",\r
+        "name": "unset label-restriction's local variables",\r
+        "xml": "<set>\n<parameter name='label-restriction.' value='' />\n<parameter name='unique-lrId' value=\"\" />\n",\r
+        "comments": "",\r
+        "x": 2033,\r
+        "y": 799,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6e4bc51.b0c9dbc",\r
+        "type": "switchNode",\r
+        "name": "switch te-link-attributes label-restriction_length",\r
+        "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2817,\r
+        "y": 523,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            [\r
+                "30a1d0ca.e887a",\r
+                "92fd4ff1.3a409",\r
+                "389e55ce.061fe2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "30a1d0ca.e887a",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3087,\r
+        "y": 485,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            [\r
+                "5dda79fd.751e4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5dda79fd.751e4",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3242,\r
+        "y": 485,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "92fd4ff1.3a409",\r
+        "type": "outcome",\r
+        "name": "length 0",\r
+        "xml": "<outcome value='0'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3089,\r
+        "y": 533,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            [\r
+                "5dda79fd.751e4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "389e55ce.061fe2",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3088,\r
+        "y": 584,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            [\r
+                "bc1a2664.a26998"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bc1a2664.a26998",\r
+        "type": "for",\r
+        "name": "for each label-restriction",\r
+        "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3273,\r
+        "y": 584,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            [\r
+                "bc3590a8.aace38",\r
+                "c370620b.230e48",\r
+                "a5a0665d.651de8",\r
+                "1ab3f9a3.2d2bce",\r
+                "fed3d208.8682f8",\r
+                "864febfd.65faf"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a5a0665d.651de8",\r
+        "type": "set",\r
+        "name": "unset label-restriction's local variables",\r
+        "xml": "<set>\n<parameter name='label-restriction.' value='' />\n<parameter name='unique-lrId' value=\"\" />\n",\r
+        "comments": "",\r
+        "x": 3571,\r
+        "y": 399,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "bc3590a8.aace38",\r
+        "type": "set",\r
+        "name": "set label-restriction's local variables",\r
+        "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n",\r
+        "comments": "",\r
+        "x": 3560.6669921875,\r
+        "y": 445.88897705078125,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c370620b.230e48",\r
+        "type": "update",\r
+        "name": "save label-restriction",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3514.370849609375,\r
+        "y": 573.444580078125,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            [\r
+                "fa7d62b3.003ef",\r
+                "8c2cda96.78942"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bad7ff54.e113a8",\r
+        "type": "save",\r
+        "name": "save link relationship to label-restriction in AAI",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3588.5556640625,\r
+        "y": 757.888916015625,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "fa7d62b3.003ef",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3705.0555419921875,\r
+        "y": 541.635009765625,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            [\r
+                "ee15e7b0.52d0f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8c2cda96.78942",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3712.734130859375,\r
+        "y": 600.8493347167969,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            [\r
+                "ed52377e.4eb4a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ee15e7b0.52d0f8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3865.5556640625,\r
+        "y": 540.8889465332031,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "ed52377e.4eb4a",\r
+        "type": "update",\r
+        "name": "save label-restriction",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3896.5556640625,\r
+        "y": 600.8889465332031,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "1ab3f9a3.2d2bce",\r
+        "type": "set",\r
+        "name": "set label-restriction's local variables",\r
+        "xml": "<set>\n<parameter name='unique-lrId' value=\"`$alt-unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",\r
+        "comments": "",\r
+        "x": 3561,\r
+        "y": 495,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ec158e78.eb2b58",\r
+        "type": "set",\r
+        "name": "set label-restriction's local variables",\r
+        "xml": "<set>\n<parameter name='unique-lrId' value=\"`$alt-unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",\r
+        "comments": "",\r
+        "x": 2475,\r
+        "y": 664,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a173e4f5.f5a478",\r
+        "type": "set",\r
+        "name": "set label-restriction's local variables",\r
+        "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n",\r
+        "comments": "",\r
+        "x": 2030,\r
+        "y": 851,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "9f4e28fe.9e925",\r
+        "type": "update",\r
+        "name": "save te-link-attribute",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1171,\r
+        "y": 873,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "15c10484.c4629b",\r
+        "type": "save",\r
+        "name": "save te-link-attribute relationship to label-restriction",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2062,\r
+        "y": 1142,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "c921d18d.970b48",\r
+        "type": "save",\r
+        "name": "save te-link-attribute relationship to logical-link in AAI",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2071,\r
+        "y": 1082,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "fc9bbbc9.76dd6",\r
+        "type": "update",\r
+        "name": "save te-link-attribute",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1662,\r
+        "y": 671,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "7a9fabbe.629c44",\r
+        "type": "update",\r
+        "name": "update te-link-attribute",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2542,\r
+        "y": 456,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "a3570d8f.6b641",\r
+        "type": "save",\r
+        "name": "save te-link-attribute relationship to logical-link in AAI",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2507,\r
+        "y": 802,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "1375d0c1.e8bf07",\r
+        "type": "save",\r
+        "name": "save te-link-attribute relationship to label-restriction",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2500,\r
+        "y": 848,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "864febfd.65faf",\r
+        "type": "save",\r
+        "name": "save te-link-attribute relationship to label-restriction",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3597,\r
+        "y": 700,\r
+        "z": "42ade40f.4fa29c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "fed3d208.8682f8",\r
+        "type": "save",\r
+        "name": "save te-link-attribute relationship to logical-link in AAI",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3604,\r
+        "y": 654,\r
+        "z": "42ade40f.4fa29c",\r
         "wires": [\r
             []\r
         ]\r

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 786fef5..7b6731c 100644 (file)
--- 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",\r
                 "75113293.98ea0c",\r
                 "9937b93d.ff5938",\r
-                "55dde830.cc61b8"\r
+                "55dde830.cc61b8",\r
+                "f7667eb6.ec8938"\r
             ]\r
         ]\r
     },\r
@@ -159,7 +160,8 @@
                 "3c657cae.66477c",\r
                 "2e1dc2b9.f23686",\r
                 "8c144095.b1eaf8",\r
-                "9abbad80.6c0f7"\r
+                "9abbad80.6c0f7",\r
+                "ef702ba5.ac71e"\r
             ]\r
         ]\r
     },\r
@@ -169,8 +171,8 @@
         "name": "set termination point",\r
         "xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",\r
         "comments": "",\r
-        "x": 1550.111328125,\r
-        "y": 536.0000457763672,\r
+        "x": 1549.111328125,\r
+        "y": 557.0000610351562,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
@@ -178,11 +180,11 @@
         "id": "8c144095.b1eaf8",\r
         "type": "save",\r
         "name": "save p-interface",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1533.815185546875,\r
-        "y": 628.5556030273438,\r
+        "x": 1543.815185546875,\r
+        "y": 744.5556030273438,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
@@ -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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1367.703857421875,\r
-        "y": 779.3333740234375,\r
+        "x": 1626.703857421875,\r
+        "y": 901.3333740234375,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
@@ -211,8 +213,8 @@
         "name": "set unique-ltpId",\r
         "xml": "<set>\n<parameter name='unique-ltpId' value=\"`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`\" />\n",\r
         "comments": "",\r
-        "x": 1534.000244140625,\r
-        "y": 570.1111145019531,\r
+        "x": 1533.000244140625,\r
+        "y": 614.111083984375,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
@@ -220,11 +222,11 @@
         "id": "8c187a81.9e4d28",\r
         "type": "execute",\r
         "name": "execute",\r
-        "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    ",\r
+        "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    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 640.9935302734375,\r
-        "y": 83.99349975585938,\r
+        "x": 641.9935302734375,\r
+        "y": 41.993499755859375,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
@@ -251,8 +253,8 @@
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1705.499885559082,\r
-        "y": 615.7460784912109,\r
+        "x": 1715.499885559082,\r
+        "y": 731.7460784912109,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
@@ -267,8 +269,8 @@
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1699.1784744262695,\r
-        "y": 667.9603900909424,\r
+        "x": 1709.1784744262695,\r
+        "y": 783.9603900909424,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
@@ -284,8 +286,8 @@
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1856.0000457763672,\r
-        "y": 615.0000095367432,\r
+        "x": 1866.0000457763672,\r
+        "y": 731.0000095367432,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
@@ -295,11 +297,11 @@
         "id": "66113f50.7819f8",\r
         "type": "update",\r
         "name": "update p-interface",\r
-        "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`' />",\r
+        "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`' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1885,\r
-        "y": 669,\r
+        "x": 1895,\r
+        "y": 785,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
@@ -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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1617,\r
-        "y": 728,\r
+        "x": 1627,\r
+        "y": 844,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
@@ -674,8 +676,8 @@
         "name": "unset termination point",\r
         "xml": "<set>\n<parameter name='tp.' value='' />\n",\r
         "comments": "",\r
-        "x": 1549,\r
-        "y": 491,\r
+        "x": 1561,\r
+        "y": 500,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
@@ -749,5 +751,151 @@
         "wires": [\r
             []\r
         ]\r
+    },\r
+    {\r
+        "id": "b9a378e9.3ee13",\r
+        "type": "execute",\r
+        "name": "execute Base64 Converter",\r
+        "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    ",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2027,\r
+        "y": 669,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            [\r
+                "1cdf8713.954a51",\r
+                "3754d4b.0357eac"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ef702ba5.ac71e",\r
+        "type": "switchNode",\r
+        "name": "switch inter-domain-plug-id empty?",\r
+        "xml": "<switch test='`length($tp.te.inter-domain-plug-id) == 0`'>\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1597,\r
+        "y": 670,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            [\r
+                "95523b36.e61fe",\r
+                "a2f27028.9e578"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a2f27028.9e578",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1824,\r
+        "y": 623,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            [\r
+                "ce508a28.fe217"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "95523b36.e61fe",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1825,\r
+        "y": 669,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            [\r
+                "b9a378e9.3ee13"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ce508a28.fe217",\r
+        "type": "set",\r
+        "name": "unset tmp.decoded-plug-id",\r
+        "xml": "<set>\n<parameter name='tmp.decoded-plug-id' value='' />\n",\r
+        "comments": "",\r
+        "x": 2028,\r
+        "y": 623,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1cdf8713.954a51",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2232,\r
+        "y": 646,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            [\r
+                "611d993d.82c5c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3754d4b.0357eac",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2225.6785888671875,\r
+        "y": 698.2143115997314,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            [\r
+                "495bfe4.4b1a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "611d993d.82c5c",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2373,\r
+        "y": 646,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "495bfe4.4b1a",\r
+        "type": "set",\r
+        "name": "unset tmp.decoded-plug-id",\r
+        "xml": "<set>\n<parameter name='tmp.decoded-plug-id' value='`$tp.te.inter-domain-plug-id`' />\n",\r
+        "comments": "",\r
+        "x": 2432,\r
+        "y": 698,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f7667eb6.ec8938",\r
+        "type": "set",\r
+        "name": "set tmp.network-if",\r
+        "xml": "<set>\n<parameter name='tmp.network-id' value=\"`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 667,\r
+        "y": 83,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": []\r
     }\r
 ]
\ 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 cec126c..1ef85f5 100644 (file)
--- 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 @@
 [\r
     {\r
-        "id": "f3ed8bda.981eb",\r
+        "id": "db76d876.619d4",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 126,\r
-        "y": 86.00650024414062,\r
-        "z": "8966128c.40fc9",\r
+        "x": 107,\r
+        "y": 76,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": [\r
             [\r
-                "1edaf826.be0fa"\r
+                "ac7d0d8e.d68168"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1edaf826.be0fa",\r
+        "id": "ac7d0d8e.d68168",\r
         "type": "service-logic",\r
         "name": "DataChange ${project.version}",\r
         "module": "DataChange",\r
@@ -22,330 +22,504 @@
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 215.00003051757812,\r
-        "y": 176.89541244506836,\r
-        "z": "8966128c.40fc9",\r
+        "x": 196.00003051757812,\r
+        "y": 166.88891220092773,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": [\r
             [\r
-                "3d56f688.012602"\r
+                "15add1ed.67bb06"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d56f688.012602",\r
+        "id": "15add1ed.67bb06",\r
         "type": "method",\r
         "name": "method update-tp-ttp-relationship",\r
         "xml": "<method rpc='update-tp-ttp-relationship' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 251.1112518310547,\r
-        "y": 247.2287368774414,\r
-        "z": "8966128c.40fc9",\r
+        "x": 232.1112518310547,\r
+        "y": 237.22223663330078,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": [\r
             [\r
-                "91a7d40.f3c79b"\r
+                "2ef3d64c.d8633a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91a7d40.f3c79b",\r
+        "id": "2ef3d64c.d8633a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 476.33343505859375,\r
-        "y": 246.784423828125,\r
-        "z": "8966128c.40fc9",\r
+        "x": 457.33343505859375,\r
+        "y": 236.77792358398438,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": [\r
             [\r
-                "44cf69ab.02fc28",\r
-                "6f71423b.e63cac",\r
-                "8b1ad0d7.d3282"\r
+                "929780.1985e88",\r
+                "25858afe.2b9bce",\r
+                "e912429a.04b788"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f71423b.e63cac",\r
+        "id": "25858afe.2b9bce",\r
         "type": "for",\r
         "name": "for each node in network-eth",\r
         "xml": "<for index='pethidx' start='0' end='`$network-eth.node_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 708.8888549804688,\r
-        "y": 201.33981323242188,\r
-        "z": "8966128c.40fc9",\r
+        "x": 689.8888549804688,\r
+        "y": 191.33331298828125,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": [\r
             [\r
-                "c451c605.7ae0a",\r
-                "70ab1d73.78dfa4",\r
-                "7bcb2ba2.9953f4"\r
+                "9ceedf0.da974a",\r
+                "2a93e407.ae18bc",\r
+                "e6e033d7.96653"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c451c605.7ae0a",\r
+        "id": "9ceedf0.da974a",\r
         "type": "set",\r
         "name": "set node-eth",\r
         "xml": "<set>\n<parameter name='node-eth.' value='`$network-eth.node[$pethidx].`' />",\r
         "comments": "",\r
-        "x": 992.111083984375,\r
-        "y": 108.22871398925781,\r
-        "z": "8966128c.40fc9",\r
+        "x": 973.111083984375,\r
+        "y": 98.22221374511719,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": []\r
     },\r
     {\r
-        "id": "70ab1d73.78dfa4",\r
-        "type": "for",\r
-        "name": "for each termination point",\r
-        "xml": "<for index='tidx' start='0' end='`$node-eth.termination-point_length`' >\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 941.4444580078125,\r
-        "y": 364.1175842285156,\r
-        "z": "8966128c.40fc9",\r
-        "wires": [\r
-            [\r
-                "ae76cdd8.d0a408",\r
-                "f5cb00b6.301068",\r
-                "a58125ba.f3ece",\r
-                "6948417f.bffae",\r
-                "eb8eee0c.443eb8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "ae76cdd8.d0a408",\r
+        "id": "79b02bc6.8ef74c",\r
         "type": "set",\r
         "name": "set termination point tp-eth",\r
         "xml": "<set>\n<parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />\n",\r
         "comments": "",\r
-        "x": 1213.111328125,\r
-        "y": 235.00656127929688,\r
-        "z": "8966128c.40fc9",\r
+        "x": 1194.111328125,\r
+        "y": 225.00006103515625,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f5cb00b6.301068",\r
+        "id": "53e75306.b60214",\r
         "type": "set",\r
         "name": "set unique-ltpethId",\r
         "xml": "<set>\n<parameter name='unique-ltpethId' value=\"`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`\" />\n",\r
         "comments": "",\r
-        "x": 1191.000244140625,\r
-        "y": 272.1175842285156,\r
-        "z": "8966128c.40fc9",\r
+        "x": 1172.000244140625,\r
+        "y": 262.111083984375,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": []\r
     },\r
     {\r
-        "id": "44cf69ab.02fc28",\r
+        "id": "929780.1985e88",\r
         "type": "execute",\r
         "name": "execute set tmp.network-eth.network-id",\r
         "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    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 666.9935302734375,\r
-        "y": 66,\r
-        "z": "8966128c.40fc9",\r
+        "x": 647.9935302734375,\r
+        "y": 55.993499755859375,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7bcb2ba2.9953f4",\r
+        "id": "2a93e407.ae18bc",\r
         "type": "set",\r
         "name": "set local variables",\r
         "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",\r
         "comments": "",\r
-        "x": 991,\r
-        "y": 156.00650024414062,\r
-        "z": "8966128c.40fc9",\r
+        "x": 972,\r
+        "y": 146,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8b1ad0d7.d3282",\r
+        "id": "e912429a.04b788",\r
         "type": "execute",\r
         "name": "execute set tmp.network-otn.network-id",\r
         "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    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 664,\r
-        "y": 105.00650024414062,\r
-        "z": "8966128c.40fc9",\r
+        "x": 645,\r
+        "y": 95,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3e8d4c9d.81492c",\r
+        "id": "8be3e429.ccb7d",\r
         "type": "for",\r
         "name": "for each tunnel termination point in otn",\r
-        "xml": "<for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >\n",\r
+        "xml": "<for index='ttidx' start='0' end='`$node-otn.te.tunnel-termination-point_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1567,\r
-        "y": 419.0065002441406,\r
-        "z": "8966128c.40fc9",\r
+        "x": 1549,\r
+        "y": 622,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": [\r
             [\r
-                "c8d54563.247c18",\r
-                "5e04ba3c.b57a04",\r
-                "f0519db1.196698",\r
-                "86fe0338.dea2e8",\r
-                "14bac025.125a4"\r
+                "f3d35e68.c9d718",\r
+                "3ad809f1.06ba16",\r
+                "4db37c69.2430a4",\r
+                "ec80108a.70e1d",\r
+                "6c3aac2e.471db4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8d54563.247c18",\r
+        "id": "f3d35e68.c9d718",\r
         "type": "set",\r
         "name": "set tunnel termination point",\r
         "xml": "<set>\n<parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />\n",\r
         "comments": "",\r
-        "x": 1943,\r
-        "y": 344.0065002441406,\r
-        "z": "8966128c.40fc9",\r
+        "x": 1918,\r
+        "y": 334,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5e04ba3c.b57a04",\r
+        "id": "3ad809f1.06ba16",\r
         "type": "set",\r
         "name": "set unique-ttpId",\r
         "xml": "<set>\n<parameter name='unique-ttpId' value=\"`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`\" />\n",\r
         "comments": "",\r
-        "x": 1920.888916015625,\r
-        "y": 411.1175842285156,\r
-        "z": "8966128c.40fc9",\r
+        "x": 1885.888916015625,\r
+        "y": 398.111083984375,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a58125ba.f3ece",\r
+        "id": "7c6c9bf4.1268f4",\r
         "type": "set",\r
         "name": "set tp-inter-layer-lock-id",\r
         "xml": "<set>\n<parameter name='tp-inter-layer-lock-id' value='`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`' />\n",\r
         "comments": "",\r
-        "x": 1231,\r
-        "y": 312.0065002441406,\r
-        "z": "8966128c.40fc9",\r
+        "x": 1212,\r
+        "y": 302,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6948417f.bffae",\r
+        "id": "38915841.38d1e",\r
         "type": "for",\r
         "name": "for each node in network-otn",\r
         "xml": "<for index='potnidx' start='0' end='`$network-otn.node_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1249,\r
-        "y": 361.0065002441406,\r
-        "z": "8966128c.40fc9",\r
+        "x": 1230,\r
+        "y": 351,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": [\r
             [\r
-                "3e8d4c9d.81492c",\r
-                "a37094cf.0ec268",\r
-                "f9e7891b.a33b9"\r
+                "b1b6d531.8e8428",\r
+                "591e31d0.de7628",\r
+                "e2cb35d4.99da",\r
+                "32e4e342.a9f04c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a37094cf.0ec268",\r
+        "id": "b1b6d531.8e8428",\r
         "type": "set",\r
         "name": "set node-otn",\r
         "xml": "<set>\n<parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />",\r
         "comments": "",\r
-        "x": 1543,\r
-        "y": 331.0065002441406,\r
-        "z": "8966128c.40fc9",\r
+        "x": 1524,\r
+        "y": 321,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f9e7891b.a33b9",\r
+        "id": "591e31d0.de7628",\r
         "type": "set",\r
         "name": "set local variables",\r
         "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",\r
         "comments": "",\r
-        "x": 1541.888916015625,\r
-        "y": 378.78428649902344,\r
-        "z": "8966128c.40fc9",\r
+        "x": 1522.888916015625,\r
+        "y": 368.7777862548828,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f0519db1.196698",\r
+        "id": "4db37c69.2430a4",\r
         "type": "set",\r
         "name": "set ttp-inter-layer-lock-id",\r
         "xml": "<set>\n<parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`' />\n",\r
         "comments": "",\r
-        "x": 1942,\r
-        "y": 462.0065002441406,\r
-        "z": "8966128c.40fc9",\r
+        "x": 1910,\r
+        "y": 452,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": []\r
     },\r
     {\r
-        "id": "86fe0338.dea2e8",\r
+        "id": "ec80108a.70e1d",\r
         "type": "switchNode",\r
         "name": "switch tp-inter-layer-lock-id",\r
-        "xml": "<switch test='tp-inter-layer-lock-id'>\n",\r
+        "xml": "<switch test='`$tp-inter-layer-lock-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1885,\r
-        "y": 517.0065002441406,\r
-        "z": "8966128c.40fc9",\r
+        "x": 1917,\r
+        "y": 508,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": [\r
             [\r
-                "bece73d9.c8717"\r
+                "cf4f4a72.7d5168"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bece73d9.c8717",\r
+        "id": "cf4f4a72.7d5168",\r
         "type": "outcome",\r
         "name": "ttp-inter-layer-lock-id",\r
-        "xml": "<outcome value='ttp-inter-layer-lock-id'>\n",\r
+        "xml": "<outcome value='`$ttp-inter-layer-lock-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1994,\r
-        "y": 614.0065002441406,\r
-        "z": "8966128c.40fc9",\r
+        "x": 1975,\r
+        "y": 604,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": [\r
             [\r
-                "377503ca.868e7c"\r
+                "3d7797fd.32b9a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "377503ca.868e7c",\r
+        "id": "3d7797fd.32b9a8",\r
         "type": "save",\r
         "name": "save p-interface relationship to ttp in AAI",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2312,\r
-        "y": 614.0065002441406,\r
-        "z": "8966128c.40fc9",\r
+        "x": 2293,\r
+        "y": 604,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "eb8eee0c.443eb8",\r
+        "id": "b8fd2648.6f854",\r
         "type": "set",\r
         "name": "unset termination point tp-eth",\r
         "xml": "<set>\n<parameter name='tp-eth.' value='' />\n",\r
         "comments": "",\r
-        "x": 1208,\r
-        "y": 198,\r
-        "z": "8966128c.40fc9",\r
+        "x": 1189,\r
+        "y": 187.99349975585938,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": []\r
     },\r
     {\r
-        "id": "14bac025.125a4",\r
+        "id": "6c3aac2e.471db4",\r
         "type": "set",\r
         "name": "unset tunnel termination point",\r
         "xml": "<set>\n<parameter name='ttp.' value='' />\n",\r
         "comments": "",\r
-        "x": 1933,\r
-        "y": 305,\r
-        "z": "8966128c.40fc9",\r
+        "x": 1926,\r
+        "y": 280.9934997558594,\r
+        "z": "ffd702ea.3cd72",\r
         "wires": []\r
+    },\r
+    {\r
+        "id": "e6e033d7.96653",\r
+        "type": "switchNode",\r
+        "name": "switch node-eth tp",\r
+        "xml": "<switch test='`$node-eth.termination-point_length`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 556,\r
+        "y": 370,\r
+        "z": "ffd702ea.3cd72",\r
+        "wires": [\r
+            [\r
+                "80e4765d.fcdaa8",\r
+                "a8cca188.f375d",\r
+                "b96aa4a5.384fe8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "80e4765d.fcdaa8",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 735,\r
+        "y": 322,\r
+        "z": "ffd702ea.3cd72",\r
+        "wires": [\r
+            [\r
+                "adea3129.2af79"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "adea3129.2af79",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 890,\r
+        "y": 322,\r
+        "z": "ffd702ea.3cd72",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "b96aa4a5.384fe8",\r
+        "type": "outcome",\r
+        "name": "length 0",\r
+        "xml": "<outcome value='0'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 745,\r
+        "y": 370,\r
+        "z": "ffd702ea.3cd72",\r
+        "wires": [\r
+            [\r
+                "adea3129.2af79"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a8cca188.f375d",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 734,\r
+        "y": 424,\r
+        "z": "ffd702ea.3cd72",\r
+        "wires": [\r
+            [\r
+                "2c29c804.a15ee"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2c29c804.a15ee",\r
+        "type": "for",\r
+        "name": "for each termination point",\r
+        "xml": "<for index='tidx' start='0' end='`$node-eth.termination-point_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 942.4444580078125,\r
+        "y": 394.111083984375,\r
+        "z": "ffd702ea.3cd72",\r
+        "wires": [\r
+            [\r
+                "b8fd2648.6f854",\r
+                "79b02bc6.8ef74c",\r
+                "53e75306.b60214",\r
+                "7c6c9bf4.1268f4",\r
+                "38915841.38d1e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e2cb35d4.99da",\r
+        "type": "set",\r
+        "name": "unset node-otn",\r
+        "xml": "<set>\n<parameter name='node-otn.' value='' />\n<parameter name='unique-network-otnId' value='' />\n<parameter name='unique-node-otnId' value=\"\" />\n",\r
+        "comments": "",\r
+        "x": 1525,\r
+        "y": 270,\r
+        "z": "ffd702ea.3cd72",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "32e4e342.a9f04c",\r
+        "type": "switchNode",\r
+        "name": "switch node-otn ttp",\r
+        "xml": "<switch test='`$node-otn.te.tunnel-termination-point_length`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1122,\r
+        "y": 601,\r
+        "z": "ffd702ea.3cd72",\r
+        "wires": [\r
+            [\r
+                "571c7e22.88577",\r
+                "c4c843ca.dc868",\r
+                "dcc7ee12.1af12"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "571c7e22.88577",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1310,\r
+        "y": 487,\r
+        "z": "ffd702ea.3cd72",\r
+        "wires": [\r
+            [\r
+                "3d4d0383.b594e4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c4c843ca.dc868",\r
+        "type": "outcome",\r
+        "name": "length 0",\r
+        "xml": "<outcome value='0'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1315,\r
+        "y": 562,\r
+        "z": "ffd702ea.3cd72",\r
+        "wires": [\r
+            [\r
+                "3d4d0383.b594e4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dcc7ee12.1af12",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1312,\r
+        "y": 624,\r
+        "z": "ffd702ea.3cd72",\r
+        "wires": [\r
+            [\r
+                "8be3e429.ccb7d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3d4d0383.b594e4",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1470,\r
+        "y": 553,\r
+        "z": "ffd702ea.3cd72",\r
+        "wires": [\r
+            []\r
+        ]\r
     }\r
 ]
\ 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 110c9f6..007f3bf 100644 (file)
--- 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\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>\r
-    <method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\r
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">\r
+    <method rpc="esr-thirdparty-sdnc-discovery" mode="sync">\r
         <block atomic="true">\r
             <switch test="`$prop.sdncRestApi.vendor == 'ZTE'`">\r
-                <outcome value='false'>\r
+                <outcome value="false">\r
                     <switch test="`$data-change-notification-input.aai-event-trigger`">\r
-                        <outcome value='Update'>\r
+                        <outcome value="Update">\r
                             <block>\r
                                 <switch test="`$prop.sdncRestApi.type`">\r
-                                    <outcome value='SOTN'>\r
+                                    <outcome value="SOTN">\r
                                         <block atomic="true">\r
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
-                                                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
-                                                <parameter name='contextPrefix' value='prop' />\r
+                                            <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties">\r
+                                                <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties"/>\r
+                                                <parameter name="contextPrefix" value="prop"/>\r
                                             </execute>\r
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />\r
-                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />\r
+                                            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
+                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`"/>\r
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`"/>\r
                                                 <parameter name="format" value="json"/>\r
                                                 <parameter name="httpMethod" value="post"/>\r
                                                 <parameter name="responsePrefix" value="token-result"/>\r
@@ -25,21 +23,21 @@
                                                 <parameter name="trustStorePassword" value="adminadmin"/>\r
                                                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
                                                 <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                <outcome value='success'>\r
+                                                <outcome value="success">\r
                                                     <set>\r
-                                                        <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\r
+                                                        <parameter name="prop.sdncRestApi.token_id" value="`$token-result.data.token_id`"/>\r
                                                     </set>\r
                                                 </outcome>\r
-                                                <outcome value='failure'>\r
-                                                    <block></block>\r
+                                                <outcome value="failure">\r
+                                                    <block/>\r
                                                 </outcome>\r
                                             </execute>\r
                                             <switch test="`$prop.sdncRestApi.token_id`">\r
-                                                <outcome value=''>\r
-                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />\r
-                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                                                <outcome value="">\r
+                                                    <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
+                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`"/>\r
+                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>\r
+                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>\r
                                                         <parameter name="format" value="json"/>\r
                                                         <parameter name="httpMethod" value="get"/>\r
                                                         <parameter name="responsePrefix" value="topology"/>\r
@@ -47,32 +45,65 @@
                                                         <parameter name="trustStorePassword" value="adminadmin"/>\r
                                                         <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
                                                         <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                        <outcome value='failure'>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />\r
+                                                        <outcome value="failure">\r
+                                                            <return status="failure">\r
+                                                                <parameter name="ack-final" value="Y"/>\r
+                                                                <parameter name="error-code" value="500"/>\r
+                                                                <parameter name="error-message" value="Error executing Create vpn rest api"/>\r
                                                             </return>\r
                                                         </outcome>\r
-                                                        <outcome value='success'>\r
+                                                        <outcome value="success">\r
                                                             <block atomic="true">\r
-                                                                <for index='nidx' start='0' end='`$topology.networks.network_length`' >\r
+                                                                <for index="nidx" start="0" end="`$topology.networks.network_length`">\r
                                                                     <block>\r
                                                                         <set>\r
-                                                                            <parameter name='network.' value='`$topology.networks.network[$nidx].`' />\r
+                                                                            <parameter name="network." value="`$topology.networks.network[$nidx].`"/>\r
                                                                         </set>\r
-                                                                        <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>\r
+                                                                        <call module="DataChange" rpc="update-network-to-aai" mode="sync"/>\r
                                                                     </block>\r
                                                                 </for>\r
+                                                                <switch test="`$topology.networks.network_length >= 2`">\r
+                                                                    <outcome value="true">\r
+                                                                        <block atomic="true">\r
+                                                                            <for index="netidx" start="0" end="`$topology.networks.network_length`">\r
+                                                                                <block>\r
+                                                                                    <set>\r
+                                                                                        <parameter name="network." value=""/>\r
+                                                                                    </set>\r
+                                                                                    <set>\r
+                                                                                        <parameter name="network." value="`$topology.networks.network[$netidx].`"/>\r
+                                                                                    </set>\r
+                                                                                    <switch test="`$network.te-topology-id`">\r
+                                                                                        <outcome value="11">\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name="network-otn." value="`$topology.networks.network[$netidx].`"/>\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                        <outcome value="33">\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name="network-eth." value="`$topology.networks.network[$netidx].`"/>\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                    </switch>\r
+                                                                                </block>\r
+                                                                            </for>\r
+                                                                            <call module="DataChange" rpc="update-tp-ttp-relationship" mode="sync"/>\r
+                                                                        </block>\r
+                                                                    </outcome>\r
+                                                                </switch>\r
                                                             </block>\r
                                                         </outcome>\r
                                                     </execute>\r
                                                 </outcome>\r
-                                                <outcome value='Other'>\r
-                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />\r
-                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                                                <outcome value="Other">\r
+                                                    <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
+                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`"/>\r
+                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>\r
+                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>\r
                                                         <parameter name="format" value="json"/>\r
                                                         <parameter name="httpMethod" value="get"/>\r
                                                         <parameter name="responsePrefix" value="topology"/>\r
@@ -80,56 +111,89 @@
                                                         <parameter name="trustStorePassword" value="adminadmin"/>\r
                                                         <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
                                                         <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                                        <outcome value='failure'>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />\r
+                                                        <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`"/>\r
+                                                        <outcome value="failure">\r
+                                                            <return status="failure">\r
+                                                                <parameter name="ack-final" value="Y"/>\r
+                                                                <parameter name="error-code" value="500"/>\r
+                                                                <parameter name="error-message" value="Error executing Create vpn rest api"/>\r
                                                             </return>\r
                                                         </outcome>\r
-                                                        <outcome value='success'>\r
+                                                        <outcome value="success">\r
                                                             <block atomic="true">\r
-                                                                <for index='nidx' start='0' end='`$topology.networks.network_length`' >\r
+                                                                <for index="nidx" start="0" end="`$topology.networks.network_length`">\r
                                                                     <block>\r
                                                                         <set>\r
-                                                                            <parameter name='network.' value='`$topology.networks.network[$nidx].`' />\r
+                                                                            <parameter name="network." value="`$topology.networks.network[$nidx].`"/>\r
                                                                         </set>\r
-                                                                        <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>\r
+                                                                        <call module="DataChange" rpc="update-network-to-aai" mode="sync"/>\r
                                                                     </block>\r
                                                                 </for>\r
+                                                                <switch test="`$topology.networks.network_length >= 2`">\r
+                                                                    <outcome value="true">\r
+                                                                        <block atomic="true">\r
+                                                                            <for index="netidx" start="0" end="`$topology.networks.network_length`">\r
+                                                                                <block>\r
+                                                                                    <set>\r
+                                                                                        <parameter name="network." value=""/>\r
+                                                                                    </set>\r
+                                                                                    <set>\r
+                                                                                        <parameter name="network." value="`$topology.networks.network[$netidx].`"/>\r
+                                                                                    </set>\r
+                                                                                    <switch test="`$network.te-topology-id`">\r
+                                                                                        <outcome value="11">\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name="network-otn." value="`$topology.networks.network[$netidx].`"/>\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                        <outcome value="33">\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name="network-eth." value="`$topology.networks.network[$netidx].`"/>\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                    </switch>\r
+                                                                                </block>\r
+                                                                            </for>\r
+                                                                            <call module="DataChange" rpc="update-tp-ttp-relationship" mode="sync"/>\r
+                                                                        </block>\r
+                                                                    </outcome>\r
+                                                                </switch>\r
                                                             </block>\r
                                                         </outcome>\r
                                                     </execute>\r
                                                 </outcome>\r
                                             </switch>\r
                                             <set>\r
-                                                <parameter name='input' value='ietf-subscribed-notifications:establish-subscription.input.' />\r
-                                                <parameter name="`$input + 'encoding'`" value="encode-json" />\r
+                                                <parameter name="input" value="ietf-subscribed-notifications:establish-subscription.input."/>\r
+                                                <parameter name="`$input + 'encoding'`" value="encode-json"/>\r
                                             </set>\r
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscription' >\r
-                                                <parameter name="subscriberId" value="sotn-controller" />\r
-                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />\r
-                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
-                                                <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`" />\r
-                                                <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />\r
-                                                <parameter name="format" value="json" />\r
-                                                <parameter name="httpMethod" value="post" />\r
+                                            <execute plugin="org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode" method="establishSubscription">\r
+                                                <parameter name="subscriberId" value="sotn-controller"/>\r
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`"/>\r
+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>\r
+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>\r
+                                                <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`"/>\r
+                                                <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification"/>\r
+                                                <parameter name="format" value="json"/>\r
+                                                <parameter name="httpMethod" value="post"/>\r
                                                 <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
                                                 <parameter name="trustStorePassword" value="adminadmin"/>\r
                                                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
                                                 <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                                <parameter name="module" value="DataChange" />\r
-                                                <parameter name="rpc" value="sotn-notification-handler" />\r
-                                                <parameter name="mode" value="sync" />\r
+                                                <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`"/>\r
+                                                <parameter name="module" value="DataChange"/>\r
+                                                <parameter name="rpc" value="sotn-notification-handler"/>\r
+                                                <parameter name="mode" value="sync"/>\r
                                             </execute>\r
                                         </block>\r
                                     </outcome>\r
-                                    <outcome value='TAPI'>\r
+                                    <outcome value="TAPI">\r
                                         <block atomic="true">\r
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
                                                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/tapi/v2/topologies?topology-id-or-name=otn'`"/>\r
                                                 <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>\r
                                                 <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>\r
@@ -140,21 +204,21 @@
                                                 <parameter name="trustStorePassword" value="adminadmin"/>\r
                                                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
                                                 <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                <outcome value='failure'>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
-                                                        <parameter name="error-message" value="Error executing get topology TAPI rest api" />\r
+                                                <outcome value="failure">\r
+                                                    <return status="failure">\r
+                                                        <parameter name="ack-final" value="Y"/>\r
+                                                        <parameter name="error-code" value="500"/>\r
+                                                        <parameter name="error-message" value="Error executing get topology TAPI rest api"/>\r
                                                     </return>\r
                                                 </outcome>\r
-                                                <outcome value='success'>\r
+                                                <outcome value="success">\r
                                                     <block atomic="true">\r
-                                                        <for index='tidx' start='0' end="`$topologies.topology_length`" >\r
+                                                        <for index="tidx" start="0" end="`$topologies.topology_length`">\r
                                                             <block>\r
                                                                 <set>\r
-                                                                    <parameter name='topology.' value='`$topologies.topology[$tidx].`' />\r
+                                                                    <parameter name="topology." value="`$topologies.topology[$tidx].`"/>\r
                                                                 </set>\r
-                                                                <call module='DataChange' rpc='tapi-update-network-to-aai' mode='sync' ></call>\r
+                                                                <call module="DataChange" rpc="tapi-update-network-to-aai" mode="sync"/>\r
                                                             </block>\r
                                                         </for>\r
                                                     </block>\r
@@ -162,9 +226,9 @@
                                             </execute>\r
                                         </block>\r
                                     </outcome>\r
-                                    <outcome value='MSA'>\r
+                                    <outcome value="MSA">\r
                                         <block atomic="true">\r
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
                                                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/openroadm/v2/networks/otn-topology'`"/>\r
                                                 <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>\r
                                                 <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>\r
@@ -175,103 +239,91 @@
                                                 <parameter name="trustStorePassword" value="adminadmin"/>\r
                                                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
                                                 <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                <outcome value='failure'>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
-                                                        <parameter name="error-message" value="Error executing get topology MSA rest api" />\r
+                                                <outcome value="failure">\r
+                                                    <return status="failure">\r
+                                                        <parameter name="ack-final" value="Y"/>\r
+                                                        <parameter name="error-code" value="500"/>\r
+                                                        <parameter name="error-message" value="Error executing get topology MSA rest api"/>\r
                                                     </return>\r
                                                 </outcome>\r
-                                                <outcome value='success'>\r
+                                                <outcome value="success">\r
                                                     <block atomic="true">\r
-                                                        <call module='DataChange' rpc='msa-update-network-to-aai' mode='sync' ></call>\r
+                                                        <call module="DataChange" rpc="msa-update-network-to-aai" mode="sync"/>\r
                                                     </block>\r
                                                 </outcome>\r
                                             </execute>\r
                                         </block>\r
                                     </outcome>\r
-                                    <outcome value='Other'>\r
-                                        <return status='failure'>\r
-                                            <parameter name='ack-final' value='Y'/>\r
-                                            <parameter name="error-code" value="500" />\r
-                                            <parameter name="error-message" value="`'Unsupported type = ' + $prop.sdncRestApi.type`" />\r
+                                    <outcome value="Other">\r
+                                        <return status="failure">\r
+                                            <parameter name="ack-final" value="Y"/>\r
+                                            <parameter name="error-code" value="500"/>\r
+                                            <parameter name="error-message" value="`'Unsupported type = ' + $prop.sdncRestApi.type`"/>\r
                                         </return>\r
                                     </outcome>\r
                                 </switch>\r
                             </block>\r
                         </outcome>\r
-                        <outcome value='Delete'>\r
+                        <outcome value="Delete">\r
                             <block atomic="true">\r
                                 <switch test="`$prop.sdncRestApi.type`">\r
-                                    <outcome value='MSA'>\r
-                                        <block atomic='true'>\r
+                                    <outcome value="MSA">\r
+                                        <block atomic="true">\r
                                             <set>\r
-                                                <parameter name='controllerid' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />\r
+                                                <parameter name="controllerid" value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`"/>\r
                                             </set>\r
-                                            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
-key='SELECT controller_id\r
-from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\r
-WHERE controller_id = $controllerid'\r
-pfx='dbcontrollerid'>\r
-                                                <outcome value='success'>\r
-                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
-    resource="SQL"\r
-    key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>\r
+                                            <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">\r
+                                                <outcome value="success">\r
+                                                    <delete plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"/>\r
                                                 </outcome>\r
-                                                <outcome value='failure'>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
-                                                        <parameter name="error-message" value="Failure in getting controller-id from DB" />\r
+                                                <outcome value="failure">\r
+                                                    <return status="failure">\r
+                                                        <parameter name="ack-final" value="Y"/>\r
+                                                        <parameter name="error-code" value="500"/>\r
+                                                        <parameter name="error-message" value="Failure in getting controller-id from DB"/>\r
                                                     </return>\r
                                                 </outcome>\r
-                                                <outcome value='not-found'>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
-                                                        <parameter name="error-message" value="controller-id could not be found in DB" />\r
+                                                <outcome value="not-found">\r
+                                                    <return status="failure">\r
+                                                        <parameter name="ack-final" value="Y"/>\r
+                                                        <parameter name="error-code" value="500"/>\r
+                                                        <parameter name="error-message" value="controller-id could not be found in DB"/>\r
                                                     </return>\r
                                                 </outcome>\r
                                             </get-resource>\r
                                         </block>\r
                                     </outcome>\r
-                                    <outcome value='TAPI'>\r
+                                    <outcome value="TAPI">\r
                                         <block>\r
                                             <set>\r
-                                                <parameter name='controllerid' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />\r
+                                                <parameter name="controllerid" value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`"/>\r
                                             </set>\r
-                                            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
-key='SELECT controller_id\r
-from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\r
-WHERE controller_id = $controllerid'\r
-pfx='dbcontrollerid'>\r
-                                                <outcome value='success'>\r
-                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
-    resource="SQL"\r
-    key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>\r
+                                            <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">\r
+                                                <outcome value="success">\r
+                                                    <delete plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"/>\r
                                                 </outcome>\r
-                                                <outcome value='failure'>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
-                                                        <parameter name="error-message" value="Failure in getting controller-id from DB" />\r
+                                                <outcome value="failure">\r
+                                                    <return status="failure">\r
+                                                        <parameter name="ack-final" value="Y"/>\r
+                                                        <parameter name="error-code" value="500"/>\r
+                                                        <parameter name="error-message" value="Failure in getting controller-id from DB"/>\r
                                                     </return>\r
                                                 </outcome>\r
-                                                <outcome value='not-found'>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
-                                                        <parameter name="error-message" value="controller-id could not be found in DB" />\r
+                                                <outcome value="not-found">\r
+                                                    <return status="failure">\r
+                                                        <parameter name="ack-final" value="Y"/>\r
+                                                        <parameter name="error-code" value="500"/>\r
+                                                        <parameter name="error-message" value="controller-id could not be found in DB"/>\r
                                                     </return>\r
                                                 </outcome>\r
                                             </get-resource>\r
                                         </block>\r
                                     </outcome>\r
-                                    <outcome value='Other'>\r
-                                        <return status='failure'>\r
-                                            <parameter name='ack-final' value='Y'/>\r
-                                            <parameter name="error-code" value="500" />\r
-                                            <parameter name="error-message" value="`'Unsupported type = ' + $prop.sdncRestApi.type`" />\r
+                                    <outcome value="Other">\r
+                                        <return status="failure">\r
+                                            <parameter name="ack-final" value="Y"/>\r
+                                            <parameter name="error-code" value="500"/>\r
+                                            <parameter name="error-message" value="`'Unsupported type = ' + $prop.sdncRestApi.type`"/>\r
                                         </return>\r
                                     </outcome>\r
                                 </switch>\r
@@ -279,8 +331,8 @@ pfx='dbcontrollerid'>
                         </outcome>\r
                     </switch>\r
                 </outcome>\r
-                <outcome value='true'>\r
-                    <call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' ></call>\r
+                <outcome value="true">\r
+                    <call module="DataChange" rpc="esr-thirdparty-sdnc-of-zte" mode="sync"/>\r
                 </outcome>\r
             </switch>\r
         </block>\r

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 b867b56..ab50abd 100644 (file)
--- 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\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>\r
-    <method rpc='update-network-links-to-aai' mode='sync'>\r
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">\r
+    <method rpc="update-network-links-to-aai" mode="sync">\r
         <block atomic="true">\r
-            <for index='pidx' start='0' end='`$network.link_length`' >\r
+            <for index="pidx" start="0" end="`$network.link_length`">\r
                 <set>\r
-                    <parameter name='link.' value='' />\r
-                    <parameter name='dst-tpId' value='' />\r
-                    <parameter name='unique-dst-node-Id' value='' />\r
-                    <parameter name='is-open-ended-link' value='false' />\r
-                    <parameter name='is-invalid-open-ended-link' value='false' />\r
+                    <parameter name="link." value=""/>\r
+                    <parameter name="dst-tpId" value=""/>\r
+                    <parameter name="unique-dst-node-Id" value=""/>\r
+                    <parameter name="is-open-ended-link" value="false"/>\r
+                    <parameter name="is-invalid-open-ended-link" value="false"/>\r
                 </set>\r
                 <set>\r
-                    <parameter name='link.' value='`$network.link[$pidx].`' />\r
-                    <parameter name='unique-networkId' value='`$tmp.network-id`' />\r
+                    <parameter name="link." value="`$network.link[$pidx].`"/>\r
+                    <parameter name="unique-networkId" value="`$tmp.network-id`"/>\r
                 </set>\r
                 <set>\r
-                    <parameter name='unique-linkId' value="`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`" />\r
-                    <parameter name='src-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`" />\r
-                    <parameter name='unique-src-node-Id' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`" />\r
+                    <parameter name="unique-linkId" value="`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`"/>\r
+                    <parameter name="src-tpId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`"/>\r
+                    <parameter name="unique-src-node-Id" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`"/>\r
                 </set>\r
-                <switch test='`$link.destination.dest-node`'>\r
-                    <outcome value=''>\r
+                <switch test="`$link.destination.dest-node`">\r
+                    <outcome value="">\r
                         <block>\r
                             <set>\r
-                                <parameter name='is-open-ended-link' value='true' />\r
+                                <parameter name="is-open-ended-link" value="true"/>\r
                             </set>\r
                             <set>\r
-                                <parameter name='tmp.aai.p-interface' value='' />\r
-                                <parameter name='tmp.aai.p-interface.inter-domain-plug-id' value='' />\r
+                                <parameter name="tmp.aai.p-interface" value=""/>\r
+                                <parameter name="tmp.aai.p-interface.inter-domain-plug-id" value=""/>\r
                             </set>\r
-                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-       resource="p-interface"\r
-           key="pnf.pnf-name = $unique-src-node-Id\r
-               and p-interface.interface-name = $src-tpId"\r
-               local-only="false" \r
-               pfx="tmp.aai.p-interface" >\r
-                                <outcome value='success'>\r
-                                    <switch test='`$tmp.aai.p-interface.inter-domain-plug-id`'>\r
-                                        <outcome value=''>\r
+                            <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">\r
+                                <outcome value="success">\r
+                                    <switch test="`$tmp.aai.p-interface.inter-domain-plug-id`">\r
+                                        <outcome value="">\r
                                             <set>\r
-                                                <parameter name='is-open-ended-link' value='false' />\r
-                                                <parameter name='is-invalid-open-ended-link' value='true' />\r
+                                                <parameter name="is-open-ended-link" value="false"/>\r
+                                                <parameter name="is-invalid-open-ended-link" value="true"/>\r
                                             </set>\r
                                         </outcome>\r
-                                        <outcome value='Other'>\r
+                                        <outcome value="Other">\r
                                             <set>\r
-                                                <parameter name='alt-unique-linkId' value="`$tmp.aai.p-interface.inter-domain-plug-id`" />\r
-                                                <!--<parameter name='alt-unique-linkId' value="`'networkId-' + $unique-networkId + '-linkId-' + $tmp.aai.p-interface.inter-domain-plug-id`" />-->\r
+                                                <parameter name="alt-unique-linkId" value="`$tmp.aai.p-interface.inter-domain-plug-id`"/>\r
+                                                <!--\r
+                                                <parameter name='alt-unique-linkId' value="`'networkId-' + $unique-networkId + '-linkId-' + $tmp.aai.p-interface.inter-domain-plug-id`" />\r
+                                                -->\r
                                             </set>\r
                                         </outcome>\r
                                     </switch>\r
                                 </outcome>\r
-                                <outcome value='not-found'>\r
-                                    <return status='failure'>\r
-                                        <parameter name='ack-final' value='Y'/>\r
-                                        <parameter name="error-code" value="500" />\r
-                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />\r
+                                <outcome value="not-found">\r
+                                    <return status="failure">\r
+                                        <parameter name="ack-final" value="Y"/>\r
+                                        <parameter name="error-code" value="500"/>\r
+                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`"/>\r
                                     </return>\r
                                 </outcome>\r
-                                <outcome value='failure'>\r
-                                    <return status='failure'>\r
-                                        <parameter name='error-code' value='' />\r
-                                        <parameter name='error-message' value='' />\r
+                                <outcome value="failure">\r
+                                    <return status="failure">\r
+                                        <parameter name="error-code" value=""/>\r
+                                        <parameter name="error-message" value=""/>\r
                                     </return>\r
                                 </outcome>\r
                             </get-resource>\r
                         </block>\r
                     </outcome>\r
-                    <outcome value='Other'>\r
+                    <outcome value="Other">\r
                         <set>\r
-                            <parameter name='dst-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`" />\r
-                            <parameter name='unique-dst-node-Id' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`" />\r
-                            <parameter name='is-open-ended-link' value='false' />\r
+                            <parameter name="dst-tpId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`"/>\r
+                            <parameter name="unique-dst-node-Id" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`"/>\r
+                            <parameter name="is-open-ended-link" value="false"/>\r
                         </set>\r
                     </outcome>\r
                 </switch>\r
-                <switch test='`$is-invalid-open-ended-link`'>\r
-                    <outcome value='true'>\r
-                        <block></block>\r
+                <switch test="`$is-invalid-open-ended-link`">\r
+                    <outcome value="true">\r
+                        <block/>\r
                     </outcome>\r
-                    <outcome value='false'>\r
-                        <switch test='`$is-open-ended-link`'>\r
-                            <outcome value='true'>\r
-                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-       resource="logical-link"\r
-           key="logical-link.link-name = $alt-unique-linkId"\r
-               local-only="false" \r
-               pfx="tmp.aai.logical-link" >\r
-                                    <outcome value='success'>\r
+                    <outcome value="false">\r
+                        <switch test="`$is-open-ended-link`">\r
+                            <outcome value="true">\r
+                                <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">\r
+                                    <outcome value="success">\r
                                         <block>\r
                                             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                                <parameter name="file" value="/opt/onap/logMerge.txt" />\r
-                                                <parameter name="field1" value="__TIMESTAMP__" />\r
-                                                <parameter name="field2" value="altUniqueLinkId" />\r
-                                                <parameter name="field3" value="`$alt-unique-linkId`" />\r
-                                                <parameter name="field4" value="srcTpId" />\r
-                                                <parameter name="field5" value="`$src-tpId`" />\r
-                                                <parameter name="field6" value="relationship-value" />\r
-                                                <parameter name="field7" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />\r
+                                                <parameter name="file" value="/opt/onap/logMerge.txt"/>\r
+                                                <parameter name="field1" value="__TIMESTAMP__"/>\r
+                                                <parameter name="field2" value="altUniqueLinkId"/>\r
+                                                <parameter name="field3" value="`$alt-unique-linkId`"/>\r
+                                                <parameter name="field4" value="srcTpId"/>\r
+                                                <parameter name="field5" value="`$src-tpId`"/>\r
+                                                <parameter name="field6" value="relationship-value"/>\r
+                                                <parameter name="field7" value="`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`"/>\r
                                             </record>\r
-                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \r
-      key='logical-link.link-name = $alt-unique-linkId' force="true" pfx="tmp.AnAI-data">\r
-                                                <!--<parameter name="relationship-list.relationship[0].related-to" value="p-interface" />-->\r
-                                                <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />-->\r
-                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />-->\r
-                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`" />-->\r
+                                            <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">\r
+                                                <!--\r
                                                 <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />\r
+                                                -->\r
+                                                <!--\r
                                                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />\r
+                                                -->\r
+                                                <!--\r
                                                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />\r
+                                                -->\r
+                                                <!--\r
                                                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`" />\r
-                                                <outcome value='success'>\r
+                                                -->\r
+                                                <parameter name="relationship-list.relationship[0].related-to" value="p-interface"/>\r
+                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>\r
+                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name"/>\r
+                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`"/>\r
+                                                <outcome value="success">\r
                                                     <block>\r
                                                         <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                                            <parameter name="file" value="/opt/onap/logMergeSuccess.txt" />\r
-                                                            <parameter name="field1" value="__TIMESTAMP__" />\r
-                                                            <parameter name="field2" value="altUniqueLinkId" />\r
-                                                            <parameter name="field3" value="`$alt-unique-linkId`" />\r
-                                                            <parameter name="field4" value="srcTpId" />\r
-                                                            <parameter name="field5" value="`$src-tpId`" />\r
-                                                            <parameter name="field6" value="relationship-value" />\r
-                                                            <parameter name="field7" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />\r
+                                                            <parameter name="file" value="/opt/onap/logMergeSuccess.txt"/>\r
+                                                            <parameter name="field1" value="__TIMESTAMP__"/>\r
+                                                            <parameter name="field2" value="altUniqueLinkId"/>\r
+                                                            <parameter name="field3" value="`$alt-unique-linkId`"/>\r
+                                                            <parameter name="field4" value="srcTpId"/>\r
+                                                            <parameter name="field5" value="`$src-tpId`"/>\r
+                                                            <parameter name="field6" value="relationship-value"/>\r
+                                                            <parameter name="field7" value="`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`"/>\r
                                                         </record>\r
                                                     </block>\r
                                                 </outcome>\r
-                                                <outcome value='failure'>\r
+                                                <outcome value="failure">\r
                                                     <block>\r
                                                         <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                                            <parameter name="file" value="/opt/onap/logMergeFailure.txt" />\r
-                                                            <parameter name="field1" value="__TIMESTAMP__" />\r
-                                                            <parameter name="field2" value="altUniqueLinkId" />\r
-                                                            <parameter name="field3" value="`$alt-unique-linkId`" />\r
-                                                            <parameter name="field4" value="srcTpId" />\r
-                                                            <parameter name="field5" value="`$src-tpId`" />\r
-                                                            <parameter name="field6" value="relationship-value" />\r
-                                                            <parameter name="field7" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />\r
+                                                            <parameter name="file" value="/opt/onap/logMergeFailure.txt"/>\r
+                                                            <parameter name="field1" value="__TIMESTAMP__"/>\r
+                                                            <parameter name="field2" value="altUniqueLinkId"/>\r
+                                                            <parameter name="field3" value="`$alt-unique-linkId`"/>\r
+                                                            <parameter name="field4" value="srcTpId"/>\r
+                                                            <parameter name="field5" value="`$src-tpId`"/>\r
+                                                            <parameter name="field6" value="relationship-value"/>\r
+                                                            <parameter name="field7" value="`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`"/>\r
                                                         </record>\r
                                                     </block>\r
                                                 </outcome>\r
                                             </save>\r
+                                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute" key="te-link-attribute.id = $link.te.te-link-attributes.name">\r
+                                                <parameter name="id" value="`$link.te.te-link-attributes.name`"/>\r
+                                                <parameter name="access-type" value="`$link.te.te-link-attributes.access-type`"/>\r
+                                            </save>\r
+                                            <switch test="`$link.te.te-link-attributes.label-restriction_length`">\r
+                                                <outcome value="">\r
+                                                    <block/>\r
+                                                </outcome>\r
+                                                <outcome value="0">\r
+                                                    <block/>\r
+                                                </outcome>\r
+                                                <outcome value="Other">\r
+                                                    <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">\r
+                                                        <set>\r
+                                                            <parameter name="label-restriction." value=""/>\r
+                                                            <parameter name="unique-lrId" value=""/>\r
+                                                        </set>\r
+                                                        <set>\r
+                                                            <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>\r
+                                                        </set>\r
+                                                        <set>\r
+                                                            <parameter name="unique-lrId" value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`"/>\r
+                                                        </set>\r
+                                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="label-restriction.id = $unique-lrId">\r
+                                                            <parameter name="id" value="`$unique-lrId`"/>\r
+                                                            <parameter name="label-start" value="`$label-restriction.label-start.te-label-tpn`"/>\r
+                                                            <parameter name="label-end" value="`$label-restriction.label-end.te-label-tpn`"/>\r
+                                                            <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>\r
+                                                            <parameter name="label-step" value="`$label-restriction.label-step`"/>\r
+                                                            <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>\r
+                                                            <outcome value="success">\r
+                                                                <block/>\r
+                                                            </outcome>\r
+                                                            <outcome value="failure">\r
+                                                                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="label-restriction.id = $unique-lrId">\r
+                                                                    <parameter name="id" value="`$unique-lrId`"/>\r
+                                                                    <parameter name="label-start" value="`$label-restriction.label-start.te-label-tpn`"/>\r
+                                                                    <parameter name="label-end" value="`$label-restriction.label-end.te-label-tpn`"/>\r
+                                                                    <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>\r
+                                                                    <parameter name="label-step" value="`$label-restriction.label-step`"/>\r
+                                                                    <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>\r
+                                                                </save>\r
+                                                            </outcome>\r
+                                                        </save>\r
+                                                        <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">\r
+                                                            <parameter name="relationship-list.relationship[0].related-to" value="logical-link"/>\r
+                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $alt-unique-linkId`"/>\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name"/>\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$alt-unique-linkId`"/>\r
+                                                        </save>\r
+                                                        <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">\r
+                                                            <parameter name="relationship-list.relationship[0].related-to" value="label-restriction"/>\r
+                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id"/>\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-lrId`"/>\r
+                                                        </save>\r
+                                                    </for>\r
+                                                </outcome>\r
+                                            </switch>\r
                                         </block>\r
                                     </outcome>\r
-                                    <outcome value='not-found'>\r
-                                        <block atomic='true'>\r
-                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \r
-      key='logical-link.link-name = $alt-unique-linkId' >\r
-                                                <parameter name='link-name' value='`$alt-unique-linkId`' />\r
-                                                <parameter name='link-id' value='`$link.link-id`' />\r
-                                                <parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\r
+                                    <outcome value="not-found">\r
+                                        <block atomic="true">\r
+                                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $alt-unique-linkId">\r
+                                                <parameter name="link-name" value="`$alt-unique-linkId`"/>\r
+                                                <parameter name="link-id" value="`$link.link-id`"/>\r
+                                                <parameter name="link-type" value="`$link.te.te-link-attributes.access-type`"/>\r
                                             </save>\r
-                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \r
-      key='logical-link.link-name = $alt-unique-linkId' force="true" pfx="tmp.AnAI-data">\r
-                                                <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />\r
-                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />\r
-                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />\r
-                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`" />\r
+                                            <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">\r
+                                                <parameter name="relationship-list.relationship[0].related-to" value="p-interface"/>\r
+                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>\r
+                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name"/>\r
+                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`"/>\r
+                                            </save>\r
+                                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute" key="te-link-attribute.id = $link.te.te-link-attributes.name">\r
+                                                <parameter name="id" value="`$link.te.te-link-attributes.name`"/>\r
+                                                <parameter name="access-type" value="`$link.te.te-link-attributes.access-type`"/>\r
                                             </save>\r
-                                            <switch test='`$link.te.te-link-attributes.label-restriction`'>\r
-                                                <outcome value=''>\r
-                                                    <block></block>\r
+                                            <switch test="`$link.te.te-link-attributes.label-restriction_length`">\r
+                                                <outcome value="">\r
+                                                    <block/>\r
                                                 </outcome>\r
-                                                <outcome value='Other'>\r
-                                                    <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\r
+                                                <outcome value="0">\r
+                                                    <block/>\r
+                                                </outcome>\r
+                                                <outcome value="Other">\r
+                                                    <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">\r
+                                                        <set>\r
+                                                            <parameter name="label-restriction." value=""/>\r
+                                                            <parameter name="unique-lrId" value=""/>\r
+                                                        </set>\r
+                                                        <set>\r
+                                                            <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>\r
+                                                        </set>\r
                                                         <set>\r
-                                                            <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\r
-                                                            <parameter name='unique-lrId' value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`" />\r
+                                                            <parameter name="unique-lrId" value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`"/>\r
                                                         </set>\r
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
-      key='logical-link.link-name = $alt-unique-linkId\r
-      AND label-restriction.id = $unique-lrId' >\r
-                                                            <parameter name='id' value='`$unique-lrId`' />\r
-                                                            <parameter name='label-start' value='`$label-restriction.label-start`' />\r
-                                                            <parameter name='label-end' value='`$label-restriction.label-end`' />\r
-                                                            <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\r
-                                                            <parameter name='label-step' value='`$label-restriction.label-step`' />\r
-                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\r
-                                                            <outcome value='success'>\r
-                                                                <block></block>\r
+                                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="label-restriction.id = $unique-lrId">\r
+                                                            <parameter name="id" value="`$unique-lrId`"/>\r
+                                                            <parameter name="label-start" value="`$label-restriction.label-start.te-label-tpn`"/>\r
+                                                            <parameter name="label-end" value="`$label-restriction.label-end.te-label-tpn`"/>\r
+                                                            <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>\r
+                                                            <parameter name="label-step" value="`$label-restriction.label-step`"/>\r
+                                                            <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>\r
+                                                            <outcome value="success">\r
+                                                                <block/>\r
                                                             </outcome>\r
-                                                            <outcome value='failure'>\r
-                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
-      key='logical-link.link-name = $alt-unique-linkId\r
-      AND label-restriction.id = $unique-lrId' >\r
-                                                                    <parameter name='id' value='`$unique-lrId`' />\r
-                                                                    <parameter name='label-start' value='`$label-restriction.label-start`' />\r
-                                                                    <parameter name='label-end' value='`$label-restriction.label-end`' />\r
-                                                                    <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\r
-                                                                    <parameter name='label-step' value='`$label-restriction.label-step`' />\r
-                                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\r
-                                                                </update>\r
+                                                            <outcome value="failure">\r
+                                                                <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">\r
+                                                                    <parameter name="id" value="`$unique-lrId`"/>\r
+                                                                    <parameter name="label-start" value="`$label-restriction.label-start`"/>\r
+                                                                    <parameter name="label-end" value="`$label-restriction.label-end`"/>\r
+                                                                    <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>\r
+                                                                    <parameter name="label-step" value="`$label-restriction.label-step`"/>\r
+                                                                    <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>\r
+                                                                </save>\r
                                                             </outcome>\r
                                                         </save>\r
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \r
-      key='logical-link.link-name = $alt-unique-linkId' force="true" pfx="tmp.AnAI-data">\r
-                                                            <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction" />\r
-                                                            <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />\r
-                                                            <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id" />\r
-                                                            <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`" />\r
+                                                        <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">\r
+                                                            <parameter name="relationship-list.relationship[0].related-to" value="logical-link"/>\r
+                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $alt-unique-linkId`"/>\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name"/>\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$alt-unique-linkId`"/>\r
+                                                        </save>\r
+                                                        <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">\r
+                                                            <parameter name="relationship-list.relationship[0].related-to" value="label-restriction"/>\r
+                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id"/>\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-lrId`"/>\r
                                                         </save>\r
                                                     </for>\r
                                                 </outcome>\r
@@ -205,77 +274,89 @@
                                     </outcome>\r
                                 </get-resource>\r
                             </outcome>\r
-                            <outcome value='false'>\r
-                                <block atomic='true'>\r
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \r
-      key='logical-link.link-name = $unique-linkId' >\r
-                                        <parameter name='link-name' value='`$unique-linkId`' />\r
-                                        <parameter name='link-id' value='`$link.link-id`' />\r
-                                        <parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\r
+                            <outcome value="false">\r
+                                <block atomic="true">\r
+                                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $unique-linkId">\r
+                                        <parameter name="link-name" value="`$unique-linkId`"/>\r
+                                        <parameter name="link-id" value="`$link.link-id`"/>\r
+                                        <parameter name="link-type" value="`$link.te.te-link-attributes.access-type`"/>\r
                                     </save>\r
                                     <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />\r
-                                        <parameter name="field1" value="__TIMESTAMP__" />\r
-                                        <parameter name="field2" value="uniqueLinkId" />\r
-                                        <parameter name="field3" value="`$unique-linkId`" />\r
-                                        <parameter name="field4" value="srcTpId" />\r
-                                        <parameter name="field5" value="`$src-tpId`" />\r
-                                        <parameter name="field6" value="dstTpId" />\r
-                                        <parameter name="field7" value="`$dst-tpId`" />\r
+                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>\r
+                                        <parameter name="field1" value="__TIMESTAMP__"/>\r
+                                        <parameter name="field2" value="uniqueLinkId"/>\r
+                                        <parameter name="field3" value="`$unique-linkId`"/>\r
+                                        <parameter name="field4" value="srcTpId"/>\r
+                                        <parameter name="field5" value="`$src-tpId`"/>\r
+                                        <parameter name="field6" value="dstTpId"/>\r
+                                        <parameter name="field7" value="`$dst-tpId`"/>\r
                                     </record>\r
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \r
-      key='logical-link.link-name = $unique-linkId' force="true" pfx="tmp.AnAI-data">\r
-                                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />\r
-                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />\r
-                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />\r
-                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`" />\r
-                                        <parameter name="relationship-list.relationship[1].related-to" value="p-interface" />\r
-                                        <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`" />\r
-                                        <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name" />\r
-                                        <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`" />\r
+                                    <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">\r
+                                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface"/>\r
+                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>\r
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name"/>\r
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`"/>\r
+                                        <parameter name="relationship-list.relationship[1].related-to" value="p-interface"/>\r
+                                        <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`"/>\r
+                                        <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name"/>\r
+                                        <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`"/>\r
+                                    </save>\r
+                                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute" key="te-link-attribute.id = $link.te.te-link-attributes.name">\r
+                                        <parameter name="id" value="`$link.te.te-link-attributes.name`"/>\r
+                                        <parameter name="access-type" value="`$link.te.te-link-attributes.access-type`"/>\r
                                     </save>\r
-                                    <switch test='`$link.te.te-link-attributes.label-restriction`'>\r
-                                        <outcome value=''>\r
-                                            <block></block>\r
+                                    <switch test="`$link.te.te-link-attributes.label-restriction_length`">\r
+                                        <outcome value="">\r
+                                            <block/>\r
                                         </outcome>\r
-                                        <outcome value='Other'>\r
-                                            <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\r
-                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \r
-      key='logical-link.link-name = $unique-linkId' force="true" pfx="tmp.AnAI-data">\r
-                                                    <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction" />\r
-                                                    <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />\r
-                                                    <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id" />\r
-                                                    <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`" />\r
-                                                </save>\r
+                                        <outcome value="0">\r
+                                            <block/>\r
+                                        </outcome>\r
+                                        <outcome value="Other">\r
+                                            <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">\r
                                                 <set>\r
-                                                    <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\r
-                                                    <parameter name='unique-lrId' value="`$unique-linkId + '-lrId-' + $label-restriction.index`" />\r
+                                                    <parameter name="label-restriction." value=""/>\r
+                                                    <parameter name="unique-lrId" value=""/>\r
                                                 </set>\r
-                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
-      key='logical-link.link-name = $unique-linkId\r
-      AND label-restriction.id = $unique-lrId' >\r
-                                                    <parameter name='id' value='`$unique-lrId`' />\r
-                                                    <parameter name='label-start' value='`$label-restriction.label-start`' />\r
-                                                    <parameter name='label-end' value='`$label-restriction.label-end`' />\r
-                                                    <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\r
-                                                    <parameter name='label-step' value='`$label-restriction.label-step`' />\r
-                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\r
-                                                    <outcome value='success'>\r
-                                                        <block></block>\r
+                                                <set>\r
+                                                    <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>\r
+                                                </set>\r
+                                                <set>\r
+                                                    <parameter name="unique-lrId" value="`$unique-linkId + '-lrId-' + $label-restriction.index`"/>\r
+                                                </set>\r
+                                                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="label-restriction.id = $unique-lrId">\r
+                                                    <parameter name="id" value="`$unique-lrId`"/>\r
+                                                    <parameter name="label-start" value="`$label-restriction.label-start.te-label-tpn`"/>\r
+                                                    <parameter name="label-end" value="`$label-restriction.label-end.te-label-tpn`"/>\r
+                                                    <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>\r
+                                                    <parameter name="label-step" value="`$label-restriction.label-step`"/>\r
+                                                    <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>\r
+                                                    <outcome value="success">\r
+                                                        <block/>\r
                                                     </outcome>\r
-                                                    <outcome value='failure'>\r
-                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
-      key='logical-link.link-name = $unique-linkId\r
-      AND label-restriction.id = $unique-lrId' >\r
-                                                            <parameter name='id' value='`$unique-lrId`' />\r
-                                                            <parameter name='label-start' value='`$label-restriction.label-start`' />\r
-                                                            <parameter name='label-end' value='`$label-restriction.label-end`' />\r
-                                                            <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\r
-                                                            <parameter name='label-step' value='`$label-restriction.label-step`' />\r
-                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\r
-                                                        </update>\r
+                                                    <outcome value="failure">\r
+                                                        <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">\r
+                                                            <parameter name="id" value="`$unique-lrId`"/>\r
+                                                            <parameter name="label-start" value="`$label-restriction.label-start`"/>\r
+                                                            <parameter name="label-end" value="`$label-restriction.label-end`"/>\r
+                                                            <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>\r
+                                                            <parameter name="label-step" value="`$label-restriction.label-step`"/>\r
+                                                            <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>\r
+                                                        </save>\r
                                                     </outcome>\r
                                                 </save>\r
+                                                <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">\r
+                                                    <parameter name="relationship-list.relationship[0].related-to" value="logical-link"/>\r
+                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $unique-linkId`"/>\r
+                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name"/>\r
+                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-linkId`"/>\r
+                                                </save>\r
+                                                <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">\r
+                                                    <parameter name="relationship-list.relationship[0].related-to" value="label-restriction"/>\r
+                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>\r
+                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id"/>\r
+                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-lrId`"/>\r
+                                                </save>\r
                                             </for>\r
                                         </outcome>\r
                                     </switch>\r

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 f9b7d99..839e15d 100644 (file)
--- 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\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>\r
-    <method rpc='update-network-to-aai' mode='sync'>\r
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">\r
+    <method rpc="update-network-to-aai" mode="sync">\r
         <block atomic="true">\r
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">\r
                 <parameter name="source" value="`$network.network-id`"/>\r
-                <parameter name="outputPath" value="tmp.network-id"/>\r
+                <parameter name="outputPath" value="tmp.original-network-id"/>\r
                 <parameter name="target" value="/"/>\r
                 <parameter name="replacement" value="-"/>\r
             </execute>\r
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  \r
-     key='network-resource.network-id = $tmp.network-id' >\r
-                <parameter name='network-id' value='`$tmp.network-id`' />\r
-                <parameter name='client-id' value='`$network.client-id`' />\r
-                <parameter name='te-topo-id' value='`$network.te-topology-id`' />\r
-                <parameter name='provider-id' value='`$network.provider-id`' />\r
-                <parameter name='network-type' value='`$network.network-types`' />\r
+            <set>\r
+                <parameter name="tmp.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`"/>\r
+            </set>\r
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $tmp.network-id">\r
+                <parameter name="network-id" value="`$tmp.network-id`"/>\r
+                <parameter name="client-id" value="`$network.client-id`"/>\r
+                <parameter name="te-topo-id" value="`$network.te-topology-id`"/>\r
+                <parameter name="provider-id" value="`$network.provider-id`"/>\r
+                <parameter name="network-type" value="`$network.network-types`"/>\r
             </save>\r
-            <for index='pidx' start='0' end='`$network.node_length`' >\r
+            <for index="pidx" start="0" end="`$network.node_length`">\r
                 <set>\r
-                    <parameter name='node.' value='' />\r
+                    <parameter name="node." value=""/>\r
                 </set>\r
                 <set>\r
-                    <parameter name='node.' value='`$network.node[$pidx].`' />\r
-                    <parameter name='unique-networkId' value='`$tmp.network-id`' />\r
+                    <parameter name="node." value="`$network.node[$pidx].`"/>\r
+                    <parameter name="unique-networkId" value="`$tmp.network-id`"/>\r
                 </set>\r
                 <set>\r
-                    <parameter name='unique-nodeId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`" />\r
+                    <parameter name="unique-nodeId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`"/>\r
                 </set>\r
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \r
-      key='pnf.pnf-name = $unique-nodeId' >\r
-                    <parameter name='pnf-name' value='`$unique-nodeId`' />\r
-                    <parameter name='pnf-id' value='`$node.node-id`' />\r
-                    <parameter name='operational-status' value='`$node.te.oper-status`' />\r
-                    <parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />\r
-                    <parameter name='in-maint' value='true' />\r
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $unique-nodeId">\r
+                    <parameter name="pnf-name" value="`$unique-nodeId`"/>\r
+                    <parameter name="pnf-id" value="`$node.node-id`"/>\r
+                    <parameter name="operational-status" value="`$node.te.oper-status`"/>\r
+                    <parameter name="admin-status" value="`$node.te.te-node-attributes.admin-status`"/>\r
+                    <parameter name="in-maint" value="true"/>\r
                 </save>\r
-                <switch test='`$node.te.tunnel-termination-point_length`'>\r
-                    <outcome value=''>\r
-                        <block></block>\r
+                <switch test="`$node.te.tunnel-termination-point_length`">\r
+                    <outcome value="">\r
+                        <block/>\r
                     </outcome>\r
-                    <outcome value='0'>\r
-                        <block></block>\r
+                    <outcome value="0">\r
+                        <block/>\r
                     </outcome>\r
-                    <outcome value='Other'>\r
-                        <for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >\r
+                    <outcome value="Other">\r
+                        <for index="ttidx" start="0" end="`$node.te.tunnel-termination-point_length`">\r
                             <set>\r
-                                <parameter name='ttp.' value='' />\r
+                                <parameter name="ttp." value=""/>\r
                             </set>\r
                             <set>\r
-                                <parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />\r
+                                <parameter name="ttp." value="`$node.te.tunnel-termination-point[$ttidx].`"/>\r
                             </set>\r
                             <set>\r
-                                <parameter name='unique-ttpId' value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`" />\r
+                                <parameter name="unique-ttpId" value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`"/>\r
                             </set>\r
-                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \r
-      key='tunnel-termination-point.ttp-id = $unique-ttpId' >\r
-                                <parameter name='ttp-id' value='`$unique-ttpId`' />\r
-                                <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\r
-                                <parameter name='name' value='`$ttp.name`' />\r
-                                <parameter name='admin-status' value='`$ttp.admin-status`' />\r
-                                <parameter name='oper-status' value='`$ttp.oper-status`' />\r
-                                <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\r
-                                <parameter name='switching-capability' value='`$ttp.switching-capability`' />\r
-                                <parameter name='protection-type' value='`$ttp.protection-type`' />\r
-                                <parameter name='encoding' value='`$ttp.encoding`' />\r
-                                <outcome value='success'>\r
-                                    <block></block>\r
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $unique-ttpId">\r
+                                <parameter name="ttp-id" value="`$unique-ttpId`"/>\r
+                                <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>\r
+                                <parameter name="name" value="`$ttp.name`"/>\r
+                                <parameter name="admin-status" value="`$ttp.admin-status`"/>\r
+                                <parameter name="oper-status" value="`$ttp.oper-status`"/>\r
+                                <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id`"/>\r
+                                <parameter name="switching-capability" value="`$ttp.switching-capability`"/>\r
+                                <parameter name="protection-type" value="`$ttp.protection-type`"/>\r
+                                <parameter name="encoding" value="`$ttp.encoding`"/>\r
+                                <outcome value="success">\r
+                                    <block/>\r
                                 </outcome>\r
-                                <outcome value='failure'>\r
-                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \r
-      key='tunnel-termination-point.ttp-id = $unique-ttpId' >\r
-                                        <parameter name='ttp-id' value='`$unique-ttpId`' />\r
-                                        <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\r
-                                        <parameter name='name' value='`$ttp.name`' />\r
-                                        <parameter name='admin-status' value='`$ttp.admin-status`' />\r
-                                        <parameter name='oper-status' value='`$ttp.oper-status`' />\r
-                                        <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\r
-                                        <parameter name='switching-capability' value='`$ttp.switching-capability`' />\r
-                                        <parameter name='protection-type' value='`$ttp.protection-type`' />\r
-                                        <parameter name='encoding' value='`$ttp.encoding`' />\r
+                                <outcome value="failure">\r
+                                    <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $unique-ttpId">\r
+                                        <parameter name="ttp-id" value="`$unique-ttpId`"/>\r
+                                        <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>\r
+                                        <parameter name="name" value="`$ttp.name`"/>\r
+                                        <parameter name="admin-status" value="`$ttp.admin-status`"/>\r
+                                        <parameter name="oper-status" value="`$ttp.oper-status`"/>\r
+                                        <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id`"/>\r
+                                        <parameter name="switching-capability" value="`$ttp.switching-capability`"/>\r
+                                        <parameter name="protection-type" value="`$ttp.protection-type`"/>\r
+                                        <parameter name="encoding" value="`$ttp.encoding`"/>\r
                                     </update>\r
                                 </outcome>\r
                             </save>\r
-                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \r
-      key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">\r
-                                <parameter name="`relationship-list.relationship[$ttidx].related-to`" value="tunnel-termination-point" />\r
-                                <!--<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`" />-->\r
-                                <parameter name="`relationship-list.relationship[$ttidx].related-link`" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />\r
-                                <parameter name="`relationship-list.relationship[$ttidx].relationship-data[0].relationship-key`" value="tunnel-termination-point.ttp-id" />\r
-                                <parameter name="`relationship-list.relationship[$ttidx].relationship-data[0].relationship-value`" value="`$unique-ttpId`" />\r
-                                <outcome value='success'>\r
+                            <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">\r
+                                <parameter name="`relationship-list.relationship[$ttidx].related-to`" value="tunnel-termination-point"/>\r
+                                <!--\r
+                                <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`" />\r
+                                -->\r
+                                <parameter name="`relationship-list.relationship[$ttidx].related-link`" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`"/>\r
+                                <parameter name="`relationship-list.relationship[$ttidx].relationship-data[0].relationship-key`" value="tunnel-termination-point.ttp-id"/>\r
+                                <parameter name="`relationship-list.relationship[$ttidx].relationship-data[0].relationship-value`" value="`$unique-ttpId`"/>\r
+                                <outcome value="success">\r
                                     <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />\r
-                                        <parameter name="field1" value="__TIMESTAMP__" />\r
-                                        <parameter name="field2" value="sucess executing Hesam log file" />\r
-                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />\r
-                                        <parameter name="field4" value="`$node.termination-point_length`" />\r
-                                        <parameter name="field5" value="sucessfully saved ttp" />\r
-                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`" />\r
+                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>\r
+                                        <parameter name="field1" value="__TIMESTAMP__"/>\r
+                                        <parameter name="field2" value="sucess executing Hesam log file"/>\r
+                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>\r
+                                        <parameter name="field4" value="`$node.termination-point_length`"/>\r
+                                        <parameter name="field5" value="sucessfully saved ttp"/>\r
+                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`"/>\r
                                     </record>\r
                                 </outcome>\r
-                                <outcome value='failure'>\r
+                                <outcome value="failure">\r
                                     <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />\r
-                                        <parameter name="field1" value="__TIMESTAMP__" />\r
-                                        <parameter name="field2" value="sucess executing Hesam log file" />\r
-                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />\r
-                                        <parameter name="field4" value="`$node.termination-point_length`" />\r
-                                        <parameter name="field5" value="failuire on saving ttp" />\r
-                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`" />\r
+                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>\r
+                                        <parameter name="field1" value="__TIMESTAMP__"/>\r
+                                        <parameter name="field2" value="sucess executing Hesam log file"/>\r
+                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>\r
+                                        <parameter name="field4" value="`$node.termination-point_length`"/>\r
+                                        <parameter name="field5" value="failuire on saving ttp"/>\r
+                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`"/>\r
                                     </record>\r
                                 </outcome>\r
                             </save>\r
@@ -117,71 +115,91 @@
                     </outcome>\r
                 </switch>\r
                 <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                    <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />\r
-                    <parameter name="field1" value="__TIMESTAMP__" />\r
-                    <parameter name="field2" value="sucess executing Hesam log file" />\r
-                    <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />\r
-                    <parameter name="field4" value="`$node.termination-point_length`" />\r
+                    <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>\r
+                    <parameter name="field1" value="__TIMESTAMP__"/>\r
+                    <parameter name="field2" value="sucess executing Hesam log file"/>\r
+                    <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>\r
+                    <parameter name="field4" value="`$node.termination-point_length`"/>\r
                 </record>\r
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \r
-      key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">\r
-                    <parameter name="relationship-list.relationship[0].related-to" value="network-resource" />\r
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`" />\r
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id" />\r
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`" />\r
+                <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">\r
+                    <parameter name="relationship-list.relationship[0].related-to" value="network-resource"/>\r
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`"/>\r
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id"/>\r
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`"/>\r
                 </save>\r
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \r
-      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \r
-      force="true" pfx="tmp.AnAI-data">\r
-                    <parameter name="relationship-list.relationship[0].related-to" value="pnf" />\r
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`" />\r
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />\r
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`" />\r
+                <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">\r
+                    <parameter name="relationship-list.relationship[0].related-to" value="pnf"/>\r
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`"/>\r
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name"/>\r
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`"/>\r
                 </save>\r
-                <switch test='`$node.termination-point_length`'>\r
-                    <outcome value=''>\r
-                        <block></block>\r
+                <switch test="`$node.termination-point_length`">\r
+                    <outcome value="">\r
+                        <block/>\r
                     </outcome>\r
-                    <outcome value='0'>\r
-                        <block></block>\r
+                    <outcome value="0">\r
+                        <block/>\r
                     </outcome>\r
-                    <outcome value='Other'>\r
-                        <for index='tidx' start='0' end='`$node.termination-point_length`' >\r
+                    <outcome value="Other">\r
+                        <for index="tidx" start="0" end="`$node.termination-point_length`">\r
                             <set>\r
-                                <parameter name='tp.' value='' />\r
+                                <parameter name="tp." value=""/>\r
                             </set>\r
                             <set>\r
-                                <parameter name='tp.' value='`$node.termination-point[$tidx].`' />\r
+                                <parameter name="tp." value="`$node.termination-point[$tidx].`"/>\r
                             </set>\r
                             <set>\r
-                                <parameter name='unique-ltpId' value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`" />\r
+                                <parameter name="unique-ltpId" value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`"/>\r
                             </set>\r
-                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \r
-      key='pnf.pnf-name = $unique-nodeId\r
-      AND p-interface.interface-name = $unique-ltpId' >\r
-                                <parameter name='interface-name' value='`$unique-ltpId`' />\r
-                                <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\r
-                                <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\r
-                                <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\r
-                                <parameter name='operational-status' value='`$tp.te.oper-status`' />\r
-                                <parameter name='in-maint' value="true" />\r
-                                <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\r
+                            <switch test="`length($tp.te.inter-domain-plug-id) == 0`">\r
+                                <outcome value="true">\r
+                                    <set>\r
+                                        <parameter name="tmp.decoded-plug-id" value=""/>\r
+                                    </set>\r
+                                </outcome>\r
+                                <outcome value="false">\r
+                                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="base64DecodingAlgo">\r
+                                        <parameter name="encodedValue" value="`$tp.te.inter-domain-plug-id`"/>\r
+                                        <parameter name="decodedValue" value="tmp.decoded-plug-id"/>\r
+                                        <outcome value="success">\r
+                                            <block/>\r
+                                        </outcome>\r
+                                        <outcome value="failure">\r
+                                            <set>\r
+                                                <parameter name="tmp.decoded-plug-id" value="`$tp.te.inter-domain-plug-id`"/>\r
+                                            </set>\r
+                                        </outcome>\r
+                                    </execute>\r
+                                </outcome>\r
+                            </switch>\r
+                            <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">\r
+                                <parameter name="interface-name" value="`$unique-ltpId`"/>\r
+                                <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>\r
+                                <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>\r
+                                <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>\r
+                                <parameter name="operational-status" value="`$tp.te.oper-status`"/>\r
+                                <parameter name="in-maint" value="true"/>\r
+                                <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>\r
+                                <!--\r
                                 <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />\r
-                                <outcome value='success'>\r
-                                    <block></block>\r
+                                -->\r
+                                <parameter name="inter-domain-plug-id" value="`$tmp.decoded-plug-id`"/>\r
+                                <outcome value="success">\r
+                                    <block/>\r
                                 </outcome>\r
-                                <outcome value='failure'>\r
-                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \r
-      key='pnf.pnf-name = $unique-nodeId\r
-      AND p-interface.interface-name = $unique-ltpId' >\r
-                                        <parameter name='interface-name' value='`$unique-ltpId`' />\r
-                                        <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\r
-                                        <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\r
-                                        <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\r
-                                        <parameter name='operational-status' value='`$tp.te.oper-status`' />\r
-                                        <parameter name='in-maint' value="true" />\r
-                                        <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\r
+                                <outcome value="failure">\r
+                                    <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">\r
+                                        <parameter name="interface-name" value="`$unique-ltpId`"/>\r
+                                        <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>\r
+                                        <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>\r
+                                        <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>\r
+                                        <parameter name="operational-status" value="`$tp.te.oper-status`"/>\r
+                                        <parameter name="in-maint" value="true"/>\r
+                                        <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>\r
+                                        <!--\r
                                         <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />\r
+                                        -->\r
+                                        <parameter name="inter-domain-plug-id" value="`$tmp.decoded-plug-id`"/>\r
                                     </update>\r
                                 </outcome>\r
                             </save>\r
@@ -189,7 +207,7 @@
                     </outcome>\r
                 </switch>\r
             </for>\r
-            <call module='DataChange' rpc='update-network-links-to-aai' mode='sync' ></call>\r
+            <call module="DataChange" rpc="update-network-links-to-aai" mode="sync"/>\r
         </block>\r
     </method>\r
 </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 f009a80..b9dbae7 100644 (file)
--- 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\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>\r
-    <method rpc='update-tp-ttp-relationship' mode='sync'>\r
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">\r
+    <method rpc="update-tp-ttp-relationship" mode="sync">\r
         <block atomic="true">\r
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">\r
                 <parameter name="source" value="`$network-eth.network-id`"/>\r
                 <parameter name="outputPath" value="tmp.network-eth.network-id"/>\r
                 <parameter name="target" value="/"/>\r
                 <parameter name="replacement" value="-"/>\r
             </execute>\r
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">\r
                 <parameter name="source" value="`$network-otn.network-id`"/>\r
                 <parameter name="outputPath" value="tmp.network-otn.network-id"/>\r
                 <parameter name="target" value="/"/>\r
                 <parameter name="replacement" value="-"/>\r
             </execute>\r
-            <for index='pethidx' start='0' end='`$network-eth.node_length`' >\r
+            <for index="pethidx" start="0" end="`$network-eth.node_length`">\r
                 <set>\r
-                    <parameter name='node-eth.' value='`$network-eth.node[$pethidx].`' />\r
+                    <parameter name="node-eth." value="`$network-eth.node[$pethidx].`"/>\r
                 </set>\r
                 <set>\r
-                    <parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />\r
-                    <parameter name='unique-node-ethId' value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`" />\r
+                    <parameter name="unique-network-ethId" value="`$tmp.network-eth.network-id`"/>\r
+                    <parameter name="unique-node-ethId" value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`"/>\r
                 </set>\r
-                <for index='tidx' start='0' end='`$node-eth.termination-point_length`' >\r
-                    <set>\r
-                        <parameter name='tp-eth.' value='' />\r
-                    </set>\r
-                    <set>\r
-                        <parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />\r
-                    </set>\r
-                    <set>\r
-                        <parameter name='unique-ltpethId' value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`" />\r
-                    </set>\r
-                    <set>\r
-                        <parameter name='tp-inter-layer-lock-id' value='`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`' />\r
-                    </set>\r
-                    <for index='potnidx' start='0' end='`$network-otn.node_length`' >\r
-                        <set>\r
-                            <parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />\r
-                        </set>\r
-                        <set>\r
-                            <parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />\r
-                            <parameter name='unique-node-otnId' value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`" />\r
-                        </set>\r
-                        <for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >\r
+                <switch test="`$node-eth.termination-point_length`">\r
+                    <outcome value="">\r
+                        <block/>\r
+                    </outcome>\r
+                    <outcome value="0">\r
+                        <block/>\r
+                    </outcome>\r
+                    <outcome value="Other">\r
+                        <for index="tidx" start="0" end="`$node-eth.termination-point_length`">\r
                             <set>\r
-                                <parameter name='ttp.' value='' />\r
+                                <parameter name="tp-eth." value=""/>\r
                             </set>\r
                             <set>\r
-                                <parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />\r
+                                <parameter name="tp-eth." value="`$node-eth.termination-point[$tidx].`"/>\r
                             </set>\r
                             <set>\r
-                                <parameter name='unique-ttpId' value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`" />\r
+                                <parameter name="unique-ltpethId" value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`"/>\r
                             </set>\r
                             <set>\r
-                                <parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`' />\r
+                                <parameter name="tp-inter-layer-lock-id" value="`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`"/>\r
                             </set>\r
-                            <switch test='tp-inter-layer-lock-id'>\r
-                                <outcome value='ttp-inter-layer-lock-id'>\r
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \r
-      key='p-interface.interface-name = $unique-ltpethId' force="true" pfx="tmp.AnAI-data">\r
-                                        <parameter name="relationship-list.relationship[1].related-to" value="tunnel-termination-point" />\r
-                                        <parameter name="relationship-list.relationship[1].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`" />\r
-                                        <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id" />\r
-                                        <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$unique-ttpId`" />\r
-                                    </save>\r
-                                </outcome>\r
-                            </switch>\r
+                            <for index="potnidx" start="0" end="`$network-otn.node_length`">\r
+                                <set>\r
+                                    <parameter name="node-otn." value=""/>\r
+                                    <parameter name="unique-network-otnId" value=""/>\r
+                                    <parameter name="unique-node-otnId" value=""/>\r
+                                </set>\r
+                                <set>\r
+                                    <parameter name="node-otn." value="`$network-otn.node[$potnidx].`"/>\r
+                                </set>\r
+                                <set>\r
+                                    <parameter name="unique-network-otnId" value="`$tmp.network-otn.network-id`"/>\r
+                                    <parameter name="unique-node-otnId" value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`"/>\r
+                                </set>\r
+                                <switch test="`$node-otn.te.tunnel-termination-point_length`">\r
+                                    <outcome value="">\r
+                                        <block/>\r
+                                    </outcome>\r
+                                    <outcome value="0">\r
+                                        <block/>\r
+                                    </outcome>\r
+                                    <outcome value="Other">\r
+                                        <for index="ttidx" start="0" end="`$node-otn.te.tunnel-termination-point_length`">\r
+                                            <set>\r
+                                                <parameter name="ttp." value=""/>\r
+                                            </set>\r
+                                            <set>\r
+                                                <parameter name="ttp." value="`$node-otn.te.tunnel-termination-point[$ttidx].`"/>\r
+                                            </set>\r
+                                            <set>\r
+                                                <parameter name="unique-ttpId" value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`"/>\r
+                                            </set>\r
+                                            <set>\r
+                                                <parameter name="ttp-inter-layer-lock-id" value="`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`"/>\r
+                                            </set>\r
+                                            <switch test="`$tp-inter-layer-lock-id`">\r
+                                                <outcome value="`$ttp-inter-layer-lock-id`">\r
+                                                    <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">\r
+                                                        <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point"/>\r
+                                                        <parameter name="relationship-list.relationship[0].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`"/>\r
+                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id"/>\r
+                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>\r
+                                                    </save>\r
+                                                </outcome>\r
+                                            </switch>\r
+                                        </for>\r
+                                    </outcome>\r
+                                </switch>\r
+                            </for>\r
                         </for>\r
-                    </for>\r
-                </for>\r
+                    </outcome>\r
+                </switch>\r
             </for>\r
         </block>\r
     </method>\r