Add IPv6 support to netmask and gateway fields

Co-authored-by: BenjiReis <[email protected]>
Signed-off-by: Damien Thenot <[email protected]>

Author: Nambrok

XSConsoleData.py

@@ -980,21 +980,58 @@ def ManagementIP(self, inDefault = None):
 
     def ManagementNetmask(self, inDefault = None):
         retVal = inDefault
-
         for pif in self.derived.managementpifs([]):
-            retVal = pif['netmask']
-            if retVal:
-                break
+            ipv6 = pif['primary_address_type'].lower() == 'ipv6'
+            configuration_mode = pif['ipv6_configuration_mode'] if ipv6 else pif['ip_configuration_mode']
+            if configuration_mode.lower().startswith('static'):
+                # For static IP the API address is correct
+                retVal = pif['IPv6'][0].split('/')[1] if ipv6 else pif['netmask']
+            elif configuration_mode.lower().startswith('dhcp'):
+                # For DHCP,  find the gateway address by parsing the output from the 'route' command
+                if 'bridge' in pif['network']:
+                    device = pif['network']['bridge']
+                else:
+                    device = pif['device']
+
+                device = ShellUtils.MakeSafeParam(device)
+
+                ipre = r'[0-9a-f.:]+'
+                ifRE = re.compile(r'\s*inet\s+' + ipre + '\s+netmask\s+(' + ipre + r')\s+broadcast\s+(' + ipre + r')\s*$',
+                        re.IGNORECASE)
+
+                ifconfig = commands.getoutput("/sbin/ifconfig '"+device+"'").split("\n")
+                for line in ifconfig:
+                    match = ifRE.match(line)
+                    if match:
+                        retVal = match.group(1)
+                        break
 
         return retVal
 
     def ManagementGateway(self, inDefault = None):
         retVal = inDefault
 
         for pif in self.derived.managementpifs([]):
-            retVal = pif['gateway']
-            if retVal:
-                break
+            ipv6 = pif['primary_address_type'].lower() == 'ipv6'
+            configuration_mode = pif['ipv6_configuration_mode'] if ipv6 else pif['ip_configuration_mode']
+            if configuration_mode.lower().startswith('static'):
+                # For static IP the API address is correct
+                retVal = pif['ipv6_gateway'] if ipv6 else pif['gateway']
+            elif configuration_mode.lower().startswith('dhcp'):
+                # For DHCP,  find the gateway address by parsing the output from the 'route' command
+                if 'bridge' in pif['network']:
+                    device = pif['network']['bridge']
+                else:
+                    device = pif['device']
+                routeRE = re.compile(r'([0-9.]+)\s+([0-9.]+)\s+([0-9.]+)\s+UG\s+\d+\s+\d+\s+\d+\s+'+device,
+                    re.IGNORECASE)
+
+                routes = commands.getoutput("/sbin/route -n").split("\n")
+                for line in routes:
+                    match = routeRE.match(line)
+                    if match:
+                        retVal = match.group(2)
+                        break
 
         return retVal