summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-12-08 09:11:35 +0100
committerChristian Breunig <christian@breunig.cc>2024-12-16 22:24:50 +0100
commit13baad691410009d1e5f7e6f6bf5afe72afd2f73 (patch)
tree90cdf1e9e95debfb0717122b23b8cfaaffa19487 /interface-definitions
parent3c79477adf3cd4f4efb302b58542ddd668b562ac (diff)
downloadvyos-1x-13baad691410009d1e5f7e6f6bf5afe72afd2f73.tar.gz
vyos-1x-13baad691410009d1e5f7e6f6bf5afe72afd2f73.zip
multicast: T6746: flatten CLI by merging "multicast route" to "mroute" CLI tagNode
This will save an entire level for the configuration and there is no need for a parent "multicast" node, as it will only have "route" as tagNode below. Move set protocols static multicast route <x.x.x.x/y> to: * set protocols static mroute <x.x.x.x/y>
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/protocols_static.xml.in79
1 files changed, 36 insertions, 43 deletions
diff --git a/interface-definitions/protocols_static.xml.in b/interface-definitions/protocols_static.xml.in
index 407e56553..d8e0ee56b 100644
--- a/interface-definitions/protocols_static.xml.in
+++ b/interface-definitions/protocols_static.xml.in
@@ -11,62 +11,55 @@
<priority>480</priority>
</properties>
<children>
- <node name="multicast">
+ <tagNode name="mroute">
<properties>
- <help>Multicast static route</help>
+ <help>Static IPv4 route for Multicast RIB</help>
+ <valueHelp>
+ <format>ipv4net</format>
+ <description>Network</description>
+ </valueHelp>
+ <constraint>
+ <validator name="ipv4-prefix"/>
+ </constraint>
</properties>
<children>
- <tagNode name="route">
+ <tagNode name="next-hop">
+ <properties>
+ <help>Next-hop IPv4 router address</help>
+ <valueHelp>
+ <format>ipv4</format>
+ <description>Next-hop router address</description>
+ </valueHelp>
+ <constraint>
+ <validator name="ipv4-address"/>
+ </constraint>
+ </properties>
+ <children>
+ #include <include/generic-disable-node.xml.i>
+ #include <include/static/static-route-distance.xml.i>
+ </children>
+ </tagNode>
+ <tagNode name="interface">
<properties>
- <help>Configure static unicast route into MRIB for multicast RPF lookup</help>
+ <help>Next-hop IPv4 router interface</help>
+ <completionHelp>
+ <script>${vyos_completion_dir}/list_interfaces</script>
+ </completionHelp>
<valueHelp>
- <format>ipv4net</format>
- <description>Network</description>
+ <format>txt</format>
+ <description>Gateway interface name</description>
</valueHelp>
<constraint>
- <validator name="ip-prefix"/>
+ #include <include/constraint/interface-name.xml.i>
</constraint>
</properties>
<children>
- <tagNode name="next-hop">
- <properties>
- <help>Next-hop IPv4 router address</help>
- <valueHelp>
- <format>ipv4</format>
- <description>Next-hop router address</description>
- </valueHelp>
- <constraint>
- <validator name="ipv4-address"/>
- </constraint>
- </properties>
- <children>
- #include <include/generic-disable-node.xml.i>
- #include <include/static/static-route-distance.xml.i>
- </children>
- </tagNode>
- <tagNode name="interface">
- <properties>
- <help>Next-hop IPv4 router interface</help>
- <completionHelp>
- <script>${vyos_completion_dir}/list_interfaces</script>
- </completionHelp>
- <valueHelp>
- <format>txt</format>
- <description>Gateway interface name</description>
- </valueHelp>
- <constraint>
- #include <include/constraint/interface-name.xml.i>
- </constraint>
- </properties>
- <children>
- #include <include/generic-disable-node.xml.i>
- #include <include/static/static-route-distance.xml.i>
- </children>
- </tagNode>
+ #include <include/generic-disable-node.xml.i>
+ #include <include/static/static-route-distance.xml.i>
</children>
</tagNode>
</children>
- </node>
+ </tagNode>
#include <include/route-map.xml.i>
#include <include/static/static-route.xml.i>
#include <include/static/static-route6.xml.i>