integration test issues fix for sdwan and sotn

Change-Id: I636afab9282ddae7836e0b2df7c8c984f8b77143
Issue-ID: SDNC-357
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
Former-commit-id: ec3a40e630b3a9921c6604dcc974df2da6df9a96

diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
index 426b856..ccc0c00 100644 (file)
--- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
@@ -1,246 +1,246 @@
 [
   {
-    "id": "e714f114.a841a",
+    "id": "3492b641.0dfbba",
     "type": "other",
     "name": "update",
     "xml": "<outcome value='Update'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 674.5000419616699,
-    "y": 205.66669845581055,
-    "z": "f60ccc0b.2e9e5",
+    "x": 673,
+    "y": 276.6667003631592,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "412d4a4c.5ea2f4"
+        "f2d65f4a.d687"
       ]
     ]
   },
   {
-    "id": "47ba392d.437028",
+    "id": "668a1af1.719b34",
     "type": "other",
     "name": "delete",
     "xml": "<outcome value='delete'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 702.7222175598145,
-    "y": 477.3335008621216,
-    "z": "f60ccc0b.2e9e5",
+    "x": 709.2221145629883,
+    "y": 478.33349609375,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "e84e5704.965b68"
+        "3b8ddbef.903fa4"
       ]
     ]
   },
   {
-    "id": "e84e5704.965b68",
+    "id": "3b8ddbef.903fa4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 858.1668968200684,
-    "y": 477.33352184295654,
-    "z": "f60ccc0b.2e9e5",
+    "x": 859.6667594909668,
+    "y": 473.3335485458374,
+    "z": "cbb28df7.1359",
     "wires": [
       []
     ]
   },
   {
-    "id": "5e6b6675.fc5a18",
+    "id": "c0cbee48.6a5f9",
     "type": "comment",
     "name": "TODO: Delete topology from AAI",
     "info": "",
     "comments": "",
-    "x": 782.8334770202637,
-    "y": 440.0001859664917,
-    "z": "f60ccc0b.2e9e5",
+    "x": 817.3334274291992,
+    "y": 429.0001735687256,
+    "z": "cbb28df7.1359",
     "wires": []
   },
   {
-    "id": "bf8e19f1.7f5908",
+    "id": "d3c03070.16287",
     "type": "switchNode",
     "name": "switch aai-event-trigger",
     "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 459.05566787719727,
-    "y": 344.2222309112549,
-    "z": "f60ccc0b.2e9e5",
+    "x": 465.5555648803711,
+    "y": 345.2222261428833,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "e714f114.a841a",
-        "47ba392d.437028"
+        "3492b641.0dfbba",
+        "668a1af1.719b34"
       ]
     ]
   },
   {
-    "id": "412d4a4c.5ea2f4",
+    "id": "6bfaf616.869108",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 842.8338432312012,
-    "y": 204.11124992370605,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1267.333755493164,
+    "y": 270.1112537384033,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "52b0fb73.694034",
-        "b992a9e2.abb498"
+        "c706e157.72486",
+        "4130ca8.c1efa34"
       ]
     ]
   },
   {
-    "id": "bf4a7e8b.e2772",
+    "id": "f4c114b8.d66028",
     "type": "execute",
     "name": "execute RestApiCallNode Get token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1120.4932975769043,
-    "y": 160.03050470352173,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1523.993263244629,
+    "y": 132.0305051803589,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "cbcc146a.b18a48",
-        "934e7ef4.942bd"
+        "fafa0167.57f14",
+        "c8836a7f.1ba7f8"
       ]
     ]
   },
   {
-    "id": "cbcc146a.b18a48",
+    "id": "fafa0167.57f14",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1355.4932975769043,
-    "y": 138.03050470352173,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1758.993263244629,
+    "y": 110.03050518035889,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "9ebe20af.228e5"
+        "bd59ffd7.cdf9"
       ]
     ]
   },
   {
-    "id": "934e7ef4.942bd",
+    "id": "c8836a7f.1ba7f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1347.7432975769043,
-    "y": 191.67338800430298,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1751.243263244629,
+    "y": 163.67338848114014,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "fe461c21.f9128"
+        "8505bfec.1c327"
       ]
     ]
   },
   {
-    "id": "9ebe20af.228e5",
+    "id": "bd59ffd7.cdf9",
     "type": "set",
     "name": "set token-id",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
     "comments": "",
-    "x": 1509.4932975769043,
-    "y": 139.03050470352173,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1912.993263244629,
+    "y": 111.03050518035889,
+    "z": "cbb28df7.1359",
     "wires": []
   },
   {
-    "id": "52b0fb73.694034",
+    "id": "c706e157.72486",
     "type": "execute",
     "name": "execute RestApiCallNode Get Topology",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1123.8267250061035,
-    "y": 253.73424243927002,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1527.3266906738281,
+    "y": 225.73424291610718,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "bf8dd5a2.3ec108",
-        "4e2f04da.b5496c"
+        "87479d00.dc1c9",
+        "c2d07026.26d52"
       ]
     ]
   },
   {
-    "id": "bf8dd5a2.3ec108",
+    "id": "87479d00.dc1c9",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1382.3820571899414,
-    "y": 231.734224319458,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1785.882022857666,
+    "y": 203.73422479629517,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "9692e7a9.a7ad78"
+        "3aa58504.f6229a"
       ]
     ]
   },
   {
-    "id": "9692e7a9.a7ad78",
+    "id": "3aa58504.f6229a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1557.937587738037,
-    "y": 229.40094661712646,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1961.4375534057617,
+    "y": 201.40094709396362,
+    "z": "cbb28df7.1359",
     "wires": [
       []
     ]
   },
   {
-    "id": "1548c97d.137267",
+    "id": "dca7d6ac.f501f8",
     "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=\"Error executing Create vpn rest api\" />\n",
     "comments": "",
-    "x": 1566.1598625183105,
-    "y": 303.62306022644043,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1969.6598281860352,
+    "y": 275.6230607032776,
+    "z": "cbb28df7.1359",
     "wires": []
   },
   {
-    "id": "4e2f04da.b5496c",
+    "id": "c2d07026.26d52",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1387.8265419006348,
-    "y": 302.84528970718384,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1791.3265075683594,
+    "y": 274.845290184021,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "1548c97d.137267"
+        "dca7d6ac.f501f8"
       ]
     ]
   },
   {
-    "id": "773b4a80.972f64",
+    "id": "7cae77af.f5b818",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 99.50000381469727,
-    "y": 84.00000476837158,
-    "z": "f60ccc0b.2e9e5",
+    "x": 105.9999008178711,
+    "y": 85,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "6b3bf10f.0a471"
+        "b697d007.11e41"
       ]
     ]
   },
   {
-    "id": "6b3bf10f.0a471",
+    "id": "b697d007.11e41",
     "type": "service-logic",
     "name": "DataChange ${project.version}",
     "module": "DataChange",
@@ -248,131 +248,208 @@
     "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": 237.6111297607422,
-    "y": 125.44446611404419,
-    "z": "f60ccc0b.2e9e5",
+    "x": 244.11102676391602,
+    "y": 126.44446134567261,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "34347376.ce668c"
+        "49de6de0.6f78a4"
       ]
     ]
   },
   {
-    "id": "34347376.ce668c",
+    "id": "49de6de0.6f78a4",
     "type": "method",
     "name": "method esr-thirdparty-sdnc-discovery",
     "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 334.05569076538086,
-    "y": 236.22224712371826,
-    "z": "f60ccc0b.2e9e5",
+    "x": 340.5555877685547,
+    "y": 237.22224235534668,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "1ded1b72.af18c5"
+        "5f1e0612.f09808"
       ]
     ]
   },
   {
-    "id": "1ded1b72.af18c5",
+    "id": "5f1e0612.f09808",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 242.2779197692871,
-    "y": 345.1112251281738,
-    "z": "f60ccc0b.2e9e5",
+    "x": 248.77781677246094,
+    "y": 346.11122035980225,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "bf8e19f1.7f5908"
+        "d3c03070.16287"
       ]
     ]
   },
   {
-    "id": "b992a9e2.abb498",
+    "id": "4130ca8.c1efa34",
     "type": "for",
     "name": "for each Network",
     "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1055.9814949035645,
-    "y": 381.22218132019043,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1459.481460571289,
+    "y": 353.2221817970276,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "d00ff672.d0b048"
+        "5ae402a2.fe5ffc"
       ]
     ]
   },
   {
-    "id": "d00ff672.d0b048",
+    "id": "5ae402a2.fe5ffc",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1245.9814567565918,
-    "y": 388.99997425079346,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1649.4814224243164,
+    "y": 360.9999747276306,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "ba2cdcd.67eab2",
-        "b9e492ff.96a56"
+        "7d9ae4c3.21708c",
+        "f67aa4a3.311fc8"
       ]
     ]
   },
   {
-    "id": "ba2cdcd.67eab2",
+    "id": "7d9ae4c3.21708c",
     "type": "call",
     "name": "call update-network-to-aai",
     "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1499.3148784637451,
-    "y": 452.3333444595337,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1902.8148441314697,
+    "y": 424.33334493637085,
+    "z": "cbb28df7.1359",
     "wires": [
       []
     ]
   },
   {
-    "id": "b9e492ff.96a56",
+    "id": "f67aa4a3.311fc8",
     "type": "set",
     "name": "set network",
     "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
     "comments": "",
-    "x": 1451.5369987487793,
-    "y": 370.1110887527466,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1855.036964416504,
+    "y": 342.11108922958374,
+    "z": "cbb28df7.1359",
     "wires": []
   },
   {
-    "id": "fe461c21.f9128",
+    "id": "8505bfec.1c327",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1509.3146934509277,
-    "y": 186.77776718139648,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1912.8146591186523,
+    "y": 158.77776765823364,
+    "z": "cbb28df7.1359",
     "wires": [
       []
     ]
   },
   {
-    "id": "12e3cffc.36ff4",
+    "id": "27eaeed1.46c512",
     "type": "comment",
     "name": "Do Nothing",
     "info": "",
     "comments": "",
-    "x": 1644.8702672322588,
-    "y": 185.66664293077258,
-    "z": "f60ccc0b.2e9e5",
+    "x": 2048.3702328999834,
+    "y": 157.66664340760974,
+    "z": "cbb28df7.1359",
+    "wires": []
+  },
+  {
+    "id": "416dcc31.e9a444",
+    "type": "switchNode",
+    "name": "switch type",
+    "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 948.0001487731934,
+    "y": 279.00003147125244,
+    "z": "cbb28df7.1359",
+    "wires": [
+      [
+        "7de88c94.fa0ca4",
+        "8ee217f7.3b1bd8"
+      ]
+    ]
+  },
+  {
+    "id": "f2d65f4a.d687",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 802.9999847412109,
+    "y": 277.00002002716064,
+    "z": "cbb28df7.1359",
+    "wires": [
+      [
+        "416dcc31.e9a444"
+      ]
+    ]
+  },
+  {
+    "id": "7de88c94.fa0ca4",
+    "type": "other",
+    "name": "SOTN",
+    "xml": "<outcome value='SOTN'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1101.9999313354492,
+    "y": 235.00000190734863,
+    "z": "cbb28df7.1359",
+    "wires": [
+      [
+        "6bfaf616.869108"
+      ]
+    ]
+  },
+  {
+    "id": "8ee217f7.3b1bd8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1098.9999313354492,
+    "y": 359.00000953674316,
+    "z": "cbb28df7.1359",
+    "wires": [
+      [
+        "c0794a5f.727638"
+      ]
+    ]
+  },
+  {
+    "id": "c0794a5f.727638",
+    "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=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",
+    "comments": "",
+    "x": 1247.7726364135742,
+    "y": 358.43917751312256,
+    "z": "cbb28df7.1359",
     "wires": []
   }
 ]

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 94cd265..2f759b4 100644 (file)
--- 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,20 +1,20 @@
 [
   {
-    "id": "3645100d.93b1e",
+    "id": "49a378ca.1b3478",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 131,
-    "y": 57,
-    "z": "f5f8cf31.a0ec1",
+    "x": 121,
+    "y": 56,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "a67dda3b.aa6388"
+        "b3ec7247.15b52"
       ]
     ]
   },
   {
-    "id": "a67dda3b.aa6388",
+    "id": "b3ec7247.15b52",
     "type": "service-logic",
     "name": "DataChange ${project.version}",
     "module": "DataChange",
@@ -22,343 +22,431 @@
     "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",
+    "x": 307.1111488342285,
+    "y": 160.44447135925293,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "fc54766d.ffb9e8"
+        "7535c6a7.f3b5e8"
       ]
     ]
   },
   {
-    "id": "fc54766d.ffb9e8",
+    "id": "7535c6a7.f3b5e8",
     "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",
+    "x": 304.5556983947754,
+    "y": 324.2222566604614,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "e6c2b0ea.17014"
+        "1400578.235a6a9"
       ]
     ]
   },
   {
-    "id": "e6c2b0ea.17014",
+    "id": "1400578.235a6a9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 269.7779655456543,
-    "y": 460.1113119125366,
-    "z": "f5f8cf31.a0ec1",
+    "x": 259.7779655456543,
+    "y": 459.1113119125366,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "9897db0a.e34dc8",
-        "9787862d.18f5b8",
-        "195661d4.a9c59e",
-        "8e1fe65e.d69f18"
+        "25a04fbf.4bd09",
+        "8d1e2cc2.dc3cf",
+        "2d8a913.fdd0d6e",
+        "77f3068a.362d28"
       ]
     ]
   },
   {
-    "id": "195661d4.a9c59e",
+    "id": "2d8a913.fdd0d6e",
     "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",
+    "x": 549,
+    "y": 530,
+    "z": "cbb28df7.1359",
     "wires": [
       []
     ]
   },
   {
-    "id": "9897db0a.e34dc8",
+    "id": "25a04fbf.4bd09",
     "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",
+    "x": 662.7776336669922,
+    "y": 392.9998035430908,
+    "z": "cbb28df7.1359",
     "wires": [
       []
     ]
   },
   {
-    "id": "9787862d.18f5b8",
+    "id": "8d1e2cc2.dc3cf",
     "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",
+    "x": 597.4441070556641,
+    "y": 475.19078826904297,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "64de51c2.171a2"
+        "8470a3b8.c68bb"
       ]
     ]
   },
   {
-    "id": "64de51c2.171a2",
+    "id": "8470a3b8.c68bb",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 779.3335723876953,
-    "y": 475.4130334854126,
-    "z": "f5f8cf31.a0ec1",
+    "x": 769.3335723876953,
+    "y": 474.4130334854126,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "6c37c93a.5a9338",
-        "f8e49db.93b206",
-        "b38e3659.a3e968",
-        "abe36d34.993f2",
-        "ab9e3d95.0ab8"
+        "2e5df795.078a08",
+        "6a42fb20.98a2b4",
+        "554fdd88.9dce84",
+        "a2362617.a38ac8",
+        "bbbe7cd.1d5138",
+        "2a8b4597.cff4ba",
+        "884a9190.06299"
       ]
     ]
   },
   {
-    "id": "6c37c93a.5a9338",
+    "id": "2e5df795.078a08",
     "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",
+    "x": 981.5552749633789,
+    "y": 384.5241861343384,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "ef74e18a.347bb"
+        "1b6eea6.229c916"
       ]
     ]
   },
   {
-    "id": "ef74e18a.347bb",
+    "id": "1b6eea6.229c916",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1155.5553970336914,
-    "y": 384.5554189682007,
-    "z": "f5f8cf31.a0ec1",
+    "x": 1145.5553970336914,
+    "y": 383.5554189682007,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "ce02826f.96607"
+        "fd22b9a9.c98888"
       ]
     ]
   },
   {
-    "id": "ce02826f.96607",
+    "id": "fd22b9a9.c98888",
     "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",
+    "x": 1299.5554885864258,
+    "y": 383.1554126739502,
+    "z": "cbb28df7.1359",
     "wires": []
   },
   {
-    "id": "f8e49db.93b206",
+    "id": "6a42fb20.98a2b4",
     "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",
+    "x": 978.8450202941895,
+    "y": 453.7712459564209,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "b1f04d56.2de33"
+        "7cf30c0f.3d4904"
       ]
     ]
   },
   {
-    "id": "b1f04d56.2de33",
+    "id": "7cf30c0f.3d4904",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1157.8450088500977,
-    "y": 452.8024892807007,
-    "z": "f5f8cf31.a0ec1",
+    "x": 1147.8450088500977,
+    "y": 451.8024892807007,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "393fe106.5ce84e"
+        "9353bb00.5c78e8"
       ]
     ]
   },
   {
-    "id": "393fe106.5ce84e",
+    "id": "9353bb00.5c78e8",
     "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",
+    "x": 1283.8451614379883,
+    "y": 451.40248012542725,
+    "z": "cbb28df7.1359",
     "wires": []
   },
   {
-    "id": "b38e3659.a3e968",
+    "id": "554fdd88.9dce84",
     "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",
+    "x": 976.6228523254395,
+    "y": 519.3267955780029,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "31f8b0b.92d9a5"
+        "a74025be.af1718"
       ]
     ]
   },
   {
-    "id": "31f8b0b.92d9a5",
+    "id": "a74025be.af1718",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1158.6228103637695,
-    "y": 520.3580408096313,
-    "z": "f5f8cf31.a0ec1",
+    "x": 1148.6228103637695,
+    "y": 519.3580408096313,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "4275b621.ba48f8"
+        "dba0cf08.2438c"
       ]
     ]
   },
   {
-    "id": "4275b621.ba48f8",
+    "id": "dba0cf08.2438c",
     "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",
+    "x": 1303.6230545043945,
+    "y": 517.9580202102661,
+    "z": "cbb28df7.1359",
     "wires": []
   },
   {
-    "id": "8e1fe65e.d69f18",
+    "id": "77f3068a.362d28",
     "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",
+    "x": 620.4377593994141,
+    "y": 601.5490007400513,
+    "z": "cbb28df7.1359",
     "wires": [
       []
     ]
   },
   {
-    "id": "abe36d34.993f2",
+    "id": "a2362617.a38ac8",
     "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",
+    "x": 998.4441528320312,
+    "y": 573.3331909179688,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "c47d5b3c.ec2b98"
+        "5cab102b.8494d"
       ]
     ]
   },
   {
-    "id": "c47d5b3c.ec2b98",
+    "id": "5cab102b.8494d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1183.4441375732422,
-    "y": 572.3643522262573,
-    "z": "f5f8cf31.a0ec1",
+    "x": 1173.4441375732422,
+    "y": 571.3643522262573,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "b46d33d6.3f8df"
+        "71f47e13.cb288"
       ]
     ]
   },
   {
-    "id": "b46d33d6.3f8df",
+    "id": "71f47e13.cb288",
     "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",
+    "x": 1339.444107055664,
+    "y": 572.964376449585,
+    "z": "cbb28df7.1359",
     "wires": []
   },
   {
-    "id": "ab9e3d95.0ab8",
+    "id": "bbbe7cd.1d5138",
     "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",
+    "x": 993,
+    "y": 618,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "6a0992e2.98429c"
+        "750fb82f.3c8b28"
       ]
     ]
   },
   {
-    "id": "6a0992e2.98429c",
+    "id": "750fb82f.3c8b28",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1177.999984741211,
-    "y": 617.0311613082886,
-    "z": "f5f8cf31.a0ec1",
+    "x": 1167.999984741211,
+    "y": 616.0311613082886,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "75b4346a.e3888c"
+        "6331f258.3f8f8c"
       ]
     ]
   },
   {
-    "id": "75b4346a.e3888c",
+    "id": "6331f258.3f8f8c",
     "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",
+    "x": 1333.9999542236328,
+    "y": 617.6311855316162,
+    "z": "cbb28df7.1359",
+    "wires": []
+  },
+  {
+    "id": "2a8b4597.cff4ba",
+    "type": "switchNode",
+    "name": "switch type",
+    "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'type'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 943.0000305175781,
+    "y": 667.0000200271606,
+    "z": "cbb28df7.1359",
+    "wires": [
+      [
+        "cc8e7403.36ff88"
+      ]
+    ]
+  },
+  {
+    "id": "cc8e7403.36ff88",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1088.0000343322754,
+    "y": 666.0311889648438,
+    "z": "cbb28df7.1359",
+    "wires": [
+      [
+        "d672d4f.959ba28"
+      ]
+    ]
+  },
+  {
+    "id": "d672d4f.959ba28",
+    "type": "set",
+    "name": "set type",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.type' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+    "comments": "",
+    "x": 1220.0000381469727,
+    "y": 665.6312046051025,
+    "z": "cbb28df7.1359",
+    "wires": []
+  },
+  {
+    "id": "884a9190.06299",
+    "type": "switchNode",
+    "name": "switch vendor",
+    "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'vendor'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 944.0000267028809,
+    "y": 723.0000219345093,
+    "z": "cbb28df7.1359",
+    "wires": [
+      [
+        "874c4c0f.cf42b"
+      ]
+    ]
+  },
+  {
+    "id": "874c4c0f.cf42b",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1089.0000305175781,
+    "y": 722.0311908721924,
+    "z": "cbb28df7.1359",
+    "wires": [
+      [
+        "84239301.8f5d"
+      ]
+    ]
+  },
+  {
+    "id": "84239301.8f5d",
+    "type": "set",
+    "name": "set vendor",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.vendor' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+    "comments": "",
+    "x": 1221.0000343322754,
+    "y": 721.6312065124512,
+    "z": "cbb28df7.1359",
     "wires": []
   }
 ]

diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
index 3f2dc89..55c1bd3 100644 (file)
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
@@ -5,38 +5,51 @@
         <block atomic="true">\r
             <switch test="`$data-change-notification-input.aai-event-trigger`">\r
                 <outcome value='Update'>\r
-                    <block atomic="true">\r
-                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />\r
-                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
-                            <parameter name="format" value="json"/>\r
-                            <parameter name="httpMethod" value="get"/>\r
-                            <parameter name="responsePrefix" value="topology"/>\r
-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>\r
-                            <parameter name="trustStorePassword" value="adminadmin"/>\r
-                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                            <parameter name="keyStorePassword" value="adminadmin"/>\r
-                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                            <outcome value='success'>\r
-                                <block atomic="true"></block>\r
+                    <block>\r
+                        <switch test="`$prop.sdncRestApi.type`">\r
+                            <outcome value='SOTN'>\r
+                                <block atomic="true">\r
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />\r
+                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
+                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                                        <parameter name="format" value="json"/>\r
+                                        <parameter name="httpMethod" value="get"/>\r
+                                        <parameter name="responsePrefix" value="topology"/>\r
+                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>\r
+                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                                        <outcome value='success'>\r
+                                            <block atomic="true"></block>\r
+                                        </outcome>\r
+                                        <outcome value='failure'>\r
+                                            <return status='failure'>\r
+                                                <parameter name='ack-final' value='Y'/>\r
+                                                <parameter name="error-code" value="500" />\r
+                                                <parameter name="error-message" value="Error executing Create vpn rest api" />\r
+                                            </return>\r
+                                        </outcome>\r
+                                    </execute>\r
+                                    <for index='nidx' start='0' end='`$topology.networks.network_length`' >\r
+                                        <block>\r
+                                            <set>\r
+                                                <parameter name='network.' value='`$topology.networks.network[$nidx].`' />\r
+                                            </set>\r
+                                            <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>\r
+                                        </block>\r
+                                    </for>\r
+                                </block>\r
                             </outcome>\r
