Ondřej Svoboda has uploaded a new change for review. Change subject: ifcfg: only determine and write HWADDR in removeNic if enabled ......................................................................
ifcfg: only determine and write HWADDR in removeNic if enabled Writing of HWADDR has been deprecated for long now but for compatibility with pre-1.0 NetworkManager (that matches on HWADDR in order to accept NM_CONTROLLED=no) we shall still write it if requested with hwaddr_in_ifcfg=always in vdsm.conf. This patch makes removeNic follow suit -- addNic was alone in respecting the condition. For more information refer to http://gerrit.ovirt.org/22288 and https://bugzilla.redhat.com/1044060 Change-Id: Ieb4e7cdae83998b4102e79b7cb548ed95f672433 Bug-Url: https://bugzilla.redhat.com/1256252 Signed-off-by: Ondřej Svoboda <[email protected]> --- M vdsm/network/configurators/ifcfg.py 1 file changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/45983/1 diff --git a/vdsm/network/configurators/ifcfg.py b/vdsm/network/configurators/ifcfg.py index 8332224..9152a0d 100644 --- a/vdsm/network/configurators/ifcfg.py +++ b/vdsm/network/configurators/ifcfg.py @@ -644,21 +644,27 @@ mtu = int(mtu) return ipv4, ipv6, mtu - def removeNic(self, nic): - cf = netinfo.NET_CONF_PREF + nic - self._backup(cf) + @staticmethod + def _hwaddr_from_ifcfg_or_system(nic, ifcfg): + if not _hwaddr_required(): + return [] try: - with open(cf) as nicFile: - hwlines = [line for line in nicFile if line.startswith( + with open(ifcfg) as ifcfg_file: + hwlines = [line for line in ifcfg_file if line.startswith( 'HWADDR=')] except IOError as e: - logging.warning("%s couldn't be read (errno %s)", cf, e.errno) + logging.warning("%s couldn't be read (errno %s)", ifcfg, e.errno) try: hwlines = ['HWADDR=%s\n' % netinfo.gethwaddr(nic)] except IOError as e: logging.exception("couldn't determine hardware address of %s " "(errno %s)", nic, e.errno) hwlines = [] + + def removeNic(self, nic): + cf = netinfo.NET_CONF_PREF + nic + self._backup(cf) + hwlines = self._hwaddr_from_ifcfg_or_system(nic, cf) l = [self.CONFFILE_HEADER + '\n', 'DEVICE=%s\n' % nic, 'ONBOOT=yes\n', 'MTU=%s\n' % netinfo.DEFAULT_MTU] + hwlines l.append('NM_CONTROLLED=no\n') -- To view, visit https://gerrit.ovirt.org/45983 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb4e7cdae83998b4102e79b7cb548ed95f672433 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
