summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-05-25 21:02:35 +0200
committerChristian Poessinger <christian@poessinger.com>2020-05-26 17:09:33 +0200
commitd5b58517f88358c686e6c8ea039a7a9a64d6c6ee (patch)
tree416632fd648499c40b8f4b8975c1da568af5401f /data
parent0cdfa72d5ccd8a2d382164a1ec39865802d1be7c (diff)
downloadvyos-1x-d5b58517f88358c686e6c8ea039a7a9a64d6c6ee.tar.gz
vyos-1x-d5b58517f88358c686e6c8ea039a7a9a64d6c6ee.zip
dhcpv6-pd: pppoe: T2506: restructure CLI
Rename the CLI nodes for prefix delegation from "dhcpv6-options delegate <interface>" to "dhcpv6-options prefix-delegation interface <interface>". The change is required to add the possibility to request for specific prefix sized via the CLI. That option was not possible with the old configuration tree.
Diffstat (limited to 'data')
-rw-r--r--data/templates/dhcp-client/ipv6.tmpl6
-rw-r--r--data/templates/pppoe/ip-down.script.tmpl2
-rw-r--r--data/templates/pppoe/ipv6-up.script.tmpl2
3 files changed, 5 insertions, 5 deletions
diff --git a/data/templates/dhcp-client/ipv6.tmpl b/data/templates/dhcp-client/ipv6.tmpl
index 6cfe24d3e..8957516e2 100644
--- a/data/templates/dhcp-client/ipv6.tmpl
+++ b/data/templates/dhcp-client/ipv6.tmpl
@@ -10,7 +10,7 @@ interface {{ ifname }} {
{% if not dhcpv6_temporary %}
send ia-na 1; # non-temporary address
{% endif %}
-{% if dhcpv6_pd %}
+{% if dhcpv6_pd_interfaces %}
send ia-pd 2; # prefix delegation
{% endif %}
};
@@ -21,9 +21,9 @@ id-assoc na 1 {
};
{% endif %}
-{% if dhcpv6_pd %}
+{% if dhcpv6_pd_interfaces %}
id-assoc pd 2 {
-{% for intf in dhcpv6_pd %}
+{% for intf in dhcpv6_pd_interfaces %}
prefix-interface {{ intf.ifname }} {
{% if intf.sla_id %}
sla-id {{ intf.sla_id }};
diff --git a/data/templates/pppoe/ip-down.script.tmpl b/data/templates/pppoe/ip-down.script.tmpl
index fe8fd7584..c4e11b6b4 100644
--- a/data/templates/pppoe/ip-down.script.tmpl
+++ b/data/templates/pppoe/ip-down.script.tmpl
@@ -27,7 +27,7 @@ fi
vtysh -c "conf t" ${VRF_NAME} -c "no ip route 0.0.0.0/0 {{ intf }} ${VRF_NAME}"
{% endif %}
-{% if dhcpv6_pd %}
+{% if dhcpv6_pd_interfaces %}
# Start wide dhcpv6 client
systemctl stop dhcp6c@{{ intf }}.service
{% endif %}
diff --git a/data/templates/pppoe/ipv6-up.script.tmpl b/data/templates/pppoe/ipv6-up.script.tmpl
index 90873229a..e795d5b0c 100644
--- a/data/templates/pppoe/ipv6-up.script.tmpl
+++ b/data/templates/pppoe/ipv6-up.script.tmpl
@@ -40,7 +40,7 @@ echo 2 > /proc/sys/net/ipv6/conf/{{ intf }}/accept_ra
echo 1 > /proc/sys/net/ipv6/conf/{{ intf }}/autoconfigure
{% endif %}
-{% if dhcpv6_pd %}
+{% if dhcpv6_pd_interfaces %}
# Start wide dhcpv6 client
systemctl start dhcp6c@{{ intf }}.service
{% endif %}