From 4357f55da843dd0d454b2bda867be33d1b28160f Mon Sep 17 00:00:00 2001
From: "shashikanth.vh" <shashikanth.vh@huawei.com>
Date: Thu, 15 Nov 2018 17:48:12 +0530
Subject: [PATCH] removed vnf-id validation check in DG

1.vnf-information.vnf-id validation check should not be
  mandatory in validate-vnf-input DG, its removed.
2. added execute node to read
   generic-resource-api-dg.properties in
   esr-thirdparty-sdnc-discovery DG.

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

Former-commit-id: 2971ac518e2facd3adf50a20de155045f48a0aac
---
 .../DataChange_esr-thirdparty-sdnc-discovery.json  | 925 +++++++++++----------
 .../DataChange_esr-thirdparty-sdnc-discovery.xml   |   4 +
 .../GENERIC-RESOURCE-API_validate-vnf-input.json   | 530 +++++++++++-
 .../GENERIC-RESOURCE-API_validate-vnf-input.xml    |  11 +-
 4 files changed, 1004 insertions(+), 466 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`" />
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json
index 86c905b6..9ef063ea 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json
@@ -1 +1,529 @@
-[{"id":"582b5aa0.7eeaf4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":260,"y":410.2500066757202,"z":"348b9f74.369c5","wires":[["bd96033d.8336e","7fd8cb2f.5fa374","38370c7c.c4f0d4","d5c4e5aa.7d5948","1bbaae3f.e0d542","aa17e02a.1771"]]},{"id":"bd96033d.8336e","type":"switchNode","name":"switch svc-request-id","xml":"<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`'>\n","comments":"","outputs":1,"x":517.7619094848633,"y":368.08034229278564,"z":"348b9f74.369c5","wires":[["2f85d56c.ed707a"]]},{"id":"2f85d56c.ed707a","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":743.476203918457,"y":368.0803461074829,"z":"348b9f74.369c5","wires":[["372f23ad.72c64c"]]},{"id":"372f23ad.72c64c","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=\"sdnc-request-header.svc-request-id is a required input\" />\n","comments":"","x":894.9047698974609,"y":368.0803442001343,"z":"348b9f74.369c5","wires":[]},{"id":"7fd8cb2f.5fa374","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":506.3332726614817,"y":326.6517738614764,"z":"348b9f74.369c5","wires":[["bd1aeb1f.a739c8"]]},{"id":"bd1aeb1f.a739c8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":742.0476243155344,"y":325.22317164284846,"z":"348b9f74.369c5","wires":[["afc00ae4.9d9d18"]]},{"id":"afc00ae4.9d9d18","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=\"sdnc-request-header.svc-action is a required input\" />\n","comments":"","x":892.0475976126536,"y":325.2231811795916,"z":"348b9f74.369c5","wires":[]},{"id":"38370c7c.c4f0d4","type":"switchNode","name":"switch request-action","xml":"<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":516.3333260672434,"y":410.9374889646258,"z":"348b9f74.369c5","wires":[["be233ca5.19ebe"]]},{"id":"be233ca5.19ebe","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":743.4761995588033,"y":410.9374998637609,"z":"348b9f74.369c5","wires":[["32cbb07.e56b45"]]},{"id":"32cbb07.e56b45","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=\"request-information.request-action is a required input\" />\n","comments":"","x":894.9047655378072,"y":410.93749795641224,"z":"348b9f74.369c5","wires":[]},{"id":"68df33c4.fea8fc","type":"switchNode","name":"switch model-customization-id","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`'>\n","comments":"","outputs":1,"x":1134.7978477478027,"y":558.3662624359131,"z":"348b9f74.369c5","wires":[["10cb7b10.f12585"]]},{"id":"10cb7b10.f12585","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1339.7978477478027,"y":558.3662452697754,"z":"348b9f74.369c5","wires":[["f4a32f1c.bd90b"]]},{"id":"f4a32f1c.bd90b","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=\"vnf-information.onap-model-information.model-customization-uuid is a required input\" />\n","comments":"","x":1491.2264137268066,"y":558.3662433624268,"z":"348b9f74.369c5","wires":[]},{"id":"fe896fef.dd825","type":"switchNode","name":"switch tenant","xml":"<switch test='`$vnf-topology-operation-input.vnf-request-input.tenant`'>\n","comments":"","outputs":1,"x":1080.6549263000488,"y":599.7947731018066,"z":"348b9f74.369c5","wires":[["74a78b37.2da984"]]},{"id":"74a78b37.2da984","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1338.3692436218262,"y":599.794807434082,"z":"348b9f74.369c5","wires":[["dd5d5cef.7e70f"]]},{"id":"dd5d5cef.7e70f","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=\"vnf-information.vnf-request-input.tenant is a required input\" />\n","comments":"","x":1489.79780960083,"y":599.7948055267334,"z":"348b9f74.369c5","wires":[]},{"id":"dbb5229b.87433","type":"comment","name":"Validation of required fields","info":"","comments":"","x":666.3332824707031,"y":282.36605644226074,"z":"348b9f74.369c5","wires":[]},{"id":"d5c4e5aa.7d5948","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":500.32141876220703,"y":600.0447483062744,"z":"348b9f74.369c5","wires":[["24b1818b.56cbbe"]]},{"id":"24b1818b.56cbbe","type":"outcome","name":"assign","xml":"<outcome value='assign'>\n","comments":"","outputs":1,"x":677.4047393798828,"y":599.6280879974365,"z":"348b9f74.369c5","wires":[["a750cf34.02893"]]},{"id":"a750cf34.02893","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":874.0713500976562,"y":599.6280879974365,"z":"348b9f74.369c5","wires":[["68df33c4.fea8fc","fe896fef.dd825","26f7b426.cb378c"]]},{"id":"980060b2.05cd2","type":"dgstart","name":"DGSTART","outputs":1,"x":178.7500098092214,"y":154.9136562347412,"z":"348b9f74.369c5","wires":[["16c74c85.6dd223"]]},{"id":"16c74c85.6dd223","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","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='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":292.03571537562766,"y":195.1517677307129,"z":"348b9f74.369c5","wires":[["323a6f66.9143"]]},{"id":"323a6f66.9143","type":"method","name":"method validate-vnf-input","xml":"<method rpc='validate-vnf-input' mode='sync'>\n","comments":"","outputs":1,"x":227.42863682338157,"y":236.16365242004395,"z":"348b9f74.369c5","wires":[["582b5aa0.7eeaf4"]]},{"id":"b04d7cd7.867c8","type":"comment","name":"validate-vnf-input","info":"","comments":"","x":573.0948660714284,"y":102.5,"z":"348b9f74.369c5","wires":[]},{"id":"1bbaae3f.e0d542","type":"switchNode","name":"switch service-instance-id","xml":"<switch test='`$vnf-topology-operation-input.service-information.service-instance-id`'>\n","comments":"","outputs":1,"x":529.3571570260183,"y":455.00001525878906,"z":"348b9f74.369c5","wires":[["7c1a77b8.6014f8"]]},{"id":"7c1a77b8.6014f8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":741.7857382638113,"y":455.0000114440918,"z":"348b9f74.369c5","wires":[["3c78fe4d.85e032"]]},{"id":"3c78fe4d.85e032","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=\"service-information.service-instance-id is a required input\" />\n","comments":"","x":893.2143042428152,"y":455.00000953674316,"z":"348b9f74.369c5","wires":[]},{"id":"aa17e02a.1771","type":"switchNode","name":"switch vnf-id","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id`'>\n","comments":"","outputs":1,"x":486.8571662902832,"y":498.5000057220459,"z":"348b9f74.369c5","wires":[["fee9192a.df3c38"]]},{"id":"fee9192a.df3c38","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":742.1428756713867,"y":497.07143783569336,"z":"348b9f74.369c5","wires":[["34c1ea3e.84a8a6"]]},{"id":"34c1ea3e.84a8a6","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=\"vnf-information.vnf-id is a required input\" />\n","comments":"","x":893.5714416503906,"y":497.0714359283447,"z":"348b9f74.369c5","wires":[]},{"id":"26f7b426.cb378c","type":"switchNode","name":"switch aic-cloud-region","xml":"<switch test='`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`'>\n","comments":"","outputs":1,"x":1110.0000076293945,"y":642.0714302062988,"z":"348b9f74.369c5","wires":[["59831b6.e59aee4"]]},{"id":"59831b6.e59aee4","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1336.7143249511719,"y":642.0714645385742,"z":"348b9f74.369c5","wires":[["b0aeb3a5.71fc5"]]},{"id":"b0aeb3a5.71fc5","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=\"vnf-request-input.aic-cloud-region is a required input\" />\n","comments":"","x":1488.1428909301758,"y":642.0714626312256,"z":"348b9f74.369c5","wires":[]},{"id":"18880cde.db6723","type":"switchNode","name":"switch model-customization-id","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`'>\n","comments":"","outputs":1,"x":1105.4761505126953,"y":757.2619113922119,"z":"348b9f74.369c5","wires":[["9cbd6868.f694f8"]]},{"id":"9cbd6868.f694f8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1310.4761505126953,"y":757.2618942260742,"z":"348b9f74.369c5","wires":[["5efeb3c6.10dcbc"]]},{"id":"5efeb3c6.10dcbc","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=\"vnf-information.onap-model-information.model-customization-uuid is a required input\" />\n","comments":"","x":1461.9047164916992,"y":757.2618923187256,"z":"348b9f74.369c5","wires":[]},{"id":"8fbbcbd5.fd98c8","type":"outcome","name":"changeassign","xml":"<outcome value='changeassign'>\n","comments":"","outputs":1,"x":695.4163703918457,"y":757.1904706954956,"z":"348b9f74.369c5","wires":[["b11b3301.491e"]]},{"id":"b11b3301.491e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":875.4163589477539,"y":757.1904373168945,"z":"348b9f74.369c5","wires":[["18880cde.db6723"]]},{"id":"bdabc15d.2497b","type":"comment","name":"model-customization-uuid validation moved to changeassign DG","info":"","comments":"","x":755,"y":722.5000104904175,"z":"348b9f74.369c5","wires":[]}]
\ No newline at end of file
+[
+  {
+    "id": "76c41400.105bfc",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 215.03125,
+    "y": 380.7500047683716,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "2a2419b1.808286",
+        "63aa7131.36521",
+        "eac281c.1de128",
+        "e567acf8.fa2ee",
+        "b96ae981.783b38"
+      ]
+    ]
+  },
+  {
+    "id": "2a2419b1.808286",
+    "type": "switchNode",
+    "name": "switch svc-request-id",
+    "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 472.7931594848633,
+    "y": 338.580340385437,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "b04eadfc.363d6"
+      ]
+    ]
+  },
+  {
+    "id": "b04eadfc.363d6",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 698.507453918457,
+    "y": 338.5803442001343,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "7a089ce3.3d6db4"
+      ]
+    ]
+  },
+  {
+    "id": "7a089ce3.3d6db4",
+    "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=\"sdnc-request-header.svc-request-id is a required input\" />\n",
+    "comments": "",
+    "x": 849.9360198974609,
+    "y": 338.58034229278564,
+    "z": "62d88521.de373c",
+    "wires": []
+  },
+  {
+    "id": "63aa7131.36521",
+    "type": "switchNode",
+    "name": "switch svc-action",
+    "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 461.3645226614817,
+    "y": 297.15177195412775,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "9a54011a.7a533"
+      ]
+    ]
+  },
+  {
+    "id": "9a54011a.7a533",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 697.0788743155344,
+    "y": 295.7231697354998,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "ae9fbdb1.99d76"
+      ]
+    ]
+  },
+  {
+    "id": "ae9fbdb1.99d76",
+    "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=\"sdnc-request-header.svc-action is a required input\" />\n",
+    "comments": "",
+    "x": 847.0788476126536,
+    "y": 295.723179272243,
+    "z": "62d88521.de373c",
+    "wires": []
+  },
+  {
+    "id": "eac281c.1de128",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 471.36457606724343,
+    "y": 381.43748705727717,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "723ab622.079618"
+      ]
+    ]
+  },
+  {
+    "id": "723ab622.079618",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 698.5074495588033,
+    "y": 381.43749795641224,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "af6a2199.40114"
+      ]
+    ]
+  },
+  {
+    "id": "af6a2199.40114",
+    "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=\"request-information.request-action is a required input\" />\n",
+    "comments": "",
+    "x": 849.9360155378072,
+    "y": 381.4374960490636,
+    "z": "62d88521.de373c",
+    "wires": []
+  },
+  {
+    "id": "cb0aa11e.ba442",
+    "type": "switchNode",
+    "name": "switch model-customization-id",
+    "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1089.8290977478027,
+    "y": 528.8662605285645,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "f7d46398.5727f"
+      ]
+    ]
+  },
+  {
+    "id": "f7d46398.5727f",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1294.8290977478027,
+    "y": 528.8662433624268,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "4203f831.9a99a8"
+      ]
+    ]
+  },
+  {
+    "id": "4203f831.9a99a8",
+    "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=\"vnf-information.onap-model-information.model-customization-uuid is a required input\" />\n",
+    "comments": "",
+    "x": 1446.2576637268066,
+    "y": 528.8662414550781,
+    "z": "62d88521.de373c",
+    "wires": []
+  },
+  {
+    "id": "3314ab19.e03fa4",
+    "type": "switchNode",
+    "name": "switch tenant",
+    "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.tenant`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1035.6861763000488,
+    "y": 570.294771194458,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "8f23daeb.368758"
+      ]
+    ]
+  },
+  {
+    "id": "8f23daeb.368758",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1293.4004936218262,
+    "y": 570.2948055267334,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "d455e65.3d8f318"
+      ]
+    ]
+  },
+  {
+    "id": "d455e65.3d8f318",
+    "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=\"vnf-information.vnf-request-input.tenant is a required input\" />\n",
+    "comments": "",
+    "x": 1444.82905960083,
+    "y": 570.2948036193848,
+    "z": "62d88521.de373c",
+    "wires": []
+  },
+  {
+    "id": "b6a4138f.58b28",
+    "type": "comment",
+    "name": "Validation of required fields",
+    "info": "",
+    "comments": "",
+    "x": 621.3645324707031,
+    "y": 252.8660545349121,
+    "z": "62d88521.de373c",
+    "wires": []
+  },
+  {
+    "id": "e567acf8.fa2ee",
+    "type": "switchNode",
+    "name": "switch svc-action",
+    "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 455.35266876220703,
+    "y": 570.5447463989258,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "99eee3d5.45a48"
+      ]
+    ]
+  },
+  {
+    "id": "99eee3d5.45a48",
+    "type": "outcome",
+    "name": "assign",
+    "xml": "<outcome value='assign'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 632.4359893798828,
+    "y": 570.1280860900879,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "74f6768d.61c458"
+      ]
+    ]
+  },
+  {
+    "id": "74f6768d.61c458",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 829.1026000976562,
+    "y": 570.1280860900879,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "cb0aa11e.ba442",
+        "3314ab19.e03fa4",
+        "14a1f7ee.4225a8"
+      ]
+    ]
+  },
+  {
+    "id": "75d1af24.b59b7",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 133.7812598092214,
+    "y": 125.41365432739258,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "7a2246ee.79a8f8"
+      ]
+    ]
+  },
+  {
+    "id": "7a2246ee.79a8f8",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "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='GENERIC-RESOURCE-API' version='${project.version}'>",
+    "outputs": 1,
+    "x": 247.06696537562766,
+    "y": 165.65176582336426,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "58cd5caf.4f7f64"
+      ]
+    ]
+  },
+  {
+    "id": "58cd5caf.4f7f64",
+    "type": "method",
+    "name": "method validate-vnf-input",
+    "xml": "<method rpc='validate-vnf-input' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 182.45988682338157,
+    "y": 206.6636505126953,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "76c41400.105bfc"
+      ]
+    ]
+  },
+  {
+    "id": "4fd47656.8c48d8",
+    "type": "comment",
+    "name": "validate-vnf-input",
+    "info": "",
+    "comments": "",
+    "x": 528.1261160714284,
+    "y": 72.99999809265137,
+    "z": "62d88521.de373c",
+    "wires": []
+  },
+  {
+    "id": "b96ae981.783b38",
+    "type": "switchNode",
+    "name": "switch service-instance-id",
+    "xml": "<switch test='`$vnf-topology-operation-input.service-information.service-instance-id`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 484.3884070260183,
+    "y": 425.50001335144043,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "222c65be.19adaa"
+      ]
+    ]
+  },
+  {
+    "id": "222c65be.19adaa",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 696.8169882638113,
+    "y": 425.50000953674316,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "419149d7.f3c9e8"
+      ]
+    ]
+  },
+  {
+    "id": "419149d7.f3c9e8",
+    "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=\"service-information.service-instance-id is a required input\" />\n",
+    "comments": "",
+    "x": 848.2455542428152,
+    "y": 425.50000762939453,
+    "z": "62d88521.de373c",
+    "wires": []
+  },
+  {
+    "id": "14a1f7ee.4225a8",
+    "type": "switchNode",
+    "name": "switch aic-cloud-region",
+    "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1065.0312576293945,
+    "y": 612.5714282989502,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "34b6bd95.7d9342"
+      ]
+    ]
+  },
+  {
+    "id": "34b6bd95.7d9342",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1291.7455749511719,
+    "y": 612.5714626312256,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "2a60eee3.33bf02"
+      ]
+    ]
+  },
+  {
+    "id": "2a60eee3.33bf02",
+    "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=\"vnf-request-input.aic-cloud-region is a required input\" />\n",
+    "comments": "",
+    "x": 1443.1741409301758,
+    "y": 612.571460723877,
+    "z": "62d88521.de373c",
+    "wires": []
+  },
+  {
+    "id": "786596f7.351798",
+    "type": "switchNode",
+    "name": "switch model-customization-id",
+    "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1060.5074005126953,
+    "y": 727.7619094848633,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "47670feb.a0d52"
+      ]
+    ]
+  },
+  {
+    "id": "47670feb.a0d52",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1265.5074005126953,
+    "y": 727.7618923187256,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "57c8f1dd.5353b"
+      ]
+    ]
+  },
+  {
+    "id": "57c8f1dd.5353b",
+    "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=\"vnf-information.onap-model-information.model-customization-uuid is a required input\" />\n",
+    "comments": "",
+    "x": 1416.9359664916992,
+    "y": 727.761890411377,
+    "z": "62d88521.de373c",
+    "wires": []
+  },
+  {
+    "id": "cfe766b3.3ac5a8",
+    "type": "outcome",
+    "name": "changeassign",
+    "xml": "<outcome value='changeassign'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 650.4476203918457,
+    "y": 727.690468788147,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "43346cb0.8ff874"
+      ]
+    ]
+  },
+  {
+    "id": "43346cb0.8ff874",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 830.4476089477539,
+    "y": 727.6904354095459,
+    "z": "62d88521.de373c",
+    "wires": [
+      [
+        "786596f7.351798"
+      ]
+    ]
+  },
+  {
+    "id": "75147ce8.6bd644",
+    "type": "comment",
+    "name": "model-customization-uuid validation moved to changeassign DG",
+    "info": "",
+    "comments": "",
+    "x": 710.03125,
+    "y": 693.0000085830688,
+    "z": "62d88521.de373c",
+    "wires": []
+  }
+]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml
index bb60391c..6de5257f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml
@@ -39,15 +39,6 @@
                     </return>
                 </outcome>
             </switch>
-            <switch test='`$vnf-topology-operation-input.vnf-information.vnf-id`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="vnf-information.vnf-id is a required input" />
-                    </return>
-                </outcome>
-            </switch>
             <switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>
                 <outcome value='assign'>
                     <block atomic="true">
@@ -83,4 +74,4 @@
             </switch>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>
-- 
2.16.6