From ac4f99ac3b176f1804b17b32e6615e8b3701dfe8 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 12 May 2020 19:28:06 +0200
Subject: nat: T2198: split nat-address-port include into individual files

---
 .../include/nat-address-port.xml.i                 | 54 ----------------------
 interface-definitions/include/nat-address.xml.i    | 37 +++++++++++++++
 interface-definitions/include/nat-port.xml.i       | 17 +++++++
 interface-definitions/include/nat-rule.xml.i       |  6 ++-
 4 files changed, 58 insertions(+), 56 deletions(-)
 delete mode 100644 interface-definitions/include/nat-address-port.xml.i
 create mode 100644 interface-definitions/include/nat-address.xml.i
 create mode 100644 interface-definitions/include/nat-port.xml.i

diff --git a/interface-definitions/include/nat-address-port.xml.i b/interface-definitions/include/nat-address-port.xml.i
deleted file mode 100644
index 8705d31cb..000000000
--- a/interface-definitions/include/nat-address-port.xml.i
+++ /dev/null
@@ -1,54 +0,0 @@
-<leafNode name="address">
-  <properties>
-    <help>IP address, subnet, or range</help>
-    <valueHelp>
-      <format>ipv4</format>
-      <description>IPv4 address to match</description>
-    </valueHelp>
-    <valueHelp>
-      <format>ipv4net</format>
-      <description>IPv4 prefix to match</description>
-    </valueHelp>
-    <valueHelp>
-      <format>ipv4range</format>
-      <description>IPv4 address range to match</description>
-    </valueHelp>
-    <valueHelp>
-      <format>!ipv4</format>
-      <description>Match everything except the specified address</description>
-    </valueHelp>
-    <valueHelp>
-      <format>!ipv4net</format>
-      <description>Match everything except the specified prefix</description>
-    </valueHelp>
-    <valueHelp>
-      <format>!ipv4range</format>
-      <description>Match everything except the specified range</description>
-    </valueHelp>
-    <constraint>
-      <validator name="ipv4-address"/>
-      <validator name="ipv4-prefix"/>
-      <validator name="ipv4-range"/>
-      <validator name="ipv4-address-exclude"/>
-      <validator name="ipv4-prefix-exclude"/>
-      <validator name="ipv4-range-exclude"/>
-    </constraint>
-  </properties>
-</leafNode>
-<leafNode name="port">
-  <properties>
-    <help>Port number</help>
-    <valueHelp>
-      <format>1-65535</format>
-      <description>Numeric IP port</description>
-    </valueHelp>
-    <valueHelp>
-      <format>start-end</format>
-      <description>Numbered port range (e.g., 1001-1005)</description>
-    </valueHelp>
-    <valueHelp>
-      <format> </format>
-      <description>\n\nMultiple destination ports can be specified as a comma-separated list.\nThe whole list can also be negated using '!'.\nFor example: '!22,telnet,http,123,1001-1005'</description>
-    </valueHelp>
-  </properties>
-</leafNode>
diff --git a/interface-definitions/include/nat-address.xml.i b/interface-definitions/include/nat-address.xml.i
new file mode 100644
index 000000000..933dae07b
--- /dev/null
+++ b/interface-definitions/include/nat-address.xml.i
@@ -0,0 +1,37 @@
+<leafNode name="address">
+  <properties>
+    <help>IP address, subnet, or range</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>IPv4 address to match</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv4net</format>
+      <description>IPv4 prefix to match</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv4range</format>
+      <description>IPv4 address range to match</description>
+    </valueHelp>
+    <valueHelp>
+      <format>!ipv4</format>
+      <description>Match everything except the specified address</description>
+    </valueHelp>
+    <valueHelp>
+      <format>!ipv4net</format>
+      <description>Match everything except the specified prefix</description>
+    </valueHelp>
+    <valueHelp>
+      <format>!ipv4range</format>
+      <description>Match everything except the specified range</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+      <validator name="ipv4-prefix"/>
+      <validator name="ipv4-range"/>
+      <validator name="ipv4-address-exclude"/>
+      <validator name="ipv4-prefix-exclude"/>
+      <validator name="ipv4-range-exclude"/>
+    </constraint>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/nat-port.xml.i b/interface-definitions/include/nat-port.xml.i
new file mode 100644
index 000000000..24803ae05
--- /dev/null
+++ b/interface-definitions/include/nat-port.xml.i
@@ -0,0 +1,17 @@
+<leafNode name="port">
+  <properties>
+    <help>Port number</help>
+    <valueHelp>
+      <format>1-65535</format>
+      <description>Numeric IP port</description>
+    </valueHelp>
+    <valueHelp>
+      <format>start-end</format>
+      <description>Numbered port range (e.g., 1001-1005)</description>
+    </valueHelp>
+    <valueHelp>
+      <format> </format>
+      <description>\n\nMultiple destination ports can be specified as a comma-separated list.\nThe whole list can also be negated using '!'.\nFor example: '!22,telnet,http,123,1001-1005'</description>
+    </valueHelp>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/nat-rule.xml.i b/interface-definitions/include/nat-rule.xml.i
index fdba4b8bd..183692664 100644
--- a/interface-definitions/include/nat-rule.xml.i
+++ b/interface-definitions/include/nat-rule.xml.i
@@ -21,7 +21,8 @@
         <help>NAT destination parameters</help>
       </properties>
       <children>
-        #include <include/nat-address-port.xml.i>
+        #include <include/nat-address.xml.i>
+        #include <include/nat-port.xml.i>
       </children>
     </node>
     <leafNode name="disable">
@@ -79,7 +80,8 @@
         <help>NAT source parameters</help>
       </properties>
       <children>
-        #include <include/nat-address-port.xml.i>
+        #include <include/nat-address.xml.i>
+        #include <include/nat-port.xml.i>
       </children>
     </node>
   </children>
-- 
cgit v1.2.3