From 19745b8f19163e042f4ce08c395ea9b05b3b8662 Mon Sep 17 00:00:00 2001 From: Damien Thenot Date: Thu, 16 Nov 2023 16:28:51 +0100 Subject: [PATCH] Add IPv6 support to netmask and gateway fields Co-authored-by: BenjiReis Signed-off-by: Damien Thenot --- XSConsoleData.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/XSConsoleData.py b/XSConsoleData.py index a7a0784..6106457 100644 --- a/XSConsoleData.py +++ b/XSConsoleData.py @@ -982,7 +982,11 @@ def ManagementNetmask(self, inDefault = None): retVal = inDefault for pif in self.derived.managementpifs([]): - retVal = pif['netmask'] + ipv6 = pif['primary_address_type'].lower() == 'ipv6' + try: + retVal = pif['IPv6'][0].split('/')[1] if ipv6 else pif['netmask'] + except IndexError: + return '' if retVal: break @@ -992,7 +996,8 @@ def ManagementGateway(self, inDefault = None): retVal = inDefault for pif in self.derived.managementpifs([]): - retVal = pif['gateway'] + ipv6 = pif['primary_address_type'].lower() == 'ipv6' + retVal = pif['ipv6_gateway'] if ipv6 else pif['gateway'] if retVal: break