From a347e10eee024991ff7c0bf7487aa9e2b78f9a84 Mon Sep 17 00:00:00 2001
From: Marcus G K Williams <marcus.williams@intel.com>
Date: Tue, 14 Nov 2017 08:48:46 -0800
Subject: Fix brg-topo DGs

1. Added get vg-mgmt-ip in brg-topo-activate
so that vg tunnel could be properple setup

2. Added get vbrg-wan-ip to brg-topo-deactivate
so that vxlan tunnels can be removed

3. Updated AA&I updates calls to include
correct brg variables for global-customer-id,
service-type and service-instance-id

Issue-Id: SDNC-195
Change-Id: I9470cd782a3bd00fa9332dd7141c28151054b75f
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>

Former-commit-id: becd9978df3428354646a48c2d106177f6477695
---
 .../main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
index c242bf07..fdd868d2 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
@@ -202,10 +202,7 @@
                         </set>
                         <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                 resource="allotted-resource"
-                                key="customer.global-customer-id = $service-data.service-information.global-customer-id AND
-			service-subscription.service-type = $service-data.service-information.subscription-service-type AND
-			service-instance.service-instance-id = $service-data.service-information.service-instance-id AND
-			allotted-resource.id = $tmp.ar.allotted-resource-id"
+                                key="customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND service-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND service-instance.service-instance-id = $brg-topology-operation-input.service-information.service-instance-id AND allotted-resource.id = $tmp.ar.allotted-resource-id"
                                 pfx='pfx' local-only='false' force='false'>
                             <parameter name="description" value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
                             <parameter name="selflink" value="`$tmp.ar.self-link`" />
-- 
cgit 1.2.3-korg