LNST-developers April 2015

lnst-developers@lists.fedorahosted.org

7 participants
62 discussions

[PATCH] Config: remove whitespace error
by Ondrej Lichtner 17 Apr '15

17 Apr '15

From: Ondrej Lichtner <olichtne(a)redhat.com> Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com> --- lnst/Common/Config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lnst/Common/Config.py b/lnst/Common/Config.py index f9c4b39..fd43742 100644 --- a/lnst/Common/Config.py +++ b/lnst/Common/Config.py @@ -275,7 +275,7 @@ class Config(): def optionBool(self, option, cfg_path): return bool_it(option) - + def optionPlain(self, option, cfg_path): return option -- 2.1.0

2 1

[lnst: 1/6] Config: remove whitespace error
by Jiří Pírko 17 Apr '15

17 Apr '15

commit f56fc9e378d4b4f9e26d2db0666e2fa184b173fa Author: Ondrej Lichtner <olichtne(a)redhat.com> Date: Fri Apr 17 14:46:36 2015 +0200 Config: remove whitespace error Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> lnst/Common/Config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/lnst/Common/Config.py b/lnst/Common/Config.py index f9c4b39..fd43742 100644 --- a/lnst/Common/Config.py +++ b/lnst/Common/Config.py @@ -275,7 +275,7 @@ class Config(): def optionBool(self, option, cfg_path): return bool_it(option) - + def optionPlain(self, option, cfg_path): return option

1 0

[lnst] (6 commits) ...Cover letter for "PerfRepo support"
by Jiří Pírko 17 Apr '15

17 Apr '15

Summary of changes: f56fc9e... Config: remove whitespace error 637c022... Utils: add utility dictionary functions 1b8d665... SlavePool: add hostname and hwaddr to match info 59b3fd8... add lnst/Controller/PerfRepo.py 3b11e39... Task: LNST integration with PerfRepo 8b7d6bf... Cover letter for "PerfRepo support"

1 0

[PATCH] VirtUtils: accept proper virtio_net driver name
by Jan Tluka 17 Apr '15

17 Apr '15

The proper driver name for virtio devices is virtio_net. However libvirt does not accept it as value for model option therefore we have to treat it internally. Signed-off-by: Jan Tluka <jtluka(a)redhat.com> --- lnst/Controller/VirtUtils.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lnst/Controller/VirtUtils.py b/lnst/Controller/VirtUtils.py index 25a6f39..19deee3 100644 --- a/lnst/Controller/VirtUtils.py +++ b/lnst/Controller/VirtUtils.py @@ -90,6 +90,9 @@ class VirtDomainCtl: def attach_interface(self, hw_addr, net_name, driver="virtio"): try: + if driver == "virtio_net": + driver = "virtio" + device_xml = self._net_device_template.format(hw_addr, net_name, driver) -- 1.9.3

3 5

[PATCH] recipes: use proper virtio_net driver name in virtual setups
by Jan Tluka 17 Apr '15

17 Apr '15

This patch adds driver parameter to all virtual setups in regression tests. Signed-off-by: Jan Tluka <jtluka(a)redhat.com> --- recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml | 6 +++++- recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml | 3 +++ .../regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml | 6 +++++- recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) 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 fb5bf61..0d448a8 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml @@ -20,7 +20,11 @@ </host> <host id="guest1"> <interfaces> - <eth id="guestnic" label="to_guest" /> + <eth id="guestnic" label="to_guest"> + <params> + <param name="driver" value="virtio_net"/> + </params> + </eth> <vlan id="vlan10"> <options> <option name="vlan_tci" value="10" /> 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 8636ce0..26a16c3 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml @@ -29,6 +29,9 @@ <host id="guest1"> <interfaces> <eth id="guestnic" label="to_guest"> + <params> + <param name="driver" value="virtio_net"/> + </params> <addresses> <address>192.168.10.10/24</address> <address>2002::10:10/64</address> 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 c262cab..0cfd079 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 @@ -17,7 +17,11 @@ </host> <host id="guest1"> <interfaces> - <eth id="guestnic" label="to_guest" /> + <eth id="guestnic" label="to_guest"> + <params> + <param name="driver" value="virtio_net"/> + </params> + </eth> <vlan id="vlan10"> <options> <option name="vlan_tci" value="10" /> 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..6b2c978 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 @@ -24,7 +24,7 @@ <interfaces> <eth id="guestnic" label="to_guest"> <params> - <param name="driver" value="virtio"/> + <param name="driver" value="virtio_net"/> </params> <addresses> <address>192.168.10.10/24</address> -- 1.9.3

