This commit replaces InterfaceAPI methods get_ip() and get_devname() with HostAPI methods which are supported and recommended.
Signed-off-by: Jiri Prochazka jprochaz@redhat.com --- recipes/regression_tests/phase1/3_vlans.py | 40 ++++++++++--------- .../regression_tests/phase1/3_vlans_over_bond.py | 46 ++++++++++++---------- recipes/regression_tests/phase1/bonding_test.py | 36 ++++++++--------- recipes/regression_tests/phase1/simple_ping.py | 11 ++++-- 4 files changed, 71 insertions(+), 62 deletions(-)
diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index 2007dc4..68974e7 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -99,37 +99,40 @@ netperf_cli_udp6 = ctl.get_module("Netperf", })
for vlan1 in vlans: + m1_vlan1 = m1.get_interface(vlan1) for vlan2 in vlans: - ping_mod.update_options({"addr": m2.get_ip(vlan2, 0), - "iface": m1.get_devname(vlan1)}) + m2_vlan2 = m2.get_interface(vlan2)
- ping_mod6.update_options({"addr": m2.get_ip(vlan2, 1), - "iface": m1.get_ip(vlan1, 1)}) + ping_mod.update_options({"addr": m2_vlan2.get_ip(0), + "iface": m1_vlan1.get_devname()})
- netperf_srv.update_options({"bind": m1.get_ip(vlan1, 0)}) + ping_mod6.update_options({"addr": m2_vlan2.get_ip(1), + "iface": m1_vlan1.get_ip(1)})
- netperf_srv6.update_options({"bind": m1.get_ip(vlan1, 1)}) + netperf_srv.update_options({"bind": m1_vlan1.get_ip(0)})
- netperf_cli_tcp.update_options({"netperf_server": m1.get_ip(vlan1, 0), - "netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2.get_ip(vlan1, 0))}) + netperf_srv6.update_options({"bind": m1_vlan1.get_ip(1)})
- netperf_cli_udp.update_options({"netperf_server": m1.get_ip(vlan1, 0), - "netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2.get_ip(vlan1, 0))}) + netperf_cli_tcp.update_options({"netperf_server": m1_vlan1.get_ip(0), + "netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2_vlan2.get_ip(0))})
- netperf_cli_tcp6.update_options({"netperf_server": m1.get_ip(vlan1, 1), - "netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2.get_ip(vlan1, 1))}) + netperf_cli_udp.update_options({"netperf_server": m1_vlan1.get_ip(0), + "netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2_vlan2.get_ip(0))})
- netperf_cli_udp6.update_options({"netperf_server": m1.get_ip(vlan1, 1), - "netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2.get_ip(vlan1, 1))}) + netperf_cli_tcp6.update_options({"netperf_server": m1_vlan1.get_ip(1), + "netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2_vlan2.get_ip(1))}) + + netperf_cli_udp6.update_options({"netperf_server": m1_vlan1.get_ip(1), + "netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2_vlan2.get_ip(1))})
if vlan1 == vlan2: # These tests should pass # Ping between same VLANs for setting in offload_settings: for offload in setting: - m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"), + m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(), offload[0], offload[1])) - m2.run("ethtool -K %s %s %s" % (m2.get_devname("eth1"), + m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(), offload[0], offload[1]))
if ipv in [ 'ipv4', 'both' ]: @@ -234,7 +237,6 @@ for vlan1 in vlans: perf_api.save_result(result_udp)
srv_proc.intr() - # These tests should fail # Ping across different VLAN else: @@ -246,7 +248,7 @@ for vlan1 in vlans:
#reset offload states for offload in offloads: - m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"), + m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(), offload, "on")) - m2.run("ethtool -K %s %s %s" % (m2.get_devname("eth1"), + m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(), offload, "on")) diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index 79c4b4d..d382036 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -39,6 +39,8 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
m1_bond = m1.get_interface("test_bond") m1_bond.set_mtu(mtu) +m1_phy1 = m1.get_interface("eth1") +m1_phy2 = m1.get_interface("eth2") m2_phy1 = m2.get_interface("eth1") m2_phy1.set_mtu(mtu)
@@ -99,28 +101,31 @@ netperf_cli_udp6 = ctl.get_module("Netperf", })
for vlan1 in vlans: + m1_vlan1 = m1.get_interface(vlan1) for vlan2 in vlans: - ping_mod.update_options({"addr": m2.get_ip(vlan2, 0), - "iface": m1.get_devname(vlan1)}) + m2_vlan2 = m2.get_interface(vlan2)
- ping_mod6.update_options({"addr": m2.get_ip(vlan2, 1), - "iface": m1.get_ip(vlan1, 1)}) + ping_mod.update_options({"addr": m2_vlan2.get_ip(0), + "iface": m1_vlan1.get_devname()})
- netperf_srv.update_options({"bind": m1.get_ip(vlan1, 0)}) + ping_mod6.update_options({"addr": m2_vlan2.get_ip(1), + "iface": m1_vlan1.get_ip(1)})
- netperf_srv6.update_options({"bind": m1.get_ip(vlan1, 1)}) + netperf_srv.update_options({"bind": m1_vlan1.get_ip(0)})
- netperf_cli_tcp.update_options({"netperf_server": m1.get_ip(vlan1, 0), - "netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2.get_ip(vlan1, 0))}) + netperf_srv6.update_options({"bind": m1_vlan1.get_ip(1)})
- netperf_cli_udp.update_options({"netperf_server": m1.get_ip(vlan1, 0), - "netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2.get_ip(vlan1, 0))}) + netperf_cli_tcp.update_options({"netperf_server": m1_vlan1.get_ip(0), + "netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2_vlan2.get_ip(0))})
- netperf_cli_tcp6.update_options({"netperf_server": m1.get_ip(vlan1, 1), - "netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2.get_ip(vlan1, 1))}) + netperf_cli_udp.update_options({"netperf_server": m1_vlan1.get_ip(0), + "netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2_vlan2.get_ip(0))})
- netperf_cli_udp6.update_options({"netperf_server": m1.get_ip(vlan1, 1), - "netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2.get_ip(vlan1, 1))}) + netperf_cli_tcp6.update_options({"netperf_server": m1_vlan1.get_ip(1), + "netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2_vlan2.get_ip(1))}) + + netperf_cli_udp6.update_options({"netperf_server": m1_vlan1.get_ip(1), + "netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2_vlan2.get_ip(1))})
if vlan1 == vlan2: # These tests should pass @@ -128,11 +133,11 @@ for vlan1 in vlans: for setting in offload_settings: #apply offload setting for offload in setting: - m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"), + m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(), offload[0], offload[1])) - m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth2"), + m1.run("ethtool -K %s %s %s" % (m1_phy2.get_devname(), offload[0], offload[1])) - m2.run("ethtool -K %s %s %s" % (m2.get_devname("eth1"), + m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(), offload[0], offload[1]))
if ipv in [ 'ipv4', 'both' ]: @@ -238,7 +243,6 @@ for vlan1 in vlans: perf_api.save_result(result_udp)
srv_proc.intr() - # These tests should fail # Ping across different VLAN else: @@ -250,9 +254,9 @@ for vlan1 in vlans:
#reset offload states for offload in offloads: - m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"), + m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(), offload, "on")) - m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth2"), + m1.run("ethtool -K %s %s %s" % (m1_phy2.get_devname(), offload, "on")) - m2.run("ethtool -K %s %s %s" % (m2.get_devname("eth1"), + m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(), offload, "on")) diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index 18659d1..079a8fe 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -44,83 +44,83 @@ test_if2.set_mtu(mtu)
ping_mod = ctl.get_module("IcmpPing", options={ - "addr" : m2.get_ip("test_if", 0), + "addr" : test_if2.get_ip(0), "count" : 100, - "iface" : m1.get_devname("test_if"), + "iface" : test_if1.get_devname(), "interval" : 0.1 })
ping_mod6 = ctl.get_module("Icmp6Ping", options={ - "addr" : m2.get_ip("test_if", 1), + "addr" : test_if2.get_ip(1), "count" : 100, - "iface" : m1.get_devname("test_if"), + "iface" : test_if1.get_devname(), "interval" : 0.1 })
netperf_srv = ctl.get_module("Netperf", options = { "role" : "server", - "bind" : m1.get_ip("test_if", 0) + "bind" : test_if1.get_ip(0) })
netperf_srv6 = ctl.get_module("Netperf", options={ "role" : "server", - "bind" : m1.get_ip("test_if", 1), + "bind" : test_if1.get_ip(1), "netperf_opts" : " -6", })
netperf_cli_tcp = ctl.get_module("Netperf", options = { "role" : "client", - "netperf_server" : m1.get_ip("test_if", 0), + "netperf_server" : test_if1.get_ip(0), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, - "netperf_opts" : "-i %s -L %s" % (nperf_max_runs, m2.get_ip("test_if", 0)) + "netperf_opts" : "-i %s -L %s" % (nperf_max_runs, test_if2.get_ip(0)) })
netperf_cli_udp = ctl.get_module("Netperf", options = { "role" : "client", - "netperf_server" : m1.get_ip("test_if", 0), + "netperf_server" : test_if1.get_ip(0), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, - "netperf_opts" : "-i %s -L %s" % (nperf_max_runs, m2.get_ip("test_if", 0)) + "netperf_opts" : "-i %s -L %s" % (nperf_max_runs, test_if2.get_ip(0)) })
netperf_cli_tcp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : - m1.get_ip("test_if", 1), + test_if1.get_ip(1), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : - "-i %s -L %s -6" % (nperf_max_runs, m2.get_ip("test_if", 1)) + "-i %s -L %s -6" % (nperf_max_runs, test_if2.get_ip(1)) }) netperf_cli_udp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : - m1.get_ip("test_if", 1), + test_if1.get_ip(1), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : - "-i %s -L %s -6" % (nperf_max_runs, m2.get_ip("test_if", 1)) + "-i %s -L %s -6" % (nperf_max_runs, test_if2.get_ip(1)) })
ctl.wait(15)
for setting in offload_settings: for offload in setting: - m1.run("ethtool -K %s %s %s" % (m1.get_devname("test_if"), + m1.run("ethtool -K %s %s %s" % (test_if1.get_devname(), offload[0], offload[1])) - m2.run("ethtool -K %s %s %s" % (m2.get_devname("test_if"), + m2.run("ethtool -K %s %s %s" % (test_if2.get_devname(), offload[0], offload[1]))
if ipv in [ 'ipv4', 'both' ]: @@ -217,7 +217,7 @@ for setting in offload_settings:
#reset offload states for offload in offloads: - m1.run("ethtool -K %s %s %s" % (m1.get_devname("test_if"), + m1.run("ethtool -K %s %s %s" % (test_if1.get_devname(), offload, "on")) - m2.run("ethtool -K %s %s %s" % (m2.get_devname("test_if"), + m2.run("ethtool -K %s %s %s" % (test_if2.get_devname(), offload, "on")) diff --git a/recipes/regression_tests/phase1/simple_ping.py b/recipes/regression_tests/phase1/simple_ping.py index f9e5837..3591402 100644 --- a/recipes/regression_tests/phase1/simple_ping.py +++ b/recipes/regression_tests/phase1/simple_ping.py @@ -6,20 +6,23 @@ hostB = ctl.get_host("machine2") hostA.sync_resources(modules=["Icmp6Ping", "IcmpPing"]) hostB.sync_resources(modules=["Icmp6Ping", "IcmpPing"])
+hostA_testiface = hostA.get_interface("testiface") +hostB_testiface = hostB.get_interface("testiface") + ping_mod = ctl.get_module("IcmpPing", options={ - "addr": hostB.get_ip("testiface", 0), + "addr": hostB_testiface.get_ip(0), "count": 100, "interval": 0.2, - "iface" : hostA.get_devname("testiface"), + "iface" : hostA_testiface.get_devname(), "limit_rate": 90})
ping_mod6 = ctl.get_module("Icmp6Ping", options={ - "addr": hostB.get_ip("testiface", 1), + "addr": hostB_testiface.get_ip(1), "count": 100, "interval": 0.2, - "iface" : hostA.get_ip("testiface", 1), + "iface" : hostA_testiface.get_ip(1), "limit_rate": 90})
ctl.wait(15)
This commit replaces InterfaceAPI methods get_ip() and get_devname() with HostAPI methods which are supported and recommended.
Signed-off-by: Jiri Prochazka jprochaz@redhat.com --- .../phase1/virtual_bridge_2_vlans_over_bond.py | 93 ++++++++++++---------- .../phase1/virtual_bridge_vlan_in_guest.py | 46 ++++++----- .../phase1/virtual_bridge_vlan_in_host.py | 45 ++++++----- 3 files changed, 102 insertions(+), 82 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 ed2de32..e1c7796 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py @@ -46,125 +46,134 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs")) mtu = ctl.get_alias("mtu") enable_udp_perf = ctl.get_alias("enable_udp_perf")
+h1_nic1 = h1.get_interface("nic1") +h1_nic2 = h1.get_interface("nic2") +h2_nic1 = h2.get_interface("nic1") +h2_nic2 = h2.get_interface("nic2") +g1_guestnic = g1.get_interface("guestnic") +g2_guestnic = g2.get_interface("guestnic") +g3_guestnic = g3.get_interface("guestnic") +g4_guestnic = g4.get_interface("guestnic") + ping_mod = ctl.get_module("IcmpPing", options={ - "addr" : g3.get_ip("guestnic", 0), + "addr" : g3_guestnic.get_ip(0), "count" : 100, - "iface" : g1.get_devname("guestnic"), + "iface" : g1_guestnic.get_devname(), "interval" : 0.1 }) ping_mod2 = ctl.get_module("IcmpPing", options={ - "addr" : g2.get_ip("guestnic", 0), + "addr" : g2_guestnic.get_ip(0), "count" : 100, - "iface" : g4.get_devname("guestnic"), + "iface" : g4_guestnic.get_devname(), "interval" : 0.1 })
ping_mod6 = ctl.get_module("Icmp6Ping", options={ - "addr" : g3.get_ip("guestnic", 1), + "addr" : g3_guestnic.get_ip(1), "count" : 100, - "iface" : g1.get_devname("guestnic"), + "iface" : g1_guestnic.get_devname(), "interval" : 0.1 })
ping_mod62 = ctl.get_module("Icmp6Ping", options={ - "addr" : g2.get_ip("guestnic", 1), + "addr" : g2_guestnic.get_ip(1), "count" : 100, - "iface" : g4.get_devname("guestnic"), + "iface" : g4_guestnic.get_devname(), "interval" : 0.1 })
netperf_srv = ctl.get_module("Netperf", options={ "role": "server", - "bind" : g1.get_ip("guestnic") + "bind" : g1_guestnic.get_ip(0) })
netperf_srv6 = ctl.get_module("Netperf", options={ "role" : "server", - "bind" : g1.get_ip("guestnic", 1), + "bind" : g1_guestnic.get_ip(1), "netperf_opts" : " -6", })
netperf_cli_tcp = ctl.get_module("Netperf", options={ "role" : "client", - "netperf_server" : g1.get_ip("guestnic"), + "netperf_server" : g1_guestnic.get_ip(0), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : "-i %s -L %s" % - (nperf_max_runs, g3.get_ip("guestnic")) + (nperf_max_runs, g3_guestnic.get_ip(0)) })
netperf_cli_udp = ctl.get_module("Netperf", options={ "role" : "client", - "netperf_server" : g1.get_ip("guestnic"), + "netperf_server" : g1_guestnic.get_ip(0), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : "-i %s -L %s" % - (nperf_max_runs, g3.get_ip("guestnic")) + (nperf_max_runs, g3_guestnic.get_ip(0)) })
netperf_cli_tcp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : - g1.get_ip("guestnic", 1), + g1_guestnic.get_ip(1), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : - "-i %s -L %s -6" % (nperf_max_runs, g3.get_ip("guestnic", 1)) + "-i %s -L %s -6" % (nperf_max_runs, g3_guestnic.get_ip(1)) })
netperf_cli_udp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : - g1.get_ip("guestnic", 1), + g1_guestnic.get_ip(1), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : - "-i %s -L %s -6" % (nperf_max_runs, g3.get_ip("guestnic", 1)) + "-i %s -L %s -6" % (nperf_max_runs, g3_guestnic.get_ip(1)) })
ping_mod_bad = ctl.get_module("IcmpPing", options={ - "addr" : g4.get_ip("guestnic"), + "addr" : g4_guestnic.get_ip(0), "count" : 100, - "iface" : g1.get_devname("guestnic"), + "iface" : g1_guestnic.get_devname(), "interval" : 0.1 })
ping_mod_bad2 = ctl.get_module("IcmpPing", options={ - "addr" : g2.get_ip("guestnic"), + "addr" : g2_guestnic.get_ip(0), "count" : 100, - "iface" : g3.get_devname("guestnic"), + "iface" : g3_guestnic.get_devname(), "interval" : 0.1 })
ping_mod6_bad = ctl.get_module("Icmp6Ping", options={ - "addr" : g4.get_ip("guestnic", 1), + "addr" : g4_guestnic.get_ip(1), "count" : 100, - "iface" : g1.get_devname("guestnic"), + "iface" : g1_guestnic.get_devname(), "interval" : 0.1 })
ping_mod6_bad2 = ctl.get_module("Icmp6Ping", options={ - "addr" : g2.get_ip("guestnic", 1), + "addr" : g2_guestnic.get_ip(1), "count" : 100, - "iface" : g3.get_devname("guestnic"), + "iface" : g3_guestnic.get_devname(), "interval" : 0.1 })
@@ -194,21 +203,21 @@ ctl.wait(15)
for setting in offload_settings: for offload in setting: - h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic1"), + h1.run("ethtool -K %s %s %s" % (h1_nic1.get_devname(), offload[0], offload[1])) - h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic2"), + h1.run("ethtool -K %s %s %s" % (h1_nic2.get_devname(), offload[0], offload[1])) - h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic1"), + h2.run("ethtool -K %s %s %s" % (h2_nic1.get_devname(), offload[0], offload[1])) - h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic2"), + h2.run("ethtool -K %s %s %s" % (h2_nic2.get_devname(), offload[0], offload[1])) - g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), + g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), offload[0], offload[1])) - g2.run("ethtool -K %s %s %s" % (g2.get_devname("guestnic"), + g2.run("ethtool -K %s %s %s" % (g2_guestnic.get_devname(), offload[0], offload[1])) - g3.run("ethtool -K %s %s %s" % (g3.get_devname("guestnic"), + g3.run("ethtool -K %s %s %s" % (g3_guestnic.get_devname(), offload[0], offload[1])) - g4.run("ethtool -K %s %s %s" % (g4.get_devname("guestnic"), + g4.run("ethtool -K %s %s %s" % (g4_guestnic.get_devname(), offload[0], offload[1]))
if ipv in [ 'ipv4', 'both' ]: @@ -317,19 +326,19 @@ for setting in offload_settings:
#reset offload states for offload in offloads: - h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic1"), + h1.run("ethtool -K %s %s %s" % (h1_nic1.get_devname(), offload, "on")) - h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic2"), + h1.run("ethtool -K %s %s %s" % (h1_nic2.get_devname(), offload, "on")) - h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic1"), + h2.run("ethtool -K %s %s %s" % (h2_nic1.get_devname(), offload, "on")) - h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic2"), + h2.run("ethtool -K %s %s %s" % (h2_nic2.get_devname(), offload, "on")) - g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), + g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), offload, "on")) - g2.run("ethtool -K %s %s %s" % (g2.get_devname("guestnic"), + g2.run("ethtool -K %s %s %s" % (g2_guestnic.get_devname(), offload, "on")) - g3.run("ethtool -K %s %s %s" % (g3.get_devname("guestnic"), + g3.run("ethtool -K %s %s %s" % (g3_guestnic.get_devname(), offload, "on")) - g4.run("ethtool -K %s %s %s" % (g4.get_devname("guestnic"), + g4.run("ethtool -K %s %s %s" % (g4_guestnic.get_devname(), offload, "on")) 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 b762f8c..81e4a25 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -40,79 +40,85 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs")) mtu = ctl.get_alias("mtu") enable_udp_perf = ctl.get_alias("enable_udp_perf")
+h2_vlan10 = h2.get_interface("vlan10") +g1_vlan10 = g1.get_interface("vlan10") +g1_guestnic = g1.get_interface("guestnic") +h1_nic = h1.get_interface("nic") +h2_nic = h2.get_interface("nic") + ping_mod = ctl.get_module("IcmpPing", options={ - "addr" : h2.get_ip("vlan10", 0), + "addr" : h2_vlan10.get_ip(0), "count" : 100, - "iface" : g1.get_devname("vlan10"), + "iface" : g1_vlan10.get_devname(), "interval" : 0.1 })
ping_mod6 = ctl.get_module("Icmp6Ping", options={ - "addr" : h2.get_ip("vlan10", 1), + "addr" : h2_vlan10.get_ip(1), "count" : 100, - "iface" : g1.get_ip("vlan10", 1), + "iface" : g1_vlan10.get_ip(1), "interval" : 0.1 })
netperf_srv = ctl.get_module("Netperf", options={ "role" : "server", - "bind" : g1.get_ip("vlan10") + "bind" : g1_vlan10.get_ip(0) })
netperf_srv6 = ctl.get_module("Netperf", options={ "role" : "server", - "bind" : g1.get_ip("vlan10", 1), + "bind" : g1_vlan10.get_ip(1), "netperf_opts" : " -6", })
netperf_cli_tcp = ctl.get_module("Netperf", options={ "role" : "client", - "netperf_server" : g1.get_ip("vlan10"), + "netperf_server" : g1_vlan10.get_ip(0), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : "-i %s -L %s" % - (nperf_max_runs, h2.get_ip("vlan10")) + (nperf_max_runs, h2_vlan10.get_ip(0)) })
netperf_cli_udp = ctl.get_module("Netperf", options={ "role" : "client", - "netperf_server" : g1.get_ip("vlan10"), + "netperf_server" : g1_vlan10.get_ip(0), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : "-i %s -L %s" % - (nperf_max_runs, h2.get_ip("vlan10")) + (nperf_max_runs, h2_vlan10.get_ip(0)) })
netperf_cli_tcp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : - g1.get_ip("vlan10", 1), + g1_vlan10.get_ip(1), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : - "-i %s -L %s -6" % (nperf_max_runs, h2.get_ip("vlan10", 1)) + "-i %s -L %s -6" % (nperf_max_runs, h2_vlan10.get_ip(1)) })
netperf_cli_udp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : - g1.get_ip("vlan10", 1), + g1_vlan10.get_ip(1), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : - "-i %s -L %s -6" % (nperf_max_runs, h2.get_ip("vlan10", 1)) + "-i %s -L %s -6" % (nperf_max_runs, h2_vlan10.get_ip(1)) })
# configure mtu @@ -129,11 +135,11 @@ ctl.wait(15)
for setting in offload_settings: for offload in setting: - g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), + g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), offload[0], offload[1])) - h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), + h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(), offload[0], offload[1])) - h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"), + h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(), offload[0], offload[1]))
if ipv in [ 'ipv4', 'both' ]: @@ -236,9 +242,9 @@ for setting in offload_settings:
#reset offload states for offload in offloads: - g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), + g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), offload, "on")) - h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), + h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(), offload, "on")) - h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"), + h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(), offload, "on")) 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 4c1a454..e5d4927 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -40,79 +40,84 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs")) mtu = ctl.get_alias("mtu") enable_udp_perf = ctl.get_alias("enable_udp_perf")
+h2_vlan10 = h2.get_interface("vlan10") +g1_guestnic= g1.get_interface("guestnic") +h1_nic = h1.get_interface("nic") +h2_nic = h2.get_interface("nic") + ping_mod = ctl.get_module("IcmpPing", options={ - "addr" : h2.get_ip("vlan10"), + "addr" : h2_vlan10.get_ip(0), "count" : 100, - "iface" : g1.get_devname("guestnic"), + "iface" : g1_guestnic.get_devname(), "interval" : 0.1 })
ping_mod6 = ctl.get_module("Icmp6Ping", options={ - "addr" : h2.get_ip("vlan10", 1), + "addr" : h2_vlan10.get_ip(1), "count" : 100, - "iface" : g1.get_ip("guestnic", 1), + "iface" : g1_guestnic.get_ip(1), "interval" : 0.1 })
netperf_srv = ctl.get_module("Netperf", options={ "role" : "server", - "bind" : g1.get_ip("guestnic") + "bind" : g1_guestnic.get_ip(0) })
netperf_srv6 = ctl.get_module("Netperf", options={ "role" : "server", - "bind" : g1.get_ip("guestnic", 1), + "bind" : g1_guestnic.get_ip(1), "netperf_opts" : " -6", })
netperf_cli_tcp = ctl.get_module("Netperf", options={ "role" : "client", - "netperf_server" : g1.get_ip("guestnic"), + "netperf_server" : g1_guestnic.get_ip(0), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : "-i %s -L %s" % - (nperf_max_runs, h2.get_ip("vlan10")) + (nperf_max_runs, h2_vlan10.get_ip(0)) })
netperf_cli_udp = ctl.get_module("Netperf", options={ "role" : "client", - "netperf_server" : g1.get_ip("guestnic"), + "netperf_server" : g1_guestnic.get_ip(0), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : "-i %s -L %s" % - (nperf_max_runs, h2.get_ip("vlan10")) + (nperf_max_runs, h2_vlan10.get_ip(0)) })
netperf_cli_tcp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : - g1.get_ip("guestnic", 1), + g1_guestnic.get_ip(1), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : - "-i %s -L %s -6" % (nperf_max_runs, h2.get_ip("vlan10", 1)) + "-i %s -L %s -6" % (nperf_max_runs, h2_vlan10.get_ip(1)) })
netperf_cli_udp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : - g1.get_ip("guestnic", 1), + g1_guestnic.get_ip(1), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : - "-i %s -L %s -6" % (nperf_max_runs, h2.get_ip("vlan10", 1)) + "-i %s -L %s -6" % (nperf_max_runs, h2_vlan10.get_ip(1)) })
# configure mtu @@ -130,11 +135,11 @@ ctl.wait(15)
for setting in offload_settings: for offload in setting: - g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), + g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), offload[0], offload[1])) - h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), + h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(), offload[0], offload[1])) - h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"), + h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(), offload[0], offload[1]))
if ipv in [ 'ipv4', 'both' ]: @@ -237,9 +242,9 @@ for setting in offload_settings:
#reset offload states for offload in offloads: - g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), + g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), offload, "on")) - h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), + h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(), offload, "on")) - h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"), + h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(), offload, "on"))
This commit replaces InterfaceAPI methods get_ip() and get_devname() with HostAPI methods which are supported and recommended.
v3 - fix typo in 3_vlans_over_team.py
Signed-off-by: Jiri Prochazka jprochaz@redhat.com --- .../regression_tests/phase2/3_vlans_over_team.py | 45 +++++++------ recipes/regression_tests/phase2/team_test.py | 73 +++++++++++----------- 2 files changed, 61 insertions(+), 57 deletions(-)
diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index 77298a2..28914cc 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -39,6 +39,8 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
m1_team = m1.get_interface("test_if") m1_team.set_mtu(mtu) +m1_phy1 = m1.get_interface("eth1") +m1_phy2 = m1.get_interface("eth2") m2_phy1 = m2.get_interface("eth1") m2_phy1.set_mtu(mtu)
@@ -100,39 +102,42 @@ netperf_cli_udp6 = ctl.get_module("Netperf", })
for vlan1 in vlans: + m1_vlan1 = m1.get_interface(vlan1) for vlan2 in vlans: - ping_mod.update_options({"addr": m2.get_ip(vlan2, 0), - "iface": m1.get_devname(vlan1)}) + m2_vlan2 = m2.get_interface(vlan2)
- ping_mod6.update_options({"addr": m2.get_ip(vlan2, 1), - "iface": m1.get_ip(vlan1, 1)}) + ping_mod.update_options({"addr": m2_vlan2.get_ip(0), + "iface": m1_vlan1.get_devname()})
- netperf_srv.update_options({"bind": m1.get_ip(vlan1, 0)}) + ping_mod6.update_options({"addr": m2_vlan2.get_ip(1), + "iface": m1_vlan1.get_ip(1)})
- netperf_srv6.update_options({"bind": m1.get_ip(vlan1, 1)}) + netperf_srv.update_options({"bind": m1_vlan1.get_ip(0)})
- netperf_cli_tcp.update_options({"netperf_server": m1.get_ip(vlan1, 0), - "netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2.get_ip(vlan1, 0))}) + netperf_srv6.update_options({"bind": m1_vlan1.get_ip(1)})
- netperf_cli_udp.update_options({"netperf_server": m1.get_ip(vlan1, 0), - "netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2.get_ip(vlan1, 0))}) + netperf_cli_tcp.update_options({"netperf_server": m1_vlan1.get_ip(0), + "netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2_vlan2.get_ip(0))})
- netperf_cli_tcp6.update_options({"netperf_server": m1.get_ip(vlan1, 1), - "netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2.get_ip(vlan1, 1))}) + netperf_cli_udp.update_options({"netperf_server": m1_vlan1.get_ip(0), + "netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2_vlan2.get_ip(0))})
- netperf_cli_udp6.update_options({"netperf_server": m1.get_ip(vlan1, 1), - "netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2.get_ip(vlan1, 1))}) + netperf_cli_tcp6.update_options({"netperf_server": m1_vlan1.get_ip(1), + "netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2_vlan2.get_ip(1))}) + + netperf_cli_udp6.update_options({"netperf_server": m1_vlan1.get_ip(1), + "netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2_vlan2.get_ip(1))})
if vlan1 == vlan2: # These tests should pass # Ping between same VLANs for setting in offload_settings: for offload in setting: - m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"), + m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(), offload[0], offload[1])) - m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth2"), + m1.run("ethtool -K %s %s %s" % (m1_phy2.get_devname(), offload[0], offload[1])) - m2.run("ethtool -K %s %s %s" % (m2.get_devname("eth1"), + m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(), offload[0], offload[1]))
if ipv in [ 'ipv4', 'both' ]: @@ -248,9 +253,9 @@ for vlan1 in vlans:
#reset offload states for offload in offloads: - m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"), + m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(), offload, "on")) - m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth2"), + m1.run("ethtool -K %s %s %s" % (m1_phy2.get_devname(), offload, "on")) - m2.run("ethtool -K %s %s %s" % (m2.get_devname("eth1"), + m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(), offload, "on")) diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 8ebb5cf..9ee0ae0 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -44,83 +44,83 @@ test_if2.set_mtu(mtu)
ping_mod = ctl.get_module("IcmpPing", options={ - "addr" : m2.get_ip("test_if", 0), + "addr" : test_if2.get_ip(0), "count" : 100, - "iface" : m1.get_devname("test_if"), + "iface" : test_if1.get_devname(), "interval" : 0.1 })
ping_mod6 = ctl.get_module("Icmp6Ping", options={ - "addr" : m2.get_ip("test_if", 1), + "addr" : test_if2.get_ip(1), "count" : 100, - "iface" : m1.get_ip("test_if", 1), + "iface" : test_if1.get_ip(1), "interval" : 0.1 })
netperf_srv = ctl.get_module("Netperf", options = { "role" : "server", - "bind" : m1.get_ip("test_if", 0) + "bind" : test_if1.get_ip(0) })
netperf_srv6 = ctl.get_module("Netperf", options = { "role" : "server", - "bind" : m1.get_ip("test_if", 1), + "bind" : test_if1.get_ip(1), "netperf_opts" : " -6" })
netperf_cli_tcp = ctl.get_module("Netperf", options = { "role" : "client", - "netperf_server" : m1.get_ip("test_if", 0), + "netperf_server" : test_if1.get_ip(0), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, - "netperf_opts" : "-i %s -L %s" % (nperf_max_runs, m2.get_ip("test_if", 0)) + "netperf_opts" : "-i %s -L %s" % (nperf_max_runs, test_if2.get_ip(0)) })
netperf_cli_udp = ctl.get_module("Netperf", options = { "role" : "client", - "netperf_server" : m1.get_ip("test_if", 0), + "netperf_server" : test_if1.get_ip(0), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, - "netperf_opts" : "-i %s -L %s" % (nperf_max_runs, m2.get_ip("test_if", 0)) + "netperf_opts" : "-i %s -L %s" % (nperf_max_runs, test_if2.get_ip(0)) })
netperf_cli_tcp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : - m1.get_ip("test_if", 1), + test_if1.get_ip(1), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : - "-i %s -L %s -6" % (nperf_max_runs, m2.get_ip("test_if", 1)) + "-i %s -L %s -6" % (nperf_max_runs, test_if2.get_ip(1)) }) netperf_cli_udp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : - m1.get_ip("test_if", 1), + test_if1.get_ip(1), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : - "-i %s -L %s -6" % (nperf_max_runs, m2.get_ip("test_if", 1)) + "-i %s -L %s -6" % (nperf_max_runs, test_if2.get_ip(1)) })
ctl.wait(15)
for setting in offload_settings: for offload in setting: - m1.run("ethtool -K %s %s %s" % (m1.get_devname("test_if"), + m1.run("ethtool -K %s %s %s" % (test_if1.get_devname(), offload[0], offload[1])) - m2.run("ethtool -K %s %s %s" % (m2.get_devname("test_if"), + m2.run("ethtool -K %s %s %s" % (test_if2.get_devname(), offload[0], offload[1]))
if ipv in [ 'ipv4', 'both' ]: @@ -224,39 +224,38 @@ for setting in offload_settings:
#reset offload states for offload in offloads: - m1.run("ethtool -K %s %s %s" % (m1.get_devname("test_if"), + m1.run("ethtool -K %s %s %s" % (test_if1.get_devname(), offload, "on")) - m2.run("ethtool -K %s %s %s" % (m2.get_devname("test_if"), + m2.run("ethtool -K %s %s %s" % (test_if2.get_devname(), offload, "on"))
+ping_mod.update_options({"addr" : test_if1.get_ip(0), + "iface" : test_if2.get_devname()})
-ping_mod.update_options({"addr" : m1.get_ip("test_if", 0), - "iface" : m2.get_devname("test_if")}) +ping_mod6.update_options({"addr" : test_if1.get_ip(1), + "iface" : test_if2.get_devname()})
-ping_mod6.update_options({"addr" : m1.get_ip("test_if", 1), - "iface" : m2.get_devname("test_if")}) +netperf_srv.update_options({"bind" : test_if2.get_ip(0)})
-netperf_srv.update_options({"bind" : m2.get_ip("test_if", 0)}) +netperf_srv6.update_options({"bind" : test_if2.get_ip(1)})
-netperf_srv6.update_options({"bind" : m2.get_ip("test_if", 1)}) +netperf_cli_tcp.update_options({"netperf_server" : test_if2.get_ip(0), + "netperf_opts" : "-i %s -L %s" % (nperf_max_runs, test_if1.get_ip(0))})
-netperf_cli_tcp.update_options({"netperf_server" : m2.get_ip("test_if", 0), - "netperf_opts" : "-i %s -L %s" % (nperf_max_runs, m1.get_ip("test_if", 0))}) +netperf_cli_udp.update_options({"netperf_server" : test_if2.get_ip(0), + "netperf_opts" : "-i %s -L %s" % (nperf_max_runs, test_if1.get_ip(0))})
-netperf_cli_udp.update_options({"netperf_server" : m2.get_ip("test_if", 0), - "netperf_opts" : "-i %s -L %s" % (nperf_max_runs, m1.get_ip("test_if", 0))}) +netperf_cli_tcp6.update_options({"netperf_server" : test_if2.get_ip(1), + "netperf_opts" : "-i %s -L %s -6" % (nperf_max_runs, test_if1.get_ip(1))})
-netperf_cli_tcp6.update_options({"netperf_server" : m2.get_ip("test_if", 1), - "netperf_opts" : "-i %s -L %s -6" % (nperf_max_runs, m1.get_ip("test_if", 1))}) - -netperf_cli_udp6.update_options({"netperf_server" : m2.get_ip("test_if", 1), - "netperf_opts" : "-i %s -L %s -6" % (nperf_max_runs, m1.get_ip("test_if", 1))}) +netperf_cli_udp6.update_options({"netperf_server" : test_if2.get_ip(1), + "netperf_opts" : "-i %s -L %s -6" % (nperf_max_runs, test_if1.get_ip(1))})
for setting in offload_settings: for offload in setting: - m1.run("ethtool -K %s %s %s" % (m1.get_devname("test_if"), + m1.run("ethtool -K %s %s %s" % (test_if1.get_devname(), offload[0], offload[1])) - m2.run("ethtool -K %s %s %s" % (m2.get_devname("test_if"), + m2.run("ethtool -K %s %s %s" % (test_if2.get_devname(), offload[0], offload[1]))
if ipv in [ 'ipv4', 'both' ]: @@ -360,7 +359,7 @@ for setting in offload_settings:
#reset offload states for offload in offloads: - m1.run("ethtool -K %s %s %s" % (m1.get_devname("test_if"), + m1.run("ethtool -K %s %s %s" % (test_if1.get_devname(), offload, "on")) - m2.run("ethtool -K %s %s %s" % (m2.get_devname("test_if"), + m2.run("ethtool -K %s %s %s" % (test_if2.get_devname(), offload, "on"))
This commit replaces InterfaceAPI methods get_ip() and get_devname() with HostAPI methods which are supported and recommended.
Signed-off-by: Jiri Prochazka jprochaz@redhat.com --- ...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 93 ++++++++++++---------- .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 50 +++++++----- .../phase2/virtual_ovs_bridge_vlan_in_host.py | 45 ++++++----- 3 files changed, 104 insertions(+), 84 deletions(-)
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 1c1aad7..4f824a0 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 @@ -43,127 +43,136 @@ nperf_reserve = int(ctl.get_alias("nperf_reserve")) nperf_confidence = ctl.get_alias("nperf_confidence") nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
+h1_nic1 = h1.get_interface("nic1") +h1_nic2 = h1.get_interface("nic2") +h2_nic1 = h2.get_interface("nic1") +h2_nic2 = h2.get_interface("nic2") +g1_guestnic = g1.get_interface("guestnic") +g2_guestnic = g2.get_interface("guestnic") +g3_guestnic = g3.get_interface("guestnic") +g4_guestnic = g4.get_interface("guestnic") + ping_mod = ctl.get_module("IcmpPing", options={ - "addr" : g3.get_ip("guestnic", 0), + "addr" : g3_guestnic.get_ip(0), "count" : 100, - "iface" : g1.get_devname("guestnic"), + "iface" : g1_guestnic.get_devname(), "interval" : 0.1 })
ping_mod2 = ctl.get_module("IcmpPing", options={ - "addr" : g2.get_ip("guestnic", 0), + "addr" : g2_guestnic.get_ip(0), "count" : 100, - "iface" : g4.get_ip("guestnic"), + "iface" : g4_guestnic.get_ip(0), "interval" : 0.1 })
ping_mod6 = ctl.get_module("Icmp6Ping", options={ - "addr" : g3.get_ip("guestnic", 1), + "addr" : g3_guestnic.get_ip(1), "count" : 100, - "iface" : g1.get_devname("guestnic"), + "iface" : g1_guestnic.get_devname(), "interval" : 0.1 })
ping_mod62 = ctl.get_module("Icmp6Ping", options={ - "addr" : g2.get_ip("guestnic", 1), + "addr" : g2_guestnic.get_ip(1), "count" : 100, - "iface" : g4.get_devname("guestnic"), + "iface" : g4_guestnic.get_devname(), "interval" : 0.1 })
netperf_srv = ctl.get_module("Netperf", options={ "role": "server", - "bind" : g1.get_ip("guestnic") + "bind" : g1_guestnic.get_ip(0) })
netperf_srv6 = ctl.get_module("Netperf", options={ "role" : "server", - "bind" : g1.get_ip("guestnic", 1), + "bind" : g1_guestnic.get_ip(1), "netperf_opts" : " -6", })
netperf_cli_tcp = ctl.get_module("Netperf", options={ "role" : "client", - "netperf_server" : g1.get_ip("guestnic"), + "netperf_server" : g1_guestnic.get_ip(0), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : "-i %s -L %s" % - (nperf_max_runs, g3.get_ip("guestnic")) + (nperf_max_runs, g3_guestnic.get_ip(0)) })
netperf_cli_udp = ctl.get_module("Netperf", options={ "role" : "client", - "netperf_server" : g1.get_ip("guestnic"), + "netperf_server" : g1_guestnic.get_ip(0), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : "-i %s -L %s" % - (nperf_max_runs, g3.get_ip("guestnic")) + (nperf_max_runs, g3_guestnic.get_ip(0)) })
netperf_cli_tcp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : - g1.get_ip("guestnic", 1), + g1_guestnic.get_ip(1), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : - "-i %s -L %s -6" % (nperf_max_runs, g3.get_ip("guestnic", 1)) + "-i %s -L %s -6" % (nperf_max_runs, g3_guestnic.get_ip(1)) })
netperf_cli_udp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : - g1.get_ip("guestnic", 1), + g1_guestnic.get_ip(1), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : - "-i %s -L %s -6" % (nperf_max_runs, g3.get_ip("guestnic", 1)) + "-i %s -L %s -6" % (nperf_max_runs, g3_guestnic.get_ip(1)) })
ping_mod_bad = ctl.get_module("IcmpPing", options={ - "addr" : g4.get_ip("guestnic"), + "addr" : g4_guestnic.get_ip(0), "count" : 100, - "iface" : g1.get_devname("guestnic"), + "iface" : g1_guestnic.get_devname(), "interval" : 0.1 })
ping_mod_bad2 = ctl.get_module("IcmpPing", options={ - "addr" : g2.get_ip("guestnic"), + "addr" : g2_guestnic.get_ip(0), "count" : 100, - "iface" : g3.get_devname("guestnic"), + "iface" : g3_guestnic.get_devname(), "interval" : 0.1 })
ping_mod6_bad = ctl.get_module("Icmp6Ping", options={ - "addr" : g4.get_ip("guestnic", 1), + "addr" : g4_guestnic.get_ip(1), "count" : 100, - "iface" : g1.get_devname("guestnic"), + "iface" : g1_guestnic.get_devname(), "interval" : 0.1 })
ping_mod6_bad2 = ctl.get_module("Icmp6Ping", options={ - "addr" : g2.get_ip("guestnic", 1), + "addr" : g2_guestnic.get_ip(1), "count" : 100, - "iface" : g3.get_devname("guestnic"), + "iface" : g3_guestnic.get_devname(), "interval" : 0.1 })
@@ -171,21 +180,21 @@ ctl.wait(15)
for setting in offload_settings: for offload in setting: - h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic1"), + h1.run("ethtool -K %s %s %s" % (h1_nic1.get_devname(), offload[0], offload[1])) - h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic2"), + h1.run("ethtool -K %s %s %s" % (h1_nic2.get_devname(), offload[0], offload[1])) - h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic1"), + h2.run("ethtool -K %s %s %s" % (h2_nic1.get_devname(), offload[0], offload[1])) - h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic2"), + h2.run("ethtool -K %s %s %s" % (h2_nic2.get_devname(), offload[0], offload[1])) - g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), + g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), offload[0], offload[1])) - g2.run("ethtool -K %s %s %s" % (g2.get_devname("guestnic"), + g2.run("ethtool -K %s %s %s" % (g2_guestnic.get_devname(), offload[0], offload[1])) - g3.run("ethtool -K %s %s %s" % (g3.get_devname("guestnic"), + g3.run("ethtool -K %s %s %s" % (g3_guestnic.get_devname(), offload[0], offload[1])) - g4.run("ethtool -K %s %s %s" % (g4.get_devname("guestnic"), + g4.run("ethtool -K %s %s %s" % (g4_guestnic.get_devname(), offload[0], offload[1]))
if ipv in [ 'ipv4', 'both' ]: @@ -287,19 +296,19 @@ for setting in offload_settings:
#reset offload states for offload in offloads: - h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic1"), + h1.run("ethtool -K %s %s %s" % (h1_nic1.get_devname(), offload, "on")) - h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic2"), + h1.run("ethtool -K %s %s %s" % (h1_nic2.get_devname(), offload, "on")) - h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic1"), + h2.run("ethtool -K %s %s %s" % (h2_nic1.get_devname(), offload, "on")) - h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic2"), + h2.run("ethtool -K %s %s %s" % (h2_nic2.get_devname(), offload, "on")) - g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), + g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), offload, "on")) - g2.run("ethtool -K %s %s %s" % (g2.get_devname("guestnic"), + g2.run("ethtool -K %s %s %s" % (g2_guestnic.get_devname(), offload, "on")) - g3.run("ethtool -K %s %s %s" % (g3.get_devname("guestnic"), + g3.run("ethtool -K %s %s %s" % (g3_guestnic.get_devname(), offload, "on")) - g4.run("ethtool -K %s %s %s" % (g4.get_devname("guestnic"), + g4.run("ethtool -K %s %s %s" % (g4_guestnic.get_devname(), offload, "on")) 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 598c31b..9ab7398 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 @@ -37,90 +37,96 @@ nperf_reserve = int(ctl.get_alias("nperf_reserve")) nperf_confidence = ctl.get_alias("nperf_confidence") nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
+h2_vlan10 = h2.get_interface("vlan10") +g1_vlan10 = g1.get_interface("vlan10") +h1_nic = h1.get_interface("nic") +h2_nic = h2.get_interface("nic") +g1_guestnic = g1.get_interface("guestnic") + ping_mod = ctl.get_module("IcmpPing", options={ - "addr" : h2.get_ip("vlan10"), + "addr" : h2_vlan10.get_ip(0), "count" : 100, - "iface" : g1.get_devname("vlan10"), + "iface" : g1_vlan10.get_devname(), "interval" : 0.1 })
ping_mod6 = ctl.get_module("Icmp6Ping", options={ - "addr" : h2.get_ip("vlan10", 1), + "addr" : h2_vlan10.get_ip(1), "count" : 100, - "iface" : g1.get_ip("vlan10", 1), + "iface" : g1_vlan10.get_ip(1), "interval" : 0.1 })
netperf_srv = ctl.get_module("Netperf", options={ "role" : "server", - "bind" : g1.get_ip("vlan10") + "bind" : g1_vlan10.get_ip(0) })
netperf_srv6 = ctl.get_module("Netperf", options={ "role" : "server", - "bind" : g1.get_ip("vlan10", 1), + "bind" : g1_vlan10.get_ip(1), "netperf_opts" : " -6", })
netperf_cli_tcp = ctl.get_module("Netperf", options={ "role" : "client", - "netperf_server" : g1.get_ip("vlan10"), + "netperf_server" : g1_vlan10.get_ip(0), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : "-i %s -L %s" % - (nperf_max_runs, h2.get_ip("vlan10")) + (nperf_max_runs, h2_vlan10.get_ip(0)) })
netperf_cli_udp = ctl.get_module("Netperf", options={ "role" : "client", - "netperf_server" : g1.get_ip("vlan10"), + "netperf_server" : g1_vlan10.get_ip(0), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : "-i %s -L %s" % - (nperf_max_runs, h2.get_ip("vlan10")) - }) + (nperf_max_runs, h2_vlan10.get_ip(0)) + })
netperf_cli_tcp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : - g1.get_ip("vlan10", 1), + g1_vlan10.get_ip(1), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : - "-i %s -L %s -6" % (nperf_max_runs, h2.get_ip("vlan10", 1)) + "-i %s -L %s -6" % (nperf_max_runs, h2_vlan10.get_ip(1)) })
netperf_cli_udp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : - g1.get_ip("vlan10", 1), + g1_vlan10.get_ip(1), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : - "-i %s -L %s -6" % (nperf_max_runs, h2.get_ip("vlan10", 1)) - }) + "-i %s -L %s -6" % (nperf_max_runs, h2_vlan10.get_ip(1)) + })
ctl.wait(15)
for setting in offload_settings: for offload in setting: - h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), + h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(), offload[0], offload[1])) - g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), + g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), offload[0], offload[1])) - h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"), + h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(), offload[0], offload[1]))
if ipv in [ 'ipv4', 'both' ]: @@ -216,9 +222,9 @@ for setting in offload_settings:
#reset offload states for offload in offloads: - h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), + h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(), offload, "on")) - g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), + g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), offload, "on")) - h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"), + h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(), offload, "on")) 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 9c2fd5d..024369e 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 @@ -37,89 +37,94 @@ nperf_reserve = int(ctl.get_alias("nperf_reserve")) nperf_confidence = ctl.get_alias("nperf_confidence") nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
+h2_vlan10 = h2.get_interface("vlan10") +g1_guestnic = g1.get_interface("guestnic") +h1_nic = h1.get_interface("nic") +h2_nic = h2.get_interface("nic") + ping_mod = ctl.get_module("IcmpPing", options={ - "addr" : h2.get_ip("vlan10"), + "addr" : h2_vlan10.get_ip(0), "count" : 100, - "iface" : g1.get_devname("guestnic"), + "iface" : g1_guestnic.get_devname(), "interval" : 0.1 })
ping_mod6 = ctl.get_module("Icmp6Ping", options={ - "addr" : h2.get_ip("vlan10", 1), + "addr" : h2_vlan10.get_ip(1), "count" : 100, - "iface" : g1.get_ip("guestnic", 1), + "iface" : g1_guestnic.get_ip(1), "interval" : 0.1 })
netperf_srv = ctl.get_module("Netperf", options={ "role" : "server", - "bind" : g1.get_ip("guestnic") + "bind" : g1_guestnic.get_ip(0) })
netperf_srv6 = ctl.get_module("Netperf", options={ "role" : "server", - "bind" : g1.get_ip("guestnic", 1), + "bind" : g1_guestnic.get_ip(1), "netperf_opts" : " -6", })
netperf_cli_tcp = ctl.get_module("Netperf", options={ "role" : "client", - "netperf_server" : g1.get_ip("guestnic"), + "netperf_server" : g1_guestnic.get_ip(0), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : "-i %s -L %s" % - (nperf_max_runs, h2.get_ip("vlan10")) + (nperf_max_runs, h2_vlan10.get_ip(0)) })
netperf_cli_udp = ctl.get_module("Netperf", options={ "role" : "client", - "netperf_server" : g1.get_ip("guestnic"), + "netperf_server" : g1_guestnic.get_ip(0), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : "-i %s -L %s" % - (nperf_max_runs, h2.get_ip("vlan10")) + (nperf_max_runs, h2_vlan10.get_ip(0)) })
netperf_cli_tcp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : - g1.get_ip("guestnic", 1), + g1_guestnic.get_ip(1), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : - "-i %s -L %s -6" % (nperf_max_runs, h2.get_ip("vlan10", 1)) + "-i %s -L %s -6" % (nperf_max_runs, h2_vlan10.get_ip(1)) })
netperf_cli_udp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" : - g1.get_ip("guestnic", 1), + g1_guestnic.get_ip(1), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, "netperf_opts" : - "-i %s -L %s -6" % (nperf_max_runs, h2.get_ip("vlan10", 1)) + "-i %s -L %s -6" % (nperf_max_runs, h2_vlan10.get_ip(1)) }) ctl.wait(15)
for setting in offload_settings: for offload in setting: - h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), + h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(), offload[0], offload[1])) - g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), + g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), offload[0], offload[1])) - h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"), + h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(), offload[0], offload[1]))
if ipv in [ 'ipv4', 'both' ]: @@ -216,9 +221,9 @@ for setting in offload_settings:
#reset offload states for offload in offloads: - h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), + h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(), offload, "on")) - g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), + g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), offload, "on")) - h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"), + h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(), offload, "on"))
Mon, Oct 26, 2015 at 02:00:32PM CET, jprochaz@redhat.com wrote:
This commit replaces InterfaceAPI methods get_ip() and get_devname() with HostAPI methods which are supported and recommended.
Signed-off-by: Jiri Prochazka jprochaz@redhat.com
recipes/regression_tests/phase1/3_vlans.py | 40 ++++++++++--------- .../regression_tests/phase1/3_vlans_over_bond.py | 46 ++++++++++++---------- recipes/regression_tests/phase1/bonding_test.py | 36 ++++++++--------- recipes/regression_tests/phase1/simple_ping.py | 11 ++++-- 4 files changed, 71 insertions(+), 62 deletions(-)
diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index 2007dc4..68974e7 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -99,37 +99,40 @@ netperf_cli_udp6 = ctl.get_module("Netperf", })
for vlan1 in vlans:
- m1_vlan1 = m1.get_interface(vlan1) for vlan2 in vlans:
ping_mod.update_options({"addr": m2.get_ip(vlan2, 0),"iface": m1.get_devname(vlan1)})
m2_vlan2 = m2.get_interface(vlan2)
ping_mod6.update_options({"addr": m2.get_ip(vlan2, 1),"iface": m1.get_ip(vlan1, 1)})
ping_mod.update_options({"addr": m2_vlan2.get_ip(0),"iface": m1_vlan1.get_devname()})
netperf_srv.update_options({"bind": m1.get_ip(vlan1, 0)})
ping_mod6.update_options({"addr": m2_vlan2.get_ip(1),"iface": m1_vlan1.get_ip(1)})
netperf_srv6.update_options({"bind": m1.get_ip(vlan1, 1)})
netperf_srv.update_options({"bind": m1_vlan1.get_ip(0)})
netperf_cli_tcp.update_options({"netperf_server": m1.get_ip(vlan1, 0),"netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2.get_ip(vlan1, 0))})
netperf_srv6.update_options({"bind": m1_vlan1.get_ip(1)})
netperf_cli_udp.update_options({"netperf_server": m1.get_ip(vlan1, 0),"netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2.get_ip(vlan1, 0))})
netperf_cli_tcp.update_options({"netperf_server": m1_vlan1.get_ip(0),"netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2_vlan2.get_ip(0))})
netperf_cli_tcp6.update_options({"netperf_server": m1.get_ip(vlan1, 1),"netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2.get_ip(vlan1, 1))})
netperf_cli_udp.update_options({"netperf_server": m1_vlan1.get_ip(0),"netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2_vlan2.get_ip(0))})
netperf_cli_udp6.update_options({"netperf_server": m1.get_ip(vlan1, 1),"netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2.get_ip(vlan1, 1))})
netperf_cli_tcp6.update_options({"netperf_server": m1_vlan1.get_ip(1),"netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2_vlan2.get_ip(1))})netperf_cli_udp6.update_options({"netperf_server": m1_vlan1.get_ip(1),"netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2_vlan2.get_ip(1))}) if vlan1 == vlan2: # These tests should pass # Ping between same VLANs for setting in offload_settings: for offload in setting:
m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"),
m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(), offload[0], offload[1]))
m2.run("ethtool -K %s %s %s" % (m2.get_devname("eth1"),
m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(), offload[0], offload[1])) if ipv in [ 'ipv4', 'both' ]:@@ -234,7 +237,6 @@ for vlan1 in vlans: perf_api.save_result(result_udp)
srv_proc.intr()
# These tests should fail # Ping across different VLAN else:@@ -246,7 +248,7 @@ for vlan1 in vlans:
#reset offload states for offload in offloads:
- m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"),
- m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(), offload, "on"))
- m2.run("ethtool -K %s %s %s" % (m2.get_devname("eth1"),
- m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(), offload, "on"))
diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index 79c4b4d..d382036 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -39,6 +39,8 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
m1_bond = m1.get_interface("test_bond") m1_bond.set_mtu(mtu) +m1_phy1 = m1.get_interface("eth1") +m1_phy2 = m1.get_interface("eth2") m2_phy1 = m2.get_interface("eth1") m2_phy1.set_mtu(mtu)
@@ -99,28 +101,31 @@ netperf_cli_udp6 = ctl.get_module("Netperf", })
for vlan1 in vlans:
- m1_vlan1 = m1.get_interface(vlan1) for vlan2 in vlans:
ping_mod.update_options({"addr": m2.get_ip(vlan2, 0),"iface": m1.get_devname(vlan1)})
m2_vlan2 = m2.get_interface(vlan2)
ping_mod6.update_options({"addr": m2.get_ip(vlan2, 1),"iface": m1.get_ip(vlan1, 1)})
ping_mod.update_options({"addr": m2_vlan2.get_ip(0),"iface": m1_vlan1.get_devname()})
netperf_srv.update_options({"bind": m1.get_ip(vlan1, 0)})
ping_mod6.update_options({"addr": m2_vlan2.get_ip(1),"iface": m1_vlan1.get_ip(1)})
netperf_srv6.update_options({"bind": m1.get_ip(vlan1, 1)})
netperf_srv.update_options({"bind": m1_vlan1.get_ip(0)})
netperf_cli_tcp.update_options({"netperf_server": m1.get_ip(vlan1, 0),"netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2.get_ip(vlan1, 0))})
netperf_srv6.update_options({"bind": m1_vlan1.get_ip(1)})
netperf_cli_udp.update_options({"netperf_server": m1.get_ip(vlan1, 0),"netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2.get_ip(vlan1, 0))})
netperf_cli_tcp.update_options({"netperf_server": m1_vlan1.get_ip(0),"netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2_vlan2.get_ip(0))})
netperf_cli_tcp6.update_options({"netperf_server": m1.get_ip(vlan1, 1),"netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2.get_ip(vlan1, 1))})
netperf_cli_udp.update_options({"netperf_server": m1_vlan1.get_ip(0),"netperf_opts": "-i %s -L %s" % (nperf_max_runs, m2_vlan2.get_ip(0))})
netperf_cli_udp6.update_options({"netperf_server": m1.get_ip(vlan1, 1),"netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2.get_ip(vlan1, 1))})
netperf_cli_tcp6.update_options({"netperf_server": m1_vlan1.get_ip(1),"netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2_vlan2.get_ip(1))})netperf_cli_udp6.update_options({"netperf_server": m1_vlan1.get_ip(1),"netperf_opts": "-i %s -L %s -6" % (nperf_max_runs, m2_vlan2.get_ip(1))}) if vlan1 == vlan2: # These tests should pass@@ -128,11 +133,11 @@ for vlan1 in vlans: for setting in offload_settings: #apply offload setting for offload in setting:
m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"),
m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(), offload[0], offload[1]))
m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth2"),
m1.run("ethtool -K %s %s %s" % (m1_phy2.get_devname(), offload[0], offload[1]))
m2.run("ethtool -K %s %s %s" % (m2.get_devname("eth1"),
m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(), offload[0], offload[1])) if ipv in [ 'ipv4', 'both' ]:@@ -238,7 +243,6 @@ for vlan1 in vlans: perf_api.save_result(result_udp)
srv_proc.intr()
# These tests should fail # Ping across different VLAN else:@@ -250,9 +254,9 @@ for vlan1 in vlans:
#reset offload states for offload in offloads:
- m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"),
- m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(), offload, "on"))
- m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth2"),
- m1.run("ethtool -K %s %s %s" % (m1_phy2.get_devname(), offload, "on"))
- m2.run("ethtool -K %s %s %s" % (m2.get_devname("eth1"),
- m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(), offload, "on"))
diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index 18659d1..079a8fe 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -44,83 +44,83 @@ test_if2.set_mtu(mtu)
ping_mod = ctl.get_module("IcmpPing", options={
"addr" : m2.get_ip("test_if", 0),
"addr" : test_if2.get_ip(0), "count" : 100,
"iface" : m1.get_devname("test_if"),
"iface" : test_if1.get_devname(), "interval" : 0.1 })ping_mod6 = ctl.get_module("Icmp6Ping", options={
"addr" : m2.get_ip("test_if", 1),
"addr" : test_if2.get_ip(1), "count" : 100,
"iface" : m1.get_devname("test_if"),
"iface" : test_if1.get_devname(), "interval" : 0.1 })netperf_srv = ctl.get_module("Netperf", options = { "role" : "server",
"bind" : m1.get_ip("test_if", 0)
"bind" : test_if1.get_ip(0) })netperf_srv6 = ctl.get_module("Netperf", options={ "role" : "server",
"bind" : m1.get_ip("test_if", 1),
"bind" : test_if1.get_ip(1), "netperf_opts" : " -6", })netperf_cli_tcp = ctl.get_module("Netperf", options = { "role" : "client",
"netperf_server" : m1.get_ip("test_if", 0),
"netperf_server" : test_if1.get_ip(0), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence,
"netperf_opts" : "-i %s -L %s" % (nperf_max_runs, m2.get_ip("test_if", 0))
"netperf_opts" : "-i %s -L %s" % (nperf_max_runs, test_if2.get_ip(0)) })netperf_cli_udp = ctl.get_module("Netperf", options = { "role" : "client",
"netperf_server" : m1.get_ip("test_if", 0),
"netperf_server" : test_if1.get_ip(0), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence,
"netperf_opts" : "-i %s -L %s" % (nperf_max_runs, m2.get_ip("test_if", 0))
"netperf_opts" : "-i %s -L %s" % (nperf_max_runs, test_if2.get_ip(0)) })netperf_cli_tcp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" :
m1.get_ip("test_if", 1),
test_if1.get_ip(1), "duration" : netperf_duration, "testname" : "TCP_STREAM", "confidence" : nperf_confidence, "netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs, m2.get_ip("test_if", 1))
"-i %s -L %s -6" % (nperf_max_runs, test_if2.get_ip(1)) })netperf_cli_udp6 = ctl.get_module("Netperf", options={ "role" : "client", "netperf_server" :
m1.get_ip("test_if", 1),
test_if1.get_ip(1), "duration" : netperf_duration, "testname" : "UDP_STREAM", "confidence" : nperf_confidence, "netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs, m2.get_ip("test_if", 1))
"-i %s -L %s -6" % (nperf_max_runs, test_if2.get_ip(1)) })ctl.wait(15)
for setting in offload_settings: for offload in setting:
m1.run("ethtool -K %s %s %s" % (m1.get_devname("test_if"),
m1.run("ethtool -K %s %s %s" % (test_if1.get_devname(), offload[0], offload[1]))
m2.run("ethtool -K %s %s %s" % (m2.get_devname("test_if"),
m2.run("ethtool -K %s %s %s" % (test_if2.get_devname(), offload[0], offload[1]))if ipv in [ 'ipv4', 'both' ]:
@@ -217,7 +217,7 @@ for setting in offload_settings:
#reset offload states for offload in offloads:
- m1.run("ethtool -K %s %s %s" % (m1.get_devname("test_if"),
- m1.run("ethtool -K %s %s %s" % (test_if1.get_devname(), offload, "on"))
- m2.run("ethtool -K %s %s %s" % (m2.get_devname("test_if"),
- m2.run("ethtool -K %s %s %s" % (test_if2.get_devname(), offload, "on"))
diff --git a/recipes/regression_tests/phase1/simple_ping.py b/recipes/regression_tests/phase1/simple_ping.py index f9e5837..3591402 100644 --- a/recipes/regression_tests/phase1/simple_ping.py +++ b/recipes/regression_tests/phase1/simple_ping.py @@ -6,20 +6,23 @@ hostB = ctl.get_host("machine2") hostA.sync_resources(modules=["Icmp6Ping", "IcmpPing"]) hostB.sync_resources(modules=["Icmp6Ping", "IcmpPing"])
+hostA_testiface = hostA.get_interface("testiface") +hostB_testiface = hostB.get_interface("testiface")
ping_mod = ctl.get_module("IcmpPing", options={
"addr": hostB.get_ip("testiface", 0),
"addr": hostB_testiface.get_ip(0), "count": 100, "interval": 0.2,
"iface" : hostA.get_devname("testiface"),
"iface" : hostA_testiface.get_devname(), "limit_rate": 90})ping_mod6 = ctl.get_module("Icmp6Ping", options={
"addr": hostB.get_ip("testiface", 1),
"addr": hostB_testiface.get_ip(1), "count": 100, "interval": 0.2,
"iface" : hostA.get_ip("testiface", 1),
"iface" : hostA_testiface.get_ip(1), "limit_rate": 90})ctl.wait(15)
2.4.3
LNST-developers mailing list LNST-developers@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
Ack to series
Acked-by: Jan Tluka jtluka@redhat.com
lnst-developers@lists.fedorahosted.org
-
Jan Tluka -
Jiri Prochazka