From b8bd0a1739c4fa1c1c965628eab4f4a65b31f25f Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 13 Nov 2023 09:14:38 +0100
Subject: pim: T5733: split out XML definitions to be re-used by pim6

(cherry picked from commit c5e2c25f8968c0f06a9e4e992decc46a4f690868)
---
 interface-definitions/include/pim/bsm.xml.i        |  14 ++
 .../include/pim/dr-priority.xml.i                  |  14 ++
 interface-definitions/include/pim/hello.xml.i      |  14 ++
 .../include/pim/join-prune-interval.xml.i          |  15 ++
 .../include/pim/keep-alive-timer.xml.i             |  15 ++
 interface-definitions/include/pim/packets.xml.i    |  15 ++
 interface-definitions/include/pim/passive.xml.i    |   8 ++
 .../include/pim/register-suppress-time.xml.i       |  14 ++
 interface-definitions/protocols-pim.xml.in         | 156 +++++----------------
 9 files changed, 146 insertions(+), 119 deletions(-)
 create mode 100644 interface-definitions/include/pim/bsm.xml.i
 create mode 100644 interface-definitions/include/pim/dr-priority.xml.i
 create mode 100644 interface-definitions/include/pim/hello.xml.i
 create mode 100644 interface-definitions/include/pim/join-prune-interval.xml.i
 create mode 100644 interface-definitions/include/pim/keep-alive-timer.xml.i
 create mode 100644 interface-definitions/include/pim/packets.xml.i
 create mode 100644 interface-definitions/include/pim/passive.xml.i
 create mode 100644 interface-definitions/include/pim/register-suppress-time.xml.i

diff --git a/interface-definitions/include/pim/bsm.xml.i b/interface-definitions/include/pim/bsm.xml.i
new file mode 100644
index 000000000..cc2cf14ca
--- /dev/null
+++ b/interface-definitions/include/pim/bsm.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from pim/bsm.xml.i -->
+<leafNode name="no-bsm">
+  <properties>
+    <help>Do not process bootstrap messages</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="no-unicast-bsm">
+  <properties>
+    <help>Do not process unicast bootstrap messages</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/pim/dr-priority.xml.i b/interface-definitions/include/pim/dr-priority.xml.i
new file mode 100644
index 000000000..bfda4e257
--- /dev/null
+++ b/interface-definitions/include/pim/dr-priority.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from pim/dr-priority.xml.i -->
+<leafNode name="dr-priority">
+  <properties>
+    <help>Designated Router Election Priority</help>
+    <valueHelp>
+      <format>u32:1-4294967295</format>
+      <description>Value of the new DR Priority</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-4294967295"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/pim/hello.xml.i b/interface-definitions/include/pim/hello.xml.i
new file mode 100644
index 000000000..0c7601be7
--- /dev/null
+++ b/interface-definitions/include/pim/hello.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from pim/hello.xml.i -->
+<leafNode name="hello">
+  <properties>
+    <help>Hello Interval</help>
+    <valueHelp>
+      <format>u32:1-180</format>
+      <description>Hello Interval in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-180"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/pim/join-prune-interval.xml.i b/interface-definitions/include/pim/join-prune-interval.xml.i
new file mode 100644
index 000000000..f7519ad67
--- /dev/null
+++ b/interface-definitions/include/pim/join-prune-interval.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from pim/join-prune-interval.xml.i -->
+<leafNode name="join-prune-interval">
+  <properties>
+    <help>Join Prune Send Interval</help>
+    <valueHelp>
+      <format>u32:1-65535</format>
+      <description>Interval in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65535"/>
+    </constraint>
+  </properties>
+  <defaultValue>60</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/pim/keep-alive-timer.xml.i b/interface-definitions/include/pim/keep-alive-timer.xml.i
new file mode 100644
index 000000000..9e71b7a14
--- /dev/null
+++ b/interface-definitions/include/pim/keep-alive-timer.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from pim/keep-alive-timer.xml.i -->
+<leafNode name="keep-alive-timer">
+  <properties>
+    <help>Keep alive Timer</help>
+    <valueHelp>
+      <format>u32:1-65535</format>
+      <description>Keep alive Timer in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65535"/>
+    </constraint>
+  </properties>
+  <defaultValue>210</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/pim/packets.xml.i b/interface-definitions/include/pim/packets.xml.i
new file mode 100644
index 000000000..1dc00c971
--- /dev/null
+++ b/interface-definitions/include/pim/packets.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from pim/packets.xml.i -->
+<leafNode name="packets">
+  <properties>
+    <help>Packets to process at once</help>
+    <valueHelp>
+      <format>u32:1-255</format>
+      <description>Number of packets</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-255"/>
+    </constraint>
+  </properties>
+  <defaultValue>3</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/pim/passive.xml.i b/interface-definitions/include/pim/passive.xml.i
new file mode 100644
index 000000000..e4e9ca0b1
--- /dev/null
+++ b/interface-definitions/include/pim/passive.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from pim/passive.xml.i -->
+<leafNode name="passive">
+  <properties>
+    <help>Disable sending and receiving PIM control packets on the interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/pim/register-suppress-time.xml.i b/interface-definitions/include/pim/register-suppress-time.xml.i
new file mode 100644
index 000000000..80180e9b6
--- /dev/null
+++ b/interface-definitions/include/pim/register-suppress-time.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from pim/register-suppress-time.xml.i -->
+<leafNode name="register-suppress-time">
+  <properties>
+    <help>Register Suppress Timer</help>
+    <valueHelp>
+      <format>u32:1-65535</format>
+      <description>In seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65535"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/protocols-pim.xml.in b/interface-definitions/protocols-pim.xml.in
index 733279aa4..96bd7504c 100644
--- a/interface-definitions/protocols-pim.xml.in
+++ b/interface-definitions/protocols-pim.xml.in
@@ -20,74 +20,39 @@
               </constraint>
             </properties>
             <children>
-              #include <include/bfd/bfd.xml.i>
-              <leafNode name="no-bsm">
-                <properties>
-                  <help>Do not process bootstrap messages</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <leafNode name="no-unicast-bsm">
-                <properties>
-                  <help>Do not process unicast bootstrap messages</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <leafNode name="dr-priority">
-                <properties>
-                  <help>Designated Router Election Priority</help>
-                  <valueHelp>
-                    <format>u32:1-4294967295</format>
-                    <description>Value of the new DR Priority</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-4294967295"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="hello">
-                <properties>
-                  <help>Hello Interval</help>
-                  <valueHelp>
-                    <format>u32:1-180</format>
-                    <description>Hello Interval in seconds</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-180"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <node name="igmp">
-                <properties>
-                  <help>Internet Group Management Protocol (IGMP) options</help>
-                </properties>
-                <children>
-                  <leafNode name="version">
-                    <properties>
-                      <help>Interface IGMP version</help>
-                      <valueHelp>
-                        <format>2</format>
-                        <description>IGMP version 2</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>3</format>
-                        <description>IGMP version 3</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 2-3"/>
-                      </constraint>
-                    </properties>
-                    <defaultValue>3</defaultValue>
+            #include <include/bfd/bfd.xml.i>
+            #include <include/pim/bsm.xml.i>
+            #include <include/pim/dr-priority.xml.i>
+            #include <include/pim/hello.xml.i>
+            #include <include/pim/passive.xml.i>
+            #include <include/source-address-ipv4.xml.i>
+            <node name="igmp">
+              <properties>
+                <help>Internet Group Management Protocol (IGMP) options</help>
+              </properties>
+              <children>
+                <leafNode name="version">
+                  <properties>
+                    <help>Interface IGMP version</help>
+                    <completionHelp>
+                      <list>1 2</list>
+                    </completionHelp>
+                    <valueHelp>
+                      <format>2</format>
+                      <description>IGMP version 2</description>
+                    </valueHelp>
+                    <valueHelp>
+                      <format>3</format>
+                      <description>IGMP version 3</description>
+                    </valueHelp>
+                    <constraint>
+                      <validator name="numeric" argument="--range 2-3"/>
+                    </constraint>
+                  </properties>
+                  <defaultValue>3</defaultValue>
                   </leafNode>
                 </children>
               </node>
-              <leafNode name="passive">
-                <properties>
-                  <help>Disable sending and receiving PIM control packets on the interface</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              #include <include/source-address-ipv4.xml.i>
             </children>
           </tagNode>
           <node name="ecmp">
@@ -102,8 +67,8 @@
                 </properties>
               </leafNode>
             </children>
-           </node>
-           <node name="igmp">
+          </node>
+          <node name="igmp">
             <properties>
               <help>Internet Group Management Protocol (IGMP) options</help>
             </properties>
@@ -121,46 +86,11 @@
                 </properties>
               </leafNode>
             </children>
-           </node>
-           <leafNode name="join-prune-interval">
-            <properties>
-              <help>Join Prune Send Interval</help>
-              <valueHelp>
-                <format>u32:1-65535</format>
-                <description>Interval in seconds</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-65535"/>
-              </constraint>
-            </properties>
-            <defaultValue>60</defaultValue>
-          </leafNode>
-          <leafNode name="keep-alive-timer">
-            <properties>
-              <help>Keep alive Timer</help>
-              <valueHelp>
-                <format>u32:1-65535</format>
-                <description>Keep alive Timer in seconds</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-65535"/>
-              </constraint>
-            </properties>
-            <defaultValue>210</defaultValue>
-          </leafNode>
-          <leafNode name="packets">
-            <properties>
-              <help>Packets to process at once</help>
-              <valueHelp>
-                <format>u32:1-255</format>
-                <description>Number of packets</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-255"/>
-              </constraint>
-            </properties>
-            <defaultValue>3</defaultValue>
-          </leafNode>
+          </node>
+          #include <include/pim/join-prune-interval.xml.i>
+          #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">
             <properties>
               <help>Only accept registers from a specific source prefix list</help>
@@ -173,18 +103,6 @@
               </completionHelp>
             </properties>
           </leafNode>
-          <leafNode name="register-suppress-time">
-            <properties>
-              <help>Register Suppress Timer</help>
-              <valueHelp>
-                <format>u32:1-65535</format>
-                <description>In seconds</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-65535"/>
-              </constraint>
-            </properties>
-          </leafNode>
           <node name="rp">
             <properties>
               <help>Rendezvous Point</help>
-- 
cgit v1.2.3