From e46d9a6d2980d3efa78a774ff52fe33e66dd396e Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Thu, 14 Nov 2024 13:12:31 -0500 Subject: [PATCH] Model cleanup --- ..._rename_mac_address_interface__mac_address_macaddress.py | 4 ++-- netbox/dcim/models/devices.py | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/migrations/0197_rename_mac_address_interface__mac_address_macaddress.py b/netbox/dcim/migrations/0197_rename_mac_address_interface__mac_address_macaddress.py index 16e2f0545..bbaa3b59d 100644 --- a/netbox/dcim/migrations/0197_rename_mac_address_interface__mac_address_macaddress.py +++ b/netbox/dcim/migrations/0197_rename_mac_address_interface__mac_address_macaddress.py @@ -60,8 +60,8 @@ class Migration(migrations.Migration): ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder)), ('description', models.CharField(blank=True, max_length=200)), ('comments', models.TextField(blank=True)), - ('mac_address', dcim.fields.MACAddressField(blank=True, null=True)), - ('is_primary', models.BooleanField(default=False)), + ('mac_address', dcim.fields.MACAddressField()), + ('is_primary', models.BooleanField(default=True)), ('assigned_object_id', models.PositiveBigIntegerField(blank=True, null=True)), ('assigned_object_type', models.ForeignKey(blank=True, limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'dcim'), ('model', 'interface')), models.Q(('app_label', 'virtualization'), ('model', 'vminterface')), _connector='OR')), null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype')), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index ba04652b4..e2371059a 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -1484,8 +1484,6 @@ class VirtualDeviceContext(PrimaryModel): class MACAddress(PrimaryModel): mac_address = MACAddressField( - null=True, - blank=True, verbose_name=_('MAC address') ) assigned_object_type = models.ForeignKey( @@ -1506,7 +1504,7 @@ class MACAddress(PrimaryModel): ) is_primary = models.BooleanField( verbose_name=_('is primary for interface'), - default=False + default=True ) class Meta: @@ -1515,7 +1513,7 @@ class MACAddress(PrimaryModel): verbose_name_plural = _('MAC addresses') def __str__(self): - return f'{str(self.mac_address)} {self.assigned_object}' + return str(self.mac_address) def clean(self): super().clean()