From 9fe156601bf30d3798584784b5132ba010184a3a Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 25 Jul 2022 15:54:07 -0400 Subject: [PATCH] Add netmask to net config data Some clients may want to consume netmask without going to the trouble of converting, so provide the extra data a different way. --- confluent_server/confluent/netutil.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/confluent_server/confluent/netutil.py b/confluent_server/confluent/netutil.py index 74348890..feb0f02f 100644 --- a/confluent_server/confluent/netutil.py +++ b/confluent_server/confluent/netutil.py @@ -287,6 +287,11 @@ def get_flat_net_config(configmanager, node): ret.append(nc) return ret +def add_netmask(ncfg): + if '/' in ncfg['ipv4_address']: + plen = ncfg['ipv4_address'].split('/', 1)[1] + ncfg['ipv4_netmask'] = cidr_to_mask(int(plen)) + def get_full_net_config(configmanager, node, serverip=None): cfd = configmanager.get_node_attributes(node, ['net.*']) cfd = cfd.get(node, {}) @@ -319,8 +324,11 @@ def get_full_net_config(configmanager, node, serverip=None): retattrs = {} if None in nm.myattribs: retattrs['default'] = nm.myattribs[None] + add_netmask(retattrs['default']) del nm.myattribs[None] retattrs['extranets'] = nm.myattribs + for attri in retattrs['extranets']: + add_netmask(retattrs['extranets'][attri]) return retattrs