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>

3 files changed, 115 insertions, 61 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustServiceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustServiceTest.groovy
index fc53744b8b..65c9e456e4 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustServiceTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustServiceTest.groovy
@@ -94,23 +94,24 @@ class DeleteVcpeResCustServiceTest extends GroovyTestBase {
 		DeleteVcpeResCustService DeleteVcpeResCustService = new DeleteVcpeResCustService()

 		DeleteVcpeResCustService.preProcessRequest(mex)

 

-		verify(mex).getVariable(DBGFLAG)

-		verify(mex).setVariable("prefix", Prefix)
-		verify(mex).setVariable("DeleteVcpeResCustServiceRequest", request)
-		verify(mex).setVariable("msoRequestId", "mri")
-		verify(mex).setVariable("requestAction", "ra")
-		verify(mex).setVariable("source", "VID")
-		verify(mex).setVariable("globalSubscriberId", CUST)
-		verify(mex).setVariable("globalCustomerId", CUST)
-		verify(mex).setVariable("disableRollback", "false")
-		verify(mex).setVariable("productFamilyId", "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb")
-		verify(mex).setVariable("subscriptionServiceType", SVC)	
+		verify(mex).getVariable(DBGFLAG)
 		
-		verify(mex).setVariable("lcpCloudRegionId", "mdt1")
-		verify(mex).setVariable("tenantId", "8b1df54faa3b49078e3416e21370a3ba")
+		assertEquals(Prefix, map.get("prefix"))
+		assertEquals(request, map.get("DeleteVcpeResCustServiceRequest"))
+		assertEquals("mri", map.get("msoRequestId"))
+		assertEquals("ra", map.get("requestAction"))
+		assertEquals("VID", map.get("source"))
+		assertEquals(CUST, map.get("globalSubscriberId"))
+		assertEquals(CUST, map.get("globalCustomerId"))
+		assertEquals("false", map.get("disableRollback"))
+		assertEquals("a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", map.get("productFamilyId"))
+		assertEquals(SVC, map.get("subscriptionServiceType"))
+		
+		assertEquals("mdt1", map.get("lcpCloudRegionId"))
+		assertEquals("8b1df54faa3b49078e3416e21370a3ba", map.get("tenantId"))
+		assertEquals("1707", map.get("sdncVersion"))
+		assertEquals("service-instance", map.get("GENGS_type"))
 		assertEquals("""{"tenantId":"8b1df54faa3b49078e3416e21370a3ba","lcpCloudRegionId":"mdt1"}""", map.get("cloudConfiguration"))
-		verify(mex).setVariable("sdncVersion", "1702")
-		verify(mex).setVariable("GENGS_type", "service-instance")
 		assertTrue(map.containsKey(Prefix+"requestInfo"))
 		
 		def reqinfo = map.get(Prefix+"requestInfo")
@@ -148,7 +149,7 @@ class DeleteVcpeResCustServiceTest extends GroovyTestBase {
 		verify(mex).setVariable("lcpCloudRegionId", "mdt1")
 		verify(mex).setVariable("tenantId", "8b1df54faa3b49078e3416e21370a3ba")
 		assertEquals("""{"tenantId":"8b1df54faa3b49078e3416e21370a3ba","lcpCloudRegionId":"mdt1"}""", map.get("cloudConfiguration"))
-		verify(mex).setVariable("sdncVersion", "1702")
+		verify(mex).setVariable("sdncVersion", "1707")
 		verify(mex).setVariable("GENGS_type", "service-instance")
 		assertTrue(map.containsKey(Prefix+"requestInfo"))
 		
@@ -258,16 +259,18 @@ class DeleteVcpeResCustServiceTest extends GroovyTestBase {
 		def map = setupMap(mex)
 		initPrepareServiceDelete(mex)
 		
+		myMockGetAr("/aai/v11/anytxc", 200, "arGetTXCById.xml");
+		myMockGetAr("/aai/v11/anybrg", 200, "arGetBRGById.xml");
+		myMockGetAr("/aai/v11/other", 200, "arGetOtherById.xml");
+		
 		DeleteVcpeResCustService DeleteVcpeResCustService = new DeleteVcpeResCustService()
 		DeleteVcpeResCustService.prepareServiceDelete(mex)
-
-		verify(mex).getVariable(DBGFLAG)
 		
 		verify(mex).setVariable(Prefix+"TunnelXConn", true)
-		assertEquals("txcA", map.get("TXC_allottedResourceId"))
+		assertEquals("ar-txcA", map.get("TXC_allottedResourceId"))
 		
 		verify(mex).setVariable(Prefix+"BRG", true)
-		assertEquals("brgB", map.get("BRG_allottedResourceId"))
+		assertEquals("ar-brgB", map.get("BRG_allottedResourceId"))
 		
 		verify(mex).setVariable(Prefix+"vnfsCount", 2)
 		assertNotNull(map.get(Prefix+"relatedVnfIdList"))
@@ -353,9 +356,62 @@ class DeleteVcpeResCustServiceTest extends GroovyTestBase {
 		when(mex.getVariable("GENGS_FoundIndicator")).thenReturn(true)
 		when(mex.getVariable("mso-request-id")).thenReturn("mri")
 		when(mex.getVariable("DeleteVcpeResCustServiceRequest")).thenReturn(request)
+		when(mex.getVariable("URN_aai_endpoint")).thenReturn(aaiUriPfx)
 		when(mex.getVariable("GENGS_service")).thenReturn(FileUtil.readResourceFile("__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml"))
 	}
 	
+	// ***** getAaiAr *****
+	
+	@Test
+//	@Ignore
+	public void getAaiAr() {
+		myMockGetAr("/myurl/ar1", 200, "arGetBRGById.xml");
+		
+		ExecutionEntity mex = setupMock()
+		initGetAaiAr(mex)
+				
+		DeleteVcpeResCustService DeleteVcpeResCustService = new DeleteVcpeResCustService()
+		def (type, id) = DeleteVcpeResCustService.getAaiAr(mex, "/myurl/ar1")
+		
+		assertEquals("BRG", type)
+		assertEquals("ar-brgB", id)
+	}
+	
+	@Test
+//	@Ignore
+	public void getAaiAr_401() {
+		myMockGetAr("/myurl/ar1", 401, "arGetBRGById.xml");
+		
+		ExecutionEntity mex = setupMock()
+		initGetAaiAr(mex)
+				
+		DeleteVcpeResCustService DeleteVcpeResCustService = new DeleteVcpeResCustService()
+		def (type, id) = DeleteVcpeResCustService.getAaiAr(mex, "/myurl/ar1")
+		
+		assertEquals(null, type)
+		assertEquals(null, id)
+	}
+	
+	@Test
+//	@Ignore
+	public void getAaiAr_EmptyResponse() {
+		myMockGetAr("/myurl/ar1", 200, "empty.txt");
+		
+		ExecutionEntity mex = setupMock()
+		initGetAaiAr(mex)
+				
+		DeleteVcpeResCustService DeleteVcpeResCustService = new DeleteVcpeResCustService()
+		def (type, id) = DeleteVcpeResCustService.getAaiAr(mex, "/myurl/ar1")
+		
+		assertEquals(null, type)
+		assertEquals(null, id)
+	}
+	
+	private void initGetAaiAr(ExecutionEntity mex) {
+		when(mex.getVariable(DBGFLAG)).thenReturn("true")
+		when(mex.getVariable("URN_aai_endpoint")).thenReturn(aaiUriPfx)
+	}
+	
 	// ***** prepareVnfAndModulesDelete *****
 			
 	@Test
@@ -707,5 +763,13 @@ class DeleteVcpeResCustServiceTest extends GroovyTestBase {
 	
 	private initProcessJavaException(ExecutionEntity mex) {
 		when(mex.getVariable(DBGFLAG)).thenReturn("true")
+	}
+	
+	private void myMockGetAr(String url, int status, String fileResp) {
+		stubFor(get(urlMatching(url))
+				.willReturn(aResponse()
+						.withStatus(status)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile("VCPE/DeleteVcpeResCustService/" + fileResp)));
 	}

 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSI.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSI.xml
index 4f95ed2f19..e0511873b6 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSI.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSI.xml
@@ -1,43 +1,35 @@
 <service-instance>
 	
    <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
-   <resource-version>123456789</resource-version>
-   
-	<allotted-resources>
-		<allotted-resource>
-			<type>TunnelXConn</type>
-			<id>ar-txcA</id>
-		</allotted-resource>
-		<allotted-resource>
-			<type>BRG</type>
-			<id>ar-brgB</id>
-		</allotted-resource>
-		<allotted-resource>
-			<type>other</type>
-			<id>ar-otherC</id>
-		</allotted-resource>
-	</allotted-resources>
-	
+   <resource-version>123456789</resource-version>	
 	<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/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/ar-txcA</related-link>
+      </relationship>
+      <relationship>
+         <related-to>allotted-resource</related-to>
+         <related-link>/aai/v11/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/ar-brgB</related-link>
       </relationship>
    </relationship-list>
 </service-instance>
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>