From ba0509379c5ca47e4a78fef920d14a52a46b8e82 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 2 Oct 2020 17:42:29 +0200
Subject: acces-ppp: T2953: drop redundant CLI definitions

---
 interface-definitions/include/accel-ppp-mppe.xml.i | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 interface-definitions/include/accel-ppp-mppe.xml.i

(limited to 'interface-definitions/include/accel-ppp-mppe.xml.i')

diff --git a/interface-definitions/include/accel-ppp-mppe.xml.i b/interface-definitions/include/accel-ppp-mppe.xml.i
new file mode 100644
index 000000000..089d8e2c1
--- /dev/null
+++ b/interface-definitions/include/accel-ppp-mppe.xml.i
@@ -0,0 +1,25 @@
+<!-- included start from accel-ppp-mppe.xml.i -->
+<leafNode name="mppe">
+  <properties>
+    <help>Specifies mppe negotiation preferences</help>
+    <completionHelp>
+      <list>require prefer deny</list>
+    </completionHelp>
+    <constraint>
+      <regex>(^require|prefer|deny)</regex>
+    </constraint>
+    <valueHelp>
+      <format>require</format>
+      <description>send mppe request, if client rejects, drop the connection</description>
+    </valueHelp>
+    <valueHelp>
+      <format>prefer</format>
+      <description>send mppe request, if client rejects continue</description>
+    </valueHelp>
+    <valueHelp>
+      <format>deny</format>
+      <description>drop all mppe</description>
+    </valueHelp>
+  </properties>
+</leafNode>
+<!-- included end -->
-- 
cgit v1.2.3


From 7e8b1299e6e1ae68e1181d3ece29a68fe8b56f37 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 3 Oct 2020 10:08:01 +0200
Subject: accel-ppp: T2953: fix missing defaultValue on mppe

Commit ba050937 ("accel-ppp: T2953: drop redundant CLI definitions ") dropped
the defaultValue of 'prefer' for MPPE making the smoketests fail. This has been
corrected.
---
 interface-definitions/include/accel-ppp-mppe.xml.i | 7 ++++---
 src/conf_mode/service_pppoe-server.py              | 2 --
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'interface-definitions/include/accel-ppp-mppe.xml.i')

diff --git a/interface-definitions/include/accel-ppp-mppe.xml.i b/interface-definitions/include/accel-ppp-mppe.xml.i
index 089d8e2c1..b7f9cfd92 100644
--- a/interface-definitions/include/accel-ppp-mppe.xml.i
+++ b/interface-definitions/include/accel-ppp-mppe.xml.i
@@ -5,9 +5,6 @@
     <completionHelp>
       <list>require prefer deny</list>
     </completionHelp>
-    <constraint>
-      <regex>(^require|prefer|deny)</regex>
-    </constraint>
     <valueHelp>
       <format>require</format>
       <description>send mppe request, if client rejects, drop the connection</description>
@@ -20,6 +17,10 @@
       <format>deny</format>
       <description>drop all mppe</description>
     </valueHelp>
+    <constraint>
+      <regex>^(require|prefer|deny)$</regex>
+    </constraint>
   </properties>
+  <defaultValue>prefer</defaultValue>
 </leafNode>
 <!-- included end -->
diff --git a/src/conf_mode/service_pppoe-server.py b/src/conf_mode/service_pppoe-server.py
index fb2cd5a26..f92569c20 100755
--- a/src/conf_mode/service_pppoe-server.py
+++ b/src/conf_mode/service_pppoe-server.py
@@ -100,8 +100,6 @@ def get_config(config=None):
             pppoe['authentication']['local_users']['username'][username] = dict_merge(
                 default_values, pppoe['authentication']['local_users']['username'][username])
 
-    import pprint
-    pprint.pprint(pppoe)
     return pppoe
 
 
-- 
cgit v1.2.3