5:07 a.m.
This commit replaces InterfaceAPI methods get_ip() and get_devname() with
HostAPI methods which are supported and recommended.
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
---
...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 77 ++++++++++++----------
.../phase2/virtual_ovs_bridge_vlan_in_guest.py | 44 +++++++------
.../phase2/virtual_ovs_bridge_vlan_in_host.py | 39 ++++++-----
3 files changed, 90 insertions(+), 70 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 6ba9541..99d1a8b 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,127 +38,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
})
@@ -166,21 +175,21 @@ ctl.wait(15)
for offload in offloads:
for state in ["off", "on"]:
- h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic1"),
+ h1.run("ethtool -K %s %s %s" % (h1_nic1.get_devname(),
offload, state))
- h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic2"),
+ h1.run("ethtool -K %s %s %s" % (h1_nic2.get_devname(),
offload, state))
- h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic1"),
+ h2.run("ethtool -K %s %s %s" % (h2_nic1.get_devname(),
offload, state))
- h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic2"),
+ h2.run("ethtool -K %s %s %s" % (h2_nic2.get_devname(),
offload, state))
- g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"),
+ g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(),
offload, state))
- g2.run("ethtool -K %s %s %s" % (g2.get_devname("guestnic"),
+ g2.run("ethtool -K %s %s %s" % (g2_guestnic.get_devname(),
offload, state))
- g3.run("ethtool -K %s %s %s" % (g3.get_devname("guestnic"),
+ g3.run("ethtool -K %s %s %s" % (g3_guestnic.get_devname(),
offload, state))
- g4.run("ethtool -K %s %s %s" % (g4.get_devname("guestnic"),
+ g4.run("ethtool -K %s %s %s" % (g4_guestnic.get_devname(),
offload, state))
if ipv in [ 'ipv4', 'both' ]:
g1.run(ping_mod)
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 3a09ec0..650d188 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,90 +32,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 offload in offloads:
for state in ["off", "on"]:
- h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"),
+ h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(),
offload, state))
- g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"),
+ g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(),
offload, state))
- h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"),
+ h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(),
offload, state))
if ipv in [ 'ipv4', 'both' ]:
g1.run(ping_mod)
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 6e1cc74..eea0850 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,89 +32,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 offload in offloads:
for state in ["off", "on"]:
- h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"),
+ h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(),
offload, state))
- g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"),
+ g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(),
offload, state))
- h2.run("ethtool -K %s %s %s" % (h2.get_devname("nic"),
+ h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(),
offload, state))
if ipv in [ 'ipv4', 'both' ]:
g1.run(ping_mod)
--
2.4.3