mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Ignore default field values which reference ConfigItems when calculating migrations

Browse Source
This commit is contained in:
jeremystretch
2022-06-23 17:44:19 -04:00
parent b77013c859
commit 4315c4697c
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/dcim/migrations/0001_squashed.py
View File

@ -386,9 +386,9 @@ class Migration(migrations.Migration):
('type', models.CharField(default='primary', max_length=50)), ('type', models.CharField(default='primary', max_length=50)),
('supply', models.CharField(default='ac', max_length=50)), ('supply', models.CharField(default='ac', max_length=50)),
('phase', models.CharField(default='single-phase', max_length=50)), ('phase', models.CharField(default='single-phase', max_length=50)),
('voltage', models.SmallIntegerField(default=120, validators=[utilities.validators.ExclusionValidator([0])])), ('voltage', models.SmallIntegerField(validators=[utilities.validators.ExclusionValidator([0])])),
('amperage', models.PositiveSmallIntegerField(default=20, validators=[django.core.validators.MinValueValidator(1)])), ('amperage', models.PositiveSmallIntegerField(validators=[django.core.validators.MinValueValidator(1)])),
('max_utilization', models.PositiveSmallIntegerField(default=80, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])), ('max_utilization', models.PositiveSmallIntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])),
('available_power', models.PositiveIntegerField(default=0, editable=False)), ('available_power', models.PositiveIntegerField(default=0, editable=False)),
('comments', models.TextField(blank=True)), ('comments', models.TextField(blank=True)),
], ],

7
netbox/utilities/management/commands/__init__.py
View File

@ -1,6 +1,8 @@
from django.db import models from django.db import models
from timezone_field import TimeZoneField from timezone_field import TimeZoneField
from netbox.config import ConfigItem
SKIP_FIELDS = ( SKIP_FIELDS = (
TimeZoneField, TimeZoneField,
@ -26,4 +28,9 @@ def custom_deconstruct(field):
for attr in EXEMPT_ATTRS: for attr in EXEMPT_ATTRS:
kwargs.pop(attr, None) kwargs.pop(attr, None)
# Ignore any field defaults which reference a ConfigItem
kwargs = {
k: v for k, v in kwargs.items() if not isinstance(v, ConfigItem)
}
return name, path, args, kwargs return name, path, args, kwargs