[PATCH 0/3] Netperf message size
by Kamil Jerabek
Patch 1 rename udp_size option to msg_size in Netperf module.
Patch 2 rename udp_size to msg_size in regression_tests/phase1-2.
Patch 3 adds set msg_size to tcp netperf tests in regression_tests/phase1-2.
Kamil Jerabek (3):
Netperf: rename udp_size option to msg_size
regression_tests: rename udp_size to msg_size in netperf tests
regression_tests: add set msg_size to tcp netperf tests
recipes/regression_tests/phase1/3_vlans.py | 26 +++++++++-----
.../regression_tests/phase1/3_vlans_over_bond.py | 26 +++++++++-----
recipes/regression_tests/phase1/bonding_test.py | 26 +++++++++-----
recipes/regression_tests/phase1/simple_netperf.py | 24 ++++++++-----
.../phase1/virtual_bridge_2_vlans_over_bond.py | 26 +++++++++-----
.../phase1/virtual_bridge_vlan_in_guest.py | 26 +++++++++-----
.../phase1/virtual_bridge_vlan_in_host.py | 26 +++++++++-----
.../regression_tests/phase2/3_vlans_over_team.py | 26 +++++++++-----
recipes/regression_tests/phase2/team_test.py | 42 +++++++++++++++-------
...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 26 +++++++++-----
.../phase2/virtual_ovs_bridge_vlan_in_guest.py | 26 +++++++++-----
.../phase2/virtual_ovs_bridge_vlan_in_host.py | 26 +++++++++-----
test_modules/Netperf.py | 10 +++---
13 files changed, 231 insertions(+), 105 deletions(-)
--
2.5.5
7 years, 5 months
[PATCH v2] regression-tests: simple_macsec add set mtu
by Kamil Jerabek
This commit adds set mtu to physical interfaces in phase3 simple_macsec task.
Changes in
v2: * fixed typo in commit message
Signed-off-by: Kamil Jerabek <kjerabek(a)redhat.com>
---
recipes/regression_tests/phase3/simple_macsec.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/recipes/regression_tests/phase3/simple_macsec.py b/recipes/regression_tests/phase3/simple_macsec.py
index 2f6dd6a..b16214b 100644
--- a/recipes/regression_tests/phase3/simple_macsec.py
+++ b/recipes/regression_tests/phase3/simple_macsec.py
@@ -43,6 +43,9 @@ pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
m1_phy = m1.get_interface("eth")
m2_phy = m2.get_interface("eth")
+m1_phy.set_mtu(mtu)
+m2_phy.set_mtu(mtu)
+
m1_phy_name = m1_phy.get_devname()
m2_phy_name = m2_phy.get_devname()
--
2.5.5
7 years, 5 months
[PATCH] InterfaceAPI: Configure IP addresses on soft devices
by Ido Schimmel
From: Ido Schimmel <idosch(a)mellanox.com>
After commit 82f606fb169e ("{Net, Nm}ConfigDevice: split up() into
up+address_setup") we no longer configure IP addresses on soft devices
created via _add_iface().
Fix this by invoking the newly introduced address_setup().
Fixes: 82f606fb169e ("{Net, Nm}ConfigDevice: split up() into up+address_setup")
Signed-off-by: Ido Schimmel <idosch(a)mellanox.com>
---
Note that I've already carried a similar fix in commit 8690fdc34919
("InterfaceAPI: Configure IP addresses following reset()"), but I
missed this spot, so please review carefully.
---
lnst/Controller/Task.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lnst/Controller/Task.py b/lnst/Controller/Task.py
index a9a184d..6fd1946 100644
--- a/lnst/Controller/Task.py
+++ b/lnst/Controller/Task.py
@@ -431,6 +431,7 @@ class HostAPI(object):
interface.configure()
interface.up()
+ interface.address_setup()
self._m.wait_interface_init()
@@ -438,6 +439,7 @@ class HostAPI(object):
def _remove_iface(self, iface):
interface = iface._if
+ interface.address_cleanup()
interface.deconfigure()
interface.cleanup()
if_id = interface.get_id()
--
2.7.4
7 years, 5 months
[PATCH] regression_tests: add set_mtu to virtual ovs bridge tests
by Kamil Jerabek
This commit adds missing set_mtu to virtual ovs bridge tests in our
regression tests in phase2.
Signed-off-by: Kamil Jerabek <kjerabek(a)redhat.com>
---
...ual_ovs_bridge_2_vlans_over_active_backup_bond.py | 20 ++++++++++++++++++++
...al_ovs_bridge_2_vlans_over_active_backup_bond.xml | 1 +
.../phase2/virtual_ovs_bridge_vlan_in_guest.py | 13 +++++++++++++
.../phase2/virtual_ovs_bridge_vlan_in_guest.xml | 1 +
.../phase2/virtual_ovs_bridge_vlan_in_host.py | 11 +++++++++++
.../phase2/virtual_ovs_bridge_vlan_in_host.xml | 1 +
6 files changed, 47 insertions(+)
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 409cb88..c2f3b78 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
@@ -33,6 +33,7 @@ g4.sync_resources(modules=["IcmpPing", "Icmp6Ping", "Netperf"])
# TESTS
# ------
+mtu = ctl.get_alias("mtu")
ipv = ctl.get_alias("ipv")
netperf_duration = int(ctl.get_alias("netperf_duration"))
nperf_reserve = int(ctl.get_alias("nperf_reserve"))
@@ -230,6 +231,25 @@ ping_mod6_bad2 = ctl.get_module("Icmp6Ping",
"interval" : 0.1
})
+
+# configure mtu
+h1_nic1.set_mtu(mtu)
+h1_nic2.set_mtu(mtu)
+h1.get_interface("tap1").set_mtu(mtu)
+h1.get_interface("tap2").set_mtu(mtu)
+h1.get_interface("bridge").set_mtu(mtu)
+
+h2_nic1.set_mtu(mtu)
+h2_nic2.set_mtu(mtu)
+h2.get_interface("tap1").set_mtu(mtu)
+h2.get_interface("tap2").set_mtu(mtu)
+h2.get_interface("bridge").set_mtu(mtu)
+
+g1.get_interface("guestnic").set_mtu(mtu)
+g2.get_interface("guestnic").set_mtu(mtu)
+g3.get_interface("guestnic").set_mtu(mtu)
+g4.get_interface("guestnic").set_mtu(mtu)
+
ctl.wait(15)
for setting in offload_settings:
diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml
index 32b4c06..01c4291 100644
--- a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml
+++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml
@@ -7,6 +7,7 @@
<alias name="nperf_max_runs" value="5" />
<alias name="nperf_mode" value="default"/>
<alias name="nperf_num_parallel" value="2"/>
+ <alias name="mtu" value="1500" />
<alias name="nperf_debug" value="0"/>
<alias name="nperf_max_dev" value="20%"/>
<alias name="mapping_file" value="virtual_ovs_bridge_2_vlans_over_active_backup_bond.mapping" />
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 b0dc574..e9318b1 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
@@ -27,6 +27,7 @@ h2.sync_resources(modules=["IcmpPing", "Icmp6Ping", "Netperf"])
# TESTS
# ------
+mtu = ctl.get_alias("mtu")
ipv = ctl.get_alias("ipv")
netperf_duration = int(ctl.get_alias("netperf_duration"))
nperf_reserve = int(ctl.get_alias("nperf_reserve"))
@@ -178,6 +179,18 @@ if nperf_udp_size is not None:
netperf_cli_udp.update_options({"udp_size" : nperf_udp_size})
netperf_cli_udp6.update_options({"udp_size" : nperf_udp_size})
+#set mtu
+h1.get_interface("nic").set_mtu(mtu)
+h1.get_interface("tap").set_mtu(mtu)
+h1.get_interface("br").set_mtu(mtu)
+
+h2.get_interface("nic").set_mtu(mtu)
+h2.get_interface("vlan10").set_mtu(mtu)
+
+g1.get_interface("guestnic").set_mtu(mtu)
+g1.get_interface("vlan10").set_mtu(mtu)
+
+
ctl.wait(15)
for setting in offload_settings:
diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml
index ae85997..786b9d3 100644
--- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml
+++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml
@@ -9,6 +9,7 @@
<alias name="nperf_num_parallel" value="2"/>
<alias name="nperf_debug" value="0"/>
<alias name="nperf_max_dev" value="20%"/>
+ <alias name="mtu" value="1500" />
<alias name="mapping_file" value="virtual_ovs_bridge_vlan_in_guest.mapping" />
<alias name="vlan10_net" value="192.168.10"/>
<alias name="vlan10_tag" value="10"/>
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 25f19f1..69560b9 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
@@ -27,6 +27,7 @@ h2.sync_resources(modules=["IcmpPing", "Icmp6Ping", "Netperf"])
# TESTS
# ------
+mtu = ctl.get_alias("mtu")
ipv = ctl.get_alias("ipv")
netperf_duration = int(ctl.get_alias("netperf_duration"))
nperf_reserve = int(ctl.get_alias("nperf_reserve"))
@@ -177,6 +178,16 @@ if nperf_udp_size is not None:
netperf_cli_udp.update_options({"udp_size" : nperf_udp_size})
netperf_cli_udp6.update_options({"udp_size" : nperf_udp_size})
+#set mtu
+h1.get_interface("nic").set_mtu(mtu)
+h1.get_interface("tap").set_mtu(mtu)
+h1.get_interface("ovs_br").set_mtu(mtu)
+
+h2.get_interface("nic").set_mtu(mtu)
+h2.get_interface("vlan10").set_mtu(mtu)
+
+g1.get_interface("guestnic").set_mtu(mtu)
+
ctl.wait(15)
for setting in offload_settings:
diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml
index 6b2a271..5f8b9e5 100644
--- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml
+++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml
@@ -9,6 +9,7 @@
<alias name="nperf_num_parallel" value="2"/>
<alias name="nperf_debug" value="0"/>
<alias name="nperf_max_dev" value="20%"/>
+ <alias name="mtu" value="1500" />
<alias name="mapping_file" value="virtual_ovs_bridge_vlan_in_host.mapping" />
<alias name="vlan10_net" value="192.168.10"/>
<alias name="vlan10_tag" value="10"/>
--
2.5.5
7 years, 5 months
[PATCH v4 0/2] offloads alias
by Kamil Jerabek
Patch 1 add Offloads module that contains method for offloads alias parsing.
Patch 2 add offloads alias to all tasks in regression_tests phase1 and phase2.
Changes in
v2: * in [PATCH 2/2] I merged offloads definition into one if statement with
offloads alias
v3: * in [PATCH 1/2] I added support for accepting offload "on" option and
also offload names with "-" are accepted now.
v4: * in [PATCH 1/2] the parse_offloads now return offloads set in order
as it is specified on input
Kamil Jerabek (2):
RecipeCommon: add Offloads module
regression_tests: add offloads alias
lnst/RecipeCommon/Offloads.py | 56 ++++++++++++++++++++++
recipes/regression_tests/phase1/3_vlans.py | 18 ++++---
.../regression_tests/phase1/3_vlans_over_bond.py | 16 +++++--
recipes/regression_tests/phase1/bonding_test.py | 17 ++++---
recipes/regression_tests/phase1/simple_netperf.py | 19 +++++---
.../phase1/virtual_bridge_2_vlans_over_bond.py | 17 ++++---
.../phase1/virtual_bridge_vlan_in_guest.py | 19 +++++---
.../phase1/virtual_bridge_vlan_in_host.py | 19 +++++---
.../regression_tests/phase2/3_vlans_over_team.py | 16 +++++--
recipes/regression_tests/phase2/team_test.py | 17 ++++---
...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 17 ++++---
.../phase2/virtual_ovs_bridge_vlan_in_guest.py | 19 +++++---
.../phase2/virtual_ovs_bridge_vlan_in_host.py | 19 +++++---
13 files changed, 194 insertions(+), 75 deletions(-)
create mode 100644 lnst/RecipeCommon/Offloads.py
--
2.5.5
7 years, 5 months
[PATCH] NetConfigDevice: fix OvSBridge down method
by Ondrej Lichtner
From: Ondrej Lichtner <olichtne(a)redhat.com>
Removing a bit of forgotten code - when I split the down method into
down + address_cleanup I forgot to remove the "ip addr del" commands for
internal ports from the down method resulting in calling the same
command twice. The second call would fail and throw an exception since
the address would already be removed.
Fixes: 82f606fb ("{Net, Nm}ConfigDevice: split up() into up+address_setup")
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
lnst/Slave/NetConfigDevice.py | 3 ---
1 file changed, 3 deletions(-)
diff --git a/lnst/Slave/NetConfigDevice.py b/lnst/Slave/NetConfigDevice.py
index 9681ac5..a668e32 100644
--- a/lnst/Slave/NetConfigDevice.py
+++ b/lnst/Slave/NetConfigDevice.py
@@ -464,9 +464,6 @@ class NetConfigDeviceOvsBridge(NetConfigDeviceGeneric):
int_ports = self._dev_config["ovs_conf"]["internals"]
br_name = self._dev_config["name"]
for iport in int_ports:
- if "addresses" in iport:
- for address in iport["addresses"]:
- exec_cmd("ip addr del %s dev %s" % (address, iport["name"]))
exec_cmd("ip link set %s down" % iport["name"])
super(NetConfigDeviceOvsBridge, self).down()
--
2.10.1
7 years, 5 months
[PATCH v3 0/2] offloads alias
by Kamil Jerabek
Patch 1 add Offloads module that contains method for offloads alias parsing.
Patch 2 add offloads alias to all tasks in regression_tests phase1 and phase2.
Changes in
v2: * in [PATCH 2/2] I merged offloads definition into one if statement with
offloads alias
v3: * in [PATCH 1/2] I added support for accepting offload "on" option and
also offload names with "-" are accepted now.
Kamil Jerabek (2):
RecipeCommon: add Offloads module
regression_tests: add offloads alias
lnst/RecipeCommon/Offloads.py | 53 ++++++++++++++++++++++
recipes/regression_tests/phase1/3_vlans.py | 18 +++++---
.../regression_tests/phase1/3_vlans_over_bond.py | 16 +++++--
recipes/regression_tests/phase1/bonding_test.py | 17 ++++---
recipes/regression_tests/phase1/simple_netperf.py | 19 +++++---
.../phase1/virtual_bridge_2_vlans_over_bond.py | 17 ++++---
.../phase1/virtual_bridge_vlan_in_guest.py | 19 +++++---
.../phase1/virtual_bridge_vlan_in_host.py | 19 +++++---
.../regression_tests/phase2/3_vlans_over_team.py | 16 +++++--
recipes/regression_tests/phase2/team_test.py | 17 ++++---
...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 17 ++++---
.../phase2/virtual_ovs_bridge_vlan_in_guest.py | 19 +++++---
.../phase2/virtual_ovs_bridge_vlan_in_host.py | 19 +++++---
13 files changed, 191 insertions(+), 75 deletions(-)
create mode 100644 lnst/RecipeCommon/Offloads.py
--
2.5.5
7 years, 5 months
[PATCH] regression-tests: simple_macsec add set mtu
by Kamil Jerabek
This commit adds set mtu to physical interfaces in phase3 simple_nepterf task.
Signed-off-by: Kamil Jerabek <kjerabek(a)redhat.com>
---
recipes/regression_tests/phase3/simple_macsec.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/recipes/regression_tests/phase3/simple_macsec.py b/recipes/regression_tests/phase3/simple_macsec.py
index 2f6dd6a..b16214b 100644
--- a/recipes/regression_tests/phase3/simple_macsec.py
+++ b/recipes/regression_tests/phase3/simple_macsec.py
@@ -43,6 +43,9 @@ pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
m1_phy = m1.get_interface("eth")
m2_phy = m2.get_interface("eth")
+m1_phy.set_mtu(mtu)
+m2_phy.set_mtu(mtu)
+
m1_phy_name = m1_phy.get_devname()
m2_phy_name = m2_phy.get_devname()
--
2.5.5
7 years, 5 months
[PATCH v2 0/2] offloads alias
by Kamil Jerabek
Patch 1 add Offloads module that contains method for offloads alias parsing.
Patch 2 add offloads alias to all tasks in regression_tests phase1 and phase2.
Changes in
v2: * in [PATCH 2/2] I merged offloads definition into one if statement with
offloads alias
Kamil Jerabek (2):
RecipeCommon: add Offloads module
regression_tests: add offloads alias
lnst/RecipeCommon/Offloads.py | 49 ++++++++++++++++++++++
recipes/regression_tests/phase1/3_vlans.py | 18 +++++---
.../regression_tests/phase1/3_vlans_over_bond.py | 16 ++++---
recipes/regression_tests/phase1/bonding_test.py | 17 +++++---
recipes/regression_tests/phase1/simple_netperf.py | 19 +++++----
.../phase1/virtual_bridge_2_vlans_over_bond.py | 17 +++++---
.../phase1/virtual_bridge_vlan_in_guest.py | 19 +++++----
.../phase1/virtual_bridge_vlan_in_host.py | 19 +++++----
.../regression_tests/phase2/3_vlans_over_team.py | 16 ++++---
recipes/regression_tests/phase2/team_test.py | 17 +++++---
...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 17 +++++---
.../phase2/virtual_ovs_bridge_vlan_in_guest.py | 19 +++++----
.../phase2/virtual_ovs_bridge_vlan_in_host.py | 19 +++++----
13 files changed, 187 insertions(+), 75 deletions(-)
create mode 100644 lnst/RecipeCommon/Offloads.py
--
2.5.5
7 years, 5 months
[PATCH 1/3] Task: set maximum retries for prefrepo connections
by Ondrej Lichtner
From: Ondrej Lichtner <olichtne(a)redhat.com>
This adds a parameter to set a higher maximum retries value for perfrepo
connections. Requires python-perfrepo newer than
2319902b2235dd45b7d2948f201ecba6fd85ea35.
Setting the default value to 3.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
lnst/Controller/Task.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lnst/Controller/Task.py b/lnst/Controller/Task.py
index 6cbb165..a9a184d 100644
--- a/lnst/Controller/Task.py
+++ b/lnst/Controller/Task.py
@@ -128,7 +128,7 @@ class ControllerAPI(object):
"""
return self._ctl._get_aliases()
- def connect_PerfRepo(self, mapping_file, url=None, username=None, password=None):
+ def connect_PerfRepo(self, mapping_file, url=None, username=None, password=None, max_retries=3):
if not self._perf_repo_api.connected():
if url is None:
url = lnst_config.get_option("perfrepo", "url")
@@ -144,7 +144,7 @@ class ControllerAPI(object):
if not password:
logging.warn("No PerfRepo password specified in config file")
if url and username and password:
- self._perf_repo_api.connect(url, username, password)
+ self._perf_repo_api.connect(url, username, password, max_retries)
root = Path(None, self._ctl._recipe_path).get_root()
path = Path(root, mapping_file)
@@ -870,9 +870,10 @@ class PerfRepoAPI(object):
else:
return False
- def connect(self, url, username, password):
+ def connect(self, url, username, password, max_retries=0):
if PerfRepoRESTAPI is not None:
self._rest_api = PerfRepoRESTAPI(url, username, password)
+ self._rest_api.set_retries(max_retries)
if not self._rest_api.connected():
self._rest_api = None
else:
--
2.10.0
7 years, 5 months