ifconfig: T1405: ensure MAC address is configured first

The MAC address is changed after we have set an IP address on the interface or
started dhclient. This will cause some users to receive the wrong IP address
on device startup.

Change to order of how parameters are set in the system. The interface MAC
address is now configured first.

1 files changed, 9 insertions, 9 deletions

diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index 893623284..39b80ce08 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -942,6 +942,15 @@ class Interface(Control):
         # method to apply()?
         self._config = config
 
+        # Change interface MAC address - re-set to real hardware address (hw-id)
+        # if custom mac is removed. Skip if bond member.
+        if 'is_bond_member' not in config:
+            mac = config.get('hw_id')
+            if 'mac' in config:
+                mac = config.get('mac')
+            if mac:
+                self.set_mac(mac)
+
         # Update interface description
         self.set_alias(config.get('description', ''))
 
@@ -1058,15 +1067,6 @@ class Interface(Control):
             for addr in tmp:
                 self.del_ipv6_eui64_address(addr)
 
-        # Change interface MAC address - re-set to real hardware address (hw-id)
-        # if custom mac is removed. Skip if bond member.
-        if 'is_bond_member' not in config:
-            mac = config.get('hw_id')
-            if 'mac' in config:
-                mac = config.get('mac')
-            if mac:
-                self.set_mac(mac)
-
         # Manage IPv6 link-local addresses
         tmp = dict_search('ipv6.address.no_default_link_local', config)
         # we must check explicitly for None type as if the key is set we will