diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-02-09 07:10:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-09 07:10:44 +0100 |
| commit | 707688894c1a02953b62eadb318b0ee398c799dd (patch) | |
| tree | f6d1cd575a2533ec9e890ed0ad48740a38f9bf88 /interface-definitions | |
| parent | cd78fe90771147f31fef252dc9b4f4061f325930 (diff) | |
| parent | b721c5a65e8ff2d29f0fdbf9a84a43e6c816ae49 (diff) | |
| download | vyos-1x-707688894c1a02953b62eadb318b0ee398c799dd.tar.gz vyos-1x-707688894c1a02953b62eadb318b0ee398c799dd.zip | |
Merge pull request #1803 from sever-sever/T4971
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 | 17 | ||||
| -rw-r--r-- | interface-definitions/service-pppoe-server.xml.in | 1 |
3 files changed, 20 insertions, 16 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 d778f9de0..ca4929249 100644 --- a/interface-definitions/service-ipoe-server.xml.in +++ b/interface-definitions/service-ipoe-server.xml.in @@ -108,22 +108,7 @@ <help>Client IP pools and gateway setting</help> </properties> <children> - <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 <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 db8522287..47f60d27d 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> |