[PATCH 3/4] recipes: use variable instead of hard coded value for extending timeout of netperf run

[Jan Tluka]

The phase1 and phase2 regression tests now take optional alias nperf_reserve
with default value of 20 seconds. Using this alias adds additional reserve to
every netperf run.

Signed-off-by: Jan Tluka <jtluka(a)redhat.com&gt;
---
 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 +
 ...rtual_bridge_2_vlans_over_active_backup_bond.xml |  1 +
 .../phase1/virtual_bridge_2_vlans_over_bond.py      | 14 ++++++++++----
 .../phase1/virtual_bridge_vlan_in_guest.py          | 14 ++++++++++----
 .../phase1/virtual_bridge_vlan_in_guest.xml         |  1 +
 .../phase1/virtual_bridge_vlan_in_host.py           | 14 ++++++++++----
 .../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 | 13 +++++++++----
 ...l_ovs_bridge_2_vlans_over_active_backup_bond.xml |  1 +
 .../phase2/virtual_ovs_bridge_vlan_in_guest.py      | 13 +++++++++----
 .../phase2/virtual_ovs_bridge_vlan_in_guest.xml     |  1 +
 .../phase2/virtual_ovs_bridge_vlan_in_host.py       | 13 +++++++++----
 .../phase2/virtual_ovs_bridge_vlan_in_host.xml      |  1 +
 34 files changed, 129 insertions(+), 48 deletions(-)

diff --git a/recipes/regression_tests/phase1/3_vlans.py
b/recipes/regression_tests/phase1/3_vlans.py
index 1307162..2be04e7 100644
--- a/recipes/regression_tests/phase1/3_vlans.py
+++ b/recipes/regression_tests/phase1/3_vlans.py
@@ -42,6 +42,7 @@ offloads = ["gso", "gro", "tso"]
 ipv = ctl.get_alias("ipv")
 mtu = ctl.get_alias("mtu")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
+nperf_reserve = int(ctl.get_alias("nperf_reserve"))
 
 m1_phy1 = m1.get_interface("eth1")
 m1_phy1.set_mtu(mtu)
@@ -194,8 +195,10 @@ 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 =
(netperf_duration + 20)*5)
-                        udp_res_data = m2.run(netperf_cli_udp, timeout =
(netperf_duration + 20)*5)
+                        tcp_res_data = m2.run(netperf_cli_tcp,
+                                              timeout = (netperf_duration +
nperf_reserve)*5)
+                        udp_res_data = m2.run(netperf_cli_udp,
+                                              timeout = (netperf_duration +
nperf_reserve)*5)
                         srv_proc.intr()
 
                         if result_tcp is not None and\
@@ -276,8 +279,10 @@ 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 =
(netperf_duration + 20)*5)
-                        udp_res_data = m2.run(netperf_cli_udp6, timeout =
(netperf_duration + 20)*5)
+                        tcp_res_data = m2.run(netperf_cli_tcp6,
+                                              timeout = (netperf_duration +
nperf_reserve)*5)
+                        udp_res_data = m2.run(netperf_cli_udp6,
+                                              timeout = (netperf_duration +
nperf_reserve)*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.xml
b/recipes/regression_tests/phase1/3_vlans.xml
index fbbc583..ee4eab5 100644
--- a/recipes/regression_tests/phase1/3_vlans.xml
+++ b/recipes/regression_tests/phase1/3_vlans.xml
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file" value="3_vlans.mapping" />
     </define>
     <network>
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 925d9f1..6101f4c 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
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="3_vlans_over_active_backup_bond.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py
b/recipes/regression_tests/phase1/3_vlans_over_bond.py
index e495d9f..feb9302 100644
--- a/recipes/regression_tests/phase1/3_vlans_over_bond.py
+++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py
@@ -42,6 +42,7 @@ offloads = ["gso", "gro", "tso"]
 ipv = ctl.get_alias("ipv")
 mtu = ctl.get_alias("mtu")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
+nperf_reserve = int(ctl.get_alias("nperf_reserve"))
 
 m1_bond = m1.get_interface("test_bond")
 m1_bond.set_mtu(mtu)
@@ -196,8 +197,10 @@ 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 =
(netperf_duration + 20)*5)
-                        udp_res_data = m2.run(netperf_cli_udp, timeout =
(netperf_duration + 20)*5)
+                        tcp_res_data = m2.run(netperf_cli_tcp,
+                                              timeout = (netperf_duration +
nperf_reserve)*5)
+                        udp_res_data = m2.run(netperf_cli_udp,
+                                              timeout = (netperf_duration +
nperf_reserve)*5)
                         srv_proc.intr()
 
                         if result_tcp is not None and\
