From 104aefb5d0fce75ee5c5ec4f4de1a6954925b5b6 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Sat, 11 Nov 2017 14:21:10 -0500
Subject: Query AAI for ARs on delete

Delete-vcpe code expected allotted-resources to be included within the
SI response from AAI.  That turns out not to be the case.  As a result,
the code for delete-vcpe was modified to query each AR found in the SI
to get it's full info.

Change-Id: I893fb2fcf50a32335bbd68d1aaa84c8d747b14f0
Issue-Id: SO-325
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 .../DeleteVcpeResCustService/serviceToDelete.xml   | 36 ++++++++++------------
 1 file changed, 17 insertions(+), 19 deletions(-)

(limited to 'bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml')

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml
index 6071c51b2d..8b8863e29c 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml
@@ -1,38 +1,36 @@
 <service xmlns="http://org.openecomp.aai.inventory/v9">
-	<allotted-resources>
-		<allotted-resource>
-			<type>TunnelXConn</type>
-			<id>txcA</id>
-		</allotted-resource>
-		<allotted-resource>
-			<type>BRG</type>
-			<id>brgB</id>
-		</allotted-resource>
-		<allotted-resource>
-			<type>other</type>
-			<id>otherC</id>
-		</allotted-resource>
-	</allotted-resources>
 	<relationship-list>
       <relationship>
          <related-to>generic-vnf</related-to>
-         <related-link>https://aai-ext1.test.com:8443/aai/v7/generic-vnf/vnfX</related-link>
+         <related-link>/aai/v7/generic-vnf/vnfX</related-link>
       </relationship>
       <relationship>
          <related-to>l3-network</related-to>
-         <related-link>https://aai-ext1.test.com:8443/aai/v7/l3-network/netA</related-link>
+         <related-link>/aai/v7/l3-network/netA</related-link>
       </relationship>
       <relationship>
          <related-to>generic-vnf</related-to>
-         <related-link>https://aai-ext1.test.com:8443/aai/v7/generic-vnf/vnfY</related-link>
+         <related-link>/aai/v7/generic-vnf/vnfY/</related-link>
       </relationship>
       <relationship>
          <related-to>l3-network</related-to>
-         <related-link>https://aai-ext1.test.com:8443/aai/v7/l3-network/netB</related-link>
+         <related-link>/aai/v7/l3-network/netB</related-link>
       </relationship>
       <relationship>
          <related-to>l3-network</related-to>
-         <related-link>https://aai-ext1.test.com:8443/aai/v7/l3-network/netC</related-link>
+         <related-link>/aai/v7/l3-network/netC</related-link>
+      </relationship>
+      <relationship>
+         <related-to>allotted-resource</related-to>
+         <related-link>/aai/v11/anytxc</related-link>
+      </relationship>
+      <relationship>
+         <related-to>allotted-resource</related-to>
+         <related-link>/aai/v11/anybrg</related-link>
+      </relationship>
+      <relationship>
+         <related-to>allotted-resource</related-to>
+         <related-link>/aai/v11/other</related-link>
       </relationship>
    </relationship-list>
 </service>
-- 
cgit 1.2.3-korg