From: shashikanth.vh <shashikanth.vh@huawei.com>
Date: Fri, 10 Nov 2017 05:24:17 +0000 (+0530)
Subject: Fix underlay DG testing issue
X-Git-Tag: v1.2.1~20^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=fbf3b7ffeb1fb45090a16a411240aa01fce0a851

Fix underlay DG testing issue

Fixed passing value to method requiredParameters, $network-topology
-operation-input.network-information.network-id was not passed in.
https://jira.onap.org/browse/SDNC-185

Issue-Id: SDNC-185
Change-Id: I6efabe6bdbb63de0e807490513c3a2a8cb9b1e34
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

Former-commit-id: 2baf4e3afe24ea1aaf7e24a88eab349ac67ee207
---

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 da6fd8d3..e2ffbf73 100644
--- 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 930e2773..19e61710 100644
--- 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">
                                 <block atomic="true">
                                     <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="requiredParameters">
-                                        <parameter name="$network-topology-operation-input.network-information.network-id" value="" />
+                                        <parameter name="network-topology-operation-input.network-information.network-id" value="$network-topology-operation-input.network-information.network-id" />
                                     </execute>
                                     <switch test="`$network-topology-operation-input.network-information.network-id`">
                                         <outcome value="">