vrrp: keepalived: T3847: remove "transition-script mode-force" option

3 files changed, 52 insertions, 15 deletions

diff --git a/interface-definitions/vrrp.xml.in b/interface-definitions/vrrp.xml.in
index cea60d9cb..d43ff83de 100644
--- a/interface-definitions/vrrp.xml.in
+++ b/interface-definitions/vrrp.xml.in
@@ -221,15 +221,6 @@
                       </constraint>
                     </properties>
                   </leafNode>
-                  <leafNode name="mode-force">
-                    <properties>
-                      <valueless/>
-                      <help>Disable VRRP state checking (deprecated, will be removed in VyOS 1.4)</help>
-                      <constraint>
-                        <validator name="script"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
                 </children>
               </node>
               <leafNode name="virtual-address">
diff --git a/src/conf_mode/vrrp.py b/src/conf_mode/vrrp.py
index 8bb237102..ba156e915 100755
--- a/src/conf_mode/vrrp.py
+++ b/src/conf_mode/vrrp.py
@@ -116,12 +116,6 @@ def verify(vrrp):
                 if 'peer_address' in group_config:
                     if is_ipv4(group_config['peer_address']):
                         raise ConfigError(f'VRRP group "{group}" uses IPv6 but peer-address is IPv4!')
-
-            # Warn the user about the deprecated mode-force option
-            if 'transition_script' in group_config and 'mode_force' in group_config['transition_script']:
-                print("""Warning: "transition-script mode-force" VRRP option is deprecated and will be removed in VyOS 1.4.""")
-                print("""It's no longer necessary, so you can safely remove it from your config now.""")
-
     # Check sync groups
     if 'sync_group' in vrrp:
         for sync_group, sync_config in vrrp['sync_group'].items():
diff --git a/src/migration-scripts/vrrp/2-to-3 b/src/migration-scripts/vrrp/2-to-3
new file mode 100755
index 000000000..b96ca139d
--- /dev/null
+++ b/src/migration-scripts/vrrp/2-to-3
@@ -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/>.
+
+# T3847: vrrp config cleanup
+
+from sys import argv
+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 = ['high-availability', 'vrrp']
+config = ConfigTree(config_file)
+
+if not config.exists(base):
+    # Nothing to do
+    exit(0)
+
+if config.exists(base + ['group']):
+    for group in config.list_nodes(base + ['group']):
+        group_base = base + ['group', group]
+
+        # Deprecated option
+        tmp = group_base + ['transition-script', 'mode-force']
+        if config.exists(tmp):
+            config.delete(tmp)
+
+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)