From c97a196c75f556105c02c43de3cc6719e8dfe559 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 6 Feb 2021 10:46:49 +0100
Subject: rip: T2833: xml: split out (access|prefix)-list to re includable

---
 .../include/rip-access-list.xml.i                  |  39 ++++++
 .../include/rip-prefix-list.xml.i                  |  33 +++++
 interface-definitions/protocols-rip.xml.in         | 155 +--------------------
 3 files changed, 78 insertions(+), 149 deletions(-)
 create mode 100644 interface-definitions/include/rip-access-list.xml.i
 create mode 100644 interface-definitions/include/rip-prefix-list.xml.i

diff --git a/interface-definitions/include/rip-access-list.xml.i b/interface-definitions/include/rip-access-list.xml.i
new file mode 100644
index 000000000..0db6863e5
--- /dev/null
+++ b/interface-definitions/include/rip-access-list.xml.i
@@ -0,0 +1,39 @@
+<!-- included start from rip-access-list.xml.i -->
+<node name="access-list">
+  <properties>
+    <help>Access-list</help>
+  </properties>
+  <children>
+    <leafNode name="in">
+      <properties>
+        <help>Access list to apply to input packets</help>
+        <valueHelp>
+          <format>u32</format>
+          <description>Access list to apply to input packets</description>
+        </valueHelp>
+        <completionHelp>
+          <path>policy access-list</path>
+        </completionHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-4294967295"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="out">
+      <properties>
+        <help>Access list to apply to output packets</help>
+        <valueHelp>
+          <format>u32</format>
+          <description>Access list to apply to output packets</description>
+        </valueHelp>
+        <completionHelp>
+          <path>policy access-list</path>
+        </completionHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-4294967295"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- included end -->
diff --git a/interface-definitions/include/rip-prefix-list.xml.i b/interface-definitions/include/rip-prefix-list.xml.i
new file mode 100644
index 000000000..58969a86b
--- /dev/null
+++ b/interface-definitions/include/rip-prefix-list.xml.i
@@ -0,0 +1,33 @@
+<!-- included start from rip-prefix-list.xml.i -->
+<node name="prefix-list">
+  <properties>
+    <help>Prefix-list</help>
+  </properties>
+  <children>
+    <leafNode name="in">
+      <properties>
+        <help>Prefix-list to apply to input packets</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Prefix-list to apply to input packets</description>
+        </valueHelp>
+        <completionHelp>
+          <path>policy prefix-list</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+    <leafNode name="out">
+      <properties>
+        <help>Prefix-list to apply to output packets</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Prefix-list to apply to output packets</description>
+        </valueHelp>
+        <completionHelp>
+          <path>policy prefix-list</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- included end -->
diff --git a/interface-definitions/protocols-rip.xml.in b/interface-definitions/protocols-rip.xml.in
index 34d0a5a10..385784f92 100644
--- a/interface-definitions/protocols-rip.xml.in
+++ b/interface-definitions/protocols-rip.xml.in
@@ -1,4 +1,4 @@
-<!-- Routing Information Protocol (RIP) configuration -->
+<?xml version="1.0"?>
 <interfaceDefinition>
   <node name="protocols">
     <children>
@@ -49,43 +49,7 @@
               <help>Filter networks in routing updates</help>
             </properties>
             <children>
-              <node name="access-list">
-                <properties>
-                  <help>Access-list</help>
-                </properties>
-                <children>
-                  <leafNode name="in">
-                    <properties>
-                      <help>Access list to apply to input packets</help>
-                      <valueHelp>
-                        <format>u32</format>
-                        <description>Access list to apply to input packets</description>
-                      </valueHelp>
-                      <completionHelp>
-                        <path>policy access-list</path>
-                      </completionHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-4294967295"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="out">
-                    <properties>
-                      <help>Access list to apply to output packets</help>
-                      <valueHelp>
-                        <format>u32</format>
-                        <description>Access list to apply to output packets</description>
-                      </valueHelp>
-                      <completionHelp>
-                        <path>policy access-list</path>
-                      </completionHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-4294967295"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
+              #include <include/rip-access-list.xml.i>
               <tagNode name="interface">
                 <properties>
                   <help>Apply filtering to an interface</help>
@@ -98,107 +62,11 @@
                   </completionHelp>
                 </properties>
                 <children>
-                  <node name="access-list">
-                    <properties>
-                      <help>Access list</help>
-                    </properties>
-                    <children>
-                      <leafNode name="in">
-                        <properties>
-                          <help>Access list to apply to input packets</help>
-                          <valueHelp>
-                            <format>u32</format>
-                            <description>Access list to apply to input packets</description>
-                          </valueHelp>
-                          <completionHelp>
-                            <path>policy access-list</path>
-                          </completionHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 0-4294967295"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="out">
-                        <properties>
-                          <help>Access list to apply to output packets</help>
-                          <valueHelp>
-                            <format>u32</format>
-                            <description>Access list to apply to output packets</description>
-                          </valueHelp>
-                          <completionHelp>
-                            <path>policy access-list</path>
-                          </completionHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 0-4294967295"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </node>
-                  <node name="prefix-list">
-                    <properties>
-                      <help>Prefix-list</help>
-                    </properties>
-                    <children>
-                      <leafNode name="in">
-                        <properties>
-                          <help>Prefix-list to apply to input packets</help>
-                          <valueHelp>
-                            <format>txt</format>
-                            <description>Prefix-list to apply to input packets</description>
-                          </valueHelp>
-                          <completionHelp>
-                            <path>policy prefix-list</path>
-                          </completionHelp>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="out">
-                        <properties>
-                          <help>Prefix-list to apply to output packets</help>
-                          <valueHelp>
-                            <format>txt</format>
-                            <description>Prefix-list to apply to output packets</description>
-                          </valueHelp>
-                          <completionHelp>
-                            <path>policy prefix-list</path>
-                          </completionHelp>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </node>
+                  #include <include/rip-access-list.xml.i>
+                  #include <include/rip-prefix-list.xml.i>
                 </children>
               </tagNode>
-              <node name="prefix-list">
-                <properties>
-                  <help>Prefix-list</help>
-                </properties>
-                <children>
-                  <leafNode name="in">
-                    <properties>
-                      <help>Prefix-list to apply to input packets</help>
-                      <valueHelp>
-                        <format>txt</format>
-                        <description>Prefix-list to apply to input packets</description>
-                      </valueHelp>
-                      <completionHelp>
-                        <path>policy prefix-list</path>
-                      </completionHelp>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="out">
-                    <properties>
-                      <help>Prefix-list to apply to output packets</help>
-                      <valueHelp>
-                        <format>txt</format>
-                        <description>Prefix-list to apply to output packets</description>
-                      </valueHelp>
-                      <completionHelp>
-                        <path>policy prefix-list</path>
-                      </completionHelp>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
+              #include <include/rip-prefix-list.xml.i>
             </children>
           </node>
           <leafNode name="interface">
@@ -264,18 +132,7 @@
                   </completionHelp>
                 </properties>
               </leafNode>
-              <leafNode name="distance">
-                <properties>
-                  <help>Administrative distance for network</help>
-                  <valueHelp>
-                    <format>u32:1-255</format>
-                    <description>Administrative distance</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-255"/>
-                  </constraint>
-                </properties>
-              </leafNode>
+              #include <include/static-route-distance.xml.i>
             </children>
           </tagNode>
           <leafNode name="passive-interface">
-- 
cgit v1.2.3