Merge "Fix underlay DG testing issue"

Former-commit-id: 2df24096041f316a910c92e04dae8abdf2793991

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
index da6fd8d..e2ffbf7 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
@@ -1015,7 +1015,7 @@
     "id": "aeedc57a.12dee8",
     "type": "execute",
     "name": "execute requiredParameter",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"$network-topology-operation-input.network-information.network-id\" value=\"\"/>\n\n",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"network-topology-operation-input.network-information.network-id\" value=\"$network-topology-operation-input.network-information.network-id\"/>\n\n",
     "comments": "",
     "outputs": 1,
     "x": 1207,

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
index 930e277..19e6171 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
@@ -275,7 +275,7 @@
                             <outcome value="DeleteNetworkInstance">\r
                                 <block atomic="true">\r
                                     <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="requiredParameters">\r
-                                        <parameter name="$network-topology-operation-input.network-information.network-id" value="" />\r
+                                        <parameter name="network-topology-operation-input.network-information.network-id" value="$network-topology-operation-input.network-information.network-id" />\r
                                     </execute>\r
                                     <switch test="`$network-topology-operation-input.network-information.network-id`">\r
                                         <outcome value="">\r