diff options
| author |   Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2017-05-04 16:02:28 +0200 |
|---|---|---|
| committer | Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2017-05-04 16:02:28 +0200 |
| commit | c0080201984842b64b91ea3cb0fc96ca03fe303c (patch) | |
| tree | 85c7ca148f1225cb195b1c8b4eea87b3d2cdadaf /sdnvpn/test/functest/testcase_3.py | |
| parent | 180024bb19dcc52469db87bf92980674fa5f65c2 (diff) | |
Removing peering testcase for Apex
Change-Id: Ifad3f84fcb0c5dfa07aca43d74a027e3522abb87
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Diffstat (limited to 'sdnvpn/test/functest/testcase_3.py')
| -rw-r--r-- | sdnvpn/test/functest/testcase_3.py | 30 |
1 files changed, 17 insertions, 13 deletions
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() |