From: Franklin Dsilva <franklin.dsilva@us.fujitsu.com>
Date: Thu, 16 Apr 2020 11:06:44 +0000 (+0000)
Subject: Few modifications in DataChange DGs
X-Git-Tag: 2.0.0~29^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=514181267234844f79768cef214ab5608ecab391

Few modifications in DataChange DGs

Change-Id: I608ffee7ab5b24013cc7136abb62faecb353587e
Issue-ID: SDNC-1144
Signed-off-by: Franklin Dsilva <franklin.dsilva@us.fujitsu.com>

Former-commit-id: 6ffbef3f0528e9cafecadf59317f5722942d8228
---

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 c3b31275..ca5ed7ae 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,252 +1,242 @@
 [
     {
-        "id": "cd2352df.fe133",
+        "id": "346770b6.e0b2e",
         "type": "other",
         "name": "update",
         "xml": "<outcome value='Update'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 717,
-        "y": 280,
-        "z": "1620e9e3.f93e5e",
+        "x": 666,
+        "y": 282,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "d7605eba.de53c8"
+                "ac79093c.29ec78"
             ]
         ]
     },
     {
-        "id": "a5fb8600.92c56",
+        "id": "2f504934.7894c6",
         "type": "other",
         "name": "delete",
-        "xml": "<outcome value='delete'>\n",
+        "xml": "<outcome value='Delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 717,
-        "y": 360,
-        "z": "1620e9e3.f93e5e",
+        "x": 666,
+        "y": 362,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "a9fa59c4.23eb88"
+                "5f23df82.9ac6e"
             ]
         ]
     },
     {
-        "id": "a9fa59c4.23eb88",
+        "id": "5f23df82.9ac6e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 858.5,
-        "y": 360,
-        "z": "1620e9e3.f93e5e",
+        "x": 807.5,
+        "y": 362,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
-            []
+            [
+                "dc10cae0.74e44"
+            ]
         ]
     },
     {
-        "id": "4266435.e82743c",
-        "type": "comment",
-        "name": "TODO: Delete topology from AAI",
-        "info": "",
-        "comments": "",
-        "x": 791.3335189819336,
-        "y": 327.96899485588074,
-        "z": "1620e9e3.f93e5e",
-        "wires": []
-    },
-    {
-        "id": "78227710.8145c",
+        "id": "5a242175.0e7ef",
         "type": "switchNode",
         "name": "switch aai-event-trigger",
         "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 547.5,
-        "y": 320,
-        "z": "1620e9e3.f93e5e",
+        "x": 496.5,
+        "y": 322,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "cd2352df.fe133",
-                "a5fb8600.92c56"
+                "346770b6.e0b2e",
+                "2f504934.7894c6"
             ]
         ]
     },
     {
-        "id": "6a609919.dbddb",
+        "id": "39f2e6f9.408272",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1244.5,
-        "y": 191,
-        "z": "1620e9e3.f93e5e",
+        "x": 1193.5,
+        "y": 193,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "a8db8257.07cda8",
-                "6c3c4f73.322ab8",
-                "49ad06a0.4e0b98",
-                "5d1f20b8.954bc8",
-                "8b00173e.a90248"
+                "97074a04.9156f",
+                "a612156e.6c82f",
+                "af67ee77.5ddb88",
+                "8f8e9805.87c3c8",
+                "9d5ac624.def28"
             ]
         ]
     },
     {
-        "id": "6c3c4f73.322ab8",
+        "id": "a612156e.6c82f",
         "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": 1517.5001983642578,
-        "y": 112.00000953674316,
-        "z": "1620e9e3.f93e5e",
+        "x": 1466.5001983642578,
+        "y": 114.00000953674316,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "4ca383bd.7f19f4",
-                "a7b25c4e.37855"
+                "e7c29f07.2a4d28",
+                "fe96d7c9.6dc11"
             ]
         ]
     },
     {
-        "id": "4ca383bd.7f19f4",
+        "id": "e7c29f07.2a4d28",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1807.000244140625,
-        "y": 104,
-        "z": "1620e9e3.f93e5e",
+        "x": 1756.000244140625,
+        "y": 106,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "bb6558fe.165e6"
+                "9a41c115.acccd8"
             ]
         ]
     },
     {
-        "id": "a7b25c4e.37855",
+        "id": "fe96d7c9.6dc11",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1803.000244140625,
-        "y": 144,
-        "z": "1620e9e3.f93e5e",
+        "x": 1752.000244140625,
+        "y": 146,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "929ec7a5.9a46b8"
+                "142d0bb2.73cbec"
             ]
         ]
     },
     {
-        "id": "bb6558fe.165e6",
+        "id": "9a41c115.acccd8",
         "type": "set",
         "name": "set token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
         "comments": "",
-        "x": 1957.500244140625,
-        "y": 104,
-        "z": "1620e9e3.f93e5e",
+        "x": 1906.500244140625,
+        "y": 106,
+        "z": "7bb5d2cb.8cfacc",
         "wires": []
     },
     {
-        "id": "3afa5b8a.d8b45c",
+        "id": "74c607f5.33c7f",
         "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": 2024.500244140625,
-        "y": 224,
-        "z": "1620e9e3.f93e5e",
+        "x": 1973.500244140625,
+        "y": 226,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "fe4ed86b.9ca41",
-                "6e1598d4.05ae"
+                "46585599.99541c",
+                "e4dc69e3.746e88"
             ]
         ]
     },
     {
-        "id": "fe4ed86b.9ca41",
+        "id": "46585599.99541c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2267.000244140625,
-        "y": 244,
-        "z": "1620e9e3.f93e5e",
+        "x": 2216.000244140625,
+        "y": 246,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "f8f7918f.b05da"
+                "c7c89355.9ce378"
             ]
         ]
     },
     {
-        "id": "f8f7918f.b05da",
+        "id": "c7c89355.9ce378",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2424.500244140625,
-        "y": 244,
-        "z": "1620e9e3.f93e5e",
+        "x": 2373.500244140625,
+        "y": 246,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "6837c77a.4d245",
-                "945331d0.def158"
+                "b3a801bb.6b3e08"
             ]
         ]
     },
     {
-        "id": "c26cc871.32d778",
+        "id": "4462058b.03bf7c",
         "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": 2401.000244140625,
-        "y": 144,
-        "z": "1620e9e3.f93e5e",
+        "x": 2350.000244140625,
+        "y": 146,
+        "z": "7bb5d2cb.8cfacc",
         "wires": []
     },
     {
-        "id": "6e1598d4.05ae",
+        "id": "e4dc69e3.746e88",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2263.000244140625,
-        "y": 144,
-        "z": "1620e9e3.f93e5e",
+        "x": 2212.000244140625,
+        "y": 146,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "c26cc871.32d778"
+                "4462058b.03bf7c"
             ]
         ]
     },
     {
-        "id": "74011233.c1b04c",
+        "id": "e48e789f.6305e8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 170,
-        "y": 55,
-        "z": "1620e9e3.f93e5e",
+        "x": 119,
+        "y": 57,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "7dcd2a77.b03e04"
+                "f17ff4c0.c3b85"
             ]
         ]
     },
     {
-        "id": "7dcd2a77.b03e04",
+        "id": "f17ff4c0.c3b85",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -254,1501 +244,1017 @@
         "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": 183,
-        "y": 115,
-        "z": "1620e9e3.f93e5e",
+        "x": 132,
+        "y": 117,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "e046753f.a8811"
+                "dcee4efc.fbc398"
             ]
         ]
     },
     {
-        "id": "e046753f.a8811",
+        "id": "dcee4efc.fbc398",
         "type": "method",
         "name": "method esr-thirdparty-sdnc-discovery",
         "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 203,
-        "y": 195,
-        "z": "1620e9e3.f93e5e",
+        "x": 152,
+        "y": 197,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "a7955eaa.8ebd"
+                "ee1d05c.842daf8"
             ]
         ]
     },
     {
-        "id": "a7955eaa.8ebd",
+        "id": "ee1d05c.842daf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 450.5,
-        "y": 195,
-        "z": "1620e9e3.f93e5e",
+        "x": 399.5,
+        "y": 197,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "cee74437.1c5038"
+                "289966fd.257632"
             ]
         ]
     },
     {
-        "id": "6837c77a.4d245",
+        "id": "b3a801bb.6b3e08",
         "type": "for",
         "name": "for each Network",
         "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2663.500244140625,
-        "y": 204,
-        "z": "1620e9e3.f93e5e",
+        "x": 1799.500259399414,
+        "y": 345.00001525878906,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "d73b1be.693fde8"
+                "f46be5c.444e598"
             ]
         ]
     },
     {
-        "id": "d73b1be.693fde8",
+        "id": "f46be5c.444e598",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2840.000244140625,
-        "y": 199,
-        "z": "1620e9e3.f93e5e",
+        "x": 1948.000259399414,
+        "y": 345.00001525878906,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "1071ecfb.db6683",
-                "22040d8e.81ad3a"
+                "9f7c6e21.8e3448",
+                "a45b31cf.5b428"
             ]
         ]
     },
     {
-        "id": "1071ecfb.db6683",
+        "id": "9f7c6e21.8e3448",
         "type": "call",
         "name": "call update-network-to-aai",
         "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3019.000244140625,
-        "y": 219,
-        "z": "1620e9e3.f93e5e",
+        "x": 2127.000259399414,
+        "y": 365.00001525878906,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             []
         ]
     },
     {
-        "id": "22040d8e.81ad3a",
+        "id": "a45b31cf.5b428",
         "type": "set",
         "name": "set network",
         "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
         "comments": "",
-        "x": 2974.000244140625,
-        "y": 179,
-        "z": "1620e9e3.f93e5e",
+        "x": 2082.000259399414,
+        "y": 325.00001525878906,
+        "z": "7bb5d2cb.8cfacc",
         "wires": []
     },
     {
-        "id": "929ec7a5.9a46b8",
+        "id": "142d0bb2.73cbec",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1923.000244140625,
-        "y": 144,
-        "z": "1620e9e3.f93e5e",
+        "x": 1872.000244140625,
+        "y": 146,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             []
         ]
     },
     {
-        "id": "a95e321b.626b1",
+        "id": "77d98c9a.bbdddc",
         "type": "comment",
         "name": "Do Nothing",
         "info": "",
         "comments": "",
-        "x": 2093.000244140625,
-        "y": 184,
-        "z": "1620e9e3.f93e5e",
+        "x": 2042.000244140625,
+        "y": 186,
+        "z": "7bb5d2cb.8cfacc",
         "wires": []
     },
     {
-        "id": "30eb5834.80e7d",
+        "id": "7a5efd17.5c18a4",
         "type": "switchNode",
         "name": "switch type",
         "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 970,
-        "y": 280,
-        "z": "1620e9e3.f93e5e",
+        "x": 919,
+        "y": 282,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "bad9968b.bbaf5",
-                "826758bc.846648",
-                "f43baf3c.399558",
-                "6e19e1c4.aa4d28"
+                "c610bb27.6f7938",
+                "f6f15d6a.b855f8",
+                "2ed61a13.0813c6",
+                "ca97ad3.a311cd"
             ]
         ]
     },
     {
-        "id": "d7605eba.de53c8",
+        "id": "ac79093c.29ec78",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 837,
-        "y": 280,
-        "z": "1620e9e3.f93e5e",
+        "x": 786,
+        "y": 282,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "30eb5834.80e7d"
+                "7a5efd17.5c18a4"
             ]
         ]
     },
     {
-        "id": "bad9968b.bbaf5",
+        "id": "c610bb27.6f7938",
         "type": "other",
         "name": "SOTN",
         "xml": "<outcome value='SOTN'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1083,
-        "y": 191,
-        "z": "1620e9e3.f93e5e",
+        "x": 1032,
+        "y": 193,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "6a609919.dbddb"
+                "39f2e6f9.408272"
             ]
         ]
     },
     {
-        "id": "826758bc.846648",
+        "id": "f6f15d6a.b855f8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1085.000087738037,
-        "y": 740.0001106262207,
-        "z": "1620e9e3.f93e5e",
+        "x": 1061.5,
+        "y": 654.5001220703125,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "8d466c1d.2dbd88"
+                "bacba57d.e755a8"
             ]
         ]
     },
     {
-        "id": "8d466c1d.2dbd88",
+        "id": "bacba57d.e755a8",
         "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": 1235.0000610351562,
-        "y": 736.0000972747803,
-        "z": "1620e9e3.f93e5e",
+        "x": 1247.75,
+        "y": 680.5001220703125,
+        "z": "7bb5d2cb.8cfacc",
         "wires": []
     },
     {
-        "id": "a8db8257.07cda8",
+        "id": "97074a04.9156f",
         "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": 1464.0001983642578,
-        "y": 72.00000953674316,
-        "z": "1620e9e3.f93e5e",
+        "x": 1413.0001983642578,
+        "y": 74.00000953674316,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             []
         ]
     },
     {
-        "id": "49ad06a0.4e0b98",
+        "id": "af67ee77.5ddb88",
         "type": "switchNode",
         "name": "switch prop.sdncRestApi.token_id",
         "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1510.5001983642578,
-        "y": 192.00000953674316,
-        "z": "1620e9e3.f93e5e",
+        "x": 1459.5001983642578,
+        "y": 194.00000953674316,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "8c8153ea.0d28b8",
-                "f01555ec.92788"
+                "196dbf86.289fe8",
+                "2e000adc.427cfe"
             ]
         ]
     },
     {
-        "id": "8c8153ea.0d28b8",
+        "id": "196dbf86.289fe8",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1803.000244140625,
-        "y": 184,
-        "z": "1620e9e3.f93e5e",
+        "x": 1752.000244140625,
+        "y": 186,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "6e76fd4a.c154c4"
+                "58dbe772.71f75"
             ]
         ]
     },
     {
-        "id": "f01555ec.92788",
+        "id": "2e000adc.427cfe",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1803.000244140625,
-        "y": 224,
-        "z": "1620e9e3.f93e5e",
+        "x": 1752.000244140625,
+        "y": 226,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "3afa5b8a.d8b45c"
+                "74c607f5.33c7f"
             ]
         ]
     },
     {
-        "id": "6e76fd4a.c154c4",
+        "id": "58dbe772.71f75",
         "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": 2024.500244140625,
-        "y": 184,
-        "z": "1620e9e3.f93e5e",
+        "x": 1973.500244140625,
+        "y": 186,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "6e1598d4.05ae",
-                "fe4ed86b.9ca41"
+                "e4dc69e3.746e88",
+                "46585599.99541c"
             ]
         ]
     },
     {
-        "id": "8b00173e.a90248",
+        "id": "9d5ac624.def28",
         "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": 1507.0001983642578,
-        "y": 332.00000953674316,
-        "z": "1620e9e3.f93e5e",
+        "x": 1456.0001983642578,
+        "y": 334.00000953674316,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             []
         ]
     },
     {
-        "id": "5d1f20b8.954bc8",
+        "id": "8f8e9805.87c3c8",
         "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": 1467.0001983642578,
-        "y": 292.00000953674316,
-        "z": "1620e9e3.f93e5e",
+        "x": 1416.0001983642578,
+        "y": 294.00000953674316,
+        "z": "7bb5d2cb.8cfacc",
         "wires": []
     },
     {
-        "id": "720c5fa5.cf9fc8",
+        "id": "bcab4612.fb18e",
         "type": "comment",
         "name": "Notification subscription",
         "info": "",
         "comments": "",
-        "x": 1472.000343322754,
-        "y": 249.00000858306885,
-        "z": "1620e9e3.f93e5e",
+        "x": 1421.000343322754,
+        "y": 251.00000858306885,
+        "z": "7bb5d2cb.8cfacc",
         "wires": []
     },
     {
-        "id": "cee74437.1c5038",
+        "id": "289966fd.257632",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$prop.sdncRestApi.vendor == 'ZTE'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 157,
-        "y": 320,
-        "z": "1620e9e3.f93e5e",
+        "x": 106,
+        "y": 322,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "68735a94.d40f5c",
-                "ab95c3e8.90657"
+                "8432bc7f.958c98",
+                "dbdc5153.c45968"
             ]
         ]
     },
     {
-        "id": "68735a94.d40f5c",
+        "id": "8432bc7f.958c98",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 344,
-        "y": 320,
-        "z": "1620e9e3.f93e5e",
+        "x": 293,
+        "y": 322,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "78227710.8145c"
+                "5a242175.0e7ef"
             ]
         ]
     },
     {
-        "id": "ab95c3e8.90657",
+        "id": "dbdc5153.c45968",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 345,
-        "y": 445,
-        "z": "1620e9e3.f93e5e",
+        "x": 67.00003051757812,
+        "y": 1078.75,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "9bf3753b.e16a38"
+                "94027433.59821"
             ]
         ]
     },
     {
-        "id": "9bf3753b.e16a38",
+        "id": "94027433.59821",
         "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": 568,
-        "y": 445,
-        "z": "1620e9e3.f93e5e",
+        "x": 298.75,
+        "y": 1095.5000610351562,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             []
         ]
     },
     {
-        "id": "f43baf3c.399558",
+        "id": "2ed61a13.0813c6",
         "type": "other",
         "name": "TAPI",
         "xml": "<outcome value='TAPI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1161,
-        "y": 425,
-        "z": "1620e9e3.f93e5e",
+        "x": 1110,
+        "y": 427,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "75540bd7.9ba5f4"
+                "4691c66b.5d4a4"
             ]
         ]
     },
     {
-        "id": "75540bd7.9ba5f4",
+        "id": "4691c66b.5d4a4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1324,
-        "y": 424,
-        "z": "1620e9e3.f93e5e",
+        "x": 1273,
+        "y": 426,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "a24deaa6.af3108"
+                "7dd7f464.c6c9e4"
             ]
         ]
     },
     {
-        "id": "a24deaa6.af3108",
+        "id": "7dd7f464.c6c9e4",
         "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": 1485,
-        "y": 423,
-        "z": "1620e9e3.f93e5e",
+        "x": 1434,
+        "y": 425,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "cdd2d534.962938",
-                "363290e2.c2512"
+                "4311848d.591ed4",
+                "fc46f47a.aebbb"
             ]
         ]
     },
     {
-        "id": "363290e2.c2512",
+        "id": "fc46f47a.aebbb",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1627,
-        "y": 499,
-        "z": "1620e9e3.f93e5e",
+        "x": 1576,
+        "y": 501,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "91d6cda6.f47358"
+                "cc96eb4.79b6718"
             ]
         ]
     },
     {
-        "id": "cdd2d534.962938",
+        "id": "4311848d.591ed4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1661,
-        "y": 420,
-        "z": "1620e9e3.f93e5e",
+        "x": 1610,
+        "y": 422,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "78d89c1.df36ce4"
+                "85a205fd.e6fe2"
             ]
         ]
     },
     {
-        "id": "78d89c1.df36ce4",
+        "id": "85a205fd.e6fe2",
         "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": 1831,
-        "y": 419,
-        "z": "1620e9e3.f93e5e",
+        "x": 1780,
+        "y": 421,
+        "z": "7bb5d2cb.8cfacc",
         "wires": []
     },
     {
-        "id": "91d6cda6.f47358",
+        "id": "cc96eb4.79b6718",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1788,
-        "y": 498,
-        "z": "1620e9e3.f93e5e",
+        "x": 1737,
+        "y": 500,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "68a08572.6d4e94"
+                "84ea29d7.966748"
             ]
         ]
     },
     {
-        "id": "68a08572.6d4e94",
+        "id": "84ea29d7.966748",
         "type": "for",
         "name": "for each topology",
         "xml": "<for index='tidx' start='0' end=\"`$topologies.topology_length`\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1967,
-        "y": 498,
-        "z": "1620e9e3.f93e5e",
+        "x": 1916,
+        "y": 500,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "e2491c10.3a12"
+                "23afbd29.52671a"
             ]
         ]
     },
     {
-        "id": "e2491c10.3a12",
+        "id": "23afbd29.52671a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2134,
-        "y": 499,
-        "z": "1620e9e3.f93e5e",
+        "x": 2083,
+        "y": 501,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "b1c3c921.3c12a",
-                "b5a39927.d40208"
+                "be671cf9.1f4a38",
+                "2c9a9e44.4d4e72"
             ]
         ]
     },
     {
-        "id": "b1c3c921.3c12a",
+        "id": "be671cf9.1f4a38",
         "type": "set",
         "name": "set topology",
         "xml": "<set>\n<parameter name='topology.' value='`$topologies.topology[$tidx].`' />\n",
         "comments": "",
-        "x": 2293,
-        "y": 500,
-        "z": "1620e9e3.f93e5e",
+        "x": 2242,
+        "y": 502,
+        "z": "7bb5d2cb.8cfacc",
         "wires": []
     },
     {
-        "id": "b5a39927.d40208",
+        "id": "2c9a9e44.4d4e72",
         "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": 2284,
-        "y": 566,
-        "z": "1620e9e3.f93e5e",
+        "x": 2233,
+        "y": 568,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             []
         ]
     },
     {
-        "id": "6e19e1c4.aa4d28",
+        "id": "ca97ad3.a311cd",
         "type": "outcome",
         "name": "MSA",
         "xml": "<outcome value='MSA'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1131.677324295044,
-        "y": 581.8993349075317,
-        "z": "1620e9e3.f93e5e",
+        "x": 1080.677324295044,
+        "y": 583.8993349075317,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "4227a936.fe14d"
+                "c2e22ff3.03e78"
             ]
         ]
     },
     {
-        "id": "4227a936.fe14d",
+        "id": "c2e22ff3.03e78",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1293.6773872375488,
-        "y": 579.899335861206,
-        "z": "1620e9e3.f93e5e",
+        "x": 1242.6773872375488,
+        "y": 581.899335861206,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "f20725de.f4794"
+                "cdc360bb.4f8c6"
             ]
         ]
     },
     {
-        "id": "f20725de.f4794",
+        "id": "cdc360bb.4f8c6",
         "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": 1470.6771354675293,
-        "y": 571.8992919921875,
-        "z": "1620e9e3.f93e5e",
+        "x": 1419.6771354675293,
+        "y": 573.8992919921875,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "49b0fd8b.249e2c",
-                "792d01db.8d11"
+                "150d6764.a614e9",
+                "1e259e4f.0e9d9a"
             ]
         ]
     },
     {
-        "id": "49b0fd8b.249e2c",
+        "id": "150d6764.a614e9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1623.6771354675293,
-        "y": 568.8992919921875,
-        "z": "1620e9e3.f93e5e",
+        "x": 1572.6771354675293,
+        "y": 570.8992919921875,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "85d21e1a.a14be8"
+                "a457e272.01c1b8"
             ]
         ]
     },
     {
-        "id": "85d21e1a.a14be8",
+        "id": "a457e272.01c1b8",
         "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": 1798.6771354675293,
-        "y": 567.8992919921875,
-        "z": "1620e9e3.f93e5e",
+        "x": 1747.6771354675293,
+        "y": 569.8992919921875,
+        "z": "7bb5d2cb.8cfacc",
         "wires": []
     },
     {
-        "id": "792d01db.8d11",
+        "id": "1e259e4f.0e9d9a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1629.6771354675293,
-        "y": 641.8992919921875,
-        "z": "1620e9e3.f93e5e",
+        "x": 1578.6771354675293,
+        "y": 643.8992919921875,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "d5110405.aee948"
+                "c148d343.01eac8"
             ]
         ]
     },
     {
-        "id": "d5110405.aee948",
+        "id": "c148d343.01eac8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1813.6771354675293,
-        "y": 643.8992919921875,
-        "z": "1620e9e3.f93e5e",
+        "x": 1762.6771354675293,
+        "y": 645.8992919921875,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "68851b61.ef75e4"
+                "f964e642.cb1ae"
             ]
         ]
     },
     {
-        "id": "68851b61.ef75e4",
+        "id": "f964e642.cb1ae",
         "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": 2092.677001953125,
-        "y": 641.8992919921875,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "945331d0.def158",
-        "type": "switchNode",
-        "name": "switch network_length",
-        "xml": "<switch test='`$topology.networks.network_length >= 2`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2684,
-        "y": 310,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "901d4e1a.652118",
-                "11935c8a.a490ab"
-            ]
-        ]
-    },
-    {
-        "id": "9c61f388.1f0838",
-        "type": "outcome",
-        "name": "2 Topologies (1 Domain)",
-        "xml": "<outcome value='2'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2894,
-        "y": 611,
-        "z": "1620e9e3.f93e5e",
+        "x": 2041.677001953125,
+        "y": 643.8992919921875,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             []
         ]
     },
     {
-        "id": "326c6d24.4336b2",
+        "id": "dc10cae0.74e44",
         "type": "switchNode",
-        "name": "switch network-types[0]",
-        "xml": "<switch test='`$topology.networks.network[0].network-types`'>\n",
+        "name": "switch type",
+        "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 4603,
-        "y": 400,
-        "z": "1620e9e3.f93e5e",
+        "x": 212.566650390625,
+        "y": 812.5666809082031,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "709f94a4.b34cf4",
-                "9cfb2d7f.448bd8"
+                "447a364c.b91ea8",
+                "f7872c45.99a4e",
+                "c8e48bf6.778e98"
             ]
         ]
     },
     {
-        "id": "709f94a4.b34cf4",
+        "id": "447a364c.b91ea8",
         "type": "outcome",
-        "name": "ethernet-topology",
-        "xml": "<outcome value='ethernet-topology'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4819,
-        "y": 400,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "6ad78f52.8d683"
-            ]
-        ]
-    },
-    {
-        "id": "6ad78f52.8d683",
-        "type": "switchNode",
-        "name": "switch network-types[1]",
-        "xml": "<switch test='`$topology.networks.network[1].network-types`'>\n",
+        "name": "MSA",
+        "xml": "<outcome value='MSA'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5044,
-        "y": 400,
-        "z": "1620e9e3.f93e5e",
+        "x": 391.857177734375,
+        "y": 729.9285888671875,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "4e12c36c.f82d3c",
-                "17b8d1f3.652706"
+                "a07fdc63.5a34d8"
             ]
         ]
     },
     {
-        "id": "4e12c36c.f82d3c",
-        "type": "outcome",
-        "name": "otn-topology",
-        "xml": "<outcome value='otn-topology'>\n",
+        "id": "f7872c45.99a4e",
+        "type": "other",
+        "name": "TAPI",
+        "xml": "<outcome value='TAPI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5280,
-        "y": 353,
-        "z": "1620e9e3.f93e5e",
+        "x": 400.6070556640625,
+        "y": 980.6428527832031,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "cd9d2417.06096"
+                "6d4308e1.31c5f"
             ]
         ]
     },
     {
-        "id": "172a24d9.92ec93",
-        "type": "call",
-        "name": "call update-tp-ttp-relationship",
-        "xml": "<call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 5696,
-        "y": 341,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "61a560e1.35c54",
-        "type": "set",
-        "name": "set networks",
-        "xml": "<set>\n<parameter name='network-eth.' value='`$topology.networks.network[0].`' />\n<parameter name='network-otn.' value='`$topology.networks.network[1].`' />\n",
-        "comments": "",
-        "x": 5541,
-        "y": 207,
-        "z": "1620e9e3.f93e5e",
-        "wires": []
-    },
-    {
-        "id": "9cfb2d7f.448bd8",
-        "type": "outcome",
-        "name": "otn-topology",
-        "xml": "<outcome value='otn-topology'>\n",
+        "id": "a07fdc63.5a34d8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4824,
-        "y": 457,
-        "z": "1620e9e3.f93e5e",
+        "x": 545.607177734375,
+        "y": 726.7143249511719,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "f16b5928.2b534"
+                "cfc4d202.c64d78",
+                "366bec81.83eddc"
             ]
         ]
     },
     {
-        "id": "cd9d2417.06096",
+        "id": "6d4308e1.31c5f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5462,
-        "y": 327,
-        "z": "1620e9e3.f93e5e",
+        "x": 550,
+        "y": 980.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "61a560e1.35c54",
-                "172a24d9.92ec93"
+                "6a48df29.ca491",
+                "62ccb800.ba59c8"
             ]
         ]
     },
     {
-        "id": "f16b5928.2b534",
-        "type": "switchNode",
-        "name": "switch network-types[1]",
-        "xml": "<switch test='`$topology.networks.network[1].network-types`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 5043,
-        "y": 459,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "b02955b9.ece2c",
-                "1f0d239a.a59004"
-            ]
-        ]
-    },
-    {
-        "id": "17b8d1f3.652706",
+        "id": "c8e48bf6.778e98",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5274,
-        "y": 412,
-        "z": "1620e9e3.f93e5e",
+        "x": 503,
+        "y": 1144.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "d245d127.681cb"
+                "ab761f62.a873d"
             ]
         ]
     },
     {
-        "id": "d245d127.681cb",
+        "id": "ab761f62.a873d",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "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": 5476,
-        "y": 410,
-        "z": "1620e9e3.f93e5e",
+        "x": 665,
+        "y": 1183.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": []
     },
     {
-        "id": "b02955b9.ece2c",
-        "type": "outcome",
-        "name": "ethernet-topology",
-        "xml": "<outcome value='ethernet-topology'>\n",
+        "id": "cfc4d202.c64d78",
+        "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": 5266,
-        "y": 473,
-        "z": "1620e9e3.f93e5e",
+        "x": 777.5,
+        "y": 774.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "a776716e.08be98"
+                "69e5b135.13096",
+                "70bf128f.7ac3cc",
+                "136d8709.29f489"
             ]
         ]
     },
     {
-        "id": "b2d9af5c.6d71e8",
+        "id": "366bec81.83eddc",
         "type": "set",
-        "name": "set networks",
-        "xml": "<set>\n<parameter name='network.eth' value='`$topology.networks.network[1].`' />\n<parameter name='network.otn' value='`$topology.networks.network[0].`' />\n",
-        "comments": "",
-        "x": 5682,
-        "y": 454,
-        "z": "1620e9e3.f93e5e",
-        "wires": []
-    },
-    {
-        "id": "1f0d239a.a59004",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 5225,
-        "y": 534,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "7a25521e.b55894"
-            ]
-        ]
-    },
-    {
-        "id": "7a25521e.b55894",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "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": 5370,
-        "y": 541,
-        "z": "1620e9e3.f93e5e",
+        "x": 737.5,
+        "y": 708.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": []
     },
     {
-        "id": "a776716e.08be98",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 5444,
-        "y": 469,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "b2d9af5c.6d71e8",
-                "7141defd.d7f3a8"
-            ]
-        ]
-    },
-    {
-        "id": "1a8710e5.1ad6b7",
-        "type": "get-resource",
-        "name": "get-resource network-resources",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resources\" \n        pfx='tmp.aai.network-resources' local-only='false' >\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2504,
-        "y": 784,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "3a8bf069.f85ce",
-                "aebcabff.82acc",
-                "1f447726.4be529"
-            ]
-        ]
-    },
-    {
-        "id": "3a8bf069.f85ce",
+        "id": "69e5b135.13096",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2757,
-        "y": 702,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "e98ead73.d60f3"
-            ]
-        ]
-    },
-    {
-        "id": "aebcabff.82acc",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2760.490966796875,
-        "y": 749.5740356445312,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "94257a05.fc968"
-            ]
-        ]
-    },
-    {
-        "id": "1f447726.4be529",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2748.823974609375,
-        "y": 793.9073486328125,
-        "z": "1620e9e3.f93e5e",
+        "x": 1016.5,
+        "y": 794.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "fe4ab328.74eee"
+                "f7324afe.a3cb98"
             ]
         ]
     },
     {
-        "id": "7141defd.d7f3a8",
-        "type": "call",
-        "name": "call update-tp-ttp-relationship",
-        "xml": "<call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' >\n",
+        "id": "f7324afe.a3cb98",
+        "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": 5717,
-        "y": 520,
-        "z": "1620e9e3.f93e5e",
+        "x": 1185.5,
+        "y": 801.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             []
         ]
     },
     {
-        "id": "db2f1670.e36278",
-        "type": "call",
-        "name": "call update-open-ended-links",
-        "xml": "<call module='DataChange' rpc='update-open-ended-links' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3712,
-        "y": 737,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e98ead73.d60f3",
-        "type": "switchNode",
-        "name": "switch network-resources_length",
-        "xml": "<switch test='tmp.aai.network-resources_length'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2972,
-        "y": 700,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "c72d2527.4f27d8"
-            ]
-        ]
-    },
-    {
-        "id": "c72d2527.4f27d8",
-        "type": "outcome",
-        "name": "4 Topologies (2 Domains)",
-        "xml": "<outcome value='4'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3233,
-        "y": 700,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "3dcb11c5.a0564e"
-            ]
-        ]
-    },
-    {
-        "id": "94257a05.fc968",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 2933,
-        "y": 750,
-        "z": "1620e9e3.f93e5e",
-        "wires": []
-    },
-    {
-        "id": "fe4ab328.74eee",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 2922,
-        "y": 796,
-        "z": "1620e9e3.f93e5e",
-        "wires": []
-    },
-    {
-        "id": "6b9df565.677604",
-        "type": "for",
-        "name": "for each network-resource",
-        "xml": "<for index='nridx' start='0' end='`$tmp.aai.network-resources.network-resource_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3695,
-        "y": 664,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "db1ad019.66229"
-            ]
-        ]
-    },
-    {
-        "id": "db1ad019.66229",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 3924,
-        "y": 690,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "9c9a1adf.4a9568",
-                "df8384d1.95fc28"
-            ]
-        ]
-    },
-    {
-        "id": "9c9a1adf.4a9568",
-        "type": "switchNode",
-        "name": "switch network-types[nridx]",
-        "xml": "<switch test='`$tmp.aai.network-resources.network-resource[$nridx].network-type`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4197,
-        "y": 715,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "be613956.e7594"
-            ]
-        ]
-    },
-    {
-        "id": "be613956.e7594",
-        "type": "outcome",
-        "name": "otn-topology",
-        "xml": "<outcome value='otn-topology'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4410,
-        "y": 709,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "a82463e6.b9c248"
-            ]
-        ]
-    },
-    {
-        "id": "369083d8.76a43c",
-        "type": "set",
-        "name": "set network-resource-otn[$otnidx]",
-        "xml": "<set>\n<parameter name='network-resource-otn[$otnidx].' value='`$tmp.aai.network-resources.network-resource[$nridx].`' />\n",
-        "comments": "",
-        "x": 4776,
-        "y": 702,
-        "z": "1620e9e3.f93e5e",
-        "wires": []
-    },
-    {
-        "id": "df8384d1.95fc28",
-        "type": "set",
-        "name": "set otnidx",
-        "xml": "<set>\n<parameter name='otnidx' value='0' />\n",
-        "comments": "",
-        "x": 4142,
-        "y": 673,
-        "z": "1620e9e3.f93e5e",
-        "wires": []
-    },
-    {
-        "id": "fd786916.269048",
+        "id": "6a48df29.ca491",
         "type": "set",
-        "name": "set otnidx",
-        "xml": "<set>\n<parameter name='otnidx' value='`$otnidx + 1`' />\n",
+        "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": 4693,
-        "y": 754,
-        "z": "1620e9e3.f93e5e",
+        "x": 714.5,
+        "y": 936.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": []
     },
     {
-        "id": "a82463e6.b9c248",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 4556,
-        "y": 722,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "369083d8.76a43c",
-                "fd786916.269048"
-            ]
-        ]
-    },
-    {
-        "id": "3dcb11c5.a0564e",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 3449,
-        "y": 695,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "6b9df565.677604",
-                "db2f1670.e36278"
-            ]
-        ]
-    },
-    {
-        "id": "901d4e1a.652118",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "62ccb800.ba59c8",
+        "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": 2866,
-        "y": 311,
-        "z": "1620e9e3.f93e5e",
+        "x": 727.5,
+        "y": 1025.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "2165924a.476cde"
+                "4cc181ad.c4d1f8",
+                "85870c46.3089f",
+                "d2032fdb.614ce8"
             ]
         ]
     },
     {
-        "id": "11935c8a.a490ab",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
+        "id": "4cc181ad.c4d1f8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2868,
-        "y": 358,
-        "z": "1620e9e3.f93e5e",
+        "x": 952.5,
+        "y": 1040.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "94ef4628.95e6b8"
+                "ebe8f601.eebec8"
             ]
         ]
     },
     {
-        "id": "94ef4628.95e6b8",
-        "type": "record",
-        "name": "log file",
-        "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logSdncDiscovery.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"networks_length\" />\n    <parameter name=\"field3\" value=\"`$topology.networks.network_length`\" />\n    ",
+        "id": "ebe8f601.eebec8",
+        "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": 2996,
-        "y": 360,
-        "z": "1620e9e3.f93e5e",
+        "x": 1123.5,
+        "y": 1041.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             []
         ]
     },
     {
-        "id": "2165924a.476cde",
-        "type": "for",
-        "name": "for each Network",
-        "xml": "<for index='netidx' start='0' end='`$topology.networks.network_length`' >\n",
+        "id": "70bf128f.7ac3cc",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3039,
-        "y": 310,
-        "z": "1620e9e3.f93e5e",
+        "x": 1002.5,
+        "y": 873.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "115276c4.acec21"
+                "dd76e326.6dd408"
             ]
         ]
     },
     {
-        "id": "115276c4.acec21",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "85870c46.3089f",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3209,
-        "y": 308,
-        "z": "1620e9e3.f93e5e",
+        "x": 933.5,
+        "y": 1113.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "2a57d05e.a0dc88",
-                "dde988af.f0e1f",
-                "ccc4b2dc.03b6",
-                "9266c042.cf422",
-                "b4168243.614878"
+                "b35680d0.668ed"
             ]
         ]
     },
     {
-        "id": "2a57d05e.a0dc88",
-        "type": "set",
-        "name": "set network",
-        "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$netidx].`' />\n",
+        "id": "dd76e326.6dd408",
+        "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": 3375,
-        "y": 276,
-        "z": "1620e9e3.f93e5e",
+        "x": 1163.5,
+        "y": 878.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": []
     },
     {
-        "id": "dde988af.f0e1f",
-        "type": "switchNode",
-        "name": "switch network-types with topologyId",
-        "xml": "<switch test='`$network.te-topology-id`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3420,
-        "y": 355,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "eaf6a3f8.6275b",
-                "92b40685.e87b6"
-            ]
-        ]
-    },
-    {
-        "id": "b3e974ed.02509",
-        "type": "record",
-        "name": "log file",
-        "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logSdncDiscovery.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"networks_length\" />\n    <parameter name=\"field3\" value=\"`$topology.networks.network_length`\" />\n    <parameter name=\"field4\" value=\"network-type-is\" />\n    <parameter name=\"field5\" value=\"OTN\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3904,
-        "y": 245,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "eaf6a3f8.6275b",
-        "type": "outcome",
-        "name": "11",
-        "xml": "<outcome value='11'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3639,
-        "y": 309,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "7df875b.d3cf70c"
-            ]
-        ]
-    },
-    {
-        "id": "92b40685.e87b6",
-        "type": "outcome",
-        "name": "33",
-        "xml": "<outcome value='33'>\n",
+        "id": "136d8709.29f489",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3639,
-        "y": 370,
-        "z": "1620e9e3.f93e5e",
+        "x": 993.5,
+        "y": 933.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "16aa4525.8ff0c3"
+                "84fa6086.1cdbd"
             ]
         ]
     },
     {
-        "id": "d246fb34.c2a69",
-        "type": "record",
-        "name": "log file",
-        "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logSdncDiscovery.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"networks_length\" />\n    <parameter name=\"field3\" value=\"`$topology.networks.network_length`\" />\n    <parameter name=\"field4\" value=\"network-type-is\" />\n    <parameter name=\"field5\" value=\"ETH\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3898,
-        "y": 370,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "50aa8e02.3ace68",
-        "type": "set",
-        "name": "set network-otn",
-        "xml": "<set>\n<parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\n",
-        "comments": "",
-        "x": 3934,
-        "y": 315,
-        "z": "1620e9e3.f93e5e",
-        "wires": []
-    },
-    {
-        "id": "1ffaf146.64fab7",
-        "type": "set",
-        "name": "set networks",
-        "xml": "<set>\n<parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\n",
+        "id": "84fa6086.1cdbd",
+        "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": 3916,
-        "y": 409,
-        "z": "1620e9e3.f93e5e",
+        "x": 1142.5,
+        "y": 935.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": []
     },
     {
-        "id": "ccc4b2dc.03b6",
-        "type": "set",
-        "name": "unset network",
-        "xml": "<set>\n<parameter name='network.' value='' />\n",
+        "id": "b35680d0.668ed",
+        "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": 3369,
-        "y": 222,
-        "z": "1620e9e3.f93e5e",
+        "x": 1081.5,
+        "y": 1114.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": []
     },
     {
-        "id": "9266c042.cf422",
-        "type": "record",
-        "name": "log file",
-        "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logSdncDiscovery.txt\" />\n    <parameter name=\"field6\" value=\"network-otn-is\" />\n    <parameter name=\"field7\" value=\"`$network-otn.te-topology-id`\" />\n    <parameter name=\"field8\" value=\"network-eth-is\" />\n    <parameter name=\"field9\" value=\"`$network-eth.te-topology-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3340,
-        "y": 480,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7df875b.d3cf70c",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 3770,
-        "y": 314,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            [
-                "b3e974ed.02509",
-                "50aa8e02.3ace68"
-            ]
-        ]
-    },
-    {
-        "id": "16aa4525.8ff0c3",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "d2032fdb.614ce8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3775,
-        "y": 391,
-        "z": "1620e9e3.f93e5e",
+        "x": 933.5,
+        "y": 1157.5,
+        "z": "7bb5d2cb.8cfacc",
         "wires": [
             [
-                "d246fb34.c2a69",
-                "1ffaf146.64fab7"
+                "a6db07ae.aaca38"
             ]
         ]
     },
     {
-        "id": "b4168243.614878",
-        "type": "call",
-        "name": "call update-tp-ttp-relationship",
-        "xml": "<call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' >\n",
+        "id": "a6db07ae.aaca38",
+        "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": "",
-        "outputs": 1,
-        "x": 3410,
-        "y": 531,
-        "z": "1620e9e3.f93e5e",
-        "wires": [
-            []
-        ]
+        "x": 1098.5,
+        "y": 1154.5,
+        "z": "7bb5d2cb.8cfacc",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/json/DataChange_msa-update-network-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_msa-update-network-to-aai.json
index cb664239..326f08f0 100644
--- a/platform-logic/datachange/src/main/json/DataChange_msa-update-network-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_msa-update-network-to-aai.json
@@ -316,8 +316,7 @@
                 "9a1981e1.920fd8",
                 "6b40a855.ff49b",
                 "32cd571a.6766f",
-                "79c2bf41.e84278",
-                "6ab14ba2.b06b3c"
+                "79c2bf41.e84278"
             ]
         ]
     },
