From 13267a899ccd06491f79f653caf1483957563149 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Mon, 22 Feb 2021 15:30:38 +0000
Subject: Supporting 3 or more network domains for Transport Slicing use case.
 Issue-ID: SDNC-1487

Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: Ia497741d70eff0f5fba12ad487f0f240709b5cb5

Former-commit-id: c2ff57f8ac2f830bb4709a29dca9644dd8d4c82d
---
 .../DataChange_esr-thirdparty-sdnc-discovery.json  | 990 +++++++++++----------
 .../DataChange_esr-thirdparty-sdnc-discovery.xml   |   6 +
 2 files changed, 507 insertions(+), 489 deletions(-)

(limited to 'platform-logic/datachange')

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 ead08f44..862817a3 100644
--- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
@@ -1,243 +1,243 @@
 [
     {
-        "id": "3872acaa.809c44",
+        "id": "e773e89.91c6b98",
         "type": "other",
         "name": "update",
         "xml": "<outcome value='Update'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 710,
-        "y": 305,
-        "z": "8cb67e95.d771b8",
+        "x": 716,
+        "y": 331,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "5a988226.7d9fdc"
+                "e959cc87.47852"
             ]
         ]
     },
     {
-        "id": "dbb694.b27a417",
+        "id": "c1b624e8.c4a36",
         "type": "other",
         "name": "delete",
         "xml": "<outcome value='Delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 710,
-        "y": 385,
-        "z": "8cb67e95.d771b8",
+        "x": 716,
+        "y": 411,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "754f4acc.eae6dc"
+                "f94d770b.d7a21"
             ]
         ]
     },
     {
-        "id": "754f4acc.eae6dc",
+        "id": "f94d770b.d7a21",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 851.5,
-        "y": 385,
-        "z": "8cb67e95.d771b8",
+        "x": 857.5,
+        "y": 411,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "983792ba.976408"
+                "4f7d3c56.d58604"
             ]
         ]
     },
     {
-        "id": "4cc508ad.f5c7d",
+        "id": "a0413cd2.f1f8e8",
         "type": "switchNode",
         "name": "switch aai-event-trigger",
         "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 540.5,
-        "y": 345,
-        "z": "8cb67e95.d771b8",
+        "x": 546.5,
+        "y": 371,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "3872acaa.809c44",
-                "dbb694.b27a417"
+                "e773e89.91c6b98",
+                "c1b624e8.c4a36"
             ]
         ]
     },
     {
-        "id": "f974c517.d68cd",
+        "id": "24096151.ae8cf6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1237.5,
-        "y": 216,
-        "z": "8cb67e95.d771b8",
+        "x": 1243.5,
+        "y": 242,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "29d0fcfc.c3657c",
-                "80deb47b.7e9e",
-                "f9b155cc.d14098",
-                "c374fd8f.2c9bc8",
-                "31237f4.62f8c"
+                "d3849c0c.290268",
+                "2e3a9914.38f54e",
+                "5d9111f6.fc1a7",
+                "e1aa7ec9.6ea95",
+                "4884da36.8dcb24"
             ]
         ]
     },
     {
-        "id": "80deb47b.7e9e",
+        "id": "2e3a9914.38f54e",
         "type": "execute",
         "name": "execute RestApiCallNode Get token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1510.5001983642578,
-        "y": 137.00000953674316,
-        "z": "8cb67e95.d771b8",
+        "x": 1516.5001983642578,
+        "y": 163.00000953674316,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "6d5b07.e87e6cf8",
-                "403286df.c4eed8"
+                "e0b90864.1c659",
+                "2d5ac090.7f4d28"
             ]
         ]
     },
     {
-        "id": "6d5b07.e87e6cf8",
+        "id": "e0b90864.1c659",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1800.000244140625,
-        "y": 129,
-        "z": "8cb67e95.d771b8",
+        "x": 1806.000244140625,
+        "y": 155,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "b95a0f0f.c5f4"
+                "fbadc5f1.b9042"
             ]
         ]
     },
     {
-        "id": "403286df.c4eed8",
+        "id": "2d5ac090.7f4d28",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1796.000244140625,
-        "y": 169,
-        "z": "8cb67e95.d771b8",
+        "x": 1802.000244140625,
+        "y": 195,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "f35984bc.58f298"
+                "8ebd62d2.d420b"
             ]
         ]
     },
     {
-        "id": "b95a0f0f.c5f4",
+        "id": "fbadc5f1.b9042",
         "type": "set",
         "name": "set token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
         "comments": "",
-        "x": 1950.500244140625,
-        "y": 129,
-        "z": "8cb67e95.d771b8",
+        "x": 1956.500244140625,
+        "y": 155,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "c03c3a2.5764a48",
+        "id": "74d21b60.35097c",
         "type": "execute",
         "name": "execute RestApiCallNode Get Topology",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2017.500244140625,
-        "y": 249,
-        "z": "8cb67e95.d771b8",
+        "x": 2023.500244140625,
+        "y": 275,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "986cb045.40c5",
-                "e9ec571f.c3cfe8"
+                "73b2188f.535b88",
+                "e3942d82.1d981"
             ]
         ]
     },
     {
-        "id": "986cb045.40c5",
+        "id": "73b2188f.535b88",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2260.000244140625,
-        "y": 269,
-        "z": "8cb67e95.d771b8",
+        "x": 2266.000244140625,
+        "y": 295,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "7a144ec7.8a9348"
+                "4a760f4a.5cb7e8"
             ]
         ]
     },
     {
-        "id": "7a144ec7.8a9348",
+        "id": "4a760f4a.5cb7e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2417.500244140625,
-        "y": 269,
-        "z": "8cb67e95.d771b8",
+        "x": 2423.500244140625,
+        "y": 295,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "55ea6ad.8497214",
-                "ad96f3f.ca0439"
+                "300a5bac.b9481c",
+                "ad97aa98.c768d"
             ]
         ]
     },
     {
-        "id": "c2f07a72.d9a858",
+        "id": "8f9fe5f7.1e28d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
         "comments": "",
-        "x": 2394.000244140625,
-        "y": 169,
-        "z": "8cb67e95.d771b8",
+        "x": 2400.000244140625,
+        "y": 195,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "e9ec571f.c3cfe8",
+        "id": "e3942d82.1d981",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2256.000244140625,
-        "y": 169,
-        "z": "8cb67e95.d771b8",
+        "x": 2262.000244140625,
+        "y": 195,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "c2f07a72.d9a858"
+                "8f9fe5f7.1e28d"
             ]
         ]
     },
     {
-        "id": "7d5868e5.98eab",
+        "id": "52ac41c0.5bfd18",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 163,
-        "y": 80,
-        "z": "8cb67e95.d771b8",
+        "x": 169,
+        "y": 106,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "22d8189e.4866f"
+                "2f07965a.1dd8e2"
             ]
         ]
     },
     {
-        "id": "22d8189e.4866f",
+        "id": "2f07965a.1dd8e2",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -245,1243 +245,1255 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>",
         "outputs": 1,
-        "x": 176,
-        "y": 140,
-        "z": "8cb67e95.d771b8",
+        "x": 182,
+        "y": 166,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "3a8b8af3.4d4416"
+                "be9d83e5.bff8b"
             ]
         ]
     },
     {
-        "id": "3a8b8af3.4d4416",
+        "id": "be9d83e5.bff8b",
         "type": "method",
         "name": "method esr-thirdparty-sdnc-discovery",
         "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 196,
-        "y": 220,
-        "z": "8cb67e95.d771b8",
+        "x": 202,
+        "y": 246,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "c8a85a4d.9e66f"
+                "dc3c6fc7.178d18"
             ]
         ]
     },
     {
-        "id": "c8a85a4d.9e66f",
+        "id": "dc3c6fc7.178d18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 443.5,
-        "y": 220,
-        "z": "8cb67e95.d771b8",
+        "x": 449.5,
+        "y": 246,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "cbd24389.ade708"
+                "febec156.8b3598"
             ]
         ]
     },
     {
-        "id": "55ea6ad.8497214",
+        "id": "300a5bac.b9481c",
         "type": "for",
         "name": "for each Network",
         "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2636.500244140625,
-        "y": 198,
-        "z": "8cb67e95.d771b8",
+        "x": 2642.500244140625,
+        "y": 224,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "1ed2d22d.82cc36"
+                "2eec7c8a.0065d4"
             ]
         ]
     },
     {
-        "id": "1ed2d22d.82cc36",
+        "id": "2eec7c8a.0065d4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2785.000244140625,
-        "y": 198,
-        "z": "8cb67e95.d771b8",
+        "x": 2791.000244140625,
+        "y": 224,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "852144d1.2cc6d",
-                "530a9a06.d69fc4"
+                "c6d65b06.9b8418",
+                "d5bb0470.a0963",
+                "51f49074.c67e58"
             ]
         ]
     },
     {
-        "id": "852144d1.2cc6d",
+        "id": "c6d65b06.9b8418",
         "type": "call",
         "name": "call update-network-to-aai",
         "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2964.000244140625,
-        "y": 218,
-        "z": "8cb67e95.d771b8",
+        "x": 2970.000244140625,
+        "y": 244,
+        "z": "8a5117b5.c01db8",
         "wires": [
             []
         ]
     },
     {
-        "id": "530a9a06.d69fc4",
+        "id": "d5bb0470.a0963",
         "type": "set",
         "name": "set network",
         "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
         "comments": "",
-        "x": 2919.000244140625,
-        "y": 178,
-        "z": "8cb67e95.d771b8",
+        "x": 2923.000244140625,
+        "y": 204,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "f35984bc.58f298",
+        "id": "8ebd62d2.d420b",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1916.000244140625,
-        "y": 169,
-        "z": "8cb67e95.d771b8",
+        "x": 1922.000244140625,
+        "y": 195,
+        "z": "8a5117b5.c01db8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a473b7cc.4471d8",
+        "id": "e262d253.cb79",
         "type": "comment",
         "name": "Do Nothing",
         "info": "",
         "comments": "",
-        "x": 2086.000244140625,
-        "y": 209,
-        "z": "8cb67e95.d771b8",
+        "x": 2092.000244140625,
+        "y": 235,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "d9afda1.5ca9828",
+        "id": "a6bffc76.37edc",
         "type": "switchNode",
         "name": "switch type",
         "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 963,
-        "y": 305,
-        "z": "8cb67e95.d771b8",
+        "x": 969,
+        "y": 331,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "7ea96e84.4a184",
-                "e5a11dd.415fde",
-                "11ea46b7.9ad609",
-                "a5c3b391.3c4aa"
+                "6f99e35d.de977c",
+                "c02a6e99.4562c",
+                "3d7935ef.04d57a",
+                "cfd2103d.fd26"
             ]
         ]
     },
     {
-        "id": "5a988226.7d9fdc",
+        "id": "e959cc87.47852",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 830,
-        "y": 305,
-        "z": "8cb67e95.d771b8",
+        "x": 836,
+        "y": 331,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "d9afda1.5ca9828"
+                "a6bffc76.37edc"
             ]
         ]
     },
     {
-        "id": "7ea96e84.4a184",
+        "id": "6f99e35d.de977c",
         "type": "other",
         "name": "SOTN",
         "xml": "<outcome value='SOTN'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1076,
-        "y": 216,
-        "z": "8cb67e95.d771b8",
+        "x": 1082,
+        "y": 242,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "f974c517.d68cd"
+                "24096151.ae8cf6"
             ]
         ]
     },
     {
-        "id": "e5a11dd.415fde",
+        "id": "c02a6e99.4562c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1105.5,
-        "y": 677.5001220703125,
-        "z": "8cb67e95.d771b8",
+        "x": 1111.5,
+        "y": 703.5001220703125,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "4a0581b6.8cbdf"
+                "1f5381b5.13672e"
             ]
         ]
     },
     {
-        "id": "4a0581b6.8cbdf",
+        "id": "1f5381b5.13672e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",
         "comments": "",
-        "x": 1291.75,
-        "y": 703.5001220703125,
-        "z": "8cb67e95.d771b8",
+        "x": 1297.75,
+        "y": 729.5001220703125,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "29d0fcfc.c3657c",
+        "id": "d3849c0c.290268",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1457.0001983642578,
-        "y": 97.00000953674316,
-        "z": "8cb67e95.d771b8",
+        "x": 1463.0001983642578,
+        "y": 123.00000953674316,
+        "z": "8a5117b5.c01db8",
         "wires": [
             []
         ]
     },
     {
-        "id": "f9b155cc.d14098",
+        "id": "5d9111f6.fc1a7",
         "type": "switchNode",
         "name": "switch prop.sdncRestApi.token_id",
         "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1503.5001983642578,
-        "y": 217.00000953674316,
-        "z": "8cb67e95.d771b8",
+        "x": 1509.5001983642578,
+        "y": 243.00000953674316,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "4e229170.2e1108",
-                "495c5d16.740274"
+                "8bff0ee3.9c1d08",
+                "46defe8b.c98d58"
             ]
         ]
     },
     {
-        "id": "4e229170.2e1108",
+        "id": "8bff0ee3.9c1d08",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1796.000244140625,
-        "y": 209,
-        "z": "8cb67e95.d771b8",
+        "x": 1802.000244140625,
+        "y": 235,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "b14dd129.fcf7f"
+                "4af5b25c.a6728c"
             ]
         ]
     },
     {
-        "id": "495c5d16.740274",
+        "id": "46defe8b.c98d58",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1796.000244140625,
-        "y": 249,
-        "z": "8cb67e95.d771b8",
+        "x": 1802.000244140625,
+        "y": 275,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "c03c3a2.5764a48"
+                "74d21b60.35097c"
             ]
         ]
     },
     {
-        "id": "b14dd129.fcf7f",
+        "id": "4af5b25c.a6728c",
         "type": "execute",
         "name": "execute RestApiCallNode Get Topology",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2017.500244140625,
-        "y": 209,
-        "z": "8cb67e95.d771b8",
+        "x": 2023.500244140625,
+        "y": 235,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "e9ec571f.c3cfe8",
-                "986cb045.40c5"
+                "e3942d82.1d981",
+                "73b2188f.535b88"
             ]
         ]
     },
     {
-        "id": "31237f4.62f8c",
+        "id": "4884da36.8dcb24",
         "type": "execute",
         "name": "execute RestconfDiscoveryNode",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscription' >\n<parameter name=\"subscriberId\" value=\"sotn-controller\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n<parameter name=\"module\" value=\"DataChange\" />\n<parameter name=\"rpc\" value=\"sotn-notification-handler\" />\n<parameter name=\"mode\" value=\"sync\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1500.0001983642578,
-        "y": 357.00000953674316,
-        "z": "8cb67e95.d771b8",
+        "x": 1506.0001983642578,
+        "y": 383.00000953674316,
+        "z": "8a5117b5.c01db8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c374fd8f.2c9bc8",
+        "id": "e1aa7ec9.6ea95",
         "type": "set",
         "name": "set encoding-format",
         "xml": "<set>\n<parameter name='input' value='ietf-subscribed-notifications:establish-subscription.input.' />\n<parameter name=\"`$input + 'encoding'`\" value=\"encode-json\" />",
         "comments": "",
-        "x": 1460.0001983642578,
-        "y": 317.00000953674316,
-        "z": "8cb67e95.d771b8",
+        "x": 1466.0001983642578,
+        "y": 343.00000953674316,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "47fcc4e5.c080a4",
+        "id": "bbab4551.0a236",
         "type": "comment",
         "name": "Notification subscription",
         "info": "",
         "comments": "",
-        "x": 1465.000343322754,
-        "y": 274.00000858306885,
-        "z": "8cb67e95.d771b8",
+        "x": 1471.000343322754,
+        "y": 300.00000858306885,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "cbd24389.ade708",
+        "id": "febec156.8b3598",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$prop.sdncRestApi.vendor == 'ZTE'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 150,
-        "y": 345,
-        "z": "8cb67e95.d771b8",
+        "x": 156,
+        "y": 371,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "f624fdf6.4a4ef8",
-                "67364ea6.885738"
+                "9a519619.b1895",
+                "48ffb5b3.b827e4"
             ]
         ]
     },
     {
-        "id": "f624fdf6.4a4ef8",
+        "id": "9a519619.b1895",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 337,
-        "y": 345,
-        "z": "8cb67e95.d771b8",
+        "x": 343,
+        "y": 371,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "4cc508ad.f5c7d"
+                "a0413cd2.f1f8e8"
             ]
         ]
     },
     {
-        "id": "67364ea6.885738",
+        "id": "48ffb5b3.b827e4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 111.00003051757812,
-        "y": 1101.75,
-        "z": "8cb67e95.d771b8",
+        "x": 117.00003051757812,
+        "y": 1127.75,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "48c54790.7a017"
+                "9ffa3ea5.b70bf"
             ]
         ]
     },
     {
-        "id": "48c54790.7a017",
+        "id": "9ffa3ea5.b70bf",
         "type": "call",
         "name": "call esr-thirdparty-sdnc-of-zte",
         "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 342.75,
-        "y": 1118.5000610351562,
-        "z": "8cb67e95.d771b8",
+        "x": 348.75,
+        "y": 1144.5000610351562,
+        "z": "8a5117b5.c01db8",
         "wires": [
             []
         ]
     },
     {
-        "id": "11ea46b7.9ad609",
+        "id": "3d7935ef.04d57a",
         "type": "other",
         "name": "TAPI",
         "xml": "<outcome value='TAPI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1154,
-        "y": 450,
-        "z": "8cb67e95.d771b8",
+        "x": 1160,
+        "y": 476,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "a1313060.f8d7d"
+                "4fe6a7b1.5767f"
             ]
         ]
     },
     {
-        "id": "a1313060.f8d7d",
+        "id": "4fe6a7b1.5767f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1317,
-        "y": 449,
-        "z": "8cb67e95.d771b8",
+        "x": 1323,
+        "y": 475,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "f271610b.da5a3"
+                "f9123ca9.fc888"
             ]
         ]
     },
     {
-        "id": "f271610b.da5a3",
+        "id": "f9123ca9.fc888",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/tapi/v2/topologies?topology-id-or-name=otn'`\"/>  \n    <parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>  \n    <parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>  \n    <parameter name=\"format\" value=\"json\"/>  \n    <parameter name=\"httpMethod\" value=\"get\"/>  \n    <parameter name=\"responsePrefix\" value=\"topologies\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n    <parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n    <parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n    <parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1478,
-        "y": 448,
-        "z": "8cb67e95.d771b8",
+        "x": 1484,
+        "y": 474,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "878204ba.609a58",
-                "1c89864.e323d7a"
+                "cc52ed00.f5d2c",
+                "dd1ac4e1.b59088"
             ]
         ]
     },
     {
-        "id": "1c89864.e323d7a",
+        "id": "dd1ac4e1.b59088",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1620,
-        "y": 524,
-        "z": "8cb67e95.d771b8",
+        "x": 1626,
+        "y": 550,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "5d965dcc.6101a4"
+                "f1e8f88.8710a88"
             ]
         ]
     },
     {
-        "id": "878204ba.609a58",
+        "id": "cc52ed00.f5d2c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1654,
-        "y": 445,
-        "z": "8cb67e95.d771b8",
+        "x": 1660,
+        "y": 471,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "4052d329.1b779c"
+                "54fdb7ce.6dd1a"
             ]
         ]
     },
     {
-        "id": "4052d329.1b779c",
+        "id": "54fdb7ce.6dd1a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n <parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing get topology TAPI rest api\" />\n\n",
         "comments": "",
-        "x": 1824,
-        "y": 444,
-        "z": "8cb67e95.d771b8",
+        "x": 1830,
+        "y": 470,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "5d965dcc.6101a4",
+        "id": "f1e8f88.8710a88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1781,
-        "y": 523,
-        "z": "8cb67e95.d771b8",
+        "x": 1787,
+        "y": 549,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "d1531df6.3732f"
+                "f8f968a.7a53a98"
             ]
         ]
     },
     {
-        "id": "d1531df6.3732f",
+        "id": "f8f968a.7a53a98",
         "type": "for",
         "name": "for each topology",
         "xml": "<for index='tidx' start='0' end=\"`$topologies.topology_length`\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1960,
-        "y": 523,
-        "z": "8cb67e95.d771b8",
+        "x": 1966,
+        "y": 549,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "8b55167c.96333"
+                "3fb827df.939078"
             ]
         ]
     },
     {
-        "id": "8b55167c.96333",
+        "id": "3fb827df.939078",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2127,
-        "y": 524,
-        "z": "8cb67e95.d771b8",
+        "x": 2133,
+        "y": 550,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "e7e4969d.73ce58",
-                "9e2e1ddf.baa2b"
+                "6c8666ff.44e6e8",
+                "8622f8e6.4ca888"
             ]
         ]
     },
     {
-        "id": "e7e4969d.73ce58",
+        "id": "6c8666ff.44e6e8",
         "type": "set",
         "name": "set topology",
         "xml": "<set>\n<parameter name='topology.' value='`$topologies.topology[$tidx].`' />\n",
         "comments": "",
-        "x": 2286,
-        "y": 525,
-        "z": "8cb67e95.d771b8",
+        "x": 2292,
+        "y": 551,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "9e2e1ddf.baa2b",
+        "id": "8622f8e6.4ca888",
         "type": "call",
         "name": "call tapi-update-network-to-aai",
         "xml": "<call module='DataChange' rpc='tapi-update-network-to-aai' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2277,
-        "y": 591,
-        "z": "8cb67e95.d771b8",
+        "x": 2283,
+        "y": 617,
+        "z": "8a5117b5.c01db8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a5c3b391.3c4aa",
+        "id": "cfd2103d.fd26",
         "type": "outcome",
         "name": "MSA",
         "xml": "<outcome value='MSA'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1124.677324295044,
-        "y": 606.8993349075317,
-        "z": "8cb67e95.d771b8",
+        "x": 1130.677324295044,
+        "y": 632.8993349075317,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "1925d7f4.b889a8"
+                "787c580c.21a83"
             ]
         ]
     },
     {
-        "id": "1925d7f4.b889a8",
+        "id": "787c580c.21a83",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1286.6773872375488,
-        "y": 604.899335861206,
-        "z": "8cb67e95.d771b8",
+        "x": 1292.6773872375488,
+        "y": 630.899335861206,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "7ba5724d.ffaffc"
+                "cb55af39.dad0b"
             ]
         ]
     },
     {
-        "id": "7ba5724d.ffaffc",
+        "id": "cb55af39.dad0b",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/openroadm/v2/networks/otn-topology'`\"/>  \n    <parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>  \n    <parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>  \n    <parameter name=\"format\" value=\"json\"/>  \n    <parameter name=\"httpMethod\" value=\"get\"/>  \n    <parameter name=\"responsePrefix\" value=\"networks\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.msa.jks\"/>  \n    <parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n    <parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n    <parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1463.6771354675293,
-        "y": 596.8992919921875,
-        "z": "8cb67e95.d771b8",
+        "x": 1469.6771354675293,
+        "y": 622.8992919921875,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "6946de0a.deebc",
-                "5d4a6514.4c3a9c"
+                "55b8f3fc.f2c404",
+                "dba7d725.59fa18"
             ]
         ]
     },
     {
-        "id": "6946de0a.deebc",
+        "id": "55b8f3fc.f2c404",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1616.6771354675293,
-        "y": 593.8992919921875,
-        "z": "8cb67e95.d771b8",
+        "x": 1622.6771354675293,
+        "y": 619.8992919921875,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "e290e7ee.1a21f"
+                "2cc6fdd5.2640a2"
             ]
         ]
     },
     {
-        "id": "e290e7ee.1a21f",
+        "id": "2cc6fdd5.2640a2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n <parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing get topology MSA rest api\" />\n\n",
         "comments": "",
-        "x": 1791.6771354675293,
-        "y": 592.8992919921875,
-        "z": "8cb67e95.d771b8",
+        "x": 1797.6771354675293,
+        "y": 618.8992919921875,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "5d4a6514.4c3a9c",
+        "id": "dba7d725.59fa18",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1622.6771354675293,
-        "y": 666.8992919921875,
-        "z": "8cb67e95.d771b8",
+        "x": 1628.6771354675293,
+        "y": 692.8992919921875,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "815556fb.bd9668"
+                "170b822d.317ece"
             ]
         ]
     },
     {
-        "id": "815556fb.bd9668",
+        "id": "170b822d.317ece",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1806.6771354675293,
-        "y": 668.8992919921875,
-        "z": "8cb67e95.d771b8",
+        "x": 1812.6771354675293,
+        "y": 694.8992919921875,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "9834a552.e8e02"
+                "8f4caf49.c88e68"
             ]
         ]
     },
     {
-        "id": "9834a552.e8e02",
+        "id": "8f4caf49.c88e68",
         "type": "call",
         "name": "call msa-update-network-to-aai",
         "xml": "<call module='DataChange' rpc='msa-update-network-to-aai' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2085.677001953125,
-        "y": 666.8992919921875,
-        "z": "8cb67e95.d771b8",
+        "x": 2091.677001953125,
+        "y": 692.8992919921875,
+        "z": "8a5117b5.c01db8",
         "wires": [
             []
         ]
     },
     {
-        "id": "983792ba.976408",
+        "id": "4f7d3c56.d58604",
         "type": "switchNode",
         "name": "switch type",
         "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 256.566650390625,
-        "y": 835.5666809082031,
-        "z": "8cb67e95.d771b8",
+        "x": 262.566650390625,
+        "y": 861.5666809082031,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "674a6a9f.8c143c",
-                "42c7b2ab.76125c",
-                "1501fed.f113881"
+                "7c479945.15b6c",
+                "41dab8d.79e9dc8",
+                "fb32359d.de7e3"
             ]
         ]
     },
     {
-        "id": "674a6a9f.8c143c",
+        "id": "7c479945.15b6c",
         "type": "outcome",
         "name": "MSA",
         "xml": "<outcome value='MSA'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 435.857177734375,
-        "y": 752.9285888671875,
-        "z": "8cb67e95.d771b8",
+        "x": 441.857177734375,
+        "y": 778.9285888671875,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "8b3cf345.6948d"
+                "d9d0d78b.47d9f"
             ]
         ]
     },
     {
-        "id": "42c7b2ab.76125c",
+        "id": "41dab8d.79e9dc8",
         "type": "other",
         "name": "TAPI",
         "xml": "<outcome value='TAPI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 444.6070556640625,
-        "y": 1003.6428527832031,
-        "z": "8cb67e95.d771b8",
+        "x": 450.6070556640625,
+        "y": 1029.6428527832031,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "ec6a41aa.381fd"
+                "1a2de346.3f0ebd"
             ]
         ]
     },
     {
-        "id": "8b3cf345.6948d",
+        "id": "d9d0d78b.47d9f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 589.607177734375,
-        "y": 749.7143249511719,
-        "z": "8cb67e95.d771b8",
+        "x": 595.607177734375,
+        "y": 775.7143249511719,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "49d8550e.67af3c",
-                "db848d25.52ee9"
+                "e787c325.7a3d48",
+                "e74f02d1.684a5"
             ]
         ]
     },
     {
-        "id": "ec6a41aa.381fd",
+        "id": "1a2de346.3f0ebd",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 594,
-        "y": 1003.5,
-        "z": "8cb67e95.d771b8",
+        "x": 600,
+        "y": 1029.5,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "1335976f.2d9b19",
-                "16c45478.af99e4"
+                "39caa350.271204",
+                "14436f1d.f47b89"
             ]
         ]
     },
     {
-        "id": "1501fed.f113881",
+        "id": "fb32359d.de7e3",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 547,
-        "y": 1167.5,
-        "z": "8cb67e95.d771b8",
+        "x": 553,
+        "y": 1193.5,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "41c63854.9379a8"
+                "33b66d76.b73a6a"
             ]
         ]
     },
     {
-        "id": "41c63854.9379a8",
+        "id": "33b66d76.b73a6a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",
         "comments": "",
-        "x": 709,
-        "y": 1206.5,
-        "z": "8cb67e95.d771b8",
+        "x": 715,
+        "y": 1232.5,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "49d8550e.67af3c",
+        "id": "e787c325.7a3d48",
         "type": "get-resource",
         "name": "get resources from DB -controller_id",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE controller_id = $controllerid'\npfx='dbcontrollerid'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 821.5,
-        "y": 797.5,
-        "z": "8cb67e95.d771b8",
+        "x": 827.5,
+        "y": 823.5,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "1a8d1895.ab6a47",
-                "47ef9d8f.3964f4",
-                "d98324ce.97ca8"
+                "48ef075d.23d478",
+                "6aefa7bc.0e864",
+                "b6643c83.4fa068"
             ]
         ]
     },
     {
-        "id": "db848d25.52ee9",
+        "id": "e74f02d1.684a5",
         "type": "set",
         "name": "set controller_id",
         "xml": "<set>\n<parameter name='controllerid' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n\n\n",
         "comments": "",
-        "x": 781.5,
-        "y": 731.5,
-        "z": "8cb67e95.d771b8",
+        "x": 787.5,
+        "y": 757.5,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "1a8d1895.ab6a47",
+        "id": "48ef075d.23d478",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1060.5,
-        "y": 817.5,
-        "z": "8cb67e95.d771b8",
+        "x": 1066.5,
+        "y": 843.5,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "d1f9e1a7.c7f19"
+                "3a0200d5.7fabc"
             ]
         ]
     },
     {
-        "id": "d1f9e1a7.c7f19",
+        "id": "3a0200d5.7fabc",
         "type": "delete",
         "name": "delete from db",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid\">",
         "comments": "",
         "outputs": 1,
-        "x": 1229.5,
-        "y": 824.5,
-        "z": "8cb67e95.d771b8",
+        "x": 1235.5,
+        "y": 850.5,
+        "z": "8a5117b5.c01db8",
         "wires": [
             []
         ]
     },
     {
-        "id": "1335976f.2d9b19",
+        "id": "39caa350.271204",
         "type": "set",
         "name": "set controller_id",
         "xml": "<set>\n<parameter name='controllerid' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n\n\n",
         "comments": "",
-        "x": 758.5,
-        "y": 959.5,
-        "z": "8cb67e95.d771b8",
+        "x": 764.5,
+        "y": 985.5,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "16c45478.af99e4",
+        "id": "14436f1d.f47b89",
         "type": "get-resource",
         "name": "get resources from DB -controller_id",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE controller_id = $controllerid'\npfx='dbcontrollerid'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 771.5,
-        "y": 1048.5,
-        "z": "8cb67e95.d771b8",
+        "x": 777.5,
+        "y": 1074.5,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "a8a3e82f.8a5a8",
-                "ae0994a7.403ab8",
-                "e57ecfd9.55df58"
+                "82076a69.af01a",
+                "7b1e0312.764db4",
+                "5cc08e4.aa9e2f"
             ]
         ]
     },
     {
-        "id": "a8a3e82f.8a5a8",
+        "id": "82076a69.af01a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 996.5,
-        "y": 1063.5,
-        "z": "8cb67e95.d771b8",
+        "x": 1002.5,
+        "y": 1089.5,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "d7aae079.2ca2a"
+                "dc7dee5b.44e56"
             ]
         ]
     },
     {
-        "id": "d7aae079.2ca2a",
+        "id": "dc7dee5b.44e56",
         "type": "delete",
         "name": "delete from db",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid\">",
         "comments": "",
         "outputs": 1,
-        "x": 1167.5,
-        "y": 1064.5,
-        "z": "8cb67e95.d771b8",
+        "x": 1173.5,
+        "y": 1090.5,
+        "z": "8a5117b5.c01db8",
         "wires": [
             []
         ]
     },
     {
-        "id": "47ef9d8f.3964f4",
+        "id": "6aefa7bc.0e864",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1046.5,
-        "y": 896.5,
-        "z": "8cb67e95.d771b8",
+        "x": 1052.5,
+        "y": 922.5,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "1e298c8c.f0408b"
+                "2c713fb3.4d6888"
             ]
         ]
     },
     {
-        "id": "ae0994a7.403ab8",
+        "id": "7b1e0312.764db4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 977.5,
-        "y": 1136.5,
-        "z": "8cb67e95.d771b8",
+        "x": 983.5,
+        "y": 1162.5,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "c236971a.ee197"
+                "2bfd8d24.d64f22"
             ]
         ]
     },
     {
-        "id": "1e298c8c.f0408b",
+        "id": "2c713fb3.4d6888",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n <parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Failure in getting controller-id from DB\" />\n\n",
         "comments": "",
-        "x": 1207.5,
-        "y": 901.5,
-        "z": "8cb67e95.d771b8",
+        "x": 1213.5,
+        "y": 927.5,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "d98324ce.97ca8",
+        "id": "b6643c83.4fa068",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1037.5,
-        "y": 956.5,
-        "z": "8cb67e95.d771b8",
+        "x": 1043.5,
+        "y": 982.5,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "3416464c.a143ea"
+                "a2919cf8.1bf828"
             ]
         ]
     },
     {
-        "id": "3416464c.a143ea",
+        "id": "a2919cf8.1bf828",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n <parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"controller-id could not be found in DB\" />\n\n",
         "comments": "",
-        "x": 1186.5,
-        "y": 958.5,
-        "z": "8cb67e95.d771b8",
+        "x": 1192.5,
+        "y": 984.5,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "c236971a.ee197",
+        "id": "2bfd8d24.d64f22",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n <parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Failure in getting controller-id from DB\" />\n\n",
         "comments": "",
-        "x": 1125.5,
-        "y": 1137.5,
-        "z": "8cb67e95.d771b8",
+        "x": 1131.5,
+        "y": 1163.5,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "e57ecfd9.55df58",
+        "id": "5cc08e4.aa9e2f",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 977.5,
-        "y": 1180.5,
-        "z": "8cb67e95.d771b8",
+        "x": 983.5,
+        "y": 1206.5,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "d5ad8139.acdf48"
+                "2f855e70.bc0c7a"
             ]
         ]
     },
     {
-        "id": "d5ad8139.acdf48",
+        "id": "2f855e70.bc0c7a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n <parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"controller-id could not be found in DB\" />\n\n",
         "comments": "",
-        "x": 1142.5,
-        "y": 1177.5,
-        "z": "8cb67e95.d771b8",
+        "x": 1148.5,
+        "y": 1203.5,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "ad96f3f.ca0439",
+        "id": "ad97aa98.c768d",
         "type": "switchNode",
         "name": "switch network_length",
         "xml": "<switch test='`$topology.networks.network_length >= 2`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2653,
-        "y": 329,
-        "z": "8cb67e95.d771b8",
+        "x": 2659,
+        "y": 355,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "d135440e.332828"
+                "47f11a60.715fe4"
             ]
         ]
     },
     {
-        "id": "d135440e.332828",
+        "id": "47f11a60.715fe4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2835,
-        "y": 330,
-        "z": "8cb67e95.d771b8",
+        "x": 2841,
+        "y": 356,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "9dfbe1b1.0501b8"
+                "610c5ba8.ab12f4"
             ]
         ]
     },
     {
-        "id": "27de91fe.6ca4f6",
+        "id": "3f621874.83f7b",
         "type": "for",
         "name": "for each Network",
         "xml": "<for index='netidx' start='0' end='`$topology.networks.network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3208,
-        "y": 323,
-        "z": "8cb67e95.d771b8",
+        "x": 3214,
+        "y": 349,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "7ec0ad88.0666cc"
+                "47e16032.729b78"
             ]
         ]
     },
     {
-        "id": "7ec0ad88.0666cc",
+        "id": "47e16032.729b78",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3426,
-        "y": 320,
-        "z": "8cb67e95.d771b8",
+        "x": 3432,
+        "y": 346,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "8fdc47cc.432ab",
-                "b5eed741.5fbb08",
-                "1656178e.3ba998"
+                "cc7e5bc4.9fb7e8",
+                "8fc85a95.09a108",
+                "c99c88.f08ccb78"
             ]
         ]
     },
     {
-        "id": "5634a256.4e2744",
+        "id": "40eac1bc.82a228",
         "type": "call",
         "name": "call update-tp-ttp-relationship",
         "xml": "<call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3241,
-        "y": 383,
-        "z": "8cb67e95.d771b8",
+        "x": 3247,
+        "y": 409,
+        "z": "8a5117b5.c01db8",
         "wires": [
             []
         ]
     },
     {
-        "id": "9dfbe1b1.0501b8",
+        "id": "610c5ba8.ab12f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3005,
-        "y": 326,
-        "z": "8cb67e95.d771b8",
+        "x": 3011,
+        "y": 352,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "27de91fe.6ca4f6",
-                "5634a256.4e2744"
+                "3f621874.83f7b",
+                "40eac1bc.82a228"
             ]
         ]
     },
     {
-        "id": "1656178e.3ba998",
+        "id": "c99c88.f08ccb78",
         "type": "set",
         "name": "unset network",
         "xml": "<set>\n<parameter name='network.' value='' />\n",
         "comments": "",
-        "x": 3585,
-        "y": 260,
-        "z": "8cb67e95.d771b8",
+        "x": 3591,
+        "y": 286,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "8fdc47cc.432ab",
+        "id": "cc7e5bc4.9fb7e8",
         "type": "set",
         "name": "set network",
         "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$netidx].`' />\n",
         "comments": "",
-        "x": 3579,
-        "y": 308,
-        "z": "8cb67e95.d771b8",
+        "x": 3585,
+        "y": 334,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "b5eed741.5fbb08",
+        "id": "8fc85a95.09a108",
         "type": "switchNode",
         "name": "switch network-types with topologyId",
         "xml": "<switch test='`$network.te-topology-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3656,
-        "y": 355,
-        "z": "8cb67e95.d771b8",
+        "x": 3662,
+        "y": 381,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "c1423a29.1c46e8",
-                "ab490ddf.8e1c1"
+                "a101ef60.461f68",
+                "46ddd7fc.c3c038"
             ]
         ]
     },
     {
-        "id": "c1423a29.1c46e8",
+        "id": "a101ef60.461f68",
         "type": "outcome",
         "name": "1",
         "xml": "<outcome value='1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3882,
-        "y": 324,
-        "z": "8cb67e95.d771b8",
+        "x": 3888,
+        "y": 350,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "3c6e5d11.fbd2b2"
+                "9f9b045e.002478"
             ]
         ]
     },
     {
-        "id": "ab490ddf.8e1c1",
+        "id": "46ddd7fc.c3c038",
         "type": "outcome",
         "name": "2",
         "xml": "<outcome value='2'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3882,
-        "y": 385,
-        "z": "8cb67e95.d771b8",
+        "x": 3888,
+        "y": 411,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "654a57a4.0fd38"
+                "c00ddb6e.187aa"
             ]
         ]
     },
     {
-        "id": "adf965cc.3e515",
+        "id": "55fe80ee.35e4c",
         "type": "set",
         "name": "set network-otn",
         "xml": "<set>\n<parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\n",
         "comments": "",
-        "x": 4177,
-        "y": 324,
-        "z": "8cb67e95.d771b8",
+        "x": 4183,
+        "y": 350,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "f1dbbcab.0dda4",
+        "id": "b736da6.72f0128",
         "type": "set",
         "name": "set network eth",
         "xml": "<set>\n<parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\n",
         "comments": "",
-        "x": 4177,
-        "y": 385,
-        "z": "8cb67e95.d771b8",
+        "x": 4183,
+        "y": 411,
+        "z": "8a5117b5.c01db8",
         "wires": []
     },
     {
-        "id": "3c6e5d11.fbd2b2",
+        "id": "9f9b045e.002478",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4016,
-        "y": 324,
-        "z": "8cb67e95.d771b8",
+        "x": 4022,
+        "y": 350,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "adf965cc.3e515"
+                "55fe80ee.35e4c"
             ]
         ]
     },
     {
-        "id": "654a57a4.0fd38",
+        "id": "c00ddb6e.187aa",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4017,
-        "y": 385,
-        "z": "8cb67e95.d771b8",
+        "x": 4023,
+        "y": 411,
+        "z": "8a5117b5.c01db8",
         "wires": [
             [
-                "f1dbbcab.0dda4"
+                "b736da6.72f0128"
             ]
         ]
+    },
+    {
+        "id": "51f49074.c67e58",
+        "type": "set",
+        "name": "unset network",
+        "xml": "<set>\n<parameter name='network.' value='' />\n",
+        "comments": "",
+        "x": 2929,
+        "y": 154,
+        "z": "8a5117b5.c01db8",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
index 98585dbd..05c011b2 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
@@ -58,6 +58,9 @@
                                                             <block atomic="true">
                                                                 <for index='nidx' start='0' end='`$topology.networks.network_length`' >
                                                                     <block>
+                                                                        <set>
+                                                                            <parameter name='network.' value='' />
+                                                                        </set>
                                                                         <set>
                                                                             <parameter name='network.' value='`$topology.networks.network[$nidx].`' />
                                                                         </set>
@@ -125,6 +128,9 @@
                                                             <block atomic="true">
                                                                 <for index='nidx' start='0' end='`$topology.networks.network_length`' >
                                                                     <block>
+                                                                        <set>
+                                                                            <parameter name='network.' value='' />
+                                                                        </set>
                                                                         <set>
                                                                             <parameter name='network.' value='`$topology.networks.network[$nidx].`' />
                                                                         </set>
-- 
cgit 1.2.3-korg