From f795758fd327fad2a9ed7ac411cfd10a3d5922a0 Mon Sep 17 00:00:00 2001
From: wsx25289 <10200860@zte.com.cn>
Date: Sun, 2 Dec 2018 21:12:15 -0500
Subject: [PATCH] fix topology discovery bug for ccvpn

Issue-ID: SDNC-354

Change-Id: I3c3d0a464af933da449f009690085d778bbb4614
Signed-off-by: Wsx25289 <10200860@zte.com.cn>
---
 .../json/DataChange_data-change-notification.json  |  372 ++--
 ...hange_esr-thirdparty-sdnc-discovery-of-zte.json | 2006 +++++++++++---------
 .../DataChange_esr-thirdparty-sdnc-discovery.json  | 1213 ++++++------
 .../DataChange_esr-thirdparty-sdnc-of-zte.json     |  603 +++---
 .../main/json/DataChange_esr-thirdparty-sdnc.json  |  904 ++++-----
 .../xml/DataChange_data-change-notification.xml    |   62 +-
 ...Change_esr-thirdparty-sdnc-discovery-of-zte.xml |  533 +++---
 .../DataChange_esr-thirdparty-sdnc-discovery.xml   |  291 +--
 .../xml/DataChange_esr-thirdparty-sdnc-of-zte.xml  |  124 +-
 .../main/xml/DataChange_esr-thirdparty-sdnc.xml    |    2 +-
 10 files changed, 3098 insertions(+), 3012 deletions(-)

diff --git a/platform-logic/datachange/src/main/json/DataChange_data-change-notification.json b/platform-logic/datachange/src/main/json/DataChange_data-change-notification.json
index eb1e8fdf..6d33aa44 100644
--- a/platform-logic/datachange/src/main/json/DataChange_data-change-notification.json
+++ b/platform-logic/datachange/src/main/json/DataChange_data-change-notification.json
@@ -1,278 +1,170 @@
 [
     {
-        "id": "c9438469.7f9978", 
-        "type": "dgstart", 
-        "name": "DGSTART", 
-        "outputs": 1, 
-        "x": 86.5, 
-        "y": 81, 
-        "z": "31e69f1c.704108", 
+        "id": "4153f9c1.51e918",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 121.03125,
+        "y": 50.99999761581421,
+        "z": "351662fa.1d559e",
         "wires": [
             [
-                "80aeb8.8187b148"
+                "c35543aa.9c0db"
             ]
         ]
-    }, 
-    {
-        "id": "80aeb8.8187b148", 
-        "type": "service-logic", 
-        "name": "DataChange ${project.version}", 
-        "module": "DataChange", 
-        "version": "${project.version}", 
-        "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": 249.61114883422852, 
-        "y": 182.44447135925293, 
-        "z": "31e69f1c.704108", 
-        "wires": [
-            [
-                "b8c8b6e.8e24748"
-            ]
-        ]
-    }, 
-    {
-        "id": "b8c8b6e.8e24748", 
-        "type": "method", 
-        "name": "method data-change-notification", 
-        "xml": "<method rpc='data-change-notification' mode='sync'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 247.0556983947754, 
-        "y": 346.2222566604614, 
-        "z": "31e69f1c.704108", 
+    },
+    {
+        "id": "c35543aa.9c0db",
+        "type": "service-logic",
+        "name": "DataChange ${project.version}",
+        "module": "DataChange",
+        "version": "${project.version}",
+        "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": 284.14239501953125,
+        "y": 153.44447326660156,
+        "z": "351662fa.1d559e",
         "wires": [
             [
-                "e44b2680.5f0e1"
+                "ddb1e250.e70de"
             ]
         ]
-    }, 
-    {
-        "id": "e44b2680.5f0e1", 
-        "type": "block", 
-        "name": "block : atomic", 
-        "xml": "<block atomic=\"true\">\n", 
-        "atomic": "false", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 292.2779846191406, 
-        "y": 461.1113269329071, 
-        "z": "31e69f1c.704108", 
+    },
+    {
+        "id": "ddb1e250.e70de",
+        "type": "method",
+        "name": "method data-change-notification",
+        "xml": "<method rpc='data-change-notification' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 281.5869483947754,
+        "y": 316.22225427627563,
+        "z": "351662fa.1d559e",
         "wires": [
             [
-                "5f1a41d8.25b23", 
-                "7978a5db.d860ec"
+                "d8e6317c.7d1e4"
             ]
         ]
-    }, 
-    {
-        "id": "5f1a41d8.25b23", 
-        "type": "returnSuccess", 
-        "name": "return success", 
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n", 
-        "comments": "", 
-        "x": 499.8338432312012, 
-        "y": 548.556131362915, 
-        "z": "31e69f1c.704108", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "bca5a9bf.c1ce98", 
-        "type": "call", 
-        "name": "call esr-thirdparty-sdnc", 
-        "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc' mode='sync' >\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1420.8341064453125, 
-        "y": 325.6667785644531, 
-        "z": "31e69f1c.704108", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "7978a5db.d860ec", 
-        "type": "switchNode", 
-        "name": "switch aai-node-type", 
-        "xml": "<switch test='`$data-change-notification-input.aai-node-type`'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 503.3827209472656, 
-        "y": 424.88262820243835, 
-        "z": "31e69f1c.704108", 
+    },
+    {
+        "id": "d8e6317c.7d1e4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 326.8092346191406,
+        "y": 431.1113245487213,
+        "z": "351662fa.1d559e",
         "wires": [
             [
-                "1e0b8434.23a404", 
-                "d0750bdf.e570e"
+                "3e65d07f.a9ae2",
+                "ed2d48f6.216158"
             ]
         ]
-    }, 
-    {
-        "id": "1e0b8434.23a404", 
-        "type": "other", 
-        "name": "esr-thirdparty-sdnc", 
-        "xml": "<outcome value='esr-thirdparty-sdnc'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 678.4146728515625, 
-        "y": 183.0572509765625, 
-        "z": "31e69f1c.704108", 
+    },
+    {
+        "id": "3e65d07f.a9ae2",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+        "comments": "",
+        "x": 534.3650932312012,
+        "y": 518.5561289787292,
+        "z": "351662fa.1d559e",
+        "wires": []
+    },
+    {
+        "id": "b5c4485f.b2ff78",
+        "type": "call",
+        "name": "call esr-thirdparty-sdnc",
+        "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1162.3653564453125,
+        "y": 152.66677856445312,
+        "z": "351662fa.1d559e",
         "wires": [
-            [
-                "e6b3f0d5.83e4a8"
-            ]
+            []
         ]
-    }, 
-    {
-        "id": "d0750bdf.e570e", 
-        "type": "other", 
-        "name": "other", 
-        "xml": "<outcome value='Other'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 743.3827857971191, 
-        "y": 423.8826608657837, 
-        "z": "31e69f1c.704108", 
+    },
+    {
+        "id": "ed2d48f6.216158",
+        "type": "switchNode",
+        "name": "switch aai-node-type",
+        "xml": "<switch test='`$data-change-notification-input.aai-node-type`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 537.9139709472656,
+        "y": 394.88262581825256,
+        "z": "351662fa.1d559e",
         "wires": [
             [
-                "9c41362c.9d7948"
+                "a7d7c4e8.cc6678",
+                "c25d5c15.d569e"
             ]
         ]
-    }, 
-    {
-        "id": "9c41362c.9d7948", 
-        "type": "returnFailure", 
-        "name": "return failure", 
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"AAI node type not supported\" />", 
-        "comments": "", 
-        "x": 898.8273048400879, 
-        "y": 423.99376010894775, 
-        "z": "31e69f1c.704108", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "dc8e805f.967db", 
-        "type": "block", 
-        "name": "block : atomic", 
-        "xml": "<block atomic=\"true\">\n", 
-        "atomic": "false", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1324.500244140625, 
-        "y": 241.8262939453125, 
-        "z": "31e69f1c.704108", 
+    },
+    {
+        "id": "a7d7c4e8.cc6678",
+        "type": "other",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 712.9459228515625,
+        "y": 153.0572485923767,
+        "z": "351662fa.1d559e",
         "wires": [
             [
-                "bca5a9bf.c1ce98"
+                "dfa0cb23.be8c58"
             ]
         ]
-    }, 
-    {
-        "id": "e6b3f0d5.83e4a8", 
-        "type": "for", 
-        "name": "for", 
-        "xml": "<for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 865.5, 
-        "y": 183, 
-        "z": "31e69f1c.704108", 
+    },
+    {
+        "id": "c25d5c15.d569e",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 777.9140357971191,
+        "y": 393.8826584815979,
+        "z": "351662fa.1d559e",
         "wires": [
             [
-                "ba8b2793.6bb91"
+                "f4eb1449.fa4908"
             ]
         ]
-    }, 
-    {
-        "id": "ba8b2793.6bb91", 
-        "type": "switchNode", 
-        "name": "switch", 
-        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-value == 'ZTE'`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1005.5, 
-        "y": 183, 
-        "z": "31e69f1c.704108", 
+    },
+    {
+        "id": "f4eb1449.fa4908",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"AAI node type not supported\" />",
+        "comments": "",
+        "x": 933.3585548400879,
+        "y": 393.99375772476196,
+        "z": "351662fa.1d559e",
+        "wires": []
+    },
+    {
+        "id": "dfa0cb23.be8c58",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 929.53125,
+        "y": 153,
+        "z": "351662fa.1d559e",
         "wires": [
             [
-                "891233f8.add168", 
-                "810b885f.a9b34"
+                "b5c4485f.b2ff78"
             ]
         ]
-    }, 
-    {
-        "id": "5b501f1b.fad328", 
-        "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": 1619.5, 
-        "y": 236, 
-        "z": "31e69f1c.704108", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "891233f8.add168", 
-        "type": "outcomeTrue", 
-        "name": "true", 
-        "xml": "<outcome value='true'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1159.5, 
-        "y": 183, 
-        "z": "31e69f1c.704108", 
-        "wires": [
-            [
-                "fb1086e7.fe9d98"
-            ]
-        ]
-    }, 
-    {
-        "id": "810b885f.a9b34", 
-        "type": "outcomeFalse", 
-        "name": "false", 
-        "xml": "<outcome value='false'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1159.5, 
-        "y": 242, 
-        "z": "31e69f1c.704108", 
-        "wires": [
-            [
-                "dc8e805f.967db"
-            ]
-        ]
-    }, 
-    {
-        "id": "fb1086e7.fe9d98", 
-        "type": "block", 
-        "name": "block : atomic", 
-        "xml": "<block atomic=\"true\">\n", 
-        "atomic": "false", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1322, 
-        "y": 183, 
-        "z": "31e69f1c.704108", 
-        "wires": [
-            [
-                "6a42dcf4.2a86a4", 
-                "5b501f1b.fad328"
-            ]
-        ]
-    }, 
-    {
-        "id": "6a42dcf4.2a86a4", 
-        "type": "set", 
-        "name": "set vendor", 
-        "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.vendor' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n", 
-        "comments": "", 
-        "x": 1547, 
-        "y": 183, 
-        "z": "31e69f1c.704108", 
-        "wires": [ ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery-of-zte.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery-of-zte.json
index f7332e85..4de03992 100644
--- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery-of-zte.json
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery-of-zte.json
@@ -1,1208 +1,1316 @@
 [
     {
-        "id": "15787234.124136", 
-        "type": "dgstart", 
-        "name": "DGSTART", 
-        "outputs": 1, 
-        "x": 101, 
-        "y": 108, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "5f902aaa.7aa9a4",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 96,
+        "y": 111,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "65c08ccc.a64284"
+                "a24e36d1.cffe88"
             ]
         ]
-    }, 
+    },
     {
-        "id": "65c08ccc.a64284", 
-        "type": "service-logic", 
-        "name": "DataChange ${project.version}", 
-        "module": "DataChange", 
-        "version": "${project.version}", 
-        "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": 205, 
-        "y": 197, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "a24e36d1.cffe88",
+        "type": "service-logic",
+        "name": "DataChange ${project.version}",
+        "module": "DataChange",
+        "version": "${project.version}",
+        "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": 200,
+        "y": 200,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "24732328.986984"
+                "62181046.00897"
             ]
         ]
-    }, 
+    },
     {
-        "id": "24732328.986984", 
-        "type": "method", 
-        "name": "method esr-thirdparty-sdnc-discovery-of-zte", 
-        "xml": "<method rpc='esr-thirdparty-sdnc-discovery-of-zte' mode='sync'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 273, 
-        "y": 295, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "62181046.00897",
+        "type": "method",
+        "name": "method esr-thirdparty-sdnc-discovery-of-zte",
+        "xml": "<method rpc='esr-thirdparty-sdnc-discovery-of-zte' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 268,
+        "y": 298,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "255730f2.067e3"
+                "bc55b20f.579c9"
             ]
         ]
-    }, 
+    },
     {
-        "id": "255730f2.067e3", 
-        "type": "block", 
-        "name": "block : atomic", 
-        "xml": "<block atomic='true'>", 
-        "atomic": "true", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 197, 
-        "y": 402, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "bc55b20f.579c9",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 192,
+        "y": 405,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "52a3f44e.4fe8d4"
+                "f7cce3b7.da11f"
             ]
         ]
-    }, 
+    },
     {
-        "id": "52a3f44e.4fe8d4", 
-        "type": "switchNode", 
-        "name": "switch aai-event-trigger", 
-        "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 399, 
-        "y": 402, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "f7cce3b7.da11f",
+        "type": "switchNode",
+        "name": "switch aai-event-trigger",
+        "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 394,
+        "y": 405,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "a7ad4b32.3232d", 
-                "7ca795d2.5ae15c"
+                "feebd6bc.652fa8",
+                "274f1a37.9e7186"
             ]
         ]
-    }, 
+    },
     {
-        "id": "a7ad4b32.3232d", 
-        "type": "outcome", 
-        "name": "update", 
-        "xml": "<outcome value='Update'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 627, 
-        "y": 357, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "feebd6bc.652fa8",
+        "type": "outcome",
+        "name": "update",
+        "xml": "<outcome value='Update'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 622,
+        "y": 360,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "6a7a4af2.cbffc4"
+                "3a6c0212.670f4e"
             ]
         ]
-    }, 
+    },
     {
-        "id": "7ca795d2.5ae15c", 
-        "type": "outcome", 
-        "name": "delete", 
-        "xml": "<outcome value='delete'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 625, 
-        "y": 525, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "274f1a37.9e7186",
+        "type": "outcome",
+        "name": "delete",
+        "xml": "<outcome value='delete'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 620,
+        "y": 528,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "3084a5a8.99639a"
+                "9093c48f.404368"
             ]
         ]
-    }, 
-    {
-        "id": "3084a5a8.99639a", 
-        "type": "block", 
-        "name": "block : atomic", 
-        "xml": "<block atomic='true'>", 
-        "atomic": "true", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 800, 
-        "y": 525, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "6a7a4af2.cbffc4", 
-        "type": "block", 
-        "name": "block", 
-        "xml": "<block>\n", 
-        "atomic": "false", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 779, 
-        "y": 357, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "9093c48f.404368",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 795,
+        "y": 528,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3a6c0212.670f4e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 774,
+        "y": 360,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "9521c124.e5b908"
+                "8c1f6548.e5e568"
             ]
         ]
-    }, 
+    },
     {
-        "id": "9521c124.e5b908", 
-        "type": "switchNode", 
-        "name": "switch type", 
-        "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 948, 
-        "y": 357, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "8c1f6548.e5e568",
+        "type": "switchNode",
+        "name": "switch type",
+        "xml": "<switch test=\"`$zte.prop.sdncRestApi.type`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 943,
+        "y": 360,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "b1b8ddba.d5362", 
-                "b2791c8d.f92988"
+                "74951572.ebdc6c",
+                "eaaeda12.faa678"
             ]
         ]
-    }, 
+    },
     {
-        "id": "b1b8ddba.d5362", 
-        "type": "outcome", 
-        "name": "SOTN", 
-        "xml": "<outcome value='SOTN'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1124, 
-        "y": 292, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "74951572.ebdc6c",
+        "type": "outcome",
+        "name": "SOTN",
+        "xml": "<outcome value='SOTN'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1119,
+        "y": 295,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "2476cb54.ee54e4"
+                "c610ea22.d44298"
             ]
         ]
-    }, 
+    },
     {
-        "id": "b2791c8d.f92988", 
-        "type": "outcome", 
-        "name": "other", 
-        "xml": "<outcome value='Other'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1118, 
-        "y": 414, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "eaaeda12.faa678",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1113,
+        "y": 417,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "615692ea.bd454c"
+                "c3125ba4.7ffdb8"
             ]
         ]
-    }, 
-    {
-        "id": "615692ea.bd454c", 
-        "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=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n", 
-        "comments": "", 
-        "x": 1310, 
-        "y": 414, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "2476cb54.ee54e4", 
-        "type": "block", 
-        "name": "block : atomic", 
-        "xml": "<block atomic='true'>", 
-        "atomic": "true", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1310, 
-        "y": 292, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "c3125ba4.7ffdb8",
+        "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=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n",
+        "comments": "",
+        "x": 1305,
+        "y": 417,
+        "z": "540d3add.6d0b44",
+        "wires": []
+    },
+    {
+        "id": "c610ea22.d44298",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1305,
+        "y": 295,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "58ffaa94.11ecc4", 
-                "876baee.788865"
+                "93e42ee3.ef7c9",
+                "14a63f8c.fb75e",
+                "16563079.8d5e2"
             ]
         ]
-    }, 
+    },
     {
-        "id": "58ffaa94.11ecc4", 
-        "type": "execute", 
-        "name": "execute RestApiCallNode Get ZTE Topology", 
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/getzteodutopotemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-topology-details'`\" />\n<parameter name=\"restapiUser\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"ztetopology\"/>", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1630, 
-        "y": 200, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "93e42ee3.ef7c9",
+        "type": "execute",
+        "name": "execute RestApiCallNode Get ZTE Topology",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/getzteodutopotemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-topology-details'`\" />\n<parameter name=\"restapiUser\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"ztetopology\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1625,
+        "y": 203,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "1cff6c99.978523", 
-                "8b1af88f.90711"
+                "7009dab5.0199f4",
+                "e43c55f6.204948"
             ]
         ]
-    }, 
+    },
     {
-        "id": "1cff6c99.978523", 
-        "type": "success", 
-        "name": "success", 
-        "xml": "<outcome value='success'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1912, 
-        "y": 145, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "7009dab5.0199f4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1907,
+        "y": 148,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "3c98a053.587f4"
+                "2945e727.0d1da8"
             ]
         ]
-    }, 
+    },
     {
-        "id": "8b1af88f.90711", 
-        "type": "failure", 
-        "name": "failure", 
-        "xml": "<outcome value='failure'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1910, 
-        "y": 245, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "e43c55f6.204948",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1905,
+        "y": 248,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "f7875e10.0e8698"
+                "775e4e34.10584"
             ]
         ]
-    }, 
-    {
-        "id": "3c98a053.587f4", 
-        "type": "block", 
-        "name": "block : atomic", 
-        "xml": "<block atomic=\"true\">", 
-        "atomic": "true", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2111, 
-        "y": 144, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "f7875e10.0e8698", 
-        "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 odutopo rest api\" />\n", 
-        "comments": "", 
-        "x": 2106, 
-        "y": 245, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "876baee.788865", 
-        "type": "for", 
-        "name": "for each oduTopology", 
-        "xml": "<for index='nidx' start='0' end='`$ztetopology.output.topology.node-ref-id_length`' >", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1538, 
-        "y": 333, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "2945e727.0d1da8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2106,
+        "y": 147,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "775e4e34.10584",
+        "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 odutopo rest api\" />\n",
+        "comments": "",
+        "x": 2101,
+        "y": 248,
+        "z": "540d3add.6d0b44",
+        "wires": []
+    },
+    {
+        "id": "14a63f8c.fb75e",
+        "type": "for",
+        "name": "for each topology",
+        "xml": "<for index='nidx' start='0' end='`$ztetopology.output.topology.node-ref-id_length`' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 1533,
+        "y": 336,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "8b00f3a6.5f00a"
+                "5cd977af.6d2188"
             ]
         ]
-    }, 
-    {
-        "id": "b480d508.259ad", 
-        "type": "update", 
-        "name": "save network-resource", 
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  \n     key='network-resource.network-id = $prop.zte.network-id' >\n<parameter name='network-id' value='`$prop.zte.network-id`' />\n<parameter name='client-id' value='`$prop.zte.client-id`' />\n<parameter name='te-topo-id' value='`$prop.zte.topo-id`' />\n<parameter name='provider-id' value='`$prop.zte.provider-id`' />", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1993, 
-        "y": 381, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "8b00f3a6.5f00a", 
-        "type": "block", 
-        "name": "block : atomic", 
-        "xml": "<block atomic='true'>", 
-        "atomic": "true", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1736, 
-        "y": 333, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "4b8d1cd8.c32504",
+        "type": "update",
+        "name": "save network-resource",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  \n     key='network-resource.network-id = $prop.zte.network-id' >\n<parameter name='network-id' value='`$prop.zte.network-id`' />\n<parameter name='client-id' value='`$prop.zte.client-id`' />\n<parameter name='te-topo-id' value='`$prop.zte.topo-id`' />\n<parameter name='provider-id' value='`$prop.zte.provider-id`' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1637,
+        "y": 664,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4a607014.a17fa",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1362,
+        "y": 562,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5d5e9d41.c00664",
+        "type": "execute",
+        "name": "execute RestApiCallNode Get ZTE oduTopology",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/getzteodutoponodetemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-topology-details'`\" />\n<parameter name=\"restapiUser\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"ztetopologynode\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 2023,
+        "y": 414,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "5a3bb265.58783c", 
-                "9645ad1c.475eb", 
-                "b480d508.259ad"
+                "ddc8baae.4921b8",
+                "66e109c3.50ba98"
             ]
         ]
-    }, 
+    },
     {
-        "id": "5a3bb265.58783c", 
-        "type": "execute", 
-        "name": "execute RestApiCallNode Get ZTE oduTopology", 
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/getzteodutoponodetemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-topology-details'`\" />\n<parameter name=\"restapiUser\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"ztetopologynode\"/>", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2075, 
-        "y": 437, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "66e109c3.50ba98",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2321,
+        "y": 495,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "942544d4.b8ec58", 
-                "8acdf237.4dae08"
+                "6aaa8b79.149894"
             ]
         ]
-    }, 
+    },
     {
-        "id": "8acdf237.4dae08", 
-        "type": "success", 
-        "name": "success", 
-        "xml": "<outcome value='success'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1509, 
-        "y": 689, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "ddc8baae.4921b8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2319,
+        "y": 414,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "6d8d547d.f1dd64"
+                "72846c1a.17d914"
             ]
         ]
-    }, 
-    {
-        "id": "942544d4.b8ec58", 
-        "type": "failure", 
-        "name": "failure", 
-        "xml": "<outcome value='failure'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1510, 
-        "y": 564, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "72846c1a.17d914",
+        "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 odutopo node rest api\" />\n",
+        "comments": "",
+        "x": 2510,
+        "y": 414,
+        "z": "540d3add.6d0b44",
+        "wires": []
+    },
+    {
+        "id": "48652b97.2fedc4",
+        "type": "for",
+        "name": "for each oduTopology node",
+        "xml": "<for index='pidx' start='0' end='`$ztetopologynode.output.topology.node-ref-id_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1649,
+        "y": 749,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "faf343d1.9734d"
+                "2d5905b0.3495ea"
             ]
         ]
-    }, 
-    {
-        "id": "faf343d1.9734d", 
-        "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 odutopo node rest api\" />\n", 
-        "comments": "", 
-        "x": 1701, 
-        "y": 564, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "6d8d547d.f1dd64", 
-        "type": "for", 
-        "name": "for each oduTopology node", 
-        "xml": "<for index='pidx' start='0' end='`$ztetopologynode.output.topology.node-ref-id_length`' >\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1735, 
-        "y": 689, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "453fd3.8bd4502c",
+        "type": "update",
+        "name": "save pnf",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' >\n<parameter name='pnf-name' value='`$ztetopologynodedetails.output.node.uuid`' />\n<parameter name='pnf-id' value='`$ztetopologynodedetails.output.node.uuid`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='admin-status' value=\"up\" />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2738,
+        "y": 818,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c9e69fe4.50fcd",
+        "type": "execute",
+        "name": "execute RestApiCallNode Get ZTE oduTopology Node details",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/getzteodutoponodedetailstemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-node-details'`\" />\n<parameter name=\"restapiUser\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"ztetopologynodedetails\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 2251,
+        "y": 748,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "a25bc521.5bb6a"
+                "e85faec3.821",
+                "68392c6a.4e1674"
             ]
         ]
-    }, 
+    },
     {
-        "id": "f538452a.143d98", 
-        "type": "update", 
-        "name": "save pnf", 
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n      key='pnf.pnf-name = $ztetopologynodedetails.node.uuid' >\n<parameter name='pnf-name' value='`$ztetopologynodedetails.node.uuid`' />\n<parameter name='pnf-id' value='`$ztetopologynodedetails.node.uuid`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='admin-status' value=\"up\" />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2743, 
-        "y": 815, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "e85faec3.821",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1711,
+        "y": 833,
+        "z": "540d3add.6d0b44",
         "wires": [
-            [ ]
+            [
+                "854a7fc2.bfea9"
+            ]
         ]
-    }, 
-    {
-        "id": "11d1e28b.963c9d", 
-        "type": "execute", 
-        "name": "execute RestApiCallNode Get ZTE oduTopology Node details", 
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/getzteodutoponodedetailstemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-node-details'`\" />\n<parameter name=\"restapiUser\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"ztetopologynodedetails\"/>", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2337, 
-        "y": 688, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "854a7fc2.bfea9",
+        "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 odutopo node details rest api\" />\n",
+        "comments": "",
+        "x": 1861,
+        "y": 833,
+        "z": "540d3add.6d0b44",
+        "wires": []
+    },
+    {
+        "id": "68392c6a.4e1674",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1709,
+        "y": 938,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "55658f39.4a8e78", 
-                "c9a1df1.d5a80a"
+                "109fc05a.9da5c"
             ]
         ]
-    }, 
+    },
     {
-        "id": "55658f39.4a8e78", 
-        "type": "failure", 
-        "name": "failure", 
-        "xml": "<outcome value='failure'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1716, 
-        "y": 830, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "109fc05a.9da5c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1892,
+        "y": 938,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "fd93d8e1.2313b"
+                "588ee473.9cb17c",
+                "6075f692.b2caa8",
+                "22a310d5.11293",
+                "7e2199ff.99b1c8"
             ]
         ]
-    }, 
-    {
-        "id": "fd93d8e1.2313b", 
-        "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 odutopo node details rest api\" />\n", 
-        "comments": "", 
-        "x": 1866, 
-        "y": 830, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "c9a1df1.d5a80a", 
-        "type": "success", 
-        "name": "success", 
-        "xml": "<outcome value='success'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1714, 
-        "y": 935, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "6075f692.b2caa8",
+        "type": "save",
+        "name": "save pnf relationship to network-resource in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $ztetopologynodedetails.output.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/' + $prop.zte.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=\"`$prop.zte.network-id`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 2187,
+        "y": 1027,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "22a310d5.11293",
+        "type": "save",
+        "name": "save pnf 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 = $zte.prop.sdncRestApi.thirdpartySdnc.id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $ztetopologynodedetails.output.node.uuid`\" />\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=\"`$ztetopologynodedetails.output.node.uuid`\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2161,
+        "y": 1094,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f00776db.4dbaf8",
+        "type": "execute",
+        "name": "execute RestApiCallNode Get ZTE oduTopology Node edge point details",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/getzteodutoponodenepdetailstemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-node-edge-point-details'`\" />\n<parameter name=\"restapiUser\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"ztetopologynodenepdetails\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 2792,
+        "y": 1275,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "77de9cee.930a9c"
+                "345328c1.c40d08",
+                "72be01d7.1258c"
             ]
         ]
-    }, 
+    },
     {
-        "id": "77de9cee.930a9c", 
-        "type": "block", 
-        "name": "block", 
-        "xml": "<block>\n", 
-        "atomic": "false", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1897, 
-        "y": 935, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "6e627eca.00e4a",
+        "type": "for",
+        "name": "for each oduTopology node nep name",
+        "xml": "<for index='tidx' start='0' end='`$ztetopologynodenepdetails.output.node-edge-point.name_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2663,
+        "y": 1510,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "1b4283dd.592abc", 
-                "eecb4617.57e91", 
-                "7e0ea1c3.cc762", 
-                "61c3b72.b4d2c48"
+                "7cffba09.0e7a94"
             ]
         ]
-    }, 
-    {
-        "id": "1b4283dd.592abc", 
-        "type": "save", 
-        "name": "save pnf relationship to network-resource in AAI", 
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $ztetopologynodedetails.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/' + 'zteNetwork'\" />\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=\"zteNetwork\" />", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2192, 
-        "y": 1024, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "eecb4617.57e91", 
-        "type": "save", 
-        "name": "save pnf 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 = $zte.prop.sdncRestApi.thirdpartySdnc.id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $ztetopologynodedetails.node.uuid`\" />\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=\"`$ztetopologynodedetails.node.uuid`\" />\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2166, 
-        "y": 1091, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "7f6ccbfa.b45a74", 
-        "type": "execute", 
-        "name": "execute RestApiCallNode Get ZTE oduTopology Node edge point details", 
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/getzteodutoponodenepdetailstemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-node-edge-point-details'`\" />\n<parameter name=\"restapiUser\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"ztetopologynodenepdetails\"/>", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2797, 
-        "y": 1272, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "7cffba09.0e7a94",
+        "type": "execute",
+        "name": "contains client",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$ztetopologynodenepdetails.node-edge-point.name[tidx].value`\"/>\n    <parameter name=\"target\" value=\"client\"/>\n    ",
+        "comments": "",
+        "outputs": 1,
+        "x": 2976,
+        "y": 1510,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "38b0f2d1.620906", 
-                "7b5490b3.a1044"
+                "36d5c2cc.d55c4e",
+                "c6db88ea.32d128"
             ]
         ]
-    }, 
+    },
     {
-        "id": "df44c30b.78cdc", 
-        "type": "for", 
-        "name": "for each oduTopology node nep name", 
-        "xml": "<for index='tidx' start='0' end='`$ztetopologynodenepdetails.output.node-edge-point.name_length`' >\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2687, 
-        "y": 1507, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "72be01d7.1258c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2386,
+        "y": 1510,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "a99510c.7985ef"
+                "6e627eca.00e4a"
             ]
         ]
-    }, 
+    },
     {
-        "id": "a99510c.7985ef", 
-        "type": "execute", 
-        "name": "contains client", 
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$ztetopologynodenepdetails.node-edge-point.name[tidx].value`\"/>\n    <parameter name=\"target\" value=\"client\"/>\n    ", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 3028, 
-        "y": 1507, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "345328c1.c40d08",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2386,
+        "y": 1419,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "81ab5973.689e", 
-                "3487141b.53f6bc"
+                "fc122084.5176a"
             ]
         ]
-    }, 
-    {
-        "id": "81ab5973.689e", 
-        "type": "outcomeTrue", 
-        "name": "true", 
-        "xml": "<outcome value='true'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 3240, 
-        "y": 1507, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "fc122084.5176a",
+        "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 odutopo node edge point details rest api\" />\n",
+        "comments": "",
+        "x": 2739,
+        "y": 1417,
+        "z": "540d3add.6d0b44",
+        "wires": []
+    },
+    {
+        "id": "2aeff331.c3498c",
+        "type": "set",
+        "name": "set zte unique-ltpId",
+        "xml": "<set>\n<parameter name='zte-unique-ltpId' value=\"`'nodeId-' + $ztetopologynodedetails.output.node.uuid + '-ltpId-' + $ztetopologynodenepdetails.output.node-edge-point.uuid`\" />\n",
+        "comments": "",
+        "x": 3687,
+        "y": 1510,
+        "z": "540d3add.6d0b44",
+        "wires": []
+    },
+    {
+        "id": "62e34399.97db9c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3473,
+        "y": 1510,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "ce449c28.7c7b3"
+                "2aeff331.c3498c",
+                "873e3131.8335a",
+                "f75f21b7.efa77"
             ]
         ]
-    }, 
+    },
     {
-        "id": "7b5490b3.a1044", 
-        "type": "success", 
-        "name": "success", 
-        "xml": "<outcome value='success'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2391, 
-        "y": 1507, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "e8680f6b.26d67",
+        "type": "update",
+        "name": "save p-interface",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid\n      AND p-interface.interface-name = $zte-unique-ltpId' >      \n<parameter name='interface-name' value='`$zte-unique-ltpId`' />\n<parameter name='network-ref' value=\"`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`\" />\n<parameter name='transparent' value=\"true\" />\n<parameter name='speed-value' value='`$zte-bandwidth`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='in-maint' value=\"true\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 4112,
+        "y": 1702,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            [
+                "eed25adb.58f488",
+                "67b16207.7b846c"
+            ]
+        ]
+    },
+    {
+        "id": "209b7c79.7331c4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3469,
+        "y": 1436,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "eed25adb.58f488",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4300,
+        "y": 1636,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "df44c30b.78cdc"
+                "e4358a9c.200a58"
             ]
         ]
-    }, 
+    },
     {
-        "id": "38b0f2d1.620906", 
-        "type": "failure", 
-        "name": "failure", 
-        "xml": "<outcome value='failure'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2391, 
-        "y": 1416, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "67b16207.7b846c",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4300,
+        "y": 1701,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "e2cba4e6.c2e7a"
+                "6efad235.03a13c"
             ]
         ]
-    }, 
-    {
-        "id": "e2cba4e6.c2e7a", 
-        "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 odutopo node edge point details rest api\" />\n", 
-        "comments": "", 
-        "x": 2763, 
-        "y": 1416, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "3bf4d883.90249", 
-        "type": "set", 
-        "name": "set zte unique-ltpId", 
-        "xml": "<set>\n<parameter name='zte-unique-ltpId' value=\"`'nodeId-' + $ztetopologynodedetails.node.uuid + '-ltpId-' + $ztetopologynodenepdetails.node-edge-point.uuid`\" />\n", 
-        "comments": "", 
-        "x": 3692, 
-        "y": 1507, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "ce449c28.7c7b3", 
-        "type": "block", 
-        "name": "block", 
-        "xml": "<block>\n", 
-        "atomic": "false", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 3478, 
-        "y": 1507, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "e4358a9c.200a58",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4489,
+        "y": 1635,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "588ee473.9cb17c",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test=\"`$ztetopologynodedetails.output.node.global-state-pac.operational-state == 'ENABLED'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2062,
+        "y": 937,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "3bf4d883.90249", 
-                "613c2ada.da8a7c", 
-                "ab8b449e.5887e"
+                "e2329ee1.9a7b6",
+                "eaec1cbd.8f432"
             ]
         ]
-    }, 
+    },
     {
-        "id": "d2080e42.04e638", 
-        "type": "update", 
-        "name": "save p-interface", 
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $ztetopologynodedetails.node.uuid\n      AND p-interface.interface-name = $zte-unique-ltpId' >      \n<parameter name='interface-name' value='`$zte-unique-ltpId`' />\n<parameter name='network-ref' value=\"`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`\" />\n<parameter name='transparent' value=\"true\" />\n<parameter name='speed-value' value='`$zte-bandwidth`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='in-maint' value=\"true\" />\n\"`'nodeId-' + $node.node-id + '-ltpId-' + $tp.te-tp-id`\"", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 4117, 
-        "y": 1699, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "e2329ee1.9a7b6",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2263,
+        "y": 886,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "768c64d0.f7a43c", 
-                "1c2dd58d.1dea72"
+                "67b87346.c6a5bc"
             ]
         ]
-    }, 
+    },
     {
-        "id": "3487141b.53f6bc", 
-        "type": "outcomeFalse", 
-        "name": "false", 
-        "xml": "<outcome value='false'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 3239, 
-        "y": 1433, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "eaec1cbd.8f432",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2262,
+        "y": 957,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "c0e9d951.a60da8"
+                "a037a75a.ae6708"
             ]
         ]
-    }, 
-    {
-        "id": "c0e9d951.a60da8", 
-        "type": "block", 
-        "name": "block", 
-        "xml": "<block>\n", 
-        "atomic": "false", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 3474, 
-        "y": 1433, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "768c64d0.f7a43c", 
-        "type": "success", 
-        "name": "success", 
-        "xml": "<outcome value='success'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 4305, 
-        "y": 1633, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "67b87346.c6a5bc",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test=\"`$ztetopologynodedetails.output.node.global-state-pac.administrative-state == 'LOCKED'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2419,
+        "y": 886,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "faf97108.30335"
+                "ba21f30c.c4435",
+                "ab98b4e0.12a4f8"
             ]
         ]
-    }, 
+    },
     {
-        "id": "1c2dd58d.1dea72", 
-        "type": "failure", 
-        "name": "failure", 
-        "xml": "<outcome value='failure'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 4305, 
-        "y": 1698, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "a037a75a.ae6708",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test=\"`$ztetopologynodedetails.output.node.global-state-pac.administrative-state == 'LOCKED'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2420,
+        "y": 957,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "48e7c11a.010d9"
+                "90096244.386ff",
+                "b1e15aa1.abad48"
             ]
         ]
-    }, 
-    {
-        "id": "faf97108.30335", 
-        "type": "block", 
-        "name": "block", 
-        "xml": "<block>\n", 
-        "atomic": "false", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 4494, 
-        "y": 1632, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "7e0ea1c3.cc762", 
-        "type": "switchNode", 
-        "name": "switch", 
-        "xml": "<switch test=\"`$ztetopologynodedetails.node.global-state-pac.operational-state == 'ENABLED'`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2067, 
-        "y": 934, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "ba21f30c.c4435",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2582,
+        "y": 818,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "c9232bab.411fe", 
-                "a6b9bca2.6fc2b"
+                "453fd3.8bd4502c"
             ]
         ]
-    }, 
+    },
     {
-        "id": "c9232bab.411fe", 
-        "type": "outcomeTrue", 
-        "name": "true", 
-        "xml": "<outcome value='true'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2268, 
-        "y": 883, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "ab98b4e0.12a4f8",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2585,
+        "y": 886,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "18266e26.721f3a"
+                "1c144406.5ea9fc"
             ]
         ]
-    }, 
+    },
     {
-        "id": "a6b9bca2.6fc2b", 
-        "type": "outcomeFalse", 
-        "name": "false", 
-        "xml": "<outcome value='false'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2267, 
-        "y": 954, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "90096244.386ff",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2586,
+        "y": 957,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "3e090a83.a9b3c6"
+                "65322994.d1f668"
             ]
         ]
-    }, 
+    },
     {
-        "id": "18266e26.721f3a", 
-        "type": "switchNode", 
-        "name": "switch", 
-        "xml": "<switch test=\"`$ztetopologynodedetails.node.global-state-pac.administrative-state == 'LOCKED'`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2424, 
-        "y": 883, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "b1e15aa1.abad48",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2587,
+        "y": 1026,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            [
+                "97879765.7b8ac8"
+            ]
+        ]
+    },
+    {
+        "id": "1c144406.5ea9fc",
+        "type": "update",
+        "name": "save pnf",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' >\n<parameter name='pnf-name' value='`$ztetopologynodedetails.output.node.uuid`' />\n<parameter name='pnf-id' value='`$ztetopologynodedetails.output.node.uuid`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='admin-status' value=\"down\" />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2738,
+        "y": 886,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "65322994.d1f668",
+        "type": "update",
+        "name": "save pnf",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' >\n<parameter name='pnf-name' value='`$ztetopologynodedetails.output.node.uuid`' />\n<parameter name='pnf-id' value='`$ztetopologynodedetails.output.node.uuid`' />\n<parameter name='operational-status' value=\"down\" />\n<parameter name='admin-status' value=\"up\" />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2735,
+        "y": 957,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "97879765.7b8ac8",
+        "type": "update",
+        "name": "save pnf",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' >\n<parameter name='pnf-name' value='`$ztetopologynodedetails.output.node.uuid`' />\n<parameter name='pnf-id' value='`$ztetopologynodedetails.output.node.uuid`' />\n<parameter name='operational-status' value=\"down\" />\n<parameter name='admin-status' value=\"down\" />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2736,
+        "y": 1026,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "873e3131.8335a",
+        "type": "switchNode",
+        "name": "test operational-state",
+        "xml": "<switch test=\"`$ztetopologynodedetails.output.node.global-state-pac.operational-state == 'ENABLED'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3687,
+        "y": 1699,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "18fde8e6.1e96f7", 
-                "1bdb1333.5ff0dd"
+                "dad7304e.123b4",
+                "cce973ee.e8539"
             ]
         ]
-    }, 
+    },
     {
-        "id": "3e090a83.a9b3c6", 
-        "type": "switchNode", 
-        "name": "switch", 
-        "xml": "<switch test=\"`$ztetopologynodedetails.node.global-state-pac.administrative-state == 'LOCKED'`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2425, 
-        "y": 954, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "dad7304e.123b4",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3903,
+        "y": 1702,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "9439c895.756d", 
-                "c071256a.4164e8"
+                "e8680f6b.26d67"
             ]
         ]
-    }, 
+    },
     {
-        "id": "18fde8e6.1e96f7", 
-        "type": "outcomeTrue", 
-        "name": "true", 
-        "xml": "<outcome value='true'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2587, 
-        "y": 815, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "cce973ee.e8539",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3906,
+        "y": 1816,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "f538452a.143d98"
+                "a9bffbab.0baeb8"
             ]
         ]
-    }, 
+    },
     {
-        "id": "1bdb1333.5ff0dd", 
-        "type": "outcomeFalse", 
-        "name": "false", 
-        "xml": "<outcome value='false'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2590, 
-        "y": 883, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "a9bffbab.0baeb8",
+        "type": "update",
+        "name": "save p-interface",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid\n      AND p-interface.interface-name = $zte-unique-ltpId' >      \n<parameter name='interface-name' value='`$zte-unique-ltpId`' />\n<parameter name='network-ref' value=\"`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`\" />\n<parameter name='transparent' value=\"true\" />\n<parameter name='speed-value' value='`$zte-bandwidth`' />\n<parameter name='operational-status' value=\"down\" />\n<parameter name='in-maint' value=\"true\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4113,
+        "y": 1816,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "5f1efe1e.eaa66"
+                "a6acf286.7190a",
+                "655a7457.79319c"
             ]
         ]
-    }, 
+    },
     {
-        "id": "9439c895.756d", 
-        "type": "outcomeTrue", 
-        "name": "true", 
-        "xml": "<outcome value='true'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2591, 
-        "y": 954, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "a6acf286.7190a",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4301,
+        "y": 1816,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "e6e244a4.0300f"
+                "f73009af.d52ca8"
             ]
         ]
-    }, 
+    },
     {
-        "id": "c071256a.4164e8", 
-        "type": "outcomeFalse", 
-        "name": "false", 
-        "xml": "<outcome value='false'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2592, 
-        "y": 1023, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "655a7457.79319c",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4298,
+        "y": 1877,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "79274805.8fd178"
+                "367baa79.63cc46"
             ]
         ]
-    }, 
-    {
-        "id": "5f1efe1e.eaa66", 
-        "type": "update", 
-        "name": "save pnf", 
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n      key='pnf.pnf-name = $ztetopologynodedetails.node.uuid' >\n<parameter name='pnf-name' value='`$ztetopologynodedetails.node.uuid`' />\n<parameter name='pnf-id' value='`$ztetopologynodedetails.node.uuid`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='admin-status' value=\"down\" />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2743, 
-        "y": 883, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "e6e244a4.0300f", 
-        "type": "update", 
-        "name": "save pnf", 
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n      key='pnf.pnf-name = $ztetopologynodedetails.node.uuid' >\n<parameter name='pnf-name' value='`$ztetopologynodedetails.node.uuid`' />\n<parameter name='pnf-id' value='`$ztetopologynodedetails.node.uuid`' />\n<parameter name='operational-status' value=\"down\" />\n<parameter name='admin-status' value=\"up\" />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2740, 
-        "y": 954, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "79274805.8fd178", 
-        "type": "update", 
-        "name": "save pnf", 
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n      key='pnf.pnf-name = $ztetopologynodedetails.node.uuid' >\n<parameter name='pnf-name' value='`$ztetopologynodedetails.node.uuid`' />\n<parameter name='pnf-id' value='`$ztetopologynodedetails.node.uuid`' />\n<parameter name='operational-status' value=\"down\" />\n<parameter name='admin-status' value=\"down\" />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2741, 
-        "y": 1023, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "613c2ada.da8a7c", 
-        "type": "switchNode", 
-        "name": "test operational-state", 
-        "xml": "<switch test=\"`$ztetopologynodedetails.node.global-state-pac.operational-state == 'ENABLED'`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 3692, 
-        "y": 1696, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "f73009af.d52ca8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4487,
+        "y": 1816,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6efad235.03a13c",
+        "type": "update",
+        "name": "save p-interface",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid\n      AND p-interface.interface-name = $zte-unique-ltpId' >      \n<parameter name='interface-name' value='`$zte-unique-ltpId`' />\n<parameter name='network-ref' value=\"`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`\" />\n<parameter name='transparent' value=\"true\" />\n<parameter name='speed-value' value='`$zte-bandwidth`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='in-maint' value=\"true\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4520,
+        "y": 1701,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "367baa79.63cc46",
+        "type": "update",
+        "name": "save p-interface",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid\n      AND p-interface.interface-name = $zte-unique-ltpId' >      \n<parameter name='interface-name' value='`$zte-unique-ltpId`' />\n<parameter name='network-ref' value=\"`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`\" />\n<parameter name='transparent' value=\"true\" />\n<parameter name='speed-value' value='`$zte-bandwidth`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='in-maint' value=\"true\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4514,
+        "y": 1877,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bcbc6e2c.3314",
+        "type": "set",
+        "name": "set params",
+        "xml": "<set>\n<parameter name='prop.zte.network-id' value=\"zteNetwork\" />\n<parameter name='prop.zte.client-id' value=\"zteClient1\" />\n<parameter name='prop.zte.topo-id' value=\"zteTopo1\" />\n<parameter name='prop.zte.provider-id' value=\"zteProvider1\" />\n",
+        "comments": "",
+        "x": 1604,
+        "y": 597,
+        "z": "540d3add.6d0b44",
+        "wires": []
+    },
+    {
+        "id": "2d5905b0.3495ea",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1871,
+        "y": 749,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "e65d9fab.c131f", 
-                "fc04748b.c0e76"
+                "c9e69fe4.50fcd",
+                "69930609.325f68"
             ]
         ]
-    }, 
-    {
-        "id": "e65d9fab.c131f", 
-        "type": "outcomeTrue", 
-        "name": "true", 
-        "xml": "<outcome value='true'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 3908, 
-        "y": 1699, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "69930609.325f68",
+        "type": "set",
+        "name": "set odutopo node name",
+        "xml": "<set>\n<parameter name='prop.zte.odutopo.node.name' value='`$ztetopologynode.output.topology.node-ref-id[$pidx]`' />\n",
+        "comments": "",
+        "x": 2135,
+        "y": 674,
+        "z": "540d3add.6d0b44",
+        "wires": []
+    },
+    {
+        "id": "e65cd4cb.61e0c8",
+        "type": "set",
+        "name": "set odutopo node nep uuid",
+        "xml": "<set>\n<parameter name='prop.zte.odutopo.node.nep.uuid' value='`$ztetopologynodedetails.output.node.node-edge-point-id[$ridx]`' />\n",
+        "comments": "",
+        "x": 2652,
+        "y": 1158,
+        "z": "540d3add.6d0b44",
+        "wires": []
+    },
+    {
+        "id": "7e2199ff.99b1c8",
+        "type": "for",
+        "name": "for each oduTopology node nep",
+        "xml": "<for index='ridx' start='0' end='`$ztetopologynodedetails.output.node.node-edge-point-id_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2132,
+        "y": 1159,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "d2080e42.04e638"
+                "cf240b59.497fb8"
             ]
         ]
-    }, 
+    },
     {
-        "id": "fc04748b.c0e76", 
-        "type": "outcomeFalse", 
-        "name": "false", 
-        "xml": "<outcome value='false'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 3911, 
-        "y": 1813, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "cf240b59.497fb8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2397,
+        "y": 1158,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            [
+                "e65cd4cb.61e0c8",
+                "f00776db.4dbaf8"
+            ]
+        ]
+    },
+    {
+        "id": "f75f21b7.efa77",
+        "type": "set",
+        "name": "set zte bandwidth",
+        "xml": "<set>\n<parameter name='zte-bandwidth' value='`1250000000 * $ztetopologynodenepdetails.output.node-edge-point.lp[0].odu-nep-pac.odu-capacity`' />\n",
+        "comments": "",
+        "x": 3679,
+        "y": 1598,
+        "z": "540d3add.6d0b44",
+        "wires": []
+    },
+    {
+        "id": "16563079.8d5e2",
+        "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": 1551,
+        "y": 114,
+        "z": "540d3add.6d0b44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ca881019.9ce88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1353,
+        "y": 664,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "278d5ea5.1b82ca"
+                "bcbc6e2c.3314",
+                "4b8d1cd8.c32504",
+                "48652b97.2fedc4"
             ]
         ]
-    }, 
+    },
     {
-        "id": "278d5ea5.1b82ca", 
-        "type": "update", 
-        "name": "save p-interface", 
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $ztetopologynodedetails.node.uuid\n      AND p-interface.interface-name = $zte-unique-ltpId' >      \n<parameter name='interface-name' value='`$zte-unique-ltpId`' />\n<parameter name='network-ref' value=\"`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`\" />\n<parameter name='transparent' value=\"true\" />\n<parameter name='speed-value' value='`$zte-bandwidth`' />\n<parameter name='operational-status' value=\"down\" />\n<parameter name='in-maint' value=\"true\" />\n\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 4118, 
-        "y": 1813, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "6aaa8b79.149894",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test=\"`$ztetopologynode.output.topology.layer-protocol-name[0] == 'ODU'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1059,
+        "y": 562,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "775b7d93.cb0874", 
-                "ee21bf18.cecaa"
+                "3cbcd27b.e8a5ce",
+                "e7e2532e.34e23"
             ]
         ]
-    }, 
+    },
     {
-        "id": "775b7d93.cb0874", 
-        "type": "success", 
-        "name": "success", 
-        "xml": "<outcome value='success'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 4306, 
-        "y": 1813, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "e7e2532e.34e23",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1204,
+        "y": 664,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "c0aead49.1958f8"
+                "ca881019.9ce88"
             ]
         ]
-    }, 
+    },
     {
-        "id": "ee21bf18.cecaa", 
-        "type": "failure", 
-        "name": "failure", 
-        "xml": "<outcome value='failure'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 4303, 
-        "y": 1874, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "3cbcd27b.e8a5ce",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1206,
+        "y": 562,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "54ef23c0.7c3d8c"
+                "4a607014.a17fa"
             ]
         ]
-    }, 
-    {
-        "id": "c0aead49.1958f8", 
-        "type": "block", 
-        "name": "block", 
-        "xml": "<block>\n", 
-        "atomic": "false", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 4492, 
-        "y": 1813, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "48e7c11a.010d9", 
-        "type": "update", 
-        "name": "save p-interface", 
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $ztetopologynodedetails.node.uuid\n      AND p-interface.interface-name = $zte-unique-ltpId' >      \n<parameter name='interface-name' value='`$zte-unique-ltpId`' />\n<parameter name='network-ref' value=\"`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`\" />\n<parameter name='transparent' value=\"true\" />\n<parameter name='speed-value' value='`$zte-bandwidth`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='in-maint' value=\"true\" />\n\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 4525, 
-        "y": 1698, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "54ef23c0.7c3d8c", 
-        "type": "update", 
-        "name": "save p-interface", 
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $ztetopologynodedetails.node.uuid\n      AND p-interface.interface-name = $zte-unique-ltpId' >      \n<parameter name='interface-name' value='`$zte-unique-ltpId`' />\n<parameter name='network-ref' value=\"`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`\" />\n<parameter name='transparent' value=\"true\" />\n<parameter name='speed-value' value='`$zte-bandwidth`' />\n<parameter name='operational-status' value=\"up\" />\n<parameter name='in-maint' value=\"true\" />\n\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 4519, 
-        "y": 1874, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "9645ad1c.475eb", 
-        "type": "set", 
-        "name": "set params", 
-        "xml": "<set>\n<parameter name='prop.zte.network-id' value=\"zteNetwork\" />\n<parameter name='prop.zte.client-id' value=\"zteClient1\" />\n<parameter name='prop.zte.topo-id' value=\"zteTopo1\" />\n<parameter name='prop.zte.provider-id' value=\"zteProvider1\" />\n<parameter name='prop.zte.odutopo.name' value='`$ztetopology.output.topology.node-ref-id[$nidx]`' />\n", 
-        "comments": "", 
-        "x": 1957, 
-        "y": 333, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "a25bc521.5bb6a", 
-        "type": "block", 
-        "name": "block", 
-        "xml": "<block>\n", 
-        "atomic": "false", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1957, 
-        "y": 689, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "9b66d171.8f74a",
+        "type": "set",
+        "name": "set topo name",
+        "xml": "<set>\n<parameter name='prop.zte.odutopo.name' value='`$ztetopology.output.topology.node-ref-id[$nidx]`' />\n",
+        "comments": "",
+        "x": 1916,
+        "y": 336,
+        "z": "540d3add.6d0b44",
+        "wires": []
+    },
+    {
+        "id": "5cd977af.6d2188",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1725,
+        "y": 336,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "11d1e28b.963c9d", 
-                "9403cfc0.48bae8"
+                "9b66d171.8f74a",
+                "5d5e9d41.c00664"
             ]
         ]
-    }, 
-    {
-        "id": "9403cfc0.48bae8", 
-        "type": "set", 
-        "name": "set odutopo node name", 
-        "xml": "<set>\n<parameter name='prop.zte.odutopo.node.name' value='`$ztetopologynode.output.topology.node-ref-id[$pidx]`' />\n", 
-        "comments": "", 
-        "x": 2221, 
-        "y": 614, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "d1f5b2ac.93ca5", 
-        "type": "set", 
-        "name": "set odutopo node nep uuid", 
-        "xml": "<set>\n<parameter name='prop.zte.odutopo.node.nep.uuid' value='`$ztetopologynodedetails.output.node.node-edge-point-id[$ridx]`' />\n", 
-        "comments": "", 
-        "x": 2657, 
-        "y": 1155, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "61c3b72.b4d2c48", 
-        "type": "for", 
-        "name": "for each oduTopology node nep", 
-        "xml": "<for index='ridx' start='0' end='`$ztetopologynodedetails.output.node.node-edge-point-id_length`' >\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2137, 
-        "y": 1156, 
-        "z": "5c3ac6a5.48ce2", 
+    },
+    {
+        "id": "36d5c2cc.d55c4e",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3216,
+        "y": 1510,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "ba3d5d3.bbc9ca"
+                "62e34399.97db9c"
             ]
         ]
-    }, 
+    },
     {
-        "id": "ba3d5d3.bbc9ca", 
-        "type": "block", 
-        "name": "block", 
-        "xml": "<block>\n", 
-        "atomic": "false", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2402, 
-        "y": 1155, 
-        "z": "5c3ac6a5.48ce2", 
+        "id": "c6db88ea.32d128",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3210,
+        "y": 1437,
+        "z": "540d3add.6d0b44",
         "wires": [
             [
-                "d1f5b2ac.93ca5", 
-                "7f6ccbfa.b45a74"
+                "209b7c79.7331c4"
             ]
         ]
-    }, 
-    {
-        "id": "ab8b449e.5887e", 
-        "type": "set", 
-        "name": "set zte bandwidth", 
-        "xml": "<set>\n<parameter name='zte-bandwidth' value='`1000 * 1000000 * 1.25 * $ztetopologynodenepdetails.node-edge-point.lp[0].odu-nep-pac.oducapacity`' />\n", 
-        "comments": "", 
-        "x": 3684, 
-        "y": 1595, 
-        "z": "5c3ac6a5.48ce2", 
-        "wires": [ ]
     }
 ]
\ No newline at end of file
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 ba7a9894..c502687a 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,576 +1,639 @@
-[
-    {
-        "id": "197ffd5b.105fa3",
-        "type": "other",
-        "name": "update",
-        "xml": "<outcome value='Update'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 310,
-        "y": 360,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "8298d18a.63e4b"
-            ]
-        ]
-    },
-    {
-        "id": "3bcc844d.917dbc",
-        "type": "other",
-        "name": "delete",
-        "xml": "<outcome value='delete'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 310,
-        "y": 440,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "9a40237.2d204e"
-            ]
-        ]
-    },
-    {
-        "id": "9a40237.2d204e",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 451.5,
-        "y": 440,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7bf268a7.980d48",
-        "type": "comment",
-        "name": "TODO: Delete topology from AAI",
-        "info": "",
-        "comments": "",
-        "x": 384.3335189819336,
-        "y": 407.96899485588074,
-        "z": "a54d391e.88f7d8",
-        "wires": []
-    },
-    {
-        "id": "9d107456.f08fe8",
-        "type": "switchNode",
-        "name": "switch aai-event-trigger",
-        "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 140.5,
-        "y": 400,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "197ffd5b.105fa3",
-                "3bcc844d.917dbc"
-            ]
-        ]
-    },
-    {
-        "id": "68d03f9b.5e646",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 871.5,
-        "y": 240,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "608a6bc.8344d94",
-                "7a11c3b.828ac3c",
-                "365e44a4.701f6c",
-                "a3a71589.3e7428",
-                "c3222caa.a5e2a"
-            ]
-        ]
-    },
-    {
-        "id": "7a11c3b.828ac3c",
-        "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": 1144.5001983642578,
-        "y": 161.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "15e6e327.6bb24d",
-                "b8526c6a.21372"
-            ]
-        ]
-    },
-    {
-        "id": "15e6e327.6bb24d",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1358.0001983642578,
-        "y": 141.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "eada649a.e312c8"
-            ]
-        ]
-    },
-    {
-        "id": "b8526c6a.21372",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1354.0001983642578,
-        "y": 181.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "bf5d38a1.f76208"
-            ]
-        ]
-    },
-    {
-        "id": "eada649a.e312c8",
-        "type": "set",
-        "name": "set token-id",
-        "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
-        "comments": "",
-        "x": 1508.5001983642578,
-        "y": 141.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": []
-    },
-    {
-        "id": "3ad01439.f9afec",
-        "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": 1575.5001983642578,
-        "y": 261.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "a2f37f5d.3d152",
-                "76d94eec.78391"
-            ]
-        ]
-    },
-    {
-        "id": "a2f37f5d.3d152",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1818.0001983642578,
-        "y": 281.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "f2edc52a.829ae8"
-            ]
-        ]
-    },
-    {
-        "id": "f2edc52a.829ae8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1975.5001983642578,
-        "y": 281.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "2876228a.bd45de"
-            ]
-        ]
-    },
-    {
-        "id": "f0deaa8b.a77c48",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
-        "comments": "",
-        "x": 1952.0001983642578,
-        "y": 181.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": []
-    },
-    {
-        "id": "76d94eec.78391",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1814.0001983642578,
-        "y": 181.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "f0deaa8b.a77c48"
-            ]
-        ]
-    },
-    {
-        "id": "a45743c4.fd9ac",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 98,
-        "y": 100,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "4069c94b.4e3178"
-            ]
-        ]
-    },
-    {
-        "id": "4069c94b.4e3178",
-        "type": "service-logic",
-        "name": "DataChange ${project.version}",
-        "module": "DataChange",
-        "version": "${project.version}",
-        "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": 164,
-        "y": 160,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "a97cf7f0.905958"
-            ]
-        ]
-    },
-    {
-        "id": "a97cf7f0.905958",
-        "type": "method",
-        "name": "method esr-thirdparty-sdnc-discovery",
-        "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 184,
-        "y": 240,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "8d013bc1.d159b8"
-            ]
-        ]
-    },
-    {
-        "id": "8d013bc1.d159b8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 431.5,
-        "y": 240,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "9d107456.f08fe8"
-            ]
-        ]
-    },
-    {
-        "id": "2876228a.bd45de",
-        "type": "for",
-        "name": "for each Network",
-        "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1401.5002136230469,
-        "y": 380.0000247955322,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "ef7b8418.bcb8e8"
-            ]
-        ]
-    },
-    {
-        "id": "ef7b8418.bcb8e8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1550.0002136230469,
-        "y": 380.0000247955322,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "64202ed1.e0b41",
-                "93269044.8fece"
-            ]
-        ]
-    },
-    {
-        "id": "64202ed1.e0b41",
-        "type": "call",
-        "name": "call update-network-to-aai",
-        "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1729.0002136230469,
-        "y": 400.0000247955322,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "93269044.8fece",
-        "type": "set",
-        "name": "set network",
-        "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
-        "comments": "",
-        "x": 1684.0002136230469,
-        "y": 360.0000247955322,
-        "z": "a54d391e.88f7d8",
-        "wires": []
-    },
-    {
-        "id": "bf5d38a1.f76208",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1474.0001983642578,
-        "y": 181.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9588f43b.0d44f8",
-        "type": "comment",
-        "name": "Do Nothing",
-        "info": "",
-        "comments": "",
-        "x": 1644.0001983642578,
-        "y": 221.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": []
-    },
-    {
-        "id": "60d84913.695d78",
-        "type": "switchNode",
-        "name": "switch type",
-        "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 563,
-        "y": 360,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "de59227b.bacf9",
-                "1a34048f.8eca2b"
-            ]
-        ]
-    },
-    {
-        "id": "8298d18a.63e4b",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 430,
-        "y": 360,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "60d84913.695d78"
-            ]
-        ]
-    },
-    {
-        "id": "de59227b.bacf9",
-        "type": "other",
-        "name": "SOTN",
-        "xml": "<outcome value='SOTN'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 710,
-        "y": 240,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "68d03f9b.5e646"
-            ]
-        ]
-    },
-    {
-        "id": "1a34048f.8eca2b",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 725.0000076293945,
-        "y": 479.00003242492676,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "7faf207a.622e5"
-            ]
-        ]
-    },
-    {
-        "id": "7faf207a.622e5",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",
-        "comments": "",
-        "x": 903.0000076293945,
-        "y": 479.00003242492676,
-        "z": "a54d391e.88f7d8",
-        "wires": []
-    },
-    {
-        "id": "608a6bc.8344d94",
-        "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": 1091.0001983642578,
-        "y": 121.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "365e44a4.701f6c",
-        "type": "switchNode",
-        "name": "switch prop.sdncRestApi.token_id",
-        "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1137.5001983642578,
-        "y": 241.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "b737a6fe.87cf68",
-                "878b1fd0.506dd"
-            ]
-        ]
-    },
-    {
-        "id": "b737a6fe.87cf68",
-        "type": "other",
-        "name": "Null",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1354.0001983642578,
-        "y": 221.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "de7d499c.f87aa8"
-            ]
-        ]
-    },
-    {
-        "id": "878b1fd0.506dd",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1354.0001983642578,
-        "y": 261.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "3ad01439.f9afec"
-            ]
-        ]
-    },
-    {
-        "id": "de7d499c.f87aa8",
-        "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": 1575.5001983642578,
-        "y": 221.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "76d94eec.78391",
-                "a2f37f5d.3d152"
-            ]
-        ]
-    },
-    {
-        "id": "c3222caa.a5e2a",
-        "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": 1134.0001983642578,
-        "y": 381.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a3a71589.3e7428",
-        "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": 1094.0001983642578,
-        "y": 341.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": []
-    },
-    {
-        "id": "98c18166.4a0f3",
-        "type": "comment",
-        "name": "Notification subscription",
-        "info": "",
-        "comments": "",
-        "x": 1099.000343322754,
-        "y": 298.00000858306885,
-        "z": "a54d391e.88f7d8",
-        "wires": []
-    }
+[
+    {
+        "id": "26c72de4.f15082", 
+        "type": "other", 
+        "name": "update", 
+        "xml": "<outcome value='Update'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 666, 
+        "y": 254, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "414d6ccb.3d26fc"
+            ]
+        ]
+    }, 
+    {
+        "id": "41138058.b8876", 
+        "type": "other", 
+        "name": "delete", 
+        "xml": "<outcome value='delete'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 666, 
+        "y": 334, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "25011722.26281"
+            ]
+        ]
+    }, 
+    {
+        "id": "25011722.26281", 
+        "type": "block", 
+        "name": "block : atomic", 
+        "xml": "<block atomic=\"true\">", 
+        "atomic": "true", 
+        "outputs": 1, 
+        "x": 807.5, 
+        "y": 334, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [ ]
+        ]
+    }, 
+    {
+        "id": "8fedb811.8ebe38", 
+        "type": "comment", 
+        "name": "TODO: Delete topology from AAI", 
+        "info": "", 
+        "comments": "", 
+        "x": 740.3335189819336, 
+        "y": 301.96899485588074, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [ ]
+    }, 
+    {
+        "id": "fc46fa0c.31e87", 
+        "type": "switchNode", 
+        "name": "switch aai-event-trigger", 
+        "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 496.5, 
+        "y": 294, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "26c72de4.f15082", 
+                "41138058.b8876"
+            ]
+        ]
+    }, 
+    {
+        "id": "73bed9ba.1eeb9", 
+        "type": "block", 
+        "name": "block : atomic", 
+        "xml": "<block atomic=\"true\">", 
+        "atomic": "true", 
+        "outputs": 1, 
+        "x": 1193.5, 
+        "y": 165, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "ebd26579.8d9818", 
+                "7c364355.c7d31c", 
+                "6bff7a95.f6b11c", 
+                "e40bbeb2.1466c", 
+                "257a5269.7c0d86"
+            ]
+        ]
+    }, 
+    {
+        "id": "7c364355.c7d31c", 
+        "type": "execute", 
+        "name": "execute RestApiCallNode Get token", 
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1466.5001983642578, 
+        "y": 86.00000953674316, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "460f203b.a3333", 
+                "2634113c.c7fc8e"
+            ]
+        ]
+    }, 
+    {
+        "id": "460f203b.a3333", 
+        "type": "success", 
+        "name": "success", 
+        "xml": "<outcome value='success'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1756.000244140625, 
+        "y": 78, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "964773.4acb289"
+            ]
+        ]
+    }, 
+    {
+        "id": "2634113c.c7fc8e", 
+        "type": "failure", 
+        "name": "failure", 
+        "xml": "<outcome value='failure'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1752.000244140625, 
+        "y": 118, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "67cff30a.da3b54"
+            ]
+        ]
+    }, 
+    {
+        "id": "964773.4acb289", 
+        "type": "set", 
+        "name": "set token-id", 
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n", 
+        "comments": "", 
+        "x": 1906.500244140625, 
+        "y": 78, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [ ]
+    }, 
+    {
+        "id": "3bf66a70.af3866", 
+        "type": "execute", 
+        "name": "execute RestApiCallNode Get Topology", 
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1973.500244140625, 
+        "y": 198, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "83daffef.93261", 
+                "9a6001a7.b0681"
+            ]
+        ]
+    }, 
+    {
+        "id": "83daffef.93261", 
+        "type": "success", 
+        "name": "success", 
+        "xml": "<outcome value='success'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 2216.000244140625, 
+        "y": 218, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "815ae1d4.60f8"
+            ]
+        ]
+    }, 
+    {
+        "id": "815ae1d4.60f8", 
+        "type": "block", 
+        "name": "block : atomic", 
+        "xml": "<block atomic=\"true\">", 
+        "atomic": "true", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 2373.500244140625, 
+        "y": 218, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "a1b0634d.e55008"
+            ]
+        ]
+    }, 
+    {
+        "id": "56a034a.503e6cc", 
+        "type": "returnFailure", 
+        "name": "return failure", 
+        "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n", 
+        "comments": "", 
+        "x": 2350.000244140625, 
+        "y": 118, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [ ]
+    }, 
+    {
+        "id": "9a6001a7.b0681", 
+        "type": "failure", 
+        "name": "failure", 
+        "xml": "<outcome value='failure'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 2212.000244140625, 
+        "y": 118, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "56a034a.503e6cc"
+            ]
+        ]
+    }, 
+    {
+        "id": "39a13bfe.fb4444", 
+        "type": "dgstart", 
+        "name": "DGSTART", 
+        "outputs": 1, 
+        "x": 66, 
+        "y": 29, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "5147cfad.5c3908"
+            ]
+        ]
+    }, 
+    {
+        "id": "5147cfad.5c3908", 
+        "type": "service-logic", 
+        "name": "DataChange ${project.version}", 
+        "module": "DataChange", 
+        "version": "${project.version}", 
+        "comments": "", 
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>", 
+        "outputs": 1, 
+        "x": 132, 
+        "y": 89, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "15128d59.469f9b"
+            ]
+        ]
+    }, 
+    {
+        "id": "15128d59.469f9b", 
+        "type": "method", 
+        "name": "method esr-thirdparty-sdnc-discovery", 
+        "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 152, 
+        "y": 169, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "1baee5be.1b11da"
+            ]
+        ]
+    }, 
+    {
+        "id": "1baee5be.1b11da", 
+        "type": "block", 
+        "name": "block : atomic", 
+        "xml": "<block atomic=\"true\">\n", 
+        "atomic": "false", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 399.5, 
+        "y": 169, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "f40069ea.6c541"
+            ]
+        ]
+    }, 
+    {
+        "id": "a1b0634d.e55008", 
+        "type": "for", 
+        "name": "for each Network", 
+        "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1799.500259399414, 
+        "y": 317.00001525878906, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "e7339f4e.4a45b8"
+            ]
+        ]
+    }, 
+    {
+        "id": "e7339f4e.4a45b8", 
+        "type": "block", 
+        "name": "block", 
+        "xml": "<block>\n", 
+        "atomic": "false", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1948.000259399414, 
+        "y": 317.00001525878906, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "e39a1349.d59948", 
+                "a69e5196.594768"
+            ]
+        ]
+    }, 
+    {
+        "id": "e39a1349.d59948", 
+        "type": "call", 
+        "name": "call update-network-to-aai", 
+        "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 2127.000259399414, 
+        "y": 337.00001525878906, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [ ]
+        ]
+    }, 
+    {
+        "id": "a69e5196.594768", 
+        "type": "set", 
+        "name": "set network", 
+        "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n", 
+        "comments": "", 
+        "x": 2082.000259399414, 
+        "y": 297.00001525878906, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [ ]
+    }, 
+    {
+        "id": "67cff30a.da3b54", 
+        "type": "block", 
+        "name": "block", 
+        "xml": "<block>\n", 
+        "atomic": "false", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1872.000244140625, 
+        "y": 118, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [ ]
+        ]
+    }, 
+    {
+        "id": "86d88e9f.569c1", 
+        "type": "comment", 
+        "name": "Do Nothing", 
+        "info": "", 
+        "comments": "", 
+        "x": 2042.000244140625, 
+        "y": 158, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [ ]
+    }, 
+    {
+        "id": "9b7ecf5d.bb983", 
+        "type": "switchNode", 
+        "name": "switch type", 
+        "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 919, 
+        "y": 254, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "d7810e52.09a7a8", 
+                "ef809a67.dde878"
+            ]
+        ]
+    }, 
+    {
+        "id": "414d6ccb.3d26fc", 
+        "type": "block", 
+        "name": "block", 
+        "xml": "<block>\n", 
+        "atomic": "false", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 786, 
+        "y": 254, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "9b7ecf5d.bb983"
+            ]
+        ]
+    }, 
+    {
+        "id": "d7810e52.09a7a8", 
+        "type": "other", 
+        "name": "SOTN", 
+        "xml": "<outcome value='SOTN'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1032, 
+        "y": 165, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "73bed9ba.1eeb9"
+            ]
+        ]
+    }, 
+    {
+        "id": "ef809a67.dde878", 
+        "type": "other", 
+        "name": "other", 
+        "xml": "<outcome value='Other'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1047.0000076293945, 
+        "y": 404.00003242492676, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "ad793f5e.17f88"
+            ]
+        ]
+    }, 
+    {
+        "id": "ad793f5e.17f88", 
+        "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": 1225.0000076293945, 
+        "y": 404.00003242492676, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [ ]
+    }, 
+    {
+        "id": "ebd26579.8d9818", 
+        "type": "execute", 
+        "name": "execute Properties", 
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1413.0001983642578, 
+        "y": 46.000009536743164, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [ ]
+        ]
+    }, 
+    {
+        "id": "6bff7a95.f6b11c", 
+        "type": "switchNode", 
+        "name": "switch prop.sdncRestApi.token_id", 
+        "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1459.5001983642578, 
+        "y": 166.00000953674316, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "baf46d81.bf5f6", 
+                "789590c1.ea5428"
+            ]
+        ]
+    }, 
+    {
+        "id": "baf46d81.bf5f6", 
+        "type": "other", 
+        "name": "Null", 
+        "xml": "<outcome value=''>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1752.000244140625, 
+        "y": 158, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "fe0ff87c.8c90c"
+            ]
+        ]
+    }, 
+    {
+        "id": "789590c1.ea5428", 
+        "type": "other", 
+        "name": "other", 
+        "xml": "<outcome value='Other'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1752.000244140625, 
+        "y": 198, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "3bf66a70.af3866"
+            ]
+        ]
+    }, 
+    {
+        "id": "fe0ff87c.8c90c", 
+        "type": "execute", 
+        "name": "execute RestApiCallNode Get Topology", 
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1973.500244140625, 
+        "y": 158, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "9a6001a7.b0681", 
+                "83daffef.93261"
+            ]
+        ]
+    }, 
+    {
+        "id": "257a5269.7c0d86", 
+        "type": "execute", 
+        "name": "execute RestconfDiscoveryNode", 
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscription' >\n<parameter name=\"subscriberId\" value=\"sotn-controller\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n<parameter name=\"module\" value=\"DataChange\" />\n<parameter name=\"rpc\" value=\"sotn-notification-handler\" />\n<parameter name=\"mode\" value=\"sync\" />", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1456.0001983642578, 
+        "y": 306.00000953674316, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [ ]
+        ]
+    }, 
+    {
+        "id": "e40bbeb2.1466c", 
+        "type": "set", 
+        "name": "set encoding-format", 
+        "xml": "<set>\n<parameter name='input' value='ietf-subscribed-notifications:establish-subscription.input.' />\n<parameter name=\"`$input + 'encoding'`\" value=\"encode-json\" />", 
+        "comments": "", 
+        "x": 1416.0001983642578, 
+        "y": 266.00000953674316, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [ ]
+    }, 
+    {
+        "id": "d34b58fb.df8cd", 
+        "type": "comment", 
+        "name": "Notification subscription", 
+        "info": "", 
+        "comments": "", 
+        "x": 1421.000343322754, 
+        "y": 223.00000858306885, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [ ]
+    }, 
+    {
+        "id": "f40069ea.6c541", 
+        "type": "switchNode", 
+        "name": "switch", 
+        "xml": "<switch test=\"`$prop.sdncRestApi.vendor == 'ZTE'`\">\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 106, 
+        "y": 294, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "5e28a0df.7fabe", 
+                "39367b0f.d19614"
+            ]
+        ]
+    }, 
+    {
+        "id": "5e28a0df.7fabe", 
+        "type": "outcomeFalse", 
+        "name": "false", 
+        "xml": "<outcome value='false'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 293, 
+        "y": 294, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "fc46fa0c.31e87"
+            ]
+        ]
+    }, 
+    {
+        "id": "39367b0f.d19614", 
+        "type": "outcomeTrue", 
+        "name": "true", 
+        "xml": "<outcome value='true'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 294, 
+        "y": 419, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "8828fa0f.91d7c8"
+            ]
+        ]
+    }, 
+    {
+        "id": "8828fa0f.91d7c8", 
+        "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": 517, 
+        "y": 419, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [ ]
+        ]
+    }
 ]
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-of-zte.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-of-zte.json
index 4212c38a..756bc61c 100644
--- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-of-zte.json
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-of-zte.json
@@ -1,408 +1,405 @@
 [
     {
-        "id": "78797449.a69d64", 
-        "type": "dgstart", 
-        "name": "DGSTART", 
-        "outputs": 1, 
-        "x": 95, 
-        "y": 72, 
-        "z": "eab52334.be231", 
+        "id": "909bed3c.217f8",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 197,
+        "y": 85,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "77d260.33eeb5a"
+                "42a75c1a.2a0054"
             ]
         ]
-    }, 
+    },
     {
-        "id": "77d260.33eeb5a", 
-        "type": "service-logic", 
-        "name": "DataChange ${project.version}", 
-        "module": "DataChange", 
-        "version": "${project.version}", 
-        "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": 239, 
-        "y": 185, 
-        "z": "eab52334.be231", 
+        "id": "42a75c1a.2a0054",
+        "type": "service-logic",
+        "name": "DataChange ${project.version}",
+        "module": "DataChange",
+        "version": "${project.version}",
+        "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": 341,
+        "y": 198,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "63d24477.5e1d24"
+                "d3b58cb6.7be93"
             ]
         ]
-    }, 
+    },
     {
-        "id": "63d24477.5e1d24", 
-        "type": "method", 
-        "name": "method esr-thirdparty-sdnc-of-zte", 
-        "xml": "<method rpc='esr-thirdparty-sdnc-of-zte' mode='sync'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 164, 
-        "y": 299, 
-        "z": "eab52334.be231", 
+        "id": "d3b58cb6.7be93",
+        "type": "method",
+        "name": "method esr-thirdparty-sdnc-of-zte",
+        "xml": "<method rpc='esr-thirdparty-sdnc-of-zte' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 266,
+        "y": 312,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "f10c2099.6d37a"
+                "d96a4272.22b2d"
             ]
         ]
-    }, 
+    },
     {
-        "id": "f10c2099.6d37a", 
-        "type": "block", 
-        "name": "block : atomic", 
-        "xml": "<block atomic='true'>", 
-        "atomic": "true", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 93, 
-        "y": 433, 
-        "z": "eab52334.be231", 
+        "id": "d96a4272.22b2d",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 195,
+        "y": 446,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "c6e14b97.61ebb8", 
-                "336b2c1.b23ca54", 
-                "ebdf7595.352788", 
-                "bd214a4f.a0427"
+                "81ed8292.6b82",
+                "68becb2a.3bd784",
+                "d51d2b6.59965d8",
+                "33f265dc.9b698a"
             ]
         ]
-    }, 
+    },
     {
-        "id": "c6e14b97.61ebb8", 
-        "type": "call", 
-        "name": "call validate-esr-thirdparty-sdnc-input", 
-        "xml": "<call module='DataChange' rpc='validate-esr-thirdparty-sdnc-input' mode='sync' >\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 451, 
-        "y": 368, 
-        "z": "eab52334.be231", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "336b2c1.b23ca54", 
-        "type": "for", 
-        "name": "for 0..key-data_length", 
-        "xml": "<for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 354, 
-        "y": 438, 
-        "z": "eab52334.be231", 
+        "id": "81ed8292.6b82",
+        "type": "for",
+        "name": "for 0..key-data_length",
+        "xml": "<for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 456,
+        "y": 451,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "75c90043.ea9e58"
+                "f198696d.07cc58"
             ]
         ]
-    }, 
+    },
     {
-        "id": "75c90043.ea9e58", 
-        "type": "block", 
-        "name": "block", 
-        "xml": "<block>\n", 
-        "atomic": "false", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 545, 
-        "y": 439, 
-        "z": "eab52334.be231", 
+        "id": "f198696d.07cc58",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 647,
+        "y": 452,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "128f1b66.00dc0d", 
-                "c1d27f5c.c264f8", 
-                "1a08949.79fd66b", 
-                "8cc1f05e.92f468", 
-                "25639564.010e22", 
-                "7b8ba016.fbb3e8"
+                "15a59c73.3ad834",
+                "557fb41a.fc54ec",
+                "2c8b7b9f.b0acf4",
+                "25227c9b.d556a4",
+                "efe677e5.fc6308",
+                "8d2d3c75.3a0c9"
             ]
         ]
-    }, 
+    },
     {
-        "id": "128f1b66.00dc0d", 
-        "type": "switchNode", 
-        "name": "switch service-url", 
-        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'service-url'`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 754, 
-        "y": 370, 
-        "z": "eab52334.be231", 
+        "id": "15a59c73.3ad834",
+        "type": "switchNode",
+        "name": "switch service-url",
+        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'service-url'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 856,
+        "y": 383,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "a2c28074.c9e3a8"
+                "b5b04925.886a28"
             ]
         ]
-    }, 
+    },
     {
-        "id": "c1d27f5c.c264f8", 
-        "type": "switchNode", 
-        "name": "switch user-name", 
-        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'user-name'`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 754, 
-        "y": 433, 
-        "z": "eab52334.be231", 
+        "id": "557fb41a.fc54ec",
+        "type": "switchNode",
+        "name": "switch user-name",
+        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'user-name'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 856,
+        "y": 446,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "1403e272.365546"
+                "bfe7936.c0f7f7"
             ]
         ]
-    }, 
+    },
     {
-        "id": "1a08949.79fd66b", 
-        "type": "switchNode", 
-        "name": "switch password", 
-        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'password'`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 750, 
-        "y": 492, 
-        "z": "eab52334.be231", 
+        "id": "2c8b7b9f.b0acf4",
+        "type": "switchNode",
+        "name": "switch password",
+        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'password'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 852,
+        "y": 505,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "ad2ddd93.50432"
+                "3e6f0e11.6ee952"
             ]
         ]
-    }, 
+    },
     {
-        "id": "8cc1f05e.92f468", 
-        "type": "switchNode", 
-        "name": "switch esr-system-info-id", 
-        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 777, 
-        "y": 555, 
-        "z": "eab52334.be231", 
+        "id": "25227c9b.d556a4",
+        "type": "switchNode",
+        "name": "switch esr-system-info-id",
+        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 879,
+        "y": 568,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "e0b54647.aef0b8"
+                "329a080c.012238"
             ]
         ]
-    }, 
+    },
     {
-        "id": "25639564.010e22", 
-        "type": "switchNode", 
-        "name": "switch thirdparty-sdnc-id", 
-        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 776, 
-        "y": 616, 
-        "z": "eab52334.be231", 
+        "id": "efe677e5.fc6308",
+        "type": "switchNode",
+        "name": "switch thirdparty-sdnc-id",
+        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 878,
+        "y": 629,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "ec3c7d9e.1913d8"
+                "93ea3ac5.6755a8"
             ]
         ]
-    }, 
+    },
     {
-        "id": "7b8ba016.fbb3e8", 
-        "type": "switchNode", 
-        "name": "switch type", 
-        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'type'`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 735, 
-        "y": 683, 
-        "z": "eab52334.be231", 
+        "id": "8d2d3c75.3a0c9",
+        "type": "switchNode",
+        "name": "switch type",
+        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'type'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 837,
+        "y": 696,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "10575d8e.fe0d6a"
+                "840db98b.49b268"
             ]
         ]
-    }, 
+    },
     {
-        "id": "a2c28074.c9e3a8", 
-        "type": "outcomeTrue", 
-        "name": "true", 
-        "xml": "<outcome value='true'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 973, 
-        "y": 370, 
-        "z": "eab52334.be231", 
+        "id": "b5b04925.886a28",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1075,
+        "y": 383,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "767b34d1.0a080c"
+                "2d9eaf7b.6319e"
             ]
         ]
-    }, 
+    },
     {
-        "id": "1403e272.365546", 
-        "type": "outcomeTrue", 
-        "name": "true", 
-        "xml": "<outcome value='true'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 972, 
-        "y": 432, 
-        "z": "eab52334.be231", 
+        "id": "bfe7936.c0f7f7",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1074,
+        "y": 445,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "92e73df5.564cf"
+                "2b796aae.5b34a6"
             ]
         ]
-    }, 
+    },
     {
-        "id": "ad2ddd93.50432", 
-        "type": "outcomeTrue", 
-        "name": "true", 
-        "xml": "<outcome value='true'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 972, 
-        "y": 491, 
-        "z": "eab52334.be231", 
+        "id": "3e6f0e11.6ee952",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1074,
+        "y": 504,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "9fc08956.e0f9c"
+                "34eaee93.2338c2"
             ]
         ]
-    }, 
+    },
     {
-        "id": "e0b54647.aef0b8", 
-        "type": "outcomeTrue", 
-        "name": "true", 
-        "xml": "<outcome value='true'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 972, 
-        "y": 555, 
-        "z": "eab52334.be231", 
+        "id": "329a080c.012238",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1074,
+        "y": 568,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "1343e358.22771d"
+                "c6a07788.15af18"
             ]
         ]
-    }, 
+    },
     {
-        "id": "ec3c7d9e.1913d8", 
-        "type": "outcomeTrue", 
-        "name": "true", 
-        "xml": "<outcome value='true'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 969, 
-        "y": 616, 
-        "z": "eab52334.be231", 
+        "id": "93ea3ac5.6755a8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1071,
+        "y": 629,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "223f6129.11e8ee"
+                "4b734f80.6eb31"
             ]
         ]
