diff options
Diffstat (limited to 'sdnvpn/test/functest/testcase_12.py')
| -rw-r--r-- | sdnvpn/test/functest/testcase_12.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sdnvpn/test/functest/testcase_12.py b/sdnvpn/test/functest/testcase_12.py index e6a7ac5..3e13d69 100644 --- a/sdnvpn/test/functest/testcase_12.py +++ b/sdnvpn/test/functest/testcase_12.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # Copyright (c) 2017 All rights reserved # This program and the accompanying materials @@ -11,8 +11,8 @@ import logging import sys -from functest.utils import openstack_utils as os_utils from sdnvpn.lib import config as sdnvpn_config +from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results @@ -100,7 +100,7 @@ def main(): if not instances_up: logger.error("One or more instances is down") - logging.info("Wait before subtest") + logger.info("Wait before subtest") test_utils.wait_before_subtest() # Get added OVS flows and groups added_ovs_flows = len(test_utils.get_ovs_flows(compute_nodes, @@ -140,7 +140,7 @@ def main(): compute_node.run_cmd("sudo ovs-vsctl set-controller {} {}". format(ovs_br, ovs_controller_conn)) - logging.info("Wait before subtest resync type 1") + logger.info("Wait before subtest resync type 1") test_utils.wait_before_subtest() # Get OVS flows added after the reconnection resynced_ovs_flows = len(test_utils.get_ovs_flows( @@ -164,7 +164,7 @@ def main(): compute_node.run_cmd("sudo iptables -D OUTPUT -p tcp --dport 6653" " -j DROP") - logging.info("Wait before subtest resync type 2") + logger.info("Wait before subtest resync type 2") test_utils.wait_before_subtest() # Get OVS flows added after the reconnection resynced_ovs_flows = len(test_utils.get_ovs_flows( @@ -202,7 +202,9 @@ def record_test_result(expected_flow_count, actual_flow_count, " actual flow count %s" % (str(expected_flow_count), str(actual_flow_count))) results.add_to_summary(0, "-") - if expected_flow_count == actual_flow_count: + # Using <= for flow validation because ODL adds some more + # ARP/ICMP flows after VMs spawn up + if expected_flow_count <= actual_flow_count: results.add_success(msg) else: results.add_failure(msg) @@ -220,5 +222,4 @@ def record_test_result(expected_flow_count, actual_flow_count, if __name__ == '__main__': - logging.basicConfig(level=logging.INFO) sys.exit(main()) |