diff options
| -rw-r--r-- | test/functest/config.yaml | 21 | ||||
| -rw-r--r-- | test/functest/results.py | 50 | ||||
| -rw-r--r-- | test/functest/testcase_1.py | 45 | ||||
| -rw-r--r-- | test/functest/testcase_2.py | 46 | ||||
| -rw-r--r-- | test/functest/testcase_4.py | 45 | ||||
| -rw-r--r-- | test/functest/testcase_7.py | 153 | ||||
| -rw-r--r-- | test/functest/utils.py | 11 |
7 files changed, 263 insertions, 108 deletions
diff --git a/test/functest/config.yaml b/test/functest/config.yaml index d075c77..ccd5db7 100644 --- a/test/functest/config.yaml +++ b/test/functest/config.yaml @@ -99,3 +99,24 @@ testcases: targets1: '88:88' targets2: '55:55' route_distinguishers: '12:12' + + testcase_7: + enabled: false + description: Network associate VPNs with routers attached (ODL Bug 6962) + success_criteria: 100 + testname_db: functest_testcase_7 + image_name: sdnvpn-image + instance_1_name: sdnvpn-7-1 + instance_2_name: sdnvpn-7-2 + net_1_name: sdnvpn-7-1 + subnet_1_name: sdnvpn-7-1-subnet + subnet_1_cidr: 10.10.10.0/24 + router_1_name: sdnvpn-7-1-router + net_2_name: sdnvpn-7-2 + subnet_2_name: sdnvpn-7-2-subnet + subnet_2_cidr: 10.10.20.0/24 + router_2_name: sdnvpn-7-2-router + secgroup_name: sdnvpn-sg + secgroup_descr: Security group for SDNVPN test cases + targets: '77:77' + route_distinguishers: '11:11' diff --git a/test/functest/results.py b/test/functest/results.py index 7c73556..66e399e 100644 --- a/test/functest/results.py +++ b/test/functest/results.py @@ -10,6 +10,7 @@ import time import functest.utils.functest_logger as ft_logger +import functest.utils.functest_utils as ft_utils logger = ft_logger.Logger("sdnvpn-results").getLogger() @@ -25,11 +26,14 @@ class Results(object): self.num_tests_failed = 0 def get_ping_status(self, - vm_source, ip_source, - vm_target, ip_target, + vm_source, + vm_target, expected="PASS", timeout=30): console_log = vm_source.get_console_output() + ip_source = vm_source.networks.itervalues().next()[0] + ip_target = vm_target.networks.itervalues().next()[0] + if "request failed" in console_log: # Normally, cirros displays this message when userdata fails logger.debug("It seems userdata is not supported in " @@ -59,11 +63,11 @@ class Results(object): % (vm_source.name, vm_target.name)) if expected == "PASS": logger.debug("[PASS] %s" % msg) - self.add_to_summary(2, "PASS", test_case_name) + self.add_success(test_case_name) else: logger.debug("[FAIL] %s" % msg) self.test_result = "FAIL" - self.add_to_summary(2, "FAIL", test_case_name) + self.add_failure(test_case_name) logger.debug("\n%s" % last_n_lines) break elif ("ping %s KO" % ip_target) in last_n_lines: @@ -71,11 +75,11 @@ class Results(object): (vm_source.name, vm_target.name)) if expected == "FAIL": logger.debug("[PASS] %s" % msg) - self.add_to_summary(2, "PASS", test_case_name) + self.add_success(test_case_name) else: logger.debug("[FAIL] %s" % msg) self.test_result = "FAIL" - self.add_to_summary(2, "FAIL", test_case_name) + self.add_failure(test_case_name) break time.sleep(1) timeout -= 1 @@ -84,7 +88,7 @@ class Results(object): logger.debug("[FAIL] Timeout reached for '%s'. " "No ping output captured in the console log" % vm_source.name) - self.add_to_summary(2, "FAIL", test_case_name) + self.add_failure(test_case_name) break def add_to_summary(self, num_cols, col1, col2=""): @@ -101,10 +105,22 @@ class Results(object): if col1 == "FAIL": self.num_tests_failed += 1 - def check_ssh_output(self, vm_source, ip_source, - vm_target, ip_target, + def record_action(self, msg): + """Record and log an action and display it in the summary.""" + logger.info(msg) + self.add_to_summary(1, msg) + + def add_failure(self, test): + self.add_to_summary(2, "FAIL", test) + + def add_success(self, test): + self.add_to_summary(2, "PASS", test) + + def check_ssh_output(self, vm_source, vm_target, expected, timeout=30): console_log = vm_source.get_console_output() + ip_source = vm_source.networks.itervalues().next()[0] + ip_target = vm_target.networks.itervalues().next()[0] if "request failed" in console_log: # Normally, cirros displays this message when userdata fails @@ -129,11 +145,11 @@ class Results(object): last_n_lines = lines[-5:] if ("%s %s" % (ip_target, expected)) in last_n_lines: logger.debug("[PASS] %s" % test_case_name) - self.add_to_summary(2, "PASS", test_case_name) + self.add_success(test_case_name) break elif ("%s not reachable" % ip_target) in last_n_lines: logger.debug("[FAIL] %s" % test_case_name) - self.add_to_summary(2, "FAIL", test_case_name) + self.add_failure(test_case_name) self.test_result = "FAIL" break time.sleep(1) @@ -143,9 +159,19 @@ class Results(object): logger.debug("[FAIL] Timeout reached for '%s'." " No ping output captured in the console log" % vm_source.name) - self.add_to_summary(2, "FAIL", test_case_name) + self.add_failure(test_case_name) break + def ping_ip_test(self, address): + ping = "ping %s -c 3" % address + testcase_name = "Ping IP %s" % address + exit_code = ft_utils.execute_command(ping) + + if exit_code != 0: + self.add_failure(testcase_name) + else: + self.add_success(testcase_name) + def compile_summary(self, SUCCESS_CRITERIA): success_message = "All the subtests have passed." failure_message = "One or more subtests have failed." diff --git a/test/functest/testcase_1.py b/test/functest/testcase_1.py index eba39bb..143945d 100644 --- a/test/functest/testcase_1.py +++ b/test/functest/testcase_1.py @@ -132,11 +132,9 @@ def main(): secgroup_name=TESTCASE_CONFIG.secgroup_name, compute_node=av_zone_1, userdata=u1) - vm_1_ip = vm_1.networks.itervalues().next()[0] msg = ("Create VPN with eRT<>iRT") - logger.info(msg) - results.add_to_summary(1, msg) + results.record_action(msg) vpn_name = "sdnvpn-" + str(randint(100000, 999999)) kwargs = { "import_targets": TESTCASE_CONFIG.targets1, @@ -149,8 +147,7 @@ def main(): logger.debug("VPN created details: %s" % bgpvpn) msg = ("Associate network '%s' to the VPN." % TESTCASE_CONFIG.net_1_name) - logger.info(msg) - results.add_to_summary(1, msg) + results.record_action(msg) results.add_to_summary(0, "-") os_utils.create_network_association( @@ -165,20 +162,13 @@ def main(): logger.error("One or more instances is down") # TODO: Handle this appropriately - # Ping from VM1 to VM2 should work - results.get_ping_status(vm_1, vm_1_ip, vm_2, vm_2_ip, - expected="PASS", timeout=200) - # Ping from VM1 to VM3 should work - results.get_ping_status(vm_1, vm_1_ip, vm_3, vm_3_ip, - expected="PASS", timeout=30) - # Ping from VM1 to VM4 should not work - results.get_ping_status(vm_1, vm_1_ip, vm_4, vm_4_ip, - expected="FAIL", timeout=30) + results.get_ping_status(vm_1, vm_2, expected="PASS", timeout=200) + results.get_ping_status(vm_1, vm_3, expected="PASS", timeout=30) + results.get_ping_status(vm_1, vm_4, expected="FAIL", timeout=30) msg = ("Associate network '%s' to the VPN." % TESTCASE_CONFIG.net_2_name) - logger.info(msg) results.add_to_summary(0, "-") - results.add_to_summary(1, msg) + results.record_action(msg) results.add_to_summary(0, "-") os_utils.create_network_association( neutron_client, bgpvpn_id, network_2_id) @@ -192,20 +182,13 @@ def main(): " updated network configuration") test_utils.wait_before_subtest() - # Ping from VM4 to VM5 should work - results.get_ping_status(vm_4, vm_4_ip, vm_5, vm_5_ip, - expected="PASS", timeout=30) - # Ping from VM1 to VM4 should not work - results.get_ping_status(vm_1, vm_1_ip, vm_4, vm_4_ip, - expected="FAIL", timeout=30) - # Ping from VM1 to VM5 should not work - results.get_ping_status(vm_1, vm_1_ip, vm_5, vm_5_ip, - expected="FAIL", timeout=30) + results.get_ping_status(vm_4, vm_5, expected="PASS", timeout=30) + results.get_ping_status(vm_1, vm_4, expected="FAIL", timeout=30) + results.get_ping_status(vm_1, vm_5, expected="FAIL", timeout=30) msg = ("Update VPN with eRT=iRT ...") - logger.info(msg) results.add_to_summary(0, "-") - results.add_to_summary(1, msg) + results.record_action(msg) results.add_to_summary(0, "-") kwargs = {"import_targets": TESTCASE_CONFIG.targets1, "export_targets": TESTCASE_CONFIG.targets1, @@ -216,12 +199,8 @@ def main(): " updated network configuration") test_utils.wait_before_subtest() - # Ping from VM1 to VM4 should work - results.get_ping_status(vm_1, vm_1_ip, vm_4, vm_4_ip, - expected="PASS", timeout=30) - # Ping from VM1 to VM5 should work - results.get_ping_status(vm_1, vm_1_ip, vm_5, vm_5_ip, - expected="PASS", timeout=30) + results.get_ping_status(vm_1, vm_4, expected="PASS", timeout=30) + results.get_ping_status(vm_1, vm_5, expected="PASS", timeout=30) return results.compile_summary(TESTCASE_CONFIG.success_criteria) diff --git a/test/functest/testcase_2.py b/test/functest/testcase_2.py index e8b8048..2875c5f 100644 --- a/test/functest/testcase_2.py +++ b/test/functest/testcase_2.py @@ -106,7 +106,6 @@ def main(): secgroup_name=TESTCASE_CONFIG.secgroup_name, compute_node=av_zone_1, userdata=userdata_common) - vm_2_ip = vm_2.networks.itervalues().next()[0] vm_3 = test_utils.create_instance( nova_client, @@ -118,7 +117,6 @@ def main(): secgroup_name=TESTCASE_CONFIG.secgroup_name, compute_node=av_zone_2, userdata=userdata_common) - vm_3_ip = vm_3.networks.itervalues().next()[0] vm_5 = test_utils.create_instance( nova_client, @@ -130,7 +128,6 @@ def main(): secgroup_name=TESTCASE_CONFIG.secgroup_name, compute_node=av_zone_2, userdata=userdata_common) - vm_5_ip = vm_5.networks.itervalues().next()[0] # We boot vm5 first because we need vm5_ip for vm4 userdata u4 = test_utils.generate_userdata_with_ssh( @@ -148,7 +145,6 @@ def main(): compute_node=av_zone_1, userdata=u4, files=files) - vm_4_ip = vm_4.networks.itervalues().next()[0] # We boot VM1 at the end because we need to get the IPs first to generate # the userdata @@ -168,11 +164,9 @@ def main(): compute_node=av_zone_1, userdata=u1, files=files) - vm_1_ip = vm_1.networks.itervalues().next()[0] msg = ("Create VPN1 with eRT=iRT") - logger.info(msg) - results.add_to_summary(1, msg) + results.record_action(msg) vpn1_name = "sdnvpn-1-" + str(randint(100000, 999999)) kwargs = {"import_targets": TESTCASE_CONFIG.targets2, "export_targets": TESTCASE_CONFIG.targets2, @@ -184,8 +178,7 @@ def main(): logger.debug("VPN1 created details: %s" % bgpvpn1) msg = ("Associate network '%s' to the VPN." % TESTCASE_CONFIG.net_1_name) - logger.info(msg) - results.add_to_summary(1, msg) + results.record_action(msg) results.add_to_summary(0, "-") os_utils.create_network_association( @@ -205,22 +198,17 @@ def main(): test_utils.wait_before_subtest() # 10.10.10.12 should return sdnvpn-2 to sdnvpn-1 - results.check_ssh_output( - vm_1, vm_1_ip, - vm_2, vm_2_ip, - expected=TESTCASE_CONFIG.instance_2_name, - timeout=200) + results.check_ssh_output(vm_1, vm_2, + expected=TESTCASE_CONFIG.instance_2_name, + timeout=200) # 10.10.11.13 should return sdnvpn-3 to sdnvpn-1 - results.check_ssh_output( - vm_1, vm_1_ip, - vm_3, vm_3_ip, - expected=TESTCASE_CONFIG.instance_3_name, - timeout=30) + results.check_ssh_output(vm_1, vm_3, + expected=TESTCASE_CONFIG.instance_3_name, + timeout=30) results.add_to_summary(0, "-") msg = ("Create VPN2 with eRT=iRT") - logger.info(msg) - results.add_to_summary(1, msg) + results.record_action(msg) vpn2_name = "sdnvpn-2-" + str(randint(100000, 999999)) kwargs = {"import_targets": TESTCASE_CONFIG.targets1, "export_targets": TESTCASE_CONFIG.targets1, @@ -232,8 +220,7 @@ def main(): logger.debug("VPN created details: %s" % bgpvpn2) msg = ("Associate network '%s' to the VPN2." % TESTCASE_CONFIG.net_2_name) - logger.info(msg) - results.add_to_summary(1, msg) + results.record_action(msg) results.add_to_summary(0, "-") os_utils.create_network_association( @@ -247,15 +234,14 @@ def main(): test_utils.wait_before_subtest() # 10.10.11.13 should return sdnvpn-5 to sdnvpn-4 - results.check_ssh_output( - vm_4, vm_4_ip, - vm_5, vm_5_ip, - expected=TESTCASE_CONFIG.instance_5_name, - timeout=30) + results.check_ssh_output(vm_4, vm_5, + expected=TESTCASE_CONFIG.instance_5_name, + timeout=30) # 10.10.10.11 should return "not reachable" to sdnvpn-4 - results.check_ssh_output( - vm_4, vm_4_ip, vm_1, vm_1_ip, expected="not reachable", timeout=30) + results.check_ssh_output(vm_4, vm_1, + expected="not reachable", + timeout=30) return results.compile_summary(TESTCASE_CONFIG.success_criteria) diff --git a/test/functest/testcase_4.py b/test/functest/testcase_4.py index bb25cce..61d8c97 100644 --- a/test/functest/testcase_4.py +++ b/test/functest/testcase_4.py @@ -132,11 +132,9 @@ def main(): secgroup_name=TESTCASE_CONFIG.secgroup_name, compute_node=av_zone_1, userdata=u1) - vm_1_ip = vm_1.networks.itervalues().next()[0] msg = ("Create VPN with eRT<>iRT") - logger.info(msg) - results.add_to_summary(1, msg) + results.record_action(msg) vpn_name = "sdnvpn-" + str(randint(100000, 999999)) kwargs = {"import_targets": TESTCASE_CONFIG.targets1, "export_targets": TESTCASE_CONFIG.targets2, @@ -147,8 +145,7 @@ def main(): logger.debug("VPN created details: %s" % bgpvpn) msg = ("Associate router '%s' to the VPN." % TESTCASE_CONFIG.router_1_name) - logger.info(msg) - results.add_to_summary(1, msg) + results.record_action(msg) results.add_to_summary(0, "-") os_utils.create_router_association( @@ -163,20 +160,13 @@ def main(): logger.error("One or more instances is down") # TODO Handle appropriately - # Ping from VM1 to VM2 should work - results.get_ping_status(vm_1, vm_1_ip, vm_2, vm_2_ip, - expected="PASS", timeout=200) - # Ping from VM1 to VM3 should work - results.get_ping_status(vm_1, vm_1_ip, vm_3, vm_3_ip, - expected="PASS", timeout=30) - # Ping from VM1 to VM4 should not work - results.get_ping_status(vm_1, vm_1_ip, vm_4, vm_4_ip, - expected="FAIL", timeout=30) + results.get_ping_status(vm_1, vm_2, expected="PASS", timeout=200) + results.get_ping_status(vm_1, vm_3, expected="PASS", timeout=30) + results.get_ping_status(vm_1, vm_4, expected="FAIL", timeout=30) msg = ("Associate network '%s' to the VPN." % TESTCASE_CONFIG.net_2_name) - logger.info(msg) results.add_to_summary(0, "-") - results.add_to_summary(1, msg) + results.record_action(msg) results.add_to_summary(0, "-") os_utils.create_network_association( neutron_client, bgpvpn_id, network_2_id) @@ -190,20 +180,13 @@ def main(): " updated network configuration") test_utils.wait_before_subtest() - # Ping from VM4 to VM5 should work - results.get_ping_status(vm_4, vm_4_ip, vm_5, vm_5_ip, - expected="PASS", timeout=30) - # Ping from VM1 to VM4 should not work - results.get_ping_status(vm_1, vm_1_ip, vm_4, vm_4_ip, - expected="FAIL", timeout=30) - # Ping from VM1 to VM5 should not work - results.get_ping_status(vm_1, vm_1_ip, vm_5, vm_5_ip, - expected="FAIL", timeout=30) + results.get_ping_status(vm_4, vm_5, expected="PASS", timeout=30) + results.get_ping_status(vm_1, vm_4, expected="FAIL", timeout=30) + results.get_ping_status(vm_1, vm_5, expected="FAIL", timeout=30) msg = ("Update VPN with eRT=iRT ...") - logger.info(msg) results.add_to_summary(0, "-") - results.add_to_summary(1, msg) + results.record_action(msg) results.add_to_summary(0, "-") kwargs = {"import_targets": TESTCASE_CONFIG.targets1, "export_targets": TESTCASE_CONFIG.targets1, @@ -214,12 +197,8 @@ def main(): " updated network configuration") test_utils.wait_before_subtest() - # Ping from VM1 to VM4 should work - results.get_ping_status(vm_1, vm_1_ip, vm_4, vm_4_ip, - expected="PASS", timeout=30) - # Ping from VM1 to VM5 should work - results.get_ping_status(vm_1, vm_1_ip, vm_5, vm_5_ip, - expected="PASS", timeout=30) + results.get_ping_status(vm_1, vm_4, expected="PASS", timeout=30) + results.get_ping_status(vm_1, vm_5, expected="PASS", timeout=30) results.add_to_summary(0, "=") logger.info("\n%s" % results.summary) diff --git a/test/functest/testcase_7.py b/test/functest/testcase_7.py new file mode 100644 index 0000000..0e4a913 --- /dev/null +++ b/test/functest/testcase_7.py @@ -0,0 +1,153 @@ +#!/usr/bin/python +# +# Copyright (c) 2015 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +""" +Testcase for router/FloatingIP & net assoc mutual exclusivity + +A testcase for ODL Bug 6962, testing whether a subnet with a router can be +network associated: +- Create two VMs, each in a subnet with a router +- Network assoc the two networks in a VPN iRT=eRT +- Try to ping from one VM to the other +- Assign a floating IP to a VM +- Ping it +""" +import argparse + +import functest.utils.functest_logger as ft_logger +import functest.utils.openstack_utils as os_utils + +import utils as test_utils +from results import Results +import config as sdnvpn_config + +parser = argparse.ArgumentParser() + +parser.add_argument("-r", "--report", + help="Create json result file", + action="store_true") + +args = parser.parse_args() + +logger = ft_logger.Logger("sdnvpn-testcase-7").getLogger() + +COMMON_CONFIG = sdnvpn_config.CommonConfig() +TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig('testcase_7') + + +def main(): + results = Results(COMMON_CONFIG.line_length) + + results.add_to_summary(0, "=") + results.add_to_summary(2, "STATUS", "SUBTEST") + results.add_to_summary(0, "=") + + nova_client = os_utils.get_nova_client() + neutron_client = os_utils.get_neutron_client() + glance_client = os_utils.get_glance_client() + + image_id = os_utils.create_glance_image(glance_client, + TESTCASE_CONFIG.image_name, + COMMON_CONFIG.image_path, + disk=COMMON_CONFIG.image_format, + container="bare", + public=True) + network_1_id, _, _ = test_utils.create_network( + neutron_client, + TESTCASE_CONFIG.net_1_name, + TESTCASE_CONFIG.subnet_1_name, + TESTCASE_CONFIG.subnet_1_cidr, + TESTCASE_CONFIG.router_1_name) + network_2_id, _, _ = test_utils.create_network( + neutron_client, + TESTCASE_CONFIG.net_2_name, + TESTCASE_CONFIG.subnet_2_name, + TESTCASE_CONFIG.subnet_2_cidr, + TESTCASE_CONFIG.router_2_name) + + 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) + vm_2 = test_utils.create_instance( + nova_client, + TESTCASE_CONFIG.instance_2_name, + image_id, + network_2_id, + sg_id, + secgroup_name=TESTCASE_CONFIG.secgroup_name) + vm_2_ip = vm_2.networks.itervalues().next()[0] + + u1 = test_utils.generate_ping_userdata([vm_2_ip]) + vm_1 = test_utils.create_instance( + nova_client, + TESTCASE_CONFIG.instance_1_name, + image_id, + network_1_id, + sg_id, + secgroup_name=TESTCASE_CONFIG.secgroup_name, + userdata=u1) + + msg = ("Create VPN with eRT==iRT") + results.record_action(msg) + vpn_name = "sdnvpn-7" + kwargs = {"import_targets": TESTCASE_CONFIG.targets, + "export_targets": TESTCASE_CONFIG.targets, + "route_distinguishers": TESTCASE_CONFIG.route_distinguishers, + "name": vpn_name} + bgpvpn = os_utils.create_bgpvpn(neutron_client, **kwargs) + bgpvpn_id = bgpvpn['bgpvpn']['id'] + logger.debug("VPN created details: %s" % bgpvpn) + + msg = ("Associate networks '%s', '%s' to the VPN." + % (TESTCASE_CONFIG.net_1_name, + TESTCASE_CONFIG.net_2_name)) + results.record_action(msg) + results.add_to_summary(0, "-") + + os_utils.create_network_association( + neutron_client, bgpvpn_id, network_1_id) + os_utils.create_network_association( + neutron_client, bgpvpn_id, network_2_id) + + test_utils.wait_for_bgp_net_assoc( + neutron_client, bgpvpn_id, network_1_id) + test_utils.wait_for_bgp_net_assoc( + neutron_client, bgpvpn_id, network_2_id) + + instances_up = test_utils.wait_for_instances_up(vm_1, vm_2) + if not instances_up: + logger.error("One or more instances is down") + + logger.info("Waiting for the VMs to connect to each other using the" + " updated network configuration") + test_utils.wait_before_subtest() + + results.get_ping_status(vm_1, vm_2, expected="PASS", timeout=200) + results.add_to_summary(0, "=") + + msg = "Assign a Floating IP to %s" % vm_2.name + results.record_action(msg) + + fip = os_utils.create_floating_ip(neutron_client) + fip_added = os_utils.add_floating_ip(nova_client, vm_2.id, fip['fip_addr']) + if fip_added: + results.add_success(msg) + else: + results.add_failure(msg) + + msg = "Ping %s via Floating IP" % vm_2.name + results.record_action(msg) + results.add_to_summary(0, "-") + results.ping_ip_test(fip['fip_addr']) + + return results.compile_summary(TESTCASE_CONFIG.success_criteria) + +if __name__ == '__main__': + main() diff --git a/test/functest/utils.py b/test/functest/utils.py index 90dfe93..cbfc88d 100644 --- a/test/functest/utils.py +++ b/test/functest/utils.py @@ -290,3 +290,14 @@ def assert_and_get_compute_nodes(nova_client, required_node_number=2): logger.debug("Compute nodes: %s" % compute_nodes) return compute_nodes + + +def open_icmp_ssh(neutron_client, security_group_id): + os_utils.create_secgroup_rule(neutron_client, + security_group_id, + 'ingress', + 'icmp') + os_utils.create_secgroup_rule(neutron_client, + security_group_id, + 'tcp', + 80, 80) |