-    }, 
+    },
     {
-        "id": "10575d8e.fe0d6a", 
-        "type": "outcomeTrue", 
-        "name": "true", 
-        "xml": "<outcome value='true'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 968, 
-        "y": 682, 
-        "z": "eab52334.be231", 
+        "id": "840db98b.49b268",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1070,
+        "y": 695,
+        "z": "6337c566.8d383c",
         "wires": [
             [
-                "a24c3d6c.c679f8"
+                "2ea57fe6.0f677"
             ]
         ]
-    }, 
+    },
     {
-        "id": "767b34d1.0a080c", 
-        "type": "set", 
-        "name": "set service-url", 
-        "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.url' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n", 
-        "comments": "", 
-        "x": 1151, 
-        "y": 370, 
-        "z": "eab52334.be231", 
-        "wires": [ ]
-    }, 
+        "id": "2d9eaf7b.6319e",
+        "type": "set",
+        "name": "set service-url",
+        "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.url' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+        "comments": "",
+        "x": 1253,
+        "y": 383,
+        "z": "6337c566.8d383c",
+        "wires": []
+    },
     {
-        "id": "92e73df5.564cf", 
-        "type": "set", 
-        "name": "set user", 
-        "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.user' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n", 
-        "comments": "", 
-        "x": 1151, 
-        "y": 432, 
-        "z": "eab52334.be231", 
-        "wires": [ ]
-    }, 
+        "id": "2b796aae.5b34a6",
+        "type": "set",
+        "name": "set user",
+        "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.user' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+        "comments": "",
+        "x": 1253,
+        "y": 445,
+        "z": "6337c566.8d383c",
+        "wires": []
+    },
     {
-        "id": "9fc08956.e0f9c", 
-        "type": "set", 
-        "name": "set password", 
-        "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.password' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n", 
-        "comments": "", 
-        "x": 1152, 
-        "y": 491, 
-        "z": "eab52334.be231", 
-        "wires": [ ]
-    }, 
+        "id": "34eaee93.2338c2",
+        "type": "set",
+        "name": "set password",
+        "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.password' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+        "comments": "",
+        "x": 1254,
+        "y": 504,
+        "z": "6337c566.8d383c",
+        "wires": []
+    },
     {
-        "id": "1343e358.22771d", 
-        "type": "set", 
-        "name": "set system-info-id", 
-        "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n", 
-        "comments": "", 
-        "x": 1150, 
-        "y": 555, 
-        "z": "eab52334.be231", 
-        "wires": [ ]
-    }, 
+        "id": "c6a07788.15af18",
+        "type": "set",
+        "name": "set system-info-id",
+        "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+        "comments": "",
+        "x": 1252,
+        "y": 568,
+        "z": "6337c566.8d383c",
+        "wires": []
+    },
     {
-        "id": "223f6129.11e8ee", 
-        "type": "set", 
-        "name": "set thirdparty-sdnc-id", 
-        "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n", 
-        "comments": "", 
-        "x": 1148, 
-        "y": 616, 
-        "z": "eab52334.be231", 
-        "wires": [ ]
-    }, 
+        "id": "4b734f80.6eb31",
+        "type": "set",
+        "name": "set thirdparty-sdnc-id",
+        "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+        "comments": "",
+        "x": 1250,
+        "y": 629,
+        "z": "6337c566.8d383c",
+        "wires": []
+    },
     {
-        "id": "a24c3d6c.c679f8", 
-        "type": "set", 
-        "name": "set type", 
-        "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.type' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n", 
-        "comments": "", 
-        "x": 1148, 
-        "y": 682, 
-        "z": "eab52334.be231", 
-        "wires": [ ]
-    }, 
+        "id": "2ea57fe6.0f677",
+        "type": "set",
+        "name": "set type",
+        "xml": "<set>\n<parameter name='zte.prop.sdncRestApi.type' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+        "comments": "",
+        "x": 1250,
+        "y": 695,
+        "z": "6337c566.8d383c",
+        "wires": []
+    },
     {
-        "id": "ebdf7595.352788", 
-        "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/zte.svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"data-change-notification\"/>\n<parameter name=\"field3\" value=\"Config\"/>\n<parameter name=\"field4\" value=\"`service-url`\"/>\n<parameter name=\"field5\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url`\"/>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 304, 
-        "y": 525, 
-        "z": "eab52334.be231", 
+        "id": "68becb2a.3bd784",
+        "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/zte.svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"data-change-notification\"/>\n<parameter name=\"field3\" value=\"Config\"/>\n<parameter name=\"field4\" value=\"`service-url`\"/>\n<parameter name=\"field5\" value=\"`$zte.prop.sdncRestApi.thirdpartySdnc.url`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 406,
+        "y": 538,
+        "z": "6337c566.8d383c",
         "wires": [
-            [ ]
+            []
         ]
-    }, 
+    },
     {
-        "id": "bd214a4f.a0427", 
-        "type": "call", 
-        "name": "call esr-thirdparty-sdnc-discovery-of-zte", 
-        "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-discovery-of-zte' mode='sync' >\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 395, 
-        "y": 615, 
-        "z": "eab52334.be231", 
+        "id": "d51d2b6.59965d8",
+        "type": "call",
+        "name": "call esr-thirdparty-sdnc-discovery-of-zte",
+        "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-discovery-of-zte' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 497,
+        "y": 628,
+        "z": "6337c566.8d383c",
         "wires": [
-            [ ]
+            []
         ]
+    },
+    {
+        "id": "33f265dc.9b698a",
+        "type": "set",
+        "name": "set zte vendor",
+        "xml": "<set>\n<parameter name='prop.zte.sdncRestApi.vendor' value='`$prop.sdncRestApi.vendor`' />\n",
+        "comments": "",
+        "x": 433,
+        "y": 384,
+        "z": "6337c566.8d383c",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json
index 2f759b4c..4e0b325a 100644
--- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json
@@ -1,452 +1,452 @@
-[
-  {
-    "id": "49a378ca.1b3478",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 121,
-    "y": 56,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "b3ec7247.15b52"
-      ]
-    ]
-  },
-  {
-    "id": "b3ec7247.15b52",
-    "type": "service-logic",
-    "name": "DataChange ${project.version}",
-    "module": "DataChange",
-    "version": "${project.version}",
-    "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": 307.1111488342285,
-    "y": 160.44447135925293,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "7535c6a7.f3b5e8"
-      ]
-    ]
-  },
-  {
-    "id": "7535c6a7.f3b5e8",
-    "type": "method",
-    "name": "method esr-thirdparty-sdnc",
-    "xml": "<method rpc='esr-thirdparty-sdnc' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 304.5556983947754,
-    "y": 324.2222566604614,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "1400578.235a6a9"
-      ]
-    ]
-  },
-  {
-    "id": "1400578.235a6a9",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 259.7779655456543,
-    "y": 459.1113119125366,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "25a04fbf.4bd09",
-        "8d1e2cc2.dc3cf",
-        "2d8a913.fdd0d6e",
-        "77f3068a.362d28"
-      ]
-    ]
-  },
-  {
-    "id": "2d8a913.fdd0d6e",
-    "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=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"data-change-notification\"/>\n<parameter name=\"field3\" value=\"Config\"/>\n<parameter name=\"field4\" value=\"`service-url`\"/>\n<parameter name=\"field5\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>",
-    "comments": "",
-    "outputs": 1,
-    "x": 549,
-    "y": 530,
-    "z": "cbb28df7.1359",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "25a04fbf.4bd09",
-    "type": "call",
-    "name": "call validate-esr-thirdparty-sdnc-input",
-    "xml": "<call module='DataChange' rpc='validate-esr-thirdparty-sdnc-input' mode='sync' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 662.7776336669922,
-    "y": 392.9998035430908,
-    "z": "cbb28df7.1359",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "8d1e2cc2.dc3cf",
-    "type": "for",
-    "name": "for 0..key-data_length",
-    "xml": "<for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 597.4441070556641,
-    "y": 475.19078826904297,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "8470a3b8.c68bb"
-      ]
-    ]
-  },
-  {
-    "id": "8470a3b8.c68bb",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 769.3335723876953,
-    "y": 474.4130334854126,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "2e5df795.078a08",
-        "6a42fb20.98a2b4",
-        "554fdd88.9dce84",
-        "a2362617.a38ac8",
-        "bbbe7cd.1d5138",
-        "2a8b4597.cff4ba",
-        "884a9190.06299"
-      ]
-    ]
-  },
-  {
-    "id": "2e5df795.078a08",
-    "type": "switchNode",
-    "name": "switch service-url",
-    "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'service-url'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 981.5552749633789,
-    "y": 384.5241861343384,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "1b6eea6.229c916"
-      ]
-    ]
-  },
-  {
-    "id": "1b6eea6.229c916",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1145.5553970336914,
-    "y": 383.5554189682007,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "fd22b9a9.c98888"
-      ]
-    ]
-  },
-  {
-    "id": "fd22b9a9.c98888",
-    "type": "set",
-    "name": "set service-url",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
-    "comments": "",
-    "x": 1299.5554885864258,
-    "y": 383.1554126739502,
-    "z": "cbb28df7.1359",
-    "wires": []
-  },
-  {
-    "id": "6a42fb20.98a2b4",
-    "type": "switchNode",
-    "name": "switch user-name",
-    "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'user-name'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 978.8450202941895,
-    "y": 453.7712459564209,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "7cf30c0f.3d4904"
-      ]
-    ]
-  },
-  {
-    "id": "7cf30c0f.3d4904",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1147.8450088500977,
-    "y": 451.8024892807007,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "9353bb00.5c78e8"
-      ]
-    ]
-  },
-  {
-    "id": "9353bb00.5c78e8",
-    "type": "set",
-    "name": "set user",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
-    "comments": "",
-    "x": 1283.8451614379883,
-    "y": 451.40248012542725,
-    "z": "cbb28df7.1359",
-    "wires": []
-  },
-  {
-    "id": "554fdd88.9dce84",
-    "type": "switchNode",
-    "name": "switch password",
-    "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'password'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 976.6228523254395,
-    "y": 519.3267955780029,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "a74025be.af1718"
-      ]
-    ]
-  },
-  {
-    "id": "a74025be.af1718",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1148.6228103637695,
-    "y": 519.3580408096313,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "dba0cf08.2438c"
-      ]
-    ]
-  },
-  {
-    "id": "dba0cf08.2438c",
-    "type": "set",
-    "name": "set password",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
-    "comments": "",
-    "x": 1303.6230545043945,
-    "y": 517.9580202102661,
-    "z": "cbb28df7.1359",
-    "wires": []
-  },
-  {
-    "id": "77f3068a.362d28",
-    "type": "call",
-    "name": "call esr-thirdparty-sdnc-discovery",
-    "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-discovery' mode='sync' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 620.4377593994141,
-    "y": 601.5490007400513,
-    "z": "cbb28df7.1359",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "a2362617.a38ac8",
-    "type": "switchNode",
-    "name": "switch esr-system-info-id",
-    "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 998.4441528320312,
-    "y": 573.3331909179688,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "5cab102b.8494d"
-      ]
-    ]
-  },
-  {
-    "id": "5cab102b.8494d",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1173.4441375732422,
-    "y": 571.3643522262573,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "71f47e13.cb288"
-      ]
-    ]
-  },
-  {
-    "id": "71f47e13.cb288",
-    "type": "set",
-    "name": "set esr-system-info-id",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
-    "comments": "",
-    "x": 1339.444107055664,
-    "y": 572.964376449585,
-    "z": "cbb28df7.1359",
-    "wires": []
-  },
-  {
-    "id": "bbbe7cd.1d5138",
-    "type": "switchNode",
-    "name": "switch thirdparty-sdnc-id",
-    "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 993,
-    "y": 618,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "750fb82f.3c8b28"
-      ]
-    ]
-  },
-  {
-    "id": "750fb82f.3c8b28",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1167.999984741211,
-    "y": 616.0311613082886,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "6331f258.3f8f8c"
-      ]
-    ]
-  },
-  {
-    "id": "6331f258.3f8f8c",
-    "type": "set",
-    "name": "set thirdparty-sdnc-id",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
-    "comments": "",
-    "x": 1333.9999542236328,
-    "y": 617.6311855316162,
-    "z": "cbb28df7.1359",
-    "wires": []
-  },
-  {
-    "id": "2a8b4597.cff4ba",
-    "type": "switchNode",
-    "name": "switch type",
-    "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'type'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 943.0000305175781,
-    "y": 667.0000200271606,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "cc8e7403.36ff88"
-      ]
-    ]
-  },
-  {
-    "id": "cc8e7403.36ff88",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1088.0000343322754,
-    "y": 666.0311889648438,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "d672d4f.959ba28"
-      ]
-    ]
-  },
-  {
-    "id": "d672d4f.959ba28",
-    "type": "set",
-    "name": "set type",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.type' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
-    "comments": "",
-    "x": 1220.0000381469727,
-    "y": 665.6312046051025,
-    "z": "cbb28df7.1359",
-    "wires": []
-  },
-  {
-    "id": "884a9190.06299",
-    "type": "switchNode",
-    "name": "switch vendor",
-    "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'vendor'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 944.0000267028809,
-    "y": 723.0000219345093,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "874c4c0f.cf42b"
-      ]
-    ]
-  },
-  {
-    "id": "874c4c0f.cf42b",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1089.0000305175781,
-    "y": 722.0311908721924,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "84239301.8f5d"
-      ]
-    ]
-  },
-  {
-    "id": "84239301.8f5d",
-    "type": "set",
-    "name": "set vendor",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.vendor' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
-    "comments": "",
-    "x": 1221.0000343322754,
-    "y": 721.6312065124512,
-    "z": "cbb28df7.1359",
-    "wires": []
-  }
-]
+[
+    {
+        "id": "99e701a0.2410d",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 136,
+        "y": 137,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "6330fb87.7056d4"
+            ]
+        ]
+    },
+    {
+        "id": "6330fb87.7056d4",
+        "type": "service-logic",
+        "name": "DataChange ${project.version}",
+        "module": "DataChange",
+        "version": "${project.version}",
+        "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": 322.1111488342285,
+        "y": 241.44447135925293,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "5d3152d6.fc261c"
+            ]
+        ]
+    },
+    {
+        "id": "5d3152d6.fc261c",
+        "type": "method",
+        "name": "method esr-thirdparty-sdnc",
+        "xml": "<method rpc='esr-thirdparty-sdnc' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 319.5556983947754,
+        "y": 405.2222566604614,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "fd1dfef.d4b4b"
+            ]
+        ]
+    },
+    {
+        "id": "fd1dfef.d4b4b",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 274.7779655456543,
+        "y": 540.1113119125366,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "9b412bae.4b0eb8",
+                "cceae5d2.b0de18",
+                "ec471744.eb69b8",
+                "ca9b8814.58fc88"
+            ]
+        ]
+    },
+    {
+        "id": "cceae5d2.b0de18",
+        "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=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"data-change-notification\"/>\n<parameter name=\"field3\" value=\"Config\"/>\n<parameter name=\"field4\" value=\"`service-url`\"/>\n<parameter name=\"field5\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 564,
+        "y": 611,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9b412bae.4b0eb8",
+        "type": "for",
+        "name": "for 0..key-data_length",
+        "xml": "<for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 612.4441070556641,
+        "y": 556.190788269043,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "d38c4e0c.d3a8e"
+            ]
+        ]
+    },
+    {
+        "id": "d38c4e0c.d3a8e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 784.3335723876953,
+        "y": 555.4130334854126,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "923e10da.3124e",
+                "ad127485.a941f8",
+                "39c9791a.a004c6",
+                "2bf6fbdd.98dd24",
+                "e16dffa9.206d5",
+                "74936d17.d58244",
+                "f60efc3e.9d559"
+            ]
+        ]
+    },
+    {
+        "id": "923e10da.3124e",
+        "type": "switchNode",
+        "name": "switch service-url",
+        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'service-url'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 996.5552749633789,
+        "y": 465.5241861343384,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "62882f3b.f43fb"
+            ]
+        ]
+    },
+    {
+        "id": "62882f3b.f43fb",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1160.5553970336914,
+        "y": 464.5554189682007,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "d288b1fe.c97e8"
+            ]
+        ]
+    },
+    {
+        "id": "d288b1fe.c97e8",
+        "type": "set",
+        "name": "set service-url",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+        "comments": "",
+        "x": 1314.5554885864258,
+        "y": 464.1554126739502,
+        "z": "3ca15a5b.03f956",
+        "wires": []
+    },
+    {
+        "id": "ad127485.a941f8",
+        "type": "switchNode",
+        "name": "switch user-name",
+        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'user-name'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 993.8450202941895,
+        "y": 534.7712459564209,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "32e92192.48f84e"
+            ]
+        ]
+    },
+    {
+        "id": "32e92192.48f84e",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1162.8450088500977,
+        "y": 532.8024892807007,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "e32de5c0.443f28"
+            ]
+        ]
+    },
+    {
+        "id": "e32de5c0.443f28",
+        "type": "set",
+        "name": "set user",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+        "comments": "",
+        "x": 1298.8451614379883,
+        "y": 532.4024801254272,
+        "z": "3ca15a5b.03f956",
+        "wires": []
+    },
+    {
+        "id": "39c9791a.a004c6",
+        "type": "switchNode",
+        "name": "switch password",
+        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'password'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 991.6228523254395,
+        "y": 600.3267955780029,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "699a3ade.cb3b24"
+            ]
+        ]
+    },
+    {
+        "id": "699a3ade.cb3b24",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1163.6228103637695,
+        "y": 600.3580408096313,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "b4409b06.1c7a48"
+            ]
+        ]
+    },
+    {
+        "id": "b4409b06.1c7a48",
+        "type": "set",
+        "name": "set password",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+        "comments": "",
+        "x": 1318.6230545043945,
+        "y": 598.9580202102661,
+        "z": "3ca15a5b.03f956",
+        "wires": []
+    },
+    {
+        "id": "ec471744.eb69b8",
+        "type": "call",
+        "name": "call esr-thirdparty-sdnc-discovery",
+        "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-discovery' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 635.4377593994141,
+        "y": 682.5490007400513,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2bf6fbdd.98dd24",
+        "type": "switchNode",
+        "name": "switch esr-system-info-id",
+        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1013.4441528320312,
+        "y": 654.3331909179688,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "6b800452.92b53c"
+            ]
+        ]
+    },
+    {
+        "id": "6b800452.92b53c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1188.4441375732422,
+        "y": 652.3643522262573,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "5fb25642.fe13a8"
+            ]
+        ]
+    },
+    {
+        "id": "5fb25642.fe13a8",
+        "type": "set",
+        "name": "set esr-system-info-id",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+        "comments": "",
+        "x": 1354.444107055664,
+        "y": 653.964376449585,
+        "z": "3ca15a5b.03f956",
+        "wires": []
+    },
+    {
+        "id": "e16dffa9.206d5",
+        "type": "switchNode",
+        "name": "switch thirdparty-sdnc-id",
+        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1008,
+        "y": 699,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "c89a0c6d.1572e"
+            ]
+        ]
+    },
+    {
+        "id": "c89a0c6d.1572e",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1182.999984741211,
+        "y": 697.0311613082886,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "a9287f8e.79595"
+            ]
+        ]
+    },
+    {
+        "id": "a9287f8e.79595",
+        "type": "set",
+        "name": "set thirdparty-sdnc-id",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+        "comments": "",
+        "x": 1348.9999542236328,
+        "y": 698.6311855316162,
+        "z": "3ca15a5b.03f956",
+        "wires": []
+    },
+    {
+        "id": "74936d17.d58244",
+        "type": "switchNode",
+        "name": "switch type",
+        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'type'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 958.0000305175781,
+        "y": 748.0000200271606,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "b33cf82.eefe308"
+            ]
+        ]
+    },
+    {
+        "id": "b33cf82.eefe308",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1103.0000343322754,
+        "y": 747.0311889648438,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "dfc8eb6b.f283a8"
+            ]
+        ]
+    },
+    {
+        "id": "dfc8eb6b.f283a8",
+        "type": "set",
+        "name": "set type",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.type' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+        "comments": "",
+        "x": 1235.0000381469727,
+        "y": 746.6312046051025,
+        "z": "3ca15a5b.03f956",
+        "wires": []
+    },
+    {
+        "id": "f60efc3e.9d559",
+        "type": "switchNode",
+        "name": "switch vendor",
+        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'vendor'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 959.0000267028809,
+        "y": 804.0000219345093,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "f02e6468.4f1ca8"
+            ]
+        ]
+    },
+    {
+        "id": "f02e6468.4f1ca8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1104.0000305175781,
+        "y": 803.0311908721924,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            [
+                "4287418.30ed9c"
+            ]
+        ]
+    },
+    {
+        "id": "4287418.30ed9c",
+        "type": "set",
+        "name": "set vendor",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.vendor' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+        "comments": "",
+        "x": 1236.0000343322754,
+        "y": 802.6312065124512,
+        "z": "3ca15a5b.03f956",
+        "wires": []
+    },
+    {
+        "id": "ca9b8814.58fc88",
+        "type": "call",
+        "name": "call validate-esr-thirdparty-sdnc-input",
+        "xml": "<call module='DataChange' rpc='validate-esr-thirdparty-sdnc-input' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 677.7776336669922,
+        "y": 473.9998035430908,
+        "z": "3ca15a5b.03f956",
+        "wires": [
+            []
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_data-change-notification.xml b/platform-logic/datachange/src/main/xml/DataChange_data-change-notification.xml
index 529b8497..76f2fe89 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_data-change-notification.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_data-change-notification.xml
@@ -1,41 +1,27 @@
 <service-logic
-  xmlns='http://www.onap.org/sdnc/svclogic'
-  xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>
-  <method rpc='data-change-notification' mode='sync'> 
-    <block atomic="true"> 
-      <switch test='`$data-change-notification-input.aai-node-type`'> 
-        <outcome value='esr-thirdparty-sdnc'> 
-          <for index='idx' start='0' end='`$data-change-notification-input.key-data_length`'> 
-            <switch test='`$data-change-notification-input.key-data[$idx].key-value == 'ZTE'`'> 
-              <outcome value='true'> 
-                <block atomic="true"> 
-                  <set> 
-                    <parameter name='zte.prop.sdncRestApi.vendor' value='`$data-change-notification-input.key-data[$idx].key-value`'/> 
-                  </set>
-                  <call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync'></call>
-                </block>
-              </outcome>
-              <outcome value='false'> 
-                <block atomic="true"> 
-                  <call module='DataChange' rpc='esr-thirdparty-sdnc' mode='sync'></call>
-                </block>
-              </outcome>
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>
+    <method rpc='data-change-notification' mode='sync'>
+        <block atomic="true">
+            <switch test='`$data-change-notification-input.aai-node-type`'>
+                <outcome value='esr-thirdparty-sdnc'>
+                    <block atomic="true">
+                        <call module='DataChange' rpc='esr-thirdparty-sdnc' mode='sync' ></call>
+                    </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="AAI node type not supported" />
+                    </return>
+                </outcome>
             </switch>
-          </for>
-        </outcome>
-        <outcome value='Other'> 
-          <return status='failure'> 
-            <parameter name='ack-final' value='Y'/>  
-            <parameter name="error-code" value="500"/>  
-            <parameter name="error-message" value="AAI node type not supported"/>
-          </return>
-        </outcome>
-      </switch>
-      <return status='success'> 
-        <parameter name="ack-final-indicator" value="Y"/>  
-        <parameter name="error-code" value="200"/>  
-        <parameter name="error-message" value="`$error-message`"/> 
-      </return>
-    </block>
-  </method>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery-of-zte.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery-of-zte.xml
index 77c83bb9..4ffb73ee 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery-of-zte.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery-of-zte.xml
@@ -1,259 +1,292 @@
-<service-logic xmlns="http://www.onap.org/sdnc/svclogic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
-  <method rpc="esr-thirdparty-sdnc-discovery-of-zte" mode="sync"> 
-    <block atomic="true">
-      <switch test="`$data-change-notification-input.aai-event-trigger`"> 
-        <outcome value="Update"> 
-          <block> 
-            <switch test="`$prop.sdncRestApi.type`"> 
-              <outcome value="SOTN"> 
-                <block atomic="true">
-                  <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> 
-                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/getzteodutopotemplate.json'`"/>  
-                    <parameter name="restapiUrl" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-topology-details'`"/>  
-                    <parameter name="restapiUser" value="`$zte.prop.sdncRestApi.thirdpartySdnc.user`"/>  
-                    <parameter name="restapiPassword" value="`$zte.prop.sdncRestApi.thirdpartySdnc.password`"/>  
-                    <parameter name="format" value="json"/>  
-                    <parameter name="httpMethod" value="POST"/>  
-                    <parameter name="responsePrefix" value="ztetopology"/>
-                    <outcome value="success"> 
-                      <block atomic="true"/>
-                    </outcome>
-                    <outcome value="failure"> 
-                      <return status="failure"> 
-                        <parameter name="ack-final" value="Y"/>  
-                        <parameter name="error-code" value="500"/>  
-                        <parameter name="error-message" value="Error executing Get odutopo rest api"/> 
-                      </return>
-                    </outcome>
-                  </execute>
-                  <for index="nidx" start="0" end="`$ztetopology.output.topology.node-ref-id_length`">
-                    <block atomic="true">
-                      <set> 
-                        <parameter name="prop.zte.network-id" value="zteNetwork"/>  
-                        <parameter name="prop.zte.client-id" value="zteClient1"/>  
-                        <parameter name="prop.zte.topo-id" value="zteTopo1"/>  
-                        <parameter name="prop.zte.provider-id" value="zteProvider1"/>  
-                        <parameter name="prop.zte.odutopo.name" value="`$ztetopology.output.topology.node-ref-id[$nidx]`"/> 
-                      </set>
-                      <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $prop.zte.network-id"> 
-                        <parameter name="network-id" value="`$prop.zte.network-id`"/>  
-                        <parameter name="client-id" value="`$prop.zte.client-id`"/>  
-                        <parameter name="te-topo-id" value="`$prop.zte.topo-id`"/>  
-                        <parameter name="provider-id" value="`$prop.zte.provider-id`"/>
-                      </save>
-                      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> 
-                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/getzteodutoponodetemplate.json'`"/>  
-                        <parameter name="restapiUrl" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-topology-details'`"/>  
-                        <parameter name="restapiUser" value="`$zte.prop.sdncRestApi.thirdpartySdnc.user`"/>  
-                        <parameter name="restapiPassword" value="`$zte.prop.sdncRestApi.thirdpartySdnc.password`"/>  
-                        <parameter name="format" value="json"/>  
-                        <parameter name="httpMethod" value="POST"/>  
-                        <parameter name="responsePrefix" value="ztetopologynode"/>
-                        <outcome value="failure"> 
-                          <return status="failure"> 
-                            <parameter name="ack-final" value="Y"/>  
-                            <parameter name="error-code" value="500"/>  
-                            <parameter name="error-message" value="Error executing Get odutopo node rest api"/> 
-                          </return>
-                        </outcome>
-                        <outcome value="success"> 
-                          <for index="pidx" start="0" end="`$ztetopologynode.output.topology.node-ref-id_length`"> 
-                            <block> 
-                              <set> 
-                                <parameter name="prop.zte.odutopo.node.name" value="`$ztetopologynode.output.topology.node-ref-id[$pidx]`"/> 
-                              </set>
-                              <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> 
-                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/getzteodutoponodedetailstemplate.json'`"/>  
-                                <parameter name="restapiUrl" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-node-details'`"/>  
-                                <parameter name="restapiUser" value="`$zte.prop.sdncRestApi.thirdpartySdnc.user`"/>  
-                                <parameter name="restapiPassword" value="`$zte.prop.sdncRestApi.thirdpartySdnc.password`"/>  
-                                <parameter name="format" value="json"/>  
-                                <parameter name="httpMethod" value="POST"/>  
-                                <parameter name="responsePrefix" value="ztetopologynodedetails"/>
-                                <outcome value="failure"> 
-                                  <return status="failure"> 
-                                    <parameter name="ack-final" value="Y"/>  
-                                    <parameter name="error-code" value="500"/>  
-                                    <parameter name="error-message" value="Error executing Get odutopo node details rest api"/> 
-                                  </return>
-                                </outcome>
-                                <outcome value="success"> 
-                                  <block> 
-                                    <switch test="`$ztetopologynodedetails.node.global-state-pac.operational-state == 'ENABLED'`"> 
-                                      <outcome value="true"> 
-                                        <switch test="`$ztetopologynodedetails.node.global-state-pac.administrative-state == 'LOCKED'`"> 
-                                          <outcome value="true"> 
-                                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid"> 
-                                              <parameter name="pnf-name" value="`$ztetopologynodedetails.node.uuid`"/>  
-                                              <parameter name="pnf-id" value="`$ztetopologynodedetails.node.uuid`"/>  
-                                              <parameter name="operational-status" value="up"/>  
-                                              <parameter name="admin-status" value="up"/>  
-                                              <parameter name="in-maint" value="true"/> 
-                                            </save>
-                                          </outcome>
-                                          <outcome value="false"> 
-                                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid"> 
-                                              <parameter name="pnf-name" value="`$ztetopologynodedetails.node.uuid`"/>  
-                                              <parameter name="pnf-id" value="`$ztetopologynodedetails.node.uuid`"/>  
-                                              <parameter name="operational-status" value="up"/>  
-                                              <parameter name="admin-status" value="down"/>  
-                                              <parameter name="in-maint" value="true"/> 
-                                            </save>
-                                          </outcome>
-                                        </switch>
-                                      </outcome>
-                                      <outcome value="false"> 
-                                        <switch test="`$ztetopologynodedetails.node.global-state-pac.administrative-state == 'LOCKED'`"> 
-                                          <outcome value="true"> 
-                                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid"> 
-                                              <parameter name="pnf-name" value="`$ztetopologynodedetails.node.uuid`"/>  
-                                              <parameter name="pnf-id" value="`$ztetopologynodedetails.node.uuid`"/>  
-                                              <parameter name="operational-status" value="down"/>  
-                                              <parameter name="admin-status" value="up"/>  
-                                              <parameter name="in-maint" value="true"/> 
-                                            </save>
-                                          </outcome>
-                                          <outcome value="false"> 
-                                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid"> 
-                                              <parameter name="pnf-name" value="`$ztetopologynodedetails.node.uuid`"/>  
-                                              <parameter name="pnf-id" value="`$ztetopologynodedetails.node.uuid`"/>  
-                                              <parameter name="operational-status" value="down"/>  
-                                              <parameter name="admin-status" value="down"/>  
-                                              <parameter name="in-maint" value="true"/> 
-                                            </save>
-                                          </outcome>
-                                        </switch>
-                                      </outcome>
-                                    </switch>
-                                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid" force="true" pfx="tmp.AnAI-data"> 
-                                      <parameter name="relationship-list.relationship[0].related-to" value="network-resource"/>  
-                                      <parameter name="relationship-list.relationship[0].related-link" value="'/network/network-resources/network-resource/' + 'zteNetwork'"/>  
-                                      <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id"/>  
-                                      <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="zteNetwork"/>
-                                    </save>
-                                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc:relationship-list" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $zte.prop.sdncRestApi.thirdpartySdnc.id" force="true" pfx="tmp.AnAI-data"> 
-                                      <parameter name="relationship-list.relationship[0].related-to" value="pnf"/>  
-                                      <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $ztetopologynodedetails.node.uuid`"/>  
-                                      <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name"/>  
-                                      <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$ztetopologynodedetails.node.uuid`"/> 
-                                    </save>
-                                    <for index="ridx" start="0" end="`$ztetopologynodedetails.output.node.node-edge-point-id_length`"> 
-                                      <block> 
-                                        <set> 
-                                          <parameter name="prop.zte.odutopo.node.nep.uuid" value="`$ztetopologynodedetails.output.node.node-edge-point-id[$ridx]`"/> 
-                                        </set>
-                                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> 
-                                          <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/getzteodutoponodenepdetailstemplate.json'`"/>  
-                                          <parameter name="restapiUrl" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-node-edge-point-details'`"/>  
-                                          <parameter name="restapiUser" value="`$zte.prop.sdncRestApi.thirdpartySdnc.user`"/>  
-                                          <parameter name="restapiPassword" value="`$zte.prop.sdncRestApi.thirdpartySdnc.password`"/>  
-                                          <parameter name="format" value="json"/>  
-                                          <parameter name="httpMethod" value="POST"/>  
-                                          <parameter name="responsePrefix" value="ztetopologynodenepdetails"/>
-                                          <outcome value="failure"> 
-                                            <return status="failure"> 
-                                              <parameter name="ack-final" value="Y"/>  
-                                              <parameter name="error-code" value="500"/>  
-                                              <parameter name="error-message" value="Error executing Get odutopo node edge point details rest api"/> 
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>
+    <method rpc='esr-thirdparty-sdnc-discovery-of-zte' mode='sync'>
+        <block atomic='true'>
+            <switch test="`$data-change-notification-input.aai-event-trigger`">
+                <outcome value='Update'>
+                    <block>
+                        <switch test="`$zte.prop.sdncRestApi.type`">
+                            <outcome value='SOTN'>
+                                <block atomic='true'>
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                                        <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                                        <parameter name='contextPrefix' value='prop' />
+                                    </execute>
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/getzteodutopotemplate.json'`" />
+                                        <parameter name="restapiUrl" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-topology-details'`" />
+                                        <parameter name="restapiUser" value="`$zte.prop.sdncRestApi.thirdpartySdnc.user`" />
+                                        <parameter name="restapiPassword" value="`$zte.prop.sdncRestApi.thirdpartySdnc.password`" />
+                                        <parameter name="format" value="json"/>
+                                        <parameter name="httpMethod" value="POST"/>
+                                        <parameter name="responsePrefix" value="ztetopology"/>
+                                        <outcome value='success'>
+                                            <block atomic="true"></block>
+                                        </outcome>
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="Error executing Get odutopo rest api" />
                                             </return>
-                                          </outcome>
-                                          <outcome value="success"> 
-                                            <for index="tidx" start="0" end="`$ztetopologynodenepdetails.output.node-edge-point.name_length`"> 
-                                              <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="contains"> 
-                                                <parameter name="source" value="`$ztetopologynodenepdetails.node-edge-point.name[tidx].value`"/>  
-                                                <parameter name="target" value="client"/>  
-                                                <outcome value="false"> 
-                                                  <block></block>
+                                        </outcome>
+                                    </execute>
+                                    <for index='nidx' start='0' end='`$ztetopology.output.topology.node-ref-id_length`' >
+                                        <block>
+                                            <set>
+                                                <parameter name='prop.zte.odutopo.name' value='`$ztetopology.output.topology.node-ref-id[$nidx]`' />
+                                            </set>
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/getzteodutoponodetemplate.json'`" />
+                                                <parameter name="restapiUrl" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-topology-details'`" />
+                                                <parameter name="restapiUser" value="`$zte.prop.sdncRestApi.thirdpartySdnc.user`" />
+                                                <parameter name="restapiPassword" value="`$zte.prop.sdncRestApi.thirdpartySdnc.password`" />
+                                                <parameter name="format" value="json"/>
+                                                <parameter name="httpMethod" value="POST"/>
+                                                <parameter name="responsePrefix" value="ztetopologynode"/>
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error executing Get odutopo node rest api" />
+                                                    </return>
                                                 </outcome>
-                                                <outcome value="true"> 
-                                                  <block> 
-                                                    <set> 
-                                                      <parameter name="zte-unique-ltpId" value="`'nodeId-' + $ztetopologynodedetails.node.uuid + '-ltpId-' + $ztetopologynodenepdetails.node-edge-point.uuid`"/> 
-                                                    </set>
-                                                    <set> 
-                                                      <parameter name="zte-bandwidth" value="`1000 * 1000000 * 1.25 * $ztetopologynodenepdetails.node-edge-point.lp[0].odu-nep-pac.oducapacity`"/> 
-                                                    </set>
-                                                    <switch test="`$ztetopologynodedetails.node.global-state-pac.operational-state == 'ENABLED'`"> 
-                                                      <outcome value="true"> 
-                                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid       AND p-interface.interface-name = $zte-unique-ltpId"> 
-                                                          <parameter name="interface-name" value="`$zte-unique-ltpId`"/>  
-                                                          <parameter name="network-ref" value="`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`"/>  
-                                                          <parameter name="transparent" value="true"/>  
-                                                          <parameter name="speed-value" value="`$zte-bandwidth`"/>  
-                                                          <parameter name="operational-status" value="up"/>  
-                                                          <parameter name="in-maint" value="true"/> "`'nodeId-' + $node.node-id + '-ltpId-' + $tp.te-tp-id`"
-                                                          <outcome value="success"> 
+                                                <outcome value='success'>
+                                                    <switch test="`$ztetopologynode.output.topology.layer-protocol-name[0] == 'ODU'`">
+                                                        <outcome value='false'>
                                                             <block></block>
-                                                          </outcome>
-                                                          <outcome value="failure"> 
-                                                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid       AND p-interface.interface-name = $zte-unique-ltpId"> 
-                                                              <parameter name="interface-name" value="`$zte-unique-ltpId`"/>  
-                                                              <parameter name="network-ref" value="`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`"/>  
-                                                              <parameter name="transparent" value="true"/>  
-                                                              <parameter name="speed-value" value="`$zte-bandwidth`"/>  
-                                                              <parameter name="operational-status" value="up"/>  
-                                                              <parameter name="in-maint" value="true"/> 
-                                                            </save>
-                                                          </outcome>
-                                                        </save>
-                                                      </outcome>
-                                                      <outcome value="false"> 
-                                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid       AND p-interface.interface-name = $zte-unique-ltpId"> 
-                                                          <parameter name="interface-name" value="`$zte-unique-ltpId`"/>  
-                                                          <parameter name="network-ref" value="`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`"/>  
-                                                          <parameter name="transparent" value="true"/>  
-                                                          <parameter name="speed-value" value="`$zte-bandwidth`"/>  
-                                                          <parameter name="operational-status" value="down"/>  
-                                                          <parameter name="in-maint" value="true"/>  
-                                                          <outcome value="success"> 
-                                                            <block></block>
-                                                          </outcome>
-                                                          <outcome value="failure"> 
-                                                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $ztetopologynodedetails.node.uuid       AND p-interface.interface-name = $zte-unique-ltpId"> 
-                                                              <parameter name="interface-name" value="`$zte-unique-ltpId`"/>  
-                                                              <parameter name="network-ref" value="`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`"/>  
-                                                              <parameter name="transparent" value="true"/>  
-                                                              <parameter name="speed-value" value="`$zte-bandwidth`"/>  
-                                                              <parameter name="operational-status" value="up"/>  
-                                                              <parameter name="in-maint" value="true"/> 
-                                                            </save>
-                                                          </outcome>
-                                                        </save>
-                                                      </outcome>
+                                                        </outcome>
+                                                        <outcome value='true'>
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name='prop.zte.network-id' value="zteNetwork" />
+                                                                    <parameter name='prop.zte.client-id' value="zteClient1" />
+                                                                    <parameter name='prop.zte.topo-id' value="zteTopo1" />
+                                                                    <parameter name='prop.zte.provider-id' value="zteProvider1" />
+                                                                </set>
+                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  
+     key='network-resource.network-id = $prop.zte.network-id' >
+                                                                    <parameter name='network-id' value='`$prop.zte.network-id`' />
+                                                                    <parameter name='client-id' value='`$prop.zte.client-id`' />
+                                                                    <parameter name='te-topo-id' value='`$prop.zte.topo-id`' />
+                                                                    <parameter name='provider-id' value='`$prop.zte.provider-id`' />
+                                                                </save>
+                                                                <for index='pidx' start='0' end='`$ztetopologynode.output.topology.node-ref-id_length`' >
+                                                                    <block>
+                                                                        <set>
+                                                                            <parameter name='prop.zte.odutopo.node.name' value='`$ztetopologynode.output.topology.node-ref-id[$pidx]`' />
+                                                                        </set>
+                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/getzteodutoponodedetailstemplate.json'`" />
+                                                                            <parameter name="restapiUrl" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-node-details'`" />
+                                                                            <parameter name="restapiUser" value="`$zte.prop.sdncRestApi.thirdpartySdnc.user`" />
+                                                                            <parameter name="restapiPassword" value="`$zte.prop.sdncRestApi.thirdpartySdnc.password`" />
+                                                                            <parameter name="format" value="json"/>
+                                                                            <parameter name="httpMethod" value="POST"/>
+                                                                            <parameter name="responsePrefix" value="ztetopologynodedetails"/>
+                                                                            <outcome value='failure'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="Error executing Get odutopo node details rest api" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                            <outcome value='success'>
+                                                                                <block>
+                                                                                    <switch test="`$ztetopologynodedetails.output.node.global-state-pac.operational-state == 'ENABLED'`">
+                                                                                        <outcome value='true'>
+                                                                                            <switch test="`$ztetopologynodedetails.output.node.global-state-pac.administrative-state == 'LOCKED'`">
+                                                                                                <outcome value='true'>
+                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' 
+      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' >
+                                                                                                        <parameter name='pnf-name' value='`$ztetopologynodedetails.output.node.uuid`' />
+                                                                                                        <parameter name='pnf-id' value='`$ztetopologynodedetails.output.node.uuid`' />
+                                                                                                        <parameter name='operational-status' value="up" />
+                                                                                                        <parameter name='admin-status' value="up" />
+                                                                                                        <parameter name='in-maint' value='true' />
+                                                                                                    </save>
+                                                                                                </outcome>
+                                                                                                <outcome value='false'>
+                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' 
+      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' >
+                                                                                                        <parameter name='pnf-name' value='`$ztetopologynodedetails.output.node.uuid`' />
+                                                                                                        <parameter name='pnf-id' value='`$ztetopologynodedetails.output.node.uuid`' />
+                                                                                                        <parameter name='operational-status' value="up" />
+                                                                                                        <parameter name='admin-status' value="down" />
+                                                                                                        <parameter name='in-maint' value='true' />
+                                                                                                    </save>
+                                                                                                </outcome>
+                                                                                            </switch>
+                                                                                        </outcome>
+                                                                                        <outcome value='false'>
+                                                                                            <switch test="`$ztetopologynodedetails.output.node.global-state-pac.administrative-state == 'LOCKED'`">
+                                                                                                <outcome value='true'>
+                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' 
+      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' >
+                                                                                                        <parameter name='pnf-name' value='`$ztetopologynodedetails.output.node.uuid`' />
+                                                                                                        <parameter name='pnf-id' value='`$ztetopologynodedetails.output.node.uuid`' />
+                                                                                                        <parameter name='operational-status' value="down" />
+                                                                                                        <parameter name='admin-status' value="up" />
+                                                                                                        <parameter name='in-maint' value='true' />
+                                                                                                    </save>
+                                                                                                </outcome>
+                                                                                                <outcome value='false'>
+                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' 
+      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' >
+                                                                                                        <parameter name='pnf-name' value='`$ztetopologynodedetails.output.node.uuid`' />
+                                                                                                        <parameter name='pnf-id' value='`$ztetopologynodedetails.output.node.uuid`' />
+                                                                                                        <parameter name='operational-status' value="down" />
+                                                                                                        <parameter name='admin-status' value="down" />
+                                                                                                        <parameter name='in-maint' value='true' />
+                                                                                                    </save>
+                                                                                                </outcome>
+                                                                                            </switch>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' 
+      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid' force="true" pfx="tmp.AnAI-data">
+                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="network-resource" />
+                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $prop.zte.network-id`" />
+                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id" />
+                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.zte.network-id`" />
+                                                                                    </save>
+                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' 
+      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $zte.prop.sdncRestApi.thirdpartySdnc.id' 
+      force="true" pfx="tmp.AnAI-data">
+                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="pnf" />
+                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $ztetopologynodedetails.output.node.uuid`" />
+                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />
+                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$ztetopologynodedetails.output.node.uuid`" />
+                                                                                    </save>
+                                                                                    <for index='ridx' start='0' end='`$ztetopologynodedetails.output.node.node-edge-point-id_length`' >
+                                                                                        <block>
+                                                                                            <set>
+                                                                                                <parameter name='prop.zte.odutopo.node.nep.uuid' value='`$ztetopologynodedetails.output.node.node-edge-point-id[$ridx]`' />
+                                                                                            </set>
+                                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/getzteodutoponodenepdetailstemplate.json'`" />
+                                                                                                <parameter name="restapiUrl" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-Topology:get-node-edge-point-details'`" />
+                                                                                                <parameter name="restapiUser" value="`$zte.prop.sdncRestApi.thirdpartySdnc.user`" />
+                                                                                                <parameter name="restapiPassword" value="`$zte.prop.sdncRestApi.thirdpartySdnc.password`" />
+                                                                                                <parameter name="format" value="json"/>
+                                                                                                <parameter name="httpMethod" value="POST"/>
+                                                                                                <parameter name="responsePrefix" value="ztetopologynodenepdetails"/>
+                                                                                                <outcome value='failure'>
+                                                                                                    <return status='failure'>
+                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                        <parameter name="error-message" value="Error executing Get odutopo node edge point details rest api" />
+                                                                                                    </return>
+                                                                                                </outcome>
+                                                                                                <outcome value='success'>
+                                                                                                    <for index='tidx' start='0' end='`$ztetopologynodenepdetails.output.node-edge-point.name_length`' >
+                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >
+                                                                                                            <parameter name="source" value="`$ztetopologynodenepdetails.node-edge-point.name[tidx].value`"/>
+                                                                                                            <parameter name="target" value="client"/>
+                                                                                                            <outcome value='failure'>
+                                                                                                                <block></block>
+                                                                                                            </outcome>
+                                                                                                            <outcome value='success'>
+                                                                                                                <block>
+                                                                                                                    <set>
+                                                                                                                        <parameter name='zte-unique-ltpId' value="`'nodeId-' + $ztetopologynodedetails.output.node.uuid + '-ltpId-' + $ztetopologynodenepdetails.output.node-edge-point.uuid`" />
+                                                                                                                    </set>
+                                                                                                                    <set>
+                                                                                                                        <parameter name='zte-bandwidth' value='`1250000000 * $ztetopologynodenepdetails.output.node-edge-point.lp[0].odu-nep-pac.odu-capacity`' />
+                                                                                                                    </set>
+                                                                                                                    <switch test="`$ztetopologynodedetails.output.node.global-state-pac.operational-state == 'ENABLED'`">
+                                                                                                                        <outcome value='true'>
+                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' 
+      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid
+      AND p-interface.interface-name = $zte-unique-ltpId' >
+                                                                                                                                <parameter name='interface-name' value='`$zte-unique-ltpId`' />
+                                                                                                                                <parameter name='network-ref' value="`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`" />
+                                                                                                                                <parameter name='transparent' value="true" />
+                                                                                                                                <parameter name='speed-value' value='`$zte-bandwidth`' />
+                                                                                                                                <parameter name='operational-status' value="up" />
+                                                                                                                                <parameter name='in-maint' value="true" />
+                                                                                                                                <outcome value='success'>
+                                                                                                                                    <block></block>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='failure'>
+                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' 
+      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid
+      AND p-interface.interface-name = $zte-unique-ltpId' >
+                                                                                                                                        <parameter name='interface-name' value='`$zte-unique-ltpId`' />
+                                                                                                                                        <parameter name='network-ref' value="`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`" />
+                                                                                                                                        <parameter name='transparent' value="true" />
+                                                                                                                                        <parameter name='speed-value' value='`$zte-bandwidth`' />
+                                                                                                                                        <parameter name='operational-status' value="up" />
+                                                                                                                                        <parameter name='in-maint' value="true" />
+                                                                                                                                    </save>
+                                                                                                                                </outcome>
+                                                                                                                            </save>
+                                                                                                                        </outcome>
+                                                                                                                        <outcome value='false'>
+                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' 
+      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid
+      AND p-interface.interface-name = $zte-unique-ltpId' >
+                                                                                                                                <parameter name='interface-name' value='`$zte-unique-ltpId`' />
+                                                                                                                                <parameter name='network-ref' value="`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`" />
+                                                                                                                                <parameter name='transparent' value="true" />
+                                                                                                                                <parameter name='speed-value' value='`$zte-bandwidth`' />
+                                                                                                                                <parameter name='operational-status' value="down" />
+                                                                                                                                <parameter name='in-maint' value="true" />
+                                                                                                                                <outcome value='success'>
+                                                                                                                                    <block></block>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='failure'>
+                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' 
+      key='pnf.pnf-name = $ztetopologynodedetails.output.node.uuid
+      AND p-interface.interface-name = $zte-unique-ltpId' >
+                                                                                                                                        <parameter name='interface-name' value='`$zte-unique-ltpId`' />
+                                                                                                                                        <parameter name='network-ref' value="`'providerId/' + $prop.zte.provider-id + '/topologyId/' + $prop.zte.topo-id + '/clientId/' + $prop.zte.client-id`" />
+                                                                                                                                        <parameter name='transparent' value="true" />
+                                                                                                                                        <parameter name='speed-value' value='`$zte-bandwidth`' />
+                                                                                                                                        <parameter name='operational-status' value="up" />
+                                                                                                                                        <parameter name='in-maint' value="true" />
+                                                                                                                                    </save>
+                                                                                                                                </outcome>
+                                                                                                                            </save>
+                                                                                                                        </outcome>
+                                                                                                                    </switch>
+                                                                                                                </block>
+                                                                                                            </outcome>
+                                                                                                        </execute>
+                                                                                                    </for>
+                                                                                                </outcome>
+                                                                                            </execute>
+                                                                                        </block>
+                                                                                    </for>
+                                                                                </block>
+                                                                            </outcome>
+                                                                        </execute>
+                                                                    </block>
+                                                                </for>
+                                                            </block>
+                                                        </outcome>
                                                     </switch>
-                                                  </block>
                                                 </outcome>
-                                              </execute>
-                                            </for>
-                                          </outcome>
-                                        </execute>
-                                      </block>
+                                            </execute>
+                                        </block>
                                     </for>
-                                  </block>
-                                </outcome>
-                              </execute>
-                            </block>
-                          </for>
-                        </outcome>
-                      </execute>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name='error-code' value="500" />
+                                    <parameter name='error-message' value="`'Unsupported type = ' + $prop.sdncRestApi.type`" />
+                                </return>
+                            </outcome>
+                        </switch>
                     </block>
-                  </for>
-                </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>
+                </outcome>
+                <outcome value='delete'>
+                    <block atomic='true'></block>
+                </outcome>
             </switch>
-          </block>
-        </outcome>
-        <outcome value="delete"> 
-          <block atomic="true"/>
-        </outcome>
-      </switch>
-    </block>
-  </method>
+        </block>
+    </method>
 </service-logic>
\ 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 e71c0419..e11daddd 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
@@ -1,144 +1,149 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>
-    <method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>
-        <block atomic="true">
-            <switch test="`$data-change-notification-input.aai-event-trigger`">
-                <outcome value='Update'>
-                    <block>
-                        <switch test="`$prop.sdncRestApi.type`">
-                            <outcome value='SOTN'>
-                                <block atomic="true">
-                                    <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                                        <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-                                        <parameter name='contextPrefix' value='prop' />
-                                    </execute>
-                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
-                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />
-                                        <parameter name="format" value="json"/>
-                                        <parameter name="httpMethod" value="post"/>
-                                        <parameter name="responsePrefix" value="token-result"/>
-                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                        <outcome value='success'>
-                                            <set>
-                                                <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />
-                                            </set>
-                                        </outcome>
-                                        <outcome value='failure'>
-                                            <block></block>
-                                        </outcome>
-                                    </execute>
-                                    <switch test="`$prop.sdncRestApi.token_id`">
-                                        <outcome value=''>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />
-                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                                <parameter name="format" value="json"/>
-                                                <parameter name="httpMethod" value="get"/>
-                                                <parameter name="responsePrefix" value="topology"/>
-                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                <parameter name="trustStorePassword" value="adminadmin"/>
-                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                <parameter name="keyStorePassword" value="adminadmin"/>
-                                                <outcome value='failure'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="Error executing Create vpn rest api" />
-                                                    </return>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block atomic="true">
-                                                        <for index='nidx' start='0' end='`$topology.networks.network_length`' >
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='network.' value='`$topology.networks.network[$nidx].`' />
-                                                                </set>
-                                                                <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
-                                                            </block>
-                                                        </for>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />
-                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                                <parameter name="format" value="json"/>
-                                                <parameter name="httpMethod" value="get"/>
-                                                <parameter name="responsePrefix" value="topology"/>
-                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                <parameter name="trustStorePassword" value="adminadmin"/>
-                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                <parameter name="keyStorePassword" value="adminadmin"/>
-                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                <outcome value='failure'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="Error executing Create vpn rest api" />
-                                                    </return>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block atomic="true">
-                                                        <for index='nidx' start='0' end='`$topology.networks.network_length`' >
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='network.' value='`$topology.networks.network[$nidx].`' />
-                                                                </set>
-                                                                <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
-                                                            </block>
-                                                        </for>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                        </outcome>
-                                    </switch>
-                                    <set>
-                                        <parameter name='input' value='ietf-subscribed-notifications:establish-subscription.input.' />
-                                        <parameter name="`$input + 'encoding'`" value="encode-json" />
-                                    </set>
-                                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscription' >
-                                        <parameter name="subscriberId" value="sotn-controller" />
-                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
-                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                        <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`" />
-                                        <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
-                                        <parameter name="format" value="json" />
-                                        <parameter name="httpMethod" value="post" />
-                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                        <parameter name="module" value="DataChange" />
-                                        <parameter name="rpc" value="sotn-notification-handler" />
-                                        <parameter name="mode" value="sync" />
-                                    </execute>
-                                </block>
-                            </outcome>
-                            <outcome value='Other'>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="`'Unsupported type = ' + $prop.sdncRestApi.type`" />
-                                </return>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-                <outcome value='delete'>
-                    <block atomic="true"></block>
-                </outcome>
-            </switch>
-        </block>
-    </method>
+<service-logic xmlns="http://www.onap.org/sdnc/svclogic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
+  <method rpc="esr-thirdparty-sdnc-discovery" mode="sync"> 
+    <block atomic="true"> 
+      <switch test="`$prop.sdncRestApi.vendor == 'ZTE'`"> 
+        <outcome value="false"> 
+          <switch test="`$data-change-notification-input.aai-event-trigger`"> 
+            <outcome value="Update"> 
+              <block> 
+                <switch test="`$prop.sdncRestApi.type`"> 
+                  <outcome value="SOTN"> 
+                    <block atomic="true">
+                      <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties"> 
+                        <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties"/>  
+                        <parameter name="contextPrefix" value="prop"/> 
+                      </execute>
+                      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> 
+                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`"/>  
+                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`"/>  
+                        <parameter name="format" value="json"/>  
+                        <parameter name="httpMethod" value="post"/>  
+                        <parameter name="responsePrefix" value="token-result"/>  
+                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>  
+                        <parameter name="trustStorePassword" value="adminadmin"/>  
+                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>  
+                        <parameter name="keyStorePassword" value="adminadmin"/>
+                        <outcome value="success"> 
+                          <set> 
+                            <parameter name="prop.sdncRestApi.token_id" value="`$token-result.data.token_id`"/> 
+                          </set>
+                        </outcome>
+                        <outcome value="failure"> 
+                          <block></block>
+                        </outcome>
+                      </execute>
+                      <switch test="`$prop.sdncRestApi.token_id`"> 
+                        <outcome value=""> 
+                          <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> 
+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`"/>  
+                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>  
+                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>  
+                            <parameter name="format" value="json"/>  
+                            <parameter name="httpMethod" value="get"/>  
+                            <parameter name="responsePrefix" value="topology"/>  
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>  
+                            <parameter name="trustStorePassword" value="adminadmin"/>  
+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>  
+                            <parameter name="keyStorePassword" value="adminadmin"/>  
+                            <outcome value="failure"> 
+                              <return status="failure"> 
+                                <parameter name="ack-final" value="Y"/>  
+                                <parameter name="error-code" value="500"/>  
+                                <parameter name="error-message" value="Error executing Create vpn rest api"/> 
+                              </return>
+                            </outcome>
+                            <outcome value="success"> 
+                              <block atomic="true">
+                                <for index="nidx" start="0" end="`$topology.networks.network_length`"> 
+                                  <block> 
+                                    <set> 
+                                      <parameter name="network." value="`$topology.networks.network[$nidx].`"/> 
+                                    </set>
+                                    <call module="DataChange" rpc="update-network-to-aai" mode="sync"></call>
+                                  </block>
+                                </for>
+                              </block>
+                            </outcome>
+                          </execute>
+                        </outcome>
+                        <outcome value="Other"> 
+                          <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> 
+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`"/>  
+                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>  
+                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>  
+                            <parameter name="format" value="json"/>  
+                            <parameter name="httpMethod" value="get"/>  
+                            <parameter name="responsePrefix" value="topology"/>  
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>  
+                            <parameter name="trustStorePassword" value="adminadmin"/>  
+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>  
+                            <parameter name="keyStorePassword" value="adminadmin"/>  
+                            <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`"/>
+                            <outcome value="failure"> 
+                              <return status="failure"> 
+                                <parameter name="ack-final" value="Y"/>  
+                                <parameter name="error-code" value="500"/>  
+                                <parameter name="error-message" value="Error executing Create vpn rest api"/> 
+                              </return>
+                            </outcome>
+                            <outcome value="success"> 
+                              <block atomic="true">
+                                <for index="nidx" start="0" end="`$topology.networks.network_length`"> 
+                                  <block> 
+                                    <set> 
+                                      <parameter name="network." value="`$topology.networks.network[$nidx].`"/> 
+                                    </set>
+                                    <call module="DataChange" rpc="update-network-to-aai" mode="sync"></call>
+                                  </block>
+                                </for>
+                              </block>
+                            </outcome>
+                          </execute>
+                        </outcome>
+                      </switch>
+                      <set> 
+                        <parameter name="input" value="ietf-subscribed-notifications:establish-subscription.input."/>  
+                        <parameter name="`$input + 'encoding'`" value="encode-json"/>
+                      </set>
+                      <execute plugin="org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode" method="establishSubscription"> 
+                        <parameter name="subscriberId" value="sotn-controller"/>  
+                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`"/>  
+                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>  
+                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>  
+                        <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`"/>  
+                        <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification"/>  
+                        <parameter name="format" value="json"/>  
+                        <parameter name="httpMethod" value="post"/>  
+                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>  
+                        <parameter name="trustStorePassword" value="adminadmin"/>  
+                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>  
+                        <parameter name="keyStorePassword" value="adminadmin"/>  
+                        <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`"/>  
+                        <parameter name="module" value="DataChange"/>  
+                        <parameter name="rpc" value="sotn-notification-handler"/>  
+                        <parameter name="mode" value="sync"/>
+                      </execute>
+                    </block>
+                  </outcome>
+                  <outcome value="Other"> 
+                    <return status="failure"> 
+                      <parameter name="ack-final" value="Y"/>  
+                      <parameter name="error-code" value="500"/>  
+                      <parameter name="error-message" value="`'Unsupported type = ' + $prop.sdncRestApi.type`"/> 
+                    </return>
+                  </outcome>
+                </switch>
+              </block>
+            </outcome>
+            <outcome value="delete"> 
+              <block atomic="true"/>
+            </outcome>
+          </switch>
+        </outcome>
+        <outcome value="true"> 
+          <call module="DataChange" rpc="esr-thirdparty-sdnc-of-zte" mode="sync"></call>
+        </outcome>
+      </switch>
+    </block>
+  </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-of-zte.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-of-zte.xml
index 25fef6b2..e98dc7b6 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-of-zte.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-of-zte.xml
@@ -1,64 +1,66 @@
 <service-logic
-  xmlns='http://www.onap.org/sdnc/svclogic'
-  xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>
-  <method rpc='esr-thirdparty-sdnc-of-zte' mode='sync'> 
-    <block atomic="true">
-      <call module='DataChange' rpc='validate-esr-thirdparty-sdnc-input' mode='sync'></call>
-      <for index='idx' start='0' end='`$data-change-notification-input.key-data_length`'> 
-        <block> 
-          <switch test='`$data-change-notification-input.key-data[$idx].key-name == 'service-url'`'> 
-            <outcome value='true'> 
-              <set> 
-                <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.url' value='`$data-change-notification-input.key-data[$idx].key-value`'/> 
-              </set>
-            </outcome>
-          </switch>
-          <switch test='`$data-change-notification-input.key-data[$idx].key-name == 'user-name'`'> 
-            <outcome value='true'> 
-              <set> 
-                <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.user' value='`$data-change-notification-input.key-data[$idx].key-value`'/> 
-              </set>
-            </outcome>
-          </switch>
-          <switch test='`$data-change-notification-input.key-data[$idx].key-name == 'password'`'> 
-            <outcome value='true'> 
-              <set> 
-                <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.password' value='`$data-change-notification-input.key-data[$idx].key-value`'/> 
-              </set>
-            </outcome>
-          </switch>
-          <switch test='`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`'> 
-            <outcome value='true'> 
-              <set> 
-                <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`'/> 
-              </set>
-            </outcome>
-          </switch>
-          <switch test='`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`'> 
-            <outcome value='true'> 
-              <set> 
-                <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`'/> 
-              </set>
-            </outcome>
-          </switch>
-          <switch test='`$data-change-notification-input.key-data[$idx].key-name == 'type'`'> 
-            <outcome value='true'> 
-              <set> 
-                <parameter name='zte.prop.sdncRestApi.type' value='`$data-change-notification-input.key-data[$idx].key-value`'/> 
-              </set>
-            </outcome>
-          </switch>
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>
+    <method rpc='esr-thirdparty-sdnc-of-zte' mode='sync'>
+        <block atomic='true'>
+            <set>
+                <parameter name='prop.zte.sdncRestApi.vendor' value='`$prop.sdncRestApi.vendor`' />
+            </set>
+            <for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >
+                <block>
+                    <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'service-url'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.url' value='`$data-change-notification-input.key-data[$idx].key-value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'user-name'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.user' value='`$data-change-notification-input.key-data[$idx].key-value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'password'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.password' value='`$data-change-notification-input.key-data[$idx].key-value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='zte.prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'type'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='zte.prop.sdncRestApi.type' value='`$data-change-notification-input.key-data[$idx].key-value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                </block>
+            </for>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/zte.svclogic.log"/>
+                <parameter name="field1" value="__TIMESTAMP__"/>
+                <parameter name="field2" value="data-change-notification"/>
+                <parameter name="field3" value="Config"/>
+                <parameter name="field4" value="`service-url`"/>
+                <parameter name="field5" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url`"/>
+            </record>
+            <call module='DataChange' rpc='esr-thirdparty-sdnc-discovery-of-zte' mode='sync' ></call>
         </block>
-      </for>
-      <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> 
-        <parameter name="file" value="/opt/opendaylight/current/data/log/zte.svclogic.log"/>  
-        <parameter name="field1" value="__TIMESTAMP__"/>  
-        <parameter name="field2" value="data-change-notification"/>  
-        <parameter name="field3" value="Config"/>  
-        <parameter name="field4" value="`service-url`"/>  
-        <parameter name="field5" value="`$zte.prop.sdncRestApi.thirdpartySdnc.url`"/> 
-      </record>
-      <call module='DataChange' rpc='esr-thirdparty-sdnc-discovery-of-zte' mode='sync'></call>
-    </block>
-  </method>
+    </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
index c2e75d22..15ac4016 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
@@ -68,4 +68,4 @@
             <call module='DataChange' rpc='esr-thirdparty-sdnc-discovery' mode='sync' ></call>
         </block>
     </method>
-</service-logic>
+</service-logic>
\ No newline at end of file
-- 
2.16.6