Cleanup br-ex/br-quagga from testcase_3

[sdnvpn.git] / sdnvpn / test / functest / testcase_3.py

diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py
index 416af39..1a23c56 100644 (file)
--- a/sdnvpn/test/functest/testcase_3.py
+++ b/sdnvpn/test/functest/testcase_3.py
@@ -1,4 +1,3 @@
-#
 # Copyright (c) 2017 All rights reserved
 # This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
@@ -53,6 +52,7 @@ def main():
                    if "running" in
                    node.run_cmd("sudo systemctl status opendaylight")]
     computes = [node for node in openstack_nodes if node.is_compute()]
+
     msg = ("Verify that OpenDaylight can start/communicate with zrpcd/Quagga")
     results.record_action(msg)
     results.add_to_summary(0, "-")
@@ -68,9 +68,9 @@ def main():
 
     controller = controllers[0]  # We don't handle HA well
     get_ext_ip_cmd = "sudo ip a | grep br-ex | grep inet | awk '{print $2}'"
-    ext_net_cidr = controller.run_cmd(get_ext_ip_cmd).split("/")
-    ext_net_mask = ext_net_cidr[1].split('\n')[0]
-    controller_ext_ip = ext_net_cidr[0]
+    ext_net_cidr = controller.run_cmd(get_ext_ip_cmd).strip().split('\n')
+    ext_net_mask = ext_net_cidr[0].split('/')[1]
+    controller_ext_ip = ext_net_cidr[0].split('/')[0]
 
     logger.info("Starting bgp speaker of controller at IP %s "
                 % controller_ext_ip)
@@ -139,8 +139,8 @@ def main():
     if not os.path.isfile(COMMON_CONFIG.ubuntu_image_path):
         logger.info("Downloading image")
         ft_utils.download_url(
-            "https://cloud-images.ubuntu.com/releases/16.04/"
-            "release/ubuntu-16.04-server-cloudimg-amd64-disk1.img",
+            "http://artifacts.opnfv.org/sdnvpn/"
+            "ubuntu-16.04-server-cloudimg-amd64-disk1.img",
             "/home/opnfv/functest/data/")
     else:
         logger.info("Using old image")
@@ -152,7 +152,9 @@ def main():
     sg_id = os_utils.create_security_group_full(neutron_client,
                                                 TESTCASE_CONFIG.secgroup_name,
                                                 TESTCASE_CONFIG.secgroup_descr)
-    test_utils.open_icmp_ssh(neutron_client, sg_id)
+    test_utils.open_icmp(neutron_client, sg_id)
+    test_utils.open_http_port(neutron_client, sg_id)
+
     test_utils.open_bgp_port(neutron_client, sg_id)
     net_id, _, _ = test_utils.create_network(neutron_client,
                                              TESTCASE_CONFIG.net_1_name,
@@ -252,6 +254,8 @@ def main():
                                        controller)
     peer = quagga.check_for_peering(controller)
 
+    test_utils.detach_instance_from_ext_br(quagga_vm, compute)
+
     if neighbor and peer:
         results.add_success("Peering with quagga")
     else: