summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorJernej Jakob <jernej.jakob@gmail.com>2020-04-22 12:39:22 +0200
committerJernej Jakob <jernej.jakob@gmail.com>2020-04-23 16:09:37 +0200
commit4940bea4f7b8574d30876fd3d0456e75f6f29877 (patch)
treee422582794edcdc00d14f3ae8578138da43eb6e6 /python
parentd6c08414d55eadd8232b693303f2b14bfe121c01 (diff)
downloadvyos-1x-4940bea4f7b8574d30876fd3d0456e75f6f29877.tar.gz
vyos-1x-4940bea4f7b8574d30876fd3d0456e75f6f29877.zip
interfaces: T2362: allow setting multiple 'ipv6 address eui64'
Diffstat (limited to 'python')
-rw-r--r--python/vyos/configdict.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index 71c85b36d..9ea89194f 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -201,15 +201,14 @@ 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)
+ # Get prefixes 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'))
+ vlan['ipv6_eui64_prefix'] = conf.return_values('ipv6 address eui64')
- # Determine currently effective EUI64 address - to determine which
+ # Determine currently effective EUI64 addresses - 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)
+ eff_addr = conf.return_effective_values('ipv6 address eui64')
+ vlan['ipv6_eui64_prefix_remove'] = list_diff(eff_addr, vlan['ipv6_eui64_prefix'])
# add the link-local by default to make IPv6 work
vlan['ipv6_eui64_prefix'].append('fe80::/64')