From 227391443df088f186f1719ae470ebb35d2ff706 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 17 Jul 2021 07:26:05 +0200
Subject: ipsec: T2816: migrate "ipsec interfaces" to "interface"

---
 interface-definitions/vpn_ipsec.xml.in | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/vpn_ipsec.xml.in b/interface-definitions/vpn_ipsec.xml.in
index 8399cf7f4..9dbebdc0f 100644
--- a/interface-definitions/vpn_ipsec.xml.in
+++ b/interface-definitions/vpn_ipsec.xml.in
@@ -52,6 +52,7 @@
                     <regex>^(disable|enable)$</regex>
                   </constraint>
                 </properties>
+                <defaultValue>disable</defaultValue>
               </leafNode>
               <leafNode name="lifetime">
                 <properties>
@@ -509,22 +510,15 @@
               <help>Sets to include an additional secrets file for strongSwan. Use an absolute path to specify the included file.</help>
             </properties>
           </leafNode>
-          <node name="ipsec-interfaces">
+          <leafNode name="interface">
             <properties>
-              <help>Interface to use for VPN [REQUIRED]</help>
+              <help>Onterface used for IPsec communication</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py</script>
+              </completionHelp>
+              <multi/>
             </properties>
-            <children>
-              <leafNode name="interface">
-                <properties>
-                  <help>IPsec interface [REQUIRED]</help>
-                  <completionHelp>
-                    <script>${vyos_completion_dir}/list_interfaces.py</script>
-                  </completionHelp>
-                  <multi/>
-                </properties>
-              </leafNode>
-            </children>
-          </node>
+          </leafNode>
           <node name="log">
             <properties>
               <help>IPsec logging</help>
-- 
cgit v1.2.3