Removing peering testcase for Apex

Change-Id: Ifad3f84fcb0c5dfa07aca43d74a027e3522abb87
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
(cherry picked from commit c0080201984842b64b91ea3cb0fc96ca03fe303c)

diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst
index 4fc01e3..f5e04cf 100644 (file)
--- a/docs/release/release-notes/release-notes.rst
+++ b/docs/release/release-notes/release-notes.rst
@@ -125,6 +125,7 @@ Documentation deliverables
 Known Limitations, Issues and Workarounds
 =========================================
 
+
 System Limitations
 ------------------
 
@@ -140,6 +141,9 @@ 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 3a63147..0f22f53 100644 (file)
--- 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()