Petr Horáček has uploaded a new change for review. Change subject: configurators: runDhclient moved iproute2 > __init__.py ......................................................................
configurators: runDhclient moved iproute2 > __init__.py Function _runDhclient is moved from iproute2.py to __init__.py, so we can use it in pyroute_two.py. Change-Id: Ibed6750d2448a3a57da05c91d0f969b7965d6f94 Signed-off-by: Petr Horáček <[email protected]> --- M vdsm/network/configurators/__init__.py M vdsm/network/configurators/iproute2.py 2 files changed, 13 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/32455/1 diff --git a/vdsm/network/configurators/__init__.py b/vdsm/network/configurators/__init__.py index 2923290..2b60727 100644 --- a/vdsm/network/configurators/__init__.py +++ b/vdsm/network/configurators/__init__.py @@ -25,6 +25,8 @@ from vdsm.netconfpersistence import RunningConfig from . import libvirt +from .dhclient import DhcpClient +from ..errors import ConfigNetworkError, ERR_FAILED_IFUP from ..models import Bond, Bridge from ..sourceroute import StaticSourceRoute @@ -156,3 +158,11 @@ except ConfigParser.NoOptionError: opts = config.get('vars', 'ethtool_opts') return opts + + +def runDhclient(iface, family=4): + dhclient = DhcpClient(iface.name, family) + rc = dhclient.start(iface.ipConfig.async) + if not iface.ipConfig.async and rc: + raise ConfigNetworkError(ERR_FAILED_IFUP, 'dhclient%s failed', + family) diff --git a/vdsm/network/configurators/iproute2.py b/vdsm/network/configurators/iproute2.py index 0f1a0c7..fc286b4 100644 --- a/vdsm/network/configurators/iproute2.py +++ b/vdsm/network/configurators/iproute2.py @@ -30,7 +30,7 @@ from vdsm.utils import CommandPath from vdsm.utils import execCmd -from . import Configurator, getEthtoolOpts, libvirt +from . import Configurator, runDhclient, getEthtoolOpts, libvirt from .dhclient import DhcpClient from ..errors import ConfigNetworkError, ERR_FAILED_IFUP, ERR_FAILED_IFDOWN from ..models import Nic @@ -250,19 +250,12 @@ def setBondingMtu(self, iface, mtu): self.setIfaceMtu(iface, mtu) - def _runDhclient(self, iface, family=4): - dhclient = DhcpClient(iface.name, family) - rc = dhclient.start(iface.ipConfig.async) - if not iface.ipConfig.async and rc: - raise ConfigNetworkError(ERR_FAILED_IFUP, 'dhclient%s failed', - family) - def ifup(self, iface): ipwrapper.linkSet(iface.name, ['up']) if iface.ipConfig.bootproto == 'dhcp': - self._runDhclient(iface) + runDhclient(iface) if iface.ipConfig.dhcpv6: - self._runDhclient(iface, 6) + runDhclient(iface, 6) def ifdown(self, iface): ipwrapper.linkSet(iface.name, ['down']) -- To view, visit http://gerrit.ovirt.org/32455 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibed6750d2448a3a57da05c91d0f969b7965d6f94 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
