diff options
| author |   Tim Irnich <tim.irnich@ericsson.com> | 2017-06-26 15:24:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-26 15:24:23 +0000 |
| commit | 92e86d8a193af46605ad888bc4f075d006b50a87 (patch) | |
| tree | 5b04282539d0a4f7bc9186fe5d96fbb632b5c331 | |
| parent | 4a6bb979b45c3b7f00f9dcc9519f439b3d405189 (diff) | |
| parent | 7b9af7888492bbca6037d0cdd1306e9f62600598 (diff) | |
Merge "Restore peering within testcase3 for Apex"
| -rw-r--r-- | docs/release/release-notes/release-notes.rst | 2 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_3.py | 29 |
2 files changed, 13 insertions, 18 deletions
diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst index f5e04cf..08b236c 100644 --- a/docs/release/release-notes/release-notes.rst +++ b/docs/release/release-notes/release-notes.rst @@ -141,8 +141,6 @@ OpenStack NAT does not work. Instances created in subnets that are connected to the public network via a gateway should have external connectivity. This does not work and can be worked around by assigning a Floating IP to the instance [1]. -For Apex the peering with the virtual Peer is not working due to limitation -of apex networking. Workarounds ----------- diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py index 85a8827..dbbdb59 100644 --- a/sdnvpn/test/functest/testcase_3.py +++ b/sdnvpn/test/functest/testcase_3.py @@ -262,26 +262,23 @@ def main(): results.add_failure(testcase) results.add_to_summary(0, "=") - # 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") + 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) + if neighbor and peer: + results.add_success("Peering with quagga") + else: + results.add_failure("Peering with quagga") + test_utils.cleanup_nova(nova_client, floatingip_ids, instance_ids, image_ids) test_utils.cleanup_neutron(neutron_client, bgpvpn_ids, interfaces, |