X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fdatachange%2Fsrc%2Fmain%2Fjson%2FDataChange_esr-thirdparty-sdnc-discovery.json;h=ead08f444ebafaf9c0da986beb01613e0006031e;hb=550fe5b30603ff6da993acc5aeea83d1096433eb;hp=232afae40d6e400e72932d5bb4fbb169fc7e8d76;hpb=58acc1cd194f7d61b22f875bccc6738e6dfb0b7c;p=sdnc%2Foam.git

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 232afae4..ead08f44 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,253 +1,243 @@
 [
     {
-        "id": "b49e6ed1.c8dcb",
+        "id": "3872acaa.809c44",
         "type": "other",
         "name": "update",
         "xml": "<outcome value='Update'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 663,
-        "y": 290,
-        "z": "1b18cff5.bba51",
+        "x": 710,
+        "y": 305,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "afc79595.03a058"
+                "5a988226.7d9fdc"
             ]
         ]
     },
     {
-        "id": "93d3a809.23d83",
+        "id": "dbb694.b27a417",
         "type": "other",
         "name": "delete",
-        "xml": "<outcome value='delete'>\n",
+        "xml": "<outcome value='Delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 663,
-        "y": 370,
-        "z": "1b18cff5.bba51",
+        "x": 710,
+        "y": 385,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "87f5ce3d.163be8"
+                "754f4acc.eae6dc"
             ]
         ]
     },
     {
-        "id": "87f5ce3d.163be8",
+        "id": "754f4acc.eae6dc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 804.5,
-        "y": 370,
-        "z": "1b18cff5.bba51",
+        "x": 851.5,
+        "y": 385,
+        "z": "8cb67e95.d771b8",
         "wires": [
-            []
+            [
+                "983792ba.976408"
+            ]
         ]
     },
     {
-        "id": "ed89d8e2.366518",
-        "type": "comment",
-        "name": "TODO: Delete topology from AAI",
-        "info": "",
-        "comments": "",
-        "x": 737.3335189819336,
-        "y": 337.96899485588074,
-        "z": "1b18cff5.bba51",
-        "wires": []
-    },
-    {
-        "id": "493ee223.06b5cc",
+        "id": "4cc508ad.f5c7d",
         "type": "switchNode",
         "name": "switch aai-event-trigger",
         "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 493.5,
-        "y": 330,
-        "z": "1b18cff5.bba51",
+        "x": 540.5,
+        "y": 345,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "b49e6ed1.c8dcb",
-                "93d3a809.23d83"
+                "3872acaa.809c44",
+                "dbb694.b27a417"
             ]
         ]
     },
     {
-        "id": "c970e0d9.988dc8",
+        "id": "f974c517.d68cd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1190.5,
-        "y": 201,
-        "z": "1b18cff5.bba51",
+        "x": 1237.5,
+        "y": 216,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "b93333aa.1c0a7",
-                "8e89ec86.381848",
-                "6bfd56ef.86aba8",
-                "29c878c8.6e2e3",
-                "9dd42ebd.c3ec58"
+                "29d0fcfc.c3657c",
+                "80deb47b.7e9e",
+                "f9b155cc.d14098",
+                "c374fd8f.2c9bc8",
+                "31237f4.62f8c"
             ]
         ]
     },
     {
-        "id": "8e89ec86.381848",
+        "id": "80deb47b.7e9e",
         "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": 1463.5001983642578,
-        "y": 122.00000953674316,
-        "z": "1b18cff5.bba51",
+        "x": 1510.5001983642578,
+        "y": 137.00000953674316,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "37b02225.daaf3e",
-                "e44faed5.0a562"
+                "6d5b07.e87e6cf8",
+                "403286df.c4eed8"
             ]
         ]
     },
     {
-        "id": "37b02225.daaf3e",
+        "id": "6d5b07.e87e6cf8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1753.000244140625,
-        "y": 114,
-        "z": "1b18cff5.bba51",
+        "x": 1800.000244140625,
+        "y": 129,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "9ee82b4c.027258"
+                "b95a0f0f.c5f4"
             ]
         ]
     },
     {
-        "id": "e44faed5.0a562",
+        "id": "403286df.c4eed8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1749.000244140625,
-        "y": 154,
-        "z": "1b18cff5.bba51",
+        "x": 1796.000244140625,
+        "y": 169,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "95fadd6c.fb4588"
+                "f35984bc.58f298"
             ]
         ]
     },
     {
-        "id": "9ee82b4c.027258",
+        "id": "b95a0f0f.c5f4",
         "type": "set",
         "name": "set token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
         "comments": "",
-        "x": 1903.500244140625,
-        "y": 114,
-        "z": "1b18cff5.bba51",
+        "x": 1950.500244140625,
+        "y": 129,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "d863483.fe451b8",
+        "id": "c03c3a2.5764a48",
         "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": 1970.500244140625,
-        "y": 234,
-        "z": "1b18cff5.bba51",
+        "x": 2017.500244140625,
+        "y": 249,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "27150b59.a15c7c",
-                "10804f14.8fac71"
+                "986cb045.40c5",
+                "e9ec571f.c3cfe8"
             ]
         ]
     },
     {
-        "id": "27150b59.a15c7c",
+        "id": "986cb045.40c5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2213.000244140625,
-        "y": 254,
-        "z": "1b18cff5.bba51",
+        "x": 2260.000244140625,
+        "y": 269,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "45766a62.487964"
+                "7a144ec7.8a9348"
             ]
         ]
     },
     {
-        "id": "45766a62.487964",
+        "id": "7a144ec7.8a9348",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2370.500244140625,
-        "y": 254,
-        "z": "1b18cff5.bba51",
+        "x": 2417.500244140625,
+        "y": 269,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "ed8abc6a.23da9",
-                "3075f0c3.b7397",
-                "5530fe3e.d46a6"
+                "55ea6ad.8497214",
+                "ad96f3f.ca0439"
             ]
         ]
     },
     {
-        "id": "679734df.7d768c",
+        "id": "c2f07a72.d9a858",
         "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": 2347.000244140625,
-        "y": 154,
-        "z": "1b18cff5.bba51",
+        "x": 2394.000244140625,
+        "y": 169,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "10804f14.8fac71",
+        "id": "e9ec571f.c3cfe8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2209.000244140625,
-        "y": 154,
-        "z": "1b18cff5.bba51",
+        "x": 2256.000244140625,
+        "y": 169,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "679734df.7d768c"
+                "c2f07a72.d9a858"
             ]
         ]
     },
     {
-        "id": "fb65e652.c18e18",
+        "id": "7d5868e5.98eab",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 116,
-        "y": 65,
-        "z": "1b18cff5.bba51",
+        "x": 163,
+        "y": 80,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "5fd8c6ae.cf15e8"
+                "22d8189e.4866f"
             ]
         ]
     },
     {
-        "id": "5fd8c6ae.cf15e8",
+        "id": "22d8189e.4866f",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -255,1233 +245,1242 @@
         "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": 129,
-        "y": 125,
-        "z": "1b18cff5.bba51",
+        "x": 176,
+        "y": 140,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "7c6d0d29.a4e9cc"
+                "3a8b8af3.4d4416"
             ]
         ]
     },
     {
-        "id": "7c6d0d29.a4e9cc",
+        "id": "3a8b8af3.4d4416",
         "type": "method",
         "name": "method esr-thirdparty-sdnc-discovery",
         "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 149,
-        "y": 205,
-        "z": "1b18cff5.bba51",
+        "x": 196,
+        "y": 220,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "d5da3f05.d59de8"
+                "c8a85a4d.9e66f"
             ]
         ]
     },
     {
-        "id": "d5da3f05.d59de8",
+        "id": "c8a85a4d.9e66f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 396.5,
-        "y": 205,
-        "z": "1b18cff5.bba51",
+        "x": 443.5,
+        "y": 220,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "94fe0252.df11a8"
+                "cbd24389.ade708"
             ]
         ]
     },
     {
-        "id": "ed8abc6a.23da9",
+        "id": "55ea6ad.8497214",
         "type": "for",
         "name": "for each Network",
         "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2609.500244140625,
-        "y": 214,
-        "z": "1b18cff5.bba51",
+        "x": 2636.500244140625,
+        "y": 198,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "9a721924.2f2028"
+                "1ed2d22d.82cc36"
             ]
         ]
     },
     {
-        "id": "9a721924.2f2028",
+        "id": "1ed2d22d.82cc36",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2786.000244140625,
-        "y": 209,
-        "z": "1b18cff5.bba51",
+        "x": 2785.000244140625,
+        "y": 198,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "6726d129.2959a",
-                "896230f8.99ca6"
+                "852144d1.2cc6d",
+                "530a9a06.d69fc4"
             ]
         ]
     },
     {
-        "id": "6726d129.2959a",
+        "id": "852144d1.2cc6d",
         "type": "call",
         "name": "call update-network-to-aai",
         "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2965.000244140625,
-        "y": 229,
-        "z": "1b18cff5.bba51",
+        "x": 2964.000244140625,
+        "y": 218,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "896230f8.99ca6",
+        "id": "530a9a06.d69fc4",
         "type": "set",
         "name": "set network",
         "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
         "comments": "",
-        "x": 2920.000244140625,
-        "y": 189,
-        "z": "1b18cff5.bba51",
+        "x": 2919.000244140625,
+        "y": 178,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "95fadd6c.fb4588",
+        "id": "f35984bc.58f298",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1869.000244140625,
-        "y": 154,
-        "z": "1b18cff5.bba51",
+        "x": 1916.000244140625,
+        "y": 169,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "8fa7ac01.7e9068",
+        "id": "a473b7cc.4471d8",
         "type": "comment",
         "name": "Do Nothing",
         "info": "",
         "comments": "",
-        "x": 2039.000244140625,
-        "y": 194,
-        "z": "1b18cff5.bba51",
+        "x": 2086.000244140625,
+        "y": 209,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "4076575b.04c63",
+        "id": "d9afda1.5ca9828",
         "type": "switchNode",
         "name": "switch type",
         "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 916,
-        "y": 290,
-        "z": "1b18cff5.bba51",
+        "x": 963,
+        "y": 305,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "e5bd5122.002238",
-                "6d8d65c8.0b06bc",
-                "b3287819.8ca7c",
-                "4433c168.8e0cb"
+                "7ea96e84.4a184",
+                "e5a11dd.415fde",
+                "11ea46b7.9ad609",
+                "a5c3b391.3c4aa"
             ]
         ]
     },
     {
-        "id": "afc79595.03a058",
+        "id": "5a988226.7d9fdc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 783,
-        "y": 290,
-        "z": "1b18cff5.bba51",
+        "x": 830,
+        "y": 305,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "4076575b.04c63"
+                "d9afda1.5ca9828"
             ]
         ]
     },
     {
-        "id": "e5bd5122.002238",
+        "id": "7ea96e84.4a184",
         "type": "other",
         "name": "SOTN",
         "xml": "<outcome value='SOTN'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1029,
-        "y": 201,
-        "z": "1b18cff5.bba51",
+        "x": 1076,
+        "y": 216,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "c970e0d9.988dc8"
+                "f974c517.d68cd"
             ]
         ]
     },
     {
-        "id": "6d8d65c8.0b06bc",
+        "id": "e5a11dd.415fde",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1031.000087738037,
-        "y": 750.0001106262207,
-        "z": "1b18cff5.bba51",
+        "x": 1105.5,
+        "y": 677.5001220703125,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "f76541c6.503d4"
+                "4a0581b6.8cbdf"
             ]
         ]
     },
     {
-        "id": "f76541c6.503d4",
+        "id": "4a0581b6.8cbdf",
         "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": 1181.0000610351562,
-        "y": 746.0000972747803,
-        "z": "1b18cff5.bba51",
+        "x": 1291.75,
+        "y": 703.5001220703125,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "b93333aa.1c0a7",
+        "id": "29d0fcfc.c3657c",
         "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": 1410.0001983642578,
-        "y": 82.00000953674316,
-        "z": "1b18cff5.bba51",
+        "x": 1457.0001983642578,
+        "y": 97.00000953674316,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "6bfd56ef.86aba8",
+        "id": "f9b155cc.d14098",
         "type": "switchNode",
         "name": "switch prop.sdncRestApi.token_id",
         "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1456.5001983642578,
-        "y": 202.00000953674316,
-        "z": "1b18cff5.bba51",
+        "x": 1503.5001983642578,
+        "y": 217.00000953674316,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "ec0b1f86.de86a8",
-                "d869f67b.6cbd68"
+                "4e229170.2e1108",
+                "495c5d16.740274"
             ]
         ]
     },
     {
-        "id": "ec0b1f86.de86a8",
+        "id": "4e229170.2e1108",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1749.000244140625,
-        "y": 194,
-        "z": "1b18cff5.bba51",
+        "x": 1796.000244140625,
+        "y": 209,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "36410877.b60b2"
+                "b14dd129.fcf7f"
             ]
         ]
     },
     {
-        "id": "d869f67b.6cbd68",
+        "id": "495c5d16.740274",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1749.000244140625,
-        "y": 234,
-        "z": "1b18cff5.bba51",
+        "x": 1796.000244140625,
+        "y": 249,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "d863483.fe451b8"
+                "c03c3a2.5764a48"
             ]
         ]
     },
     {
-        "id": "36410877.b60b2",
+        "id": "b14dd129.fcf7f",
         "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": 1970.500244140625,
-        "y": 194,
-        "z": "1b18cff5.bba51",
+        "x": 2017.500244140625,
+        "y": 209,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "10804f14.8fac71",
-                "27150b59.a15c7c"
+                "e9ec571f.c3cfe8",
+                "986cb045.40c5"
             ]
         ]
     },
     {
-        "id": "9dd42ebd.c3ec58",
+        "id": "31237f4.62f8c",
         "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": 1453.0001983642578,
-        "y": 342.00000953674316,
-        "z": "1b18cff5.bba51",
+        "x": 1500.0001983642578,
+        "y": 357.00000953674316,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "29c878c8.6e2e3",
+        "id": "c374fd8f.2c9bc8",
         "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": 1413.0001983642578,
-        "y": 302.00000953674316,
-        "z": "1b18cff5.bba51",
+        "x": 1460.0001983642578,
+        "y": 317.00000953674316,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "6c35f59f.31aaf4",
+        "id": "47fcc4e5.c080a4",
         "type": "comment",
         "name": "Notification subscription",
         "info": "",
         "comments": "",
-        "x": 1418.000343322754,
-        "y": 259.00000858306885,
-        "z": "1b18cff5.bba51",
+        "x": 1465.000343322754,
+        "y": 274.00000858306885,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "94fe0252.df11a8",
+        "id": "cbd24389.ade708",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$prop.sdncRestApi.vendor == 'ZTE'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 103,
-        "y": 330,
-        "z": "1b18cff5.bba51",
+        "x": 150,
+        "y": 345,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "97112dfb.d25148",
-                "c86f88a8.e3654"
+                "f624fdf6.4a4ef8",
+                "67364ea6.885738"
             ]
         ]
     },
     {
-        "id": "97112dfb.d25148",
+        "id": "f624fdf6.4a4ef8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 290,
-        "y": 330,
-        "z": "1b18cff5.bba51",
+        "x": 337,
+        "y": 345,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "493ee223.06b5cc"
+                "4cc508ad.f5c7d"
             ]
         ]
     },
     {
-        "id": "c86f88a8.e3654",
+        "id": "67364ea6.885738",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 291,
-        "y": 455,
-        "z": "1b18cff5.bba51",
+        "x": 111.00003051757812,
+        "y": 1101.75,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "31c62e46.1b6bfa"
+                "48c54790.7a017"
             ]
         ]
     },
     {
-        "id": "31c62e46.1b6bfa",
+        "id": "48c54790.7a017",
         "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": 514,
-        "y": 455,
-        "z": "1b18cff5.bba51",
+        "x": 342.75,
+        "y": 1118.5000610351562,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b3287819.8ca7c",
+        "id": "11ea46b7.9ad609",
         "type": "other",
         "name": "TAPI",
         "xml": "<outcome value='TAPI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1107,
-        "y": 435,
-        "z": "1b18cff5.bba51",
+        "x": 1154,
+        "y": 450,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "a1b223fc.4bfc8"
+                "a1313060.f8d7d"
             ]
         ]
     },
     {
-        "id": "a1b223fc.4bfc8",
+        "id": "a1313060.f8d7d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1270,
-        "y": 434,
-        "z": "1b18cff5.bba51",
+        "x": 1317,
+        "y": 449,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "2ba90d0d.a5469a"
+                "f271610b.da5a3"
             ]
         ]
     },
     {
-        "id": "2ba90d0d.a5469a",
+        "id": "f271610b.da5a3",
         "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": 1431,
-        "y": 433,
-        "z": "1b18cff5.bba51",
+        "x": 1478,
+        "y": 448,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "e4e0c00a.96655",
-                "8857c3bd.cbf58"
+                "878204ba.609a58",
+                "1c89864.e323d7a"
             ]
         ]
     },
     {
-        "id": "8857c3bd.cbf58",
+        "id": "1c89864.e323d7a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1573,
-        "y": 509,
-        "z": "1b18cff5.bba51",
+        "x": 1620,
+        "y": 524,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "5009a48f.6c9144"
+                "5d965dcc.6101a4"
             ]
         ]
     },
     {
-        "id": "e4e0c00a.96655",
+        "id": "878204ba.609a58",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1607,
-        "y": 430,
-        "z": "1b18cff5.bba51",
+        "x": 1654,
+        "y": 445,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "3d3fabb0.3b7c64"
+                "4052d329.1b779c"
             ]
         ]
     },
     {
-        "id": "3d3fabb0.3b7c64",
+        "id": "4052d329.1b779c",
         "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": 1777,
-        "y": 429,
-        "z": "1b18cff5.bba51",
+        "x": 1824,
+        "y": 444,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "5009a48f.6c9144",
+        "id": "5d965dcc.6101a4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1734,
-        "y": 508,
-        "z": "1b18cff5.bba51",
+        "x": 1781,
+        "y": 523,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "7bccde97.6587f8"
+                "d1531df6.3732f"
             ]
         ]
     },
     {
-        "id": "7bccde97.6587f8",
+        "id": "d1531df6.3732f",
         "type": "for",
         "name": "for each topology",
         "xml": "<for index='tidx' start='0' end=\"`$topologies.topology_length`\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1913,
-        "y": 508,
-        "z": "1b18cff5.bba51",
+        "x": 1960,
+        "y": 523,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "b488f25e.063e58"
+                "8b55167c.96333"
             ]
         ]
     },
     {
-        "id": "b488f25e.063e58",
+        "id": "8b55167c.96333",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2080,
-        "y": 509,
-        "z": "1b18cff5.bba51",
+        "x": 2127,
+        "y": 524,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "5387bb7e.ccfa04",
-                "58ce3e1c.538878"
+                "e7e4969d.73ce58",
+                "9e2e1ddf.baa2b"
             ]
         ]
     },
     {
-        "id": "5387bb7e.ccfa04",
+        "id": "e7e4969d.73ce58",
         "type": "set",
         "name": "set topology",
         "xml": "<set>\n<parameter name='topology.' value='`$topologies.topology[$tidx].`' />\n",
         "comments": "",
-        "x": 2239,
-        "y": 510,
-        "z": "1b18cff5.bba51",
+        "x": 2286,
+        "y": 525,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "58ce3e1c.538878",
+        "id": "9e2e1ddf.baa2b",
         "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": 2230,
-        "y": 576,
-        "z": "1b18cff5.bba51",
+        "x": 2277,
+        "y": 591,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "4433c168.8e0cb",
+        "id": "a5c3b391.3c4aa",
         "type": "outcome",
         "name": "MSA",
         "xml": "<outcome value='MSA'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1077.677324295044,
-        "y": 591.8993349075317,
-        "z": "1b18cff5.bba51",
+        "x": 1124.677324295044,
+        "y": 606.8993349075317,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "e65be9ee.c7b3b"
+                "1925d7f4.b889a8"
             ]
         ]
     },
     {
-        "id": "e65be9ee.c7b3b",
+        "id": "1925d7f4.b889a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1239.6773872375488,
-        "y": 589.899335861206,
-        "z": "1b18cff5.bba51",
+        "x": 1286.6773872375488,
+        "y": 604.899335861206,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "35fd633c.bf4964"
+                "7ba5724d.ffaffc"
             ]
         ]
     },
     {
-        "id": "35fd633c.bf4964",
+        "id": "7ba5724d.ffaffc",
         "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": 1416.6771354675293,
-        "y": 581.8992919921875,
-        "z": "1b18cff5.bba51",
+        "x": 1463.6771354675293,
+        "y": 596.8992919921875,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "7a243e03.e07788",
-                "31b0685e.813ca8"
+                "6946de0a.deebc",
+                "5d4a6514.4c3a9c"
             ]
         ]
     },
     {
-        "id": "7a243e03.e07788",
+        "id": "6946de0a.deebc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1569.6771354675293,
-        "y": 578.8992919921875,
-        "z": "1b18cff5.bba51",
+        "x": 1616.6771354675293,
+        "y": 593.8992919921875,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "a65ca6e4.09ef28"
+                "e290e7ee.1a21f"
             ]
         ]
     },
     {
-        "id": "a65ca6e4.09ef28",
+        "id": "e290e7ee.1a21f",
         "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": 1744.6771354675293,
-        "y": 577.8992919921875,
-        "z": "1b18cff5.bba51",
+        "x": 1791.6771354675293,
+        "y": 592.8992919921875,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "31b0685e.813ca8",
+        "id": "5d4a6514.4c3a9c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1575.6771354675293,
-        "y": 651.8992919921875,
-        "z": "1b18cff5.bba51",
+        "x": 1622.6771354675293,
+        "y": 666.8992919921875,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "777a7a58.789fc4"
+                "815556fb.bd9668"
             ]
         ]
     },
     {
-        "id": "777a7a58.789fc4",
+        "id": "815556fb.bd9668",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1759.6771354675293,
-        "y": 653.8992919921875,
-        "z": "1b18cff5.bba51",
+        "x": 1806.6771354675293,
+        "y": 668.8992919921875,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "7575649a.153f4c"
+                "9834a552.e8e02"
             ]
         ]
     },
     {
-        "id": "7575649a.153f4c",
+        "id": "9834a552.e8e02",
         "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": 2038.677001953125,
-        "y": 651.8992919921875,
-        "z": "1b18cff5.bba51",
+        "x": 2085.677001953125,
+        "y": 666.8992919921875,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "3075f0c3.b7397",
+        "id": "983792ba.976408",
         "type": "switchNode",
-        "name": "switch network_length",
-        "xml": "<switch test='`$topology.networks.network_length`'>\n",
+        "name": "switch type",
+        "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2630,
-        "y": 320,
-        "z": "1b18cff5.bba51",
+        "x": 256.566650390625,
+        "y": 835.5666809082031,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "8524dca2.aeded8"
+                "674a6a9f.8c143c",
+                "42c7b2ab.76125c",
+                "1501fed.f113881"
             ]
         ]
     },
     {
-        "id": "8524dca2.aeded8",
+        "id": "674a6a9f.8c143c",
         "type": "outcome",
-        "name": "2 Topologies (1 Domain)",
-        "xml": "<outcome value='2'>\n",
+        "name": "MSA",
+        "xml": "<outcome value='MSA'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2904,
-        "y": 320,
-        "z": "1b18cff5.bba51",
+        "x": 435.857177734375,
+        "y": 752.9285888671875,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "b33095ec.9e9e"
+                "8b3cf345.6948d"
             ]
         ]
     },
     {
-        "id": "b33095ec.9e9e",
-        "type": "switchNode",
-        "name": "switch network-types[0]",
-        "xml": "<switch test='`$topology.networks.network[0].network-types`'>\n",
+        "id": "42c7b2ab.76125c",
+        "type": "other",
+        "name": "TAPI",
+        "xml": "<outcome value='TAPI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3272,
-        "y": 305,
-        "z": "1b18cff5.bba51",
+        "x": 444.6070556640625,
+        "y": 1003.6428527832031,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "d9671ae7.1f2ac",
-                "8d2f7cad.ac7078"
+                "ec6a41aa.381fd"
             ]
         ]
     },
     {
-        "id": "d9671ae7.1f2ac",
-        "type": "outcome",
-        "name": "ethernet-topology",
-        "xml": "<outcome value='ethernet-topology'>\n",
+        "id": "8b3cf345.6948d",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3488,
-        "y": 305,
-        "z": "1b18cff5.bba51",
+        "x": 589.607177734375,
+        "y": 749.7143249511719,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "9105249.2609cd8"
+                "49d8550e.67af3c",
+                "db848d25.52ee9"
             ]
         ]
     },
     {
-        "id": "9105249.2609cd8",
-        "type": "switchNode",
-        "name": "switch network-types[1]",
-        "xml": "<switch test='`$topology.networks.network[1].network-types`'>\n",
+        "id": "ec6a41aa.381fd",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3713,
-        "y": 305,
-        "z": "1b18cff5.bba51",
+        "x": 594,
+        "y": 1003.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "9ce7c86d.2eb2d8",
-                "36497843.e3494"
+                "1335976f.2d9b19",
+                "16c45478.af99e4"
             ]
         ]
     },
     {
-        "id": "9ce7c86d.2eb2d8",
-        "type": "outcome",
-        "name": "otn-topology",
-        "xml": "<outcome value='otn-topology'>\n",
+        "id": "1501fed.f113881",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3949,
-        "y": 258,
-        "z": "1b18cff5.bba51",
+        "x": 547,
+        "y": 1167.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "637acfae.0f124"
+                "41c63854.9379a8"
             ]
         ]
     },
     {
-        "id": "f3d25251.c6e91",
-        "type": "call",
-        "name": "call update-tp-ttp-relationship",
-        "xml": "<call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' >\n",
+        "id": "41c63854.9379a8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",
+        "comments": "",
+        "x": 709,
+        "y": 1206.5,
+        "z": "8cb67e95.d771b8",
+        "wires": []
+    },
+    {
+        "id": "49d8550e.67af3c",
+        "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": 4365,
-        "y": 246,
-        "z": "1b18cff5.bba51",
+        "x": 821.5,
+        "y": 797.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
-            []
+            [
+                "1a8d1895.ab6a47",
+                "47ef9d8f.3964f4",
+                "d98324ce.97ca8"
+            ]
         ]
     },
     {
-        "id": "741e41f5.1da6",
+        "id": "db848d25.52ee9",
         "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",
+        "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": 4321,
-        "y": 155,
-        "z": "1b18cff5.bba51",
+        "x": 781.5,
+        "y": 731.5,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "8d2f7cad.ac7078",
-        "type": "outcome",
-        "name": "otn-topology",
-        "xml": "<outcome value='otn-topology'>\n",
+        "id": "1a8d1895.ab6a47",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3493,
-        "y": 362,
-        "z": "1b18cff5.bba51",
+        "x": 1060.5,
+        "y": 817.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "a8d319cf.4bc79"
+                "d1f9e1a7.c7f19"
             ]
         ]
     },
     {
-        "id": "637acfae.0f124",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "d1f9e1a7.c7f19",
+        "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": 4131,
-        "y": 232,
-        "z": "1b18cff5.bba51",
+        "x": 1229.5,
+        "y": 824.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
-            [
-                "741e41f5.1da6",
-                "f3d25251.c6e91"
-            ]
+            []
         ]
     },
     {
-        "id": "a8d319cf.4bc79",
-        "type": "switchNode",
-        "name": "switch network-types[1]",
-        "xml": "<switch test='`$topology.networks.network[1].network-types`'>\n",
+        "id": "1335976f.2d9b19",
+        "type": "set",
+        "name": "set controller_id",
+        "xml": "<set>\n<parameter name='controllerid' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n\n\n",
+        "comments": "",
+        "x": 758.5,
+        "y": 959.5,
+        "z": "8cb67e95.d771b8",
+        "wires": []
+    },
+    {
+        "id": "16c45478.af99e4",
+        "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": 3712,
-        "y": 364,
-        "z": "1b18cff5.bba51",
+        "x": 771.5,
+        "y": 1048.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "5531c9a0.612ad8",
-                "182315db.ba9502"
+                "a8a3e82f.8a5a8",
+                "ae0994a7.403ab8",
+                "e57ecfd9.55df58"
             ]
         ]
     },
     {
-        "id": "36497843.e3494",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "a8a3e82f.8a5a8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3943,
-        "y": 317,
-        "z": "1b18cff5.bba51",
+        "x": 996.5,
+        "y": 1063.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "695f6a27.1421dc"
+                "d7aae079.2ca2a"
             ]
         ]
     },
     {
-        "id": "695f6a27.1421dc",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "id": "d7aae079.2ca2a",
+        "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": "",
-        "x": 4145,
-        "y": 315,
-        "z": "1b18cff5.bba51",
-        "wires": []
+        "outputs": 1,
+        "x": 1167.5,
+        "y": 1064.5,
+        "z": "8cb67e95.d771b8",
+        "wires": [
+            []
+        ]
     },
     {
-        "id": "5531c9a0.612ad8",
-        "type": "outcome",
-        "name": "ethernet-topology",
-        "xml": "<outcome value='ethernet-topology'>\n",
+        "id": "47ef9d8f.3964f4",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3935,
-        "y": 378,
-        "z": "1b18cff5.bba51",
+        "x": 1046.5,
+        "y": 896.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "842f72e1.b17048"
+                "1e298c8c.f0408b"
             ]
         ]
     },
     {
-        "id": "3a98f05a.e5da8",
-        "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": 4351,
-        "y": 359,
-        "z": "1b18cff5.bba51",
-        "wires": []
-    },
-    {
-        "id": "182315db.ba9502",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "ae0994a7.403ab8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3894,
-        "y": 439,
-        "z": "1b18cff5.bba51",
+        "x": 977.5,
+        "y": 1136.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "ac618cc1.491d7"
+                "c236971a.ee197"
             ]
         ]
     },
     {
-        "id": "ac618cc1.491d7",
+        "id": "1e298c8c.f0408b",
         "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 <parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Failure in getting controller-id from DB\" />\n\n",
         "comments": "",
-        "x": 4063,
-        "y": 446,
-        "z": "1b18cff5.bba51",
+        "x": 1207.5,
+        "y": 901.5,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "842f72e1.b17048",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "d98324ce.97ca8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4113,
-        "y": 374,
-        "z": "1b18cff5.bba51",
+        "x": 1037.5,
+        "y": 956.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "3a98f05a.e5da8",
-                "225dfddc.2a0cba"
+                "3416464c.a143ea"
             ]
         ]
     },
     {
-        "id": "5530fe3e.d46a6",
-        "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",
+        "id": "3416464c.a143ea",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n <parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"controller-id could not be found in DB\" />\n\n",
+        "comments": "",
+        "x": 1186.5,
+        "y": 958.5,
+        "z": "8cb67e95.d771b8",
+        "wires": []
+    },
+    {
+        "id": "c236971a.ee197",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n <parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Failure in getting controller-id from DB\" />\n\n",
+        "comments": "",
+        "x": 1125.5,
+        "y": 1137.5,
+        "z": "8cb67e95.d771b8",
+        "wires": []
+    },
+    {
+        "id": "e57ecfd9.55df58",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2617,
-        "y": 510,
-        "z": "1b18cff5.bba51",
+        "x": 977.5,
+        "y": 1180.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "d9e48832.552bd8",
-                "59795789.351ce",
-                "61ad07cf.dca3e8"
+                "d5ad8139.acdf48"
             ]
         ]
     },
     {
-        "id": "d9e48832.552bd8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "d5ad8139.acdf48",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n <parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"controller-id could not be found in DB\" />\n\n",
+        "comments": "",
+        "x": 1142.5,
+        "y": 1177.5,
+        "z": "8cb67e95.d771b8",
+        "wires": []
+    },
+    {
+        "id": "ad96f3f.ca0439",
+        "type": "switchNode",
+        "name": "switch network_length",
+        "xml": "<switch test='`$topology.networks.network_length >= 2`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2870,
-        "y": 428,
-        "z": "1b18cff5.bba51",
+        "x": 2653,
+        "y": 329,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "aa408c9d.56c38"
+                "d135440e.332828"
             ]
         ]
     },
     {
-        "id": "59795789.351ce",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "d135440e.332828",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2873.490966796875,
-        "y": 475.57403564453125,
-        "z": "1b18cff5.bba51",
+        "x": 2835,
+        "y": 330,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "c28a983a.0204"
+                "9dfbe1b1.0501b8"
             ]
         ]
     },
     {
-        "id": "61ad07cf.dca3e8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "27de91fe.6ca4f6",
+        "type": "for",
+        "name": "for each Network",
+        "xml": "<for index='netidx' start='0' end='`$topology.networks.network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2861.823974609375,
-        "y": 519.9073486328125,
-        "z": "1b18cff5.bba51",
+        "x": 3208,
+        "y": 323,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "781b901c.45ff08"
+                "7ec0ad88.0666cc"
             ]
         ]
     },
     {
-        "id": "225dfddc.2a0cba",
-        "type": "call",
-        "name": "call update-tp-ttp-relationship",
-        "xml": "<call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' >\n",
+        "id": "7ec0ad88.0666cc",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4386,
-        "y": 425,
-        "z": "1b18cff5.bba51",
+        "x": 3426,
+        "y": 320,
+        "z": "8cb67e95.d771b8",
         "wires": [
-            []
+            [
+                "8fdc47cc.432ab",
+                "b5eed741.5fbb08",
+                "1656178e.3ba998"
+            ]
         ]
     },
     {
-        "id": "11abef7e.ad2629",
+        "id": "5634a256.4e2744",
         "type": "call",
-        "name": "call update-open-ended-links",
-        "xml": "<call module='DataChange' rpc='update-open-ended-links' mode='sync' >\n",
+        "name": "call update-tp-ttp-relationship",
+        "xml": "<call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3658,
-        "y": 683,
-        "z": "1b18cff5.bba51",
+        "x": 3241,
+        "y": 383,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "aa408c9d.56c38",
-        "type": "switchNode",
-        "name": "switch network-resources_length",
-        "xml": "<switch test='tmp.aai.network-resources_length'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3085,
-        "y": 426,
-        "z": "1b18cff5.bba51",
-        "wires": [
-            [
-                "13de82c2.31f6ad"
-            ]
-        ]
-    },
-    {
-        "id": "13de82c2.31f6ad",
-        "type": "outcome",
-        "name": "4 Topologies (2 Domains)",
-        "xml": "<outcome value='4'>\n",
+        "id": "9dfbe1b1.0501b8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3362,
-        "y": 425,
-        "z": "1b18cff5.bba51",
+        "x": 3005,
+        "y": 326,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "e4acb7eb.00534"
+                "27de91fe.6ca4f6",
+                "5634a256.4e2744"
             ]
         ]
     },
     {
-        "id": "c28a983a.0204",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "id": "1656178e.3ba998",
+        "type": "set",
+        "name": "unset network",
+        "xml": "<set>\n<parameter name='network.' value='' />\n",
         "comments": "",
-        "x": 3046,
-        "y": 476,
-        "z": "1b18cff5.bba51",
+        "x": 3585,
+        "y": 260,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "781b901c.45ff08",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "id": "8fdc47cc.432ab",
+        "type": "set",
+        "name": "set network",
+        "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$netidx].`' />\n",
         "comments": "",
-        "x": 3035,
-        "y": 522,
-        "z": "1b18cff5.bba51",
+        "x": 3579,
+        "y": 308,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "3daf0b35.8056dc",
-        "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": 3677,
-        "y": 476,
-        "z": "1b18cff5.bba51",
-        "wires": [
-            [
-                "a478abea.aef858"
-            ]
-        ]
-    },
-    {
-        "id": "a478abea.aef858",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "b5eed741.5fbb08",
+        "type": "switchNode",
+        "name": "switch network-types with topologyId",
+        "xml": "<switch test='`$network.te-topology-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3836,
-        "y": 575,
-        "z": "1b18cff5.bba51",
+        "x": 3656,
+        "y": 355,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "672de2b7.6fadec",
-                "b7971e38.4fdc88"
+                "c1423a29.1c46e8",
+                "ab490ddf.8e1c1"
             ]
         ]
     },
     {
-        "id": "672de2b7.6fadec",
-        "type": "switchNode",
-        "name": "switch network-types[nridx]",
-        "xml": "<switch test='`$tmp.aai.network-resources.network-resource[$nridx].network-type`'>\n",
+        "id": "c1423a29.1c46e8",
+        "type": "outcome",
+        "name": "1",
+        "xml": "<outcome value='1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4043,
-        "y": 568,
-        "z": "1b18cff5.bba51",
+        "x": 3882,
+        "y": 324,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "8b03cc56.be0278"
+                "3c6e5d11.fbd2b2"
             ]
         ]
     },
     {
-        "id": "8b03cc56.be0278",
+        "id": "ab490ddf.8e1c1",
         "type": "outcome",
-        "name": "otn-topology",
-        "xml": "<outcome value='otn-topology'>\n",
+        "name": "2",
+        "xml": "<outcome value='2'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4256,
-        "y": 562,
-        "z": "1b18cff5.bba51",
+        "x": 3882,
+        "y": 385,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "5b2aaa85.617b44"
+                "654a57a4.0fd38"
             ]
         ]
     },
     {
-        "id": "7c2a6199.8c29b",
-        "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": 4622,
-        "y": 555,
-        "z": "1b18cff5.bba51",
-        "wires": []
-    },
-    {
-        "id": "b7971e38.4fdc88",
+        "id": "adf965cc.3e515",
         "type": "set",
-        "name": "set otnidx",
-        "xml": "<set>\n<parameter name='otnidx' value='0' />\n",
+        "name": "set network-otn",
+        "xml": "<set>\n<parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\n",
         "comments": "",
-        "x": 3988,
-        "y": 526,
-        "z": "1b18cff5.bba51",
+        "x": 4177,
+        "y": 324,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "ee5c6cf6.44a0c",
+        "id": "f1dbbcab.0dda4",
         "type": "set",
-        "name": "set otnidx",
-        "xml": "<set>\n<parameter name='otnidx' value='`$otnidx + 1`' />\n",
+        "name": "set network eth",
+        "xml": "<set>\n<parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\n",
         "comments": "",
-        "x": 4539,
-        "y": 607,
-        "z": "1b18cff5.bba51",
+        "x": 4177,
+        "y": 385,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "5b2aaa85.617b44",
+        "id": "3c6e5d11.fbd2b2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4402,
-        "y": 575,
-        "z": "1b18cff5.bba51",
+        "x": 4016,
+        "y": 324,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "7c2a6199.8c29b",
-                "ee5c6cf6.44a0c"
+                "adf965cc.3e515"
             ]
         ]
     },
     {
-        "id": "e4acb7eb.00534",
+        "id": "654a57a4.0fd38",
         "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3456,
-        "y": 499,
-        "z": "1b18cff5.bba51",
+        "x": 4017,
+        "y": 385,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "3daf0b35.8056dc",
-                "11abef7e.ad2629"
+                "f1dbbcab.0dda4"
             ]
         ]
     }