From 0bb644bd5c11ce03b6dec71d26127fbd3519a9b4 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Tue, 7 Aug 2018 16:06:09 -0400 Subject: Refactored references to AaiUtils to use AAIResourceClient updated bpmn, removed Generic AAI flows, and removed dead useless code Did not modify E2E Delete Service Instance flow as it has changed significantly Issue-ID: SO-813 Change-Id: I1a6bc5353ef89e2ce4359be2654395f7ce060aba Signed-off-by: Benjamin, Max (mb388a) --- .../GenericFlows/getGenericVnfByNameResponse.xml | 23 ----- .../__files/GenericFlows/getGenericVnfResponse.xml | 90 -------------------- .../getGenericVnfResponse_hasRelationships.xml | 90 -------------------- .../__files/GenericFlows/getSIUrlById.xml | 6 -- .../__files/GenericFlows/getSIUrlByName.xml | 6 -- .../GenericFlows/getSIUrlByNameMultiCustomer.xml | 11 --- .../__files/GenericFlows/getServiceInstance.xml | 30 ------- .../GenericFlows/getServiceSubscription.xml | 34 -------- .../__files/GenericFlows/getVceByNameResponse.xml | 97 ---------------------- .../__files/GenericFlows/getVceResponse.xml | 92 -------------------- ...ance_PutServiceInstance_AAIResponse_Success.xml | 11 --- .../__files/GenericPutServiceInstance/aaiFault.xml | 15 ---- 12 files changed, 505 deletions(-) delete mode 100644 bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml delete mode 100644 bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse.xml delete mode 100644 bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse_hasRelationships.xml delete mode 100644 bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlById.xml delete mode 100644 bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlByName.xml delete mode 100644 bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlByNameMultiCustomer.xml delete mode 100644 bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceInstance.xml delete mode 100644 bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceSubscription.xml delete mode 100644 bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceByNameResponse.xml delete mode 100644 bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceResponse.xml delete mode 100644 bpmn/MSOCommonBPMN/src/test/resources/__files/GenericPutServiceInstance/GenericPutServiceInstance_PutServiceInstance_AAIResponse_Success.xml delete mode 100644 bpmn/MSOCommonBPMN/src/test/resources/__files/GenericPutServiceInstance/aaiFault.xml (limited to 'bpmn/MSOCommonBPMN/src/test/resources') diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml deleted file mode 100644 index 7c879879ef..0000000000 --- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 2f1cc940-455f-4ee2-9411-a7899cd4f124 - testVnfName123 - mmsc-capacity - a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb - vMMSC - pending-create - testReVer123 - - - nothing - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/ - - l3-network.network-id - c597ab81-fece-49f4-a4f5-710cebb13c29 - - - - - - - \ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse.xml deleted file mode 100644 index 0b5a822b68..0000000000 --- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - 2f1cc940-455f-4ee2-9411-a7899cd4f124 - testVnfName123 - mmsc-capacity - a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb - vMMSC - pending-create - - - l3-network - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/ - - l3-network.network-id - c597ab81-fece-49f4-a4f5-710cebb13c29 - - - - l3-network - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/ - - l3-network.network-id - 53956c91-6e5e-49aa-88dd-535f57e66e70 - - - - l3-network - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/ - - l3-network.network-id - 44e0d9e0-9334-4ec6-9344-07a96dac629f - - - - l3-network - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/ - - l3-network.network-id - ac49d99b-5daf-4624-9f8e-188b126ea166 - - - - - - - - 802767b3-18a6-4432-96db-25522786aee0 - ZRDM1MMSC03 - mmsc-capacity - a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb - vMMSC - pending-create - - - l3-network - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/ - - l3-network.network-id - c597ab81-fece-49f4-a4f5-710cebb13c29 - - - - l3-network - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/ - - l3-network.network-id - 53956c91-6e5e-49aa-88dd-535f57e66e70 - - - - l3-network - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/ - - l3-network.network-id - 44e0d9e0-9334-4ec6-9344-07a96dac629f - - - - l3-network - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/ - - l3-network.network-id - ac49d99b-5daf-4624-9f8e-188b126ea166 - - - - - - - \ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse_hasRelationships.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse_hasRelationships.xml deleted file mode 100644 index 0b5a822b68..0000000000 --- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse_hasRelationships.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - 2f1cc940-455f-4ee2-9411-a7899cd4f124 - testVnfName123 - mmsc-capacity - a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb - vMMSC - pending-create - - - l3-network - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/ - - l3-network.network-id - c597ab81-fece-49f4-a4f5-710cebb13c29 - - - - l3-network - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/ - - l3-network.network-id - 53956c91-6e5e-49aa-88dd-535f57e66e70 - - - - l3-network - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/ - - l3-network.network-id - 44e0d9e0-9334-4ec6-9344-07a96dac629f - - - - l3-network - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/ - - l3-network.network-id - ac49d99b-5daf-4624-9f8e-188b126ea166 - - - - - - - - 802767b3-18a6-4432-96db-25522786aee0 - ZRDM1MMSC03 - mmsc-capacity - a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb - vMMSC - pending-create - - - l3-network - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/ - - l3-network.network-id - c597ab81-fece-49f4-a4f5-710cebb13c29 - - - - l3-network - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/ - - l3-network.network-id - 53956c91-6e5e-49aa-88dd-535f57e66e70 - - - - l3-network - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/ - - l3-network.network-id - 44e0d9e0-9334-4ec6-9344-07a96dac629f - - - - l3-network - https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/ - - l3-network.network-id - ac49d99b-5daf-4624-9f8e-188b126ea166 - - - - - - - \ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlById.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlById.xml deleted file mode 100644 index d0fccd80c9..0000000000 --- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlById.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - service-instance - https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET - - \ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlByName.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlByName.xml deleted file mode 100644 index d0fccd80c9..0000000000 --- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlByName.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - service-instance - https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET - - \ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlByNameMultiCustomer.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlByNameMultiCustomer.xml deleted file mode 100644 index fce47fcd0d..0000000000 --- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlByNameMultiCustomer.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - service-instance - /aai/v11/business/customers/customer/AbcBank/service-subscriptions/service-subscription/ABC-ST/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET - - - service-instance - /aai/v11/business/customers/customer/XyCorporation/service-subscriptions/service-subscription/XY-ST/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET - - \ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceInstance.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceInstance.xml deleted file mode 100644 index e377c70474..0000000000 --- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceInstance.xml +++ /dev/null @@ -1,30 +0,0 @@ - - MIS/1604/0026/SW_INTERNET - 123456789 - - - cvlan-tag - https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/ - - cvlan-tag.cvlan-tag - 2003 - - - port-group.interface-id - slcp1447vbc.ipag - - - vce.vnf-id - 832bace2-3fb0-49e0-a6a4-07c47223c535 - - - - vce - https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/ - - vce.vnf-id - 832bace2-3fb0-49e0-a6a4-07c47223c535 - - - - \ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceSubscription.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceSubscription.xml deleted file mode 100644 index 52e75d970a..0000000000 --- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceSubscription.xml +++ /dev/null @@ -1,34 +0,0 @@ - - SDN-ETHERNET-INTERNET - 1234 - - MIS/1604/0026/SW_INTERNET - 123456789 - - - cvlan-tag - https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/ - - cvlan-tag.cvlan-tag - 2003 - - - port-group.interface-id - slcp1447vbc.ipag - - - vce.vnf-id - 832bace2-3fb0-49e0-a6a4-07c47223c535 - - - - vce - https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/ - - vce.vnf-id - 832bace2-3fb0-49e0-a6a4-07c47223c535 - - - - - \ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceByNameResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceByNameResponse.xml deleted file mode 100644 index b55d51971d..0000000000 --- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceByNameResponse.xml +++ /dev/null @@ -1,97 +0,0 @@ - - 1936628a-d22f-4943-8587-a57bab2ece7a - testVnfName123 - US0112SLCP1VBRT076 - esx-vce - NVTPROV - created - 0000020 - slcp1476vbc/94a3c72b-94d5-444b-9a1f-647a36c2181d - - VPESAT-mtanjrsv126 - 135.21.249.160 - - - slcp1476vbc.vpe - e7568706-a2a9-45f8-aef8-95a0e2910953 - dvspg-VCE_VPE-slcp1476vbc - Internet - dvspg-VCE_VPE-slcp1476vbc - 0000020 - dvs-slcp1-01 - created - dvspg-VCE_VPE-slcp1476vbc/c1299f74-da35-4228-b1e0-d2fd07176196 - - - - 3012 - 0000020 - - - - - slcp1476vbc.ipag - 3477ddb6-b925-4971-ab62-c84b69634c49 - dvspg-IPAG_VCE-slcp1476vbc - Customer - dvspg-IPAG_VCE-slcp1476vbc - dvs-slcp1-01 - 0000020 - created - dvspg-IPAG_VCE-slcp1476vbc/1e9c033a-2eef-47f5-9d48-98e0b59538e7 - - - - 2003 - 0000020 - - - - - - - service-instance - https://aai-ext1.test.com:8443/aai/v2/business/customers/customer/011216-1602-SDNC001/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/SDNC%2FVLXM%2F0112001%2F%2FSW_INTERNET/ - - service-instance.service-instance-id - SDNC/VLXM/0112001//SW_INTERNET - - - service-subscription.service-type - SDN-ETHERNET-INTERNET - - - customer.global-customer-id - 011216-1602-SDNC001 - - - - vserver - https://aai-ext1.test.com:8443/aai/servers/v2/3d5f3fe23821416fac2b69af65248c74/vservers/ecab47d5-3450-4507-ada9-2b3c58485c51/ - - vserver.vserver-id - ecab47d5-3450-4507-ada9-2b3c58485c51 - - - tenant.tenant-id - 3d5f3fe23821416fac2b69af65248c74 - - - - complex - https://aai-ext1.test.com:8443/aai/v2/cloud-infrastructure/complexes/complex/MDTWNJ21A4/ - - complex.physical-location-id - MDTWNJ21A4 - - - - availability-zone - https://aai-ext1.test.com:8443/aai/v2/cloud-infrastructure/availability-zones/availability-zone/slcp1-esx-az01/ - - availability-zone.availability-zone-name - slcp1-esx-az01 - - - - \ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceResponse.xml deleted file mode 100644 index e5f98bfe33..0000000000 --- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceResponse.xml +++ /dev/null @@ -1,92 +0,0 @@ - - 1936628a-d22f-4943-8587-a57bab2ece7a - testVnfName123 - US0112SLCP1VBRT076 - esx-vce - NVTPROV - created - slcp1476vbc/94a3c72b-94d5-444b-9a1f-647a36c2181d - - VPESAT-mtanjrsv126 - 135.21.249.160 - - - slcp1476vbc.vpe - e7568706-a2a9-45f8-aef8-95a0e2910953 - dvspg-VCE_VPE-slcp1476vbc - Internet - dvspg-VCE_VPE-slcp1476vbc - dvs-slcp1-01 - created - dvspg-VCE_VPE-slcp1476vbc/c1299f74-da35-4228-b1e0-d2fd07176196 - - - - 3012 - - - - - slcp1476vbc.ipag - 3477ddb6-b925-4971-ab62-c84b69634c49 - dvspg-IPAG_VCE-slcp1476vbc - Customer - dvspg-IPAG_VCE-slcp1476vbc - dvs-slcp1-01 - created - dvspg-IPAG_VCE-slcp1476vbc/1e9c033a-2eef-47f5-9d48-98e0b59538e7 - - - - 2003 - - - - - - - service-instance - https://aai-ext1.test.com:8443/aai/v2/business/customers/customer/011216-1602-SDNC001/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/SDNC%2FVLXM%2F0112001%2F%2FSW_INTERNET/ - - service-instance.service-instance-id - SDNC/VLXM/0112001//SW_INTERNET - - - service-subscription.service-type - SDN-ETHERNET-INTERNET - - - customer.global-customer-id - 011216-1602-SDNC001 - - - - vserver - https://aai-ext1.test.com:8443/aai/servers/v2/3d5f3fe23821416fac2b69af65248c74/vservers/ecab47d5-3450-4507-ada9-2b3c58485c51/ - - vserver.vserver-id - ecab47d5-3450-4507-ada9-2b3c58485c51 - - - tenant.tenant-id - 3d5f3fe23821416fac2b69af65248c74 - - - - complex - https://aai-ext1.test.com:8443/aai/v2/cloud-infrastructure/complexes/complex/MDTWNJ21A4/ - - complex.physical-location-id - MDTWNJ21A4 - - - - availability-zone - https://aai-ext1.test..com:8443/aai/v2/cloud-infrastructure/availability-zones/availability-zone/slcp1-esx-az01/ - - availability-zone.availability-zone-name - slcp1-esx-az01 - - - - \ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericPutServiceInstance/GenericPutServiceInstance_PutServiceInstance_AAIResponse_Success.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericPutServiceInstance/GenericPutServiceInstance_PutServiceInstance_AAIResponse_Success.xml deleted file mode 100644 index eedbda9343..0000000000 --- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericPutServiceInstance/GenericPutServiceInstance_PutServiceInstance_AAIResponse_Success.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericPutServiceInstance/aaiFault.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericPutServiceInstance/aaiFault.xml deleted file mode 100644 index 66ed8f5758..0000000000 --- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericPutServiceInstance/aaiFault.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - -SVC3002 -Error writing output performing %1 on %2 (msg=%3) (ec=%4) - -PUTcustomer -SubName01 -Unexpected error reading/updating database:Adding this property for key [service-instance-id] and value [USSTU2CFCNC0101UJZZ01] violates a uniqueness constraint [service-instance-id] -ERR.5.4.5105 - - - - \ No newline at end of file -- cgit 1.2.3-korg