integration test issues fix for sdwan and sotn

Change-Id: I406550404f0cfb661d6e480cf1df48d39fad06e7
Issue-ID: SDNC-357
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

Former-commit-id: 3e4fa46160a5d6d52bb7eccf08dbb790d96a4682

1 files changed, 364 insertions, 320 deletions

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 5c40ac4c..94cd2655 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,320 +1,364 @@
-[

-    {

-        "id": "d0fde8b6.3aa408",

-        "type": "dgstart",

-        "name": "DGSTART",

-        "outputs": 1,

-        "x": 114.00390625,

-        "y": 42.00390625,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            [

-                "4796011e.231d3"

-            ]

-        ]

-    },

-    {

-        "id": "4796011e.231d3",

-        "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": 300.1150550842285,

-        "y": 146.44837760925293,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            [

-                "83e631da.db4b1"

-            ]

-        ]

-    },

-    {

-        "id": "83e631da.db4b1",

-        "type": "method",

-        "name": "method esr-thirdparty-sdnc",

-        "xml": "<method rpc='esr-thirdparty-sdnc' mode='sync'>\n",

-        "comments": "",

-        "outputs": 1,

-        "x": 297.5596046447754,

-        "y": 310.2261629104614,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            [

-                "2d86f41b.00eefc"

-            ]

-        ]

-    },

-    {

-        "id": "2d86f41b.00eefc",

-        "type": "block",

-        "name": "block : atomic",

-        "xml": "<block atomic=\"true\">\n",

-        "atomic": "false",

-        "comments": "",

-        "outputs": 1,

-        "x": 252.7818717956543,

-        "y": 445.1152181625366,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            [

-                "1ccf3882.d71c77",

-                "41fd63bc.2e97bc",

-                "ba86cde8.fb9f3",

-                "b799af7a.5b9c9"

-            ]

-        ]

-    },

-    {

-        "id": "ba86cde8.fb9f3",

-        "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": 542.00390625,

-        "y": 516.00390625,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            []

-        ]

-    },

-    {

-        "id": "1ccf3882.d71c77",

-        "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": 655.7815399169922,

-        "y": 379.0037097930908,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            []

-        ]

-    },

-    {

-        "id": "41fd63bc.2e97bc",

-        "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": 590.4480133056641,

-        "y": 461.19469451904297,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            [

-                "b1d2d6de.13b948"

-            ]

-        ]

-    },

-    {

-        "id": "b1d2d6de.13b948",

-        "type": "block",

-        "name": "block",

-        "xml": "<block>\n",

-        "atomic": "false",

-        "comments": "",

-        "outputs": 1,

-        "x": 762.3374786376953,

-        "y": 460.4169397354126,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            [

-                "1ad86336.4ad5cd",

-                "fa2d7e75.6219e",

-                "5d462805.1bcf28",

-                "44977471.592c0c"

-            ]

-        ]

-    },

-    {

-        "id": "1ad86336.4ad5cd",

-        "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": 974.5591812133789,

-        "y": 370.5280923843384,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            [

-                "49195641.421748"

-            ]

-        ]

-    },

-    {

-        "id": "49195641.421748",

-        "type": "outcomeTrue",

-        "name": "true",

-        "xml": "<outcome value='true'>\n",

-        "comments": "",

-        "outputs": 1,

-        "x": 1138.5593032836914,

-        "y": 369.5593252182007,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            [

-                "68e2f0ac.a4549"

-            ]

-        ]

-    },

-    {

-        "id": "68e2f0ac.a4549",

-        "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": 1292.5593948364258,

-        "y": 369.1593189239502,

-        "z": "57a3a26d.f7d23c",

-        "wires": []

-    },

-    {

-        "id": "fa2d7e75.6219e",

-        "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": 971.8489265441895,

-        "y": 439.7751522064209,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            [

-                "4a967272.ac408c"

-            ]

-        ]

-    },

