From 9f26522388972eb6537446a5030c806a5e1b68ff Mon Sep 17 00:00:00 2001
From: Jernej Jakob <jernej.jakob@gmail.com>
Date: Wed, 22 Apr 2020 18:57:50 +0200
Subject: interfaces: vlan: T2362: add IPv6 EUI64 address to VLAN scripts

---
 python/vyos/configdict.py    | 12 ++++++++++++
 python/vyos/ifconfig_vlan.py |  8 ++++++++
 2 files changed, 20 insertions(+)

(limited to 'python')

diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index 24fe174d2..0d315f146 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -125,6 +125,8 @@ def vlan_to_dict(conf):
         'ip_enable_arp_ignore': 0,
         'ip_proxy_arp': 0,
         'ipv6_autoconf': 0,
+        'ipv6_eui64_prefix': [],
+        'ipv6_eui64_prefix_remove': [],
         'ipv6_forwarding': 1,
         'ipv6_dup_addr_detect': 1,
         'ingress_qos': '',
@@ -199,6 +201,16 @@ def vlan_to_dict(conf):
     if conf.exists('ipv6 address autoconf'):
         vlan['ipv6_autoconf'] = 1
 
+    # Get prefix for IPv6 addressing based on MAC address (EUI-64)
+    if conf.exists('ipv6 address eui64'):
+        vlan['ipv6_eui64_prefix'].append(conf.return_value('ipv6 address eui64'))
+
+    # Determine currently effective EUI64 address - to determine which
+    # address is no longer valid and needs to be removed
+    eff_addr = conf.return_effective_value('ipv6 address eui64')
+    if eff_addr and eff_addr not in vlan['ipv6_eui64_prefix']:
+        vlan['ipv6_eui64_prefix_remove'].append(eff_addr)
+
     # Disable IPv6 forwarding on this interface
     if conf.exists('ipv6 disable-forwarding'):
         vlan['ipv6_forwarding'] = 0
diff --git a/python/vyos/ifconfig_vlan.py b/python/vyos/ifconfig_vlan.py
index 899fd17da..ee009f7f9 100644
--- a/python/vyos/ifconfig_vlan.py
+++ b/python/vyos/ifconfig_vlan.py
@@ -66,10 +66,18 @@ def apply_vlan_config(vlan, config):
     # assign/remove VRF
     vlan.set_vrf(config['vrf'])
 
+    # Delete old IPv6 EUI64 addresses before changing MAC
+    for addr in config['ipv6_eui64_prefix_remove']:
+        vlan.del_ipv6_eui64_address(addr)
+
     # Change VLAN interface MAC address
     if config['mac']:
         vlan.set_mac(config['mac'])
 
+    # Add IPv6 EUI-based addresses
+    for addr in config['ipv6_eui64_prefix']:
+        vlan.add_ipv6_eui64_address(addr)
+
     # enable/disable VLAN interface
     if config['disable']:
         vlan.set_admin_state('down')
-- 
cgit v1.2.3