From 9e619702c40763cd9892f2e8ca3d75ae2969ebdb Mon Sep 17 00:00:00 2001
From: DmitriyEshenko <dmitriy.eshenko@vyos.io>
Date: Fri, 24 Jan 2020 18:22:26 +0000
Subject: pppoe-server: T1985: Enable ipv6 modules if ipv6 not denied

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

diff --git a/interface-definitions/service-pppoe.xml.in b/interface-definitions/service-pppoe.xml.in
index bf6023a82..7f93a6e2f 100644
--- a/interface-definitions/service-pppoe.xml.in
+++ b/interface-definitions/service-pppoe.xml.in
@@ -560,6 +560,9 @@
                     <format>require</format>
                     <description>Require IPv4 negotiation</description>
                   </valueHelp>
+                  <completionHelp>
+                    <list>deny allow prefer require</list>
+                  </completionHelp>
                 </properties>
               </leafNode>
               <leafNode name="ipv6">
@@ -585,6 +588,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/service-pppoe.py b/src/conf_mode/service-pppoe.py
index b4a22b1cd..4090cb953 100755
--- a/src/conf_mode/service-pppoe.py
+++ b/src/conf_mode/service-pppoe.py
@@ -49,7 +49,7 @@ pppoe
 radius
 {% endif %}
 ippool
-{% if client_ipv6_pool %}
+{% if ppp_options['ipv6'] != 'deny' %}
 ipv6pool
 ipv6_nd
 ipv6_dhcp
-- 
cgit v1.2.3