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 8a8aa30..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
@@ -47,9 +46,13 @@ def main():
 
     openstack_nodes = test_utils.get_nodes()
 
+    # node.is_odl() doesn't work in Apex
+    # https://jira.opnfv.org/browse/RELENG-192
     controllers = [node for node in openstack_nodes
-                   if node.is_odl()]
+                   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, "-")
@@ -64,8 +67,11 @@ def main():
         results.add_success(msg)
 
     controller = controllers[0]  # We don't handle HA well
-    get_ext_ip_cmd = "ip a | grep br-ex | grep inet | awk '{print $2}'"
-    controller_ext_ip = controller.run_cmd(get_ext_ip_cmd).split("/")[0]
+    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).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)
     logger.info("Checking if zrpcd is "
@@ -133,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")
@@ -146,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,
@@ -161,11 +169,19 @@ def main():
         TESTCASE_CONFIG.quagga_subnet_cidr,
         TESTCASE_CONFIG.quagga_router_name)
 
+    installer_type = str(os.environ['INSTALLER_TYPE'].lower())
+    if installer_type == "fuel":
+        disk = 'raw'
+    elif installer_type == "apex":
+        disk = 'qcow2'
+    else:
+        logger.error("Incompatible installer type")
+
     ubuntu_image_id = os_utils.create_glance_image(
         glance_client,
         COMMON_CONFIG.ubuntu_image_name,
         COMMON_CONFIG.ubuntu_image_path,
-        disk="raw",
+        disk,
         container="bare",
         public="public")
 
@@ -188,17 +204,16 @@ def main():
     # Map the hypervisor used above to a compute handle
     # returned by releng's manager
     for comp in computes:
-        if compute_node.host_ip in comp.run_cmd("ip a"):
+        if compute_node.host_ip in comp.run_cmd("sudo ip a"):
             compute = comp
             break
-    # Get the mask of ext net of the compute where quagga is running
-    # TODO check this works on apex
-    ext_cidr = compute.run_cmd(get_ext_ip_cmd).split("/")
-    ext_net_mask = ext_cidr[1]
     quagga_bootstrap_script = quagga.gen_quagga_setup_script(
         controller_ext_ip,
         fake_fip['fip_addr'],
         ext_net_mask)
+
+    test_utils.create_custom_flavor()
+
     quagga_vm = test_utils.create_instance(
         nova_client,
         TESTCASE_CONFIG.quagga_instance_name,
@@ -206,7 +221,7 @@ def main():
         quagga_net_id,
         sg_id,
         fixed_ip=TESTCASE_CONFIG.quagga_instance_ip,
-        flavor=TESTCASE_CONFIG.quagga_instance_flavor,
+        flavor=COMMON_CONFIG.custom_flavor_name,
         userdata=quagga_bootstrap_script,
         compute_node=quagga_compute_node)
 
@@ -220,14 +235,7 @@ def main():
     else:
         results.add_failure(msg)
 
-    # This part works around NAT
-    # What we do is attach the instance directly to the OpenStack
-    # external network. This way is is directly accessible from the
-    # controller without NAT. We assign a floating IP for this
-    # to make sure no overlaps happen.
-    libvirt_instance_name = getattr(quagga_vm, "OS-EXT-SRV-ATTR:instance_name")
-    compute.run_cmd("virsh attach-interface %s"
-                    " bridge br-ex" % libvirt_instance_name)
+    test_utils.attach_instance_to_ext_br(quagga_vm, compute)
 
     testcase = "Bootstrap quagga inside an OpenStack instance"
     cloud_init_success = test_utils.wait_for_cloud_init(quagga_vm)
@@ -246,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: