commit a617f44b565e250f55bdbd602d233c94ad0d75d9
Author: Ondrej Lichtner <olichtne(a)redhat.com>
Date: Fri Apr 5 16:19:52 2013 +0200
NetConfigDevice: fix team configuration
The interface for teamdctl application has changed and the team
configuration executed by lnst slaves wasn't working.
This commit fixes that.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
lnst/Slave/NetConfigDevice.py | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/lnst/Slave/NetConfigDevice.py b/lnst/Slave/NetConfigDevice.py
index cd8a69e..c781e83 100644
--- a/lnst/Slave/NetConfigDevice.py
+++ b/lnst/Slave/NetConfigDevice.py
@@ -271,16 +271,18 @@ class NetConfigDeviceTeam(NetConfigDeviceGeneric):
port_netdev = self._config[slaveid]
port_name = port_netdev["name"]
teamd_port_config = get_option(port_netdev, "teamd_port_config")
+ dbus_option = "-D" if self._should_enable_dbus() else ""
if teamd_port_config:
teamd_port_config = prepare_json_str(teamd_port_config)
- exec_cmd("teamdctl %s PortConfigUpdate %s \"%s\"" %
(dev_name, port_name, teamd_port_config))
+ exec_cmd("teamdctl %s %s port config update %s \"%s\"" %
(dbus_option, dev_name, port_name, teamd_port_config))
NetConfigDevice(port_netdev, self._config).down()
- exec_cmd("teamdctl %s PortAdd %s" % (dev_name, port_name))
+ exec_cmd("teamdctl %s %s port add %s" % (dbus_option, dev_name,
port_name))
def slave_del(self, slaveid):
dev_name = self._netdev["name"]
port_name = self._config[slaveid]["name"]
- exec_cmd("teamdctl %s PortRemove %s" % (dev_name, port_name))
+ dbus_option = "-D" if self._should_enable_dbus() else ""
+ exec_cmd("teamdctl %s %s port remove %s" % (dbus_option, dev_name,
port_name))
type_class_mapping = {
"eth": NetConfigDeviceEth,
Show replies by date