diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-02-13 17:38:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-13 17:38:16 +0100 |
| commit | 5e56daaff4ec53a387abbd3ad879e916a2bfa373 (patch) | |
| tree | 3a9a3d1823e01287c52a38cc67c0b7061bc901ce /interface-definitions | |
| parent | 9c481b00cae8ed1d121c809fb5edc24a937525e9 (diff) | |
| parent | e7e81746e6ad01ce644cd7b584233464f91d9380 (diff) | |
| download | vyos-1x-5e56daaff4ec53a387abbd3ad879e916a2bfa373.tar.gz vyos-1x-5e56daaff4ec53a387abbd3ad879e916a2bfa373.zip | |
Merge pull request #1813 from sever-sever/T4971-eq
T4971: PPPoE server add named ip pool and attr Framed-Pool
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/accel-ppp/client-ip-pool-name.xml.i | 18 | ||||
| -rw-r--r-- | interface-definitions/service_ipoe-server.xml.in | 14 | ||||
| -rw-r--r-- | interface-definitions/service_pppoe-server.xml.in | 1 |
3 files changed, 20 insertions, 13 deletions
diff --git a/interface-definitions/include/accel-ppp/client-ip-pool-name.xml.i b/interface-definitions/include/accel-ppp/client-ip-pool-name.xml.i new file mode 100644 index 000000000..654b6727e --- /dev/null +++ b/interface-definitions/include/accel-ppp/client-ip-pool-name.xml.i @@ -0,0 +1,18 @@ +<!-- include start from accel-ppp/client-ip-pool-name.xml.i --> +<tagNode name="name"> + <properties> + <help>Pool name</help> + <valueHelp> + <format>txt</format> + <description>Name of IP pool</description> + </valueHelp> + <constraint> + <regex>[-_a-zA-Z0-9.]+</regex> + </constraint> + </properties> + <children> + #include <include/accel-ppp/gateway-address.xml.i> + #include <include/accel-ppp/client-ip-pool-subnet-single.xml.i> + </children> +</tagNode> +<!-- include end --> diff --git a/interface-definitions/service_ipoe-server.xml.in b/interface-definitions/service_ipoe-server.xml.in index b9279793c..d81ec99f9 100644 --- a/interface-definitions/service_ipoe-server.xml.in +++ b/interface-definitions/service_ipoe-server.xml.in @@ -117,19 +117,7 @@ <help>Client IP pools and gateway setting</help> </properties> <children> - <tagNode name="name"> - <properties> - <help>Pool name</help> - <constraint> - <regex>[-_a-zA-Z0-9]+</regex> - </constraint> - <constraintErrorMessage>Client IP pool is limited to alphanumerical characters and can contain hyphen and underscores</constraintErrorMessage> - </properties> - <children> - #include <include/accel-ppp/gateway-address.xml.i> - #include <include/accel-ppp/client-ip-pool-subnet-single.xml.i> - </children> - </tagNode> + #include <include/accel-ppp/client-ip-pool-name.xml.i> </children> </node> #include <include/accel-ppp/client-ipv6-pool.xml.i> diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in index 25ab6f9a0..65868226b 100644 --- a/interface-definitions/service_pppoe-server.xml.in +++ b/interface-definitions/service_pppoe-server.xml.in @@ -56,6 +56,7 @@ <children> #include <include/accel-ppp/client-ip-pool-start-stop.xml.i> #include <include/accel-ppp/client-ip-pool-subnet.xml.i> + #include <include/accel-ppp/client-ip-pool-name.xml.i> </children> </node> #include <include/accel-ppp/client-ipv6-pool.xml.i> |