Merge "removed vnf-id validation check in DG" into casablanca

Former-commit-id: c5a26a4f748d1f03f1a23046e7d94b9027b4321d

2 files changed, 474 insertions, 455 deletions

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 ef453318..aef62059 100644
--- 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,455 +1,470 @@
-[
-  {
-    "id": "3492b641.0dfbba",
-    "type": "other",
-    "name": "update",
-    "xml": "<outcome value='Update'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 673,
-    "y": 276.6667003631592,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "f2d65f4a.d687"
-      ]
-    ]
-  },
-  {
-    "id": "668a1af1.719b34",
-    "type": "other",
-    "name": "delete",
-    "xml": "<outcome value='delete'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 709.2221145629883,
-    "y": 478.33349609375,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "3b8ddbef.903fa4"
-      ]
-    ]
-  },
-  {
-    "id": "3b8ddbef.903fa4",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 859.6667594909668,
-    "y": 473.3335485458374,
-    "z": "cbb28df7.1359",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "c0cbee48.6a5f9",
-    "type": "comment",
-    "name": "TODO: Delete topology from AAI",
-    "info": "",
-    "comments": "",
-    "x": 817.3334274291992,
-    "y": 429.0001735687256,
-    "z": "cbb28df7.1359",
-    "wires": []
-  },
-  {
-    "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": 465.5555648803711,
-    "y": 345.2222261428833,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "3492b641.0dfbba",
-        "668a1af1.719b34"
-      ]
-    ]
-  },
-  {
-    "id": "6bfaf616.869108",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1267.333755493164,
-    "y": 270.1112537384033,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "c706e157.72486",
-        "4130ca8.c1efa34"
-      ]
-    ]
-  },
-  {
-    "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.onap.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": 1523.993263244629,
-    "y": 132.0305051803589,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "fafa0167.57f14",
-        "c8836a7f.1ba7f8"
-      ]
-    ]
-  },
-  {
-    "id": "fafa0167.57f14",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1758.993263244629,
-    "y": 110.03050518035889,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "bd59ffd7.cdf9"
-      ]
-    ]
-  },
-  {
-    "id": "c8836a7f.1ba7f8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1751.243263244629,
-    "y": 163.67338848114014,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "8505bfec.1c327"
-      ]
-    ]
-  },
-  {
-    "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": 1912.993263244629,
-    "y": 111.03050518035889,
-    "z": "cbb28df7.1359",
-    "wires": []
-  },
-  {
-    "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.onap.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": 1527.3266906738281,
-    "y": 225.73424291610718,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "87479d00.dc1c9",
-        "c2d07026.26d52"
-      ]
-    ]
-  },
-  {
-    "id": "87479d00.dc1c9",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1785.882022857666,
-    "y": 203.73422479629517,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "3aa58504.f6229a"
-      ]
-    ]
-  },
-  {
-    "id": "3aa58504.f6229a",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1961.4375534057617,
-    "y": 201.40094709396362,
-    "z": "cbb28df7.1359",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "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": 1969.6598281860352,
-    "y": 275.6230607032776,
-    "z": "cbb28df7.1359",
-    "wires": []
-  },
-  {
-    "id": "c2d07026.26d52",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1791.3265075683594,
-    "y": 274.845290184021,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "dca7d6ac.f501f8"
-      ]
-    ]
-  },
-  {
-    "id": "7cae77af.f5b818",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 105.9999008178711,
-    "y": 85,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "b697d007.11e41"
-      ]
-    ]
-  },
-  {
-    "id": "b697d007.11e41",
-    "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": 244.11102676391602,
-    "y": 126.44446134567261,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "49de6de0.6f78a4"
-      ]
-    ]
-  },
-  {
-    "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": 340.5555877685547,
-    "y": 237.22224235534668,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "5f1e0612.f09808"
-      ]
-    ]
-  },
-  {
-    "id": "5f1e0612.f09808",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 248.77781677246094,
-    "y": 346.11122035980225,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "d3c03070.16287"
-      ]
-    ]
-  },
-  {
-    "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": 1459.481460571289,
-    "y": 353.2221817970276,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "5ae402a2.fe5ffc"
-      ]
-    ]
-  },
-  {
-    "id": "5ae402a2.fe5ffc",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1649.4814224243164,
-    "y": 360.9999747276306,
-    "z": "cbb28df7.1359",
-    "wires": [
-      [
-        "7d9ae4c3.21708c",
-        "f67aa4a3.311fc8"
-      ]
-    ]
-  },
-  {
-    "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": 1902.8148441314697,
-    "y": 424.33334493637085,
-    "z": "cbb28df7.1359",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "f67aa4a3.311fc8",
-    "type": "set",
-    "name": "set network",
-    "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
-    "comments": "",
-    "x": 1855.036964416504,
-    "y": 342.11108922958374,
-    "z": "cbb28df7.1359",
-    "wires": []
-  },
-  {
-    "id": "8505bfec.1c327",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1912.8146591186523,
-    "y": 158.77776765823364,
-    "z": "cbb28df7.1359",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "27eaeed1.46c512",
-    "type": "comment",
-    "name": "Do Nothing",
-    "info": "",
-    "comments": "",
-    "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": []
-  }
-]
+[

+  {

+    "id": "1d39536e.bcea8d",

+    "type": "other",

+    "name": "update",

+    "xml": "<outcome value='Update'>\n",

+    "comments": "",

+    "outputs": 1,

+    "x": 630.0000991821289,

+    "y": 392.6666978597641,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "eb33b12.26d255"

+      ]

+    ]

