addons: address: process hwaddress before processing ip addresses

Signed-off-by: Julien Fortin <jfortin@nvidia.com>

diff --git a/ifupdown2/addons/address.py b/ifupdown2/addons/address.py
index feedfb8c39668306556087b6484c97372cf6e755..75c5d0ef9c72b748240d321fdb81a81cac8b33ef 100644 (file)
--- a/ifupdown2/addons/address.py
+++ b/ifupdown2/addons/address.py
@@ -1079,6 +1079,11 @@ class address(AddonWithIpBlackList, moduleBase):
         self.process_mtu(ifaceobj, ifaceobj_getfunc)
         self.up_ipv6_addrgen(ifaceobj)
 
+       try:
+            hwaddress, old_mac_addr = self.process_hwaddress(ifaceobj)
+       except Exception as e:
+            self.log_error('%s: %s' % (ifaceobj.name, str(e)), ifaceobj)
+
         if addr_method not in ["dhcp", "ppp"]:
             self.process_addresses(ifaceobj, ifaceobj_getfunc, force_reapply)
         else:
@@ -1091,7 +1096,7 @@ class address(AddonWithIpBlackList, moduleBase):
 
         try:
             # Handle special things on a bridge
-            self._process_bridge(ifaceobj, True, *self.process_hwaddress(ifaceobj))
+            self._process_bridge(ifaceobj, True, hwaddress, old_mac_addr)
         except Exception as e:
             self.log_error('%s: %s' % (ifaceobj.name, str(e)), ifaceobj)