ipsec: T3588: remove CLI options deprecated by strongSwan

- set vpn ipsec nat-traversal
- set vpn ipsec nat-networks allowed-network

2 files changed, 52 insertions, 53 deletions

diff --git a/interface-definitions/vpn_ipsec.xml.in b/interface-definitions/vpn_ipsec.xml.in
index 6b20bc20a..604f49cb6 100644
--- a/interface-definitions/vpn_ipsec.xml.in
+++ b/interface-definitions/vpn_ipsec.xml.in
@@ -624,59 +624,6 @@
               </leafNode>
             </children>
           </node>
-          <node name="nat-networks">
-            <properties>
-              <help>Network Address Translation (NAT) networks (Obsolete)</help>
-            </properties>
-            <children>
-              <tagNode name="allowed-network">
-                <properties>
-                  <help>NAT networks to allow</help>
-                  <valueHelp>
-                    <format>ipv4net</format>
-                    <description>NAT networks to allow</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ip-prefix"/>
-                  </constraint>
-                </properties>
-                <children>
-                  <leafNode name="exclude">
-                    <properties>
-                      <help>NAT networks to exclude from allowed-networks</help>
-                      <valueHelp>
-                        <format>ipv4net</format>
-                        <description>NAT networks to exclude from allowed-networks</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ip-prefix"/>
-                      </constraint>
-                      <multi/>
-                    </properties>
-                  </leafNode>
-                </children>
-              </tagNode>
-            </children>
-          </node>
-          <leafNode name="nat-traversal">
-            <properties>
-              <help>Network Address Translation (NAT) traversal (Obsolete)</help>
-              <completionHelp>
-                <list>disable enable</list>
-              </completionHelp>
-              <valueHelp>
-                <format>disable</format>
-                <description>Disable NAT-T</description>
-              </valueHelp>
-              <valueHelp>
-                <format>enable</format>
-                <description>Enable NAT-T</description>
-              </valueHelp>
-              <constraint>
-                <regex>^(disable|enable)$</regex>
-              </constraint>
-            </properties>
-          </leafNode>
           <node name="options">
             <properties>
               <help>Global IPsec settings</help>
diff --git a/src/migration-scripts/ipsec/5-to-6 b/src/migration-scripts/ipsec/5-to-6
new file mode 100755
index 000000000..29d73536f
--- /dev/null
+++ b/src/migration-scripts/ipsec/5-to-6
@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2021 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Remove deprecated strongSwan options from VyOS CLI
+# - vpn ipsec nat-traversal enable
+# - vpn ipsec nat-networks allowed-network
+
+from sys import argv
+from sys import exit
+
+from vyos.configtree import ConfigTree
+
+if (len(argv) < 1):
+    print("Must specify file name!")
+    exit(1)
+
+file_name = argv[1]
+
+with open(file_name, 'r') as f:
+    config_file = f.read()
+
+base = ['vpn', 'ipsec']
+config = ConfigTree(config_file)
+
+if not config.exists(base):
+    # Nothing to do
+    exit(0)
+
+# Delete CLI nodes whose config options got removed by strongSwan
+for cli_node in ['nat-traversal', 'nat-networks']:
+    if config.exists(base + [cli_node]):
+        config.delete(base + [cli_node])
+
+try:
+    with open(file_name, 'w') as f:
+        f.write(config.to_string())
+except OSError as e:
+    print(f'Failed to save the modified config: {e}')
+    exit(1)