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

Issue-ID: SDNC-354

Change-Id: I3c3d0a464af933da449f009690085d778bbb4614
Signed-off-by: Wsx25289 <10200860@zte.com.cn>

Former-commit-id: f795758fd327fad2a9ed7ac411cfd10a3d5922a0
---
 .../json/DataChange_data-change-notification.json  | 372 ++++++++-------------
 1 file changed, 132 insertions(+), 240 deletions(-)

(limited to 'platform-logic/datachange/src/main/json/DataChange_data-change-notification.json')

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
-- 
cgit 1.2.3-korg