From 2c4962f32cc45b939398a70b8ff42844648112c5 Mon Sep 17 00:00:00 2001
From: wsx25289 <10200860@zte.com.cn>
Date: Tue, 18 Sep 2018 10:32:28 +0800
Subject: [PATCH] modify format

Issue-ID: SDNC-354

Change-Id: Ib954aa68a71a2168617ff036024aa453c603065f
Signed-off-by: Wsx25289 <10200860@zte.com.cn>
---
 .../json/DataChange_data-change-notification.json  | 250 ++++++++++++++++++++-
 .../DataChange_esr-thirdparty-sdnc-of-zte.json     |  49 +++-
 .../xml/DataChange_data-change-notification.xml    |  56 +++--
 .../xml/DataChange_esr-thirdparty-sdnc-of-zte.xml  |   7 +-
 4 files changed, 338 insertions(+), 24 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 c4df22ad..bbeb5c10 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 +1,249 @@
-[{"id":"2abb63ad.3df404","type":"dgstart","name":"DGSTART","outputs":1,"x":97,"y":89,"z":"bbab5cc4.c9cbd","wires":[["cec5984a.941728"]]},{"id":"cec5984a.941728","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":283.1111488342285,"y":193.44447135925293,"z":"bbab5cc4.c9cbd","wires":[["6f601264.f5fb8c"]]},{"id":"6f601264.f5fb8c","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","wires":[["b8bb57bd.6c8f88"]]},{"id":"b8bb57bd.6c8f88","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":325.7779846191406,"y":472.1113269329071,"z":"bbab5cc4.c9cbd","wires":[["97cb17d6.992f9","3b4bb8da.ca8bd8"]]},{"id":"97cb17d6.992f9","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","wires":[]},{"id":"c1961812.103ba","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","wires":[[]]},{"id":"3b4bb8da.ca8bd8","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","wires":[["8187ec02.edc438","e44a9744.783fc8"]]},{"id":"8187ec02.edc438","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","wires":[["b5d44440.30e84"]]},{"id":"e44a9744.783fc8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":776.8827857971191,"y":434.8826608657837,"z":"bbab5cc4.c9cbd","wires":[["62e87f0f.63e3e"]]},{"id":"62e87f0f.63e3e","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","wires":[]},{"id":"9f25a183.327f8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1358.000244140625,"y":252.8262939453125,"z":"bbab5cc4.c9cbd","wires":[["c1961812.103ba"]]},{"id":"b5d44440.30e84","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","wires":[["b63e0c35.6e5668"]]},{"id":"b63e0c35.6e5668","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","wires":[["4a9c78f7.44a98","ed07b87c.5778b8"]]},{"id":"14dce58a.e0a96a","type":"call","name":"call","xml":"<call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' >\n","comments":"","outputs":1,"x":1342,"y":194,"z":"bbab5cc4.c9cbd","wires":[[]]},{"id":"4a9c78f7.44a98","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1193,"y":194,"z":"bbab5cc4.c9cbd","wires":[["14dce58a.e0a96a"]]},{"id":"ed07b87c.5778b8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1193,"y":253,"z":"bbab5cc4.c9cbd","wires":[["9f25a183.327f8"]]}]
\ No newline at end of file
+[
+    {
+        "id": "2abb63ad.3df404", 
+        "type": "dgstart", 
+        "name": "DGSTART", 
+        "outputs": 1, 
+        "x": 97, 
+        "y": 89, 
+        "z": "bbab5cc4.c9cbd", 
+        "wires": [
+            [
+                "cec5984a.941728"
+            ]
+        ]
+    }, 
+    {
+        "id": "cec5984a.941728", 
+        "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": 283.1111488342285, 
+        "y": 193.44447135925293, 
+        "z": "bbab5cc4.c9cbd", 
+        "wires": [
+            [
+                "6f601264.f5fb8c"
+            ]
+        ]
+    }, 
+    {
+        "id": "6f601264.f5fb8c", 
+        "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", 
+        "wires": [
+            [
+                "b8bb57bd.6c8f88"
+            ]
+        ]
+    }, 
+    {
+        "id": "b8bb57bd.6c8f88", 
+        "type": "block", 
+        "name": "block : atomic", 
+        "xml": "<block atomic=\"true\">\n", 
+        "atomic": "false", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 325.7779846191406, 
+        "y": 472.1113269329071, 
+        "z": "bbab5cc4.c9cbd", 
+        "wires": [
+            [
+                "97cb17d6.992f9", 
+                "3b4bb8da.ca8bd8"
+            ]
+        ]
+    }, 
+    {
+        "id": "97cb17d6.992f9", 
+        "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", 
+        "wires": [ ]
+    }, 
+    {
+        "id": "c1961812.103ba", 
+        "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", 
+        "wires": [
+            [ ]
+        ]
+    }, 
+    {
+        "id": "3b4bb8da.ca8bd8", 
+        "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", 
+        "wires": [
+            [
+                "8187ec02.edc438", 
+                "e44a9744.783fc8"
+            ]
+        ]
+    }, 
+    {
+        "id": "8187ec02.edc438", 
+        "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", 
+        "wires": [
+            [
+                "b5d44440.30e84"
+            ]
+        ]
+    }, 
+    {
+        "id": "e44a9744.783fc8", 
+        "type": "other", 
+        "name": "other", 
+        "xml": "<outcome value='Other'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 776.8827857971191, 
+        "y": 434.8826608657837, 
+        "z": "bbab5cc4.c9cbd", 
+        "wires": [
+            [
+                "62e87f0f.63e3e"
+            ]
+        ]
+    }, 
+    {
+        "id": "62e87f0f.63e3e", 
+        "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", 
+        "wires": [ ]
+    }, 
+    {
+        "id": "9f25a183.327f8", 
+        "type": "block", 
+        "name": "block : atomic", 
+        "xml": "<block atomic=\"true\">\n", 
+        "atomic": "false", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1358.000244140625, 
+        "y": 252.8262939453125, 
+        "z": "bbab5cc4.c9cbd", 
+        "wires": [
+            [
+                "c1961812.103ba"
+            ]
+        ]
+    }, 
+    {
+        "id": "b5d44440.30e84", 
+        "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", 
+        "wires": [
+            [
+                "b63e0c35.6e5668"
+            ]
+        ]
+    }, 
+    {
+        "id": "b63e0c35.6e5668", 
+        "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", 
+        "wires": [
+            [
+                "4a9c78f7.44a98", 
+                "ed07b87c.5778b8"
+            ]
+        ]
+    }, 
+    {
+        "id": "14dce58a.e0a96a", 
+        "type": "call", 
+        "name": "call", 
+        "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' >\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1342, 
+        "y": 194, 
+        "z": "bbab5cc4.c9cbd", 
+        "wires": [
+            [ ]
+        ]
+    }, 
+    {
+        "id": "4a9c78f7.44a98", 
+        "type": "outcomeTrue", 
+        "name": "true", 
+        "xml": "<outcome value='true'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1193, 
+        "y": 194, 
+        "z": "bbab5cc4.c9cbd", 
+        "wires": [
+            [
+                "14dce58a.e0a96a"
+            ]
+        ]
+    }, 
+    {
+        "id": "ed07b87c.5778b8", 
+        "type": "outcomeFalse", 
+        "name": "false", 
+        "xml": "<outcome value='false'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1193, 
+        "y": 253, 
+        "z": "bbab5cc4.c9cbd", 
+        "wires": [
+            [
+                "9f25a183.327f8"
+            ]
+        ]
+    }
+]
\ 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 23c13fe6..0e93be66 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 +1,48 @@
-[{"id":"c4dfa871.acfb38","type":"dgstart","name":"DGSTART","outputs":1,"x":131,"y":100,"z":"b1682cba.152","wires":[["b06bc6e2.9ba258"]]},{"id":"b06bc6e2.9ba258","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":275,"y":213,"z":"b1682cba.152","wires":[["94182378.e4944"]]},{"id":"94182378.e4944","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","wires":[[]]}]
\ No newline at end of file
+[
+    {
+        "id": "c4dfa871.acfb38", 
+        "type": "dgstart", 
+        "name": "DGSTART", 
+        "outputs": 1, 
+        "x": 131, 
+        "y": 100, 
+        "z": "b1682cba.152", 
+        "wires": [
+            [
+                "b06bc6e2.9ba258"
+            ]
+        ]
+    }, 
+    {
+        "id": "b06bc6e2.9ba258", 
+        "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": 275, 
+        "y": 213, 
+        "z": "b1682cba.152", 
+        "wires": [
+            [
+                "94182378.e4944"
+            ]
+        ]
+    }, 
+    {
+        "id": "94182378.e4944", 
+        "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", 
+        "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 8f05c4a5..80c8acf5 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,20 +1,36 @@
-<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'>
-<call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' >
-</call></outcome><outcome value='false'>
-<block atomic="true">
-<call module='DataChange' rpc='esr-thirdparty-sdnc' mode='sync' >
-</call></block></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></service-logic>
\ No newline at end of file
+<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'> 
+                <call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync'></call>
+              </outcome>
+              <outcome value='false'> 
+                <block atomic="true"> 
+                  <call module='DataChange' rpc='esr-thirdparty-sdnc' mode='sync'></call>
+                </block>
+              </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>
+</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 5765a04d..52161217 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,2 +1,5 @@
-<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>
\ No newline at end of file
+<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>
\ No newline at end of file
-- 
2.16.6