Commit eec09ece authored by Xavier Thompson's avatar Xavier Thompson

slapformat: Fix ipv6 range parsing from definition

Due to typo, ipv4 address was wrongly used when loading ipv6 range
from computer definition file. Also, prefixlength was misleadingly
loaded as netmask.
parent 1965c63c
...@@ -1464,9 +1464,15 @@ def parse_computer_definition(conf, definition_path): ...@@ -1464,9 +1464,15 @@ def parse_computer_definition(conf, definition_path):
address_list.append(dict(addr=address, netmask=netmask)) address_list.append(dict(addr=address, netmask=netmask))
if computer_definition.has_option(section, 'ipv6_range'): if computer_definition.has_option(section, 'ipv6_range'):
ipv6_range_network = computer_definition.get(section, 'ipv6_range') ipv6_range_network = computer_definition.get(section, 'ipv6_range')
addr, netmask = ipv6_range_network.split('/') ipv6_range_addr, ipv6_range_prefixlen = ipv6_range_network.split('/')
netmask = netmaskFromLenIPv6(int(netmask)) ipv6_range_prefixlen = int(ipv6_range_prefixlen)
ipv6_range = {'addr' : address, 'netmask' : netmask, 'network' : ipv6_range_network} ipv6_range_netmask = netmaskFromLenIPv6(ipv6_range_prefixlen)
ipv6_range = {
'addr' : ipv6_range_addr,
'netmask' : ipv6_range_netmask,
'network' : ipv6_range_network,
'prefixlen': ipv6_range_prefixlen,
}
else: else:
ipv6_range = {} ipv6_range = {}
tap = Tap(computer_definition.get(section, 'network_interface')) tap = Tap(computer_definition.get(section, 'network_interface'))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment