LNST-developers April 2015

lnst-developers@lists.fedorahosted.org

7 participants
62 discussions

[PATCH] Fix typo in proces_options method
by Jiri Prochazka 08 Apr '15

08 Apr '15

Process should be with double s. :-) Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> --- lnst/Controller/RecipeParser.py | 16 ++++++++-------- 1 file 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 -- 2.1.0

1 0

[PATCH] Set timeout for netperf run to 70 seconds in regression tests.
by Jiri Prochazka 08 Apr '15

08 Apr '15

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> --- 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 64047de..dbf95a1 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() -- 2.1.0

1 0

[lnst] Use receive rate as tracked value instead of send rate in UDP_STREAM.
by Jiří Pírko 08 Apr '15

08 Apr '15

commit ce07c573b93a67483a7495aa8cd54023a645d3f6 Author: Jiri Prochazka <jprochaz(a)redhat.com> Date: Wed Apr 8 12:56:10 2015 +0200 Use receive rate as tracked value instead of send rate in UDP_STREAM. UDP_STREAM test shows 2 values, first is send rate and second one is receive rate. We are more interested in receive rate, so this patch changes UDP_STREAM output parsing to parse receive rate instead. Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> test_modules/Netperf.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- diff --git a/test_modules/Netperf.py b/test_modules/Netperf.py index 1994412..a098d5a 100644 --- a/test_modules/Netperf.py +++ b/test_modules/Netperf.py @@ -80,8 +80,8 @@ class Netperf(TestGeneric): testname = self.get_opt("testname") if testname == "UDP_STREAM": # pattern for UDP_STREAM throughput output - # decimal decimal float decimal decimal (float) - pattern_udp_stream = "\d+\s+\d+\s+\d+\.\d+\s+\d+\s+\d+\s+(\d+(\.\d+){0,1})" + # decimal float decimal (float) + pattern_udp_stream = "\d+\s+\d+\.\d+\s+\d+\s+(\d+(\.\d+){0,1})\n" r2 = re.search(pattern_udp_stream, output.lower()) elif testname == "TCP_STREAM": # pattern for TCP_STREAM throughput output

1 0

[PATCH] Use receive rate as tracked value instead of send rate in UDP_STREAM.
by Jiri Prochazka 08 Apr '15

08 Apr '15

UDP_STREAM test shows 2 values, first is send rate and second one is receive rate. We are more interested in receive rate, so this patch changes UDP_STREAM output parsing to parse receive rate instead. Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> --- test_modules/Netperf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test_modules/Netperf.py b/test_modules/Netperf.py index 1994412..a098d5a 100644 --- a/test_modules/Netperf.py +++ b/test_modules/Netperf.py @@ -80,8 +80,8 @@ class Netperf(TestGeneric): testname = self.get_opt("testname") if testname == "UDP_STREAM": # pattern for UDP_STREAM throughput output - # decimal decimal float decimal decimal (float) - pattern_udp_stream = "\d+\s+\d+\s+\d+\.\d+\s+\d+\s+\d+\s+(\d+(\.\d+){0,1})" + # decimal float decimal (float) + pattern_udp_stream = "\d+\s+\d+\.\d+\s+\d+\s+(\d+(\.\d+){0,1})\n" r2 = re.search(pattern_udp_stream, output.lower()) elif testname == "TCP_STREAM": # pattern for TCP_STREAM throughput output -- 2.1.0

2 1

[lnst] Move param tag to correct interface in virtual_ovs_bridge_vlan_in_host test.
by Jiří Pírko 07 Apr '15

07 Apr '15

commit 16f40481e95705bb5f4311a7072b427a10070da2 Author: Jiri Prochazka <jprochaz(a)redhat.com> Date: Tue Apr 7 18:16:26 2015 +0200 Move param tag to correct interface in virtual_ovs_bridge_vlan_in_host test. The virtio param should be assigned to guest machine, not host Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> .../phase2/virtual_ovs_bridge_vlan_in_host.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- 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 e941c4e..d425b82 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 @@ -23,6 +23,9 @@ <host id="guest1"> <interfaces> <eth id="guestnic" label="to_guest"> + <params> + <param name="driver" value="virtio"/> + </params> <addresses> <address>192.168.10.10/24</address> <address>2002::10:10/64</address> @@ -33,9 +36,6 @@ <host id="host2"> <interfaces> <eth id="nic" label="to_switch"> - <params> - <param name="driver" value="virtio"/> - </params> </eth> <vlan id="vlan10"> <options>

1 0

[PATCH] Move param tag to correct interface in virtual_ovs_bridge_vlan_in_host test.
by Jiri Prochazka 07 Apr '15

