From 104aefb5d0fce75ee5c5ec4f4de1a6954925b5b6 Mon Sep 17 00:00:00 2001 From: Jim Hahn 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 --- .../VCPE/DeleteVcpeResCustService/getSI.xml | 36 +++++++++------------- .../DeleteVcpeResCustService/serviceToDelete.xml | 36 ++++++++++------------ 2 files changed, 31 insertions(+), 41 deletions(-) (limited to 'bpmn/MSOInfrastructureBPMN/src/test/resources/__files') 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 @@ MIS/1604/0026/SW_INTERNET - 123456789 - - - - TunnelXConn - ar-txcA - - - BRG - ar-brgB - - - other - ar-otherC - - - + 123456789 generic-vnf - https://aai-ext1.test.com:8443/aai/v7/generic-vnf/vnfX + /aai/v7/generic-vnf/vnfX l3-network - https://aai-ext1.test.com:8443/aai/v7/l3-network/netA + /aai/v7/l3-network/netA generic-vnf - https://aai-ext1.test.com:8443/aai/v7/generic-vnf/vnfY + /aai/v7/generic-vnf/vnfY l3-network - https://aai-ext1.test.com:8443/aai/v7/l3-network/netB + /aai/v7/l3-network/netB l3-network - https://aai-ext1.test.com:8443/aai/v7/l3-network/netC + /aai/v7/l3-network/netC + + + allotted-resource + /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 + + + allotted-resource + /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 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 @@ - - - TunnelXConn - txcA - - - BRG - brgB - - - other - otherC - - generic-vnf - https://aai-ext1.test.com:8443/aai/v7/generic-vnf/vnfX + /aai/v7/generic-vnf/vnfX l3-network - https://aai-ext1.test.com:8443/aai/v7/l3-network/netA + /aai/v7/l3-network/netA generic-vnf - https://aai-ext1.test.com:8443/aai/v7/generic-vnf/vnfY + /aai/v7/generic-vnf/vnfY/ l3-network - https://aai-ext1.test.com:8443/aai/v7/l3-network/netB + /aai/v7/l3-network/netB l3-network - https://aai-ext1.test.com:8443/aai/v7/l3-network/netC + /aai/v7/l3-network/netC + + + allotted-resource + /aai/v11/anytxc + + + allotted-resource + /aai/v11/anybrg + + + allotted-resource + /aai/v11/other -- cgit 1.2.3-korg