@@ -876,25 +875,11 @@
             []
         ]
     },
-    {
-        "id": "6ab14ba2.b06b3c",
-        "type": "save",
-        "name": "save",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='custom-query' \n      key=\"format='resource'\"\n      force=\"true\"\n      local-only=\"false\"\n      pfx=\"data\">      \n<parameter name='interface-name' value='`$interfaceName`' />\n<parameter name='port-description' value='`$tp.tp-id`' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1809,
-        "y": 903.5666656494141,
-        "z": "8859ea1e.d24268",
-        "wires": [
-            []
-        ]
-    },
     {
         "id": "81e5bdae.f433c8",
         "type": "set",
         "name": "set controller_id",
-        "xml": "<set>\n<parameter name='controller_id' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url`\" />\n\n\n\n",
+        "xml": "<set>\n<parameter name='controller_id' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n\n\n",
         "comments": "",
         "x": 865.5,
         "y": 235.56666564941406,
diff --git a/platform-logic/datachange/src/main/json/DataChange_tapi-update-network-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_tapi-update-network-to-aai.json
index 88eef901..ad93223d 100644
--- a/platform-logic/datachange/src/main/json/DataChange_tapi-update-network-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_tapi-update-network-to-aai.json
@@ -1,6 +1,6 @@
 [
     {
-        "id": "935a3170.617d58",
+        "id": "dd0d634e.2a2c2",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -8,2021 +8,2021 @@
         "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": 328.5,
-        "y": 96,
-        "z": "12d97b5.248ff85",
+        "x": 335,
+        "y": 65.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "b0347539.62863"
+                "1cbc4994.bb76be"
             ]
         ]
     },
     {
-        "id": "b0347539.62863",
+        "id": "1cbc4994.bb76be",
         "type": "method",
         "name": "method tapi-update-network-to-aai",
         "xml": "<method rpc='tapi-update-network-to-aai' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 142.5,
-        "y": 154,
-        "z": "12d97b5.248ff85",
+        "x": 149,
+        "y": 123.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "c7d276d1.b2201"
+                "94d58717.09f498"
             ]
         ]
     },
     {
-        "id": "c7d276d1.b2201",
+        "id": "94d58717.09f498",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 366.5,
-        "y": 199,
-        "z": "12d97b5.248ff85",
+        "x": 373,
+        "y": 168.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "9d541262.2259c",
-                "9085ed80.90f39",
-                "a234d204.9ad8d",
-                "cd55a1ab.6e1058",
-                "42993030.f025",
-                "68ba4fb8.0ba9e",
-                "6381672e.4b66e8"
+                "9ab8c0cf.e6f98",
+                "e690bc57.ec78a",
+                "35fef5d3.ca4d02",
+                "e0fab15a.f10c18",
+                "60d36464.813cfc",
+                "4f3ea1d6.c426d",
+                "de75f383.c32b18"
             ]
         ]
     },
     {
-        "id": "b010e3f2.4096b",
+        "id": "7a504318.e0fe94",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 77.5,
-        "y": 97,
-        "z": "12d97b5.248ff85",
+        "x": 84,
+        "y": 66.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "935a3170.617d58"
+                "dd0d634e.2a2c2"
             ]
         ]
     },
     {
-        "id": "42993030.f025",
+        "id": "60d36464.813cfc",
         "type": "set",
         "name": "set network-id",
         "xml": "<set>\n<parameter name='tmp.network-id' value=\"`$prop.sdncRestApi.thirdpartySdnc.id + '-TAPI-' + $topology.uuid`\" />\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 638,
-        "y": 107,
-        "z": "12d97b5.248ff85",
+        "x": 644.5,
+        "y": 76.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "9d541262.2259c",
+        "id": "9ab8c0cf.e6f98",
         "type": "save",
         "name": "save network-resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  \n     key='network-resource.network-id = $tmp.network-id' >\n<parameter name='network-id' value='`$tmp.network-id`' />",
         "comments": "",
         "outputs": 1,
-        "x": 652,
-        "y": 208,
-        "z": "12d97b5.248ff85",
+        "x": 658.5,
+        "y": 177.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "9085ed80.90f39",
+        "id": "e690bc57.ec78a",
         "type": "save",
         "name": "save network-resource relation with esr-thirdparty-sdnc",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-resource.network-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.network-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 720,
-        "y": 253,
-        "z": "12d97b5.248ff85",
+        "x": 726.5,
+        "y": 222.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "a234d204.9ad8d",
+        "id": "35fef5d3.ca4d02",
         "type": "for",
         "name": "for each node",
         "xml": "<for index='nidx' start='0' end='`$topology.node_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 511,
-        "y": 410,
-        "z": "12d97b5.248ff85",
+        "x": 517.5,
+        "y": 379.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "50a0e2c1.af46dc",
-                "b0afae25.cb087",
-                "e9e2ecad.80a61"
+                "3c67cc6c.cfe42c",
+                "9229822e.14f158",
+                "6b1527e8.25be7"
             ]
         ]
     },
     {
-        "id": "50a0e2c1.af46dc",
+        "id": "3c67cc6c.cfe42c",
         "type": "set",
         "name": "set node",
         "xml": "<set>\n<parameter name='node.' value='`$topology.node[$nidx].`' />\n",
         "comments": "",
-        "x": 734,
-        "y": 332,
-        "z": "12d97b5.248ff85",
+        "x": 740.5,
+        "y": 301.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "b0afae25.cb087",
+        "id": "9229822e.14f158",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 730,
-        "y": 384,
-        "z": "12d97b5.248ff85",
+        "x": 736.5,
+        "y": 353.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "4e4155b0.3e1144"
+                "7815b3bd.d57894"
             ]
         ]
     },
     {
-        "id": "fd732489.b8daa",
+        "id": "705eebcd.82fa04",
         "type": "switchNode",
         "name": "switch name_length",
         "xml": "<switch test='`$node.name_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1174,
-        "y": 381,
-        "z": "12d97b5.248ff85",
+        "x": 1180.5,
+        "y": 350.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "3bb8d7e2.eaee28",
-                "80a53d1e.bbca58"
+                "e6f8e410.73b858",
+                "4d0546eb.27bdd8"
             ]
         ]
     },
     {
-        "id": "3bb8d7e2.eaee28",
+        "id": "e6f8e410.73b858",
         "type": "outcomeTrue",
         "name": "NULL Do nothing",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1439,
-        "y": 345,
-        "z": "12d97b5.248ff85",
+        "x": 1445.5,
+        "y": 314.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "80a53d1e.bbca58",
+        "id": "4d0546eb.27bdd8",
         "type": "outcomeTrue",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1398,
-        "y": 467,
-        "z": "12d97b5.248ff85",
+        "x": 1404.5,
+        "y": 436.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "52f17a63.9bfd44"
+                "6dad649c.dedce4"
             ]
         ]
     },
     {
-        "id": "52f17a63.9bfd44",
+        "id": "6dad649c.dedce4",
         "type": "for",
         "name": "for each name ",
         "xml": "<for index='na-idx' start='0' end='`$node.name_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1612,
-        "y": 470,
-        "z": "12d97b5.248ff85",
+        "x": 1618.5,
+        "y": 439.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "1eee1e7b.5435f2"
+                "cfe7c49.701eab8"
             ]
         ]
     },
     {
-        "id": "1eee1e7b.5435f2",
+        "id": "cfe7c49.701eab8",
         "type": "switchNode",
         "name": "switch name-value = name",
         "xml": "<switch test=\"`$node.name[$na-idx].value-name == 'name'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1522,
-        "y": 532,
-        "z": "12d97b5.248ff85",
+        "x": 1528.5,
+        "y": 501.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "1cf3cb4d.a6fb3d"
+                "72453289.f9940c"
             ]
         ]
     },
     {
-        "id": "1cf3cb4d.a6fb3d",
+        "id": "72453289.f9940c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1728,
-        "y": 529,
-        "z": "12d97b5.248ff85",
+        "x": 1734.5,
+        "y": 498.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "38316d9c.01edfa"
+                "98c4c13b.021d4"
             ]
         ]
     },
     {
-        "id": "38316d9c.01edfa",
+        "id": "98c4c13b.021d4",
         "type": "set",
         "name": "set node-name",
         "xml": "<set>\n<parameter name='node-name' value=\"`$node.name[$na-idx].value`\"/>\n",
         "comments": "",
-        "x": 1898,
-        "y": 525,
-        "z": "12d97b5.248ff85",
+        "x": 1904.5,
+        "y": 494.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "6555285e.9ebd6",
+        "id": "ee278548.48c048",
         "type": "save",
         "name": "save pnf in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf'\nkey='pnf.pnf-name = $node.uuid' >\n    <parameter name='pnf-name' value='`$node.uuid`' />\n    <parameter name='pnf-id' value='`$node-name`' />\n    <parameter name='in-maint' value='true' />\n    \n                         \n",
         "comments": "",
         "outputs": 1,
-        "x": 1172,
-        "y": 512,
-        "z": "12d97b5.248ff85",
+        "x": 1178.5,
+        "y": 481.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "81aa1acf.f68a58",
+        "id": "f54e4cb0.06b158",
         "type": "save",
         "name": "save pnf relationship to network-resource in AAI",
         "xml": "\n<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $node.uuid' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-resource.network-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.network-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1193,
-        "y": 580,
-        "z": "12d97b5.248ff85",
+        "x": 1199.5,
+        "y": 549.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "e9e2ecad.80a61",
+        "id": "6b1527e8.25be7",
         "type": "for",
         "name": "for each termination point",
         "xml": "<for index='tpidx' start='0' end='`$node.node-edge-point_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 460,
-        "y": 746,
-        "z": "12d97b5.248ff85",
+        "x": 466.5,
+        "y": 715.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "c89d18fe.055318",
-                "ac9bd5ab.d519c"
+                "9bc4ad0d.346da",
+                "3f256854.d899a"
             ]
         ]
     },
     {
-        "id": "ac9bd5ab.d519c",
+        "id": "3f256854.d899a",
         "type": "set",
         "name": "set termination point",
         "xml": "<set>\n<parameter name='tp.' value='`$node.node-edge-point[$tpidx].`' />\n",
         "comments": "",
-        "x": 688,
-        "y": 696,
-        "z": "12d97b5.248ff85",
+        "x": 694.5,
+        "y": 665.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "6f66e8cb.64f95",
+        "id": "dfedd521.86b5a",
         "type": "switchNode",
         "name": "switch name_length",
         "xml": "<switch test='`$tp.name_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1213,
-        "y": 768,
-        "z": "12d97b5.248ff85",
+        "x": 1219.5,
+        "y": 737.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "ee3c6985.76e71",
-                "bfda0f7b.b56b18"
+                "b7d6f4f0.e0bd3",
+                "66cf26fb.09f71"
             ]
         ]
     },
     {
-        "id": "ee3c6985.76e71",
+        "id": "b7d6f4f0.e0bd3",
         "type": "outcomeTrue",
         "name": "If NULL Do nothing",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1477,
-        "y": 632,
-        "z": "12d97b5.248ff85",
+        "x": 1483.5,
+        "y": 601.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "bfda0f7b.b56b18",
+        "id": "66cf26fb.09f71",
         "type": "outcomeTrue",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1442,
-        "y": 767,
-        "z": "12d97b5.248ff85",
+        "x": 1448.5,
+        "y": 736.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "9320404b.db2348"
+                "862b958d.f2e34"
             ]
         ]
     },
     {
-        "id": "9320404b.db2348",
+        "id": "862b958d.f2e34",
         "type": "for",
         "name": "for each name ",
         "xml": "<for index='na-idx' start='0' end='`$tp.name_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1614,
-        "y": 768,
-        "z": "12d97b5.248ff85",
+        "x": 1620.5,
+        "y": 737.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "aef7823d.d8a618",
-                "35cc269a.e40662"
+                "a4a363d9.79d1a",
+                "3453f969.e5d4fe"
             ]
         ]
     },
     {
-        "id": "aef7823d.d8a618",
+        "id": "a4a363d9.79d1a",
         "type": "switchNode",
         "name": "switch name-value = name",
         "xml": "<switch test=\"`$tp.name[$na-idx].value-name == 'name'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1829,
-        "y": 619,
-        "z": "12d97b5.248ff85",
+        "x": 1835.5,
+        "y": 588.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "35fb5cff.eb7ef4"
+                "162774dd.4da85b"
             ]
         ]
     },
     {
-        "id": "35fb5cff.eb7ef4",
+        "id": "162774dd.4da85b",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2043,
-        "y": 661,
-        "z": "12d97b5.248ff85",
+        "x": 2049.5,
+        "y": 630.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "9d15562e.3da29"
+                "62abe205.1c35e4"
             ]
         ]
     },
     {
-        "id": "9d15562e.3da29",
+        "id": "62abe205.1c35e4",
         "type": "set",
         "name": "set equipment identifier (tp-name)",
         "xml": "<set>\n<parameter name='tp-name' value=\"`$tp.name[$na-idx].value`\"/>\n",
         "comments": "",
-        "x": 2265,
-        "y": 659,
-        "z": "12d97b5.248ff85",
+        "x": 2271.5,
+        "y": 628.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "6381672e.4b66e8",
+        "id": "de75f383.c32b18",
         "type": "for",
         "name": " for each link",
         "xml": "<for index='lidx' start='0' end='`$topology.link_length`' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 314,
-        "y": 945,
-        "z": "12d97b5.248ff85",
+        "x": 320.5,
+        "y": 914.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "c58ed545.369738",
-                "719956b2.0cd3",
-                "7e813e06.d7a0a8",
-                "b416801f.d4ff5",
-                "10707cde.2f4863"
+                "82a5932e.ce1e3",
+                "7acdad8b.581844",
+                "c92f2637.6550b8",
+                "1af3399a.6caa5e",
+                "137abc28.75c06c"
             ]
         ]
     },
     {
-        "id": "c58ed545.369738",
+        "id": "82a5932e.ce1e3",
         "type": "set",
         "name": "set link",
         "xml": "<set>\n<parameter name='link.' value='`$topology.link[$lidx].`' />\n",
         "comments": "",
-        "x": 472,
-        "y": 869,
-        "z": "12d97b5.248ff85",
+        "x": 478.5,
+        "y": 838.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "cd55a1ab.6e1058",
+        "id": "e0fab15a.f10c18",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$topology.name[0].value`\"/>\n<parameter name=\"field2\" value=\"`$prop.sdncRestApi.thirdpartySdnc.id`\"/>\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 604,
-        "y": 154,
-        "z": "12d97b5.248ff85",
+        "x": 610.5,
+        "y": 123.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "ac455a91.e52088",
+        "id": "5d2cdae.4f905a4",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value='`$node.name_length`'/>\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1155,
-        "y": 446,
-        "z": "12d97b5.248ff85",
+        "x": 1161.5,
+        "y": 415.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "719956b2.0cd3",
+        "id": "7acdad8b.581844",
         "type": "set",
         "name": "set link-name",
         "xml": "<set>\n<parameter name='link.name' value=\"`$link.uuid`\" />\n",
         "comments": "",
-        "x": 512,
-        "y": 1005,
-        "z": "12d97b5.248ff85",
+        "x": 518.5,
+        "y": 974.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "7e813e06.d7a0a8",
+        "id": "c92f2637.6550b8",
         "type": "save",
         "name": "save link in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link'\nkey='logical-link.link-name = $link.name' >\n    <parameter name='link-name' value='`$link.name`' />\n    <parameter name='link-type' value='OTN-LINK' />\n    <parameter name='in-maint' value='true' />\n    <parameter name='operational-status' value='`$link.operational-state`' />\n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 504,
-        "y": 1097,
-        "z": "12d97b5.248ff85",
+        "x": 510.5,
+        "y": 1066.566665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "b416801f.d4ff5",
+        "id": "1af3399a.6caa5e",
         "type": "save",
         "name": "save logical-link relationship to p-interface",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $link.name' 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/' + $pnf1 + '/p-interfaces/p-interface/' + $interface1 `\" />\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=\"`$pnf1`\" /> \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/' + $pnf2 + '/p-interfaces/p-interface/' + $interface2 `\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$pnf2`\" /> ",
         "comments": "",
         "outputs": 1,
-        "x": 536,
-        "y": 1175,
-        "z": "12d97b5.248ff85",
+        "x": 542.5,
+        "y": 1144.566665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "35cc269a.e40662",
+        "id": "3453f969.e5d4fe",
         "type": "switchNode",
         "name": "switch name-value=rate",
         "xml": "<switch test=\"`$tp.name[$na-idx].value-name == 'rate'`\">",
         "comments": "",
         "outputs": 1,
-        "x": 1869,
-        "y": 778,
-        "z": "12d97b5.248ff85",
+        "x": 1875.5,
+        "y": 747.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "1b3ff34.e74448d"
+                "f20b41d5.0223a8"
             ]
         ]
     },
     {
-        "id": "ec747020.3cd26",
+        "id": "66cfa48e.98759c",
         "type": "set",
         "name": "set speed-value",
         "xml": "<set>\n<parameter name='tp-speed' value=\"`$tp.name[$na-idx].value`\"/>",
         "comments": "",
-        "x": 2267,
-        "y": 783,
-        "z": "12d97b5.248ff85",
+        "x": 2273.5,
+        "y": 752.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "1b3ff34.e74448d",
+        "id": "f20b41d5.0223a8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2085,
-        "y": 777,
-        "z": "12d97b5.248ff85",
+        "x": 2091.5,
+        "y": 746.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "ec747020.3cd26"
+                "66cfa48e.98759c"
             ]
         ]
     },
     {
-        "id": "72dab98.9c32948",
+        "id": "c0fc82b3.30b7b8",
         "type": "switchNode",
         "name": "switch speed-value",
         "xml": "<switch test='`$tp-speed`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1206,
-        "y": 976,
-        "z": "12d97b5.248ff85",
+        "x": 1212.5,
+        "y": 945.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "7c1acbf6.52a7b4",
-                "e680c1d4.8d26b",
-                "637bc8ed.78c8f8",
-                "546b1c73.cde174",
-                "ff2067e8.34ff3",
-                "137d910.c7ebc6f",
-                "3a380053.5e28e8",
-                "c59da1dd.0a3a6",
-                "d7b0999b.5401d8",
-                "9ef45078.45166",
-                "a8b7220d.93d588"
+                "e27e9d29.e7909",
+                "a8a78b1e.d9fbe8",
+                "6d366e8d.e15bb",
+                "760758e3.4dee9",
+                "7b7866ff.b65f9",
+                "ee64d5ad.37015",
+                "ebd113cf.809d58",
+                "55df563c.f847e8",
+                "5e039964.21b738",
+                "2a77e6fd.99cfe2",
+                "b446277d.b32c2"
             ]
         ]
     },
     {
-        "id": "7c1acbf6.52a7b4",
+        "id": "e27e9d29.e7909",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1379,
-        "y": 848,
-        "z": "12d97b5.248ff85",
+        "x": 1385.5,
+        "y": 817.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "c6b4b57e.be0f4"
+                "88200379.ba144"
             ]
         ]
     },
     {
-        "id": "3f789e8e.088bd2",
+        "id": "fe9ed448.89feb",
         "type": "set",
         "name": "set interface-type as NNI",
         "xml": "<set>\n<parameter name='netinttype' value='NNI' />",
         "comments": "",
-        "x": 1713,
-        "y": 978,
-        "z": "12d97b5.248ff85",
+        "x": 1719.5,
+        "y": 947.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "c6b4b57e.be0f4",
+        "id": "88200379.ba144",
         "type": "set",
         "name": "set interface type as UNI",
         "xml": "<set>\n<parameter name='netinttype' value='UNI' />\n",
         "comments": "",
-        "x": 1570,
-        "y": 849,
-        "z": "12d97b5.248ff85",
+        "x": 1576.5,
+        "y": 818.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "4ff9fdea.07798c",
+        "id": "62c4a0a9.7119d",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"speed-values\"/>\n<parameter name=\"field2\" value=\"`$tp-speed`\"/>\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1239,
-        "y": 842,
-        "z": "12d97b5.248ff85",
+        "x": 1245.5,
+        "y": 811.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "c89d18fe.055318",
+        "id": "9bc4ad0d.346da",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 650,
-        "y": 809,
-        "z": "12d97b5.248ff85",
+        "x": 656.5,
+        "y": 778.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "7215b4d0.41eff4"
+                "20b1aa33.4b13b6"
             ]
         ]
     },
     {
-        "id": "7215b4d0.41eff4",
+        "id": "20b1aa33.4b13b6",
         "type": "switchNode",
         "name": "switch protocol-name",
         "xml": "<switch test='`$tp.layer-protocol-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 816,
-        "y": 760,
-        "z": "12d97b5.248ff85",
+        "x": 822.5,
+        "y": 729.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "2a45d6ca.fdcd6a",
-                "9e6c2d7a.6a9"
+                "3ccfdf03.565b68",
+                "36a79e43.96952a"
             ]
         ]
     },
     {
-        "id": "2a45d6ca.fdcd6a",
+        "id": "3ccfdf03.565b68",
         "type": "outcome",
         "name": "ODU",
         "xml": "<outcome value='ODU'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 853,
-        "y": 835,
-        "z": "12d97b5.248ff85",
+        "x": 859.5,
+        "y": 804.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "dbc08438.6ccc88"
+                "689242aa.067e9c"
             ]
         ]
     },
     {
-        "id": "9e6c2d7a.6a9",
+        "id": "36a79e43.96952a",
         "type": "other",
         "name": "other : Do nothing",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1011,
-        "y": 701,
-        "z": "12d97b5.248ff85",
+        "x": 1017.5,
+        "y": 670.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "4e4155b0.3e1144",
+        "id": "7815b3bd.d57894",
         "type": "switchNode",
         "name": "switch protocol-name",
         "xml": "<switch test='`$node.layer-protocol-name[0]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 748,
-        "y": 444,
-        "z": "12d97b5.248ff85",
+        "x": 754.5,
+        "y": 413.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "7222169b.377ed8",
-                "491fb5e5.6c1c64"
+                "228d2ded.a28e1a",
+                "c84e2543.54c0f8"
             ]
         ]
     },
     {
-        "id": "7222169b.377ed8",
+        "id": "228d2ded.a28e1a",
         "type": "outcome",
         "name": "ODU",
         "xml": "<outcome value='ODU'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 916,
-        "y": 393,
-        "z": "12d97b5.248ff85",
+        "x": 922.5,
+        "y": 362.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "7f13a4a.2f87fdc"
+                "90388069.5c1f6"
             ]
         ]
     },
     {
-        "id": "491fb5e5.6c1c64",
+        "id": "c84e2543.54c0f8",
         "type": "other",
         "name": "other : Do nothing",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 839,
-        "y": 561,
-        "z": "12d97b5.248ff85",
+        "x": 845.5,
+        "y": 530.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "7f13a4a.2f87fdc",
+        "id": "90388069.5c1f6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 969,
-        "y": 453,
-        "z": "12d97b5.248ff85",
+        "x": 975.5,
+        "y": 422.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "fd732489.b8daa",
-                "ac455a91.e52088",
-                "6555285e.9ebd6",
-                "81aa1acf.f68a58"
+                "705eebcd.82fa04",
+                "5d2cdae.4f905a4",
+                "ee278548.48c048",
+                "f54e4cb0.06b158"
             ]
         ]
     },
     {
-        "id": "dbc08438.6ccc88",
+        "id": "689242aa.067e9c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 994,
-        "y": 833,
-        "z": "12d97b5.248ff85",
+        "x": 1000.5,
+        "y": 802.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "6f66e8cb.64f95",
-                "4ff9fdea.07798c",
-                "72dab98.9c32948",
-                "e75de0f2.fdaed",
-                "f6aff657.ff10f8",
-                "caaa66fd.e0cba",
-                "38a93e32.54219a",
-                "500637ea.435bb8",
-                "8c9dedce.28c178"
+                "dfedd521.86b5a",
+                "62c4a0a9.7119d",
+                "c0fc82b3.30b7b8",
+                "d13f710c.ed5cd",
+                "f6b93d25.146b98",
+                "ac5930e6.a398f8",
+                "618e03f2.2580c4",
+                "7b143047.5b21b8",
+                "9e26b070.282158"
             ]
         ]
     },
     {
-        "id": "10707cde.2f4863",
+        "id": "137abc28.75c06c",
         "type": "set",
         "name": "set link paramaters",
         "xml": "<set>\n<parameter name='interface1' value=\"`$link.node-edge-point[0].node-edge-point-uuid`\" />\n<parameter name='interface2' value=\"`$link.node-edge-point[1].node-edge-point-uuid`\" />\n<parameter name='pnf1' value=\"`$link.node-edge-point[0].node-uuid`\" />\n<parameter name='pnf2' value=\"`$link.node-edge-point[1].node-uuid`\" />\n",
         "comments": "",
-        "x": 537,
-        "y": 926,
-        "z": "12d97b5.248ff85",
+        "x": 543.5,
+        "y": 895.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "68ba4fb8.0ba9e",
+        "id": "4f3ea1d6.c426d",
         "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='controller_id' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url`\" />\n\n\n\n",
+        "name": "set controller_id",
+        "xml": "<set>\n<parameter name='controller_id' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n\n\n",
         "comments": "",
-        "x": 572,
-        "y": 305,
-        "z": "12d97b5.248ff85",
+        "x": 578.5,
+        "y": 274.56666564941406,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "e680c1d4.8d26b",
+        "id": "a8a78b1e.d9fbe8",
         "type": "outcome",
         "name": "ODU0",
         "xml": "<outcome value='ODU0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1401,
-        "y": 912,
-        "z": "12d97b5.248ff85",
+        "x": 1407.5,
+        "y": 881.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "3f789e8e.088bd2"
+                "fe9ed448.89feb"
             ]
         ]
     },
     {
-        "id": "637bc8ed.78c8f8",
+        "id": "6d366e8d.e15bb",
         "type": "outcome",
         "name": "ODU1",
         "xml": "<outcome value='ODU1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1401,
-        "y": 950,
-        "z": "12d97b5.248ff85",
+        "x": 1407.5,
+        "y": 919.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "3f789e8e.088bd2"
+                "fe9ed448.89feb"
             ]
         ]
     },
     {
-        "id": "546b1c73.cde174",
+        "id": "760758e3.4dee9",
         "type": "outcome",
         "name": "ODU2",
         "xml": "<outcome value='ODU2'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1394,
-        "y": 988,
-        "z": "12d97b5.248ff85",
+        "x": 1400.5,
+        "y": 957.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "3f789e8e.088bd2"
+                "fe9ed448.89feb"
             ]
         ]
     },
     {
-        "id": "38a93e32.54219a",
+        "id": "618e03f2.2580c4",
         "type": "for",
         "name": "for each connection-point",
         "xml": "<for index='cepx' start='0' end='`$tp.cep-list.connection-end-point_length`' >\n    \n    \n    \n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 753.75,
-        "y": 2695.25,
-        "z": "12d97b5.248ff85",
+        "x": 760.25,
+        "y": 2664.816665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "e2073ad2.b58ea8",
-                "9baa5127.75eb5"
+                "20e29f32.cd952",
+                "cc6c35b3.c62f2"
             ]
         ]
     },
     {
-        "id": "500637ea.435bb8",
+        "id": "7b143047.5b21b8",
         "type": "save",
         "name": "save pnf & p-interface in DB",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE VALUES ( $tp.uuid , $tp-name , $node.uuid , $node-name , $controller_id , $tp-speed , null , $ce );\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 715.75,
-        "y": 2829.5498046875,
-        "z": "12d97b5.248ff85",
+        "x": 722.25,
+        "y": 2799.116470336914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "e2073ad2.b58ea8",
+        "id": "20e29f32.cd952",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"For every uuid\"/>\n<parameter name=\"field2\" value=\"`$tp.cep-list.connection-end-point[$cepx].uuid`\"/>\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 965.61669921875,
-        "y": 2616.0166015625,
-        "z": "12d97b5.248ff85",
+        "x": 972.11669921875,
+        "y": 2585.583267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "9baa5127.75eb5",
+        "id": "cc6c35b3.c62f2",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$tp.cep-list.connection-end-point_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 971.61669921875,
-        "y": 2720.0166015625,
-        "z": "12d97b5.248ff85",
+        "x": 978.11669921875,
+        "y": 2689.583267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "d3741b24.f41a38",
-                "fbbf0be.c3047f8",
-                "5c2bdcbd.9ea0e4",
-                "7cb8cac.25fb634"
+                "273def74.3cce9",
+                "6fc0b135.b9369",
+                "7d3171a.679f41",
+                "ad2c24d8.6c26"
             ]
         ]
     },
     {
-        "id": "4519c61a.330528",
+        "id": "322c7b5a.6844d4",
         "type": "set",
         "name": "set cep-uuid ",
         "xml": "<set>\n<parameter name='ce' value=\"`$ce + $tp.cep-list.connection-end-point[0].uuid`\" />\n",
         "comments": "",
-        "x": 1520.61669921875,
-        "y": 2625.0166015625,
-        "z": "12d97b5.248ff85",
+        "x": 1527.11669921875,
+        "y": 2594.583267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "7cb8cac.25fb634",
+        "id": "ad2c24d8.6c26",
         "type": "other",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1144.61669921875,
-        "y": 2579.0166015625,
-        "z": "12d97b5.248ff85",
+        "x": 1151.11669921875,
+        "y": 2548.583267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "467d498d.a66ab8"
+                "c49ebae2.bd0708"
             ]
         ]
     },
     {
-        "id": "d3741b24.f41a38",
+        "id": "273def74.3cce9",
         "type": "other",
         "name": "1",
         "xml": "<outcome value='1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1149.783447265625,
-        "y": 2657.433349609375,
-        "z": "12d97b5.248ff85",
+        "x": 1156.283447265625,
+        "y": 2627.000015258789,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "322831f2.c2967e"
+                "40ec28a5.0ef9b"
             ]
         ]
     },
     {
-        "id": "fbbf0be.c3047f8",
+        "id": "6fc0b135.b9369",
         "type": "other",
         "name": "2",
         "xml": "<outcome value='2'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1117.61669921875,
-        "y": 2721.0166015625,
-        "z": "12d97b5.248ff85",
+        "x": 1124.11669921875,
+        "y": 2690.583267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "2bf1c373.508c94"
+                "45a84518.ed353c"
             ]
         ]
     },
     {
-        "id": "cbf030b5.5d4338",
+        "id": "f10a50ff.a09b",
         "type": "set",
         "name": "set cep-uuid ",
         "xml": "<set>\n<parameter name='some1' value=\"`$tp.cep-list.connection-end-point[0].uuid`\" />\n<parameter name='ce' value=\"`$some1 + ',' + $tp.cep-list.connection-end-point[1].uuid`\" />\n\n",
         "comments": "",
-        "x": 1479.783447265625,
-        "y": 2699.433349609375,
-        "z": "12d97b5.248ff85",
+        "x": 1486.283447265625,
+        "y": 2669.000015258789,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "5c2bdcbd.9ea0e4",
+        "id": "7d3171a.679f41",
         "type": "other",
         "name": "3",
         "xml": "<outcome value='3'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1130.666748046875,
-        "y": 2843.216796875,
-        "z": "12d97b5.248ff85",
+        "x": 1137.166748046875,
+        "y": 2812.783462524414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "f57bea8c.8d2af8"
+                "35343890.318c5"
             ]
         ]
     },
     {
-        "id": "ef6bffe9.2ced08",
+        "id": "972c5dc6.97f998",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='some1' value=\"`$tp.cep-list.connection-end-point[0].uuid`\" />\n<parameter name='cep' value=\"`$some1 + ',' + $tp.cep-list.connection-end-point[1].uuid`\" />\n<parameter name='ce' value=\"`$cep + ',' + $tp.cep-list.connection-end-point[2].uuid`\" />\n",
         "comments": "",
-        "x": 1488.61669921875,
-        "y": 2847.0166015625,
-        "z": "12d97b5.248ff85",
+        "x": 1495.11669921875,
+        "y": 2816.583267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "322831f2.c2967e",
+        "id": "40ec28a5.0ef9b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1309.4833984375,
-        "y": 2643.38330078125,
-        "z": "12d97b5.248ff85",
+        "x": 1315.9833984375,
+        "y": 2612.949966430664,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "4519c61a.330528"
+                "322c7b5a.6844d4"
             ]
         ]
     },
     {
-        "id": "2bf1c373.508c94",
+        "id": "45a84518.ed353c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1296.4833984375,
-        "y": 2719.38330078125,
-        "z": "12d97b5.248ff85",
+        "x": 1302.9833984375,
+        "y": 2688.949966430664,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "cbf030b5.5d4338",
-                "d43dd35.5a18fb"
+                "f10a50ff.a09b",
+                "8f18f763.8fc5f"
             ]
         ]
     },
     {
-        "id": "f57bea8c.8d2af8",
+        "id": "35343890.318c5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1319.4833984375,
-        "y": 2851.38330078125,
-        "z": "12d97b5.248ff85",
+        "x": 1325.9833984375,
+        "y": 2820.949966430664,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "ef6bffe9.2ced08"
+                "972c5dc6.97f998"
             ]
         ]
     },
     {
-        "id": "d43dd35.5a18fb",
+        "id": "8f18f763.8fc5f",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Length\"/>\n<parameter name=\"field2\" value=\"`$tp.cep-list.connection-end-point_length`\"/>\n\n<parameter name=\"field3\" value=\"`$some1`\"/>\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1488.4833984375,
-        "y": 2752.38330078125,
-        "z": "12d97b5.248ff85",
+        "x": 1494.9833984375,
+        "y": 2721.949966430664,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "d03ef92d.fe74c8",
+        "id": "134a61b.b91ba1e",
         "type": "set",
         "name": "set cep-uuid ",
         "xml": "<set>\n<parameter name='ce' value='' />\n",
         "comments": "",
-        "x": 1506.783447265625,
-        "y": 2561.433349609375,
-        "z": "12d97b5.248ff85",
+        "x": 1513.283447265625,
+        "y": 2531.000015258789,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "467d498d.a66ab8",
+        "id": "c49ebae2.bd0708",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1305.4833984375,
-        "y": 2572.88330078125,
-        "z": "12d97b5.248ff85",
+        "x": 1311.9833984375,
+        "y": 2542.449966430664,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "d03ef92d.fe74c8"
+                "134a61b.b91ba1e"
             ]
         ]
     },
     {
-        "id": "e75de0f2.fdaed",
+        "id": "d13f710c.ed5cd",
         "type": "save",
         "name": "save p-interface in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid' >      \n<parameter name='interface-name' value='`$tp.uuid`' />\n<parameter name='port-description' value='`$tp-name`' />\n<parameter name='operational-status' value='`$tp.administrative-state`' />\n<parameter name='in-maint' value=\"true\" />\n<parameter name='network-interface-type' value='`$netinttype`' />\n<parameter name='speed-units' value=\"Gbps\" />\n<parameter name='speed-value' value='`$tp-speed`' />\n<parameter name='available-capacity' value='`$tp-speed`' />\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1171,
-        "y": 1217,
-        "z": "12d97b5.248ff85",
+        "x": 1177.5,
+        "y": 1186.566665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "ff2067e8.34ff3",
+        "id": "7b7866ff.b65f9",
         "type": "outcome",
         "name": "ODU3",
         "xml": "<outcome value='ODU3'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1398,
-        "y": 1022,
-        "z": "12d97b5.248ff85",
+        "x": 1404.5,
+        "y": 991.5666656494141,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "3f789e8e.088bd2"
+                "fe9ed448.89feb"
             ]
         ]
     },
     {
-        "id": "137d910.c7ebc6f",
+        "id": "ee64d5ad.37015",
         "type": "outcome",
         "name": "ODU4",
         "xml": "<outcome value='ODU4'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1396,
-        "y": 1061,
-        "z": "12d97b5.248ff85",
+        "x": 1402.5,
+        "y": 1030.566665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "3f789e8e.088bd2"
+                "fe9ed448.89feb"
             ]
         ]
     },
     {
-        "id": "f6aff657.ff10f8",
+        "id": "f6b93d25.146b98",
         "type": "get-resource",
         "name": "get-resource",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"p-interface\"\n key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid'  \n      pfx='aai.service' local-only='false'>",
         "comments": "",
         "outputs": 1,
-        "x": 1089.566650390625,
-        "y": 1354.566650390625,
-        "z": "12d97b5.248ff85",
+        "x": 1096.066650390625,
+        "y": 1324.133316040039,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "12efb7be.6d223"
+                "453ceaef.3975e4"
             ]
         ]
     },
     {
-        "id": "12efb7be.6d223",
+        "id": "453ceaef.3975e4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1307.75,
-        "y": 1363.75,
-        "z": "12d97b5.248ff85",
+        "x": 1314.25,
+        "y": 1333.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "87e62e83.a861a"
+                "be595bc4.13c43"
             ]
         ]
     },
     {
-        "id": "87e62e83.a861a",
+        "id": "be595bc4.13c43",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='interface-type' value='`$aai.service.network-interface-type`' />\n<parameter name='rate-param' value='`$aai.service.speed-value`' />\n\n",
         "comments": "",
-        "x": 1460.75,
-        "y": 1362.75,
-        "z": "12d97b5.248ff85",
+        "x": 1467.25,
+        "y": 1332.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "caaa66fd.e0cba",
+        "id": "ac5930e6.a398f8",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$interface-type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1054.75,
-        "y": 1470.75,
-        "z": "12d97b5.248ff85",
+        "x": 1061.25,
+        "y": 1440.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "62e0ec7.acc3f94",
-                "b8317d0d.95e438"
+                "cdc64818.36fd",
+                "b011f5a6.ef38d8"
             ]
         ]
     },
     {
-        "id": "62e0ec7.acc3f94",
+        "id": "cdc64818.36fd",
         "type": "outcome",
         "name": "UNI : Do Nothing",
         "xml": "<outcome value='UNI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1216.75,
-        "y": 1436.75,
-        "z": "12d97b5.248ff85",
+        "x": 1223.25,
+        "y": 1406.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "b8317d0d.95e438",
+        "id": "b011f5a6.ef38d8",
         "type": "outcome",
         "name": "NNI",
         "xml": "<outcome value='NNI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1192.75,
-        "y": 1573.75,
-        "z": "12d97b5.248ff85",
+        "x": 1199.25,
+        "y": 1543.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "4eb8450f.7429b4"
+                "f7262702.8d2888"
             ]
         ]
     },
     {
-        "id": "4eb8450f.7429b4",
+        "id": "f7262702.8d2888",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1391.75,
-        "y": 1466.75,
-        "z": "12d97b5.248ff85",
+        "x": 1398.25,
+        "y": 1436.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "3796a832.dd7c9",
-                "f32c42b.ef627c",
-                "113f1be5.7b839c",
-                "d298a5ec.4701a8"
+                "8e99d37.4c0f43",
+                "3b2ad59e.117432",
+                "d63ed666.f191b8",
+                "6902bc7e.130e9c"
             ]
         ]
     },
     {
-        "id": "3796a832.dd7c9",
+        "id": "8e99d37.4c0f43",
         "type": "save",
         "name": "save p-interface in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='bandwidth-attribute' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba' >      \n<parameter name='bwa-id' value='`$random-ba`' />\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1628.75,
-        "y": 1490.7499389648438,
-        "z": "12d97b5.248ff85",
+        "x": 1635.25,
+        "y": 1460.3166046142578,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "8c9dedce.28c178",
+        "id": "9e26b070.282158",
         "type": "set",
         "name": "set cep-uuid ",
         "xml": "<set>\n<parameter name='ce' value='' />\n<parameter name='some' value='' />\n",
         "comments": "",
-        "x": 744.75,
-        "y": 2613.25,
-        "z": "12d97b5.248ff85",
+        "x": 751.25,
+        "y": 2582.816665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "f32c42b.ef627c",
+        "id": "3b2ad59e.117432",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='random-ba' value=\"`$node.uuid + '_' + $tp.uuid`\" />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 1608.75,
-        "y": 1408.25,
-        "z": "12d97b5.248ff85",
+        "x": 1615.25,
+        "y": 1377.816665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "113f1be5.7b839c",
+        "id": "d63ed666.f191b8",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1615.75,
-        "y": 1325.75,
-        "z": "12d97b5.248ff85",
+        "x": 1622.25,
+        "y": 1295.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "d298a5ec.4701a8",
+        "id": "6902bc7e.130e9c",
         "type": "switchNode",
         "name": "switch rate in NNI",
         "xml": "<switch test='`$rate-param`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1080.75,
-        "y": 1966.75,
-        "z": "12d97b5.248ff85",
+        "x": 1087.25,
+        "y": 1936.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "4b3e2ceb.2eb48c",
-                "721cd7f0.663828",
-                "91cb4231.18cc9",
-                "7a32a1a.1876ce",
-                "8e655d43.d52e48"
+                "5071ff0f.45a7a",
+                "ab34cf8f.734be",
+                "c356f219.2efb",
+                "d2d986e3.cc045",
+                "2091cc41.70c8cc"
             ]
         ]
     },
     {
-        "id": "4b3e2ceb.2eb48c",
+        "id": "5071ff0f.45a7a",
         "type": "outcome",
         "name": "ODU0",
         "xml": "<outcome value='ODU0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1748.933349609375,
-        "y": 1552.933349609375,
-        "z": "12d97b5.248ff85",
+        "x": 1755.433349609375,
+        "y": 1522.500015258789,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "9c235584.62579"
+                "19f4b73d.cdd069"
             ]
         ]
     },
     {
-        "id": "721cd7f0.663828",
+        "id": "ab34cf8f.734be",
         "type": "outcome",
         "name": "ODU1",
         "xml": "<outcome value='ODU1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1705.933349609375,
-        "y": 1815.933349609375,
-        "z": "12d97b5.248ff85",
+        "x": 1712.433349609375,
+        "y": 1785.500015258789,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "b7bd314d.9cf0d"
+                "1e178e7a.d3ed5a"
             ]
         ]
     },
     {
-        "id": "91cb4231.18cc9",
+        "id": "c356f219.2efb",
         "type": "outcome",
         "name": "ODU2",
         "xml": "<outcome value='ODU2'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1659.933349609375,
-        "y": 2045.933349609375,
-        "z": "12d97b5.248ff85",
+        "x": 1666.433349609375,
+        "y": 2015.500015258789,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "b7e44f5e.25e06"
+                "40f83d7a.41a484"
             ]
         ]
     },
     {
-        "id": "7a32a1a.1876ce",
+        "id": "d2d986e3.cc045",
         "type": "outcome",
         "name": "ODU3",
         "xml": "<outcome value='ODU3'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1751.933349609375,
-        "y": 2416.933349609375,
-        "z": "12d97b5.248ff85",
+        "x": 1758.433349609375,
+        "y": 2386.500015258789,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "ca6f1330.654d"
+                "91b89ace.609a68"
             ]
         ]
     },
     {
-        "id": "8e655d43.d52e48",
+        "id": "2091cc41.70c8cc",
         "type": "outcome",
         "name": "ODU4",
         "xml": "<outcome value='ODU4'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1736.933349609375,
-        "y": 2642.933349609375,
-        "z": "12d97b5.248ff85",
+        "x": 1743.433349609375,
+        "y": 2612.500015258789,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "c8a60ea.86b8df"
+                "f610d634.b8cc4"
             ]
         ]
     },
     {
-        "id": "9c235584.62579",
+        "id": "19f4b73d.cdd069",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1893.933349609375,
-        "y": 1429.7333984375,
-        "z": "12d97b5.248ff85",
+        "x": 1900.433349609375,
+        "y": 1399.300064086914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "b06987be.8600c8",
-                "2152e5a8.234e4a",
-                "fee249b2.2732e8",
-                "8d5bc0c.88ed84",
-                "227e1b10.a2fb2c",
-                "3bb8f50c.9c58ca"
+                "19e54ba0.7c2e0c",
+                "9b8b0393.415698",
+                "ae120072.9b7ff",
+                "d8f0832e.4d0f7",
+                "e2261dd3.e1a278",
+                "c59ccd0.41ff13"
             ]
         ]
     },
     {
-        "id": "b06987be.8600c8",
+        "id": "19e54ba0.7c2e0c",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu0",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu0' >      \n<parameter name='ab-id' value='`$odu0`' />\n<parameter name='odu-type' value=\"ODU0\" />\n<parameter name='number' value='1' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2181.933349609375,
-        "y": 1277.7333984375,
-        "z": "12d97b5.248ff85",
+        "x": 2188.433349609375,
+        "y": 1247.300064086914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "2152e5a8.234e4a",
+        "id": "9b8b0393.415698",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu1",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu1' >      \n<parameter name='ab-id' value='`$odu1`' />\n<parameter name='odu-type' value=\"ODU1\" />\n<parameter name='number' value='0' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2175.25,
-        "y": 1332.75,
-        "z": "12d97b5.248ff85",
+        "x": 2181.75,
+        "y": 1302.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "fee249b2.2732e8",
+        "id": "ae120072.9b7ff",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu2",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu2' >      \n<parameter name='ab-id' value='`$odu2`' />\n<parameter name='odu-type' value=\"ODU2\" />\n<parameter name='number' value='0' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2163.25,
-        "y": 1406.75,
-        "z": "12d97b5.248ff85",
+        "x": 2169.75,
+        "y": 1376.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "8d5bc0c.88ed84",
+        "id": "d8f0832e.4d0f7",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu3",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu3' >      \n<parameter name='ab-id' value='`$odu3`' />\n<parameter name='odu-type' value=\"ODU3\" />\n<parameter name='number' value='0' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2162.25,
-        "y": 1480.75,
-        "z": "12d97b5.248ff85",
+        "x": 2168.75,
+        "y": 1450.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "227e1b10.a2fb2c",
+        "id": "e2261dd3.e1a278",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu4",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu4' >      \n<parameter name='ab-id' value='`$odu4`' />\n<parameter name='odu-type' value=\"ODU4\" />\n<parameter name='number' value='0' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2181.25,
-        "y": 1583.75,
-        "z": "12d97b5.248ff85",
+        "x": 2187.75,
+        "y": 1553.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "b7bd314d.9cf0d",
+        "id": "1e178e7a.d3ed5a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1888.25,
-        "y": 1815.75,
-        "z": "12d97b5.248ff85",
+        "x": 1894.75,
+        "y": 1785.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "6ef755ed.99548c",
-                "dd2f7629.777398",
-                "66e62552.4aa394",
-                "8609ccb1.2d8bd",
-                "87595d0e.b05d38",
-                "ce9a967c.b09018"
+                "11cbd181.874abe",
+                "2f3663f5.b479dc",
+                "de12e90e.01947",
+                "790ae74c.b00338",
+                "2418cab2.d227fe",
+                "97c5cda9.f9b988"
             ]
         ]
     },
     {
-        "id": "6ef755ed.99548c",
+        "id": "11cbd181.874abe",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu0",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu0' >      \n<parameter name='ab-id' value='`$odu0`' />\n<parameter name='odu-type' value=\"ODU0\" />\n<parameter name='number' value='2' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2213.25,
-        "y": 1662.75,
-        "z": "12d97b5.248ff85",
+        "x": 2219.75,
+        "y": 1632.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "dd2f7629.777398",
+        "id": "2f3663f5.b479dc",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu1",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu1' >      \n<parameter name='ab-id' value='`$odu1`' />\n<parameter name='odu-type' value=\"ODU1\" />\n<parameter name='number' value='1' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2196.566650390625,
-        "y": 1733.7666015625,
-        "z": "12d97b5.248ff85",
+        "x": 2203.066650390625,
+        "y": 1703.333267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "66e62552.4aa394",
+        "id": "de12e90e.01947",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu2",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu2' >      \n<parameter name='ab-id' value='`$odu2`' />\n<parameter name='odu-type' value=\"ODU2\" />\n<parameter name='number' value='0' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2192.566650390625,
-        "y": 1788.7666015625,
-        "z": "12d97b5.248ff85",
+        "x": 2199.066650390625,
+        "y": 1758.333267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "8609ccb1.2d8bd",
+        "id": "790ae74c.b00338",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu3",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu3' >      \n<parameter name='ab-id' value='`$odu3`' />\n<parameter name='odu-type' value=\"ODU3\" />\n<parameter name='number' value='0' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2207.566650390625,
-        "y": 1853.7666015625,
-        "z": "12d97b5.248ff85",
+        "x": 2214.066650390625,
+        "y": 1823.333267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "87595d0e.b05d38",
+        "id": "2418cab2.d227fe",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu4",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu4' >      \n<parameter name='ab-id' value='`$odu4`' />\n<parameter name='odu-type' value=\"ODU4\" />\n<parameter name='number' value='0' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2202.566650390625,
-        "y": 1922.7666015625,
-        "z": "12d97b5.248ff85",
+        "x": 2209.066650390625,
+        "y": 1892.333267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "b7e44f5e.25e06",
+        "id": "40f83d7a.41a484",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1901.25,
-        "y": 2121.25,
-        "z": "12d97b5.248ff85",
+        "x": 1907.75,
+        "y": 2090.816665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "b6290079.3768d8",
-                "aeacf8f2.125a18",
-                "3a3745a4.09acaa",
-                "20f621b2.75d936",
-                "d5c969cd.0b6938",
-                "fa7682f.bf183"
+                "4406468d.5ce9b",
+                "bfd3738c.6803a8",
+                "b85d6527.346848",
+                "b41c7ac9.59a77",
+                "8f7d9a54.5cdd1",
+                "31c35c3d.e2a904"
             ]
         ]
     },
     {
-        "id": "b6290079.3768d8",
+        "id": "4406468d.5ce9b",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu0",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu0' >      \n<parameter name='ab-id' value='`$odu0`' />\n<parameter name='odu-type' value=\"ODU0\" />\n<parameter name='number' value='8' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2226.25,
-        "y": 1968.25,
-        "z": "12d97b5.248ff85",
+        "x": 2232.75,
+        "y": 1937.816665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "aeacf8f2.125a18",
+        "id": "bfd3738c.6803a8",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu1",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu1' >      \n<parameter name='ab-id' value='`$odu1`' />\n<parameter name='odu-type' value=\"ODU1\" />\n<parameter name='number' value='4' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2209.566650390625,
-        "y": 2039.2666015625,
-        "z": "12d97b5.248ff85",
+        "x": 2216.066650390625,
+        "y": 2008.833267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "3a3745a4.09acaa",
+        "id": "b85d6527.346848",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu2",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu2' >      \n<parameter name='ab-id' value='`$odu2`' />\n<parameter name='odu-type' value=\"ODU2\" />\n<parameter name='number' value='1' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2205.566650390625,
-        "y": 2094.2666015625,
-        "z": "12d97b5.248ff85",
+        "x": 2212.066650390625,
+        "y": 2063.833267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "20f621b2.75d936",
+        "id": "b41c7ac9.59a77",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu3",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu3' >      \n<parameter name='ab-id' value='`$odu3`' />\n<parameter name='odu-type' value=\"ODU3\" />\n<parameter name='number' value='0' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2220.566650390625,
-        "y": 2159.2666015625,
-        "z": "12d97b5.248ff85",
+        "x": 2227.066650390625,
+        "y": 2128.833267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "d5c969cd.0b6938",
+        "id": "8f7d9a54.5cdd1",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu4",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu4' >      \n<parameter name='ab-id' value='`$odu4`' />\n<parameter name='odu-type' value=\"ODU4\" />\n<parameter name='number' value='0' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2215.566650390625,
-        "y": 2228.2666015625,
-        "z": "12d97b5.248ff85",
+        "x": 2222.066650390625,
+        "y": 2197.833267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "ca6f1330.654d",
+        "id": "91b89ace.609a68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1921.25,
-        "y": 2442.25,
-        "z": "12d97b5.248ff85",
+        "x": 1927.75,
+        "y": 2411.816665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "2be58a1d.aed496",
-                "89903ba4.c414c8",
-                "41154fca.298178",
-                "e906813f.b5869",
-                "96b9d670.d50be8",
-                "82c447b3.e8f528"
+                "ee326db5.8436a",
+                "35407e33.d79e02",
+                "18be1ac.ac0dde5",
+                "aebddf9c.15c58",
+                "765cd24e.25591c",
+                "7d4e01bf.0dfb3"
             ]
         ]
     },
     {
-        "id": "2be58a1d.aed496",
+        "id": "ee326db5.8436a",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu0",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu0' >      \n<parameter name='ab-id' value='`$odu0`' />\n<parameter name='odu-type' value=\"ODU0\" />\n<parameter name='number' value='40' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2280.25,
-        "y": 2293.25,
-        "z": "12d97b5.248ff85",
+        "x": 2286.75,
+        "y": 2262.816665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "89903ba4.c414c8",
+        "id": "35407e33.d79e02",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu1",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu1' >      \n<parameter name='ab-id' value='`$odu1`' />\n<parameter name='odu-type' value=\"ODU1\" />\n<parameter name='number' value='20' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2277.566650390625,
-        "y": 2360.2666015625,
-        "z": "12d97b5.248ff85",
+        "x": 2284.066650390625,
+        "y": 2329.833267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "41154fca.298178",
+        "id": "18be1ac.ac0dde5",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu2",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu2' >      \n<parameter name='ab-id' value='`$odu2`' />\n<parameter name='odu-type' value=\"ODU2\" />\n<parameter name='number' value='5' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2225.566650390625,
-        "y": 2415.2666015625,
-        "z": "12d97b5.248ff85",
+        "x": 2232.066650390625,
+        "y": 2384.833267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "e906813f.b5869",
+        "id": "aebddf9c.15c58",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu3",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu3' >      \n<parameter name='ab-id' value='`$odu3`' />\n<parameter name='odu-type' value=\"ODU3\" />\n<parameter name='number' value='1' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2240.566650390625,
-        "y": 2480.2666015625,
-        "z": "12d97b5.248ff85",
+        "x": 2247.066650390625,
+        "y": 2449.833267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "96b9d670.d50be8",
+        "id": "765cd24e.25591c",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu4",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu4' >      \n<parameter name='ab-id' value='`$odu4`' />\n<parameter name='odu-type' value=\"ODU4\" />\n<parameter name='number' value='0' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2235.566650390625,
-        "y": 2549.2666015625,
-        "z": "12d97b5.248ff85",
+        "x": 2242.066650390625,
+        "y": 2518.833267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "c8a60ea.86b8df",
+        "id": "f610d634.b8cc4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1945.25,
-        "y": 2776.25,
-        "z": "12d97b5.248ff85",
+        "x": 1951.75,
+        "y": 2745.816665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "2e6514f0.94b6c4",
-                "b0455458.6d62f",
-                "6ee00e0.0c53cf4",
-                "1a460df7.cad502",
-                "62cd4705.4d3d4",
-                "6816d709.9fbb6"
+                "46acc9e7.1d9a8",
+                "a8c71c34.c3e7c",
+                "4f6686a5.9e0468",
+                "ae2f3dac.166",
+                "ad5a2744.3a73f",
+                "2aeb6b3e.6c3a4c"
             ]
         ]
     },
     {
-        "id": "2e6514f0.94b6c4",
+        "id": "46acc9e7.1d9a8",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu0",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu0' >      \n<parameter name='ab-id' value='`$odu0`' />\n<parameter name='odu-type' value=\"ODU0\" />\n<parameter name='number' value='80' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2306.25,
-        "y": 2623.25,
-        "z": "12d97b5.248ff85",
+        "x": 2312.75,
+        "y": 2592.816665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "b0455458.6d62f",
+        "id": "a8c71c34.c3e7c",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu1",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu1' >      \n<parameter name='ab-id' value='`$odu1`' />\n<parameter name='odu-type' value=\"ODU1\" />\n<parameter name='number' value='40' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2291.566650390625,
-        "y": 2694.2666015625,
-        "z": "12d97b5.248ff85",
+        "x": 2298.066650390625,
+        "y": 2663.833267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "6ee00e0.0c53cf4",
+        "id": "4f6686a5.9e0468",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu2",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu2' >      \n<parameter name='ab-id' value='`$odu2`' />\n<parameter name='odu-type' value=\"ODU2\" />\n<parameter name='number' value='10' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2249.566650390625,
-        "y": 2749.2666015625,
-        "z": "12d97b5.248ff85",
+        "x": 2256.066650390625,
+        "y": 2718.833267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "1a460df7.cad502",
+        "id": "ae2f3dac.166",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu3",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu3' >      \n<parameter name='ab-id' value='`$odu3`' />\n<parameter name='odu-type' value=\"ODU3\" />\n<parameter name='number' value='2' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2264.566650390625,
-        "y": 2814.2666015625,
-        "z": "12d97b5.248ff85",
+        "x": 2271.066650390625,
+        "y": 2783.833267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "62cd4705.4d3d4",
+        "id": "ad5a2744.3a73f",
         "type": "save",
         "name": "save available-bandwidth in AAI for odu4",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='available-bandwidth' \n      key='pnf.pnf-name = $node.uuid\n      AND p-interface.interface-name = $tp.uuid AND bandwidth-attribute.bwa-id = $random-ba AND available-bandwidth.ab-id = $odu4' >      \n<parameter name='ab-id' value='`$odu4`' />\n<parameter name='odu-type' value=\"ODU4\" />\n<parameter name='number' value='1' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2259.566650390625,
-        "y": 2883.2666015625,
-        "z": "12d97b5.248ff85",
+        "x": 2266.066650390625,
+        "y": 2852.833267211914,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             []
         ]
     },
     {
-        "id": "3a380053.5e28e8",
+        "id": "ebd113cf.809d58",
         "type": "outcome",
         "name": "OTU0",
         "xml": "<outcome value='OTU0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1392.75,
-        "y": 1096.75,
-        "z": "12d97b5.248ff85",
+        "x": 1399.25,
+        "y": 1066.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "3f789e8e.088bd2"
+                "fe9ed448.89feb"
             ]
         ]
     },
     {
-        "id": "d7b0999b.5401d8",
+        "id": "5e039964.21b738",
         "type": "outcome",
         "name": "OTU1",
         "xml": "<outcome value='OTU1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1389.75,
-        "y": 1134.75,
-        "z": "12d97b5.248ff85",
+        "x": 1396.25,
+        "y": 1104.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "3f789e8e.088bd2"
+                "fe9ed448.89feb"
             ]
         ]
     },
     {
-        "id": "c59da1dd.0a3a6",
+        "id": "55df563c.f847e8",
         "type": "outcome",
         "name": "OTU2",
         "xml": "<outcome value='OTU2'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1396.75,
-        "y": 1181.75,
-        "z": "12d97b5.248ff85",
+        "x": 1403.25,
+        "y": 1151.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "3f789e8e.088bd2"
+                "fe9ed448.89feb"
             ]
         ]
     },
     {
-        "id": "9ef45078.45166",
+        "id": "2a77e6fd.99cfe2",
         "type": "outcome",
         "name": "OTU3",
         "xml": "<outcome value='OTU3'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1396.75,
-        "y": 1229.75,
-        "z": "12d97b5.248ff85",
+        "x": 1403.25,
+        "y": 1199.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "3f789e8e.088bd2"
+                "fe9ed448.89feb"
             ]
         ]
     },
     {
-        "id": "a8b7220d.93d588",
+        "id": "b446277d.b32c2",
         "type": "outcome",
         "name": "OTU4",
         "xml": "<outcome value='OTU4'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1392.75,
-        "y": 1276.75,
-        "z": "12d97b5.248ff85",
+        "x": 1399.25,
+        "y": 1246.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": [
             [
-                "3f789e8e.088bd2"
+                "fe9ed448.89feb"
             ]
         ]
     },
     {
-        "id": "3bb8f50c.9c58ca",
+        "id": "c59ccd0.41ff13",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='random-ba' value=\"`$node.uuid + '_' + $tp.uuid`\" />\n<parameter name='odu0' value=\"`$random-ba + '-ODU0'`\" />\n<parameter name='odu1' value=\"`$random-ba + '-ODU1'`\" />\n<parameter name='odu2' value=\"`$random-ba + '-ODU2'`\" />\n<parameter name='odu3' value=\"`$random-ba + '-ODU3'`\" />\n<parameter name='odu4' value=\"`$random-ba + '-ODU4'`\" />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 1938,
-        "y": 1294.25,
-        "z": "12d97b5.248ff85",
+        "x": 1944.5,
+        "y": 1263.816665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "ce9a967c.b09018",
+        "id": "97c5cda9.f9b988",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='random-ba' value=\"`$node.uuid + '_' + $tp.uuid`\" />\n<parameter name='odu0' value=\"`$random-ba + '-ODU0'`\" />\n<parameter name='odu1' value=\"`$random-ba + '-ODU1'`\" />\n<parameter name='odu2' value=\"`$random-ba + '-ODU2'`\" />\n<parameter name='odu3' value=\"`$random-ba + '-ODU3'`\" />\n<parameter name='odu4' value=\"`$random-ba + '-ODU4'`\" />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 1883,
-        "y": 1658,
-        "z": "12d97b5.248ff85",
+        "x": 1889.5,
+        "y": 1627.566665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "fa7682f.bf183",
+        "id": "31c35c3d.e2a904",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='random-ba' value=\"`$node.uuid + '_' + $tp.uuid`\" />\n<parameter name='odu0' value=\"`$random-ba + '-ODU0'`\" />\n<parameter name='odu1' value=\"`$random-ba + '-ODU1'`\" />\n<parameter name='odu2' value=\"`$random-ba + '-ODU2'`\" />\n<parameter name='odu3' value=\"`$random-ba + '-ODU3'`\" />\n<parameter name='odu4' value=\"`$random-ba + '-ODU4'`\" />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 1984,
-        "y": 1989.75,
-        "z": "12d97b5.248ff85",
+        "x": 1990.5,
+        "y": 1959.316665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "82c447b3.e8f528",
+        "id": "7d4e01bf.0dfb3",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='random-ba' value=\"`$node.uuid + '_' + $tp.uuid`\" />\n<parameter name='odu0' value=\"`$random-ba + '-ODU0'`\" />\n<parameter name='odu1' value=\"`$random-ba + '-ODU1'`\" />\n<parameter name='odu2' value=\"`$random-ba + '-ODU2'`\" />\n<parameter name='odu3' value=\"`$random-ba + '-ODU3'`\" />\n<parameter name='odu4' value=\"`$random-ba + '-ODU4'`\" />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 2034,
-        "y": 2288.5,
-        "z": "12d97b5.248ff85",
+        "x": 2040.5,
+        "y": 2258.066665649414,
+        "z": "4a2cc4e8.fff2dc",
         "wires": []
     },
     {
-        "id": "6816d709.9fbb6",
+        "id": "2aeb6b3e.6c3a4c",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='random-ba' value=\"`$node.uuid + '_' + $tp.uuid`\" />\n<parameter name='odu0' value=\"`$random-ba + '-ODU0'`\" />\n<parameter name='odu1' value=\"`$random-ba + '-ODU1'`\" />\n<parameter name='odu2' value=\"`$random-ba + '-ODU2'`\" />\n<parameter name='odu3' value=\"`$random-ba + '-ODU3'`\" />\n<parameter name='odu4' value=\"`$random-ba + '-ODU4'`\" />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 2060,
-        "y": 2616,
-        "z": "12d97b5.248ff85",
+        "x": 2066.5,
+        "y": 2585.566665649414,
+        "z": "4a2cc4e8.fff2dc",
         "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 81e8bd20..110c9f61 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
@@ -64,68 +64,6 @@
                                                                         <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
                                                                     </block>
                                                                 </for>
-                                                                <switch test='`$topology.networks.network_length >= 2`'>
-                                                                    <outcome value='true'>
-                                                                        <for index='netidx' start='0' end='`$topology.networks.network_length`' >
-                                                                            <block>
-                                                                                <set>
-                                                                                    <parameter name='network.' value='' />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='network.' value='`$topology.networks.network[$netidx].`' />
-                                                                                </set>
-                                                                                <switch test='`$network.te-topology-id`'>
-                                                                                    <outcome value='11'>
-                                                                                        <block>
-                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                                                <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
-                                                                                                <parameter name="field1" value="__TIMESTAMP__" />
-                                                                                                <parameter name="field2" value="networks_length" />
-                                                                                                <parameter name="field3" value="`$topology.networks.network_length`" />
-                                                                                                <parameter name="field4" value="network-type-is" />
-                                                                                                <parameter name="field5" value="OTN" />
-                                                                                            </record>
-                                                                                            <set>
-                                                                                                <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />
-                                                                                            </set>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                    <outcome value='33'>
-                                                                                        <block>
-                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                                                <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
-                                                                                                <parameter name="field1" value="__TIMESTAMP__" />
-                                                                                                <parameter name="field2" value="networks_length" />
-                                                                                                <parameter name="field3" value="`$topology.networks.network_length`" />
-                                                                                                <parameter name="field4" value="network-type-is" />
-                                                                                                <parameter name="field5" value="ETH" />
-                                                                                            </record>
-                                                                                            <set>
-                                                                                                <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />
-                                                                                            </set>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                </switch>
-                                                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                                    <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
-                                                                                    <parameter name="field6" value="network-otn-is" />
-                                                                                    <parameter name="field7" value="`$network-otn.te-topology-id`" />
-                                                                                    <parameter name="field8" value="network-eth-is" />
-                                                                                    <parameter name="field9" value="`$network-eth.te-topology-id`" />
-                                                                                </record>
-                                                                                <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
-                                                                            </block>
-                                                                        </for>
-                                                                    </outcome>
-                                                                    <outcome value='false'>
-                                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                            <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
-                                                                            <parameter name="field1" value="__TIMESTAMP__" />
-                                                                            <parameter name="field2" value="networks_length" />
-                                                                            <parameter name="field3" value="`$topology.networks.network_length`" />
-                                                                        </record>
-                                                                    </outcome>
-                                                                </switch>
                                                             </block>
                                                         </outcome>
                                                     </execute>
@@ -160,68 +98,6 @@
                                                                         <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
                                                                     </block>
                                                                 </for>
-                                                                <switch test='`$topology.networks.network_length >= 2`'>
-                                                                    <outcome value='true'>
-                                                                        <for index='netidx' start='0' end='`$topology.networks.network_length`' >
-                                                                            <block>
-                                                                                <set>
-                                                                                    <parameter name='network.' value='' />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='network.' value='`$topology.networks.network[$netidx].`' />
-                                                                                </set>
-                                                                                <switch test='`$network.te-topology-id`'>
-                                                                                    <outcome value='11'>
-                                                                                        <block>
-                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                                                <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
-                                                                                                <parameter name="field1" value="__TIMESTAMP__" />
-                                                                                                <parameter name="field2" value="networks_length" />
-                                                                                                <parameter name="field3" value="`$topology.networks.network_length`" />
-                                                                                                <parameter name="field4" value="network-type-is" />
-                                                                                                <parameter name="field5" value="OTN" />
-                                                                                            </record>
-                                                                                            <set>
-                                                                                                <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />
-                                                                                            </set>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                    <outcome value='33'>
-                                                                                        <block>
-                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                                                <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
-                                                                                                <parameter name="field1" value="__TIMESTAMP__" />
-                                                                                                <parameter name="field2" value="networks_length" />
-                                                                                                <parameter name="field3" value="`$topology.networks.network_length`" />
-                                                                                                <parameter name="field4" value="network-type-is" />
-                                                                                                <parameter name="field5" value="ETH" />
-                                                                                            </record>
-                                                                                            <set>
-                                                                                                <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />
-                                                                                            </set>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                </switch>
-                                                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                                    <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
-                                                                                    <parameter name="field6" value="network-otn-is" />
-                                                                                    <parameter name="field7" value="`$network-otn.te-topology-id`" />
-                                                                                    <parameter name="field8" value="network-eth-is" />
-                                                                                    <parameter name="field9" value="`$network-eth.te-topology-id`" />
-                                                                                </record>
-                                                                                <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
-                                                                            </block>
-                                                                        </for>
-                                                                    </outcome>
-                                                                    <outcome value='false'>
-                                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                            <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
-                                                                            <parameter name="field1" value="__TIMESTAMP__" />
-                                                                            <parameter name="field2" value="networks_length" />
-                                                                            <parameter name="field3" value="`$topology.networks.network_length`" />
-                                                                        </record>
-                                                                    </outcome>
-                                                                </switch>
                                                             </block>
                                                         </outcome>
                                                     </execute>
@@ -324,8 +200,82 @@
                                 </switch>
                             </block>
                         </outcome>
-                        <outcome value='delete'>
-                            <block atomic="true"></block>
+                        <outcome value='Delete'>
+                            <block atomic="true">
+                                <switch test="`$prop.sdncRestApi.type`">
+                                    <outcome value='MSA'>
+                                        <block atomic='true'>
+                                            <set>
+                                                <parameter name='controllerid' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />
+                                            </set>
+                                            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT controller_id
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
+WHERE controller_id = $controllerid'
+pfx='dbcontrollerid'>
+                                                <outcome value='success'>
+                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
+    resource="SQL"
+    key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>
+                                                </outcome>
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Failure in getting controller-id from DB" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='not-found'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="controller-id could not be found in DB" />
+                                                    </return>
+                                                </outcome>
+                                            </get-resource>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='TAPI'>
+                                        <block>
+                                            <set>
+                                                <parameter name='controllerid' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />
+                                            </set>
+                                            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT controller_id
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
+WHERE controller_id = $controllerid'
+pfx='dbcontrollerid'>
+                                                <outcome value='success'>
+                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
+    resource="SQL"
+    key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>
+                                                </outcome>
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Failure in getting controller-id from DB" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='not-found'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="controller-id could not be found in DB" />
+                                                    </return>
+                                                </outcome>
+                                            </get-resource>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='Other'>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`'Unsupported type = ' + $prop.sdncRestApi.type`" />
+                                        </return>
+                                    </outcome>
+                                </switch>
+                            </block>
                         </outcome>
                     </switch>
                 </outcome>
diff --git a/platform-logic/datachange/src/main/xml/DataChange_msa-update-network-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_msa-update-network-to-aai.xml
index a4076e51..34fdcebb 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_msa-update-network-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_msa-update-network-to-aai.xml
@@ -20,7 +20,7 @@
                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$networks.network-id`" />
                         </save>
                         <set>
-                            <parameter name='controller_id' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url`" />
+                            <parameter name='controller_id' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />
                         </set>
                         <for index='nidx' start='0' end='`$networks.node_length`' >
                             <set>
@@ -120,14 +120,6 @@ key='pnf.pnf-name = $pnfname' >
                                                 <parameter name='speed-value' value='100' />
                                                 <parameter name='available-capacity' value='100' />
                                             </save>
-                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='custom-query' 
-      key="format='resource'"
-      force="true"
-      local-only="false"
-      pfx="data">
-                                                <parameter name='interface-name' value='`$interfaceName`' />
-                                                <parameter name='port-description' value='`$tp.tp-id`' />
-                                            </save>
                                             <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE VALUES ( $interfaceName , $tp.tp-id , $pnfname , $node.node-id , $controller_id , '100' , $clli , null );"></save>
                                         </for>
                                     </block>
diff --git a/platform-logic/datachange/src/main/xml/DataChange_tapi-update-network-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_tapi-update-network-to-aai.xml
index 626b7c73..e6a17cd1 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_tapi-update-network-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_tapi-update-network-to-aai.xml
@@ -25,7 +25,7 @@
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`" />
             </save>
             <set>
-                <parameter name='controller_id' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url`" />
+                <parameter name='controller_id' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />
             </set>
             <for index='nidx' start='0' end='`$topology.node_length`' >
                 <set>