-                            <outcome value='failure'>\r
+                            <outcome value='Other'>\r
                                 <return status='failure'>\r
                                     <parameter name='ack-final' value='Y'/>\r
                                     <parameter name="error-code" value="500" />\r
-                                    <parameter name="error-message" value="Error executing Create vpn rest api" />\r
+                                    <parameter name="error-message" value="`'Unsupported type = ' + $prop.sdncRestApi.type`" />\r
                                 </return>\r
                             </outcome>\r
-                        </execute>\r
-                        <for index='nidx' start='0' end='`$topology.networks.network_length`' >\r
-                            <block>\r
-                                <set>\r
-                                    <parameter name='network.' value='`$topology.networks.network[$nidx].`' />\r
-                                </set>\r
-                                <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>\r
-                            </block>\r
-                        </for>\r
+                        </switch>\r
                     </block>\r
                 </outcome>\r
                 <outcome value='delete'>\r

diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
index edce7fb..c2e75d2 100644 (file)
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
@@ -41,6 +41,20 @@
                             </set>\r
                         </outcome>\r
                     </switch>\r
+                    <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'type'`">\r
+                        <outcome value='true'>\r
+                            <set>\r
+                                <parameter name='prop.sdncRestApi.type' value='`$data-change-notification-input.key-data[$idx].key-value`' />\r
+                            </set>\r
+                        </outcome>\r
+                    </switch>\r
+                    <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'vendor'`">\r
+                        <outcome value='true'>\r
+                            <set>\r
+                                <parameter name='prop.sdncRestApi.vendor' value='`$data-change-notification-input.key-data[$idx].key-value`' />\r
+                            </set>\r
+                        </outcome>\r
+                    </switch>\r
                 </block>\r
             </for>\r
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r