1:42 a.m.
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
---
recipes/regression_tests/phase1/3_vlans.py | 31 +++++++++-------
.../regression_tests/phase1/3_vlans_over_bond.py | 31 +++++++++-------
recipes/regression_tests/phase1/bonding_test.py | 24 ++++++-------
recipes/regression_tests/phase1/simple_ping.py | 16 ++++-----
.../phase1/virtual_bridge_2_vlans_over_bond.py | 41 ++++++++++++----------
.../phase1/virtual_bridge_vlan_in_guest.py | 30 +++++++++-------
.../phase1/virtual_bridge_vlan_in_host.py | 30 +++++++++-------
7 files changed, 113 insertions(+), 90 deletions(-)
diff --git a/recipes/regression_tests/phase1/3_vlans.py
b/recipes/regression_tests/phase1/3_vlans.py
index 0109ba0..0cafeb1 100644
--- a/recipes/regression_tests/phase1/3_vlans.py
+++ b/recipes/regression_tests/phase1/3_vlans.py
@@ -106,27 +106,32 @@ 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:
# These tests should pass
diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py
b/recipes/regression_tests/phase1/3_vlans_over_bond.py
index 4dae207..78b3cbd 100644
--- a/recipes/regression_tests/phase1/3_vlans_over_bond.py
+++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py
@@ -106,27 +106,32 @@ 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:
# These tests should pass
diff --git a/recipes/regression_tests/phase1/bonding_test.py
b/recipes/regression_tests/phase1/bonding_test.py
index e59d830..d86a5d9 100644
--- a/recipes/regression_tests/phase1/bonding_test.py
+++ b/recipes/regression_tests/phase1/bonding_test.py
@@ -49,7 +49,7 @@ test_if2.set_mtu(mtu)
ping_mod = ctl.get_module("IcmpPing",
options={
- "addr" : m2.get_ip("test_if", 0),
+ "addr" : test_if2.get_ip_addr(0),
"count" : 100,
"iface" : m1.get_devname("test_if"),
"interval" : 0.1
@@ -57,7 +57,7 @@ ping_mod = ctl.get_module("IcmpPing",
ping_mod6 = ctl.get_module("Icmp6Ping",
options={
- "addr" : m2.get_ip("test_if", 1),
+ "addr" : test_if2.get_ip_addr(1),
"count" : 100,
"iface" : m1.get_devname("test_if"),
"interval" : 0.1
@@ -66,57 +66,57 @@ ping_mod6 = ctl.get_module("Icmp6Ping",
netperf_srv = ctl.get_module("Netperf",
options = {
"role" : "server",
- "bind" : m1.get_ip("test_if", 0)
+ "bind" : test_if1.get_ip_addr(0)
})
netperf_srv6 = ctl.get_module("Netperf",
options={
"role" : "server",
- "bind" : m1.get_ip("test_if", 1),
+ "bind" : test_if1.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" :
test_if1.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" %
test_if2.get_ip_addr(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_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" %
test_if2.get_ip_addr(0)
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"netperf_server" :
- m1.get_ip("test_if", 1),
+ test_if1.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" %
test_if2.get_ip_addr(1)
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"netperf_server" :
- m1.get_ip("test_if", 1),
+ test_if1.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" %
test_if2.get_ip_addr(1)
})
ctl.wait(15)
diff --git a/recipes/regression_tests/phase1/simple_ping.py
b/recipes/regression_tests/phase1/simple_ping.py
index f9e5837..22ef851 100644
--- a/recipes/regression_tests/phase1/simple_ping.py
+++ b/recipes/regression_tests/phase1/simple_ping.py
@@ -6,9 +6,12 @@ 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_addr(0),
"count": 100,
"interval": 0.2,
"iface" :
hostA.get_devname("testiface"),
@@ -16,10 +19,10 @@ ping_mod = ctl.get_module("IcmpPing",
ping_mod6 = ctl.get_module("Icmp6Ping",
options={
- "addr": hostB.get_ip("testiface", 1),
+ "addr": hostB_testiface.get_ip_addr(1),
"count": 100,
"interval": 0.2,
- "iface" : hostA.get_ip("testiface",
1),
+ "iface" : hostA_testiface.get_ip_addr(1),
"limit_rate": 90})
ctl.wait(15)
@@ -27,11 +30,8 @@ ctl.wait(15)
ipv = ctl.get_alias("ipv")
mtu = ctl.get_alias("mtu")
-test_if1 = hostA.get_interface("testiface")
-test_if1.set_mtu(mtu)
-test_if2 = hostB.get_interface("testiface")
-test_if2.set_mtu(mtu)
-
+hostA_testiface.set_mtu(mtu)
+hostB_testiface.set_mtu(mtu)
if ipv in [ 'ipv6', 'both' ]:
hostA.run(ping_mod6)
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 69e0605..2ed8258 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
@@ -48,16 +48,21 @@ offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
netperf_duration = ctl.get_alias("netperf_duration")
+g1_testiface = g1.get_interface("guestnic")
+g2_testiface = g2.get_interface("guestnic")
+g3_testiface = g3.get_interface("guestnic")
+g4_testiface = g4.get_interface("guestnic")
+
ping_mod = ctl.get_module("IcmpPing",
options={
- "addr" : g3.get_ip("guestnic", 0),
+ "addr" : g3_testiface.get_ip_addr(0),
"count" : 100,
"iface" : g1.get_devname("guestnic"),
"interval" : 0.1
})
ping_mod2 = ctl.get_module("IcmpPing",
options={
- "addr" : g2.get_ip("guestnic", 0),
+ "addr" : g2_testiface.get_ip_addr(0),
"count" : 100,
"iface" : g4.get_devname("guestnic"),
"interval" : 0.1
@@ -65,7 +70,7 @@ ping_mod2 = ctl.get_module("IcmpPing",
ping_mod6 = ctl.get_module("Icmp6Ping",
options={
- "addr" : g3.get_ip("guestnic", 1),
+ "addr" : g3_testiface.get_ip_addr(1),
"count" : 100,
"iface" : g1.get_devname("guestnic"),
"interval" : 0.1
@@ -73,7 +78,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping",
ping_mod62 = ctl.get_module("Icmp6Ping",
options={
- "addr" : g2.get_ip("guestnic", 1),
+ "addr" : g2_testiface.get_ip_addr(1),
"count" : 100,
"iface" : g4.get_devname("guestnic"),
"interval" : 0.1
@@ -82,65 +87,65 @@ ping_mod62 = ctl.get_module("Icmp6Ping",
netperf_srv = ctl.get_module("Netperf",
options={
"role": "server",
- "bind" : g1.get_ip("guestnic")
+ "bind" : g1_testiface.get_ip_addr(0)
})
netperf_srv6 = ctl.get_module("Netperf",
options={
"role" : "server",
- "bind" : g1.get_ip("guestnic", 1),
+ "bind" : g1_testiface.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_testiface.get_ip_addr(0),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : "99,5",
"netperf_opts" : "-i 5 -L %s"
%
-
g3.get_ip("guestnic")
+ g3_testiface.get_ip_addr(0)
})
netperf_cli_udp = ctl.get_module("Netperf",
options={
"role" : "client",
- "netperf_server" :
g1.get_ip("guestnic"),
+ "netperf_server" :
g1_testiface.get_ip_addr(0),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : "99,5",
"netperf_opts" : "-i 5 -L %s"
%
-
g3.get_ip("guestnic")
+ g3_testiface.get_ip_addr(0)
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"netperf_server" :
- g1.get_ip("guestnic", 1),
+ g1_testiface.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_testiface.get_ip_addr(1)
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"netperf_server" :
- g1.get_ip("guestnic", 1),
+ g1_testiface.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_testiface.get_ip_addr(1)
})
ping_mod_bad = ctl.get_module("IcmpPing",
options={
- "addr" : g4.get_ip("guestnic"),
+ "addr" : g4_testiface.get_ip_addr(0),
"count" : 100,
"iface" :
g1.get_devname("guestnic"),
"interval" : 0.1
@@ -148,7 +153,7 @@ ping_mod_bad = ctl.get_module("IcmpPing",
ping_mod_bad2 = ctl.get_module("IcmpPing",
options={
- "addr" : g2.get_ip("guestnic"),
+ "addr" : g2_testiface.get_ip_addr(0),
"count" : 100,
"iface" :
g3.get_devname("guestnic"),
"interval" : 0.1
@@ -156,7 +161,7 @@ ping_mod_bad2 = ctl.get_module("IcmpPing",
ping_mod6_bad = ctl.get_module("Icmp6Ping",
options={
- "addr" : g4.get_ip("guestnic", 1),
+ "addr" : g4_testiface.get_ip_addr(1),
"count" : 100,
"iface" : g1.get_devname("guestnic"),
"interval" : 0.1
@@ -164,7 +169,7 @@ ping_mod6_bad = ctl.get_module("Icmp6Ping",
ping_mod6_bad2 = ctl.get_module("Icmp6Ping",
options={
- "addr" : g2.get_ip("guestnic", 1),
+ "addr" : g2_testiface.get_ip_addr(1),
"count" : 100,
"iface" : g3.get_devname("guestnic"),
"interval" : 0.1
diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
index e7ef089..fea6482 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
@@ -42,9 +42,13 @@ offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
netperf_duration = ctl.get_alias("netperf_duration")
+h1_vlan10 = h1.get_interface("vlan10")
+h2_vlan10 = h2.get_interface("vlan10")
+g1_vlan10 = g1.get_interface("vlan10")
+
ping_mod = ctl.get_module("IcmpPing",
options={
- "addr" : h2.get_ip("vlan10", 0),
+ "addr" : h2_vlan10.get_ip_addr(0),
"count" : 100,
"iface" : g1.get_devname("vlan10"),
"interval" : 0.1
@@ -52,69 +56,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/phase1/virtual_bridge_vlan_in_host.py
b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
index d32b1e0..6e70c9f 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
@@ -42,9 +42,13 @@ offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
netperf_duration = ctl.get_alias("netperf_duration")
+h1_vlan10 = h1.get_interface("vlan10")
+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 +56,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