diff options
| author | hagbard <vyosdev@derith.de> | 2018-11-18 10:51:03 -0800 |
|---|---|---|
| committer | hagbard <vyosdev@derith.de> | 2018-11-18 10:51:03 -0800 |
| commit | 7115030c32f8545e8a2e3f21723952110690d32f (patch) | |
| tree | 3c5807662a9ba0ca3561c33e6396f5bea6e3d102 | |
| parent | 7a615ab169a7f6141fd9b6e84ac1ea415216d9bb (diff) | |
| download | vyos-1x-7115030c32f8545e8a2e3f21723952110690d32f.tar.gz vyos-1x-7115030c32f8545e8a2e3f21723952110690d32f.zip | |
T835: adding default pado delay and mode autocomplete
| -rw-r--r-- | interface-definitions/pppoe-server.xml | 29 | ||||
| -rwxr-xr-x | src/conf_mode/accel_pppoe.py | 1 |
2 files changed, 17 insertions, 13 deletions
diff --git a/interface-definitions/pppoe-server.xml b/interface-definitions/pppoe-server.xml index 510bfeb3b..2fac4ec5a 100644 --- a/interface-definitions/pppoe-server.xml +++ b/interface-definitions/pppoe-server.xml @@ -64,22 +64,25 @@ </tagNode> </children> </node> - <leafNode name="mode"> + <node name="mode"> <properties> <help>Authentication mode for PPPoE Server</help> - <valueHelp> - <format>local</format> - <description>Use local username/password configuration</description> - </valueHelp> - <valueHelp> - <format>radius</format> - <description>Use Radius server to autenticate users</description> - </valueHelp> - <constraint> - <regex>^(local|radius)</regex> - </constraint> </properties> - </leafNode> + <children> + <leafNode name="local"> + <properties> + <help>Use local username/password configuration</help> + <valueless /> + </properties> + </leafNode> + <leafNode name="radius"> + <properties> + <help>Use Radius server to autenticate users</help> + <valueless /> + </properties> + </leafNode> + </children> + </node> <tagNode name="radius-server"> <properties> <help>IP address of radius server</help> diff --git a/src/conf_mode/accel_pppoe.py b/src/conf_mode/accel_pppoe.py index 51a121eaf..0ef22110f 100755 --- a/src/conf_mode/accel_pppoe.py +++ b/src/conf_mode/accel_pppoe.py @@ -223,6 +223,7 @@ interface={{int}} {% if svc_name %} service-name={{svc_name}} {% endif %} +pado-delay=0 # maybe: called-sid, tr101, padi-limit etc. {% if limits %} |