Merge branch 'develop' into develop-2.7

2026-01-07 04:27:27 -06:00 · 2020-01-02 17:21:15 -05:00
parent 65444899af c2dc243c7c
commit 1d63a30b7a
42 changed files with 2303 additions and 182 deletions
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -926,8 +926,8 @@ class InventoryItemFilter(DeviceComponentFilterSet):
        qs_filter = (
            Q(name__icontains=value) |
            Q(part_id__icontains=value) |
-            Q(serial__iexact=value) |
-            Q(asset_tag__iexact=value) |
+            Q(serial__icontains=value) |
+            Q(asset_tag__icontains=value) |
            Q(description__icontains=value)
        )
        return queryset.filter(qs_filter)
@@ -993,7 +993,7 @@ class CableFilter(django_filters.FilterSet):
    device_id = MultiValueNumberFilter(
        method='filter_device'
    )
-    device = MultiValueNumberFilter(
+    device = MultiValueCharFilter(
        method='filter_device',
        field_name='device__name'
    )
@@ -1036,9 +1036,12 @@ class ConsoleConnectionFilter(django_filters.FilterSet):
        method='filter_site',
        label='Site (slug)',
    )
-    device = django_filters.CharFilter(
+    device_id = MultiValueNumberFilter(
+        method='filter_device'
+    )
+    device = MultiValueCharFilter(
        method='filter_device',
-        label='Device',
+        field_name='device__name'
    )

    class Meta:
@@ -1051,11 +1054,11 @@ class ConsoleConnectionFilter(django_filters.FilterSet):
        return queryset.filter(connected_endpoint__device__site__slug=value)

    def filter_device(self, queryset, name, value):
-        if not value.strip():
+        if not value:
            return queryset
        return queryset.filter(
-            Q(device__name__icontains=value) |
-            Q(connected_endpoint__device__name__icontains=value)
+            Q(**{'{}__in'.format(name): value}) |
+            Q(**{'connected_endpoint__{}__in'.format(name): value})
        )


@@ -1064,9 +1067,12 @@ class PowerConnectionFilter(django_filters.FilterSet):
        method='filter_site',
        label='Site (slug)',
    )
-    device = django_filters.CharFilter(
+    device_id = MultiValueNumberFilter(
+        method='filter_device'
+    )
+    device = MultiValueCharFilter(
        method='filter_device',
-        label='Device',
+        field_name='device__name'
    )

    class Meta:
@@ -1079,11 +1085,11 @@ class PowerConnectionFilter(django_filters.FilterSet):
        return queryset.filter(_connected_poweroutlet__device__site__slug=value)

    def filter_device(self, queryset, name, value):
-        if not value.strip():
+        if not value:
            return queryset
        return queryset.filter(
-            Q(device__name__icontains=value) |
-            Q(_connected_poweroutlet__device__name__icontains=value)
+            Q(**{'{}__in'.format(name): value}) |
+            Q(**{'_connected_poweroutlet__{}__in'.format(name): value})
        )


@@ -1092,9 +1098,12 @@ class InterfaceConnectionFilter(django_filters.FilterSet):
        method='filter_site',
        label='Site (slug)',
    )
-    device = django_filters.CharFilter(
+    device_id = MultiValueNumberFilter(
+        method='filter_device'
+    )
+    device = MultiValueCharFilter(
        method='filter_device',
-        label='Device',
+        field_name='device__name'
    )

    class Meta:
@@ -1110,11 +1119,11 @@ class InterfaceConnectionFilter(django_filters.FilterSet):
        )

    def filter_device(self, queryset, name, value):
-        if not value.strip():
+        if not value:
            return queryset
        return queryset.filter(
-            Q(device__name__icontains=value) |
-            Q(_connected_interface__device__name__icontains=value)
+            Q(**{'{}__in'.format(name): value}) |
+            Q(**{'_connected_interface__{}__in'.format(name): value})
        )


