summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-11-13 21:36:31 +0100
committerChristian Breunig <christian@breunig.cc>2023-11-13 22:19:32 +0100
commitdd13213ae94f071bc30cc17f5fabef02fbf95939 (patch)
treea67a9cab6456b9ced10c3fe84327913e10cc9b41 /interface-definitions
parentbc83fb097719f5c4c803808572f690fbc367b9e5 (diff)
downloadvyos-1x-dd13213ae94f071bc30cc17f5fabef02fbf95939.tar.gz
vyos-1x-dd13213ae94f071bc30cc17f5fabef02fbf95939.zip
pim: T5733: fix CLI level of global PIM commands
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/include/pim/keep-alive-timer.xml.i1
-rw-r--r--interface-definitions/include/policy/prefix-list.xml.i14
-rw-r--r--interface-definitions/protocols-pim.xml.in78
3 files changed, 44 insertions, 49 deletions
diff --git a/interface-definitions/include/pim/keep-alive-timer.xml.i b/interface-definitions/include/pim/keep-alive-timer.xml.i
index 9e71b7a14..0dd27d6e7 100644
--- a/interface-definitions/include/pim/keep-alive-timer.xml.i
+++ b/interface-definitions/include/pim/keep-alive-timer.xml.i
@@ -10,6 +10,5 @@
<validator name="numeric" argument="--range 1-65535"/>
</constraint>
</properties>
- <defaultValue>210</defaultValue>
</leafNode>
<!-- include end -->
diff --git a/interface-definitions/include/policy/prefix-list.xml.i b/interface-definitions/include/policy/prefix-list.xml.i
new file mode 100644
index 000000000..5d7980ee2
--- /dev/null
+++ b/interface-definitions/include/policy/prefix-list.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from policy/prefix-list.xml.i -->
+<leafNode name="prefix-list">
+ <properties>
+ <help>Prefix-list to use</help>
+ <valueHelp>
+ <format>txt</format>
+ <description>Prefix-list to apply (IPv4)</description>
+ </valueHelp>
+ <completionHelp>
+ <path>policy prefix-list</path>
+ </completionHelp>
+ </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/protocols-pim.xml.in b/interface-definitions/protocols-pim.xml.in
index c1fa1b489..bbdb00cae 100644
--- a/interface-definitions/protocols-pim.xml.in
+++ b/interface-definitions/protocols-pim.xml.in
@@ -130,18 +130,14 @@
#include <include/pim/keep-alive-timer.xml.i>
#include <include/pim/packets.xml.i>
#include <include/pim/register-suppress-time.xml.i>
- <leafNode name="register-accept-list">
+ <node name="register-accept-list">
<properties>
<help>Only accept registers from a specific source prefix list</help>
- <valueHelp>
- <format>txt</format>
- <description>Prefix-list to apply</description>
- </valueHelp>
- <completionHelp>
- <path>policy prefix-list</path>
- </completionHelp>
</properties>
- </leafNode>
+ <children>
+ #include <include/policy/prefix-list.xml.i>
+ </children>
+ </node>
<node name="rp">
<properties>
<help>Rendezvous Point</help>
@@ -174,50 +170,36 @@
</leafNode>
</children>
</tagNode>
- <leafNode name="send-v6-secondary">
- <properties>
- <help>Send v6 secondary addresses</help>
- <valueless/>
- </properties>
- </leafNode>
- <node name="spt-switchover">
+ #include <include/pim/keep-alive-timer.xml.i>
+ </children>
+ </node>
+ <leafNode name="no-v6-secondary">
+ <properties>
+ <help>Disable IPv6 secondary address in hello packets</help>
+ <valueless/>
+ </properties>
+ </leafNode>
+ <node name="spt-switchover">
+ <properties>
+ <help>Send v6 secondary addresses</help>
+ </properties>
+ <children>
+ <node name="infinity-and-beyond">
<properties>
- <help>Send v6 secondary addresses</help>
+ <help>Never switch to SPT Tree</help>
</properties>
<children>
- <node name="infinity-and-beyond">
- <properties>
- <help>Never switch to SPT Tree</help>
- </properties>
- <children>
- <leafNode name="prefix-list">
- <properties>
- <help>Prefix-List to control which groups to switch</help>
- <valueHelp>
- <format>txt</format>
- <description>Prefix-list to apply</description>
- </valueHelp>
- <completionHelp>
- <path>policy prefix-list</path>
- </completionHelp>
- </properties>
- </leafNode>
- </children>
- </node>
+ #include <include/policy/prefix-list.xml.i>
</children>
</node>
- <leafNode name="ssm">
- <properties>
- <help>Source-Specific Multicast</help>
- <completionHelp>
- <path>policy prefix-list</path>
- </completionHelp>
- <valueHelp>
- <format>txt</format>
- <description>Prefix-list to apply</description>
- </valueHelp>
- </properties>
- </leafNode>
+ </children>
+ </node>
+ <node name="ssm">
+ <properties>
+ <help>Source-Specific Multicast</help>
+ </properties>
+ <children>
+ #include <include/policy/prefix-list.xml.i>
</children>
</node>
</children>