Skip to content

Commit 751574e

Browse files
ryanmerolleryanmerolle
committed
lint updates
1 parent c8575d6 commit 751574e

File tree

3 files changed

+114
-51
lines changed

3 files changed

+114
-51
lines changed

‎.github/linters/.jscpd.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"threshold": 0.5
3+
}

‎netbox_acls/forms/filtersets.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ class AccessListFilterForm(NetBoxModelFilterSetForm):
5555
site = DynamicModelChoiceField(
5656
queryset=Site.objects.all(),
5757
required=False,
58-
query_params={
59-
"region_id": "$region",
60-
"group_id": "$site_group"
61-
}
58+
query_params={"region_id": "$region", "group_id": "$site_group"},
6259
)
6360
device = DynamicModelChoiceField(
6461
queryset=Device.objects.all(),
@@ -123,10 +120,7 @@ class ACLInterfaceAssignmentFilterForm(NetBoxModelFilterSetForm):
123120
site = DynamicModelChoiceField(
124121
queryset=Site.objects.all(),
125122
required=False,
126-
query_params={
127-
"region_id": "$region",
128-
"group_id": "$site_group"
129-
}
123+
query_params={"region_id": "$region", "group_id": "$site_group"},
130124
)
131125
device = DynamicModelChoiceField(
132126
queryset=Device.objects.all(),

‎netbox_acls/migrations/0002_alter_accesslist_options_and_more.py

Lines changed: 109 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,160 @@
11
# Generated by Django 4.0.8 on 2023-01-21 09:00
22

33
import django.core.validators
4-
from django.db import migrations, models
54
import django.db.models.deletion
5+
from django.db import migrations, models
66

77

88
class Migration(migrations.Migration):
99

1010
dependencies = [
11-
('contenttypes', '0002_remove_content_type_name'),
12-
('netbox_acls', '0001_initial'),
11+
("contenttypes", "0002_remove_content_type_name"),
12+
("netbox_acls", "0001_initial"),
1313
]
1414

1515
operations = [
1616
migrations.AlterModelOptions(
17-
name='accesslist',
18-
options={'ordering': ['assigned_object_type', 'assigned_object_id', 'name'], 'verbose_name': 'Access List', 'verbose_name_plural': 'Access Lists'},
17+
name="accesslist",
18+
options={
19+
"ordering": ["assigned_object_type", "assigned_object_id", "name"],
20+
"verbose_name": "Access List",
21+
"verbose_name_plural": "Access Lists",
22+
},
1923
),
2024
migrations.AlterModelOptions(
21-
name='aclextendedrule',
22-
options={'ordering': ['access_list', 'index'], 'verbose_name': 'ACL Extended Rule', 'verbose_name_plural': 'ACL Extended Rules'},
25+
name="aclextendedrule",
26+
options={
27+
"ordering": ["access_list", "index"],
28+
"verbose_name": "ACL Extended Rule",
29+
"verbose_name_plural": "ACL Extended Rules",
30+
},
2331
),
2432
migrations.AlterModelOptions(
25-
name='aclinterfaceassignment',
26-
options={'ordering': ['assigned_object_type', 'assigned_object_id', 'access_list', 'direction'], 'verbose_name': 'ACL Interface Assignment', 'verbose_name_plural': 'ACL Interface Assignments'},
33+
name="aclinterfaceassignment",
34+
options={
35+
"ordering": [
36+
"assigned_object_type",
37+
"assigned_object_id",
38+
"access_list",
39+
"direction",
40+
],
41+
"verbose_name": "ACL Interface Assignment",
42+
"verbose_name_plural": "ACL Interface Assignments",
43+
},
2744
),
2845
migrations.AlterModelOptions(
29-
name='aclstandardrule',
30-
options={'ordering': ['access_list', 'index'], 'verbose_name': 'ACL Standard Rule', 'verbose_name_plural': 'ACL Standard Rules'},
46+
name="aclstandardrule",
47+
options={
48+
"ordering": ["access_list", "index"],
49+
"verbose_name": "ACL Standard Rule",
50+
"verbose_name_plural": "ACL Standard Rules",
51+
},
3152
),
3253
migrations.AlterField(
33-
model_name='accesslist',
34-
name='assigned_object_id',
54+
model_name="accesslist",
55+
name="assigned_object_id",
3556
field=models.PositiveBigIntegerField(),
3657
),
3758
migrations.AlterField(
38-
model_name='accesslist',
39-
name='assigned_object_type',
40-
field=models.ForeignKey(limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'dcim'), ('model', 'device')), models.Q(('app_label', 'dcim'), ('model', 'virtualchassis')), models.Q(('app_label', 'virtualization'), ('model', 'virtualmachine')), _connector='OR')), on_delete=django.db.models.deletion.PROTECT, to='contenttypes.contenttype'),
59+
model_name="accesslist",
60+
name="assigned_object_type",
61+
field=models.ForeignKey(
62+
limit_choices_to=models.Q(
63+
models.Q(
64+
models.Q(("app_label", "dcim"), ("model", "device")),
65+
models.Q(("app_label", "dcim"), ("model", "virtualchassis")),
66+
models.Q(
67+
("app_label", "virtualization"), ("model", "virtualmachine")
68+
),
69+
_connector="OR",
70+
)
71+
),
72+
on_delete=django.db.models.deletion.PROTECT,
73+
to="contenttypes.contenttype",
74+
),
4175
),
4276
migrations.AlterField(
43-
model_name='accesslist',
44-
name='name',
45-
field=models.CharField(max_length=500, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z,-,_]*$', 'Only alphanumeric, hyphens, and underscores characters are allowed.')]),
77+
model_name="accesslist",
78+
name="name",
79+
field=models.CharField(
80+
max_length=500,
81+
validators=[
82+
django.core.validators.RegexValidator(
83+
"^[0-9a-zA-Z,-,_]*$",
84+
"Only alphanumeric, hyphens, and underscores characters are allowed.",
85+
)
86+
],
87+
),
4688
),
4789
migrations.AlterField(
48-
model_name='accesslist',
49-
name='type',
90+
model_name="accesslist",
91+
name="type",
5092
field=models.CharField(max_length=30),
5193
),
5294
migrations.AlterField(
53-
model_name='aclextendedrule',
54-
name='access_list',
55-
field=models.ForeignKey(limit_choices_to={'type': 'extended'}, on_delete=django.db.models.deletion.CASCADE, related_name='aclextendedrules', to='netbox_acls.accesslist'),
95+
model_name="aclextendedrule",
96+
name="access_list",
97+
field=models.ForeignKey(
98+
limit_choices_to={"type": "extended"},
99+
on_delete=django.db.models.deletion.CASCADE,
100+
related_name="aclextendedrules",
101+
to="netbox_acls.accesslist",
102+
),
56103
),
57104
migrations.AlterField(
58-
model_name='aclextendedrule',
59-
name='remark',
60-
field=models.CharField(blank=True, default='', max_length=500),
105+
model_name="aclextendedrule",
106+
name="remark",
107+
field=models.CharField(blank=True, default="", max_length=500),
61108
preserve_default=False,
62109
),
63110
migrations.AlterField(
64-
model_name='aclinterfaceassignment',
65-
name='access_list',
66-
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='netbox_acls.accesslist'),
111+
model_name="aclinterfaceassignment",
112+
name="access_list",
113+
field=models.ForeignKey(
114+
on_delete=django.db.models.deletion.CASCADE, to="netbox_acls.accesslist"
115+
),
67116
),
68117
migrations.AlterField(
69-
model_name='aclinterfaceassignment',
70-
name='assigned_object_id',
118+
model_name="aclinterfaceassignment",
119+
name="assigned_object_id",
71120
field=models.PositiveBigIntegerField(),
72121
),
73122
migrations.AlterField(
74-
model_name='aclinterfaceassignment',
75-
name='assigned_object_type',
76-
field=models.ForeignKey(limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'dcim'), ('model', 'interface')), models.Q(('app_label', 'virtualization'), ('model', 'vminterface')), _connector='OR')), on_delete=django.db.models.deletion.PROTECT, to='contenttypes.contenttype'),
123+
model_name="aclinterfaceassignment",
124+
name="assigned_object_type",
125+
field=models.ForeignKey(
126+
limit_choices_to=models.Q(
127+
models.Q(
128+
models.Q(("app_label", "dcim"), ("model", "interface")),
129+
models.Q(
130+
("app_label", "virtualization"), ("model", "vminterface")
131+
),
132+
_connector="OR",
133+
)
134+
),
135+
on_delete=django.db.models.deletion.PROTECT,
136+
to="contenttypes.contenttype",
137+
),
77138
),
78139
migrations.AlterField(
79-
model_name='aclinterfaceassignment',
80-
name='direction',
140+
model_name="aclinterfaceassignment",
141+
name="direction",
81142
field=models.CharField(max_length=30),
82143
),
83144
migrations.AlterField(
84-
model_name='aclstandardrule',
85-
name='access_list',
86-
field=models.ForeignKey(limit_choices_to={'type': 'standard'}, on_delete=django.db.models.deletion.CASCADE, related_name='aclstandardrules', to='netbox_acls.accesslist'),
145+
model_name="aclstandardrule",
146+
name="access_list",
147+
field=models.ForeignKey(
148+
limit_choices_to={"type": "standard"},
149+
on_delete=django.db.models.deletion.CASCADE,
150+
related_name="aclstandardrules",
151+
to="netbox_acls.accesslist",
152+
),
87153
),
88154
migrations.AlterField(
89-
model_name='aclstandardrule',
90-
name='remark',
91-
field=models.CharField(blank=True, default='', max_length=500),
155+
model_name="aclstandardrule",
156+
name="remark",
157+
field=models.CharField(blank=True, default="", max_length=500),
92158
preserve_default=False,
93159
),
94160
]

0 commit comments

Comments
 (0)