Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
recipes/regression_tests/phase1/3_vlans.py | 10 +++++-----
recipes/regression_tests/phase1/3_vlans_over_bond.py | 10 +++++-----
recipes/regression_tests/phase1/bonding_test.py | 10 +++++-----
.../phase1/virtual_bridge_2_vlans_over_bond.py | 10 +++++-----
.../phase1/virtual_bridge_vlan_in_guest.py | 10 +++++-----
.../phase1/virtual_bridge_vlan_in_host.py | 10 +++++-----
recipes/regression_tests/phase2/3_vlans_over_team.py | 10 +++++-----
recipes/regression_tests/phase2/team_test.py | 18 +++++++++---------
...rtual_ovs_bridge_2_vlans_over_active_backup_bond.py | 10 +++++-----
.../phase2/virtual_ovs_bridge_vlan_in_guest.py | 10 +++++-----
.../phase2/virtual_ovs_bridge_vlan_in_host.py | 10 +++++-----
11 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/recipes/regression_tests/phase1/3_vlans.py
b/recipes/regression_tests/phase1/3_vlans.py
index e950721..1307162 100644
--- a/recipes/regression_tests/phase1/3_vlans.py
+++ b/recipes/regression_tests/phase1/3_vlans.py
@@ -41,7 +41,7 @@ offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
mtu = ctl.get_alias("mtu")
-netperf_duration = ctl.get_alias("netperf_duration")
+netperf_duration = int(ctl.get_alias("netperf_duration"))
m1_phy1 = m1.get_interface("eth1")
m1_phy1.set_mtu(mtu)
@@ -194,8 +194,8 @@ for vlan1 in vlans:
# Netperf test (both TCP and UDP)
srv_proc = m1.run(netperf_srv, bg=True)
ctl.wait(2)
- tcp_res_data = m2.run(netperf_cli_tcp, timeout =
(int(netperf_duration) + 20)*5)
- udp_res_data = m2.run(netperf_cli_udp, timeout =
(int(netperf_duration) + 20)*5)
+ tcp_res_data = m2.run(netperf_cli_tcp, timeout =
(netperf_duration + 20)*5)
+ udp_res_data = m2.run(netperf_cli_udp, timeout =
(netperf_duration + 20)*5)
srv_proc.intr()
if result_tcp is not None and\
@@ -276,8 +276,8 @@ for vlan1 in vlans:
# Netperf test (both TCP and UDP)
srv_proc = m1.run(netperf_srv6, bg=True)
ctl.wait(2)
- tcp_res_data = m2.run(netperf_cli_tcp6, timeout =
(int(netperf_duration) + 20)*5)
- udp_res_data = m2.run(netperf_cli_udp6, timeout =
(int(netperf_duration) + 20)*5)
+ tcp_res_data = m2.run(netperf_cli_tcp6, timeout =
(netperf_duration + 20)*5)
+ udp_res_data = m2.run(netperf_cli_udp6, timeout =
(netperf_duration + 20)*5)
srv_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not
None and\
diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py
b/recipes/regression_tests/phase1/3_vlans_over_bond.py
index 92d2344..e495d9f 100644
--- a/recipes/regression_tests/phase1/3_vlans_over_bond.py
+++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py
@@ -41,7 +41,7 @@ offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
mtu = ctl.get_alias("mtu")
-netperf_duration = ctl.get_alias("netperf_duration")
+netperf_duration = int(ctl.get_alias("netperf_duration"))
m1_bond = m1.get_interface("test_bond")
m1_bond.set_mtu(mtu)
@@ -196,8 +196,8 @@ for vlan1 in vlans:
# Netperf test (both TCP and UDP)
srv_proc = m1.run(netperf_srv, bg=True)
ctl.wait(2)
- tcp_res_data = m2.run(netperf_cli_tcp, timeout =
(int(netperf_duration) + 20)*5)
- udp_res_data = m2.run(netperf_cli_udp, timeout =
(int(netperf_duration) + 20)*5)
+ tcp_res_data = m2.run(netperf_cli_tcp, timeout =
(netperf_duration + 20)*5)
+ udp_res_data = m2.run(netperf_cli_udp, timeout =
(netperf_duration + 20)*5)
srv_proc.intr()
if result_tcp is not None and\
@@ -278,8 +278,8 @@ for vlan1 in vlans:
# Netperf test (both TCP and UDP)
srv_proc = m1.run(netperf_srv6, bg=True)
ctl.wait(2)
- tcp_res_data = m2.run(netperf_cli_tcp6, timeout =
(int(netperf_duration) + 20)*5)
- udp_res_data = m2.run(netperf_cli_udp6, timeout =
(int(netperf_duration) + 20)*5)
+ tcp_res_data = m2.run(netperf_cli_tcp6, timeout =
(netperf_duration + 20)*5)
+ udp_res_data = m2.run(netperf_cli_udp6, timeout =
(netperf_duration + 20)*5)
srv_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not
None and\
diff --git a/recipes/regression_tests/phase1/bonding_test.py
b/recipes/regression_tests/phase1/bonding_test.py
index 1ed02c0..8217f26 100644
--- a/recipes/regression_tests/phase1/bonding_test.py
+++ b/recipes/regression_tests/phase1/bonding_test.py
@@ -40,7 +40,7 @@ offloads = ["tso", "gro", "gso"]
ipv = ctl.get_alias("ipv")
mtu = ctl.get_alias("mtu")
-netperf_duration = ctl.get_alias("netperf_duration")
+netperf_duration = int(ctl.get_alias("netperf_duration"))
test_if1 = m1.get_interface("test_if")
test_if1.set_mtu(mtu)
@@ -175,8 +175,8 @@ for offload in offloads:
server_proc = m1.run(netperf_srv, bg=True)
ctl.wait(2)
- tcp_res_data = m2.run(netperf_cli_tcp, timeout = (int(netperf_duration) +
20)*5)
- udp_res_data = m2.run(netperf_cli_udp, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = m2.run(netperf_cli_tcp, timeout = (netperf_duration + 20)*5)
+ udp_res_data = m2.run(netperf_cli_udp, timeout = (netperf_duration + 20)*5)
server_proc.intr()
if result_tcp is not None and\
@@ -251,8 +251,8 @@ for offload in offloads:
server_proc = m1.run(netperf_srv6, bg=True)
ctl.wait(2)
- tcp_res_data = m2.run(netperf_cli_tcp6, timeout = (int(netperf_duration) +
20)*5)
- udp_res_data = m2.run(netperf_cli_udp6, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = m2.run(netperf_cli_tcp6, timeout = (netperf_duration + 20)*5)
+ udp_res_data = m2.run(netperf_cli_udp6, timeout = (netperf_duration + 20)*5)
server_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not None and\
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 860d418..8958cb3 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
@@ -46,7 +46,7 @@ g4.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
-netperf_duration = ctl.get_alias("netperf_duration")
+netperf_duration = int(ctl.get_alias("netperf_duration"))
mtu = ctl.get_alias("mtu")
enable_udp_perf = ctl.get_alias("enable_udp_perf")
@@ -269,9 +269,9 @@ for offload in offloads:
server_proc = g1.run(netperf_srv, bg=True)
ctl.wait(2)
- tcp_res_data = g3.run(netperf_cli_tcp, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = g3.run(netperf_cli_tcp, timeout = (netperf_duration + 20)*5)
if enable_udp_perf is not None:
- udp_res_data = g3.run(netperf_cli_udp, timeout = (int(netperf_duration) +
20)*5)
+ udp_res_data = g3.run(netperf_cli_udp, timeout = (netperf_duration +
20)*5)
server_proc.intr()
if result_tcp is not None and\
@@ -354,9 +354,9 @@ for offload in offloads:
server_proc = g1.run(netperf_srv6, bg=True)
ctl.wait(2)
- tcp_res_data = g3.run(netperf_cli_tcp6, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = g3.run(netperf_cli_tcp6, timeout = (netperf_duration + 20)*5)
if enable_udp_perf is not None:
- udp_res_data = g3.run(netperf_cli_udp6, timeout = (int(netperf_duration)
+ 20)*5)
+ udp_res_data = g3.run(netperf_cli_udp6, timeout = (netperf_duration +
20)*5)
server_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not None and\
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 936ef0e..924e270 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
@@ -40,7 +40,7 @@ h2.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
-netperf_duration = ctl.get_alias("netperf_duration")
+netperf_duration = int(ctl.get_alias("netperf_duration"))
mtu = ctl.get_alias("mtu")
enable_udp_perf = ctl.get_alias("enable_udp_perf")
@@ -192,9 +192,9 @@ for offload in offloads:
server_proc = g1.run(netperf_srv, bg=True)
ctl.wait(2)
- tcp_res_data = h2.run(netperf_cli_tcp, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = h2.run(netperf_cli_tcp, timeout = (netperf_duration + 20)*5)
if enable_udp_perf is not None:
- udp_res_data = h2.run(netperf_cli_udp, timeout = (int(netperf_duration) +
20)*5)
+ udp_res_data = h2.run(netperf_cli_udp, timeout = (netperf_duration +
20)*5)
server_proc.intr()
@@ -275,8 +275,8 @@ for offload in offloads:
server_proc = g1.run(netperf_srv6, bg=True)
ctl.wait(2)
- tcp_res_data = h2.run(netperf_cli_tcp6, timeout = (int(netperf_duration) +
20)*5)
- udp_res_data = h2.run(netperf_cli_udp6, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = h2.run(netperf_cli_tcp6, timeout = (netperf_duration + 20)*5)
+ udp_res_data = h2.run(netperf_cli_udp6, timeout = (netperf_duration + 20)*5)
server_proc.intr()
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 92ba7bb..feb9e54 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
@@ -40,7 +40,7 @@ h2.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
-netperf_duration = ctl.get_alias("netperf_duration")
+netperf_duration = int(ctl.get_alias("netperf_duration"))
mtu = ctl.get_alias("mtu")
enable_udp_perf = ctl.get_alias("enable_udp_perf")
@@ -192,9 +192,9 @@ for offload in offloads:
server_proc = g1.run(netperf_srv, bg=True)
ctl.wait(2)
- tcp_res_data = h2.run(netperf_cli_tcp, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = h2.run(netperf_cli_tcp, timeout = (netperf_duration + 20)*5)
if enable_udp_perf is not None:
- udp_res_data = h2.run(netperf_cli_udp, timeout = (int(netperf_duration) +
20)*5)
+ udp_res_data = h2.run(netperf_cli_udp, timeout = (netperf_duration +
20)*5)
server_proc.intr()
@@ -275,8 +275,8 @@ for offload in offloads:
server_proc = g1.run(netperf_srv6, bg=True)
ctl.wait(2)
- tcp_res_data = h2.run(netperf_cli_tcp6, timeout = (int(netperf_duration) +
20)*5)
- udp_res_data = h2.run(netperf_cli_udp6, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = h2.run(netperf_cli_tcp6, timeout = (netperf_duration + 20)*5)
+ udp_res_data = h2.run(netperf_cli_udp6, timeout = (netperf_duration + 20)*5)
server_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not None and\
diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py
b/recipes/regression_tests/phase2/3_vlans_over_team.py
index 59e32a6..2188052 100644
--- a/recipes/regression_tests/phase2/3_vlans_over_team.py
+++ b/recipes/regression_tests/phase2/3_vlans_over_team.py
@@ -40,7 +40,7 @@ offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
mtu = ctl.get_alias("mtu")
-netperf_duration = ctl.get_alias("netperf_duration")
+netperf_duration = int(ctl.get_alias("netperf_duration"))
m1_team = m1.get_interface("test_if")
m1_team.set_mtu(mtu)
@@ -197,8 +197,8 @@ for vlan1 in vlans:
# Netperf test (both TCP and UDP)
srv_proc = m1.run(netperf_srv, bg=True)
ctl.wait(2)
- tcp_res_data = m2.run(netperf_cli_tcp, timeout =
(int(netperf_duration) + 20)*5)
- udp_res_data = m2.run(netperf_cli_udp, timeout =
(int(netperf_duration) + 20)*5)
+ tcp_res_data = m2.run(netperf_cli_tcp, timeout =
(netperf_duration + 20)*5)
+ udp_res_data = m2.run(netperf_cli_udp, timeout =
(netperf_duration + 20)*5)
srv_proc.intr()
if result_tcp is not None and\
@@ -278,8 +278,8 @@ for vlan1 in vlans:
# Netperf test (both TCP and UDP)
srv_proc = m1.run(netperf_srv6, bg=True)
ctl.wait(2)
- tcp_res_data = m2.run(netperf_cli_tcp6, timeout =
(int(netperf_duration) + 20)*5)
- udp_res_data = m2.run(netperf_cli_udp6, timeout =
(int(netperf_duration) + 20)*5)
+ tcp_res_data = m2.run(netperf_cli_tcp6, timeout =
(netperf_duration + 20)*5)
+ udp_res_data = m2.run(netperf_cli_udp6, timeout =
(netperf_duration + 20)*5)
srv_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not
None and\
diff --git a/recipes/regression_tests/phase2/team_test.py
b/recipes/regression_tests/phase2/team_test.py
index 80cc6e4..20c7ee1 100644
--- a/recipes/regression_tests/phase2/team_test.py
+++ b/recipes/regression_tests/phase2/team_test.py
@@ -40,7 +40,7 @@ offloads = ["tso", "gro", "gso"]
ipv = ctl.get_alias("ipv")
mtu = ctl.get_alias("mtu")
-netperf_duration = ctl.get_alias("netperf_duration")
+netperf_duration = int(ctl.get_alias("netperf_duration"))
test_if1 = m1.get_interface("test_if")
test_if1.set_mtu(mtu)
@@ -181,8 +181,8 @@ for offload in offloads:
server_proc = m1.run(netperf_srv, bg=True)
ctl.wait(2)
- tcp_res_data = m2.run(netperf_cli_tcp, timeout = (int(netperf_duration) +
20)*5)
- udp_res_data = m2.run(netperf_cli_udp, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = m2.run(netperf_cli_tcp, timeout = (netperf_duration + 20)*5)
+ udp_res_data = m2.run(netperf_cli_udp, timeout = (netperf_duration + 20)*5)
server_proc.intr()
if result_tcp is not None and\
@@ -261,8 +261,8 @@ for offload in offloads:
server_proc = m1.run(netperf_srv6, bg=True)
ctl.wait(2)
- tcp_res_data = m2.run(netperf_cli_tcp6, timeout = (int(netperf_duration) +
20)*5)
- udp_res_data = m2.run(netperf_cli_udp6, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = m2.run(netperf_cli_tcp6, timeout = (netperf_duration + 20)*5)
+ udp_res_data = m2.run(netperf_cli_udp6, timeout = (netperf_duration + 20)*5)
server_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not None and\
@@ -370,8 +370,8 @@ for offload in offloads:
server_proc = m2.run(netperf_srv, bg=True)
ctl.wait(2)
- tcp_res_data = m1.run(netperf_cli_tcp, timeout = (int(netperf_duration) +
20)*5)
- udp_res_data = m1.run(netperf_cli_udp, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = m1.run(netperf_cli_tcp, timeout = (netperf_duration + 20)*5)
+ udp_res_data = m1.run(netperf_cli_udp, timeout = (netperf_duration + 20)*5)
server_proc.intr()
if result_tcp is not None and\
@@ -450,8 +450,8 @@ for offload in offloads:
server_proc = m2.run(netperf_srv6, bg=True)
ctl.wait(2)
- tcp_res_data = m1.run(netperf_cli_tcp6, timeout = (int(netperf_duration) +
20)*5)
- udp_res_data = m1.run(netperf_cli_udp6, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = m1.run(netperf_cli_tcp6, timeout = (netperf_duration + 20)*5)
+ udp_res_data = m1.run(netperf_cli_udp6, timeout = (netperf_duration + 20)*5)
server_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not None and\
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 d7cf68d..8297a58 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
@@ -46,7 +46,7 @@ g4.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
-netperf_duration = ctl.get_alias("netperf_duration")
+netperf_duration = int(ctl.get_alias("netperf_duration"))
ping_mod = ctl.get_module("IcmpPing",
options={
@@ -243,8 +243,8 @@ for offload in offloads:
server_proc = g1.run(netperf_srv, bg=True)
ctl.wait(2)
- tcp_res_data = g3.run(netperf_cli_tcp, timeout = (int(netperf_duration) +
20)*5)
- udp_res_data = g3.run(netperf_cli_udp, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = g3.run(netperf_cli_tcp, timeout = (netperf_duration + 20)*5)
+ udp_res_data = g3.run(netperf_cli_udp, timeout = (netperf_duration + 20)*5)
server_proc.intr()
if result_tcp is not None and\
@@ -322,8 +322,8 @@ for offload in offloads:
server_proc = g1.run(netperf_srv6, bg=True)
ctl.wait(2)
- tcp_res_data = g3.run(netperf_cli_tcp6, timeout = (int(netperf_duration) +
20)*5)
- udp_res_data = g3.run(netperf_cli_udp6, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = g3.run(netperf_cli_tcp6, timeout = (netperf_duration + 20)*5)
+ udp_res_data = g3.run(netperf_cli_udp6, timeout = (netperf_duration + 20)*5)
server_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not None and\
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 7d6d8de..1d26410 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
@@ -40,7 +40,7 @@ h2.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
-netperf_duration = ctl.get_alias("netperf_duration")
+netperf_duration = int(ctl.get_alias("netperf_duration"))
ping_mod = ctl.get_module("IcmpPing",
options={
@@ -175,8 +175,8 @@ for offload in offloads:
server_proc = g1.run(netperf_srv, bg=True)
ctl.wait(2)
- tcp_res_data = h2.run(netperf_cli_tcp, timeout = (int(netperf_duration) +
20)*5)
- udp_res_data = h2.run(netperf_cli_udp, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = h2.run(netperf_cli_tcp, timeout = (netperf_duration + 20)*5)
+ udp_res_data = h2.run(netperf_cli_udp, timeout = (netperf_duration + 20)*5)
server_proc.intr()
@@ -252,8 +252,8 @@ for offload in offloads:
server_proc = g1.run(netperf_srv6, bg=True)
ctl.wait(2)
- tcp_res_data = h2.run(netperf_cli_tcp6, timeout = (int(netperf_duration) +
20)*5)
- udp_res_data = h2.run(netperf_cli_udp6, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = h2.run(netperf_cli_tcp6, timeout = (netperf_duration + 20)*5)
+ udp_res_data = h2.run(netperf_cli_udp6, timeout = (netperf_duration + 20)*5)
server_proc.intr()
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 d1b407b..86cb460 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
@@ -40,7 +40,7 @@ h2.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
-netperf_duration = ctl.get_alias("netperf_duration")
+netperf_duration = int(ctl.get_alias("netperf_duration"))
ping_mod = ctl.get_module("IcmpPing",
options={
@@ -174,8 +174,8 @@ for offload in offloads:
server_proc = g1.run(netperf_srv, bg=True)
ctl.wait(2)
- tcp_res_data = h2.run(netperf_cli_tcp, timeout = (int(netperf_duration) +
20)*5)
- udp_res_data = h2.run(netperf_cli_udp, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = h2.run(netperf_cli_tcp, timeout = (netperf_duration + 20)*5)
+ udp_res_data = h2.run(netperf_cli_udp, timeout = (netperf_duration + 20)*5)
server_proc.intr()
if result_tcp is not None and\
@@ -250,8 +250,8 @@ for offload in offloads:
server_proc = g1.run(netperf_srv6, bg=True)
ctl.wait(2)
- tcp_res_data = h2.run(netperf_cli_tcp6, timeout = (int(netperf_duration) +
20)*5)
- udp_res_data = h2.run(netperf_cli_udp6, timeout = (int(netperf_duration) +
20)*5)
+ tcp_res_data = h2.run(netperf_cli_tcp6, timeout = (netperf_duration + 20)*5)
+ udp_res_data = h2.run(netperf_cli_udp6, timeout = (netperf_duration + 20)*5)
server_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not None and\
--
2.1.0