From ecf88f00ec4da073617e025ca97c8dc169a4b660 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Fri, 28 Oct 2022 12:34:04 -0500 Subject: [PATCH] Fix PEP8 errors --- netbox/dcim/filtersets.py | 2 +- netbox/dcim/forms/bulk_edit.py | 2 +- netbox/dcim/forms/model_forms.py | 5 ++--- netbox/dcim/models/devices.py | 1 + netbox/dcim/tables/devices.py | 2 +- netbox/dcim/views.py | 3 ++- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index 1c3562c79..e7221a893 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -1034,7 +1034,7 @@ class VirtualDeviceContextFilterSet(NetBoxModelFilterSet, TenancyFilterSet): class Meta: model = VirtualDeviceContext - fields = ['id', 'device', 'name',] + fields = ['id', 'device', 'name', ] class ModuleFilterSet(NetBoxModelFilterSet): diff --git a/netbox/dcim/forms/bulk_edit.py b/netbox/dcim/forms/bulk_edit.py index b8d45f55d..74c801289 100644 --- a/netbox/dcim/forms/bulk_edit.py +++ b/netbox/dcim/forms/bulk_edit.py @@ -1342,4 +1342,4 @@ class VirtualDeviceContextBulkEditForm(NetBoxModelBulkEditForm): fieldsets = ( (None, ('device',)), ) - nullable_fields = ('device', ) \ No newline at end of file + nullable_fields = ('device', ) diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py index e7264c620..061b550c1 100644 --- a/netbox/dcim/forms/model_forms.py +++ b/netbox/dcim/forms/model_forms.py @@ -397,7 +397,7 @@ class DeviceTypeForm(NetBoxModelForm): model = DeviceType fields = [ 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'subdevice_role', 'airflow', - 'vdc_type','vdc_type','weight', 'weight_unit', 'front_image', 'rear_image', 'comments', 'tags', + 'vdc_type', 'vdc_type', 'weight', 'weight_unit', 'front_image', 'rear_image', 'comments', 'tags', ] widgets = { 'airflow': StaticSelect(), @@ -1650,7 +1650,6 @@ class InventoryItemRoleForm(NetBoxModelForm): ] - class VirtualDeviceContextForm(TenancyForm, NetBoxModelForm): region = DynamicModelChoiceField( queryset=Region.objects.all(), @@ -1701,12 +1700,12 @@ class VirtualDeviceContextForm(TenancyForm, NetBoxModelForm): } ) - fieldsets = ( ('Device', ('region', 'site_group', 'site', 'location', 'rack', 'device')), ('Virtual Device Context', ('name', 'identifier', 'primary_ip4', 'primary_ip6', 'tenant_group', 'tenant')), (None, ('tags', )) ) + class Meta: model = VirtualDeviceContext fields = [ diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index e1e4fa110..6d2ea42cf 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -1137,6 +1137,7 @@ class VirtualChassis(NetBoxModel): return super().delete(*args, **kwargs) + class VirtualDeviceContext(NetBoxModel): device = models.ForeignKey( to='Device', diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index 63ae35dbd..efa8ee111 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -938,4 +938,4 @@ class VirtualDeviceContextTable(TenancyColumnsMixin, NetBoxTable): ) default_columns = ( 'pk', 'name', 'identifier', 'tenant', 'primary_ip', - ) \ No newline at end of file + ) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 4fc2c2f1c..50d3a082e 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -3606,6 +3606,8 @@ class VirtualDeviceContextBulkRenameView(generic.BulkRenameView): queryset = VirtualDeviceContext.objects.all() filterset = filtersets.VirtualDeviceContextFilterSet table = tables.VirtualDeviceContextTable + + class VirtualDeviceContextBulkEditView(generic.BulkEditView): queryset = VirtualDeviceContext.objects.all() filterset = filtersets.VirtualDeviceContextFilterSet @@ -3613,7 +3615,6 @@ class VirtualDeviceContextBulkEditView(generic.BulkEditView): form = forms.VirtualDeviceContextBulkEditForm - class VirtualDeviceContextBulkDeleteView(generic.BulkDeleteView): queryset = VirtualDeviceContext.objects.all() filterset = filtersets.VirtualDeviceContextFilterSet