From 60775f8fffb91a098315385f6919ce5593005d2d Mon Sep 17 00:00:00 2001
From: wsx25289 <10200860@zte.com.cn>
Date: Wed, 19 Sep 2018 15:52:49 +0800
Subject: [PATCH] add zte esr-thirdparty-sdnc discovery logic

Issue-ID: SDNC-354

Change-Id: Ida2c54bfd2211774c872c0535032182cf4f90324
Signed-off-by: Wsx25289 <10200860@zte.com.cn>
---
 .../json/DataChange_data-change-notification.json  | 189 +++++-----
 ...hange_esr-thirdparty-sdnc-discovery-of-zte.json | 300 ++++++++++++++++
 .../DataChange_esr-thirdparty-sdnc-of-zte.json     | 388 ++++++++++++++++++++-
 .../datachange/src/main/resources/graph.versions   |   1 +
 .../xml/DataChange_data-change-notification.xml    |   9 +-
 ...Change_esr-thirdparty-sdnc-discovery-of-zte.xml |  53 +++
 .../xml/DataChange_esr-thirdparty-sdnc-of-zte.xml  |  67 +++-
 7 files changed, 907 insertions(+), 100 deletions(-)
 create mode 100644 platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery-of-zte.json
 create mode 100644 platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery-of-zte.xml

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 bbeb5c10..eb1e8fdf 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,20 +1,20 @@
 [
     {
-        "id": "2abb63ad.3df404", 
+        "id": "c9438469.7f9978", 
         "type": "dgstart", 
         "name": "DGSTART", 
         "outputs": 1, 
-        "x": 97, 
-        "y": 89, 
-        "z": "bbab5cc4.c9cbd", 
+        "x": 86.5, 
+        "y": 81, 
+        "z": "31e69f1c.704108", 
         "wires": [
             [
-                "cec5984a.941728"
+                "80aeb8.8187b148"
             ]
         ]
     }, 
     {
-        "id": "cec5984a.941728", 
+        "id": "80aeb8.8187b148", 
         "type": "service-logic", 
         "name": "DataChange ${project.version}", 
         "module": "DataChange", 
@@ -22,228 +22,257 @@
         "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": 283.1111488342285, 
-        "y": 193.44447135925293, 
-        "z": "bbab5cc4.c9cbd", 
+        "x": 249.61114883422852, 
+        "y": 182.44447135925293, 
+        "z": "31e69f1c.704108", 
         "wires": [
             [
-                "6f601264.f5fb8c"
+                "b8c8b6e.8e24748"
             ]
         ]
     }, 
     {
-        "id": "6f601264.f5fb8c", 
+        "id": "b8c8b6e.8e24748", 
         "type": "method", 
         "name": "method data-change-notification", 
         "xml": "<method rpc='data-change-notification' mode='sync'>\n", 
         "comments": "", 
         "outputs": 1, 
-        "x": 280.5556983947754, 
-        "y": 357.2222566604614, 
-        "z": "bbab5cc4.c9cbd", 
+        "x": 247.0556983947754, 
+        "y": 346.2222566604614, 
+        "z": "31e69f1c.704108", 
         "wires": [
             [
-                "b8bb57bd.6c8f88"
+                "e44b2680.5f0e1"
             ]
         ]
     }, 
     {
-        "id": "b8bb57bd.6c8f88", 
+        "id": "e44b2680.5f0e1", 
         "type": "block", 
         "name": "block : atomic", 
         "xml": "<block atomic=\"true\">\n", 
         "atomic": "false", 
         "comments": "", 
         "outputs": 1, 
-        "x": 325.7779846191406, 
-        "y": 472.1113269329071, 
-        "z": "bbab5cc4.c9cbd", 
+        "x": 292.2779846191406, 
+        "y": 461.1113269329071, 
+        "z": "31e69f1c.704108", 
         "wires": [
             [
-                "97cb17d6.992f9", 
-                "3b4bb8da.ca8bd8"
+                "5f1a41d8.25b23", 
+                "7978a5db.d860ec"
             ]
         ]
     }, 
     {
-        "id": "97cb17d6.992f9", 
+        "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": 533.3338432312012, 
-        "y": 559.556131362915, 
-        "z": "bbab5cc4.c9cbd", 
+        "x": 499.8338432312012, 
+        "y": 548.556131362915, 
+        "z": "31e69f1c.704108", 
         "wires": [ ]
     }, 
     {
-        "id": "c1961812.103ba", 
+        "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": 1454.3341064453125, 
-        "y": 336.6667785644531, 
-        "z": "bbab5cc4.c9cbd", 
+        "x": 1420.8341064453125, 
+        "y": 325.6667785644531, 
+        "z": "31e69f1c.704108", 
         "wires": [
             [ ]
         ]
     }, 
     {
-        "id": "3b4bb8da.ca8bd8", 
+        "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": 536.8827209472656, 
-        "y": 435.88262820243835, 
-        "z": "bbab5cc4.c9cbd", 
+        "x": 503.3827209472656, 
+        "y": 424.88262820243835, 
+        "z": "31e69f1c.704108", 
         "wires": [
             [
-                "8187ec02.edc438", 
-                "e44a9744.783fc8"
+                "1e0b8434.23a404", 
+                "d0750bdf.e570e"
             ]
         ]
     }, 
     {
-        "id": "8187ec02.edc438", 
+        "id": "1e0b8434.23a404", 
         "type": "other", 
         "name": "esr-thirdparty-sdnc", 
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n", 
         "comments": "", 
         "outputs": 1, 
-        "x": 711.9146728515625, 
-        "y": 194.0572509765625, 
-        "z": "bbab5cc4.c9cbd", 
+        "x": 678.4146728515625, 
+        "y": 183.0572509765625, 
+        "z": "31e69f1c.704108", 
         "wires": [
             [
-                "b5d44440.30e84"
+                "e6b3f0d5.83e4a8"
             ]
         ]
     }, 
     {
-        "id": "e44a9744.783fc8", 
+        "id": "d0750bdf.e570e", 
         "type": "other", 
         "name": "other", 
         "xml": "<outcome value='Other'>\n", 
         "comments": "", 
         "outputs": 1, 
-        "x": 776.8827857971191, 
-        "y": 434.8826608657837, 
-        "z": "bbab5cc4.c9cbd", 
+        "x": 743.3827857971191, 
+        "y": 423.8826608657837, 
+        "z": "31e69f1c.704108", 
         "wires": [
             [
-                "62e87f0f.63e3e"
+                "9c41362c.9d7948"
             ]
         ]
     }, 
     {
-        "id": "62e87f0f.63e3e", 
+        "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": 932.3273048400879, 
-        "y": 434.99376010894775, 
-        "z": "bbab5cc4.c9cbd", 
+        "x": 898.8273048400879, 
+        "y": 423.99376010894775, 
+        "z": "31e69f1c.704108", 
         "wires": [ ]
     }, 
     {
-        "id": "9f25a183.327f8", 
+        "id": "dc8e805f.967db", 
         "type": "block", 
         "name": "block : atomic", 
         "xml": "<block atomic=\"true\">\n", 
         "atomic": "false", 
         "comments": "", 
         "outputs": 1, 
-        "x": 1358.000244140625, 
-        "y": 252.8262939453125, 
-        "z": "bbab5cc4.c9cbd", 
+        "x": 1324.500244140625, 
+        "y": 241.8262939453125, 
+        "z": "31e69f1c.704108", 
         "wires": [
             [
-                "c1961812.103ba"
+                "bca5a9bf.c1ce98"
             ]
         ]
     }, 
     {
-        "id": "b5d44440.30e84", 
+        "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": 899, 
-        "y": 194, 
-        "z": "bbab5cc4.c9cbd", 
+        "x": 865.5, 
+        "y": 183, 
+        "z": "31e69f1c.704108", 
         "wires": [
             [
-                "b63e0c35.6e5668"
+                "ba8b2793.6bb91"
             ]
         ]
     }, 
     {
-        "id": "b63e0c35.6e5668", 
+        "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": 1039, 
-        "y": 194, 
-        "z": "bbab5cc4.c9cbd", 
+        "x": 1005.5, 
+        "y": 183, 
+        "z": "31e69f1c.704108", 
         "wires": [
             [
-                "4a9c78f7.44a98", 
-                "ed07b87c.5778b8"
+                "891233f8.add168", 
+                "810b885f.a9b34"
             ]
         ]
     }, 
     {
-        "id": "14dce58a.e0a96a", 
+        "id": "5b501f1b.fad328", 
         "type": "call", 
-        "name": "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": 1342, 
-        "y": 194, 
-        "z": "bbab5cc4.c9cbd", 
+        "x": 1619.5, 
+        "y": 236, 
+        "z": "31e69f1c.704108", 
         "wires": [
             [ ]
         ]
     }, 
     {
-        "id": "4a9c78f7.44a98", 
+        "id": "891233f8.add168", 
         "type": "outcomeTrue", 
         "name": "true", 
         "xml": "<outcome value='true'>\n", 
         "comments": "", 
         "outputs": 1, 
-        "x": 1193, 
-        "y": 194, 
-        "z": "bbab5cc4.c9cbd", 
+        "x": 1159.5, 
+        "y": 183, 
+        "z": "31e69f1c.704108", 
         "wires": [
             [
-                "14dce58a.e0a96a"
+                "fb1086e7.fe9d98"
             ]
         ]
     }, 
     {
-        "id": "ed07b87c.5778b8", 
+        "id": "810b885f.a9b34", 
         "type": "outcomeFalse", 
         "name": "false", 
         "xml": "<outcome value='false'>\n", 
         "comments": "", 
         "outputs": 1, 
-        "x": 1193, 
-        "y": 253, 
-        "z": "bbab5cc4.c9cbd", 
+        "x": 1159.5, 
+        "y": 242, 
+        "z": "31e69f1c.704108", 
         "wires": [
             [
-                "9f25a183.327f8"
+                "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
new file mode 100644
index 00000000..d8262519
--- /dev/null
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery-of-zte.json
@@ -0,0 +1,300 @@
+[
+    {
+        "id": "461e2499.8f3954", 
+        "type": "dgstart", 
+        "name": "DGSTART", 
+        "outputs": 1, 
+        "x": 98, 
+        "y": 69, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [
+                "701f3038.9db4d"
+            ]
+        ]
+    }, 
+    {
+        "id": "701f3038.9db4d", 
+        "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": 202, 
+        "y": 158, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [
+                "ba25d02c.fdd0a8"
+            ]
+        ]
+    }, 
+    {
+        "id": "ba25d02c.fdd0a8", 
+        "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": 270, 
+        "y": 256, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [
+                "a3d44b66.a5094"
+            ]
+        ]
+    }, 
+    {
+        "id": "a3d44b66.a5094", 
+        "type": "block", 
+        "name": "block : atomic", 
+        "xml": "<block atomic='true'>", 
+        "atomic": "true", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 194, 
+        "y": 363, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [
+                "ca8f74a.2337f88"
+            ]
+        ]
+    }, 
+    {
+        "id": "ca8f74a.2337f88", 
+        "type": "switchNode", 
+        "name": "switch aai-event-trigger", 
+        "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 396, 
+        "y": 363, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [
+                "63184cea.989334", 
+                "7bf3b058.b30c4"
+            ]
+        ]
+    }, 
+    {
+        "id": "63184cea.989334", 
+        "type": "outcome", 
+        "name": "update", 
+        "xml": "<outcome value='Update'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 624, 
+        "y": 318, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [
+                "fdd46760.8bf7f"
+            ]
+        ]
+    }, 
+    {
+        "id": "7bf3b058.b30c4", 
+        "type": "outcome", 
+        "name": "delete", 
+        "xml": "<outcome value='delete'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 622, 
+        "y": 486, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [
+                "8e4adf58.75aaa"
+            ]
+        ]
+    }, 
+    {
+        "id": "8e4adf58.75aaa", 
+        "type": "block", 
+        "name": "block : atomic", 
+        "xml": "<block atomic='true'>", 
+        "atomic": "true", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 797, 
+        "y": 486, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [ ]
+        ]
+    }, 
+    {
+        "id": "fdd46760.8bf7f", 
+        "type": "block", 
+        "name": "block", 
+        "xml": "<block>\n", 
+        "atomic": "false", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 776, 
+        "y": 318, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [
+                "da8890ad.af057"
+            ]
+        ]
+    }, 
+    {
+        "id": "da8890ad.af057", 
+        "type": "switchNode", 
+        "name": "switch type", 
+        "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 945, 
+        "y": 318, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [
+                "f4b967b.17aaa18", 
+                "9bc9bbca.bea01"
+            ]
+        ]
+    }, 
+    {
+        "id": "f4b967b.17aaa18", 
+        "type": "outcome", 
+        "name": "SOTN", 
+        "xml": "<outcome value='SOTN'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1121, 
+        "y": 253, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [
+                "8178bbaf.4eb688"
+            ]
+        ]
+    }, 
+    {
+        "id": "9bc9bbca.bea01", 
+        "type": "outcome", 
+        "name": "other", 
+        "xml": "<outcome value='Other'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1115, 
+        "y": 375, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [
+                "d8c7c62c.b1c62"
+            ]
+        ]
+    }, 
+    {
+        "id": "d8c7c62c.b1c62", 
+        "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": 1307, 
+        "y": 375, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [ ]
+    }, 
+    {
+        "id": "8178bbaf.4eb688", 
+        "type": "block", 
+        "name": "block : atomic", 
+        "xml": "<block atomic='true'>", 
+        "atomic": "true", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1307, 
+        "y": 253, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [
+                "9fb7d11c.800968"
+            ]
+        ]
+    }, 
+    {
+        "id": "9fb7d11c.800968", 
+        "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 + '/getztetopotemplate.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\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.zte.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.zte.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1627, 
+        "y": 161, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [
+                "eab2d66e.d885b8", 
+                "17a6c836.1328e"
+            ]
+        ]
+    }, 
+    {
+        "id": "eab2d66e.d885b8", 
+        "type": "success", 
+        "name": "success", 
+        "xml": "<outcome value='success'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1909, 
+        "y": 106, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [
+                "e4e6a315.e66f18"
+            ]
+        ]
+    }, 
+    {
+        "id": "17a6c836.1328e", 
+        "type": "failure", 
+        "name": "failure", 
+        "xml": "<outcome value='failure'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1907, 
+        "y": 206, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [
+                "f408426d.ddcf3"
+            ]
+        ]
+    }, 
+    {
+        "id": "e4e6a315.e66f18", 
+        "type": "block", 
+        "name": "block : atomic", 
+        "xml": "<block atomic=\"true\">", 
+        "atomic": "true", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 2108, 
+        "y": 105, 
+        "z": "233b36a1.5b5d1a", 
+        "wires": [
+            [ ]
+        ]
+    }, 
+    {
+        "id": "f408426d.ddcf3", 
+        "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 Create vpn rest api\" />\n", 
+        "comments": "", 
+        "x": 2103, 
+        "y": 206, 
+        "z": "233b36a1.5b5d1a", 
+        "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 0e93be66..4212c38a 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,20 +1,20 @@
 [
     {
-        "id": "c4dfa871.acfb38", 
+        "id": "78797449.a69d64", 
         "type": "dgstart", 
         "name": "DGSTART", 
         "outputs": 1, 
-        "x": 131, 
-        "y": 100, 
-        "z": "b1682cba.152", 
+        "x": 95, 
+        "y": 72, 
+        "z": "eab52334.be231", 
         "wires": [
             [
-                "b06bc6e2.9ba258"
+                "77d260.33eeb5a"
             ]
         ]
     }, 
     {
-        "id": "b06bc6e2.9ba258", 
+        "id": "77d260.33eeb5a", 
         "type": "service-logic", 
         "name": "DataChange ${project.version}", 
         "module": "DataChange", 
@@ -22,25 +22,385 @@
         "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": 275, 
-        "y": 213, 
-        "z": "b1682cba.152", 
+        "x": 239, 
+        "y": 185, 
+        "z": "eab52334.be231", 
         "wires": [
             [
-                "94182378.e4944"
+                "63d24477.5e1d24"
             ]
         ]
     }, 
     {
-        "id": "94182378.e4944", 
+        "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": 200, 
-        "y": 327, 
-        "z": "b1682cba.152", 
+        "x": 164, 
+        "y": 299, 
+        "z": "eab52334.be231", 
+        "wires": [
+            [
+                "f10c2099.6d37a"
+            ]
+        ]
+    }, 
+    {
+        "id": "f10c2099.6d37a", 
+        "type": "block", 
+        "name": "block : atomic", 
+        "xml": "<block atomic='true'>", 
+        "atomic": "true", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 93, 
+        "y": 433, 
+        "z": "eab52334.be231", 
+        "wires": [
+            [
+                "c6e14b97.61ebb8", 
+                "336b2c1.b23ca54", 
+                "ebdf7595.352788", 
+                "bd214a4f.a0427"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "75c90043.ea9e58"
+            ]
+        ]
+    }, 
+    {
+        "id": "75c90043.ea9e58", 
+        "type": "block", 
+        "name": "block", 
+        "xml": "<block>\n", 
+        "atomic": "false", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 545, 
+        "y": 439, 
+        "z": "eab52334.be231", 
+        "wires": [
+            [
+                "128f1b66.00dc0d", 
+                "c1d27f5c.c264f8", 
+                "1a08949.79fd66b", 
+                "8cc1f05e.92f468", 
+                "25639564.010e22", 
+                "7b8ba016.fbb3e8"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "a2c28074.c9e3a8"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "1403e272.365546"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "ad2ddd93.50432"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "e0b54647.aef0b8"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "ec3c7d9e.1913d8"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "10575d8e.fe0d6a"
+            ]
+        ]
+    }, 
+    {
+        "id": "a2c28074.c9e3a8", 
+        "type": "outcomeTrue", 
+        "name": "true", 
+        "xml": "<outcome value='true'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 973, 
+        "y": 370, 
+        "z": "eab52334.be231", 
+        "wires": [
+            [
+                "767b34d1.0a080c"
+            ]
+        ]
+    }, 
+    {
+        "id": "1403e272.365546", 
+        "type": "outcomeTrue", 
+        "name": "true", 
+        "xml": "<outcome value='true'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 972, 
+        "y": 432, 
+        "z": "eab52334.be231", 
+        "wires": [
+            [
+                "92e73df5.564cf"
+            ]
+        ]
+    }, 
+    {
+        "id": "ad2ddd93.50432", 
+        "type": "outcomeTrue", 
+        "name": "true", 
+        "xml": "<outcome value='true'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 972, 
+        "y": 491, 
+        "z": "eab52334.be231", 
+        "wires": [
+            [
+                "9fc08956.e0f9c"
+            ]
+        ]
+    }, 
+    {
+        "id": "e0b54647.aef0b8", 
+        "type": "outcomeTrue", 
+        "name": "true", 
+        "xml": "<outcome value='true'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 972, 
+        "y": 555, 
+        "z": "eab52334.be231", 
+        "wires": [
+            [
+                "1343e358.22771d"
+            ]
+        ]
+    }, 
+    {
+        "id": "ec3c7d9e.1913d8", 
+        "type": "outcomeTrue", 
+        "name": "true", 
+        "xml": "<outcome value='true'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 969, 
+        "y": 616, 
+        "z": "eab52334.be231", 
+        "wires": [
+            [
+                "223f6129.11e8ee"
+            ]
+        ]
+    }, 
+    {
+        "id": "10575d8e.fe0d6a", 
+        "type": "outcomeTrue", 
+        "name": "true", 
+        "xml": "<outcome value='true'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 968, 
+        "y": 682, 
+        "z": "eab52334.be231", 
+        "wires": [
+            [
+                "a24c3d6c.c679f8"
+            ]
+        ]
+    }, 
+    {
+        "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": "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": "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": "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": "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": "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": "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", 
+        "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", 
         "wires": [
             [ ]
         ]
diff --git a/platform-logic/datachange/src/main/resources/graph.versions b/platform-logic/datachange/src/main/resources/graph.versions
index 37211fe7..1901fd05 100644
--- a/platform-logic/datachange/src/main/resources/graph.versions
+++ b/platform-logic/datachange/src/main/resources/graph.versions
@@ -3,4 +3,5 @@ DataChange esr-thirdparty-sdnc ${project.version} sync
 DataChange esr-thirdparty-sdnc-of-zte ${project.version} sync
 DataChange validate-esr-thirdparty-sdnc-input ${project.version} sync
 DataChange esr-thirdparty-sdnc-discovery ${project.version} sync
+DataChange esr-thirdparty-sdnc-discovery-of-zte ${project.version} sync
 DataChange update-network-to-aai ${project.version} sync
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 80c8acf5..529b8497 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
@@ -6,9 +6,14 @@
       <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'`"> 
+            <switch test='`$data-change-notification-input.key-data[$idx].key-value == 'ZTE'`'> 
               <outcome value='true'> 
-                <call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync'></call>
+                <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"> 
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
new file mode 100644
index 00000000..2cc77da8
--- /dev/null
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery-of-zte.xml
@@ -0,0 +1,53 @@
+<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 + '/getztetopotemplate.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"/>  
+                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.zte.client.jks"/>  
+                    <parameter name="trustStorePassword" value="adminadmin"/>  
+                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.zte.p12"/>  
+                    <parameter name="keyStorePassword" value="adminadmin"/>  
+                    <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 Create vpn rest api"/> 
+                      </return>
+                    </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>
+        </outcome>
+        <outcome value='delete'> 
+          <block atomic="true"/>
+        </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 52161217..25fef6b2 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,5 +1,64 @@
-<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'></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-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>
+        </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>
 </service-logic>
\ No newline at end of file
-- 
2.16.6