From 5660b07a0b95b685ba46c308a3d1fd0774cfdbfb Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Sun, 26 Jul 2020 14:37:28 -0500
Subject: pppoe-server: T1985: backport Enable ipv6 modules if ipv6 not denied

---
 interface-definitions/pppoe-server.xml | 6 ++++++
 src/conf_mode/accel_pppoe.py           | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/interface-definitions/pppoe-server.xml b/interface-definitions/pppoe-server.xml
index 18b0e649c..4f39d7950 100644
--- a/interface-definitions/pppoe-server.xml
+++ b/interface-definitions/pppoe-server.xml
@@ -519,6 +519,9 @@
                     <format>require</format>
                     <description>Require IPv4 negotiation</description>
                   </valueHelp>
+                  <completionHelp>
+                    <list>deny allow prefer require</list>
+                  </completionHelp>
                 </properties>
               </leafNode>
               <leafNode name="ipv6">
@@ -544,6 +547,9 @@
                     <format>require</format>
                     <description>Require IPv6 negotiation</description>
                   </valueHelp>
+                  <completionHelp>
+                    <list>deny allow prefer require</list>
+                  </completionHelp>
                 </properties>
               </leafNode>
               <leafNode name="ipv6-intf-id">
diff --git a/src/conf_mode/accel_pppoe.py b/src/conf_mode/accel_pppoe.py
index 1c99bf0fc..c8b570a87 100755
--- a/src/conf_mode/accel_pppoe.py
+++ b/src/conf_mode/accel_pppoe.py
@@ -49,7 +49,7 @@ radius
 {% endif %}
 chap-secrets
 ippool
-{% if client_ipv6_pool %}
+{% if ppp_options['ipv6'] != 'deny' %}
 ipv6pool
 {% endif %}
 auth_pap
-- 
cgit v1.2.3