diff options
| author | Jernej Jakob <jernej.jakob@gmail.com> | 2020-04-22 12:39:22 +0200 |
|---|---|---|
| committer | Jernej Jakob <jernej.jakob@gmail.com> | 2020-04-23 16:09:37 +0200 |
| commit | 4940bea4f7b8574d30876fd3d0456e75f6f29877 (patch) | |
| tree | e422582794edcdc00d14f3ae8578138da43eb6e6 /src/conf_mode/interfaces-bridge.py | |
| parent | d6c08414d55eadd8232b693303f2b14bfe121c01 (diff) | |
| download | vyos-1x-4940bea4f7b8574d30876fd3d0456e75f6f29877.tar.gz vyos-1x-4940bea4f7b8574d30876fd3d0456e75f6f29877.zip | |
interfaces: T2362: allow setting multiple 'ipv6 address eui64'
Diffstat (limited to 'src/conf_mode/interfaces-bridge.py')
| -rwxr-xr-x | src/conf_mode/interfaces-bridge.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py index 2ad5ecf2b..d4470ef26 100755 --- a/src/conf_mode/interfaces-bridge.py +++ b/src/conf_mode/interfaces-bridge.py @@ -161,15 +161,14 @@ def get_config(): if conf.exists('ipv6 address autoconf'): bridge['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'): - bridge['ipv6_eui64_prefix'].append(conf.return_value('ipv6 address eui64')) + bridge['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 bridge['ipv6_eui64_prefix']: - bridge['ipv6_eui64_prefix_remove'].append(eff_addr) + eff_addr = conf.return_effective_values('ipv6 address eui64') + bridge['ipv6_eui64_prefix_remove'] = list_diff(eff_addr, bridge['ipv6_eui64_prefix']) # add the link-local by default to make IPv6 work bridge['ipv6_eui64_prefix'].append('fe80::/64') |