2 1

[lnst] recipes: use proper virtio_net driver name in virtual setups
by Jiří Pírko 17 Apr '15

17 Apr '15

commit 6062bbad7862eccce94a66afbc4b3bb0d487dbfa Author: Jan Tluka <jtluka(a)redhat.com> Date: Thu Apr 16 18:37:07 2015 +0200 recipes: use proper virtio_net driver name in virtual setups This patch adds driver parameter to all virtual setups in regression tests. Signed-off-by: Jan Tluka <jtluka(a)redhat.com> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> .../phase1/virtual_bridge_vlan_in_guest.xml | 6 +++++- .../phase1/virtual_bridge_vlan_in_host.xml | 3 +++ .../phase2/virtual_ovs_bridge_vlan_in_guest.xml | 6 +++++- .../phase2/virtual_ovs_bridge_vlan_in_host.xml | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) --- 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 fb5bf61..0d448a8 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml @@ -20,7 +20,11 @@ </host> <host id="guest1"> <interfaces> - <eth id="guestnic" label="to_guest" /> + <eth id="guestnic" label="to_guest"> + <params> + <param name="driver" value="virtio_net"/> + </params> + </eth> <vlan id="vlan10"> <options> <option name="vlan_tci" value="10" /> 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 8636ce0..26a16c3 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml @@ -29,6 +29,9 @@ <host id="guest1"> <interfaces> <eth id="guestnic" label="to_guest"> + <params> + <param name="driver" value="virtio_net"/> + </params> <addresses> <address>192.168.10.10/24</address> <address>2002::10:10/64</address> 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 c262cab..0cfd079 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 @@ -17,7 +17,11 @@ </host> <host id="guest1"> <interfaces> - <eth id="guestnic" label="to_guest" /> + <eth id="guestnic" label="to_guest"> + <params> + <param name="driver" value="virtio_net"/> + </params> + </eth> <vlan id="vlan10"> <options> <option name="vlan_tci" value="10" /> 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..6b2c978 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 @@ -24,7 +24,7 @@ <interfaces> <eth id="guestnic" label="to_guest"> <params> - <param name="driver" value="virtio"/> + <param name="driver" value="virtio_net"/> </params> <addresses> <address>192.168.10.10/24</address>

1 0

[lnst] ENRT: Set offloads on host NICs in virtual setups
by Jiří Pírko 16 Apr '15

16 Apr '15

commit 45e310a1023396057f1c4fb82ee0a98127653f78 Author: Jiri Prochazka <jprochaz(a)redhat.com> Date: Fri Apr 10 15:35:17 2015 +0200 ENRT: Set offloads on host NICs in virtual setups Based on our last meeting we agreed on setting offloads (gro, tso, gso) on both guest NICs and host NICs. Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> .../phase1/virtual_bridge_2_vlans_over_bond.py | 8 ++++++++ .../phase1/virtual_bridge_vlan_in_guest.py | 2 ++ .../phase1/virtual_bridge_vlan_in_host.py | 2 ++ ...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 8 ++++++++ .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 2 ++ .../phase2/virtual_ovs_bridge_vlan_in_host.py | 2 ++ 6 files changed, 24 insertions(+), 0 deletions(-) --- 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 52a2ae2..c3c43b8 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 @@ -146,6 +146,14 @@ ping_mod6_bad2 = ctl.get_module("Icmp6Ping", for offload in offloads: for state in ["on", "off"]: + h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic1"), + offload, state)) + h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic2"), + offload, state)) + h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic1"), + offload, state)) + h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic2"), + offload, state)) g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), offload, state)) g2.run("ethtool -K %s %s %s" % (g2.get_devname("guestnic"), 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 4b9bafb..aefda4a 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -95,6 +95,8 @@ for offload in offloads: for state in ["on", "off"]: g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), offload, state)) + h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), + offload, state)) h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"), offload, state)) 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 29c6bcc..e2d32d6 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -95,6 +95,8 @@ for offload in offloads: for state in ["on", "off"]: g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), offload, state)) + h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), + offload, state)) h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"), offload, state)) if ipv == 'ipv4': 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 a5c927f..92e5253 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 @@ -149,6 +149,14 @@ ping_mod6_bad2 = ctl.get_module("Icmp6Ping", for offload in offloads: for state in ["on", "off"]: + h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic1"), + offload, state)) + h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic2"), + offload, state)) + h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic1"), + offload, state)) + h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic2"), + offload, state)) g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), offload, state)) g2.run("ethtool -K %s %s %s" % (g2.get_devname("guestnic"), 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 03cd652..9adf380 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 @@ -94,6 +94,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", for offload in offloads: for state in ["on", "off"]: + h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), + offload, state)) g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), offload, state)) h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"), 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 bc50b18..fbda2cb 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 @@ -93,6 +93,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", for offload in offloads: for state in ["on", "off"]: + h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), + offload, state)) g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), offload, state)) h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"),

