vpn: l2tp: T2264: migrate IPv6 prefix node to common CLI style

Combining multiple options into a single CLI node is considered bad practice.
IPv6 prefixes consited of the prefix itself and a mask send to the client in
one node only.

The following CLI parts have been migrated from

  client-ipv6-pool {
    delegate-prefix fc00:0:1::/48,64
    prefix 2001:db8::/64,64
  }

to

  client-ipv6-pool {
    delegate fc00:0:1::/48 {
      delegation-prefix 48
    }
    prefix 2001:db8::/48 {
      mask 64
    }
  }

Thus regular validation steps from the VyOS CLI can be used when a prefix is
configured.

1 files changed, 26 insertions, 4 deletions

diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py
index 08654e2ff..7cfb4e74e 100755
--- a/src/conf_mode/vpn_l2tp.py
+++ b/src/conf_mode/vpn_l2tp.py
@@ -232,12 +232,30 @@ def get_config():
         l2tp['client_ip_subnets'] = conf.return_values(['client-ip-pool', 'subnet'])
 
     if conf.exists(['client-ipv6-pool', 'prefix']):
-        l2tp['client_ipv6_pool'] = conf.return_values(['client-ipv6-pool', 'prefix'])
         l2tp['ip6_column'].append('ip6')
+        for prefix in conf.list_nodes(['client-ipv6-pool', 'prefix']):
+            tmp = {
+                'prefix': prefix,
+                'mask': '64'
+            }
+
+            if conf.exists(['client-ipv6-pool', 'prefix', prefix, 'mask']):
+                tmp['mask'] = conf.return_value(['client-ipv6-pool', 'prefix', prefix, 'mask'])
 
-    if conf.exists(['client-ipv6-pool', 'delegate-prefix']):
-        l2tp['client_ipv6_delegate_prefix'] = conf.return_values(['client-ipv6-pool', 'delegate-prefix'])
-        l2tp['ip6_column'].append('ip6-dp')
+            l2tp['client_ipv6_pool'].append(tmp)
+
+    if conf.exists(['client-ipv6-pool', 'delegate']):
+        l2tp['ip6_column'].append('ip6-db')
+        for prefix in conf.list_nodes(['client-ipv6-pool', 'delegate']):
+            tmp = {
+                'prefix': prefix,
+                'mask': ''
+            }
+
+            if conf.exists(['client-ipv6-pool', 'delegate', prefix, 'mask']):
+                tmp['mask'] = conf.return_value(['client-ipv6-pool', 'delegate', prefix, 'delegation-prefix'])
+
+            l2tp['client_ipv6_delegate_prefix'].append(tmp)
 
     if conf.exists(['mtu']):
         l2tp['mtu'] = conf.return_value(['mtu'])
@@ -306,6 +324,10 @@ def verify(l2tp):
     if l2tp['client_ipv6_delegate_prefix'] and not l2tp['client_ipv6_pool']:
         raise ConfigError('IPv6 prefix delegation requires client-ipv6-pool prefix')
 
+    for prefix in l2tp['client_ipv6_delegate_prefix']:
+        if not prefix['mask']:
+            raise ConfigError('Delegation-prefix required for individual delegated networks')
+
     if len(l2tp['wins']) > 2:
         raise ConfigError('Not more then two IPv4 WINS name-servers can be configured')