From c0080201984842b64b91ea3cb0fc96ca03fe303c Mon Sep 17 00:00:00 2001 From: Nikolas Hermanns Date: Thu, 4 May 2017 16:02:28 +0200 Subject: Removing peering testcase for Apex Change-Id: Ifad3f84fcb0c5dfa07aca43d74a027e3522abb87 Signed-off-by: Nikolas Hermanns --- sdnvpn/test/functest/testcase_3.py | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'sdnvpn') diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py index 3a63147..0f22f53 100644 --- a/sdnvpn/test/functest/testcase_3.py +++ b/sdnvpn/test/functest/testcase_3.py @@ -245,22 +245,26 @@ def main(): 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) + # TODO remove this and include apex again + installer_type = str(os.environ['INSTALLER_TYPE'].lower()) + if installer_type != "apex": + + 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") + else: + results.add_failure("Peering with quagga") + finally: test_utils.detach_instance_from_ext_br(quagga_vm, compute) - if neighbor and peer: - results.add_success("Peering with quagga") - else: - results.add_failure("Peering with quagga") - return results.compile_summary() -- cgit 1.2.3-korg