From 3851818b7a2691f8cf016c4d15071cef8d235041 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 4 Jul 2021 20:52:36 +0200
Subject: ipsec: T2816: add include definition for ipsec local-address

---
 .../include/ipsec/local-address.xml.i              | 27 +++++++++++
 interface-definitions/vpn_ipsec.xml.in             | 52 +---------------------
 2 files changed, 29 insertions(+), 50 deletions(-)
 create mode 100644 interface-definitions/include/ipsec/local-address.xml.i

diff --git a/interface-definitions/include/ipsec/local-address.xml.i b/interface-definitions/include/ipsec/local-address.xml.i
new file mode 100644
index 000000000..2de6ecb1f
--- /dev/null
+++ b/interface-definitions/include/ipsec/local-address.xml.i
@@ -0,0 +1,27 @@
+<!-- include start from ipsec/local-address.xml.i -->
+<leafNode name="local-address">
+  <properties>
+    <help>IPv4 or IPv6 address of a local interface to use for VPN</help>
+    <completionHelp>
+      <list>any</list>
+    </completionHelp>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>IPv4 address of a local interface for VPN</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6</format>
+      <description>IPv6 address of a local interface for VPN</description>
+    </valueHelp>
+    <valueHelp>
+      <format>any</format>
+      <description>Allow any IPv4 address present on the system to be used for VPN</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+      <validator name="ipv6-address"/>
+      <regex>^(any)$</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/vpn_ipsec.xml.in b/interface-definitions/vpn_ipsec.xml.in
index 31ec3e744..157d5ba59 100644
--- a/interface-definitions/vpn_ipsec.xml.in
+++ b/interface-definitions/vpn_ipsec.xml.in
@@ -743,31 +743,7 @@
               #include <include/generic-disable-node.xml.i>
               #include <include/ipsec/esp-group.xml.i>
               #include <include/ipsec/ike-group.xml.i>
-              <leafNode name="local-address">
-                <properties>
-                  <help>IPv4 or IPv6 address of a local interface to use for VPN</help>
-                  <completionHelp>
-                    <list>any</list>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>IPv4 address of a local interface for VPN</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>ipv6</format>
-                    <description>IPv6 address of a local interface for VPN</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>any</format>
-                    <description>Allow any IPv4 address present on the system to be used for VPN</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv4-address"/>
-                    <validator name="ipv6-address"/>
-                    <regex>^(any)$</regex>
-                  </constraint>
-                </properties>
-              </leafNode>
+              #include <include/ipsec/local-address.xml.i>
               <node name="local-network">
                 <properties>
                   <help>Local traffic selectors</help>
@@ -1039,31 +1015,7 @@
                       </constraint>
                     </properties>
                   </leafNode>
-                  <leafNode name="local-address">
-                    <properties>
-                      <help>IPv4 or IPv6 address of a local interface to use for VPN</help>
-                      <completionHelp>
-                        <list>any</list>
-                      </completionHelp>
-                      <valueHelp>
-                        <format>ipv4</format>
-                        <description>IPv4 address of a local interface for VPN</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>ipv6</format>
-                        <description>IPv6 address of a local interface for VPN</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>any</format>
-                        <description>Allow any IPv4 address present on the system to be used for VPN</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv4-address"/>
-                        <validator name="ipv6-address"/>
-                        <regex>^(any)$</regex>
-                      </constraint>
-                    </properties>
-                  </leafNode>
+                  #include <include/ipsec/local-address.xml.i>
                   <tagNode name="tunnel">
                     <properties>
                       <help>Peer tunnel [REQUIRED]</help>
-- 
cgit v1.2.3