diff options
author | Håkon Solbjørg <hakon@solbj.org> | 2023-03-24 22:35:05 +0100 |
---|---|---|
committer | Håkon Solbjørg <hakon@solbj.org> | 2023-03-24 22:35:05 +0100 |
commit | 2b8233cedb99955bed82bf83793ba4b5fb18c511 (patch) | |
tree | 44a3b58a9d2cfbfb95ea356be05e4d5416035694 /tools/netbox/scripts/netbox2gondul/netbox2gondul.py | |
parent | 9ba884b5c483c1c7a8f8076c1d038162f07dbe5e (diff) |
fix(nb2gondul): Get the direct parent network for this addr instead of all parents
Diffstat (limited to 'tools/netbox/scripts/netbox2gondul/netbox2gondul.py')
-rw-r--r-- | tools/netbox/scripts/netbox2gondul/netbox2gondul.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/netbox/scripts/netbox2gondul/netbox2gondul.py b/tools/netbox/scripts/netbox2gondul/netbox2gondul.py index 61af762..5ad0de1 100644 --- a/tools/netbox/scripts/netbox2gondul/netbox2gondul.py +++ b/tools/netbox/scripts/netbox2gondul/netbox2gondul.py @@ -8,7 +8,7 @@ from dcim.choices import DeviceStatusChoices, InterfaceModeChoices, InterfaceTyp from dcim.models import Cable, CableTermination, Device, DeviceRole, DeviceType, Interface, Manufacturer, Site from extras.scripts import * from ipam.models import IPAddress, Prefix, VLAN -from ipam.lookups import NetContainsOrEquals +from ipam.lookups import NetHostContained import ipaddress import json @@ -191,14 +191,14 @@ class Netbox2Gondul(Script): vlan: VLAN = None prefix_v4: Prefix = None if device.primary_ip4: - prefix_v4 = Prefix.objects.get(NetContainsOrEquals(F('prefix'), str(device.primary_ip4.address))) + prefix_v4 = Prefix.objects.get(NetHostContained(F('prefix'), str(device.primary_ip4))) vlan = prefix_v4.vlan else: self.log_warning(f'Device <a href="{device.get_absolute_url()}">{device.name}</a> is missing primary IPv4 address.') prefix_v6: Prefix = None if device.primary_ip6: - prefix_v6 = Prefix.objects.get(NetContainsOrEquals(F('prefix'), str(device.primary_ip6.address))) + prefix_v6 = Prefix.objects.get(NetHostContained(F('prefix'), str(device.primary_ip6))) vlan = prefix_v6.vlan else: self.log_warning(f'Device <a href="{device.get_absolute_url()}">{device.name}</a> is missing primary IPv6 address.') |