drygdryg/netbox-plugin-device-map
1
0
Fork 0
mirror of https://github.com/drygdryg/netbox-plugin-device-map.git synced 2025-02-18 11:02:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge c2d6b459c5 into 03092bcf31

Browse Source
This commit is contained in:
Seb Harrington 2024-08-08 16:36:42 -07:00 committed by GitHub
commit 7e4c19a7c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netbox_device_map/forms.py
View File

@ -15,6 +15,7 @@ class DeviceMapFilterForm(BootstrapMixin, forms.Form):
)
vlan = DynamicModelChoiceField(
queryset=VLAN.objects.all(),
required=False,
label="VLAN",
help_text="Filter devices by VLAN attached to any device interface",
query_params={"group_id": "$vlan_group"}

5
netbox_device_map/helpers.py
View File

@ -14,7 +14,10 @@ LatLon = tuple[float, float]
def get_device_location(device: Device) -> LatLon | None:
"""Extract device geolocation from special custom field"""
"""If netbox latitude and longitude fields are populated for a device then use them."""
if device.latitude and device.longitude:
return (device.latitude, device.longitude)
"""... Otherwise extract device geolocation from special custom field"""
if location_cf := device.custom_field_data.get(LOCATION_CF_NAME):
return tuple(map(float, location_cf.replace(' ', '').split(',', maxsplit=1)))

21
netbox_device_map/views.py
View File

@ -25,19 +25,20 @@ class MapView(PermissionRequiredMixin, View):
"""Device map view"""
form = self.form(request.GET)
if form.is_valid():
interfaces = Interface.objects.all()
vlan = form.cleaned_data['vlan']
#interfaces = Interface.objects.all()
#vlan = form.cleaned_data['vlan']
interfaces = interfaces.filter(Q(untagged_vlan=vlan) | Q(tagged_vlans=vlan))
devices = Device.objects.filter(interfaces__in=interfaces).distinct()
#interfaces = interfaces.filter(Q(untagged_vlan=vlan) | Q(tagged_vlans=vlan))
devices = Device.objects.all().distinct()
if device_roles := form.cleaned_data['device_roles']:
devices = devices.filter(device_role__in=device_roles)
devices = devices.filter(role__in=device_roles)
print(f"Device roles are :{device_roles}")
geolocated_devices = {d: coords for d in devices if (coords := get_device_location(d))}
non_geolocated_devices = set(devices) - set(geolocated_devices.keys())
map_data = configure_leaflet_map("geomap", geolocated_devices, form.cleaned_data['calculate_connections'])
map_data['vlan'] = vlan.id
#map_data['vlan'] = vlan.id
return render(request, self.template_name, context=dict(
filter_form=form, map_data=map_data, non_geolocated_devices=non_geolocated_devices
))
@ -61,12 +62,12 @@ class ConnectedCpeAjaxView(PermissionRequiredMixin, View):
form = self.form(request.GET)
if form.is_valid():
data = form.cleaned_data
connected_devices_qs = get_connected_devices(device, vlan=data['vlan'])\
.filter(device_role__name=plugin_settings['cpe_device_role']).order_by()
connected_devices_qs = get_connected_devices(device, vlan=data['vlan'])
#\
# .filter(device_role__name=plugin_settings['cpe_device_role']).order_by()
connected_devices = [dict(id=d.id, name=d.name, url=d.get_absolute_url(), comments=d.comments)
for d in connected_devices_qs]
# Sorting list of CPE devices by the sequence of integers contained in the comments
connected_devices.sort(key=lambda d: tuple(int(n) for n in INTEGER_REGEXP.findall(d['comments'])))
return JsonResponse(dict(status=True, cpe_devices=connected_devices,
device_type=f'{device.device_type.manufacturer.name} {device.device_type.model}'))
else: