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 --- .../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..e12bbb0 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 = m1.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"))