From ab65c8a4bdaaa59a7bcf2b587839fc95f720f0ad Mon Sep 17 00:00:00 2001
From: "shashikanth.vh" <shashikanth.vh@huawei.com>
Date: Mon, 30 Oct 2017 20:16:34 +0530
Subject: [PATCH] Fix Overlay DG testing issue

While getting record from AAI for l3-network, key used is
esr-thirdparty-sdnc.thirdparty-sdnc-id instead of l3-network.network-name
https://jira.onap.org/browse/SDNC-155

Issue-Id: SDNC-155
Change-Id: I47fcd19111f5fa4c32d464409c28b52599116e7c
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
---
 ...RESOURCE-API_dci-connects-network-topology-operation-activate.json | 4 ++--
 ...-RESOURCE-API_dci-connects-network-topology-operation-activate.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
index dfdf0b41..635773b0 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
@@ -1797,7 +1797,7 @@
     "id": "fc475635.0ecc7",
     "type": "get-resource",
     "name": "get-resource l3-network",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"l3-network\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.dci-connects.local_networks[$idx] AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.l3-network' local-only='false' >\n",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $tmp.dci-connects.local_networks[$idx] AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.l3-network' local-only='false' >\n",
     "comments": "",
     "outputs": 1,
     "x": 3475.500030517578,
@@ -2029,7 +2029,7 @@
     "id": "5d5e8ee8.e594e8",
     "type": "get-resource",
     "name": "get-resource l3-network",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"l3-network\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.dci-connects.local_networks[$idx] AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.l3-network' local-only='false' >\n",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $tmp.dci-connects.local_networks[$idx] AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.l3-network' local-only='false' >\n",
     "comments": "",
     "outputs": 1,
     "x": 3506,
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
index 4dba808f..7f4eb8ff 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
@@ -40,7 +40,7 @@
                                             <parameter name="ctx_memory_result_key" value="tmp.dci-connects.local_networks" />
                                             <outcome value="success">
                                                 <for index="idx" start="0" end="`$tmp.dci-connects.local_networks_length`">
-                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="l3-network" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.dci-connects.local_networks[$idx] AND         depth = '0'" pfx="tmp.aai.l3-network" local-only="false">
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="l3-network" key="l3-network.network-name = $tmp.dci-connects.local_networks[$idx] AND         depth = '0'" pfx="tmp.aai.l3-network" local-only="false">
                                                         <outcome value="success">
                                                             <set>
                                                                 <parameter name="prop.dci-connects.local_networks[$idx]" value="`$tmp.aai.l3-network.network-id`" />
@@ -244,7 +244,7 @@
                                             <parameter name="ctx_memory_result_key" value="tmp.dci-connects.local_networks" />
                                             <outcome value="success">
                                                 <for index="idx" start="0" end="`$tmp.dci-connects.local_networks_length`">
-                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="l3-network" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.dci-connects.local_networks[$idx] AND         depth = '0'" pfx="tmp.aai.l3-network" local-only="false">
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="l3-network" key="l3-network.network-name = $tmp.dci-connects.local_networks[$idx] AND         depth = '0'" pfx="tmp.aai.l3-network" local-only="false">
                                                         <outcome value="success">
                                                             <set>
                                                                 <parameter name="prop.dci-connects.local_networks[$idx]" value="`$tmp.aai.l3-network.network-id`" />
-- 
2.16.6