--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1484,7 +1484,8 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldForm):
        widget=APISelect(
            api_url="/api/dcim/manufacturers/",
            filter_for={
-                'device_type': 'manufacturer_id'
+                'device_type': 'manufacturer_id',
+                'platform': 'manufacturer_id'
            }
        )
    )
@@ -1553,7 +1554,10 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldForm):
            ),
            'status': StaticSelect2(),
            'platform': APISelect(
-                api_url="/api/dcim/platforms/"
+                api_url="/api/dcim/platforms/",
+                additional_query_params={
+                    "manufacturer_id": "null"
+                }
            ),
            'primary_ip4': StaticSelect2(),
            'primary_ip6': StaticSelect2(),
@@ -1870,7 +1874,7 @@ class DeviceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditF
 class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilterForm, CustomFieldFilterForm):
    model = Device
    field_order = [
-        'q', 'region', 'site', 'rack_group_id', 'rack_id', 'status', 'role', 'tenant_group', 'tenant',
+        'q', 'region', 'site', 'group_id', 'rack_id', 'status', 'role', 'tenant_group', 'tenant',
        'manufacturer_id', 'device_type_id', 'mac_address', 'has_primary_ip',
    ]
    q = forms.CharField(
@@ -1896,12 +1900,12 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
            api_url="/api/dcim/sites/",
            value_field="slug",
            filter_for={
-                'rack_group_id': 'site',
+                'group_id': 'site',
                'rack_id': 'site',
            }
        )
    )
-    rack_group_id = FilterChoiceField(
+    group_id = FilterChoiceField(
        queryset=RackGroup.objects.prefetch_related(
            'site'
        ),
@@ -1909,7 +1913,7 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
        widget=APISelectMultiple(
            api_url="/api/dcim/rack-groups/",
            filter_for={
-                'rack_id': 'rack_group_id',
+                'rack_id': 'group_id',
            }
        )
    )
@@ -3605,9 +3609,13 @@ class CableFilterForm(BootstrapMixin, forms.Form):
        required=False,
        widget=ColorSelect()
    )
