diff options
| author |   Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com> | 2018-07-09 14:22:14 +0200 |
|---|---|---|
| committer | Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com> | 2018-07-09 14:22:14 +0200 |
| commit | 4b6630459f3cebb78ee21922f7976820ab04690b (patch) | |
| tree | 8d613df41c7a69c3ca532c88e271c11aed93f35f | |
| parent | 643764bf5b65d837d424df278015f8cfb535a3ad (diff) | |
Detach quagga vm in the cleanup block
Change-Id: I45145dacaeec0f7b518ab61a33d3a824458e9af5
Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
| -rw-r--r-- | sdnvpn/test/functest/testcase_3.py | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py index a527236..fc22fa4 100644 --- a/sdnvpn/test/functest/testcase_3.py +++ b/sdnvpn/test/functest/testcase_3.py @@ -291,26 +291,22 @@ def main(): test_utils.attach_instance_to_ext_br(quagga_vm, compute) - try: - testcase = "Bootstrap quagga inside an OpenStack instance" - cloud_init_success = test_utils.wait_for_cloud_init(quagga_vm) - if cloud_init_success: - results.add_success(testcase) - else: - results.add_failure(testcase) - results.add_to_summary(0, "=") - - results.add_to_summary(0, '-') - results.add_to_summary(1, "Peer Quagga with OpenDaylight") - results.add_to_summary(0, '-') - - neighbor = quagga.odl_add_neighbor(fake_fip['fip_addr'], - controller_ext_ip, - controller) - peer = quagga.check_for_peering(controller) - - finally: - test_utils.detach_instance_from_ext_br(quagga_vm, compute) + testcase = "Bootstrap quagga inside an OpenStack instance" + cloud_init_success = test_utils.wait_for_cloud_init(quagga_vm) + if cloud_init_success: + results.add_success(testcase) + else: + results.add_failure(testcase) + results.add_to_summary(0, "=") + + results.add_to_summary(0, '-') + results.add_to_summary(1, "Peer Quagga with OpenDaylight") + results.add_to_summary(0, '-') + + neighbor = quagga.odl_add_neighbor(fake_fip['fip_addr'], + controller_ext_ip, + controller) + peer = quagga.check_for_peering(controller) if neighbor and peer: results.add_success("Peering with quagga") @@ -398,6 +394,7 @@ def main(): logger.error("exception occurred while executing testcase_3: %s", e) raise finally: + test_utils.detach_instance_from_ext_br(quagga_vm, compute) test_utils.cleanup_nova(nova_client, instance_ids, flavor_ids) test_utils.cleanup_glance(glance_client, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, |