+  },

+  {

+    "id": "e7963432.3c05f8",

+    "type": "other",

+    "name": "delete",

+    "xml": "<outcome value='delete'>\n",

+    "comments": "",

+    "outputs": 1,

+    "x": 666.2222137451172,

+    "y": 594.3334935903549,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "bdac689.e471598"

+      ]

+    ]

+  },

+  {

+    "id": "bdac689.e471598",

+    "type": "block",

+    "name": "block : atomic",

+    "xml": "<block atomic=\"true\">",

+    "atomic": "true",

+    "outputs": 1,

+    "x": 816.6668586730957,

+    "y": 589.3335460424423,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      []

+    ]

+  },

+  {

+    "id": "27946419.4db7ac",

+    "type": "comment",

+    "name": "TODO: Delete topology from AAI",

+    "info": "",

+    "comments": "",

+    "x": 774.3335266113281,

+    "y": 545.0001710653305,

+    "z": "5f9799f8.016aa8",

+    "wires": []

+  },

+  {

+    "id": "1b12380b.1bb078",

+    "type": "switchNode",

+    "name": "switch aai-event-trigger",

+    "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",

+    "comments": "",

+    "outputs": 1,

+    "x": 422.5556640625,

+    "y": 461.2222236394882,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "1d39536e.bcea8d",

+        "e7963432.3c05f8"

+      ]

+    ]

+  },

+  {

+    "id": "8b3f9b57.fb7ca8",

+    "type": "block",

+    "name": "block : atomic",

+    "xml": "<block atomic=\"true\">",

+    "atomic": "true",

+    "outputs": 1,

+    "x": 1224.333854675293,

+    "y": 386.11125123500824,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "6bd0a191.4d206",

+        "1e8929fa.00dd96",

+        "f740e66d.fb9468"

+      ]

+    ]

+  },

+  {

+    "id": "d4ab9cef.99595",

+    "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.onap.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": 1480.9933624267578,

+    "y": 248.0305026769638,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "9a5236ed.1ea128",

+        "5a03214d.f8c65"

+      ]

+    ]

+  },

