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

3 files changed, 46 insertions, 61 deletions

diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index 5b2760386..6b0f08fd4 100755
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -38,7 +38,6 @@ from vyos.util import read_file
 from vyos.util import get_interface_config
 from vyos.util import get_interface_namespace
 from vyos.util import is_systemd_service_active
-from vyos.util import is_ipv6_enabled
 from vyos.template import is_ipv4
 from vyos.template import is_ipv6
 from vyos.validate import is_intf_addr_assigned
@@ -1080,12 +1079,6 @@ class Interface(Control):
         if addr in self._addr:
             return False
 
-        addr_is_v4 = is_ipv4(addr)
-
-        # Failsave - do not add IPv6 address if IPv6 is disabled
-        if is_ipv6(addr) and not is_ipv6_enabled():
-            return False
-
         # add to interface
         if addr == 'dhcp':
             self.set_dhcp(True)
@@ -1517,50 +1510,48 @@ class Interface(Control):
         if 'mtu' in config:
             self.set_mtu(config.get('mtu'))
 
-        # Only change IPv6 parameters if IPv6 was not explicitly disabled
-        if is_ipv6_enabled():
-            # Configure MSS value for IPv6 TCP connections
-            tmp = dict_search('ipv6.adjust_mss', config)
-            value = tmp if (tmp != None) else '0'
-            self.set_tcp_ipv6_mss(value)
-
-            # IPv6 forwarding
-            tmp = dict_search('ipv6.disable_forwarding', config)
-            value = '0' if (tmp != None) else '1'
-            self.set_ipv6_forwarding(value)
-
-            # IPv6 router advertisements
-            tmp = dict_search('ipv6.address.autoconf', config)
-            value = '2' if (tmp != None) else '1'
-            if 'dhcpv6' in new_addr:
-                value = '2'
-            self.set_ipv6_accept_ra(value)
-
-            # IPv6 address autoconfiguration
-            tmp = dict_search('ipv6.address.autoconf', config)
-            value = '1' if (tmp != None) else '0'
-            self.set_ipv6_autoconf(value)
-
-            # IPv6 Duplicate Address Detection (DAD) tries
-            tmp = dict_search('ipv6.dup_addr_detect_transmits', config)
-            value = tmp if (tmp != None) else '1'
-            self.set_ipv6_dad_messages(value)
-
-            # Delete old IPv6 EUI64 addresses before changing MAC
-            for addr in (dict_search('ipv6.address.eui64_old', config) or []):
-                self.del_ipv6_eui64_address(addr)
-
-            # Manage IPv6 link-local addresses
-            if dict_search('ipv6.address.no_default_link_local', config) != None:
-                self.del_ipv6_eui64_address('fe80::/64')
-            else:
-                self.add_ipv6_eui64_address('fe80::/64')
+        # Configure MSS value for IPv6 TCP connections
+        tmp = dict_search('ipv6.adjust_mss', config)
+        value = tmp if (tmp != None) else '0'
+        self.set_tcp_ipv6_mss(value)
+
+        # IPv6 forwarding
+        tmp = dict_search('ipv6.disable_forwarding', config)
+        value = '0' if (tmp != None) else '1'
+        self.set_ipv6_forwarding(value)
+
+        # IPv6 router advertisements
+        tmp = dict_search('ipv6.address.autoconf', config)
+        value = '2' if (tmp != None) else '1'
+        if 'dhcpv6' in new_addr:
+            value = '2'
+        self.set_ipv6_accept_ra(value)
+
+        # IPv6 address autoconfiguration
+        tmp = dict_search('ipv6.address.autoconf', config)
+        value = '1' if (tmp != None) else '0'
+        self.set_ipv6_autoconf(value)
+
+        # IPv6 Duplicate Address Detection (DAD) tries
+        tmp = dict_search('ipv6.dup_addr_detect_transmits', config)
+        value = tmp if (tmp != None) else '1'
+        self.set_ipv6_dad_messages(value)
+
+        # Delete old IPv6 EUI64 addresses before changing MAC
+        for addr in (dict_search('ipv6.address.eui64_old', config) or []):
+            self.del_ipv6_eui64_address(addr)
+
+        # Manage IPv6 link-local addresses
+        if dict_search('ipv6.address.no_default_link_local', config) != None:
+            self.del_ipv6_eui64_address('fe80::/64')
+        else:
+            self.add_ipv6_eui64_address('fe80::/64')
 
-            # Add IPv6 EUI-based addresses
-            tmp = dict_search('ipv6.address.eui64', config)
-            if tmp:
-                for addr in tmp:
-                    self.add_ipv6_eui64_address(addr)
+        # Add IPv6 EUI-based addresses
+        tmp = dict_search('ipv6.address.eui64', config)
+        if tmp:
+            for addr in tmp:
+                self.add_ipv6_eui64_address(addr)
 
         # re-add ourselves to any bridge we might have fallen out of
         if 'is_bridge_member' in config:
diff --git a/python/vyos/ifconfig/loopback.py b/python/vyos/ifconfig/loopback.py
index 30c890fdf..b3babfadc 100644
--- a/python/vyos/ifconfig/loopback.py
+++ b/python/vyos/ifconfig/loopback.py
@@ -14,7 +14,6 @@
 # License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 from vyos.ifconfig.interface import Interface
-from vyos.util import is_ipv6_enabled
 
 @Interface.register
 class LoopbackIf(Interface):
@@ -58,15 +57,14 @@ class LoopbackIf(Interface):
         interface setup code and provide a single point of entry when workin
         on any interface. """
 
-        addr = config.get('address', [])
-
+        address = config.get('address', [])
         # We must ensure that the loopback addresses are never deleted from the system
-        addr.append('127.0.0.1/8')
-        if is_ipv6_enabled():
-            addr.append('::1/128')
+        for tmp in self._persistent_addresses:
+            if tmp not in address:
+                address.append(tmp)
 
         # Update IP address entry in our dictionary
-        config.update({'address' : addr})
+        config.update({'address' : address})
 
         # call base class
         super().update(config)
diff --git a/python/vyos/util.py b/python/vyos/util.py
index 0bf6b699e..de55e108b 100644
--- a/python/vyos/util.py
+++ b/python/vyos/util.py
@@ -1024,7 +1024,3 @@ def sysctl_write(name, value):
         call(f'sysctl -wq {name}={value}')
         return True
     return False
-
-def is_ipv6_enabled() -> bool:
-    """ Check if IPv6 support on the system is enabled or not """
-    return (sysctl_read('net.ipv6.conf.all.disable_ipv6') == '0')