-    {

-        "id": "4a967272.ac408c",

-        "type": "outcomeTrue",

-        "name": "true",

-        "xml": "<outcome value='true'>\n",

-        "comments": "",

-        "outputs": 1,

-        "x": 1140.8489151000977,

-        "y": 437.8063955307007,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            [

-                "a97aae71.052dc"

-            ]

-        ]

-    },

-    {

-        "id": "a97aae71.052dc",

-        "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": 1276.8490676879883,

-        "y": 437.40638637542725,

-        "z": "57a3a26d.f7d23c",

-        "wires": []

-    },

-    {

-        "id": "5d462805.1bcf28",

-        "type": "switchNode",

-        "name": "switch password",

-        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'password'`\">\n",

-        "comments": "",

-        "outputs": 1,

-        "x": 969.6267585754395,

-        "y": 505.33070182800293,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            [

-                "aa2c8a18.06def8"

-            ]

-        ]

-    },

-    {

-        "id": "aa2c8a18.06def8",

-        "type": "outcomeTrue",

-        "name": "true",

-        "xml": "<outcome value='true'>\n",

-        "comments": "",

-        "outputs": 1,

-        "x": 1141.6267166137695,

-        "y": 505.36194705963135,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            [

-                "ae62fe3a.d8789"

-            ]

-        ]

-    },

-    {

-        "id": "ae62fe3a.d8789",

-        "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": 1296.6269607543945,

-        "y": 503.9619264602661,

-        "z": "57a3a26d.f7d23c",

-        "wires": []

-    },

-    {

-        "id": "b799af7a.5b9c9",

-        "type": "call",

-        "name": "call esr-thirdparty-sdnc-discovery",

-        "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-discovery' mode='sync' >\n",

-        "comments": "",

-        "outputs": 1,

-        "x": 613.4416656494141,

-        "y": 587.5529069900513,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            []

-        ]

-    },

-    {

-        "id": "44977471.592c0c",

-        "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": 991.4480667114258,

-        "y": 559.3370685577393,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            [

-                "e1fdba16.c57aa8"

-            ]

-        ]

-    },

-    {

-        "id": "e1fdba16.c57aa8",

-        "type": "outcomeTrue",

-        "name": "true",

-        "xml": "<outcome value='true'>\n",

-        "comments": "",

-        "outputs": 1,

-        "x": 1166.4480438232422,

-        "y": 557.3682584762573,

-        "z": "57a3a26d.f7d23c",

-        "wires": [

-            [

-                "3f219327.b83efc"

-            ]

-        ]

-    },

-    {

-        "id": "3f219327.b83efc",

-        "type": "set",

-        "name": "set esr-system-info-id",

-        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",

-        "comments": "",

-        "x": 1332.448013305664,

-        "y": 558.968282699585,

-        "z": "57a3a26d.f7d23c",

-        "wires": []

-    }

-]
\ No newline at end of file
+[
+  {
+    "id": "3645100d.93b1e",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 131,
+    "y": 57,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      [
+        "a67dda3b.aa6388"
+      ]
+    ]
+  },
+  {
+    "id": "a67dda3b.aa6388",
+    "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": 317.1111488342285,
+    "y": 161.44447135925293,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      [
+        "fc54766d.ffb9e8"
+      ]
+    ]
+  },
+  {
+    "id": "fc54766d.ffb9e8",
+    "type": "method",
+    "name": "method esr-thirdparty-sdnc",
+    "xml": "<method rpc='esr-thirdparty-sdnc' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 314.5556983947754,
+    "y": 325.2222566604614,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      [
+        "e6c2b0ea.17014"
+      ]
+    ]
+  },
+  {
+    "id": "e6c2b0ea.17014",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 269.7779655456543,
+    "y": 460.1113119125366,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      [
+        "9897db0a.e34dc8",
+        "9787862d.18f5b8",
+        "195661d4.a9c59e",
+        "8e1fe65e.d69f18"
+      ]
+    ]
+  },
+  {
+    "id": "195661d4.a9c59e",
+    "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": 559,
+    "y": 531,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "9897db0a.e34dc8",
+    "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": 672.7776336669922,
+    "y": 393.9998035430908,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "9787862d.18f5b8",
+    "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": 607.4441070556641,
+    "y": 476.19078826904297,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      [
+        "64de51c2.171a2"
+      ]
+    ]
+  },
+  {
+    "id": "64de51c2.171a2",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 779.3335723876953,
+    "y": 475.4130334854126,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      [
+        "6c37c93a.5a9338",
+        "f8e49db.93b206",
+        "b38e3659.a3e968",
+        "abe36d34.993f2",
+        "ab9e3d95.0ab8"
+      ]
+    ]
+  },
+  {
+    "id": "6c37c93a.5a9338",
+    "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": 991.5552749633789,
+    "y": 385.5241861343384,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      [
+        "ef74e18a.347bb"
+      ]
+    ]
+  },
+  {
+    "id": "ef74e18a.347bb",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1155.5553970336914,
+    "y": 384.5554189682007,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      [
+        "ce02826f.96607"
+      ]
+    ]
+  },
+  {
+    "id": "ce02826f.96607",
+    "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": 1309.5554885864258,
+    "y": 384.1554126739502,
+    "z": "f5f8cf31.a0ec1",
+    "wires": []
+  },
+  {
+    "id": "f8e49db.93b206",
+    "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": 988.8450202941895,
+    "y": 454.7712459564209,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      [
+        "b1f04d56.2de33"
+      ]
+    ]
+  },
+  {
+    "id": "b1f04d56.2de33",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1157.8450088500977,
+    "y": 452.8024892807007,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      [
+        "393fe106.5ce84e"
+      ]
+    ]
+  },
+  {
+    "id": "393fe106.5ce84e",
+    "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": 1293.8451614379883,
+    "y": 452.40248012542725,
+    "z": "f5f8cf31.a0ec1",
+    "wires": []
+  },
+  {
+    "id": "b38e3659.a3e968",
+    "type": "switchNode",
+    "name": "switch password",
+    "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'password'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 986.6228523254395,
+    "y": 520.3267955780029,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      [
+        "31f8b0b.92d9a5"
+      ]
+    ]
+  },
+  {
+    "id": "31f8b0b.92d9a5",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1158.6228103637695,
+    "y": 520.3580408096313,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      [
+        "4275b621.ba48f8"
+      ]
+    ]
+  },
+  {
+    "id": "4275b621.ba48f8",
+    "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": 1313.6230545043945,
+    "y": 518.9580202102661,
+    "z": "f5f8cf31.a0ec1",
+    "wires": []
+  },
+  {
+    "id": "8e1fe65e.d69f18",
+    "type": "call",
+    "name": "call esr-thirdparty-sdnc-discovery",
+    "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-discovery' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 630.4377593994141,
+    "y": 602.5490007400513,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "abe36d34.993f2",
+    "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": 1008.4441528320312,
+    "y": 574.3331909179688,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      [
+        "c47d5b3c.ec2b98"
+      ]
+    ]
+  },
+  {
+    "id": "c47d5b3c.ec2b98",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1183.4441375732422,
+    "y": 572.3643522262573,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      [
+        "b46d33d6.3f8df"
+      ]
+    ]
+  },
+  {
+    "id": "b46d33d6.3f8df",
+    "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": 1349.444107055664,
+    "y": 573.964376449585,
+    "z": "f5f8cf31.a0ec1",
+    "wires": []
+  },
+  {
+    "id": "ab9e3d95.0ab8",
+    "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": 1003,
+    "y": 619,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      [
+        "6a0992e2.98429c"
+      ]
+    ]
+  },
+  {
+    "id": "6a0992e2.98429c",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1177.999984741211,
+    "y": 617.0311613082886,
+    "z": "f5f8cf31.a0ec1",
+    "wires": [
+      [
+        "75b4346a.e3888c"
+      ]
+    ]
+  },
+  {
+    "id": "75b4346a.e3888c",
+    "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": 1343.9999542236328,
+    "y": 618.6311855316162,
+    "z": "f5f8cf31.a0ec1",
+    "wires": []
+  }
+]