From: Marcus Williams <marcus.williams@intel.com>
Date: Fri, 10 Nov 2017 16:15:18 +0000 (+0000)
Subject: Merge "Fix underlay DG testing issue"
X-Git-Tag: v1.2.1~20
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f5bd4b3cdc3c129e5263e51b6e2d18bf8fbc3399;hp=08cfcb2f74bcebdf714f6e47a72814234a27a195;p=sdnc%2Foam.git

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 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="">