From 180d3d002992d6ce0c2cabe4905fc5ef0a9e8b35 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 21 Nov 2019 21:44:30 -0500 Subject: [PATCH] Resolved migration discrepancies when dealing with NULL values --- netbox/dcim/migrations/0078_rack_type_to_slug.py | 5 +++++ netbox/dcim/migrations/0079_rack_status_to_slug.py | 2 +- netbox/dcim/migrations/0080_device_face_to_slug.py | 5 +++++ .../dcim/migrations/0081_devicetype_subdevicerole_to_slug.py | 5 +++++ netbox/dcim/models.py | 1 + 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/netbox/dcim/migrations/0078_rack_type_to_slug.py b/netbox/dcim/migrations/0078_rack_type_to_slug.py index 33c9c8f7b..2ebcd7168 100644 --- a/netbox/dcim/migrations/0078_rack_type_to_slug.py +++ b/netbox/dcim/migrations/0078_rack_type_to_slug.py @@ -31,4 +31,9 @@ class Migration(migrations.Migration): migrations.RunPython( code=rack_type_to_slug ), + migrations.AlterField( + model_name='rack', + name='type', + field=models.CharField(blank=True, max_length=50), + ), ] diff --git a/netbox/dcim/migrations/0079_rack_status_to_slug.py b/netbox/dcim/migrations/0079_rack_status_to_slug.py index 1760c321e..76890d796 100644 --- a/netbox/dcim/migrations/0079_rack_status_to_slug.py +++ b/netbox/dcim/migrations/0079_rack_status_to_slug.py @@ -26,7 +26,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='rack', name='status', - field=models.CharField(blank=True, default='active', max_length=50), + field=models.CharField(default='active', max_length=50), ), migrations.RunPython( code=rack_status_to_slug diff --git a/netbox/dcim/migrations/0080_device_face_to_slug.py b/netbox/dcim/migrations/0080_device_face_to_slug.py index 93d9c7609..4fe214770 100644 --- a/netbox/dcim/migrations/0080_device_face_to_slug.py +++ b/netbox/dcim/migrations/0080_device_face_to_slug.py @@ -28,4 +28,9 @@ class Migration(migrations.Migration): migrations.RunPython( code=device_face_to_slug ), + migrations.AlterField( + model_name='device', + name='face', + field=models.CharField(blank=True, max_length=50), + ), ] diff --git a/netbox/dcim/migrations/0081_devicetype_subdevicerole_to_slug.py b/netbox/dcim/migrations/0081_devicetype_subdevicerole_to_slug.py index edcfc9e4b..2497f1702 100644 --- a/netbox/dcim/migrations/0081_devicetype_subdevicerole_to_slug.py +++ b/netbox/dcim/migrations/0081_devicetype_subdevicerole_to_slug.py @@ -28,4 +28,9 @@ class Migration(migrations.Migration): migrations.RunPython( code=devicetype_subdevicerole_to_slug ), + migrations.AlterField( + model_name='devicetype', + name='subdevice_role', + field=models.CharField(blank=True, max_length=50), + ), ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 93aa8c8fb..4b4087d9a 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -922,6 +922,7 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): subdevice_role = models.CharField( max_length=50, choices=SubdeviceRoleChoices, + blank=True, verbose_name='Parent/child status', help_text='Parent devices house child devices in device bays. Leave blank ' 'if this device type is neither a parent nor a child.'