1 0

[PATCH] ENRT: Set offloads on host NICs in virtual setups
by Jiri Prochazka 10 Apr '15

10 Apr '15

Based on our last meeting we agreed on setting offloads (gro, tso, gso) on both guest NICs and host NICs. Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> --- .../regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py | 8 ++++++++ recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py | 2 ++ recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py | 2 ++ .../phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py | 8 ++++++++ .../regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py | 2 ++ .../regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py | 2 ++ 6 files changed, 24 insertions(+) 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 52a2ae2..c3c43b8 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 @@ -146,6 +146,14 @@ ping_mod6_bad2 = ctl.get_module("Icmp6Ping", for offload in offloads: for state in ["on", "off"]: + h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic1"), + offload, state)) + h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic2"), + offload, state)) + h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic1"), + offload, state)) + h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic2"), + offload, state)) g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), offload, state)) g2.run("ethtool -K %s %s %s" % (g2.get_devname("guestnic"), 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 4b9bafb..aefda4a 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -95,6 +95,8 @@ for offload in offloads: for state in ["on", "off"]: g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), offload, state)) + h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), + offload, state)) h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"), offload, state)) 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 29c6bcc..e2d32d6 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -95,6 +95,8 @@ for offload in offloads: for state in ["on", "off"]: g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), offload, state)) + h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), + offload, state)) h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"), offload, state)) if ipv == 'ipv4': 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 a5c927f..92e5253 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 @@ -149,6 +149,14 @@ ping_mod6_bad2 = ctl.get_module("Icmp6Ping", for offload in offloads: for state in ["on", "off"]: + h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic1"), + offload, state)) + h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic2"), + offload, state)) + h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic1"), + offload, state)) + h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic2"), + offload, state)) g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), offload, state)) g2.run("ethtool -K %s %s %s" % (g2.get_devname("guestnic"), 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 03cd652..9adf380 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 @@ -94,6 +94,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", for offload in offloads: for state in ["on", "off"]: + h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), + offload, state)) g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), offload, state)) h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"), 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 bc50b18..fbda2cb 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 @@ -93,6 +93,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", for offload in offloads: for state in ["on", "off"]: + h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), + offload, state)) g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), offload, state)) h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"), -- 2.1.0

1 0

[lnst] Fix typo in proces_options method
by Jiří Pírko 10 Apr '15

10 Apr '15

