interfaces: T2362: delete and re-add all EUI64 addresses if MAC has changed

1 files changed, 7 insertions, 1 deletions

diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py
index ba459f871..2ad5ecf2b 100755
--- a/src/conf_mode/interfaces-bridge.py
+++ b/src/conf_mode/interfaces-bridge.py
@@ -20,7 +20,7 @@ from copy import deepcopy
 from sys import exit
 from netifaces import interfaces
 
-from vyos.ifconfig import BridgeIf
+from vyos.ifconfig import BridgeIf, Section
 from vyos.ifconfig.stp import STP
 from vyos.configdict import list_diff
 from vyos.config import Config
@@ -186,6 +186,12 @@ def get_config():
     if conf.exists('mac'):
         bridge['mac'] = conf.return_value('mac')
 
+    # Find out if MAC has changed - if so, we need to delete all IPv6 EUI64 addresses
+    # before re-adding them
+    if ( bridge['mac'] and bridge['intf'] in Section.interfaces(section='bridge')
+             and bridge['mac'] != BridgeIf(bridge['intf'], create=False).get_mac() ):
+        bridge['ipv6_eui64_prefix_remove'] += bridge['ipv6_eui64_prefix']
+
     # Interval at which neighbor bridges are removed
     if conf.exists('max-age'):
         bridge['max_age'] = int(conf.return_value('max-age'))