From 2876ca35c12a9ab9bba3920c5ada43c294846403 Mon Sep 17 00:00:00 2001 From: Roopa Prabhu Date: Fri, 11 Mar 2016 15:56:34 -0800 Subject: [PATCH] Revert "Detect and ignore the `ether` keyword in /etc/network/interface" This reverts commit bed653e31b7cae7ac33073ab8ecf5e98c8b3bd21. Reverting commit because this does not do the right thing and also prints 'NoneType' errors. We should not be changing anything for running values. The ether check is only needed for configured values. --- addons/address.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/addons/address.py b/addons/address.py index 0f09731..48a5c95 100644 --- a/addons/address.py +++ b/addons/address.py @@ -81,13 +81,8 @@ class address(moduleBase): return True return False - def _hwaddress_ether_support(self, hwaddress): - if hwaddress.startswith("ether"): - hwaddress = hwaddress[5:].strip() - return hwaddress - def _process_bridge(self, ifaceobj, up): - hwaddress = self._hwaddress_ether_support(ifaceobj.get_attr_value_first('hwaddress')) + hwaddress = ifaceobj.get_attr_value_first('hwaddress') addrs = ifaceobj.get_attr_value_first('address') is_vlan_dev_on_vlan_aware_bridge = False is_bridge = self.ipcmd.is_bridge(ifaceobj.name) @@ -262,11 +257,11 @@ class address(moduleBase): self.ipcmd.link_set_alias(ifaceobj.name, alias) self.ipcmd.batch_commit() - hwaddress = self._hwaddress_ether_support(ifaceobj.get_attr_value_first('hwaddress')) + hwaddress = ifaceobj.get_attr_value_first('hwaddress') if hwaddress: running_hwaddress = None if not self.PERFMODE: # system is clean - running_hwaddress = self._hwaddress_ether_support(self.ipcmd.link_get_hwaddress(ifaceobj.name)) + running_hwaddress = self.ipcmd.link_get_hwaddress(ifaceobj.name) if hwaddress != running_hwaddress: slave_down = False rtnetlink_api.rtnl_api.link_set(ifaceobj.name, "down") @@ -368,9 +363,9 @@ class address(moduleBase): addr_method = ifaceobj.addr_method self.query_n_update_ifaceobjcurr_attr(ifaceobj, ifaceobjcurr, 'mtu', self.ipcmd.link_get_mtu) - hwaddress = self._hwaddress_ether_support(ifaceobj.get_attr_value_first('hwaddress')) + hwaddress = ifaceobj.get_attr_value_first('hwaddress') if hwaddress: - rhwaddress = self._hwaddress_ether_support(self.ipcmd.link_get_hwaddress(ifaceobj.name)) + rhwaddress = self.ipcmd.link_get_hwaddress(ifaceobj.name) if not rhwaddress or rhwaddress != hwaddress: ifaceobjcurr.update_config_with_status('hwaddress', rhwaddress, 1) -- 2.39.2