ipv6: T4346: delete (migrate) CLI command to disable IPv6 address family

4 files changed, 51 insertions, 31 deletions

diff --git a/src/conf_mode/system-ipv6.py b/src/conf_mode/system-ipv6.py
index e6bcc12ad..26aacf46b 100755
--- a/src/conf_mode/system-ipv6.py
+++ b/src/conf_mode/system-ipv6.py
@@ -17,11 +17,8 @@
 import os
 
 from sys import exit
-from vyos.base import DeprecationWarning
 from vyos.config import Config
 from vyos.configdict import dict_merge
-from vyos.configdict import leaf_node_changed
-from vyos.util import call
 from vyos.util import dict_search
 from vyos.util import sysctl_write
 from vyos.util import write_file
@@ -39,9 +36,6 @@ def get_config(config=None):
 
     opt = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
 
-    tmp = leaf_node_changed(conf, base + ['disable'])
-    if tmp: opt['reboot_required'] = {}
-
     # We have gathered the dict representation of the CLI, but there are default
     # options which we need to update into the dictionary retrived.
     default_values = defaults(base)
@@ -50,24 +44,12 @@ def get_config(config=None):
     return opt
 
 def verify(opt):
-    if 'disable' in opt:
-        DeprecationWarning('VyOS 1.4 (sagitta) will remove the CLI command to '\
-                           'disable IPv6 address family in the Linux Kernel!')
     pass
 
 def generate(opt):
     pass
 
 def apply(opt):
-    # disable IPv6 globally
-    tmp = dict_search('disable', opt)
-    value = '1' if (tmp != None) else '0'
-    sysctl_write('net.ipv6.conf.all.disable_ipv6', value)
-
-    if 'reboot_required' in opt:
-        print('Changing IPv6 disable parameter will only take affect\n' \
-              'when the system is rebooted.')
-
     # configure multipath
     tmp = dict_search('multipath.layer4_hashing', opt)
     value = '1' if (tmp != None) else '0'
diff --git a/src/conf_mode/vrf.py b/src/conf_mode/vrf.py
index c3e2d8efd..f79c8a21e 100755
--- a/src/conf_mode/vrf.py
+++ b/src/conf_mode/vrf.py
@@ -30,7 +30,6 @@ from vyos.util import get_interface_config
 from vyos.util import popen
 from vyos.util import run
 from vyos.util import sysctl_write
-from vyos.util import is_ipv6_enabled
 from vyos import ConfigError
 from vyos import frr
 from vyos import airbag
@@ -219,8 +218,7 @@ def apply(vrf):
             # We also should add proper loopback IP addresses to the newly added
             # VRF for services bound to the loopback address (SNMP, NTP)
             vrf_if.add_addr('127.0.0.1/8')
-            if is_ipv6_enabled():
-                vrf_if.add_addr('::1/128')
+            vrf_if.add_addr('::1/128')
             # add VRF description if available
             vrf_if.set_alias(config.get('description', ''))
 
diff --git a/src/migration-scripts/system/22-to-23 b/src/migration-scripts/system/22-to-23
new file mode 100755
index 000000000..7f832e48a
--- /dev/null
+++ b/src/migration-scripts/system/22-to-23
@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2022 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/>.
+
+import os
+
+from sys import exit, 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 = ['system', 'ipv6']
+config = ConfigTree(config_file)
+
+if not config.exists(base):
+    # Nothing to do
+    exit(0)
+
+# T4346: drop support to disbale IPv6 address family within the OS Kernel
+if config.exists(base + ['disable']):
+    config.delete(base + ['disable'])
+    # IPv6 address family disable was the only CLI option set - we can cleanup
+    # the entire tree
+    if len(config.list_nodes(base)) == 0:
+        config.delete(base)
+
+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)
diff --git a/src/tests/test_util.py b/src/tests/test_util.py
index 91890262c..8ac9a500a 100644
--- a/src/tests/test_util.py
+++ b/src/tests/test_util.py
@@ -26,13 +26,3 @@ class TestVyOSUtil(TestCase):
 
     def test_sysctl_read(self):
         self.assertEqual(sysctl_read('net.ipv4.conf.lo.forwarding'), '1')
-
-    def test_ipv6_enabled(self):
-        tmp = sysctl_read('net.ipv6.conf.all.disable_ipv6')
-        # We need to test for both variants as this depends on how the
-        # Docker container is started (with or without IPv6 support) - so we
-        # will simply check both cases to not make the users life miserable.
-        if tmp == '0':
-            self.assertTrue(is_ipv6_enabled())
-        else:
-            self.assertFalse(is_ipv6_enabled())