Fri, May 20, 2016 at 10:06:36AM CEST, olichtne(a)redhat.com wrote:
From: Ondrej Lichtner <olichtne(a)redhat.com>
This adds all the missing features that recipes from other phases have
but were skipped for the initial vxlan recipes. This includes:
* cpu pinning
* multithreaded netperf mode
!!!!!!!! CAUTION !!!!!!!!!
this works differently than other phases - it's controlled by just
the nperf_num_parallel alias - when '==1' then mode is normal and
when >1 then mode is multithreaded.
Don't forget that when multithreading is used, confidence is
calculated manually by the LNST Netperf module instead of the
netperf tool.
* netperf debug alias
* Removed the rest of the commented code related to offloads that aren't
used in these vxlan recipes
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
.../regression_tests/phase3/2_virt_ovs_vxlan.py | 75 +++++++++++----------
.../regression_tests/phase3/2_virt_ovs_vxlan.xml | 4 +-
.../regression_tests/phase3/novirt_ovs_vxlan.py | 58 ++++++++--------
.../regression_tests/phase3/novirt_ovs_vxlan.xml | 4 +-
.../regression_tests/phase3/vxlan_multicast.xml | 4 +-
recipes/regression_tests/phase3/vxlan_remote.xml | 4 +-
recipes/regression_tests/phase3/vxlan_test.py | 78 ++++++----------------
7 files changed, 102 insertions(+), 125 deletions(-)
diff --git a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py
b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py
index 910f2fa..79820e0 100644
--- a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py
+++ b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py
@@ -38,9 +38,10 @@ netperf_duration = int(ctl.get_alias("netperf_duration"))
nperf_reserve = int(ctl.get_alias("nperf_reserve"))
nperf_confidence = ctl.get_alias("nperf_confidence")
nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
+nperf_cpupin = ctl.get_alias("nperf_cpupin")
nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
-nperf_mode = ctl.get_alias("nperf_mode")
nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
+nperf_debug = ctl.get_alias("nperf_debug")
pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([guest1, guest2, guest3, guest4],
@@ -56,17 +57,21 @@ g2_nic.set_mtu(mtu)
g3_nic.set_mtu(mtu)
g4_nic.set_mtu(mtu)
-host1.run("service irqbalance stop")
-host2.run("service irqbalance stop")
-guest1.run("service irqbalance stop")
-guest2.run("service irqbalance stop")
-guest3.run("service irqbalance stop")
-guest4.run("service irqbalance stop")
+if nperf_cpupin:
+ host1.run("service irqbalance stop")
+ host2.run("service irqbalance stop")
+ guest1.run("service irqbalance stop")
+ guest2.run("service irqbalance stop")
+ guest3.run("service irqbalance stop")
+ guest4.run("service irqbalance stop")
-#this will pin devices irqs to cpu #0
-for m, d in [(guest1, g1_nic), (guest2, g2_nic), (guest3, g3_nic), (guest4, g4_nic)]:
- pin_dev_irqs(m, d, 0)
+ #this will pin devices irqs to cpu #0
+ for m, d in [(guest1, g1_nic), (guest2, g2_nic), (guest3, g3_nic), (guest4,
g4_nic)]:
+ pin_dev_irqs(m, d, 0)
I'm not sure if this is necessary. In the phase1 and phase2 tests I do
this only on the host machines not the guests. The reason is that I expect
the virtual guests are using just one CPU therefore it did not make sense to
pin irqs inside guest. Having said that I'm ok with that, could be handy
when we run guests with 2 cpus allocated.
>
>+nperf_opts = ""
>+if nperf_cpupin and nperf_num_parallel == 1:
>+ nperf_opts = " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
>
> ctl.wait(15)
>
>@@ -116,17 +121,6 @@ if ipv in ['ipv6', 'both']:
> (guest4, g4_nic, 1, {"scope": 0}),
> options=ping_opts, expect="fail")
>
>-# if nperf_mode == "multi":
>- # netperf_cli_tcp.unset_option("confidence")
>- # netperf_cli_udp.unset_option("confidence")
>- # netperf_cli_tcp6.unset_option("confidence")
>- # netperf_cli_udp6.unset_option("confidence")
>-
>- # netperf_cli_tcp.update_options({"num_parallel": nperf_num_parallel})
>- # netperf_cli_udp.update_options({"num_parallel": nperf_num_parallel})
>- # netperf_cli_tcp6.update_options({"num_parallel":
nperf_num_parallel})
>- # netperf_cli_udp6.update_options({"num_parallel":
nperf_num_parallel})
>-
>
> if ipv in [ 'ipv4', 'both' ]:
> # prepare PerfRepo result for tcp
>@@ -136,7 +130,7 @@ if ipv in [ 'ipv4', 'both' ]:
> 'kernel_release',
> 'redhat_release'])
> result_tcp.add_tag(product_name)
>- if nperf_mode == "multi":
>+ if nperf_num_parallel > 1:
> result_tcp.add_tag("multithreaded")
> result_tcp.set_parameter('num_parallel', nperf_num_parallel)
>
>@@ -147,8 +141,11 @@ if ipv in [ 'ipv4', 'both' ]:
> client_opts={"duration" : netperf_duration,
> "testname" :
"TCP_STREAM",
> "confidence" : nperf_confidence,
>+ "num_parallel" :
nperf_num_parallel,
> "cpu_util" : nperf_cpu_util,
>- "runs": nperf_max_runs},
>+ "runs": nperf_max_runs,
>+ "netperf_opts": nperf_opts,
>+ "debug": nperf_debug},
> baseline = baseline,
> timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
>
>@@ -163,7 +160,7 @@ if ipv in [ 'ipv4', 'both' ]:
> 'kernel_release',
> 'redhat_release'])
> result_udp.add_tag(product_name)
>- if nperf_mode == "multi":
>+ if nperf_num_parallel > 1:
> result_udp.add_tag("multithreaded")
> result_udp.set_parameter('num_parallel', nperf_num_parallel)
>
>@@ -174,8 +171,11 @@ if ipv in [ 'ipv4', 'both' ]:
> client_opts={"duration" : netperf_duration,
> "testname" :
"UDP_STREAM",
> "confidence" : nperf_confidence,
>+ "num_parallel" :
nperf_num_parallel,
> "cpu_util" : nperf_cpu_util,
>- "runs": nperf_max_runs},
>+ "runs": nperf_max_runs,
>+ "netperf_opts": nperf_opts,
>+ "debug": nperf_debug},
> baseline = baseline,
> timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
>
>@@ -190,7 +190,7 @@ if ipv in [ 'ipv6', 'both' ]:
> 'kernel_release',
> 'redhat_release'])
> result_tcp.add_tag(product_name)
>- if nperf_mode == "multi":
>+ if nperf_num_parallel > 1:
> result_tcp.add_tag("multithreaded")
> result_tcp.set_parameter('num_parallel', nperf_num_parallel)
>
>@@ -201,9 +201,11 @@ if ipv in [ 'ipv6', 'both' ]:
> client_opts={"duration" : netperf_duration,
> "testname" :
"TCP_STREAM",
> "confidence" : nperf_confidence,
>+ "num_parallel" :
nperf_num_parallel,
> "cpu_util" : nperf_cpu_util,
> "runs": nperf_max_runs,
>- "netperf_opts" : "-6"},
>+ "netperf_opts" : nperf_opts +
"-6",
>+ "debug": nperf_debug},
> baseline = baseline,
> timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
>
>@@ -218,7 +220,7 @@ if ipv in [ 'ipv6', 'both' ]:
> 'kernel_release',
> 'redhat_release'])
> result_udp.add_tag(product_name)
>- if nperf_mode == "multi":
>+ if nperf_num_parallel > 1:
> result_udp.add_tag("multithreaded")
> result_udp.set_parameter('num_parallel', nperf_num_parallel)
>
>@@ -229,9 +231,11 @@ if ipv in [ 'ipv6', 'both' ]:
> client_opts={"duration" : netperf_duration,
> "testname" :
"UDP_STREAM",
> "confidence" : nperf_confidence,
>+ "num_parallel" :
nperf_num_parallel,
> "cpu_util" : nperf_cpu_util,
> "runs": nperf_max_runs,
>- "netperf_opts" : "-6"},
>+ "netperf_opts" : nperf_opts +
"-6",
>+ "debug": nperf_debug},
> baseline = baseline,
> timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
>
>@@ -239,9 +243,10 @@ if ipv in [ 'ipv6', 'both' ]:
> result_udp.set_comment(pr_comment)
> perf_api.save_result(result_udp)
>
>-host1.run("service irqbalance start")
>-host2.run("service irqbalance start")
>-guest1.run("service irqbalance start")
>-guest2.run("service irqbalance start")
>-guest3.run("service irqbalance start")
>-guest4.run("service irqbalance start")
>+if nperf_cpupin:
>+ host1.run("service irqbalance start")
>+ host2.run("service irqbalance start")
>+ guest1.run("service irqbalance start")
>+ guest2.run("service irqbalance start")
>+ guest3.run("service irqbalance start")
>+ guest4.run("service irqbalance start")
>diff --git a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml
b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml
>index 05509d8..f16f9bc 100644
>--- a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml
>+++ b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml
>@@ -6,8 +6,8 @@
> <alias name="nperf_reserve" value="20" />
> <alias name="nperf_confidence" value="99,5" />
> <alias name="nperf_max_runs" value="5"/>
>- <alias name="nperf_mode" value="default"/>
>- <alias name="nperf_num_parallel" value="2"/>
>+ <alias name="nperf_num_parallel" value="1"/>
>+ <alias name="nperf_debug" value="0"/>
> <alias name="mapping_file"
value="2_virt_ovs_vxlan.mapping" />
> <alias name="net" value="192.168.2"/>
> <alias name="vxlan_net" value="192.168.100"/>
>diff --git a/recipes/regression_tests/phase3/novirt_ovs_vxlan.py
b/recipes/regression_tests/phase3/novirt_ovs_vxlan.py
>index 6114bff..f69e77f 100644
>--- a/recipes/regression_tests/phase3/novirt_ovs_vxlan.py
>+++ b/recipes/regression_tests/phase3/novirt_ovs_vxlan.py
>@@ -32,9 +32,10 @@ netperf_duration =
int(ctl.get_alias("netperf_duration"))
> nperf_reserve = int(ctl.get_alias("nperf_reserve"))
> nperf_confidence = ctl.get_alias("nperf_confidence")
> nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
>+nperf_cpupin = ctl.get_alias("nperf_cpupin")
> nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
>-nperf_mode = ctl.get_alias("nperf_mode")
> nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
>+nperf_debug = ctl.get_alias("nperf_debug")
> pr_user_comment = ctl.get_alias("perfrepo_comment")
>
> pr_comment = generate_perfrepo_comment([h1, h2], pr_user_comment)
>@@ -45,23 +46,17 @@ h2_nic = h2.get_device("int0")
> h1_nic.set_mtu(mtu)
> h2_nic.set_mtu(mtu)
>
>-h1.run("service irqbalance stop")
>-h2.run("service irqbalance stop")
>+if nperf_cpupin:
>+ h1.run("service irqbalance stop")
>+ h2.run("service irqbalance stop")
>
>-# this will pin devices irqs to cpu #0
>-for m, d in [(h1, h1_nic), (h2, h2_nic)]:
>- pin_dev_irqs(m, d, 0)
>+ # this will pin devices irqs to cpu #0
>+ for m, d in [(h1, h1_nic), (h2, h2_nic)]:
>+ pin_dev_irqs(m, d, 0)
>
>-# if nperf_mode == "multi":
>- # netperf_cli_tcp.unset_option("confidence")
>- # netperf_cli_udp.unset_option("confidence")
>- # netperf_cli_tcp6.unset_option("confidence")
>- # netperf_cli_udp6.unset_option("confidence")
>-
>- # netperf_cli_tcp.update_options({"num_parallel": nperf_num_parallel})
>- # netperf_cli_udp.update_options({"num_parallel": nperf_num_parallel})
>- # netperf_cli_tcp6.update_options({"num_parallel":
nperf_num_parallel})
>- # netperf_cli_udp6.update_options({"num_parallel":
nperf_num_parallel})
>+nperf_opts = ""
>+if nperf_cpupin and nperf_num_parallel == 1:
>+ nperf_opts = " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
>
> ctl.wait(15)
>
>@@ -88,7 +83,7 @@ if ipv in [ 'ipv4', 'both' ]:
> 'kernel_release',
> 'redhat_release'])
> result_tcp.add_tag(product_name)
>- if nperf_mode == "multi":
>+ if nperf_num_parallel > 1:
> result_tcp.add_tag("multithreaded")
> result_tcp.set_parameter('num_parallel', nperf_num_parallel)
>
>@@ -100,8 +95,11 @@ if ipv in [ 'ipv4', 'both' ]:
> client_opts={"duration" : netperf_duration,
> "testname" :
"TCP_STREAM",
> "confidence" : nperf_confidence,
>+ "num_parallel" :
nperf_num_parallel,
> "cpu_util" : nperf_cpu_util,
>- "runs": nperf_max_runs},
>+ "runs": nperf_max_runs,
>+ "debug": nperf_debug,
>+ "netperf_opts": nperf_opts},
> baseline = baseline,
> timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
>
>@@ -116,7 +114,7 @@ if ipv in [ 'ipv4', 'both' ]:
> 'kernel_release',
> 'redhat_release'])
> result_udp.add_tag(product_name)
>- if nperf_mode == "multi":
>+ if nperf_num_parallel > 1:
> result_udp.add_tag("multithreaded")
> result_udp.set_parameter('num_parallel', nperf_num_parallel)
>
>@@ -128,8 +126,11 @@ if ipv in [ 'ipv4', 'both' ]:
> client_opts={"duration" : netperf_duration,
> "testname" :
"UDP_STREAM",
> "confidence" : nperf_confidence,
>+ "num_parallel" :
nperf_num_parallel,
> "cpu_util" : nperf_cpu_util,
>- "runs": nperf_max_runs},
>+ "runs": nperf_max_runs,
>+ "debug": nperf_debug,
>+ "netperf_opts": nperf_opts},
> baseline = baseline,
> timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
>
>@@ -146,7 +147,7 @@ if ipv in [ 'ipv6', 'both' ]:
> 'kernel_release',
> 'redhat_release'])
> result_tcp.add_tag(product_name)
>- if nperf_mode == "multi":
>+ if nperf_num_parallel > 1:
> result_tcp.add_tag("multithreaded")
> result_tcp.set_parameter('num_parallel', nperf_num_parallel)
>
>@@ -158,9 +159,11 @@ if ipv in [ 'ipv6', 'both' ]:
> client_opts={"duration" : netperf_duration,
> "testname" :
"TCP_STREAM",
> "confidence" : nperf_confidence,
>+ "num_parallel" :
nperf_num_parallel,
> "cpu_util" : nperf_cpu_util,
> "runs": nperf_max_runs,
>- "netperf_opts" : "-6"},
>+ "debug": nperf_debug,
>+ "netperf_opts" : nperf_opts +
"-6"},
> baseline = baseline,
> timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
>
>@@ -175,7 +178,7 @@ if ipv in [ 'ipv6', 'both' ]:
> 'kernel_release',
> 'redhat_release'])
> result_udp.add_tag(product_name)
>- if nperf_mode == "multi":
>+ if nperf_num_parallel > 1:
> result_udp.add_tag("multithreaded")
> result_udp.set_parameter('num_parallel', nperf_num_parallel)
>
>@@ -187,9 +190,11 @@ if ipv in [ 'ipv6', 'both' ]:
> client_opts={"duration" : netperf_duration,
> "testname" :
"UDP_STREAM",
> "confidence" : nperf_confidence,
>+ "num_parallel" :
nperf_num_parallel,
> "cpu_util" : nperf_cpu_util,
> "runs": nperf_max_runs,
>- "netperf_opts" : "-6"},
>+ "debug": nperf_debug,
>+ "netperf_opts" : nperf_opts +
"-6"},
> baseline = baseline,
> timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
>
>@@ -197,5 +202,6 @@ if ipv in [ 'ipv6', 'both' ]:
> result_udp.set_comment(pr_comment)
> perf_api.save_result(result_udp)
>
>-h1.run("service irqbalance start")
>-h2.run("service irqbalance start")
>+if nperf_cpupin:
>+ h1.run("service irqbalance start")
>+ h2.run("service irqbalance start")
>diff --git a/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml
b/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml
>index 1e4ec02..25404b7 100644
>--- a/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml
>+++ b/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml
>@@ -6,8 +6,8 @@
> <alias name="nperf_reserve" value="20" />
> <alias name="nperf_confidence" value="99,5" />
> <alias name="nperf_max_runs" value="5"/>
>- <alias name="nperf_mode" value="default"/>
>- <alias name="nperf_num_parallel" value="2"/>
>+ <alias name="nperf_num_parallel" value="1"/>
>+ <alias name="nperf_debug" value="0"/>
> <alias name="mapping_file"
value="novirt_ovs_vxlan.mapping" />
> <alias name="net" value="192.168.2"/>
> <alias name="vxlan_net" value="192.168.100"/>
>diff --git a/recipes/regression_tests/phase3/vxlan_multicast.xml
b/recipes/regression_tests/phase3/vxlan_multicast.xml
>index 6b52231..2327c6b 100644
>--- a/recipes/regression_tests/phase3/vxlan_multicast.xml
>+++ b/recipes/regression_tests/phase3/vxlan_multicast.xml
>@@ -6,8 +6,8 @@
> <alias name="nperf_reserve" value="20" />
> <alias name="nperf_confidence" value="99,5" />
> <alias name="nperf_max_runs" value="5"/>
>- <alias name="nperf_mode" value="default"/>
>- <alias name="nperf_num_parallel" value="2"/>
>+ <alias name="nperf_num_parallel" value="1"/>
>+ <alias name="nperf_debug" value="0"/>
> <alias name="mapping_file" value="vxlan.mapping"
/>
> <alias name="net" value="192.168.0"/>
> <alias name="vxlan_net" value="192.168.100"/>
>diff --git a/recipes/regression_tests/phase3/vxlan_remote.xml
b/recipes/regression_tests/phase3/vxlan_remote.xml
>index 38392fb..6fbf3eb 100644
>--- a/recipes/regression_tests/phase3/vxlan_remote.xml
>+++ b/recipes/regression_tests/phase3/vxlan_remote.xml
>@@ -6,8 +6,8 @@
> <alias name="nperf_reserve" value="20" />
> <alias name="nperf_confidence" value="99,5" />
> <alias name="nperf_max_runs" value="5"/>
>- <alias name="nperf_mode" value="default"/>
>- <alias name="nperf_num_parallel" value="2"/>
>+ <alias name="nperf_num_parallel" value="1"/>
>+ <alias name="nperf_debug" value="0"/>
> <alias name="mapping_file"
value="vxlan_remote.mapping" />
> <alias name="net" value="192.168.0"/>
> <alias name="vxlan_net" value="192.168.100"/>
>diff --git a/recipes/regression_tests/phase3/vxlan_test.py
b/recipes/regression_tests/phase3/vxlan_test.py
>index ed14276..9086a1e 100644
>--- a/recipes/regression_tests/phase3/vxlan_test.py
>+++ b/recipes/regression_tests/phase3/vxlan_test.py
>@@ -26,13 +26,6 @@ m2.sync_resources(modules=["IcmpPing",
"Icmp6Ping", "Netperf"])
> # TESTS
> # ------
>
>-# offloads = ["gro", "gso", "tso", "tx",
"rx"]
>-# offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
>- # [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
>- # [("gro", "on"), ("gso",
"off"), ("tso", "off"), ("tx", "on"),
("rx", "on")],
>- # [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
>- # [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
>-
> ipv = ctl.get_alias("ipv")
> mtu = ctl.get_alias("mtu")
> netperf_duration = int(ctl.get_alias("netperf_duration"))
>@@ -41,8 +34,8 @@ nperf_confidence = ctl.get_alias("nperf_confidence")
> nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
> nperf_cpupin = ctl.get_alias("nperf_cpupin")
> nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
>-nperf_mode = ctl.get_alias("nperf_mode")
> nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
>+nperf_debug = ctl.get_alias("nperf_debug")
> pr_user_comment = ctl.get_alias("perfrepo_comment")
>
> pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
>@@ -64,36 +57,14 @@ if nperf_cpupin:
> for m, d in dev_list:
> pin_dev_irqs(m, d, 0)
>
>-# p_opts = "-L %s" % (test_if2.get_ip(0))
>-# if nperf_cpupin and nperf_mode != "multi":
>- # p_opts += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
>-
>-# p_opts6 = "-L %s -6" % (test_if2.get_ip(1))
>-# if nperf_cpupin and nperf_mode != "multi":
>- # p_opts6 += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
>-
>-# if nperf_mode == "multi":
>- # netperf_cli_tcp.unset_option("confidence")
>- # netperf_cli_udp.unset_option("confidence")
>- # netperf_cli_tcp6.unset_option("confidence")
>- # netperf_cli_udp6.unset_option("confidence")
>-
>- # netperf_cli_tcp.update_options({"num_parallel": nperf_num_parallel})
>- # netperf_cli_udp.update_options({"num_parallel": nperf_num_parallel})
>- # netperf_cli_tcp6.update_options({"num_parallel":
nperf_num_parallel})
>- # netperf_cli_udp6.update_options({"num_parallel":
nperf_num_parallel})
>+nperf_opts = ""
>+if nperf_cpupin and nperf_num_parallel == 1:
>+ nperf_opts = " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
>
> ctl.wait(15)
>
> ping_opts = {"count": 100, "interval": 0.1}
>
>-# for setting in offload_settings:
>- # dev_features = ""
>- # for offload in setting:
>- # dev_features += " %s %s" % (offload[0], offload[1])
>- # m1.run("ethtool -K %s %s" % (test_if1.get_devname(), dev_features))
>- # m2.run("ethtool -K %s %s" % (test_if2.get_devname(), dev_features))
>-
> if ipv in [ 'ipv4', 'both' ]:
> ping((m1, test_if1, 0, {"scope": 0}),
> (m2, test_if2, 0, {"scope": 0}),
>@@ -107,10 +78,8 @@ if ipv in [ 'ipv4', 'both' ]:
> hash_ignore=[
> 'kernel_release',
> 'redhat_release'])
>- # for offload in setting:
>- # result_tcp.set_parameter(offload[0], offload[1])
> result_tcp.add_tag(product_name)
>- if nperf_mode == "multi":
>+ if nperf_num_parallel > 1:
> result_tcp.add_tag("multithreaded")
> result_tcp.set_parameter('num_parallel', nperf_num_parallel)
>
>@@ -122,8 +91,11 @@ if ipv in [ 'ipv4', 'both' ]:
> client_opts={"duration" : netperf_duration,
> "testname" :
"TCP_STREAM",
> "confidence" : nperf_confidence,
>+ "num_parallel" :
nperf_num_parallel,
> "cpu_util" : nperf_cpu_util,
>- "runs": nperf_max_runs},
>+ "runs": nperf_max_runs,
>+ "debug": nperf_debug,
>+ "netperf_opts": nperf_opts},
> baseline = baseline,
> timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
>
>@@ -137,10 +109,8 @@ if ipv in [ 'ipv4', 'both' ]:
> hash_ignore=[
> 'kernel_release',
> 'redhat_release'])
>- # for offload in setting:
>- # result_udp.set_parameter(offload[0], offload[1])
> result_udp.add_tag(product_name)
>- if nperf_mode == "multi":
>+ if nperf_num_parallel > 1:
> result_udp.add_tag("multithreaded")
> result_udp.set_parameter('num_parallel', nperf_num_parallel)
>
>@@ -152,8 +122,11 @@ if ipv in [ 'ipv4', 'both' ]:
> client_opts={"duration" : netperf_duration,
> "testname" :
"UDP_STREAM",
> "confidence" : nperf_confidence,
>+ "num_parallel" :
nperf_num_parallel,
> "cpu_util" : nperf_cpu_util,
>- "runs": nperf_max_runs},
>+ "runs": nperf_max_runs,
>+ "debug": nperf_debug,
>+ "netperf_opts": nperf_opts},
> baseline = baseline,
> timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
>
>@@ -172,10 +145,8 @@ if ipv in [ 'ipv6', 'both' ]:
> hash_ignore=[
> 'kernel_release',
> 'redhat_release'])
>- # for offload in setting:
>- # result_tcp.set_parameter(offload[0], offload[1])
> result_tcp.add_tag(product_name)
>- if nperf_mode == "multi":
>+ if nperf_num_parallel > 1:
> result_tcp.add_tag("multithreaded")
> result_tcp.set_parameter('num_parallel', nperf_num_parallel)
>
>@@ -187,9 +158,11 @@ if ipv in [ 'ipv6', 'both' ]:
> client_opts={"duration" : netperf_duration,
> "testname" :
"TCP_STREAM",
> "confidence" : nperf_confidence,
>+ "num_parallel" :
nperf_num_parallel,
> "cpu_util" : nperf_cpu_util,
> "runs": nperf_max_runs,
>- "netperf_opts" : "-6"},
>+ "debug": nperf_debug,
>+ "netperf_opts" : nperf_opts +
" -6"},
> baseline = baseline,
> timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
>
>@@ -203,10 +176,8 @@ if ipv in [ 'ipv6', 'both' ]:
> hash_ignore=[
> 'kernel_release',
> 'redhat_release'])
>- # for offload in setting:
>- # result_udp.set_parameter(offload[0], offload[1])
> result_udp.add_tag(product_name)
>- if nperf_mode == "multi":
>+ if nperf_num_parallel > 1:
> result_udp.add_tag("multithreaded")
> result_udp.set_parameter('num_parallel', nperf_num_parallel)
>
>@@ -218,9 +189,11 @@ if ipv in [ 'ipv6', 'both' ]:
> client_opts={"duration" : netperf_duration,
> "testname" :
"UDP_STREAM",
> "confidence" : nperf_confidence,
>+ "num_parallel" :
nperf_num_parallel,
> "cpu_util" : nperf_cpu_util,
> "runs": nperf_max_runs,
>- "netperf_opts" : "-6"},
>+ "debug": nperf_debug,
>+ "netperf_opts" : nperf_opts +
"-6"},
> baseline = baseline,
> timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
>
>@@ -228,13 +201,6 @@ if ipv in [ 'ipv6', 'both' ]:
> result_udp.set_comment(pr_comment)
> perf_api.save_result(result_udp)
>
>-#reset offload states
>-# dev_features = ""
>-# for offload in offloads:
>- # dev_features += " %s %s" % (offload, "on")
>-# m1.run("ethtool -K %s %s" % (test_if1.get_devname(), dev_features))
>-# m2.run("ethtool -K %s %s" % (test_if2.get_devname(), dev_features))
>-
> if nperf_cpupin:
> m1.run("service irqbalance start")
> m2.run("service irqbalance start")
>--
>2.8.2
>_______________________________________________
>LNST-developers mailing list
>lnst-developers(a)lists.fedorahosted.org
>https://lists.fedorahosted.org/admin/lists/lnst-developers@lists.fedorahosted.org