diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-02-23 12:26:34 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-02-23 14:36:56 +0100 |
| commit | 3d0162557f9c2217d4a925e6c893863b1af55e58 (patch) | |
| tree | b204c47d4450161654a6d75e6f203097ed82e54f /interface-definitions | |
| parent | 07273632fcf59d04be988f2c43fe53e7bec8d46a (diff) | |
| download | vyos-1x-3d0162557f9c2217d4a925e6c893863b1af55e58.tar.gz vyos-1x-3d0162557f9c2217d4a925e6c893863b1af55e58.zip | |
pppoe: T1318: migrate user-id and password nodes under an authentication node
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/interfaces-pppoe.xml.in | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in index 8bae0e490..933d9edf1 100644 --- a/interface-definitions/interfaces-pppoe.xml.in +++ b/interface-definitions/interfaces-pppoe.xml.in @@ -26,6 +26,23 @@ <constraintErrorMessage>Access concentrator name must be composed of uppper and lower case letters or numbers only</constraintErrorMessage> </properties> </leafNode> + <node name="authentication"> + <properties> + <help>Authentication settings</help> + </properties> + <children> + <leafNode name="user"> + <properties> + <help>User name</help> + </properties> + </leafNode> + <leafNode name="password"> + <properties> + <help>Password</help> + </properties> + </leafNode> + </children> + </node> <leafNode name="connect-on-demand"> <properties> <help>Automatic establishment of PPPOE connection when traffic is sent</help> @@ -143,11 +160,6 @@ <constraintErrorMessage>Must be either 'auto' or 'none'</constraintErrorMessage> </properties> </leafNode> - <leafNode name="password"> - <properties> - <help>Password for authenticating local machine to PPPoE server</help> - </properties> - </leafNode> <leafNode name="remote-address"> <properties> <help>IPv4 address of remote end of the PPPoE link</help> @@ -169,11 +181,6 @@ <constraintErrorMessage>Service name must be composed of uppper and lower case letters or numbers only</constraintErrorMessage> </properties> </leafNode> - <leafNode name="user-id"> - <properties> - <help>Authentication name supplied to PPPoE server</help> - </properties> - </leafNode> </children> </tagNode> </children> |