-    device = forms.CharField(
+    device_id = FilterChoiceField(
+        queryset=Device.objects.all(),
        required=False,
-        label='Device name'
+        label='Device',
+        widget=APISelectMultiple(
+            api_url='/api/dcim/devices/',
+        )
    )


@@ -3726,38 +3734,59 @@ class DeviceBayBulkRenameForm(BulkRenameForm):
 #

 class ConsoleConnectionFilterForm(BootstrapMixin, forms.Form):
-    site = forms.ModelChoiceField(
+    site = FilterChoiceField(
        queryset=Site.objects.all(),
-        required=False,
-        to_field_name='slug'
+        to_field_name='slug',
+        widget=APISelectMultiple(
+            api_url="/api/dcim/sites/",
+            value_field="slug",
+        )
    )
-    device = forms.CharField(
+    device_id = FilterChoiceField(
+        queryset=Device.objects.all(),
        required=False,
-        label='Device name'
+        label='Device',
+        widget=APISelectMultiple(
+            api_url='/api/dcim/devices/',
+        )
    )


 class PowerConnectionFilterForm(BootstrapMixin, forms.Form):
-    site = forms.ModelChoiceField(
+    site = FilterChoiceField(
        queryset=Site.objects.all(),
-        required=False,
-        to_field_name='slug'
+        to_field_name='slug',
+        widget=APISelectMultiple(
+            api_url="/api/dcim/sites/",
+            value_field="slug",
+        )
    )
-    device = forms.CharField(
+    device_id = FilterChoiceField(
+        queryset=Device.objects.all(),
        required=False,
-        label='Device name'
+        label='Device',
+        widget=APISelectMultiple(
+            api_url='/api/dcim/devices/',
+        )
    )


 class InterfaceConnectionFilterForm(BootstrapMixin, forms.Form):
-    site = forms.ModelChoiceField(
+    site = FilterChoiceField(
        queryset=Site.objects.all(),
-        required=False,
-        to_field_name='slug'
+        to_field_name='slug',
+        widget=APISelectMultiple(
+            api_url="/api/dcim/sites/",
+            value_field="slug",
+        )
    )
-    device = forms.CharField(
+    device_id = FilterChoiceField(
+        queryset=Device.objects.all(),
        required=False,
-        label='Device name'
+        label='Device',
+        widget=APISelectMultiple(
+            api_url='/api/dcim/devices/',
+        )
    )


@@ -3773,9 +3802,12 @@ class InventoryItemForm(BootstrapMixin, forms.ModelForm):
    class Meta:
        model = InventoryItem
        fields = [
-            'name', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description', 'tags',
+            'name', 'device', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description', 'tags',
        ]
        widgets = {
+            'device': APISelect(
+                api_url="/api/dcim/devices/"
+            ),
            'manufacturer': APISelect(
                api_url="/api/dcim/manufacturers/"
            )
@@ -3811,9 +3843,19 @@ class InventoryItemBulkEditForm(BootstrapMixin, BulkEditForm):
        queryset=InventoryItem.objects.all(),
        widget=forms.MultipleHiddenInput()
    )
+    device = forms.ModelChoiceField(
+        queryset=Device.objects.all(),
+        required=False,
+        widget=APISelect(
+            api_url="/api/dcim/devices/"
+        )
+    )
    manufacturer = forms.ModelChoiceField(
        queryset=Manufacturer.objects.all(),
-        required=False
+        required=False,
+        widget=APISelect(
+            api_url="/api/dcim/manufacturers/"
+        )
    )
    part_id = forms.CharField(
        max_length=50,
@@ -3837,18 +3879,25 @@ class InventoryItemFilterForm(BootstrapMixin, forms.Form):
        required=False,
        label='Search'
    )
-    device = forms.CharField(
+    device_id = FilterChoiceField(
+        queryset=Device.objects.all(),
        required=False,
-        label='Device name'
+        label='Device',
+        widget=APISelect(
+            api_url='/api/dcim/devices/',
+        )
    )
    manufacturer = FilterChoiceField(
        queryset=Manufacturer.objects.all(),
        to_field_name='slug',
-        null_label='-- None --'
+        widget=APISelect(
+            api_url="/api/dcim/manufacturers/",
+            value_field="slug",
+        )
    )
    discovered = forms.NullBooleanField(
        required=False,
-        widget=forms.Select(
+        widget=StaticSelect2(
            choices=BOOLEAN_WITH_BLANK_CHOICES
        )
    )
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -10,7 +10,7 @@ from django.contrib.postgres.fields import ArrayField, JSONField
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from django.db.models import Count, Q, Sum
+from django.db.models import Count, F, ProtectedError, Q, Sum
 from django.urls import reverse
 from django.utils.http import urlencode
 from mptt.models import MPTTModel, TreeForeignKey
@@ -2811,7 +2811,7 @@ class DeviceBay(ComponentModel):
        # Check that the installed device is not already installed elsewhere
        if self.installed_device:
            current_bay = DeviceBay.objects.filter(installed_device=self.installed_device).first()
-            if current_bay:
+            if current_bay and current_bay != self:
                raise ValidationError({
                    'installed_device': "Cannot install the specified device; device is already installed in {}".format(
                        current_bay
@@ -2944,6 +2944,24 @@ class VirtualChassis(ChangeLoggedModel):
                'master': "The selected master is not assigned to this virtual chassis."
            })

+    def delete(self, *args, **kwargs):
+
+        # Check for LAG interfaces split across member chassis
+        interfaces = Interface.objects.filter(
+            device__in=self.members.all(),
+            lag__isnull=False
+        ).exclude(
+            lag__device=F('device')
+        )
+        if interfaces:
+            raise ProtectedError(
+                "Unable to delete virtual chassis {}. There are member interfaces which form a cross-chassis "
+                "LAG".format(self),
+                interfaces
+            )
+
+        return super().delete(*args, **kwargs)
+
    def to_csv(self):
        return (
            self.master,