@@ -278,8 +281,10 @@ 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 =
(netperf_duration + 20)*5)
-                        udp_res_data = m2.run(netperf_cli_udp6, timeout =
(netperf_duration + 20)*5)
+                        tcp_res_data = m2.run(netperf_cli_tcp6,
+                                              timeout = (netperf_duration +
nperf_reserve)*5)
+                        udp_res_data = m2.run(netperf_cli_udp6,
+                                              timeout = (netperf_duration +
nperf_reserve)*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_round_robin_bond.xml
b/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml
index 2fd3ede..da729c2 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
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="3_vlans_over_round_robin_bond.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase1/active_backup_bond.xml
b/recipes/regression_tests/phase1/active_backup_bond.xml
index cfd44fc..db2772e 100644
--- a/recipes/regression_tests/phase1/active_backup_bond.xml
+++ b/recipes/regression_tests/phase1/active_backup_bond.xml
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="active_backup_bond.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase1/active_backup_double_bond.xml
b/recipes/regression_tests/phase1/active_backup_double_bond.xml
index cf83e7a..b9f3006 100644
--- a/recipes/regression_tests/phase1/active_backup_double_bond.xml
+++ b/recipes/regression_tests/phase1/active_backup_double_bond.xml
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="active_backup_double_bond.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase1/bonding_test.py
b/recipes/regression_tests/phase1/bonding_test.py
index 8217f26..cefea0d 100644
--- a/recipes/regression_tests/phase1/bonding_test.py
+++ b/recipes/regression_tests/phase1/bonding_test.py
@@ -41,6 +41,7 @@ offloads = ["tso", "gro", "gso"]
 ipv = ctl.get_alias("ipv")
 mtu = ctl.get_alias("mtu")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
+nperf_reserve = int(ctl.get_alias("nperf_reserve"))
 
 test_if1 = m1.get_interface("test_if")
 test_if1.set_mtu(mtu)
@@ -175,8 +176,10 @@ for offload in offloads:
 
             server_proc = m1.run(netperf_srv, bg=True)
             ctl.wait(2)
-            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)
+            tcp_res_data = m2.run(netperf_cli_tcp,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
+            udp_res_data = m2.run(netperf_cli_udp,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
             server_proc.intr()
 
             if result_tcp is not None and\
@@ -251,8 +254,10 @@ for offload in offloads:
 
             server_proc = m1.run(netperf_srv6, bg=True)
             ctl.wait(2)
-            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)
+            tcp_res_data = m2.run(netperf_cli_tcp6,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
+            udp_res_data = m2.run(netperf_cli_udp6,
+                                  timeout = (netperf_duration + nperf_reserve)*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/round_robin_bond.xml
b/recipes/regression_tests/phase1/round_robin_bond.xml
index ec43383..66e010c 100644
--- a/recipes/regression_tests/phase1/round_robin_bond.xml
+++ b/recipes/regression_tests/phase1/round_robin_bond.xml
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="round_robin_bond.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase1/round_robin_double_bond.xml
b/recipes/regression_tests/phase1/round_robin_double_bond.xml
index c283826..e9003d3 100644
--- a/recipes/regression_tests/phase1/round_robin_double_bond.xml
+++ b/recipes/regression_tests/phase1/round_robin_double_bond.xml
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="round_robin_double_bond.mapping" />
     </define>
     <network>
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 d11d88a..e5d9d1d 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
@@ -2,6 +2,7 @@
     <define>
         <alias name="ipv" value="both" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mtu" value="1500" />
         <alias name="mapping_file"
value="virtual_bridge_2_vlans_over_active_backup_bond.mapping" />
     </define>
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 8958cb3..dd55166 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
@@ -47,6 +47,8 @@ offloads = ["gso", "gro", "tso"]
 
 ipv = ctl.get_alias("ipv")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
+nperf_reserve = int(ctl.get_alias("nperf_reserve"))
+
 mtu = ctl.get_alias("mtu")
 enable_udp_perf = ctl.get_alias("enable_udp_perf")
 
@@ -269,9 +271,11 @@ for offload in offloads:
 
             server_proc = g1.run(netperf_srv, bg=True)
             ctl.wait(2)
-            tcp_res_data = g3.run(netperf_cli_tcp, timeout = (netperf_duration + 20)*5)
+            tcp_res_data = g3.run(netperf_cli_tcp,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
             if enable_udp_perf is not None:
-                udp_res_data = g3.run(netperf_cli_udp, timeout = (netperf_duration +
20)*5)
+                udp_res_data = g3.run(netperf_cli_udp,
+                                      timeout = (netperf_duration + nperf_reserve)*5)
             server_proc.intr()
 
             if result_tcp is not None and\
@@ -354,9 +358,11 @@ for offload in offloads:
 
             server_proc = g1.run(netperf_srv6, bg=True)
             ctl.wait(2)
-            tcp_res_data = g3.run(netperf_cli_tcp6, timeout = (netperf_duration + 20)*5)
+            tcp_res_data = g3.run(netperf_cli_tcp6,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
             if enable_udp_perf is not None:
-                udp_res_data = g3.run(netperf_cli_udp6, timeout = (netperf_duration +
20)*5)
+                udp_res_data = g3.run(netperf_cli_udp6,
+                                      timeout = (netperf_duration + nperf_reserve)*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 924e270..af66655 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
@@ -41,6 +41,8 @@ offloads = ["gso", "gro", "tso"]
 
 ipv = ctl.get_alias("ipv")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
+nperf_reserve = int(ctl.get_alias("nperf_reserve"))
+
 mtu = ctl.get_alias("mtu")
 enable_udp_perf = ctl.get_alias("enable_udp_perf")
 
@@ -192,9 +194,11 @@ for offload in offloads:
 
             server_proc = g1.run(netperf_srv, bg=True)
             ctl.wait(2)
-            tcp_res_data = h2.run(netperf_cli_tcp, timeout = (netperf_duration + 20)*5)
+            tcp_res_data = h2.run(netperf_cli_tcp,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
             if enable_udp_perf is not None:
-                udp_res_data = h2.run(netperf_cli_udp, timeout = (netperf_duration +
20)*5)
+                udp_res_data = h2.run(netperf_cli_udp,
+                                      timeout = (netperf_duration + nperf_reserve)*5)
 
             server_proc.intr()
 
@@ -275,8 +279,10 @@ for offload in offloads:
 
             server_proc = g1.run(netperf_srv6, bg=True)
             ctl.wait(2)
-            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)
+            tcp_res_data = h2.run(netperf_cli_tcp6,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
+            udp_res_data = h2.run(netperf_cli_udp6,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
 
             server_proc.intr()
 
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 0e11fbf..a3bfb9f 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml
@@ -2,6 +2,7 @@
     <define>
         <alias name="ipv" value="both" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mtu" value="1500" />
         <alias name="mapping_file"
value="virtual_bridge_vlan_in_guest.mapping" />
     </define>
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 feb9e54..30979cb 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
@@ -41,6 +41,8 @@ offloads = ["gso", "gro", "tso"]
 
 ipv = ctl.get_alias("ipv")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
+nperf_reserve = int(ctl.get_alias("nperf_reserve"))
+
 mtu = ctl.get_alias("mtu")
 enable_udp_perf = ctl.get_alias("enable_udp_perf")
 
@@ -192,9 +194,11 @@ for offload in offloads:
 
             server_proc = g1.run(netperf_srv, bg=True)
             ctl.wait(2)
-            tcp_res_data = h2.run(netperf_cli_tcp, timeout = (netperf_duration + 20)*5)
+            tcp_res_data = h2.run(netperf_cli_tcp,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
             if enable_udp_perf is not None:
-                udp_res_data = h2.run(netperf_cli_udp, timeout = (netperf_duration +
20)*5)
+                udp_res_data = h2.run(netperf_cli_udp,
+                                      timeout = (netperf_duration + nperf_reserve)*5)
 
             server_proc.intr()
 
@@ -275,8 +279,10 @@ for offload in offloads:
 
             server_proc = g1.run(netperf_srv6, bg=True)
             ctl.wait(2)
-            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)
+            tcp_res_data = h2.run(netperf_cli_tcp6,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
+            udp_res_data = h2.run(netperf_cli_udp6,
+                                  timeout = (netperf_duration + nperf_reserve)*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_host.xml
b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml
index 138ad6d..2d8b862 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml
@@ -2,6 +2,7 @@
     <define>
         <alias name="ipv" value="both" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mtu" value="1500" />
         <alias name="mapping_file"
value="virtual_bridge_vlan_in_host.mapping" />
     </define>
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 f2cd757..c2eb6f8 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
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="3_vlans_over_active_backup_team.mapping" />
     </define>
     <network>
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 a03ef5e..daec70b 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
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="3_vlans_over_round_robin_team.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py
b/recipes/regression_tests/phase2/3_vlans_over_team.py
index 2188052..7f9a767 100644
--- a/recipes/regression_tests/phase2/3_vlans_over_team.py
+++ b/recipes/regression_tests/phase2/3_vlans_over_team.py
@@ -41,6 +41,7 @@ offloads = ["gso", "gro", "tso"]
 ipv = ctl.get_alias("ipv")
 mtu = ctl.get_alias("mtu")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
+nperf_reserve = int(ctl.get_alias("nperf_reserve"))
 
 m1_team = m1.get_interface("test_if")
 m1_team.set_mtu(mtu)
@@ -197,8 +198,10 @@ 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 =
(netperf_duration + 20)*5)
-                        udp_res_data = m2.run(netperf_cli_udp, timeout =
(netperf_duration + 20)*5)
+                        tcp_res_data = m2.run(netperf_cli_tcp,
+                                              timeout = (netperf_duration +
nperf_reserve)*5)
+                        udp_res_data = m2.run(netperf_cli_udp,
+                                              timeout = (netperf_duration +
nperf_reserve)*5)
                         srv_proc.intr()
 
                         if result_tcp is not None and\
@@ -278,8 +281,10 @@ 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 =
(netperf_duration + 20)*5)
-                        udp_res_data = m2.run(netperf_cli_udp6, timeout =
(netperf_duration + 20)*5)
+                        tcp_res_data = m2.run(netperf_cli_tcp6,
+                                              timeout = (netperf_duration +
nperf_reserve)*5)
+                        udp_res_data = m2.run(netperf_cli_udp6,
+                                              timeout = (netperf_duration +
nperf_reserve)*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/active_backup_double_team.xml
b/recipes/regression_tests/phase2/active_backup_double_team.xml
index 900fa0d..2cc911a 100644
--- a/recipes/regression_tests/phase2/active_backup_double_team.xml
+++ b/recipes/regression_tests/phase2/active_backup_double_team.xml
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="active_backup_double_team.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase2/active_backup_team.xml
b/recipes/regression_tests/phase2/active_backup_team.xml
index c3bc6fe..8e5a6ad 100644
--- a/recipes/regression_tests/phase2/active_backup_team.xml
+++ b/recipes/regression_tests/phase2/active_backup_team.xml
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="active_backup_team.mapping" />
     </define>
     <network>
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 78fefc1..c373bd1 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
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="active_backup_team_vs_active_backup_bond.mapping" />
     </define>
     <network>
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 8b438b7..fcfa46a 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
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="active_backup_team_vs_round_robin_bond.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase2/round_robin_double_team.xml
b/recipes/regression_tests/phase2/round_robin_double_team.xml
index 817ea72..2a680f5 100644
--- a/recipes/regression_tests/phase2/round_robin_double_team.xml
+++ b/recipes/regression_tests/phase2/round_robin_double_team.xml
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="round_robin_double_team.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase2/round_robin_team.xml
b/recipes/regression_tests/phase2/round_robin_team.xml
index 5834c63..cc3702c 100644
--- a/recipes/regression_tests/phase2/round_robin_team.xml
+++ b/recipes/regression_tests/phase2/round_robin_team.xml
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="round_robin_team.mapping" />
     </define>
     <network>
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 e3f9b4e..1f18459 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
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="round_robin_team_vs_active_backup_bond.mapping" />
     </define>
     <network>
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 9ba661a..bcdd111 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
@@ -3,6 +3,7 @@
         <alias name="ipv" value="both" />
         <alias name="mtu" value="1500" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="round_robin_team_vs_round_robin_bond.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase2/team_test.py
b/recipes/regression_tests/phase2/team_test.py
index 20c7ee1..259505b 100644
--- a/recipes/regression_tests/phase2/team_test.py
+++ b/recipes/regression_tests/phase2/team_test.py
@@ -41,6 +41,7 @@ offloads = ["tso", "gro", "gso"]
 ipv = ctl.get_alias("ipv")
 mtu = ctl.get_alias("mtu")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
+nperf_reserve = int(ctl.get_alias("nperf_reserve"))
 
 test_if1 = m1.get_interface("test_if")
 test_if1.set_mtu(mtu)
@@ -181,8 +182,10 @@ for offload in offloads:
 
             server_proc = m1.run(netperf_srv, bg=True)
             ctl.wait(2)
-            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)
+            tcp_res_data = m2.run(netperf_cli_tcp,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
+            udp_res_data = m2.run(netperf_cli_udp,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
             server_proc.intr()
 
             if result_tcp is not None and\
@@ -261,8 +264,10 @@ for offload in offloads:
 
             server_proc = m1.run(netperf_srv6, bg=True)
             ctl.wait(2)
-            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)
+            tcp_res_data = m2.run(netperf_cli_tcp6,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
+            udp_res_data = m2.run(netperf_cli_udp6,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
             server_proc.intr()
 
             if result_tcp is not None and tcp_res_data.get_result() is not None and\
@@ -370,8 +375,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 = (netperf_duration + 20)*5)
-            udp_res_data = m1.run(netperf_cli_udp, timeout = (netperf_duration + 20)*5)
+            tcp_res_data = m1.run(netperf_cli_tcp, timeout = (netperf_duration +
nperf_reserve)*5)
+            udp_res_data = m1.run(netperf_cli_udp, timeout = (netperf_duration +
nperf_reserve)*5)
             server_proc.intr()
 
             if result_tcp is not None and\
@@ -450,8 +455,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 = (netperf_duration + 20)*5)
-            udp_res_data = m1.run(netperf_cli_udp6, timeout = (netperf_duration + 20)*5)
+            tcp_res_data = m1.run(netperf_cli_tcp6, timeout = (netperf_duration +
nperf_reserve)*5)
+            udp_res_data = m1.run(netperf_cli_udp6, timeout = (netperf_duration +
nperf_reserve)*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 8297a58..3d0a828 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
@@ -47,6 +47,7 @@ offloads = ["gso", "gro", "tso"]
 
 ipv = ctl.get_alias("ipv")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
+nperf_reserve = int(ctl.get_alias("nperf_reserve"))
 
 ping_mod = ctl.get_module("IcmpPing",
                            options={
@@ -243,8 +244,10 @@ for offload in offloads:
 
             server_proc = g1.run(netperf_srv, bg=True)
             ctl.wait(2)
-            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)
+            tcp_res_data = g3.run(netperf_cli_tcp,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
+            udp_res_data = g3.run(netperf_cli_udp,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
             server_proc.intr()
 
             if result_tcp is not None and\
@@ -322,8 +325,10 @@ for offload in offloads:
 
             server_proc = g1.run(netperf_srv6, bg=True)
             ctl.wait(2)
-            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)
+            tcp_res_data = g3.run(netperf_cli_tcp6,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
+            udp_res_data = g3.run(netperf_cli_udp6,
+                                  timeout = (netperf_duration + nperf_reserve)*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.xml
b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml
index 95e1c20..07e0d14 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
@@ -2,6 +2,7 @@
     <define>
         <alias name="ipv" value="both" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="virtual_ovs_bridge_2_vlans_over_active_backup_bond.mapping" />
     </define>
     <network>
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 1d26410..7a5b710 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
@@ -41,6 +41,7 @@ offloads = ["gso", "gro", "tso"]
 
 ipv = ctl.get_alias("ipv")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
+nperf_reserve = int(ctl.get_alias("nperf_reserve"))
 
 ping_mod = ctl.get_module("IcmpPing",
                            options={
@@ -175,8 +176,10 @@ for offload in offloads:
 
             server_proc = g1.run(netperf_srv, bg=True)
             ctl.wait(2)
-            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)
+            tcp_res_data = h2.run(netperf_cli_tcp,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
+            udp_res_data = h2.run(netperf_cli_udp,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
 
             server_proc.intr()
 
@@ -252,8 +255,10 @@ for offload in offloads:
 
             server_proc = g1.run(netperf_srv6, bg=True)
             ctl.wait(2)
-            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)
+            tcp_res_data = h2.run(netperf_cli_tcp6,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
+            udp_res_data = h2.run(netperf_cli_udp6,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
 
             server_proc.intr()
 
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 beb75d2..eead7a9 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
@@ -2,6 +2,7 @@
     <define>
         <alias name="ipv" value="both" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="virtual_ovs_bridge_vlan_in_guest.mapping" />
     </define>
     <network>
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 86cb460..c418ad1 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
@@ -41,6 +41,7 @@ offloads = ["gso", "gro", "tso"]
 
 ipv = ctl.get_alias("ipv")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
+nperf_reserve = int(ctl.get_alias("nperf_reserve"))
 
 ping_mod = ctl.get_module("IcmpPing",
                            options={
@@ -174,8 +175,10 @@ for offload in offloads:
 
             server_proc = g1.run(netperf_srv, bg=True)
             ctl.wait(2)
-            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)
+            tcp_res_data = h2.run(netperf_cli_tcp,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
+            udp_res_data = h2.run(netperf_cli_udp, 
+                                  timeout = (netperf_duration + nperf_reserve)*5)
             server_proc.intr()
 
             if result_tcp is not None and\
@@ -250,8 +253,10 @@ for offload in offloads:
 
             server_proc = g1.run(netperf_srv6, bg=True)
             ctl.wait(2)
-            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)
+            tcp_res_data = h2.run(netperf_cli_tcp6,
+                                  timeout = (netperf_duration + nperf_reserve)*5)
+            udp_res_data = h2.run(netperf_cli_udp6,
+                                  timeout = (netperf_duration + nperf_reserve)*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_host.xml
b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml
index e931335..b31f8e1 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
@@ -2,6 +2,7 @@
     <define>
         <alias name="ipv" value="both" />
         <alias name="netperf_duration" value="60" />
+        <alias name="nperf_reserve" value="20" />
         <alias name="mapping_file"
value="virtual_ovs_bridge_vlan_in_host.mapping" />
     </define>
     <network>
-- 
2.1.0

[Ondrej Lichtner]

On Thu, Sep 17, 2015 at 08:38:31PM -0400, Jan Tluka wrote:
>  The phase1 and phase2 regression tests now take optional alias
> nperf_reserve
>  with default value of 20 seconds. Using this alias adds additional reserve to
>  every netperf run.
>  
>  Signed-off-by: Jan Tluka <jtluka(a)redhat.com&gt; 
I get the following warning:

Applying: recipes: use variable instead of hard coded value for extending timeout of
netperf run
/home/olichtne/lnst/.git/rebase-apply/patch:731: trailing whitespace.
            udp_res_data = h2.run(netperf_cli_udp,
warning: 1 line adds whitespace errors.