From 07080afd4015a900fb7474e1c81008f58b478565 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 11 Apr 2020 15:12:52 +0200
Subject: 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.
---
 data/templates/l2tp/l2tp.config.tmpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'data')

diff --git a/data/templates/l2tp/l2tp.config.tmpl b/data/templates/l2tp/l2tp.config.tmpl
index 0dcff1371..ba78cadcd 100644
--- a/data/templates/l2tp/l2tp.config.tmpl
+++ b/data/templates/l2tp/l2tp.config.tmpl
@@ -118,11 +118,11 @@ ipv6=allow
 
 {% if client_ipv6_pool %}
 [ipv6-pool]
-{% for prefix in client_ipv6_pool %}
-{{ prefix }}
+{% for p in client_ipv6_pool %}
+{{ p.prefix }},{{ p.mask }}
 {% endfor %}
-{% for prefix in client_ipv6_delegate_prefix %}
-delegate={{ prefix }}
+{% for p in client_ipv6_delegate_prefix %}
+delegate={{ p.prefix }},{{ p.mask }}
 {% endfor %}
 
 {% endif %}
-- 
cgit v1.2.3