Default value is set to 60 seconds.
Closes #118
Signed-off-by: Jiri Prochazka jprochaz@redhat.com --- recipes/regression_tests/phase1/3_vlans.py | 13 +++++++------ recipes/regression_tests/phase1/3_vlans.xml | 1 + .../phase1/3_vlans_over_active_backup_bond.xml | 1 + .../regression_tests/phase1/3_vlans_over_bond.py | 13 +++++++------ .../phase1/3_vlans_over_round_robin_bond.xml | 1 + .../regression_tests/phase1/active_backup_bond.xml | 1 + .../phase1/active_backup_double_bond.xml | 1 + recipes/regression_tests/phase1/bonding_test.py | 13 +++++++------ .../regression_tests/phase1/round_robin_bond.xml | 1 + .../phase1/round_robin_double_bond.xml | 1 + recipes/regression_tests/phase1/simple_ping.py | 4 ++-- ...rtual_bridge_2_vlans_over_active_backup_bond.xml | 1 + .../phase1/virtual_bridge_2_vlans_over_bond.py | 9 +++++---- .../phase1/virtual_bridge_vlan_in_guest.py | 9 +++++---- .../phase1/virtual_bridge_vlan_in_guest.xml | 1 + .../phase1/virtual_bridge_vlan_in_host.py | 9 +++++---- .../phase1/virtual_bridge_vlan_in_host.xml | 1 + .../phase2/3_vlans_over_active_backup_team.xml | 1 + .../phase2/3_vlans_over_round_robin_team.xml | 1 + .../regression_tests/phase2/3_vlans_over_team.py | 13 +++++++------ .../phase2/active_backup_double_team.xml | 1 + .../regression_tests/phase2/active_backup_team.xml | 1 + .../active_backup_team_vs_active_backup_bond.xml | 1 + .../active_backup_team_vs_round_robin_bond.xml | 1 + .../phase2/round_robin_double_team.xml | 1 + .../regression_tests/phase2/round_robin_team.xml | 1 + .../round_robin_team_vs_active_backup_bond.xml | 1 + .../phase2/round_robin_team_vs_round_robin_bond.xml | 1 + recipes/regression_tests/phase2/team_test.py | 21 +++++++++++---------- ...al_ovs_bridge_2_vlans_over_active_backup_bond.py | 9 +++++---- ...l_ovs_bridge_2_vlans_over_active_backup_bond.xml | 1 + .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 9 +++++---- .../phase2/virtual_ovs_bridge_vlan_in_guest.xml | 1 + .../phase2/virtual_ovs_bridge_vlan_in_host.py | 9 +++++---- .../phase2/virtual_ovs_bridge_vlan_in_host.xml | 1 + 35 files changed, 94 insertions(+), 60 deletions(-)
diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index 7e79a9f..7e2360e 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -17,8 +17,9 @@ m2.sync_resources(modules=["IcmpPing", "Icmp6Ping", "Netperf"]) vlans = ["vlan10", "vlan20", "vlan30"] offloads = ["gso", "gro", "tso"]
-ipv = ctl.get_alias('ipv') -mtu = ctl.get_alias('mtu') +ipv = ctl.get_alias("ipv") +mtu = ctl.get_alias("mtu") +netperf_duration = ctl.get_alias("netperf_duration")
m1_phy1 = m1.get_interface("eth1") m1_phy1.set_mtu(mtu) @@ -69,7 +70,7 @@ for vlan1 in vlans: "role" : "client", "netperf_server" : m1.get_ip(vlan1, 0), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s" % m2.get_ip(vlan1) @@ -80,7 +81,7 @@ for vlan1 in vlans: "role" : "client", "netperf_server" : m1.get_ip(vlan1, 0), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s" % m2.get_ip(vlan1) @@ -91,7 +92,7 @@ for vlan1 in vlans: "role" : "client", "netperf_server" : m1.get_ip(vlan1, 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s -6" % m2.get_ip(vlan1, 1) @@ -102,7 +103,7 @@ for vlan1 in vlans: "role" : "client", "netperf_server" : m1.get_ip(vlan1, 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s -6" % m2.get_ip(vlan1, 1) diff --git a/recipes/regression_tests/phase1/3_vlans.xml b/recipes/regression_tests/phase1/3_vlans.xml index ba0455c..aeb3ed1 100644 --- a/recipes/regression_tests/phase1/3_vlans.xml +++ b/recipes/regression_tests/phase1/3_vlans.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml b/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml index 60b2efd..bcaf221 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml +++ b/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index dde2359..6fa1d80 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -17,8 +17,9 @@ m2.sync_resources(modules=["IcmpPing", "Icmp6Ping", "Netperf"]) vlans = ["vlan10", "vlan20", "vlan30"] offloads = ["gso", "gro", "tso"]
-ipv = ctl.get_alias('ipv') -mtu = ctl.get_alias('mtu') +ipv = ctl.get_alias("ipv") +mtu = ctl.get_alias("mtu") +netperf_duration = ctl.get_alias("netperf_duration")
m1_bond = m1.get_interface("test_bond") m1_bond.set_mtu(mtu) @@ -69,7 +70,7 @@ for vlan1 in vlans: "role" : "client", "netperf_server" : m1.get_ip(vlan1, 0), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s" % m2.get_ip(vlan1, 0) @@ -80,7 +81,7 @@ for vlan1 in vlans: "role" : "client", "netperf_server" : m1.get_ip(vlan1, 0), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s" % m2.get_ip(vlan1, 0) @@ -91,7 +92,7 @@ for vlan1 in vlans: "role" : "client", "netperf_server" : m1.get_ip(vlan1, 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s -6" % m2.get_ip(vlan1, 1) @@ -102,7 +103,7 @@ for vlan1 in vlans: "role" : "client", "netperf_server" : m1.get_ip(vlan1, 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s -6" % m2.get_ip(vlan1, 1) diff --git a/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml b/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml index 1aa0149..922f696 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml +++ b/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase1/active_backup_bond.xml b/recipes/regression_tests/phase1/active_backup_bond.xml index 596dec5..720c6c2 100644 --- a/recipes/regression_tests/phase1/active_backup_bond.xml +++ b/recipes/regression_tests/phase1/active_backup_bond.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase1/active_backup_double_bond.xml b/recipes/regression_tests/phase1/active_backup_double_bond.xml index dec15df..417622c 100644 --- a/recipes/regression_tests/phase1/active_backup_double_bond.xml +++ b/recipes/regression_tests/phase1/active_backup_double_bond.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index d2d6378..acc3748 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -17,8 +17,9 @@ m2.sync_resources(modules=["IcmpPing", "Icmp6Ping", "Netperf"])
offloads = ["tso", "gro", "gso"]
-ipv = ctl.get_alias('ipv') -mtu = ctl.get_alias('mtu') +ipv = ctl.get_alias("ipv") +mtu = ctl.get_alias("mtu") +netperf_duration = ctl.get_alias("netperf_duration")
test_if1 = m1.get_interface("test_if") test_if1.set_mtu(mtu) @@ -58,7 +59,7 @@ netperf_cli_tcp = ctl.get_module("Netperf", options = { "role" : "client", "netperf_server" : m1.get_ip("test_if", 0), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s" % m2.get_ip("test_if", 0) }) @@ -67,7 +68,7 @@ netperf_cli_udp = ctl.get_module("Netperf", options = { "role" : "client", "netperf_server" : m1.get_ip("test_if", 0), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s" % m2.get_ip("test_if", 0) }) @@ -77,7 +78,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : m1.get_ip("test_if", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s -6" % m2.get_ip("test_if", 1) @@ -87,7 +88,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : m1.get_ip("test_if", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s -6" % m2.get_ip("test_if", 1) diff --git a/recipes/regression_tests/phase1/round_robin_bond.xml b/recipes/regression_tests/phase1/round_robin_bond.xml index 516bf5b..619b4f5 100644 --- a/recipes/regression_tests/phase1/round_robin_bond.xml +++ b/recipes/regression_tests/phase1/round_robin_bond.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase1/round_robin_double_bond.xml b/recipes/regression_tests/phase1/round_robin_double_bond.xml index 51a871e..4c00f70 100644 --- a/recipes/regression_tests/phase1/round_robin_double_bond.xml +++ b/recipes/regression_tests/phase1/round_robin_double_bond.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase1/simple_ping.py b/recipes/regression_tests/phase1/simple_ping.py index 0882fed..f9e5837 100644 --- a/recipes/regression_tests/phase1/simple_ping.py +++ b/recipes/regression_tests/phase1/simple_ping.py @@ -24,8 +24,8 @@ ping_mod6 = ctl.get_module("Icmp6Ping",
ctl.wait(15)
-ipv = ctl.get_alias('ipv') -mtu = ctl.get_alias('mtu') +ipv = ctl.get_alias("ipv") +mtu = ctl.get_alias("mtu")
test_if1 = hostA.get_interface("testiface") test_if1.set_mtu(mtu) diff --git a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml index 6877739..2c9ed11 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml @@ -1,6 +1,7 @@ <lnstrecipe> <define> <alias name="ipv" value="both" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="host1"> diff --git a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py index 141f4f0..c4f93d7 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py @@ -25,6 +25,7 @@ g4.sync_resources(modules=["IcmpPing", "Icmp6Ping", "Netperf"]) offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv") +netperf_duration = ctl.get_alias("netperf_duration")
ping_mod = ctl.get_module("IcmpPing", options={ @@ -74,7 +75,7 @@ netperf_cli_tcp = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : g1.get_ip("guestnic"), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s" % g3.get_ip("guestnic") @@ -84,7 +85,7 @@ netperf_cli_udp = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : g1.get_ip("guestnic"), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s" % g3.get_ip("guestnic") @@ -95,7 +96,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : g1.get_ip("guestnic", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s -6" % g3.get_ip("guestnic", 1) @@ -106,7 +107,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : g1.get_ip("guestnic", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s -6" % g3.get_ip("guestnic", 1) diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py index 1a2f911..bc90f5d 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -19,6 +19,7 @@ h2.sync_resources(modules=["IcmpPing", "Icmp6Ping", "Netperf"]) offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv") +netperf_duration = ctl.get_alias("netperf_duration")
ping_mod = ctl.get_module("IcmpPing", options={ @@ -53,7 +54,7 @@ netperf_cli_tcp = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : g1.get_ip("vlan10"), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s" % h2.get_ip("vlan10") @@ -63,7 +64,7 @@ netperf_cli_udp = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : g1.get_ip("vlan10"), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s" % h2.get_ip("vlan10") @@ -74,7 +75,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : g1.get_ip("vlan10", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s -6" % h2.get_ip("vlan10", 1) @@ -85,7 +86,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : g1.get_ip("vlan10", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s -6" % h2.get_ip("vlan10", 1) diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml index 1899b38..ea49082 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml @@ -1,6 +1,7 @@ <lnstrecipe> <define> <alias name="ipv" value="both" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="host1"> diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py index 0188686..0344641 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -19,6 +19,7 @@ h2.sync_resources(modules=["IcmpPing", "Icmp6Ping", "Netperf"]) offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv") +netperf_duration = ctl.get_alias("netperf_duration")
ping_mod = ctl.get_module("IcmpPing", options={ @@ -53,7 +54,7 @@ netperf_cli_tcp = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : g1.get_ip("guestnic"), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s" % h2.get_ip("vlan10") @@ -63,7 +64,7 @@ netperf_cli_udp = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : g1.get_ip("guestnic"), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s" % h2.get_ip("vlan10") @@ -74,7 +75,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : g1.get_ip("guestnic", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s -6" % h2.get_ip("vlan10", 1) @@ -85,7 +86,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : g1.get_ip("guestnic", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s -6" % h2.get_ip("vlan10", 1) diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml index 7fb917e..3649ca9 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml @@ -1,6 +1,7 @@ <lnstrecipe> <define> <alias name="ipv" value="both" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="host1"> diff --git a/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml b/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml index 4d27752..87a056a 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml +++ b/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml b/recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml index d8115b5..612fe01 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml +++ b/recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index 74b5a5a..fc04b29 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -17,8 +17,9 @@ m2.sync_resources(modules=["IcmpPing", "Icmp6Ping", "Netperf"]) vlans = ["vlan10", "vlan20", "vlan30"] offloads = ["gso", "gro", "tso"]
-ipv = ctl.get_alias('ipv') -mtu = ctl.get_alias('mtu') +ipv = ctl.get_alias("ipv") +mtu = ctl.get_alias("mtu") +netperf_duration = ctl.get_alias("netperf_duration")
m1_team = m1.get_interface("test_if") m1_team.set_mtu(mtu) @@ -70,7 +71,7 @@ for vlan1 in vlans: "role" : "client", "netperf_server" : m1.get_ip(vlan1, 0), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s" % m2.get_ip(vlan1, 0) @@ -81,7 +82,7 @@ for vlan1 in vlans: "role" : "client", "netperf_server" : m1.get_ip(vlan1, 0), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s" % m2.get_ip(vlan1, 0) @@ -92,7 +93,7 @@ for vlan1 in vlans: "role" : "client", "netperf_server" : m1.get_ip(vlan1, 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s -6" % m2.get_ip(vlan1, 1) @@ -102,7 +103,7 @@ for vlan1 in vlans: "role" : "client", "netperf_server" : m1.get_ip(vlan1, 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s -6" % m2.get_ip(vlan1, 1) diff --git a/recipes/regression_tests/phase2/active_backup_double_team.xml b/recipes/regression_tests/phase2/active_backup_double_team.xml index 387937a..ade6a3e 100644 --- a/recipes/regression_tests/phase2/active_backup_double_team.xml +++ b/recipes/regression_tests/phase2/active_backup_double_team.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/active_backup_team.xml b/recipes/regression_tests/phase2/active_backup_team.xml index b798f5b..1897d4f 100644 --- a/recipes/regression_tests/phase2/active_backup_team.xml +++ b/recipes/regression_tests/phase2/active_backup_team.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml b/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml index b1cdbfe..21b5463 100644 --- a/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml +++ b/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/active_backup_team_vs_round_robin_bond.xml b/recipes/regression_tests/phase2/active_backup_team_vs_round_robin_bond.xml index 6905721..a949c07 100644 --- a/recipes/regression_tests/phase2/active_backup_team_vs_round_robin_bond.xml +++ b/recipes/regression_tests/phase2/active_backup_team_vs_round_robin_bond.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/round_robin_double_team.xml b/recipes/regression_tests/phase2/round_robin_double_team.xml index 8fcedca..450bad8 100644 --- a/recipes/regression_tests/phase2/round_robin_double_team.xml +++ b/recipes/regression_tests/phase2/round_robin_double_team.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/round_robin_team.xml b/recipes/regression_tests/phase2/round_robin_team.xml index d9d277b..ba1b8fc 100644 --- a/recipes/regression_tests/phase2/round_robin_team.xml +++ b/recipes/regression_tests/phase2/round_robin_team.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/round_robin_team_vs_active_backup_bond.xml b/recipes/regression_tests/phase2/round_robin_team_vs_active_backup_bond.xml index 76513da..e389126 100644 --- a/recipes/regression_tests/phase2/round_robin_team_vs_active_backup_bond.xml +++ b/recipes/regression_tests/phase2/round_robin_team_vs_active_backup_bond.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/round_robin_team_vs_round_robin_bond.xml b/recipes/regression_tests/phase2/round_robin_team_vs_round_robin_bond.xml index e91558c..31e354a 100644 --- a/recipes/regression_tests/phase2/round_robin_team_vs_round_robin_bond.xml +++ b/recipes/regression_tests/phase2/round_robin_team_vs_round_robin_bond.xml @@ -2,6 +2,7 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 88cbb8c..ee0456a 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -16,8 +16,9 @@ m2.sync_resources(modules=["IcmpPing", "Icmp6Ping", "Netperf"])
offloads = ["tso", "gro", "gso"]
-ipv = ctl.get_alias('ipv') -mtu = ctl.get_alias('mtu') +ipv = ctl.get_alias("ipv") +mtu = ctl.get_alias("mtu") +netperf_duration = ctl.get_alias("netperf_duration")
test_if1 = m1.get_interface("test_if") test_if1.set_mtu(mtu) @@ -58,7 +59,7 @@ netperf_cli_tcp = ctl.get_module("Netperf", options = { "role" : "client", "netperf_server" : m1.get_ip("test_if", 0), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s" % m2.get_ip("test_if", 0) }) @@ -67,7 +68,7 @@ netperf_cli_udp = ctl.get_module("Netperf", options = { "role" : "client", "netperf_server" : m1.get_ip("test_if", 0), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s" % m2.get_ip("test_if", 0) }) @@ -77,7 +78,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : m1.get_ip("test_if", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s -6" % m2.get_ip("test_if", 1) @@ -87,7 +88,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : m1.get_ip("test_if", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s -6" % m2.get_ip("test_if", 1) @@ -150,7 +151,7 @@ netperf_cli_tcp = ctl.get_module("Netperf", options = { "role" : "client", "netperf_server" : m2.get_ip("test_if", 0), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s" % m1.get_ip("test_if", 0) }) @@ -159,7 +160,7 @@ netperf_cli_udp = ctl.get_module("Netperf", options = { "role" : "client", "netperf_server" : m2.get_ip("test_if", 0), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s" % m1.get_ip("test_if", 0) }) @@ -169,7 +170,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : m2.get_ip("test_if", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s -6" % m1.get_ip("test_if", 1) @@ -179,7 +180,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : m2.get_ip("test_if", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s -6" % m1.get_ip("test_if", 1) diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py index 8daa471..4dcded8 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py @@ -25,6 +25,7 @@ g4.sync_resources(modules=["IcmpPing", "Icmp6Ping", "Netperf"]) offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv") +netperf_duration = ctl.get_alias("netperf_duration")
ping_mod = ctl.get_module("IcmpPing", options={ @@ -75,7 +76,7 @@ netperf_cli_tcp = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : g1.get_ip("guestnic"), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s" % g3.get_ip("guestnic") @@ -85,7 +86,7 @@ netperf_cli_udp = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : g1.get_ip("guestnic"), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s" % g3.get_ip("guestnic") @@ -96,7 +97,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : g1.get_ip("guestnic", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s -6" % g3.get_ip("guestnic", 1) @@ -107,7 +108,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : g1.get_ip("guestnic", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s -6" % g3.get_ip("guestnic", 1) diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml index 5e54823..4f1c7b1 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml @@ -1,6 +1,7 @@ <lnstrecipe> <define> <alias name="ipv" value="both" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="host1"> diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py index 662e888..e8099b8 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py @@ -19,6 +19,7 @@ h2.sync_resources(modules=["IcmpPing", "Icmp6Ping", "Netperf"]) offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv") +netperf_duration = ctl.get_alias("netperf_duration")
ping_mod = ctl.get_module("IcmpPing", options={ @@ -53,7 +54,7 @@ netperf_cli_tcp = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : g1.get_ip("vlan10"), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s" % h2.get_ip("vlan10") @@ -63,7 +64,7 @@ netperf_cli_udp = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : g1.get_ip("vlan10"), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s" % h2.get_ip("vlan10") @@ -74,7 +75,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : g1.get_ip("vlan10", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s -6" % h2.get_ip("vlan10", 1) @@ -85,7 +86,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : g1.get_ip("vlan10", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s -6" % h2.get_ip("vlan10", 1) diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml index eb031b8..6f08cdd 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml @@ -1,6 +1,7 @@ <lnstrecipe> <define> <alias name="ipv" value="both" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="host1"> diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py index 15122c4..fdf7186 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py @@ -19,6 +19,7 @@ h2.sync_resources(modules=["IcmpPing", "Icmp6Ping", "Netperf"]) offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv") +netperf_duration = ctl.get_alias("netperf_duration")
ping_mod = ctl.get_module("IcmpPing", options={ @@ -53,7 +54,7 @@ netperf_cli_tcp = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : g1.get_ip("guestnic"), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s" % h2.get_ip("vlan10") @@ -63,7 +64,7 @@ netperf_cli_udp = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : g1.get_ip("guestnic"), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s" % h2.get_ip("vlan10") @@ -74,7 +75,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : g1.get_ip("guestnic", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "TCP_STREAM", "netperf_opts" : "-L %s -6" % h2.get_ip("vlan10", 1) @@ -85,7 +86,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "role" : "client", "netperf_server" : g1.get_ip("guestnic", 1), - "duration" : 60, + "duration" : netperf_duration, "testname" : "UDP_STREAM", "netperf_opts" : "-L %s -6" % h2.get_ip("vlan10", 1) diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml index d425b82..a5bbc39 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml @@ -1,6 +1,7 @@ <lnstrecipe> <define> <alias name="ipv" value="both" /> + <alias name="netperf_duration" value="60" /> </define> <network> <host id="host1">
lnst-developers@lists.fedorahosted.org
-
Jiri Prochazka