From 3a9e7eafe53108c183cf1f9f2b475f1419236956 Mon Sep 17 00:00:00 2001
From: Nicolas Fort <nicolasfort1988@gmail.com>
Date: Fri, 5 Aug 2022 17:53:13 +0000
Subject: nat66: T4598: Add exclude options in nat66

---
 interface-definitions/nat66.xml.in | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'interface-definitions/nat66.xml.in')

diff --git a/interface-definitions/nat66.xml.in b/interface-definitions/nat66.xml.in
index ac3198f45..b50e11c49 100644
--- a/interface-definitions/nat66.xml.in
+++ b/interface-definitions/nat66.xml.in
@@ -35,6 +35,12 @@
                   <valueless/>
                 </properties>
               </leafNode>
+              <leafNode name="exclude">
+                <properties>
+                  <help>Exclude packets matching this rule from NAT</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
               <leafNode name="log">
                 <properties>
                   <help>NAT66 rule logging</help>
@@ -162,6 +168,12 @@
                   <valueless/>
                 </properties>
               </leafNode>
+              <leafNode name="exclude">
+                <properties>
+                  <help>Exclude packets matching this rule from NAT</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
               <leafNode name="log">
                 <properties>
                   <help>NAT66 rule logging</help>
-- 
cgit v1.2.3


From 0863b441f4a95c3d3f678f42f31800e9ec4c924a Mon Sep 17 00:00:00 2001
From: Nicolas Fort <nicolasfort1988@gmail.com>
Date: Mon, 8 Aug 2022 17:49:05 +0000
Subject: nat66: T4598: add file nat-exclue.xml.i, which is invoked by
 nat66.xml.in and nat-rule.xml.i

---
 interface-definitions/include/nat-exclude.xml.i |  8 ++++++++
 interface-definitions/include/nat-rule.xml.i    |  7 +------
 interface-definitions/nat66.xml.in              | 14 ++------------
 3 files changed, 11 insertions(+), 18 deletions(-)
 create mode 100644 interface-definitions/include/nat-exclude.xml.i

(limited to 'interface-definitions/nat66.xml.in')

diff --git a/interface-definitions/include/nat-exclude.xml.i b/interface-definitions/include/nat-exclude.xml.i
new file mode 100644
index 000000000..4d53cf844
--- /dev/null
+++ b/interface-definitions/include/nat-exclude.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from nat-exclude.xml.i -->
+<leafNode name="exclude">
+   <properties>
+     <help>Exclude packets matching this rule from NAT</help>
+     <valueless/>
+   </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/nat-rule.xml.i b/interface-definitions/include/nat-rule.xml.i
index bdb86ed9b..84941aa6a 100644
--- a/interface-definitions/include/nat-rule.xml.i
+++ b/interface-definitions/include/nat-rule.xml.i
@@ -23,12 +23,7 @@
       </children>
     </node>
     #include <include/generic-disable-node.xml.i>
-    <leafNode name="exclude">
-      <properties>
-        <help>Exclude packets matching this rule from NAT</help>
-        <valueless/>
-      </properties>
-    </leafNode>
+    #include <include/nat-exclude.xml.i>
     <leafNode name="log">
       <properties>
         <help>NAT rule logging</help>
diff --git a/interface-definitions/nat66.xml.in b/interface-definitions/nat66.xml.in
index b50e11c49..bde1a6f8d 100644
--- a/interface-definitions/nat66.xml.in
+++ b/interface-definitions/nat66.xml.in
@@ -35,12 +35,7 @@
                   <valueless/>
                 </properties>
               </leafNode>
-              <leafNode name="exclude">
-                <properties>
-                  <help>Exclude packets matching this rule from NAT</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
+              #include <include/nat-exclude.xml.i>
               <leafNode name="log">
                 <properties>
                   <help>NAT66 rule logging</help>
@@ -168,12 +163,7 @@
                   <valueless/>
                 </properties>
               </leafNode>
-              <leafNode name="exclude">
-                <properties>
-                  <help>Exclude packets matching this rule from NAT</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
+              #include <include/nat-exclude.xml.i>
               <leafNode name="log">
                 <properties>
                   <help>NAT66 rule logging</help>
-- 
cgit v1.2.3