commit d401daecc13f773d01a551e8262298a56335748c Author: Jiri Prochazka <jprochaz(a)redhat.com> Date: Wed Apr 8 15:37:48 2015 +0200 Fix typo in proces_options method Process should be with double s. :-) Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> lnst/Controller/RecipeParser.py | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) --- diff --git a/lnst/Controller/RecipeParser.py b/lnst/Controller/RecipeParser.py index 1109b35..7269820 100644 --- a/lnst/Controller/RecipeParser.py +++ b/lnst/Controller/RecipeParser.py @@ -141,7 +141,7 @@ class RecipeParser(XmlParser): # slave options opts_tag = slave_tag.find("options") - opts = self._proces_options(opts_tag) + opts = self._process_options(opts_tag) if len(opts) > 0: slave["options"] = opts @@ -149,13 +149,13 @@ class RecipeParser(XmlParser): # interface options opts_tag = iface_tag.find("options") - opts = self._proces_options(opts_tag) + opts = self._process_options(opts_tag) if len(opts) > 0: iface["options"] = opts elif iface["type"] in ["vti"]: # interface options opts_tag = iface_tag.find("options") - opts = self._proces_options(opts_tag) + opts = self._process_options(opts_tag) iface["options"] = opts elif iface["type"] in ["vlan"]: # real_dev of the VLAN interface @@ -175,7 +175,7 @@ class RecipeParser(XmlParser): # interface options opts_tag = iface_tag.find("options") - opts = self._proces_options(opts_tag) + opts = self._process_options(opts_tag) if len(opts) > 0: iface["options"] = opts elif iface["type"] == "ovs_bridge": @@ -249,13 +249,13 @@ class RecipeParser(XmlParser): bond_slaves.append(slave_id) opts_tag = bond_tag.find("options") - opts = self._proces_options(opts_tag) + opts = self._process_options(opts_tag) if len(opts) > 0: bonds[bond_id]["options"] = opts return [iface] - def _proces_options(self, opts_tag): + def _process_options(self, opts_tag): options = XmlCollection(opts_tag) if opts_tag is not None: for opt_tag in opts_tag: @@ -336,7 +336,7 @@ class RecipeParser(XmlParser): # options opts_tag = cmd_tag.find("options") - opts = self._proces_options(opts_tag) + opts = self._process_options(opts_tag) if len(opts) > 0: cmd["options"] = opts elif has_command: @@ -384,7 +384,7 @@ class RecipeParser(XmlParser): else: # options opts_tag = cmd_tag.find("options") - opts = self._proces_options(opts_tag) + opts = self._process_options(opts_tag) if len(opts) > 0: cmd["options"] = opts

1 0

[lnst] Set timeout for netperf run to 70 seconds in regression tests.
by Jiří Pírko 10 Apr '15

10 Apr '15

