From: Ondrej Lichtner olichtne@redhat.com

This commit adds regex patterns that should be ignored during hash generation so that the hashes are stable between beaker runs. I also changed the ids of interfaces connecting guests in the 2_virt_ovs_vxlan.xml recipe to be consistent with the other virt recipes.

Signed-off-by: Ondrej Lichtner olichtne@redhat.com --- .../regression_tests/phase3/2_virt_ovs_vxlan.py | 36 +++++++++++++++++----- .../regression_tests/phase3/2_virt_ovs_vxlan.xml | 16 +++++----- .../regression_tests/phase3/novirt_ovs_vxlan.py | 20 +++++++----- recipes/regression_tests/phase3/vxlan_multicast.py | 34 ++++++++++++++------ .../regression_tests/phase3/vxlan_multicast.xml | 4 +-- recipes/regression_tests/phase3/vxlan_remote.py | 20 +++++++----- 6 files changed, 87 insertions(+), 43 deletions(-)

diff --git a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py index 45b5873..57f1373 100644 --- a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py +++ b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py @@ -129,8 +129,13 @@ if ipv in [ 'ipv4', 'both' ]: result_tcp = perf_api.new_result("tcp_ipv4_id", "tcp_ipv4_result", hash_ignore=[ - 'kernel_release', - 'redhat_release']) + r'kernel_release', + r'redhat_release', + r'test_host\d+.hostname', + r'test_host\d+..*hwaddr', + r'machine_h\d+..*ovs\d*.hwaddr', + r'machine_h\d+..*tap\d*.hwaddr', + r'machine_h\d+..*tap\d*.devname']) result_tcp.add_tag(product_name) if nperf_num_parallel > 1: result_tcp.add_tag("multithreaded") @@ -159,8 +164,13 @@ if ipv in [ 'ipv4', 'both' ]: result_udp = perf_api.new_result("udp_ipv4_id", "udp_ipv4_result", hash_ignore=[ - 'kernel_release', - 'redhat_release']) + r'kernel_release', + r'redhat_release', + r'test_host\d+.hostname', + r'test_host\d+..*hwaddr', + r'machine_h\d+..*ovs\d*.hwaddr', + r'machine_h\d+..*tap\d*.hwaddr', + r'machine_h\d+..*tap\d*.devname']) result_udp.add_tag(product_name) if nperf_num_parallel > 1: result_udp.add_tag("multithreaded") @@ -189,8 +199,13 @@ if ipv in [ 'ipv6', 'both' ]: result_tcp = perf_api.new_result("tcp_ipv6_id", "tcp_ipv6_result", hash_ignore=[ - 'kernel_release', - 'redhat_release']) + r'kernel_release', + r'redhat_release', + r'test_host\d+.hostname', + r'test_host\d+..*hwaddr', + r'machine_h\d+..*ovs\d*.hwaddr', + r'machine_h\d+..*tap\d*.hwaddr', + r'machine_h\d+..*tap\d*.devname']) result_tcp.add_tag(product_name) if nperf_num_parallel > 1: result_tcp.add_tag("multithreaded") @@ -219,8 +234,13 @@ if ipv in [ 'ipv6', 'both' ]: result_udp = perf_api.new_result("udp_ipv6_id", "udp_ipv6_result", hash_ignore=[ - 'kernel_release', - 'redhat_release']) + r'kernel_release', + r'redhat_release', + r'test_host\d+.hostname', + r'test_host\d+..*hwaddr', + r'machine_h\d+..*ovs\d*.hwaddr', + r'machine_h\d+..*tap\d*.hwaddr', + r'machine_h\d+..*tap\d*.devname']) result_udp.add_tag(product_name) if nperf_num_parallel > 1: result_udp.add_tag("multithreaded") diff --git a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml index f16f9bc..a9c97d1 100644 --- a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml +++ b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml @@ -21,16 +21,16 @@ <address value="{$net}.1/24"/> </addresses> </eth> - <eth id="if2" label="to_guest1"/> - <eth id="if3" label="to_guest2"/> + <eth id="tap1" label="to_guest1"/> + <eth id="tap2" label="to_guest2"/> <ovs_bridge id="ovs1"> <slaves> - <slave id="if2"> + <slave id="tap1"> <options> <option name="ofport_request" value="5"/> </options> </slave> - <slave id="if3"> + <slave id="tap2"> <options> <option name="ofport_request" value="6"/> </options> @@ -80,16 +80,16 @@ <address value="{$net}.2/24"/> </addresses> </eth> - <eth id="if2" label="to_guest3"/> - <eth id="if3" label="to_guest4"/> + <eth id="tap1" label="to_guest3"/> + <eth id="tap2" label="to_guest4"/> <ovs_bridge id="ovs2"> <slaves> - <slave id="if2"> + <slave id="tap1"> <options> <option name="ofport_request" value="5"/> </options> </slave> - <slave id="if3"> + <slave id="tap2"> <options> <option name="ofport_request" value="6"/> </options> diff --git a/recipes/regression_tests/phase3/novirt_ovs_vxlan.py b/recipes/regression_tests/phase3/novirt_ovs_vxlan.py index f69e77f..d3b0ac9 100644 --- a/recipes/regression_tests/phase3/novirt_ovs_vxlan.py +++ b/recipes/regression_tests/phase3/novirt_ovs_vxlan.py @@ -80,8 +80,9 @@ if ipv in [ 'ipv4', 'both' ]: result_tcp = perf_api.new_result("tcp_ipv4_id", "tcp_ipv4_result", hash_ignore=[ - 'kernel_release', - 'redhat_release']) + r'kernel_release', + r'redhat_release', + r'interface_ovs\d+.hwaddr']) result_tcp.add_tag(product_name) if nperf_num_parallel > 1: result_tcp.add_tag("multithreaded") @@ -111,8 +112,9 @@ if ipv in [ 'ipv4', 'both' ]: result_udp = perf_api.new_result("udp_ipv4_id", "udp_ipv4_result", hash_ignore=[ - 'kernel_release', - 'redhat_release']) + r'kernel_release', + r'redhat_release', + r'interface_ovs\d+.hwaddr']) result_udp.add_tag(product_name) if nperf_num_parallel > 1: result_udp.add_tag("multithreaded") @@ -144,8 +146,9 @@ if ipv in [ 'ipv6', 'both' ]: result_tcp = perf_api.new_result("tcp_ipv6_id", "tcp_ipv6_result", hash_ignore=[ - 'kernel_release', - 'redhat_release']) + r'kernel_release', + r'redhat_release', + r'interface_ovs\d+.hwaddr']) result_tcp.add_tag(product_name) if nperf_num_parallel > 1: result_tcp.add_tag("multithreaded") @@ -175,8 +178,9 @@ if ipv in [ 'ipv6', 'both' ]: result_udp = perf_api.new_result("udp_ipv6_id", "udp_ipv6_result", hash_ignore=[ - 'kernel_release', - 'redhat_release']) + r'kernel_release', + r'redhat_release', + r'interface_ovs\d+.hwaddr']) result_udp.add_tag(product_name) if nperf_num_parallel > 1: result_udp.add_tag("multithreaded") diff --git a/recipes/regression_tests/phase3/vxlan_multicast.py b/recipes/regression_tests/phase3/vxlan_multicast.py index 9cfa900..293e8ec 100644 --- a/recipes/regression_tests/phase3/vxlan_multicast.py +++ b/recipes/regression_tests/phase3/vxlan_multicast.py @@ -54,7 +54,7 @@ if nperf_cpupin: g1.run("service irqbalance stop")

