diff options
| author |   Jim Hahn <jrh3@att.com> | 2017-11-11 14:21:10 -0500 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2017-11-11 14:21:10 -0500 |
| commit | 104aefb5d0fce75ee5c5ec4f4de1a6954925b5b6 (patch) | |
| tree | 80aafb8a41aa4640309078eb2a1be171a189c84b /bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE | |
| parent | 6fff64a3138d347b961e59c0996d85093c6fa930 (diff) | |
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>
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE')
2 files changed, 31 insertions, 41 deletions
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> |