Skip to content

Commit 4315c46

Browse files
committed
Ignore default field values which reference ConfigItems when calculating migrations
1 parent b77013c commit 4315c46

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

netbox/dcim/migrations/0001_squashed.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -386,9 +386,9 @@ class Migration(migrations.Migration):
386386
('type', models.CharField(default='primary', max_length=50)),
387387
('supply', models.CharField(default='ac', max_length=50)),
388388
('phase', models.CharField(default='single-phase', max_length=50)),
389-
('voltage', models.SmallIntegerField(default=120, validators=[utilities.validators.ExclusionValidator([0])])),
390-
('amperage', models.PositiveSmallIntegerField(default=20, validators=[django.core.validators.MinValueValidator(1)])),
391-
('max_utilization', models.PositiveSmallIntegerField(default=80, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])),
389+
('voltage', models.SmallIntegerField(validators=[utilities.validators.ExclusionValidator([0])])),
390+
('amperage', models.PositiveSmallIntegerField(validators=[django.core.validators.MinValueValidator(1)])),
391+
('max_utilization', models.PositiveSmallIntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])),
392392
('available_power', models.PositiveIntegerField(default=0, editable=False)),
393393
('comments', models.TextField(blank=True)),
394394
],

netbox/utilities/management/commands/__init__.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
from django.db import models
22
from timezone_field import TimeZoneField
33

4+
from netbox.config import ConfigItem
5+
46

57
SKIP_FIELDS = (
68
TimeZoneField,
@@ -26,4 +28,9 @@ def custom_deconstruct(field):
2628
for attr in EXEMPT_ATTRS:
2729
kwargs.pop(attr, None)
2830

31+
# Ignore any field defaults which reference a ConfigItem
32+
kwargs = {
33+
k: v for k, v in kwargs.items() if not isinstance(v, ConfigItem)
34+
}
35+
2936
return name, path, args, kwargs

0 commit comments

Comments
 (0)