diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-10-03 10:08:01 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-10-03 10:09:15 +0200 |
| commit | 7e8b1299e6e1ae68e1181d3ece29a68fe8b56f37 (patch) | |
| tree | 96f4044fb1eb34c9a1c15139f1d24cdfe524eb21 | |
| parent | 858143739cece6eee0cf13a6a3e1fcffa70928bb (diff) | |
| download | vyos-1x-7e8b1299e6e1ae68e1181d3ece29a68fe8b56f37.tar.gz vyos-1x-7e8b1299e6e1ae68e1181d3ece29a68fe8b56f37.zip | |
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.
| -rw-r--r-- | interface-definitions/include/accel-ppp-mppe.xml.i | 7 | ||||
| -rwxr-xr-x | src/conf_mode/service_pppoe-server.py | 2 |
2 files changed, 4 insertions, 5 deletions
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 |