commit 1303fd1161f29085dc26aeb6a656e4b65b52c4b3 Author: Jiri Prochazka jprochaz@redhat.com Date: Fri Feb 27 15:03:19 2015 +0100

recipes: Change Python tasks Icmp6Ping module calls to use IP as source, not device.

ping6 is currently bugged, when device is entered as -I argument, it sometimes uses IP from different device. This patch forces ping6 to use IP on selected device.

Signed-off-by: Jiri Prochazka jprochaz@redhat.com Signed-off-by: Jiri Pirko jiri@resnulli.us

recipes/regression_tests/phase1/3_vlans.py | 2 +- .../regression_tests/phase1/3_vlans_over_bond.py | 2 +- recipes/regression_tests/phase1/simple_ping.py | 2 +- .../phase1/virtual_bridge_2_vlans_over_bond.py | 2 +- .../phase1/virtual_bridge_vlan_in_guest.py | 4 ++-- .../phase1/virtual_bridge_vlan_in_host.py | 2 +- .../regression_tests/phase2/3_vlans_over_team.py | 2 +- recipes/regression_tests/phase2/team_test.py | 4 ++-- ...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 2 +- .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 2 +- .../phase2/virtual_ovs_bridge_vlan_in_host.py | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) --- diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index c7f8824..f59e941 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -33,7 +33,7 @@ for vlan1 in vlans: options={ "addr" : m2.get_ip(vlan2, 1), "count" : 100, - "iface" : m1.get_devname(vlan1), + "iface" : m1.get_ip(vlan1), "interval" : 0.1 })

diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index a9a0eb8..0ea489b 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -33,7 +33,7 @@ for vlan1 in vlans: options={ "addr" : m2.get_ip(vlan2, 1), "count" : 100, - "iface" : m1.get_devname(vlan1), + "iface" : m1.get_ip(vlan1), "interval" : 0.1 })

diff --git a/recipes/regression_tests/phase1/simple_ping.py b/recipes/regression_tests/phase1/simple_ping.py index b19b2d7..74fd026 100644 --- a/recipes/regression_tests/phase1/simple_ping.py +++ b/recipes/regression_tests/phase1/simple_ping.py @@ -19,7 +19,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", "addr": hostB.get_ip("testiface", 1), "count": 100, "interval": 0.2, - "iface" : hostA.get_devname("testiface"), + "iface" : hostA.get_ip("testiface"), "limit_rate": 90})

if ctl.get_alias('ipv') == 'ipv6': 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 6f024ed..27c21f1 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 @@ -37,7 +37,7 @@ ping_mod2 = ctl.get_module("IcmpPing", options={ "addr" : g2.get_ip("guestnic", 0), "count" : 100, - "iface" : g4.get_devname("guestnic"), + "iface" : g4.get_ip("guestnic"), "interval" : 0.1 })

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 41dd0b5..8334d6e 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -32,7 +32,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", options={ "addr" : h2.get_ip("vlan10", 1), "count" : 100, - "iface" : g1.get_devname("vlan10"), + "iface" : g1.get_ip("vlan10"), "interval" : 0.1 })

@@ -127,4 +127,4 @@ for offload in offloads: ctl.wait(2) h2.run(netperf_cli_tcp6, timeout=65) h2.run(netperf_cli_udp6, timeout=65) - server_proc.intr() \ No newline at end of file + 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 3344d81..e4d3810 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -32,7 +32,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", options={ "addr" : h2.get_ip("vlan10", 1), "count" : 100, - "iface" : g1.get_devname("guestnic"), + "iface" : g1.get_ip("guestnic"), "interval" : 0.1 })

diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index 2ede5d4..3deb7f4 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -33,7 +33,7 @@ for vlan1 in vlans: options={ "addr" : m2.get_ip(vlan2, 1), "count" : 100, - "iface" : m1.get_devname(vlan1), + "iface" : m1.get_ip(vlan1), "interval" : 0.1 })

diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 78e9efe..ae6e164 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_devname("test_if"), + "iface" : m1.get_ip("test_if"), "interval" : 0.1 })

@@ -222,4 +222,4 @@ for offload in offloads: ctl.wait(2) m1.run(netperf_cli_tcp6, timeout=65) m1.run(netperf_cli_udp6, timeout=65) - server_proc.intr() \ No newline at end of file + 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 a4cfdd8..0de17d5 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 @@ -38,7 +38,7 @@ ping_mod2 = ctl.get_module("IcmpPing", options={ "addr" : g2.get_ip("guestnic", 0), "count" : 100, - "iface" : g4.get_devname("guestnic"), + "iface" : g4.get_ip("guestnic"), "interval" : 0.1 })

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 0d6aba8..63b5ed4 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 @@ -32,7 +32,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", options={ "addr" : h2.get_ip("vlan10", 1), "count" : 100, - "iface" : g1.get_devname("vlan10"), + "iface" : g1.get_ip("vlan10"), "interval" : 0.1 })

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 3344d81..e4d3810 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 @@ -32,7 +32,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", options={ "addr" : h2.get_ip("vlan10", 1), "count" : 100, - "iface" : g1.get_devname("guestnic"), + "iface" : g1.get_ip("guestnic"), "interval" : 0.1 })