diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-18 12:35:10 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-04-18 14:31:51 +0200 |
| commit | 901d5e89ec6e3fb0f3d13f90f0495a4dda592454 (patch) | |
| tree | 6a18d5bcbfa1fbdf7d83d1ba828a7641ac694af5 /interface-definitions | |
| parent | 3a81e26a23b5e1b372bfa15c63dbc725a2f448ed (diff) | |
| download | vyos-1x-901d5e89ec6e3fb0f3d13f90f0495a4dda592454.tar.gz vyos-1x-901d5e89ec6e3fb0f3d13f90f0495a4dda592454.zip | |
pppoe-server: T2314: migrate IPv6 to common CLI nodes with embeeded validation
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/accel-client-ipv6-pool.xml.in | 59 | ||||
| -rw-r--r-- | interface-definitions/service_pppoe-server.xml.in | 20 | ||||
| -rw-r--r-- | interface-definitions/vpn_l2tp.xml.in | 60 |
3 files changed, 61 insertions, 78 deletions
diff --git a/interface-definitions/include/accel-client-ipv6-pool.xml.in b/interface-definitions/include/accel-client-ipv6-pool.xml.in new file mode 100644 index 000000000..455ada6ef --- /dev/null +++ b/interface-definitions/include/accel-client-ipv6-pool.xml.in @@ -0,0 +1,59 @@ +<node name="client-ipv6-pool"> + <properties> + <help>Pool of client IPv6 addresses</help> + </properties> + <children> + <tagNode name="prefix"> + <properties> + <help>Pool of addresses used to assign to clients</help> + <valueHelp> + <format>ipv6net</format> + <description>IPv6 address and prefix length</description> + </valueHelp> + <constraint> + <validator name="ipv6-prefix"/> + </constraint> + </properties> + <children> + <leafNode name="mask"> + <properties> + <help>Prefix length used for individual client</help> + <valueHelp> + <format><48-128></format> + <description>Client prefix length (default: 64)</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 48-128"/> + </constraint> + </properties> + </leafNode> + </children> + </tagNode> + <tagNode name="delegate"> + <properties> + <help>Subnet used to delegate prefix through DHCPv6-PD (RFC3633)</help> + <valueHelp> + <format>ipv6net</format> + <description>IPv6 address and prefix length</description> + </valueHelp> + <constraint> + <validator name="ipv6-prefix"/> + </constraint> + </properties> + <children> + <leafNode name="delegation-prefix"> + <properties> + <help>Prefix length delegated to client</help> + <valueHelp> + <format><32-64></format> + <description>Delegated prefix length</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 32-64"/> + </constraint> + </properties> + </leafNode> + </children> + </tagNode> + </children> +</node> diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in index 0d7c3568c..e42de4f90 100644 --- a/interface-definitions/service_pppoe-server.xml.in +++ b/interface-definitions/service_pppoe-server.xml.in @@ -248,25 +248,7 @@ </leafNode> </children> </node> - <node name="client-ipv6-pool"> - <properties> - <help>Pool of client IPv6 addresses</help> - </properties> - <children> - <leafNode name="prefix"> - <properties> - <help>Format: ipv6prefix/mask,prefix_len (e.g.: fc00:0:1::/48,64 - divides prefix into /64 subnets for clients)</help> - <multi /> - </properties> - </leafNode> - <leafNode name="delegate-prefix"> - <properties> - <help>Format: ipv6prefix/mask,prefix_len (delegate to clients through DHCPv6 prefix delegation - rfc3633)</help> - <multi /> - </properties> - </leafNode> - </children> - </node> + #include <include/accel-client-ipv6-pool.xml.in> <leafNode name="name-server"> <properties> <help>Domain Name Server (DNS) propagated to client</help> diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in index d4286a810..d92817ca0 100644 --- a/interface-definitions/vpn_l2tp.xml.in +++ b/interface-definitions/vpn_l2tp.xml.in @@ -232,65 +232,7 @@ </leafNode> </children> </node> - <node name="client-ipv6-pool"> - <properties> - <help>Pool of client IPv6 addresses</help> - </properties> - <children> - <tagNode name="prefix"> - <properties> - <help>Pool of addresses used to assign to clients</help> - <valueHelp> - <format>ipv6net</format> - <description>IPv6 address and prefix length</description> - </valueHelp> - <constraint> - <validator name="ipv6-prefix"/> - </constraint> - </properties> - <children> - <leafNode name="mask"> - <properties> - <help>Prefix length used for individual client</help> - <valueHelp> - <format><48-128></format> - <description>Client prefix length (default: 64)</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 48-128"/> - </constraint> - </properties> - </leafNode> - </children> - </tagNode> - <tagNode name="delegate"> - <properties> - <help>Subnet used to delegate prefix through DHCPv6-PD (RFC3633)</help> - <valueHelp> - <format>ipv6net</format> - <description>IPv6 address and prefix length</description> - </valueHelp> - <constraint> - <validator name="ipv6-prefix"/> - </constraint> - </properties> - <children> - <leafNode name="delegation-prefix"> - <properties> - <help>Prefix length delegated to client</help> - <valueHelp> - <format><32-64></format> - <description>Delegated prefix length</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 32-64"/> - </constraint> - </properties> - </leafNode> - </children> - </tagNode> - </children> - </node> + #include <include/accel-client-ipv6-pool.xml.in> <leafNode name="description"> <properties> <help>Description for L2TP remote-access settings</help> |