From 4d5095fdddb2ca14cb143fa8430307e40a2a5e4e Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 3 Sep 2022 20:18:57 +0200
Subject: firewall: T3568: add XML include block for eq,gt,lt options

---
 interface-definitions/firewall.xml.in           | 78 ++-----------------------
 interface-definitions/include/firewall/eq.xml.i | 14 +++++
 interface-definitions/include/firewall/gt.xml.i | 14 +++++
 interface-definitions/include/firewall/lt.xml.i | 14 +++++
 4 files changed, 48 insertions(+), 72 deletions(-)
 create mode 100644 interface-definitions/include/firewall/eq.xml.i
 create mode 100644 interface-definitions/include/firewall/gt.xml.i
 create mode 100644 interface-definitions/include/firewall/lt.xml.i

diff --git a/interface-definitions/firewall.xml.in b/interface-definitions/firewall.xml.in
index cca3c0f7d..c2d652278 100644
--- a/interface-definitions/firewall.xml.in
+++ b/interface-definitions/firewall.xml.in
@@ -389,42 +389,9 @@
                   <help>Hop Limit</help>
                 </properties>
                 <children>
-                  <leafNode name="eq">
-                    <properties>
-                      <help>Value to match a hop limit equal to it</help>
-                      <valueHelp>
-                        <format>u32:0-255</format>
-                        <description>Hop limit equal to value</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-255"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="gt">
-                    <properties>
-                      <help>Value to match a hop limit greater than or equal to it</help>
-                      <valueHelp>
-                        <format>u32:0-255</format>
-                        <description>Hop limit greater than value</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-255"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="lt">
-                    <properties>
-                      <help>Value to match a hop limit less than or equal to it</help>
-                      <valueHelp>
-                        <format>u32:0-255</format>
-                        <description>Hop limit less than value</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-255"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
+                  #include <include/firewall/eq.xml.i>
+                  #include <include/firewall/gt.xml.i>
+                  #include <include/firewall/lt.xml.i>
                 </children>
               </node>
               <node name="icmpv6">
@@ -610,42 +577,9 @@
                   <help>Time to live limit</help>
                 </properties>
                 <children>
-                  <leafNode name="eq">
-                    <properties>
-                      <help>Value to match a ttl equal to it</help>
-                      <valueHelp>
-                        <format>u32:0-255</format>
-                        <description>ttl equal to value</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-255"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="gt">
-                    <properties>
-                      <help>Value to match a ttl greater than or equal to it</help>
-                      <valueHelp>
-                        <format>u32:0-255</format>
-                        <description>ttl greater than value</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-255"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="lt">
-                    <properties>
-                      <help>Value to match a ttl less than or equal to it</help>
-                      <valueHelp>
-                        <format>u32:0-255</format>
-                        <description>ttl less than value</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-255"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
+                  #include <include/firewall/eq.xml.i>
+                  #include <include/firewall/gt.xml.i>
+                  #include <include/firewall/lt.xml.i>
                 </children>
               </node>
             </children>
diff --git a/interface-definitions/include/firewall/eq.xml.i b/interface-definitions/include/firewall/eq.xml.i
new file mode 100644
index 000000000..e1b4f37a2
--- /dev/null
+++ b/interface-definitions/include/firewall/eq.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from firewall/eq.xml.i -->
+<leafNode name="eq">
+  <properties>
+    <help>Match on equal value</help>
+    <valueHelp>
+      <format>u32:0-255</format>
+      <description>Equal to value</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-255"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
\ No newline at end of file
diff --git a/interface-definitions/include/firewall/gt.xml.i b/interface-definitions/include/firewall/gt.xml.i
new file mode 100644
index 000000000..c879171ee
--- /dev/null
+++ b/interface-definitions/include/firewall/gt.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from firewall/gt.xml.i -->
+<leafNode name="gt">
+  <properties>
+    <help>Match on greater then value</help>
+    <valueHelp>
+      <format>u32:0-255</format>
+      <description>Greater then value</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-255"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/firewall/lt.xml.i b/interface-definitions/include/firewall/lt.xml.i
new file mode 100644
index 000000000..77894d3ce
--- /dev/null
+++ b/interface-definitions/include/firewall/lt.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from firewall/lt.xml.i -->
+<leafNode name="lt">
+  <properties>
+    <help>Match on less then value</help>
+    <valueHelp>
+      <format>u32:0-255</format>
+      <description>Less then value</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-255"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
-- 
cgit v1.2.3