1:42 a.m.
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
---
.../regression_tests/phase2/3_vlans_over_team.py | 32 +++++++-----
recipes/regression_tests/phase2/team_test.py | 58 +++++++++++-----------
...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 43 +++++++++-------
.../phase2/virtual_ovs_bridge_vlan_in_guest.py | 29 ++++++-----
.../phase2/virtual_ovs_bridge_vlan_in_host.py | 29 ++++++-----
5 files changed, 104 insertions(+), 87 deletions(-)
diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py
b/recipes/regression_tests/phase2/3_vlans_over_team.py
index 86c59b0..1aeac8c 100644
--- a/recipes/regression_tests/phase2/3_vlans_over_team.py
+++ b/recipes/regression_tests/phase2/3_vlans_over_team.py
@@ -106,27 +106,33 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
for vlan1 in vlans:
for vlan2 in vlans:
- ping_mod.update_options({"addr": m2.get_ip(vlan2, 0),
+
+ m1_vlan1 = m1.get_interface(vlan1)
+ m1_vlan2 = m1.get_interface(vlan2)
+ m2_vlan1 = m2.get_interface(vlan1)
+ m2_vlan2 = m2.get_interface(vlan2)
+
+ ping_mod.update_options({"addr": m2_vlan2.get_ip_addr(0),
"iface": m1.get_devname(vlan1)})
- ping_mod6.update_options({"addr": m2.get_ip(vlan2, 1),
- "iface": m1.get_ip(vlan1, 1)})
+ ping_mod6.update_options({"addr": m2_vlan2.get_ip_addr(1),
+ "iface": m1_vlan1.get_ip_addr(1)})
- netperf_srv.update_options({"bind": m1.get_ip(vlan1, 0)})
+ netperf_srv.update_options({"bind": m1_vlan1.get_ip_addr(0)})
- netperf_srv6.update_options({"bind": m1.get_ip(vlan1, 1)})
+ netperf_srv6.update_options({"bind": m1_vlan1.get_ip_addr(1)})
- netperf_cli_tcp.update_options({"netperf_server": m1.get_ip(vlan1, 0),
- "netperf_opts": "-i 5 -L %s"
% m2.get_ip(vlan1, 0)})
+ netperf_cli_tcp.update_options({"netperf_server":
m1_vlan1.get_ip_addr(0),
+ "netperf_opts": "-i 5 -L %s"
% m2_vlan1.get_ip_addr(0)})
- netperf_cli_udp.update_options({"netperf_server": m1.get_ip(vlan1, 0),
- "netperf_opts": "-i 5 -L %s"
% m2.get_ip(vlan1, 0)})
+ netperf_cli_udp.update_options({"netperf_server":
m1_vlan1.get_ip_addr(0),
+ "netperf_opts": "-i 5 -L %s"
% m2_vlan1.get_ip_addr(0)})
- netperf_cli_tcp6.update_options({"netperf_server": m1.get_ip(vlan1,
1),
- "netperf_opts": "-i 5 -L %s
-6" % m2.get_ip(vlan1, 1)})
+ netperf_cli_tcp6.update_options({"netperf_server":
m1_vlan1.get_ip_addr(1),
+ "netperf_opts": "-i 5 -L %s
-6" % m2_vlan1.get_ip_addr(1)})
- netperf_cli_udp6.update_options({"netperf_server": m1.get_ip(vlan1,
1),
- "netperf_opts": "-i 5 -L %s
-6" % m2.get_ip(vlan1, 1)})
+ netperf_cli_udp6.update_options({"netperf_server":
m1_vlan1.get_ip_addr(1),
+ "netperf_opts": "-i 5 -L %s
-6" % m2_vlan1.get_ip_addr(1)})
if vlan1 == vlan2:
diff --git a/recipes/regression_tests/phase2/team_test.py
b/recipes/regression_tests/phase2/team_test.py
index 0ecc25c..55e9ff8 100644
--- a/recipes/regression_tests/phase2/team_test.py
+++ b/recipes/regression_tests/phase2/team_test.py
@@ -42,15 +42,15 @@ ipv = ctl.get_alias("ipv")
mtu = ctl.get_alias("mtu")
netperf_duration = ctl.get_alias("netperf_duration")
-test_if1 = m1.get_interface("test_if")
-test_if1.set_mtu(mtu)
-test_if2 = m2.get_interface("test_if")
-test_if2.set_mtu(mtu)
+m1_testiface = m1.get_interface("test_if")
+m1_testiface.set_mtu(mtu)
+m2_testiface = m2.get_interface("test_if")
+m2_testiface.set_mtu(mtu)
ping_mod = ctl.get_module("IcmpPing",
options={
- "addr" : m2.get_ip("test_if", 0),
+ "addr" : m2_testiface.get_ip_addr(0),
"count" : 100,
"iface" : m1.get_devname("test_if"),
"interval" : 0.1
@@ -58,66 +58,66 @@ ping_mod = ctl.get_module("IcmpPing",
ping_mod6 = ctl.get_module("Icmp6Ping",
options={
- "addr" : m2.get_ip("test_if", 1),
+ "addr" : m2_testiface.get_ip_addr(1),
"count" : 100,
- "iface" : m1.get_ip("test_if", 1),
+ "iface" : m1_testiface.get_ip_addr(1),
"interval" : 0.1
})
netperf_srv = ctl.get_module("Netperf",
options = {
"role" : "server",
- "bind" : m1.get_ip("test_if", 0)
+ "bind" : m1_testiface.get_ip_addr(0)
})
netperf_srv6 = ctl.get_module("Netperf",
options = {
"role" : "server",
- "bind" : m1.get_ip("test_if", 1),
+ "bind" : m1_testiface.get_ip_addr(1),
"netperf_opts" : " -6"
})
netperf_cli_tcp = ctl.get_module("Netperf",
options = {
"role" : "client",
- "netperf_server" :
m1.get_ip("test_if", 0),
+ "netperf_server" :
m1_testiface.get_ip_addr(0),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s" %
m2.get_ip("test_if", 0)
+ "netperf_opts" : "-i 5 -L %s" %
m2_testiface.get_ip_addr(0)
})
netperf_cli_udp = ctl.get_module("Netperf",
options = {
"role" : "client",
- "netperf_server" :
m1.get_ip("test_if", 0),
+ "netperf_server" :
m1_testiface.get_ip_addr(0),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s" %
m2.get_ip("test_if", 0)
+ "netperf_opts" : "-i 5 -L %s" %
m2_testiface.get_ip_addr(0)
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"netperf_server" :
- m1.get_ip("test_if", 1),
+ m1_testiface.get_ip_addr(1),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : "99,5",
"netperf_opts" :
- "-i 5 -L %s -6" %
m2.get_ip("test_if", 1)
+ "-i 5 -L %s -6" %
m2_testiface.get_ip_addr(1)
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"netperf_server" :
- m1.get_ip("test_if", 1),
+ m1_testiface.get_ip_addr(1),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : "99,5",
"netperf_opts" :
- "-i 5 -L %s -6" %
m2.get_ip("test_if", 1)
+ "-i 5 -L %s -6" %
m2_testiface.get_ip_addr(1)
})
ctl.wait(15)
@@ -289,27 +289,27 @@ for offload in offloads:
-ping_mod.update_options({"addr" : m1.get_ip("test_if", 0),
+ping_mod.update_options({"addr" : m1_testiface.get_ip_addr(0),
"iface" : m2.get_devname("test_if")})
-ping_mod6.update_options({"addr" : m1.get_ip("test_if", 1),
+ping_mod6.update_options({"addr" : m1_testiface.get_ip_addr(1),
"iface" : m2.get_devname("test_if")})
-netperf_srv.update_options({"bind" : m2.get_ip("test_if", 0)})
+netperf_srv.update_options({"bind" : m2_testiface.get_ip_addr(0)})
-netperf_srv6.update_options({"bind" : m2.get_ip("test_if", 1)})
+netperf_srv6.update_options({"bind" : m2_testiface.get_ip_addr(1)})
-netperf_cli_tcp.update_options({"netperf_server" :
m2.get_ip("test_if", 0),
- "netperf_opts" : "-i 5 -L %s" %
m1.get_ip("test_if", 0)})
+netperf_cli_tcp.update_options({"netperf_server" :
m2_testiface.get_ip_addr(0),
+ "netperf_opts" : "-i 5 -L %s" %
m1_testiface.get_ip_addr(0)})
-netperf_cli_udp.update_options({"netperf_server" :
m2.get_ip("test_if", 0),
- "netperf_opts" : "-i 5 -L %s" %
m1.get_ip("test_if", 0)})
+netperf_cli_udp.update_options({"netperf_server" :
m2_testiface.get_ip_addr(0),
+ "netperf_opts" : "-i 5 -L %s" %
m1_testiface.get_ip_addr(0)})
-netperf_cli_tcp6.update_options({"netperf_server" :
m2.get_ip("test_if", 1),
- "netperf_opts" : "-i 5 -L %s -6" %
m1.get_ip("test_if", 1)})
+netperf_cli_tcp6.update_options({"netperf_server" :
m2_testiface.get_ip_addr(1),
+ "netperf_opts" : "-i 5 -L %s -6" %
m1_testiface.get_ip_addr(1)})
-netperf_cli_udp6.update_options({"netperf_server" :
m2.get_ip("test_if", 1),
- "netperf_opts" : "-i 5 -L %s -6" %
m1.get_ip("test_if", 1)})
+netperf_cli_udp6.update_options({"netperf_server" :
m2_testiface.get_ip_addr(1),
+ "netperf_opts" : "-i 5 -L %s -6" %
m1_testiface.get_ip_addr(1)})
for offload in offloads:
for state in ["off", "on"]:
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 a35d446..4b651c3 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
@@ -48,9 +48,14 @@ offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
netperf_duration = ctl.get_alias("netperf_duration")
+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_addr(0),
"count" : 100,
"iface" : g1.get_devname("guestnic"),
"interval" : 0.1
@@ -58,15 +63,15 @@ ping_mod = ctl.get_module("IcmpPing",
ping_mod2 = ctl.get_module("IcmpPing",
options={
- "addr" : g2.get_ip("guestnic", 0),
+ "addr" : g2_guestnic.get_ip_addr(0),
"count" : 100,
- "iface" : g4.get_ip("guestnic"),
+ "iface" : g4_guestnic.get_ip_addr(0),
"interval" : 0.1
})
ping_mod6 = ctl.get_module("Icmp6Ping",
options={
- "addr" : g3.get_ip("guestnic", 1),
+ "addr" : g3_guestnic.get_ip_addr(1),
"count" : 100,
"iface" : g1.get_devname("guestnic"),
"interval" : 0.1
@@ -74,7 +79,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping",
ping_mod62 = ctl.get_module("Icmp6Ping",
options={
- "addr" : g2.get_ip("guestnic", 1),
+ "addr" : g2_guestnic.get_ip_addr(1),
"count" : 100,
"iface" : g4.get_devname("guestnic"),
"interval" : 0.1
@@ -83,65 +88,65 @@ ping_mod62 = ctl.get_module("Icmp6Ping",
netperf_srv = ctl.get_module("Netperf",
options={
"role": "server",
- "bind" : g1.get_ip("guestnic")
+ "bind" : g1_guestnic.get_ip_addr(0)
})
netperf_srv6 = ctl.get_module("Netperf",
options={
"role" : "server",
- "bind" : g1.get_ip("guestnic", 1),
+ "bind" : g1_guestnic.get_ip_addr(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_addr(0),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : "99,5",
"netperf_opts" : "-i 5 -L %s"
%
-
g3.get_ip("guestnic")
+ g3_guestnic.get_ip_addr(0)
})
netperf_cli_udp = ctl.get_module("Netperf",
options={
"role" : "client",
- "netperf_server" :
g1.get_ip("guestnic"),
+ "netperf_server" :
g1_guestnic.get_ip_addr(0),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : "99,5",
"netperf_opts" : "-i 5 -L %s"
%
-
g3.get_ip("guestnic")
+ g3_guestnic.get_ip_addr(0)
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"netperf_server" :
- g1.get_ip("guestnic", 1),
+ g1_guestnic.get_ip_addr(1),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : "99,5",
"netperf_opts" :
- "-i 5 -L %s -6" %
g3.get_ip("guestnic", 1)
+ "-i 5 -L %s -6" %
g3_guestnic.get_ip_addr(1)
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"netperf_server" :
- g1.get_ip("guestnic", 1),
+ g1_guestnic.get_ip_addr(1),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : "99,5",
"netperf_opts" :
- "-i 5 -L %s -6" %
g3.get_ip("guestnic", 1)
+ "-i 5 -L %s -6" %
g3_guestnic.get_ip_addr(1)
})
ping_mod_bad = ctl.get_module("IcmpPing",
options={
- "addr" : g4.get_ip("guestnic"),
+ "addr" : g4_guestnic.get_ip_addr(0),
"count" : 100,
"iface" :
g1.get_devname("guestnic"),
"interval" : 0.1
@@ -150,7 +155,7 @@ ping_mod_bad = ctl.get_module("IcmpPing",
ping_mod_bad2 = ctl.get_module("IcmpPing",
options={
- "addr" : g2.get_ip("guestnic"),
+ "addr" : g2_guestnic.get_ip_addr(0),
"count" : 100,
"iface" :
g3.get_devname("guestnic"),
"interval" : 0.1
@@ -158,7 +163,7 @@ ping_mod_bad2 = ctl.get_module("IcmpPing",
ping_mod6_bad = ctl.get_module("Icmp6Ping",
options={
- "addr" : g4.get_ip("guestnic", 1),
+ "addr" : g4_guestnic.get_ip_addr(1),
"count" : 100,
"iface" : g1.get_devname("guestnic"),
"interval" : 0.1
@@ -166,7 +171,7 @@ ping_mod6_bad = ctl.get_module("Icmp6Ping",
ping_mod6_bad2 = ctl.get_module("Icmp6Ping",
options={
- "addr" : g2.get_ip("guestnic", 1),
+ "addr" : g2_guestnic.get_ip_addr(1),
"count" : 100,
"iface" : g3.get_devname("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 89c3469..e5ba262 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
@@ -42,9 +42,12 @@ offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
netperf_duration = ctl.get_alias("netperf_duration")
+h2_vlan10 = h2.get_interface("vlan10")
+g1_vlan10 = g1.get_interface("vlan10")
+
ping_mod = ctl.get_module("IcmpPing",
options={
- "addr" : h2.get_ip("vlan10"),
+ "addr" : h2_vlan10.get_ip_addr(0),
"count" : 100,
"iface" : g1.get_devname("vlan10"),
"interval" : 0.1
@@ -52,69 +55,69 @@ ping_mod = ctl.get_module("IcmpPing",
ping_mod6 = ctl.get_module("Icmp6Ping",
options={
- "addr" : h2.get_ip("vlan10", 1),
+ "addr" : h2_vlan10.get_ip_addr(1),
"count" : 100,
- "iface" : g1.get_ip("vlan10", 1),
+ "iface" : g1_vlan10.get_ip_addr(1),
"interval" : 0.1
})
netperf_srv = ctl.get_module("Netperf",
options={
"role" : "server",
- "bind" : g1.get_ip("vlan10")
+ "bind" : g1_vlan10.get_ip_addr(0)
})
netperf_srv6 = ctl.get_module("Netperf",
options={
"role" : "server",
- "bind" : g1.get_ip("vlan10", 1),
+ "bind" : g1_vlan10.get_ip_addr(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_addr(0),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : "99,5",
"netperf_opts" : "-i 5 -L %s"
%
-
h2.get_ip("vlan10")
+ h2_vlan10.get_ip_addr(0)
})
netperf_cli_udp = ctl.get_module("Netperf",
options={
"role" : "client",
- "netperf_server" :
g1.get_ip("vlan10"),
+ "netperf_server" :
g1_vlan10.get_ip_addr(0),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : "99,5",
"netperf_opts" : "-i 5 -L %s"
%
-
h2.get_ip("vlan10")
+ h2_vlan10.get_ip_addr(0)
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"netperf_server" :
- g1.get_ip("vlan10", 1),
+ g1_vlan10.get_ip_addr(1),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : "99,5",
"netperf_opts" :
- "-i 5 -L %s -6" %
h2.get_ip("vlan10", 1)
+ "-i 5 -L %s -6" %
h2_vlan10.get_ip_addr(1)
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"netperf_server" :
- g1.get_ip("vlan10", 1),
+ g1_vlan10.get_ip_addr(1),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : "99,5",
"netperf_opts" :
- "-i 5 -L %s -6" %
h2.get_ip("vlan10", 1)
+ "-i 5 -L %s -6" %
h2_vlan10.get_ip_addr(1)
})
ctl.wait(15)
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 d15f2be..c9d2ca6 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
@@ -42,9 +42,12 @@ offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
netperf_duration = ctl.get_alias("netperf_duration")
+h2_vlan10 = h2.get_interface("vlan10")
+g1_guestnic = g1.get_interface("guestnic")
+
ping_mod = ctl.get_module("IcmpPing",
options={
- "addr" : h2.get_ip("vlan10"),
+ "addr" : h2_vlan10.get_ip_addr(0),
"count" : 100,
"iface" : g1.get_devname("guestnic"),
"interval" : 0.1
@@ -52,69 +55,69 @@ ping_mod = ctl.get_module("IcmpPing",
ping_mod6 = ctl.get_module("Icmp6Ping",
options={
- "addr" : h2.get_ip("vlan10", 1),
+ "addr" : h2_vlan10.get_ip_addr(1),
"count" : 100,
- "iface" : g1.get_ip("guestnic", 1),
+ "iface" : g1_guestnic.get_ip_addr(1),
"interval" : 0.1
})
netperf_srv = ctl.get_module("Netperf",
options={
"role" : "server",
- "bind" : g1.get_ip("guestnic")
+ "bind" : g1_guestnic.get_ip_addr(0)
})
netperf_srv6 = ctl.get_module("Netperf",
options={
"role" : "server",
- "bind" : g1.get_ip("guestnic", 1),
+ "bind" : g1_guestnic.get_ip_addr(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_addr(0),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : "99,5",
"netperf_opts" : "-i 5 -L %s"
%
-
h2.get_ip("vlan10")
+ h2_vlan10.get_ip_addr(0)
})
netperf_cli_udp = ctl.get_module("Netperf",
options={
"role" : "client",
- "netperf_server" :
g1.get_ip("guestnic"),
+ "netperf_server" :
g1_guestnic.get_ip_addr(0),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : "99,5",
"netperf_opts" : "-i 5 -L %s"
%
-
h2.get_ip("vlan10")
+ h2_vlan10.get_ip_addr(0)
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"netperf_server" :
- g1.get_ip("guestnic", 1),
+ g1_guestnic.get_ip_addr(1),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : "99,5",
"netperf_opts" :
- "-i 5 -L %s -6" %
h2.get_ip("vlan10", 1)
+ "-i 5 -L %s -6" %
h2_vlan10.get_ip_addr(1)
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"netperf_server" :
- g1.get_ip("guestnic", 1),
+ g1_guestnic.get_ip_addr(1),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : "99,5",
"netperf_opts" :
- "-i 5 -L %s -6" %
h2.get_ip("vlan10", 1)
+ "-i 5 -L %s -6" %
h2_vlan10.get_ip_addr(1)
})
ctl.wait(15)
--
2.4.3