m1_phy1 = m1.get_interface("eth1") - m1_phy2 = m1.get_interface("eth2") + m1_phy2 = m1.get_interface("tap1") m2_phy1 = m2.get_interface("eth1") g1_phy1 = g1.get_interface("eth1") dev_list = [(m1, m1_phy1), (m1, m1_phy2), (m2, m2_phy1), (g1, g1_phy1)] @@ -102,8 +102,12 @@ if ipv in [ 'ipv4', 'both' ]: result_tcp = perf_api.new_result("tcp_ipv4_id", "tcp_ipv4_result", hash_ignore=[ - 'kernel_release', - 'redhat_release']) + r'kernel_release', + r'redhat_release', + r'testmachine\d+.interface_tap\d+.hwaddr', + r'guest\d+.hostname', + r'guest\d+.interface_eth\d+.hwaddr', + r'test_if.hwaddr']) result_tcp.add_tag(product_name) if nperf_num_parallel > 1: result_tcp.add_tag("multithreaded") @@ -133,8 +137,12 @@ if ipv in [ 'ipv4', 'both' ]: result_udp = perf_api.new_result("udp_ipv4_id", "udp_ipv4_result", hash_ignore=[ - 'kernel_release', - 'redhat_release']) + r'kernel_release', + r'redhat_release', + r'testmachine\d+.interface_tap\d+.hwaddr', + r'guest\d+.hostname', + r'guest\d+.interface_eth\d+.hwaddr', + r'test_if.hwaddr']) result_udp.add_tag(product_name) if nperf_num_parallel > 1: result_udp.add_tag("multithreaded") @@ -165,8 +173,12 @@ if ipv in [ 'ipv6', 'both' ]: result_tcp = perf_api.new_result("tcp_ipv6_id", "tcp_ipv6_result", hash_ignore=[ - 'kernel_release', - 'redhat_release']) + r'kernel_release', + r'redhat_release', + r'testmachine\d+.interface_tap\d+.hwaddr', + r'guest\d+.hostname', + r'guest\d+.interface_eth\d+.hwaddr', + r'test_if.hwaddr']) result_tcp.add_tag(product_name) if nperf_num_parallel > 1: result_tcp.add_tag("multithreaded") @@ -196,8 +208,12 @@ if ipv in [ 'ipv6', 'both' ]: result_udp = perf_api.new_result("udp_ipv6_id", "udp_ipv6_result", hash_ignore=[ - 'kernel_release', - 'redhat_release']) + r'kernel_release', + r'redhat_release', + r'testmachine\d+.interface_tap\d+.hwaddr', + r'guest\d+.hostname', + r'guest\d+.interface_eth\d+.hwaddr', + r'test_if.hwaddr']) result_udp.add_tag(product_name) if nperf_num_parallel > 1: result_udp.add_tag("multithreaded") diff --git a/recipes/regression_tests/phase3/vxlan_multicast.xml b/recipes/regression_tests/phase3/vxlan_multicast.xml index cfdb4ac..87b2cb3 100644 --- a/recipes/regression_tests/phase3/vxlan_multicast.xml +++ b/recipes/regression_tests/phase3/vxlan_multicast.xml @@ -17,11 +17,11 @@ <host id="testmachine1"> <interfaces> <eth id="eth1" label="tnet"/> - <eth id="eth2" label="to_guest1"/> + <eth id="tap1" label="to_guest1"/> <bridge id="br0"> <slaves> <slave id="eth1"/> - <slave id="eth2"/> + <slave id="tap1"/> </slaves> <addresses> <address value="{$net}.1/24" /> diff --git a/recipes/regression_tests/phase3/vxlan_remote.py b/recipes/regression_tests/phase3/vxlan_remote.py index 9086a1e..712c34b 100644 --- a/recipes/regression_tests/phase3/vxlan_remote.py +++ b/recipes/regression_tests/phase3/vxlan_remote.py @@ -76,8 +76,9 @@ if ipv in [ 'ipv4', 'both' ]: result_tcp = perf_api.new_result("tcp_ipv4_id", "tcp_ipv4_result", hash_ignore=[ - 'kernel_release', - 'redhat_release']) + r'kernel_release', + r'redhat_release', + r'test_if.hwaddr']) result_tcp.add_tag(product_name) if nperf_num_parallel > 1: result_tcp.add_tag("multithreaded") @@ -107,8 +108,9 @@ if ipv in [ 'ipv4', 'both' ]: result_udp = perf_api.new_result("udp_ipv4_id", "udp_ipv4_result", hash_ignore=[ - 'kernel_release', - 'redhat_release']) + r'kernel_release', + r'redhat_release', + r'test_if.hwaddr']) result_udp.add_tag(product_name) if nperf_num_parallel > 1: result_udp.add_tag("multithreaded") @@ -143,8 +145,9 @@ if ipv in [ 'ipv6', 'both' ]: result_tcp = perf_api.new_result("tcp_ipv6_id", "tcp_ipv6_result", hash_ignore=[ - 'kernel_release', - 'redhat_release']) + r'kernel_release', + r'redhat_release', + r'test_if.hwaddr']) result_tcp.add_tag(product_name) if nperf_num_parallel > 1: result_tcp.add_tag("multithreaded") @@ -174,8 +177,9 @@ if ipv in [ 'ipv6', 'both' ]: result_udp = perf_api.new_result("udp_ipv6_id", "udp_ipv6_result", hash_ignore=[ - 'kernel_release', - 'redhat_release']) + r'kernel_release', + r'redhat_release', + r'test_if.hwaddr']) result_udp.add_tag(product_name) if nperf_num_parallel > 1: result_udp.add_tag("multithreaded")