From 312ee15058fbb26feb6a93520417f0d5343ad15b Mon Sep 17 00:00:00 2001
From: Nicolas Fort <nicolasfort1988@gmail.com>
Date: Thu, 1 Sep 2022 19:08:37 +0000
Subject: Firewall: T4651: Change proposed cli from ip-length to packet-length

---
 interface-definitions/firewall.xml.in              | 42 ++--------------------
 .../include/firewall/packet-length.xml.i           | 18 ++++++++++
 2 files changed, 20 insertions(+), 40 deletions(-)
 create mode 100644 interface-definitions/include/firewall/packet-length.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/firewall.xml.in b/interface-definitions/firewall.xml.in
index f838f1b88..ed84acbb7 100644
--- a/interface-definitions/firewall.xml.in
+++ b/interface-definitions/firewall.xml.in
@@ -383,26 +383,7 @@
                 </children>
               </node>
               #include <include/firewall/common-rule.xml.i>
-              <leafNode name="ip-length">
-                <properties>
-                  <help>Payload size in bytes, including any extension header</help>
-                  <valueHelp>
-                    <format>u32:1-65535</format>
-                    <description>Numbered packet length</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>&lt;start-end&gt;</format>
-                    <description>Packet length range (e.g. 1001-1005)</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format> </format>
-                    <description>\n\n  Multiple values can be specified as a comma-separated list.\n  For example: '64, 512,1001-1005'</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ip-length"/>
-                  </constraint>
-                </properties>
-              </leafNode>
+              #include <include/firewall/packet-length.xml.i>
               <node name="hop-limit">
                 <properties>
                   <help>Hop Limit</help>
@@ -591,26 +572,7 @@
                 </children>
               </node>
               #include <include/firewall/common-rule.xml.i>
-              <leafNode name="ip-length">
-                <properties>
-                  <help>Packet size in bytes, including header and data</help>
-                  <valueHelp>
-                    <format>u32:1-65535</format>
-                    <description>Numbered packet length</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>&lt;start-end&gt;</format>
-                    <description>Packet length range (e.g. 1001-1005)</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format> </format>
-                    <description>\n\n  Multiple values can be specified as a comma-separated list.\n  For example: '64, 512,1001-1005'</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ip-length"/>
-                  </constraint>
-                </properties>
-              </leafNode>
+              #include <include/firewall/packet-length.xml.i>
               <node name="icmp">
                 <properties>
                   <help>ICMP type and code information</help>
diff --git a/interface-definitions/include/firewall/packet-length.xml.i b/interface-definitions/include/firewall/packet-length.xml.i
new file mode 100644
index 000000000..866a76bbb
--- /dev/null
+++ b/interface-definitions/include/firewall/packet-length.xml.i
@@ -0,0 +1,18 @@
+<!-- include start from firewall/packet-length.xml.i -->
+<leafNode name="packet-length">
+  <properties>
+    <help>Payload size in bytes, including header and data</help>
+    <valueHelp>
+      <format>u32:1-65535</format>
+      <description>Packet length value. Multiple values can be specified as a comma-separated list. Inverted match is also supported</description>
+    </valueHelp>
+    <valueHelp>
+      <format>&lt;start-end&gt;</format>
+      <description>Packet length range. Inverted match is also supported (e.g. 1001-1005 or !1001-1005)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="packet-length"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
-- 
cgit v1.2.3