commit 801ac9cc29444c9158ef2a5b16efac5367be7648 Author: Jiri Prochazka <jprochaz(a)redhat.com> Date: Wed Apr 8 15:20:09 2015 +0200 Set timeout for netperf run to 70 seconds in regression tests. This change applies to both phase1 and phase2 tests. Also few redundant timeouts in bg commands were removed. Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> recipes/regression_tests/phase1/3_vlans.py | 16 +++++----- .../regression_tests/phase1/3_vlans_over_bond.py | 16 +++++----- recipes/regression_tests/phase1/bonding_test.py | 18 +++++----- .../phase1/virtual_bridge_2_vlans_over_bond.py | 24 +++++++------- .../phase1/virtual_bridge_vlan_in_guest.py | 16 +++++----- .../phase1/virtual_bridge_vlan_in_host.py | 16 +++++----- .../regression_tests/phase2/3_vlans_over_team.py | 16 +++++----- recipes/regression_tests/phase2/team_test.py | 32 ++++++++++---------- ...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 24 +++++++------- .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 16 +++++----- 10 files changed, 97 insertions(+), 97 deletions(-) --- diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index 1625b97..0f1749d 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -111,8 +111,8 @@ for vlan1 in vlans: # Netperf test (both TCP and UDP) srv_proc = m1.run(netperf_srv, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp, timeout=65) - m2.run(netperf_cli_udp, timeout=65) + m2.run(netperf_cli_tcp, timeout=70) + m2.run(netperf_cli_udp, timeout=70) srv_proc.intr() elif ipv == 'ipv6': # Ping test @@ -121,8 +121,8 @@ for vlan1 in vlans: # Netperf test (both TCP and UDP) srv_proc = m1.run(netperf_srv6, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp6, timeout=65) - m2.run(netperf_cli_udp6, timeout=65) + m2.run(netperf_cli_tcp6, timeout=70) + m2.run(netperf_cli_udp6, timeout=70) srv_proc.intr() else: # Ping tests @@ -132,15 +132,15 @@ for vlan1 in vlans: # Netperf test (both TCP and UDP) srv_proc = m1.run(netperf_srv, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp, timeout=65) - m2.run(netperf_cli_udp, timeout=65) + m2.run(netperf_cli_tcp, timeout=70) + m2.run(netperf_cli_udp, timeout=70) srv_proc.intr() # Netperf test (both TCP and UDP) srv_proc = m1.run(netperf_srv6, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp6, timeout=65) - m2.run(netperf_cli_udp6, timeout=65) + m2.run(netperf_cli_tcp6, timeout=70) + m2.run(netperf_cli_udp6, timeout=70) srv_proc.intr() # These tests should fail diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index f511bad..865e2cc 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -113,8 +113,8 @@ for vlan1 in vlans: # Netperf test (both TCP and UDP) srv_proc = m1.run(netperf_srv, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp, timeout=65) - m2.run(netperf_cli_udp, timeout=65) + m2.run(netperf_cli_tcp, timeout=70) + m2.run(netperf_cli_udp, timeout=70) srv_proc.intr() elif ipv == 'ipv6': # Ping test @@ -123,8 +123,8 @@ for vlan1 in vlans: # Netperf test (both TCP and UDP) srv_proc = m1.run(netperf_srv6, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp6, timeout=65) - m2.run(netperf_cli_udp6, timeout=65) + m2.run(netperf_cli_tcp6, timeout=70) + m2.run(netperf_cli_udp6, timeout=70) srv_proc.intr() else: # Ping tests @@ -134,15 +134,15 @@ for vlan1 in vlans: # Netperf test (both TCP and UDP) srv_proc = m1.run(netperf_srv, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp, timeout=65) - m2.run(netperf_cli_udp, timeout=65) + m2.run(netperf_cli_tcp, timeout=70) + m2.run(netperf_cli_udp, timeout=70) srv_proc.intr() # Netperf test (both TCP and UDP) srv_proc = m1.run(netperf_srv6, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp6, timeout=65) - m2.run(netperf_cli_udp6, timeout=65) + m2.run(netperf_cli_tcp6, timeout=70) + m2.run(netperf_cli_udp6, timeout=70) srv_proc.intr() # These tests should fail diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index f7d45d6..165978b 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -97,26 +97,26 @@ for offload in offloads: m1.run(ping_mod) server_proc = m1.run(netperf_srv, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp, timeout=65) - m2.run(netperf_cli_udp, timeout=65) + m2.run(netperf_cli_tcp, timeout=70) + m2.run(netperf_cli_udp, timeout=70) server_proc.intr() elif ipv == 'ipv6': m1.run(ping_mod6) server_proc = m1.run(netperf_srv6, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp6, timeout=65) - m2.run(netperf_cli_udp6, timeout=65) + m2.run(netperf_cli_tcp6, timeout=70) + m2.run(netperf_cli_udp6, timeout=70) server_proc.intr() else: m1.run(ping_mod) m1.run(ping_mod6) server_proc = m1.run(netperf_srv, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp, timeout=65) - m2.run(netperf_cli_udp, timeout=65) + m2.run(netperf_cli_tcp, timeout=70) + m2.run(netperf_cli_udp, timeout=70) server_proc.intr() server_proc = m1.run(netperf_srv6, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp6, timeout=65) - m2.run(netperf_cli_udp6, timeout=65) - server_proc.intr() \ No newline at end of file + m2.run(netperf_cli_tcp6, timeout=70) + m2.run(netperf_cli_udp6, timeout=70) + server_proc.intr() 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 27c21f1..52a2ae2 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 @@ -160,10 +160,10 @@ for offload in offloads: g1.run(ping_mod_bad, expect="fail") g3.run(ping_mod_bad2, expect="fail") - server_proc = g1.run(netperf_srv, bg=True, timeout=125) + server_proc = g1.run(netperf_srv, bg=True) ctl.wait(2) - g3.run(netperf_cli_tcp, timeout=65) - g3.run(netperf_cli_udp, timeout=65) + g3.run(netperf_cli_tcp, timeout=70) + g3.run(netperf_cli_udp, timeout=70) server_proc.intr() elif ipv == 'ipv6': g1.run(ping_mod6) @@ -171,10 +171,10 @@ for offload in offloads: g1.run(ping_mod6_bad, expect="fail") g3.run(ping_mod6_bad2, expect="fail") - server_proc = g1.run(netperf_srv6, bg=True, timeout=125) + server_proc = g1.run(netperf_srv6, bg=True) ctl.wait(2) - g3.run(netperf_cli_tcp6, timeout=65) - g3.run(netperf_cli_udp6, timeout=65) + g3.run(netperf_cli_tcp6, timeout=70) + g3.run(netperf_cli_udp6, timeout=70) server_proc.intr() else: # IPv4 @@ -183,10 +183,10 @@ for offload in offloads: g1.run(ping_mod_bad, expect="fail") g3.run(ping_mod_bad2, expect="fail") - server_proc = g1.run(netperf_srv, bg=True, timeout=125) + server_proc = g1.run(netperf_srv, bg=True) ctl.wait(2) - g3.run(netperf_cli_tcp, timeout=65) - g3.run(netperf_cli_udp, timeout=65) + g3.run(netperf_cli_tcp, timeout=70) + g3.run(netperf_cli_udp, timeout=70) server_proc.intr() # IPv6 g1.run(ping_mod6) @@ -194,8 +194,8 @@ for offload in offloads: g1.run(ping_mod6_bad, expect="fail") g3.run(ping_mod6_bad2, expect="fail") - server_proc = g1.run(netperf_srv6, bg=True, timeout=125) + server_proc = g1.run(netperf_srv6, bg=True) ctl.wait(2) - g3.run(netperf_cli_tcp6, timeout=65) - g3.run(netperf_cli_udp6, timeout=65) + g3.run(netperf_cli_tcp6, timeout=70) + g3.run(netperf_cli_udp6, timeout=70) server_proc.intr() 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 4782389..4b9bafb 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -102,29 +102,29 @@ for offload in offloads: g1.run(ping_mod) server_proc = g1.run(netperf_srv, bg=True) ctl.wait(2) - h2.run(netperf_cli_tcp, timeout=65) - h2.run(netperf_cli_udp, timeout=65) + h2.run(netperf_cli_tcp, timeout=70) + h2.run(netperf_cli_udp, timeout=70) server_proc.intr() elif ipv == 'ipv6': g1.run(ping_mod6) server_proc = g1.run(netperf_srv6, bg=True) ctl.wait(2) - h2.run(netperf_cli_tcp6, timeout=65) - h2.run(netperf_cli_udp6, timeout=65) + h2.run(netperf_cli_tcp6, timeout=70) + h2.run(netperf_cli_udp6, timeout=70) server_proc.intr() else: g1.run(ping_mod) server_proc = g1.run(netperf_srv, bg=True) ctl.wait(2) - h2.run(netperf_cli_tcp, timeout=65) - h2.run(netperf_cli_udp, timeout=65) + h2.run(netperf_cli_tcp, timeout=70) + h2.run(netperf_cli_udp, timeout=70) server_proc.intr() g1.run(ping_mod6) server_proc = g1.run(netperf_srv6, bg=True) ctl.wait(2) - h2.run(netperf_cli_tcp6, timeout=65) - h2.run(netperf_cli_udp6, timeout=65) + h2.run(netperf_cli_tcp6, timeout=70) + h2.run(netperf_cli_udp6, timeout=70) 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 bc50b18..29c6bcc 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -101,29 +101,29 @@ for offload in offloads: g1.run(ping_mod) server_proc = g1.run(netperf_srv, bg=True) ctl.wait(2) - h2.run(netperf_cli_tcp, timeout=65) - h2.run(netperf_cli_udp, timeout=65) + h2.run(netperf_cli_tcp, timeout=70) + h2.run(netperf_cli_udp, timeout=70) server_proc.intr() elif ipv == 'ipv6': g1.run(ping_mod6) server_proc = g1.run(netperf_srv6, bg=True) ctl.wait(2) - h2.run(netperf_cli_tcp6, timeout=65) - h2.run(netperf_cli_udp6, timeout=65) + h2.run(netperf_cli_tcp6, timeout=70) + h2.run(netperf_cli_udp6, timeout=70) server_proc.intr() else: g1.run(ping_mod) server_proc = g1.run(netperf_srv, bg=True) ctl.wait(2) - h2.run(netperf_cli_tcp, timeout=65) - h2.run(netperf_cli_udp, timeout=65) + h2.run(netperf_cli_tcp, timeout=70) + h2.run(netperf_cli_udp, timeout=70) server_proc.intr() g1.run(ping_mod6) server_proc = g1.run(netperf_srv6, bg=True) ctl.wait(2) - h2.run(netperf_cli_tcp6, timeout=65) - h2.run(netperf_cli_udp6, timeout=65) + h2.run(netperf_cli_tcp6, timeout=70) + h2.run(netperf_cli_udp6, timeout=70) server_proc.intr() diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index a6ef2a2..e8d6281 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -115,8 +115,8 @@ for vlan1 in vlans: # Netperf test (both TCP and UDP) srv_proc = m1.run(netperf_srv, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp, timeout=65) - m2.run(netperf_cli_udp, timeout=65) + m2.run(netperf_cli_tcp, timeout=70) + m2.run(netperf_cli_udp, timeout=70) srv_proc.intr() elif ipv == 'ipv6': m1.run(ping_mod6) @@ -124,8 +124,8 @@ for vlan1 in vlans: # Netperf test (both TCP and UDP) srv_proc = m1.run(netperf_srv6, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp6, timeout=65) - m2.run(netperf_cli_udp6, timeout=65) + m2.run(netperf_cli_tcp6, timeout=70) + m2.run(netperf_cli_udp6, timeout=70) srv_proc.intr() else: m1.run(ping_mod) @@ -133,8 +133,8 @@ for vlan1 in vlans: # Netperf test (both TCP and UDP) srv_proc = m1.run(netperf_srv, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp, timeout=65) - m2.run(netperf_cli_udp, timeout=65) + m2.run(netperf_cli_tcp, timeout=70) + m2.run(netperf_cli_udp, timeout=70) srv_proc.intr() m1.run(ping_mod6) @@ -142,8 +142,8 @@ for vlan1 in vlans: # Netperf test (both TCP and UDP) srv_proc = m1.run(netperf_srv6, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp6, timeout=65) - m2.run(netperf_cli_udp6, timeout=65) + m2.run(netperf_cli_tcp6, timeout=70) + m2.run(netperf_cli_udp6, timeout=70) srv_proc.intr() # These tests should fail diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index d792ea3..ba9941d 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -96,29 +96,29 @@ for offload in offloads: m1.run(ping_mod) server_proc = m1.run(netperf_srv, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp, timeout=65) - m2.run(netperf_cli_udp, timeout=65) + m2.run(netperf_cli_tcp, timeout=70) + m2.run(netperf_cli_udp, timeout=70) server_proc.intr() elif ipv == "ipv6": m1.run(ping_mod6) server_proc = m1.run(netperf_srv6, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp6, timeout=65) - m2.run(netperf_cli_udp6, timeout=65) + m2.run(netperf_cli_tcp6, timeout=70) + m2.run(netperf_cli_udp6, timeout=70) server_proc.intr() else: m1.run(ping_mod) server_proc = m1.run(netperf_srv, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp, timeout=65) - m2.run(netperf_cli_udp, timeout=65) + m2.run(netperf_cli_tcp, timeout=70) + m2.run(netperf_cli_udp, timeout=70) server_proc.intr() m1.run(ping_mod6) server_proc = m1.run(netperf_srv6, bg=True) ctl.wait(2) - m2.run(netperf_cli_tcp6, timeout=65) - m2.run(netperf_cli_udp6, timeout=65) + m2.run(netperf_cli_tcp6, timeout=70) + m2.run(netperf_cli_udp6, timeout=70) server_proc.intr() ping_mod = ctl.get_module("IcmpPing", @@ -199,27 +199,27 @@ for offload in offloads: m2.run(ping_mod) server_proc = m2.run(netperf_srv, bg=True) ctl.wait(2) - m1.run(netperf_cli_tcp, timeout=65) - m1.run(netperf_cli_udp, timeout=65) + m1.run(netperf_cli_tcp, timeout=70) + m1.run(netperf_cli_udp, timeout=70) server_proc.intr() elif ipv == 'ipv6': m2.run(ping_mod6) server_proc = m2.run(netperf_srv6, bg=True) ctl.wait(2) - m1.run(netperf_cli_tcp6, timeout=65) - m1.run(netperf_cli_udp6, timeout=65) + m1.run(netperf_cli_tcp6, timeout=70) + m1.run(netperf_cli_udp6, timeout=70) server_proc.intr() else: m2.run(ping_mod) server_proc = m2.run(netperf_srv, bg=True) ctl.wait(2) - m1.run(netperf_cli_tcp, timeout=65) - m1.run(netperf_cli_udp, timeout=65) + m1.run(netperf_cli_tcp, timeout=70) + m1.run(netperf_cli_udp, timeout=70) server_proc.intr() m2.run(ping_mod6) server_proc = m2.run(netperf_srv6, bg=True) ctl.wait(2) - m1.run(netperf_cli_tcp6, timeout=65) - m1.run(netperf_cli_udp6, timeout=65) + m1.run(netperf_cli_tcp6, timeout=70) + m1.run(netperf_cli_udp6, timeout=70) server_proc.intr() 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 0de17d5..a5c927f 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 @@ -163,10 +163,10 @@ for offload in offloads: g1.run(ping_mod_bad, expect="fail") g3.run(ping_mod_bad2, expect="fail") - server_proc = g1.run(netperf_srv, bg=True, timeout=125) + server_proc = g1.run(netperf_srv, bg=True) ctl.wait(2) - g3.run(netperf_cli_tcp, timeout=65) - g3.run(netperf_cli_udp, timeout=65) + g3.run(netperf_cli_tcp, timeout=70) + g3.run(netperf_cli_udp, timeout=70) server_proc.intr() elif ipv == 'ipv6': g1.run(ping_mod6) @@ -174,10 +174,10 @@ for offload in offloads: g1.run(ping_mod6_bad, expect="fail") g3.run(ping_mod6_bad2, expect="fail") - server_proc = g1.run(netperf_srv6, bg=True, timeout=125) + server_proc = g1.run(netperf_srv6, bg=True) ctl.wait(2) - g3.run(netperf_cli_tcp6, timeout=65) - g3.run(netperf_cli_udp6, timeout=65) + g3.run(netperf_cli_tcp6, timeout=70) + g3.run(netperf_cli_udp6, timeout=70) server_proc.intr() else: # IPv4 @@ -186,10 +186,10 @@ for offload in offloads: g1.run(ping_mod_bad, expect="fail") g3.run(ping_mod_bad2, expect="fail") - server_proc = g1.run(netperf_srv, bg=True, timeout=125) + server_proc = g1.run(netperf_srv, bg=True) ctl.wait(2) - g3.run(netperf_cli_tcp, timeout=65) - g3.run(netperf_cli_udp, timeout=65) + g3.run(netperf_cli_tcp, timeout=70) + g3.run(netperf_cli_udp, timeout=70) server_proc.intr() # IPv6 g1.run(ping_mod6) @@ -197,8 +197,8 @@ for offload in offloads: g1.run(ping_mod6_bad, expect="fail") g3.run(ping_mod6_bad2, expect="fail") - server_proc = g1.run(netperf_srv6, bg=True, timeout=125) + server_proc = g1.run(netperf_srv6, bg=True) ctl.wait(2) - g3.run(netperf_cli_tcp6, timeout=65) - g3.run(netperf_cli_udp6, timeout=65) + g3.run(netperf_cli_tcp6, timeout=70) + g3.run(netperf_cli_udp6, timeout=70) server_proc.intr() 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 eae14db..03cd652 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 @@ -102,29 +102,29 @@ for offload in offloads: g1.run(ping_mod) server_proc = g1.run(netperf_srv, bg=True) ctl.wait(2) - h2.run(netperf_cli_tcp, timeout=65) - h2.run(netperf_cli_udp, timeout=65) + h2.run(netperf_cli_tcp, timeout=70) + h2.run(netperf_cli_udp, timeout=70) server_proc.intr() elif ipv == 'ipv6': g1.run(ping_mod6) server_proc = g1.run(netperf_srv6, bg=True) ctl.wait(2) - h2.run(netperf_cli_tcp6, timeout=65) - h2.run(netperf_cli_udp6, timeout=65) + h2.run(netperf_cli_tcp6, timeout=70) + h2.run(netperf_cli_udp6, timeout=70) server_proc.intr() else: g1.run(ping_mod) server_proc = g1.run(netperf_srv, bg=True) ctl.wait(2) - h2.run(netperf_cli_tcp, timeout=65) - h2.run(netperf_cli_udp, timeout=65) + h2.run(netperf_cli_tcp, timeout=70) + h2.run(netperf_cli_udp, timeout=70) server_proc.intr() g1.run(ping_mod6) server_proc = g1.run(netperf_srv6, bg=True) ctl.wait(2) - h2.run(netperf_cli_tcp6, timeout=65) - h2.run(netperf_cli_udp6, timeout=65) + h2.run(netperf_cli_tcp6, timeout=70) + h2.run(netperf_cli_udp6, timeout=70) server_proc.intr()

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

LNST-developers April 2015