rebase me: refactor NetInterface creation

Create a specific class to init IPv6 NetInterface

Signed-off-by: BenjiReis <benjamin.reis@vates.fr>

Author: benjamreis

netinterface.py

@@ -24,7 +24,7 @@ class NetInterface:
     Autoconf = 3
 
     def __init__(self, mode, hwaddr, ipaddr=None, netmask=None, gateway=None,
-                 dns=None, domain=None, vlan=None, ipv6=False):
+                 dns=None, domain=None, vlan=None):
         assert mode in [None, self.Static, self.DHCP, self.Autoconf]
         if ipaddr == '':
             ipaddr = None
@@ -36,31 +36,23 @@ def __init__(self, mode, hwaddr, ipaddr=None, netmask=None, gateway=None,
             dns = None
         elif isinstance(dns, str):
             dns = [ dns ]
-        if mode == self.Static:
+        is_static = mode == self.Static
+        if is_static:
             assert ipaddr and netmask
 
         self.hwaddr = hwaddr
-        if ipv6:
-            self.mode = None
-            self.ipaddr = None
-            self.netmask = None
-            self.gateway = None
-
-            self.modev6 = mode
-            self.ipv6addr = ipaddr + "/" + netmask if mode == self.Static else None
-            self.ipv6_gateway = gateway if mode == self.Static else None
-        else:
-            self.modev6 = None
-            self.ipv6addr = None
-            self.ipv6_gateway = None
 
-            self.mode = mode
-            self.ipaddr = ipaddr if mode == self.Static else None
-            self.netmask = netmask if mode == self.Static else None
-            self.gateway = gateway if mode == self.Static else None
+        self.modev6 = None
+        self.ipv6addr = None
+        self.ipv6_gateway = None
 
-        self.dns = dns if mode == self.Static else None
-        self.domain = domain if mode == self.Static else None
+        self.mode = mode
+        self.ipaddr = ipaddr if is_static else None
+        self.netmask = netmask if is_static else None
+        self.gateway = gateway if is_static else None
+
+        self.dns = dns if is_static else None
+        self.domain = domain if is_static else None
         self.vlan = vlan
 
     def __repr__(self):
@@ -377,3 +369,15 @@ def loadFromNetDb(jdata, hwaddr):
 
         nic.addIPv6(modev6, ipv6addr, gatewayv6)
         return nic
+
+class NetInterfaceV6(NetInterface):
+    def __init__(self, mode, hwaddr, ipaddr=None, netmask=None, gateway=None, dns=None, domain=None, vlan=None):
+        super().__init__(None, hwaddr, None, None, None, dns, domain, vlan)
+
+        is_static = mode == self.Static
+        ipv6addr = None
+        if is_static:
+            assert ipaddr and netmask
+            ipv6addr = ipaddr + "/" + netmask
+
+        self.addIPv6(mode, ipv6addr=ipv6addr, ipv6gw=gateway)

tui/network.py

@@ -295,13 +295,13 @@ def use_vlan_cb_change():
 
         vlan_value = int(vlan_field.value()) if vlan_cb.selected() else None
         if bool(dhcp_rb.selected()):
-            answers = NetInterface(NetInterface.DHCP, nic.hwaddr, vlan=vlan_value, ipv6=True)
+            answers = NetInterfaceV6(NetInterface.DHCP, nic.hwaddr, vlan=vlan_value)
         elif bool(autoconf_rb.selected()):
-            answers = NetInterface(NetInterface.Autoconf, nic.hwaddr, vlan=vlan_value, ipv6=True)
+            answers = NetInterfaceV6(NetInterface.Autoconf, nic.hwaddr, vlan=vlan_value)
         else:
-            answers = NetInterface(NetInterface.Static, nic.hwaddr, ip_field.value(),
+            answers = NetInterfaceV6(NetInterface.Static, nic.hwaddr, ip_field.value(),
                             subnet_field.value(), gateway_field.value(),
-                            dns_field.value(), vlan=vlan_value, ipv6=True)
+                            dns_field.value(), vlan=vlan_value)
 
         return RIGHT_FORWARDS, answers