diff options
author | 黄卓垚10112215 <huang.zhuoyao@zte.com.cn> | 2018-09-17 09:31:37 +0800 |
---|---|---|
committer | Zhuoyao Huang <10112215@zte.com.cn> | 2018-09-17 09:49:42 +0800 |
commit | cac704d8cbfad8710a32a4d589ae1c9a0b054bdd (patch) | |
tree | 6c5118889a598ebe0a995c23ba70d9d1a283689e | |
parent | 90902c4b98c58d16d8277723b69212ec8fe86afd (diff) |
zte data change process
Issue-ID: SDNC-354
Change-Id: I8a8c5047f86a726bdba6285c891ec200848a160d
Signed-off-by: Zhuoyao Huang <10112215@zte.com.cn>
Former-commit-id: 4f65afc077b3bd25a19e56be96c4aa607eee2e77
5 files changed, 25 insertions, 197 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 a68422ec..c4df22ad 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,170 +1 @@ -[
- {
- "id": "14de9b29.eb77a5",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 116.00390625,
- "y": 67.9999988079071,
- "z": "bf7c0729.dcd628",
- "wires": [
- [
- "1630f686.0be599"
- ]
- ]
- },
- {
- "id": "1630f686.0be599",
- "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": 302.1150550842285,
- "y": 172.44447016716003,
- "z": "bf7c0729.dcd628",
- "wires": [
- [
- "8b5ae719.a8f008"
- ]
- ]
- },
- {
- "id": "8b5ae719.a8f008",
- "type": "method",
- "name": "method data-change-notification",
- "xml": "<method rpc='data-change-notification' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 299.5596046447754,
- "y": 336.22225546836853,
- "z": "bf7c0729.dcd628",
- "wires": [
- [
- "d99c1956.418f78"
- ]
- ]
- },
- {
- "id": "d99c1956.418f78",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 344.7818908691406,
- "y": 451.1113257408142,
- "z": "bf7c0729.dcd628",
- "wires": [
- [
- "fa034db9.8bac4",
- "1981ae.01d4be53"
- ]
- ]
- },
- {
- "id": "fa034db9.8bac4",
- "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": 552.3377494812012,
- "y": 538.5561301708221,
- "z": "bf7c0729.dcd628",
- "wires": []
- },
- {
- "id": "560d6ca1.0b4dd4",
- "type": "call",
- "name": "call esr-thirdparty-sdnc",
- "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1316.3379707336426,
- "y": 346.66678977012634,
- "z": "bf7c0729.dcd628",
- "wires": [
- []
- ]
- },
- {
- "id": "1981ae.01d4be53",
- "type": "switchNode",
- "name": "switch aai-node-type",
- "xml": "<switch test='`$data-change-notification-input.aai-node-type`'>\n",
- "comments": "",
- "outputs": 1,
- "x": 555.8866271972656,
- "y": 414.88262701034546,
- "z": "bf7c0729.dcd628",
- "wires": [
- [
- "3eac43c0.8ab16c",
- "935a0267.cd419"
- ]
- ]
- },
- {
- "id": "3eac43c0.8ab16c",
- "type": "other",
- "name": "esr-thirdparty-sdnc",
- "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
- "comments": "",
- "outputs": 1,
- "x": 837.9185485839844,
- "y": 346.05725717544556,
- "z": "bf7c0729.dcd628",
- "wires": [
- [
- "43f3171.d9a25e8"
- ]
- ]
- },
- {
- "id": "935a0267.cd419",
- "type": "other",
- "name": "other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 795.8866920471191,
- "y": 413.8826596736908,
- "z": "bf7c0729.dcd628",
- "wires": [
- [
- "b093dd51.fe287"
- ]
- ]
- },
- {
- "id": "b093dd51.fe287",
- "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": 951.3312110900879,
- "y": 413.99375891685486,
- "z": "bf7c0729.dcd628",
- "wires": []
- },
- {
- "id": "43f3171.d9a25e8",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1040.0042114257812,
- "y": 346.8262984752655,
- "z": "bf7c0729.dcd628",
- "wires": [
- [
- "560d6ca1.0b4dd4"
- ]
- ]
- }
-]
\ 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 new file mode 100644 index 00000000..23c13fe6 --- /dev/null +++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-of-zte.json @@ -0,0 +1 @@ +[{"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/resources/graph.versions b/platform-logic/datachange/src/main/resources/graph.versions index 5c1b0889..37211fe7 100644 --- a/platform-logic/datachange/src/main/resources/graph.versions +++ b/platform-logic/datachange/src/main/resources/graph.versions @@ -1,5 +1,6 @@ DataChange data-change-notification ${project.version} sync 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 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 76f2fe89..8f05c4a5 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,27 +1,20 @@ -<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'>
- <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>
- <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 new file mode 100644 index 00000000..5765a04d --- /dev/null +++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-of-zte.xml @@ -0,0 +1,2 @@ +<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 |