+  {

+    "id": "9a5236ed.1ea128",

+    "type": "success",

+    "name": "success",

+    "xml": "<outcome value='success'>\n",

+    "comments": "",

+    "outputs": 1,

+    "x": 1715.9933624267578,

+    "y": 226.0305026769638,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "8343226c.c2c78"

+      ]

+    ]

+  },

+  {

+    "id": "5a03214d.f8c65",

+    "type": "failure",

+    "name": "failure",

+    "xml": "<outcome value='failure'>\n",

+    "comments": "",

+    "outputs": 1,

+    "x": 1708.2433624267578,

+    "y": 279.67338597774506,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "194b3286.c3d03d"

+      ]

+    ]

+  },

+  {

+    "id": "8343226c.c2c78",

+    "type": "set",

+    "name": "set token-id",

+    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",

+    "comments": "",

+    "x": 1869.9933624267578,

+    "y": 227.0305026769638,

+    "z": "5f9799f8.016aa8",

+    "wires": []

+  },

+  {

+    "id": "6bd0a191.4d206",

+    "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.onap.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": 1484.326789855957,

+    "y": 341.7342404127121,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "7690c31d.5032fc",

+        "3ee8b658.f04c7a"

+      ]

+    ]

+  },

+  {

+    "id": "7690c31d.5032fc",

+    "type": "success",

+    "name": "success",

+    "xml": "<outcome value='success'>\n",

+    "comments": "",

+    "outputs": 1,

+    "x": 1742.882122039795,

+    "y": 319.7342222929001,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "5faa0ea5.47b54"

+      ]

+    ]

+  },

+  {

+    "id": "5faa0ea5.47b54",

+    "type": "block",

+    "name": "block : atomic",

+    "xml": "<block atomic=\"true\">",

+    "atomic": "true",

+    "comments": "",

+    "outputs": 1,

+    "x": 1918.4376525878906,

+    "y": 317.40094459056854,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      []

+    ]

+  },

+  {

+    "id": "30f38062.10fc2",

+    "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": 1926.659927368164,

+    "y": 391.6230581998825,

+    "z": "5f9799f8.016aa8",

+    "wires": []

+  },

+  {

+    "id": "3ee8b658.f04c7a",

+    "type": "failure",

+    "name": "failure",

+    "xml": "<outcome value='failure'>\n",

+    "comments": "",

+    "outputs": 1,

+    "x": 1748.3266067504883,

+    "y": 390.8452876806259,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "30f38062.10fc2"

+      ]

+    ]

+  },

+  {

+    "id": "d6f1376d.103958",

+    "type": "dgstart",

+    "name": "DGSTART",

+    "outputs": 1,

+    "x": 77,

+    "y": 168.00000381469727,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "b042ac6b.0b2f5"

+      ]

+    ]

+  },

+  {

+    "id": "b042ac6b.0b2f5",

+    "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": 201.11112594604492,

+    "y": 242.44445884227753,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "fa0cd6cd.4d3678"

+      ]

+    ]

+  },

+  {

+    "id": "fa0cd6cd.4d3678",

+    "type": "method",

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

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

+    "comments": "",

+    "outputs": 1,

+    "x": 297.5556869506836,

+    "y": 353.2222398519516,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "17dbe4b2.90a36b"

+      ]

+    ]

+  },

+  {

+    "id": "17dbe4b2.90a36b",

+    "type": "block",

+    "name": "block : atomic",

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

+    "atomic": "false",

+    "comments": "",

+    "outputs": 1,

+    "x": 205.77791595458984,

+    "y": 462.11121785640717,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "1b12380b.1bb078"

+      ]

+    ]

+  },

+  {

+    "id": "1e8929fa.00dd96",

+    "type": "for",

+    "name": "for each Network",

+    "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",

+    "comments": "",

+    "outputs": 1,

+    "x": 1416.481559753418,

+    "y": 469.2221792936325,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "7ac7e4f1.ee6b4c"

+      ]

+    ]

+  },