07 Apr '15

The virtio param should be assigned to guest machine, not host Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> --- recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 e941c4e..d425b82 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 @@ -23,6 +23,9 @@ <host id="guest1"> <interfaces> <eth id="guestnic" label="to_guest"> + <params> + <param name="driver" value="virtio"/> + </params> <addresses> <address>192.168.10.10/24</address> <address>2002::10:10/64</address> @@ -33,9 +36,6 @@ <host id="host2"> <interfaces> <eth id="nic" label="to_switch"> - <params> - <param name="driver" value="virtio"/> - </params> </eth> <vlan id="vlan10"> <options> -- 2.1.0

2 1

[PATCH] SlavePool: fix interface parameter matching
by Jan Tluka 07 Apr '15

07 Apr '15

Interface compatibility check in matching algorithm compares the value of parameter only if it's also present in slavemachine definition inside pool. If it's not in the pool, the check is finally evaluated as matched. So, if the first interface that we compare to does not have the requested param and second one has it, it is the first one that is evaluated as matched and not the second one as a user would expect. Since we __require__ that the machine has all the requirements we define under <params> tag in recipe the condition had to be changed. Signed-off-by: Jan Tluka <jtluka(a)redhat.com> --- lnst/Controller/SlavePool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lnst/Controller/SlavePool.py b/lnst/Controller/SlavePool.py index 82737a4..2602f23 100644 --- a/lnst/Controller/SlavePool.py +++ b/lnst/Controller/SlavePool.py @@ -595,7 +595,7 @@ class SetupMapper(object): req_label != req_if["network"]: return False for param, value in req_if["params"].iteritems(): - if param in pool_if["params"] and\ + if param not in pool_if["params"] or\ value != pool_if["params"][param]: return False return True -- 1.9.3

2 1

[lnst] SlavePool: fix interface parameter matching
by Jiří Pírko 07 Apr '15

07 Apr '15

commit c27b06d6f0652225a7b183fb3df5685dc0d3f381 Author: Jan Tluka <jtluka(a)redhat.com> Date: Tue Apr 7 16:54:48 2015 +0200 SlavePool: fix interface parameter matching Interface compatibility check in matching algorithm compares the value of parameter only if it's also present in slavemachine definition inside pool. If it's not in the pool, the check is finally evaluated as matched. So, if the first interface that we compare to does not have the requested param and second one has it, it is the first one that is evaluated as matched and not the second one as a user would expect. Since we __require__ that the machine has all the requirements we define under <params> tag in recipe the condition had to be changed. Signed-off-by: Jan Tluka <jtluka(a)redhat.com> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> lnst/Controller/SlavePool.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/lnst/Controller/SlavePool.py b/lnst/Controller/SlavePool.py index 82737a4..2602f23 100644 --- a/lnst/Controller/SlavePool.py +++ b/lnst/Controller/SlavePool.py @@ -595,7 +595,7 @@ class SetupMapper(object): req_label != req_if["network"]: return False for param, value in req_if["params"].iteritems(): - if param in pool_if["params"] and\ + if param not in pool_if["params"] or\ value != pool_if["params"][param]: return False return True

1 0

[lnst] tests: fix typo in team_test.py
by Jiří Pírko 03 Apr '15

03 Apr '15

commit 904cf7f47f6b72979a3dda93cff3a2cff0ad14e3 Author: Jan Tluka <jtluka(a)redhat.com> Date: Fri Apr 3 13:31:47 2015 +0200 tests: fix typo in team_test.py Obviously the interface identifier is wrong. Signed-off-by: Jan Tluka <jtluka(a)redhat.com> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> recipes/regression_tests/phase2/team_test.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 64047de..d792ea3 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -30,7 +30,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", options={ "addr" : m2.get_ip("test_if", 1), "count" : 100, - "iface" : m1.get_ip("test_if, 1"), + "iface" : m1.get_ip("test_if", 1), "interval" : 0.1 })

1 0

[PATCH] tests: fix typo in team_test.py
by Jan Tluka 03 Apr '15

03 Apr '15

Obviously the interface identifier is wrong. Signed-off-by: Jan Tluka <jtluka(a)redhat.com> --- recipes/regression_tests/phase2/team_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 64047de..d792ea3 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -30,7 +30,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", options={ "addr" : m2.get_ip("test_if", 1), "count" : 100, - "iface" : m1.get_ip("test_if, 1"), + "iface" : m1.get_ip("test_if", 1), "interval" : 0.1 }) -- 1.9.3

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

LNST-developers April 2015