From e2b05343b30d2f989968532106e792cbaf75ecf6 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@vyos.io>
Date: Thu, 18 Jul 2024 19:33:24 +0100
Subject: openvpn: T6591: deprecate OpenVPN server net30 topology (#3825)

---
 interface-definitions/include/version/openvpn-version.xml.i |  2 +-
 interface-definitions/interfaces_openvpn.xml.in             | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/version/openvpn-version.xml.i b/interface-definitions/include/version/openvpn-version.xml.i
index e4eb13b7c..e03ad55c0 100644
--- a/interface-definitions/include/version/openvpn-version.xml.i
+++ b/interface-definitions/include/version/openvpn-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/openvpn-version.xml.i -->
-<syntaxVersion component='openvpn' version='2'></syntaxVersion>
+<syntaxVersion component='openvpn' version='3'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/interfaces_openvpn.xml.in b/interface-definitions/interfaces_openvpn.xml.in
index 23cc83e9a..1860523c2 100644
--- a/interface-definitions/interfaces_openvpn.xml.in
+++ b/interface-definitions/interfaces_openvpn.xml.in
@@ -589,25 +589,25 @@
                 <properties>
                   <help>Topology for clients</help>
                   <completionHelp>
-                    <list>net30 point-to-point subnet</list>
+                    <list>subnet point-to-point net30</list>
                   </completionHelp>
                   <valueHelp>
-                    <format>net30</format>
-                    <description>net30 topology</description>
+                    <format>subnet</format>
+                    <description>Subnet topology (recommended)</description>
                   </valueHelp>
                   <valueHelp>
                     <format>point-to-point</format>
                     <description>Point-to-point topology</description>
                   </valueHelp>
                   <valueHelp>
-                    <format>subnet</format>
-                    <description>Subnet topology</description>
+                    <format>net30</format>
+                    <description>net30 topology (deprecated)</description>
                   </valueHelp>
                   <constraint>
                     <regex>(subnet|point-to-point|net30)</regex>
                   </constraint>
                 </properties>
-                <defaultValue>net30</defaultValue>
+                <defaultValue>subnet</defaultValue>
               </leafNode>
               <node name="mfa">
                 <properties>
-- 
cgit v1.2.3