+  {

+    "id": "7ac7e4f1.ee6b4c",

+    "type": "block",

+    "name": "block",

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

+    "atomic": "false",

+    "comments": "",

+    "outputs": 1,

+    "x": 1606.4815216064453,

+    "y": 476.99997222423553,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "1bdd6882.262a87",

+        "73f341e0.4fb9a"

+      ]

+    ]

+  },

+  {

+    "id": "1bdd6882.262a87",

+    "type": "call",

+    "name": "call update-network-to-aai",

+    "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",

+    "comments": "",

+    "outputs": 1,

+    "x": 1859.8149433135986,

+    "y": 540.3333424329758,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      []

+    ]

+  },

+  {

+    "id": "73f341e0.4fb9a",

+    "type": "set",

+    "name": "set network",

+    "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",

+    "comments": "",

+    "x": 1812.0370635986328,

+    "y": 458.11108672618866,

+    "z": "5f9799f8.016aa8",

+    "wires": []

+  },

+  {

+    "id": "194b3286.c3d03d",

+    "type": "block",

+    "name": "block",

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

+    "atomic": "false",

+    "comments": "",

+    "outputs": 1,

+    "x": 1869.8147583007812,

+    "y": 274.77776515483856,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      []

+    ]

+  },

+  {

+    "id": "f5a2b8a2.ec17c8",

+    "type": "comment",

+    "name": "Do Nothing",

+    "info": "",

+    "comments": "",

+    "x": 2005.3703320821123,

+    "y": 273.66664090421466,

+    "z": "5f9799f8.016aa8",

+    "wires": []

+  },

+  {

+    "id": "86797eba.6e658",

+    "type": "switchNode",

+    "name": "switch type",

+    "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",

+    "comments": "",

+    "outputs": 1,

+    "x": 905.0002479553223,

+    "y": 395.00002896785736,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "5d555655.1a63b8",

+        "698c0c25.f99474"

+      ]

+    ]

+  },

+  {

+    "id": "eb33b12.26d255",

+    "type": "block",

+    "name": "block",

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

+    "atomic": "false",

+    "comments": "",

+    "outputs": 1,

+    "x": 760.0000839233398,

+    "y": 393.00001752376556,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "86797eba.6e658"

+      ]

+    ]

+  },

+  {

+    "id": "5d555655.1a63b8",

+    "type": "other",

+    "name": "SOTN",

+    "xml": "<outcome value='SOTN'>\n",

+    "comments": "",

+    "outputs": 1,

+    "x": 1059.0000305175781,

+    "y": 350.99999940395355,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "8b3f9b57.fb7ca8"

+      ]

+    ]

+  },

+  {

+    "id": "698c0c25.f99474",

+    "type": "other",

+    "name": "other",

+    "xml": "<outcome value='Other'>\n",

+    "comments": "",

+    "outputs": 1,

+    "x": 1056.0000305175781,

+    "y": 475.0000070333481,

+    "z": "5f9799f8.016aa8",

+    "wires": [

+      [

+        "8899e728.ec90b8"

+      ]

+    ]

+  },

+  {

+    "id": "8899e728.ec90b8",

+    "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": 1204.7727355957031,

+    "y": 474.4391750097275,

+    "z": "5f9799f8.016aa8",

+    "wires": []

+  },

+  {

+    "id": "f740e66d.fb9468",

+    "type": "execute",

+    "name": "execute Properties",

+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",

+    "comments": "",

+    "outputs": 1,

+    "x": 1423.03125,

+    "y": 193.03125,

+    "z": "5f9799f8.016aa8",

+    "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 dcab41bd..3382b996 100644
--- 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
@@ -9,6 +9,10 @@
                         <switch test="`$prop.sdncRestApi.type`">

                             <outcome value='SOTN'>

                                 <block atomic="true">

+                                    <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >

+                                        <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />

+                                        <parameter name='contextPrefix' value='prop' />

+                                    </execute>

                                     <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

                                         <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />

                                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />