DGNum/netbox-agent
6
0
Fork 0
Code Issues 28 Pull requests 9 Projects Releases 14 Packages Wiki Activity Actions

Merge pull request 'feat(network): Batch requests when filtering on interfaces' (#297) from Tom-Hubrecht/master into master

Browse source 
Reviewed-on: #297
This commit is contained in:
thubrecht 2024-10-21 10:01:35 +02:00
commit 59ce76fc29
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
netbox_agent/network.py
View file

@ -1,7 +1,7 @@
import logging import logging
import os import os
import re import re
from itertools import chain from itertools import chain, islice
import netifaces import netifaces
from netaddr import IPAddress from netaddr import IPAddress
@ -413,11 +413,16 @@ class Network(object):
# delete IP on netbox that are not known on this server # delete IP on netbox that are not known on this server
if len(nb_nics): if len(nb_nics):
netbox_ips = nb.ipam.ip_addresses.filter( def batched(it, n):
**{self.intf_type: [x.id for x in nb_nics]} while batch := tuple(islice(it, n)):
yield batch
netbox_ips = []
for ids in batched((x.id for x in nb_nics), 25):
netbox_ips += list(
nb.ipam.ip_addresses.filter(**{self.intf_type: ids})
) )
netbox_ips = list(netbox_ips)
all_local_ips = list(chain.from_iterable([ all_local_ips = list(chain.from_iterable([
x['ip'] for x in self.nics if x['ip'] is not None x['ip'] for x in self.nics if x['ip'] is not None
])) ]))