crans
/
ansible
mirror of http://gitlab.adm.crans.org/nounous/ansible.git
19
0
Fork 0
Code Issues Projects Releases Wiki Activity

[re2o_lookup] Fix IP address range retrieval.

certbot_on_virtu
_pollion 2020-05-17 21:10:00 +02:00
parent 9e4e71dbbd
commit 11b3383972
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lookup_plugins/re2oapi.py
View File

@ -566,7 +566,7 @@ class LookupModule(LookupBase):
prefixes = [] prefixes = []
while dterms: while dterms:
subnet_name = dterms.popleft() subnet_name = dterms.popleft()
prefixes.append(self._get_prefix(api_client, subnet_name)) prefixes.append([self._get_prefix(api_client, subnet_name)])
if prefixes: if prefixes:
res.extend(prefixes) res.extend(prefixes)
else: else:
@ -576,7 +576,7 @@ class LookupModule(LookupBase):
cidrs = [] cidrs = []
while dterms: while dterms:
subnet_name = dterms.popleft() subnet_name = dterms.popleft()
cidrs.append(self._get_cidrs(api_client, subnet_name)) cidrs.append([self._get_cidrs(api_client, subnet_name)])
if cidrs: if cidrs:
res.extend(cidrs) res.extend(cidrs)
else: else:
@ -770,7 +770,7 @@ class LookupModule(LookupBase):
iptype = list(filter(lambda x: x['type'] == subnet_name, Mtypes))[0] iptype = list(filter(lambda x: x['type'] == subnet_name, Mtypes))[0]
ips = iptype['domaine_ip_start'] ips = iptype['domaine_ip_start']
ipe = iptype['domaine_ip_stop'] ipe = iptype['domaine_ip_stop']
cidrs = str(netaddr.iprange_to_cidrs(ips, ipe)[0]) cidrs = list(map(lambda a: str(a), netaddr.iprange_to_cidrs(ips, ipe)))
display.vvv("Storing subnet {} in cache".format(subnet_name)) display.vvv("Storing subnet {} in cache".format(subnet_name))
self._set_cache(subnet_name, cidrs) self._set_cache(subnet_name, cidrs)
return cidrs return cidrs