diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-02-05 23:10:59 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-02-05 23:10:59 +0100 |
| commit | d7a84dc144951f698ae17111ed50d6dbd2f65fe7 (patch) | |
| tree | 3d1998a19ed20625d14335e817e55808c7ee3bf0 /interface-definitions/protocols-static.xml.in | |
| parent | f55fe07dc1894e22eda522d65cb4b1364da16c38 (diff) | |
| parent | 96d51fa69fbe072fe5c9e8efd4fa6a89d8a2771a (diff) | |
| download | vyos-1x-d7a84dc144951f698ae17111ed50d6dbd2f65fe7.tar.gz vyos-1x-d7a84dc144951f698ae17111ed50d6dbd2f65fe7.zip | |
Merge branch 't2450-vrf' of github.com:c-po/vyos-1x into current
* 't2450-vrf' of github.com:c-po/vyos-1x:
xml: add new common "interface-name" validator
xml: include: accel: add missing file include comments
smoketest: static: improve static route testing
route: static: T2450: provide full protocol support in XML and Python with new CLI
vrf: T2450: provide full protocol support in XML and Python with new CLI
migrator: ospf: T3267: cleanup empty interface "ip" nodes
Diffstat (limited to 'interface-definitions/protocols-static.xml.in')
| -rw-r--r-- | interface-definitions/protocols-static.xml.in | 341 |
1 files changed, 6 insertions, 335 deletions
diff --git a/interface-definitions/protocols-static.xml.in b/interface-definitions/protocols-static.xml.in index 2a9f7014f..59a7927a5 100644 --- a/interface-definitions/protocols-static.xml.in +++ b/interface-definitions/protocols-static.xml.in @@ -1,193 +1,15 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Protocol STATIC configuration --> +<?xml version="1.0"?> <interfaceDefinition> <node name="protocols"> <children> - <node name="nstatic" owner="${vyos_conf_scripts_dir}/protocols_static.py"> + <node name="static" owner="${vyos_conf_scripts_dir}/protocols_static.py"> <properties> <help>Static route parameters</help> </properties> <children> - <tagNode name="interface-route"> - <properties> - <help>Interface based static route</help> - <valueHelp> - <format>ipv4net</format> - <description>Interface based static route</description> - </valueHelp> - <constraint> - <validator name="ipv4-prefix"/> - </constraint> - </properties> - <children> - <tagNode name="next-hop-interface"> - <properties> - <help>Next-hop interface [REQUIRED]</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py</script> - </completionHelp> - </properties> - <children> - #include <include/static-route-disable.xml.i> - #include <include/static-route-distance.xml.i> - #include <include/static-route-next-hop-vrf.xml.i> - </children> - </tagNode> - </children> - </tagNode> - <tagNode name="interface-route6"> - <properties> - <help>Interface based IPv6 static route</help> - <valueHelp> - <format>ipv6net</format> - <description>Interface based IPv6 static route</description> - </valueHelp> - <constraint> - <validator name="ipv6-prefix"/> - </constraint> - </properties> - <children> - <tagNode name="next-hop-interface"> - <properties> - <help>Next-hop interface [REQUIRED]</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py</script> - </completionHelp> - </properties> - <children> - #include <include/static-route-disable.xml.i> - #include <include/static-route-distance.xml.i> - </children> - </tagNode> - </children> - </tagNode> #include <include/static-route-map.xml.i> - <tagNode name="route"> - <properties> - <help>Static route</help> - <valueHelp> - <format>ipv4net</format> - <description>Static route</description> - </valueHelp> - <constraint> - <validator name="ipv4-prefix"/> - </constraint> - </properties> - <children> - <node name="blackhole"> - <properties> - <help>Silently discard pkts when matched</help> - </properties> - <children> - #include <include/static-route-distance.xml.i> - <leafNode name="tag"> - <properties> - <help>Tag value for this route</help> - <valueHelp> - <format>u32:1-4294967295</format> - <description>Tag value for this route</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-4294967295"/> - </constraint> - </properties> - </leafNode> - </children> - </node> - <leafNode name="dhcp-interface"> - <properties> - <help>DHCP interface that supplies the next-hop IP address for this static route</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py</script> - </completionHelp> - <valueHelp> - <format>txt</format> - <description>DHCP interface</description> - </valueHelp> - </properties> - </leafNode> - <tagNode name="next-hop"> - <properties> - <help>Next-hop router</help> - <valueHelp> - <format>ipv4</format> - <description>Next-hop router</description> - </valueHelp> - <constraint> - <validator name="ipv4-address"/> - </constraint> - </properties> - <children> - #include <include/static-route-disable.xml.i> - #include <include/static-route-distance.xml.i> - <leafNode name="next-hop-interface"> - <properties> - <help>IPv4 gateway interface name</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py</script> - </completionHelp> - <valueHelp> - <format>txt</format> - <description>IPv4 gateway interface name</description> - </valueHelp> - </properties> - </leafNode> - #include <include/static-route-next-hop-vrf.xml.i> - </children> - </tagNode> - </children> - </tagNode> - <tagNode name="route6"> - <properties> - <help>Static IPv6 route</help> - <valueHelp> - <format>ipv6net</format> - <description>Static IPv6 route</description> - </valueHelp> - <constraint> - <validator name="ipv6-prefix"/> - </constraint> - </properties> - <children> - <node name="blackhole"> - <properties> - <help>Silently discard pkts when matched</help> - </properties> - <children> - #include <include/static-route-distance.xml.i> - </children> - </node> - <tagNode name="next-hop"> - <properties> - <help>Next-hop IPv6 router [REQUIRED]</help> - <valueHelp> - <format>ipv6</format> - <description>Next-hop IPv6 router [REQUIRED]</description> - </valueHelp> - <constraint> - <validator name="ipv6-address"/> - </constraint> - </properties> - <children> - #include <include/static-route-disable.xml.i> - #include <include/static-route-distance.xml.i> - <leafNode name="interface"> - <properties> - <help>IPv6 gateway interface name</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py</script> - </completionHelp> - <valueHelp> - <format>txt</format> - <description>IPv6 gateway interface name</description> - </valueHelp> - </properties> - </leafNode> - #include <include/static-route-next-hop-vrf.xml.i> - </children> - </tagNode> - </children> - </tagNode> + #include <include/static-route.xml.i> + #include <include/static-route6.xml.i> <tagNode name="table"> <properties> <help>Policy route table number</help> @@ -200,159 +22,8 @@ </constraint> </properties> <children> - <tagNode name="interface-route"> - <properties> - <help>Interface based static route</help> - <valueHelp> - <format>ipv4net</format> - <description>Interface based static route</description> - </valueHelp> - <constraint> - <validator name="ipv4-prefix"/> - </constraint> - </properties> - <children> - <tagNode name="next-hop-interface"> - <properties> - <help>Next-hop interface [REQUIRED]</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py</script> - </completionHelp> - </properties> - <children> - #include <include/static-route-disable.xml.i> - #include <include/static-route-distance.xml.i> - </children> - </tagNode> - </children> - </tagNode> - <tagNode name="interface-route6"> - <properties> - <help>Interface based IPv6 static route</help> - <valueHelp> - <format>ipv6net</format> - <description>Interface based IPv6 static route</description> - </valueHelp> - <constraint> - <validator name="ipv6-prefix"/> - </constraint> - </properties> - <children> - <tagNode name="next-hop-interface"> - <properties> - <help>Next-hop interface [REQUIRED]</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py</script> - </completionHelp> - </properties> - <children> - #include <include/static-route-disable.xml.i> - #include <include/static-route-distance.xml.i> - </children> - </tagNode> - </children> - </tagNode> - <tagNode name="route"> - <properties> - <help>Static route</help> - <valueHelp> - <format>ipv4net</format> - <description>Static route</description> - </valueHelp> - <constraint> - <validator name="ipv4-prefix"/> - </constraint> - </properties> - <children> - <node name="blackhole"> - <properties> - <help>Silently discard pkts when matched</help> - </properties> - <children> - #include <include/static-route-distance.xml.i> - </children> - </node> - <leafNode name="dhcp-interface"> - <properties> - <help>DHCP interface that supplies the next-hop IP address for this static route</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py</script> - </completionHelp> - <valueHelp> - <format>txt</format> - <description>DHCP interface</description> - </valueHelp> - </properties> - </leafNode> - <tagNode name="next-hop"> - <properties> - <help>Next-hop router</help> - <valueHelp> - <format>ipv4</format> - <description>Next-hop router</description> - </valueHelp> - <constraint> - <validator name="ipv4-address"/> - </constraint> - </properties> - <children> - #include <include/static-route-disable.xml.i> - #include <include/static-route-distance.xml.i> - <leafNode name="next-hop-interface"> - <properties> - <help>IPv4 gateway interface name</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py</script> - </completionHelp> - <valueHelp> - <format>txt</format> - <description>IPv4 gateway interface name</description> - </valueHelp> - </properties> - </leafNode> - #include <include/static-route-next-hop-vrf.xml.i> - </children> - </tagNode> - </children> - </tagNode> - <tagNode name="route6"> - <properties> - <help>Static IPv6 route</help> - <valueHelp> - <format>ipv6net</format> - <description>Static IPv6 route</description> - </valueHelp> - <constraint> - <validator name="ipv6-prefix"/> - </constraint> - </properties> - <children> - <node name="blackhole"> - <properties> - <help>Silently discard pkts when matched</help> - </properties> - <children> - #include <include/static-route-distance.xml.i> - </children> - </node> - <tagNode name="next-hop"> - <properties> - <help>Next-hop IPv6 router [REQUIRED]</help> - <valueHelp> - <format>ipv6</format> - <description>Next-hop IPv6 router [REQUIRED]</description> - </valueHelp> - <constraint> - <validator name="ipv6-address"/> - </constraint> - </properties> - <children> - #include <include/static-route-disable.xml.i> - #include <include/static-route-distance.xml.i> - </children> - </tagNode> - </children> - </tagNode> + #include <include/static-route.xml.i> + #include <include/static-route6.xml.i> </children> </tagNode> </children> |