From ce21078a983552db3f36ee95ca6bc55dd15fa170 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 13 Nov 2023 21:36:31 +0100
Subject: pim: T5733: fix CLI level of global PIM commands

(cherry picked from commit dd13213ae94f071bc30cc17f5fabef02fbf95939)
---
 .../include/pim/keep-alive-timer.xml.i             |  1 -
 .../include/policy/prefix-list.xml.i               | 14 ++++
 interface-definitions/protocols-pim.xml.in         | 78 +++++++++-------------
 3 files changed, 44 insertions(+), 49 deletions(-)
 create mode 100644 interface-definitions/include/policy/prefix-list.xml.i

(limited to 'interface-definitions')

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>
-- 
cgit v1.2.3