Clean up unnecessary bulk create forms/views/routes

netbox/dcim/forms/bulk_create.py

@@ -2,7 +2,6 @@ from django import forms
 from django.utils.translation import gettext_lazy as _
 
 from dcim.models import *
-from dcim.fields import MACAddressField
 from extras.models import Tag
 from netbox.forms.mixins import CustomFieldsMixin
 from utilities.forms import form_from_model
@@ -13,10 +12,8 @@ __all__ = (
     'ConsolePortBulkCreateForm',
     'ConsoleServerPortBulkCreateForm',
     'DeviceBayBulkCreateForm',
-    # 'FrontPortBulkCreateForm',
     'InterfaceBulkCreateForm',
     'InventoryItemBulkCreateForm',
-    'MACAddressBulkCreateForm',
     'ModuleBayBulkCreateForm',
     'PowerOutletBulkCreateForm',
     'PowerPortBulkCreateForm',
@@ -78,12 +75,6 @@ class PowerOutletBulkCreateForm(
     field_order = ('name', 'label', 'type', 'feed_leg', 'description', 'tags')
 
 
-class MACAddressBulkCreateForm(forms.Form):
-    pattern = MACAddressField(
-        # label=_('Address pattern')
-    )
-
-
 class InterfaceBulkCreateForm(
     form_from_model(Interface, [
         'type', 'enabled', 'speed', 'duplex', 'mtu', 'mgmt_only', 'mark_connected', 'poe_mode', 'poe_type', 'rf_role'

netbox/dcim/forms/model_forms.py

@@ -44,7 +44,6 @@ __all__ = (
     'InventoryItemTemplateForm',
     'LocationForm',
     'MACAddressForm',
-    'MACAddressBulkAddForm',
     'ManufacturerForm',
     'ModuleForm',
     'ModuleBayForm',
@@ -1385,15 +1384,6 @@ class MACAddressForm(NetBoxModelForm):
             )
 
 
-class MACAddressBulkAddForm(NetBoxModelForm):
-
-    class Meta:
-        model = MACAddress
-        fields = [
-            'mac_address', 'description', 'tags',
-        ]
-
-
 class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm):
     vdcs = DynamicModelMultipleChoiceField(
         queryset=VirtualDeviceContext.objects.all(),

netbox/dcim/migrations/0197_rename_mac_address_interface__mac_address_macaddress.py

@@ -62,14 +62,13 @@ class Migration(migrations.Migration):
                 ('comments', models.TextField(blank=True)),
                 ('mac_address', dcim.fields.MACAddressField(blank=True, null=True)),
                 ('is_primary', models.BooleanField(default=False)),
-                # ('interface', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='dcim.interface')),
                 ('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')),
-                # ('vm_interface', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='virtualization.vminterface')),
             ],
             options={
                 'abstract': False,
+                'ordering': ('mac_address',)
             },
         ),
         migrations.RunPython(

netbox/dcim/models/device_components.py

@@ -1385,8 +1385,9 @@ class MACAddress(PrimaryModel):
     )
 
     class Meta:
+        ordering = ('mac_address',)
         verbose_name = _('MAC address')
         verbose_name_plural = _('MAC addresses')
 
     def __str__(self):
-        return str(self.mac_address)
+        return f'{str(self.mac_address)} {self.assigned_object}'

netbox/dcim/tests/test_views.py

@@ -2554,7 +2554,6 @@ class InterfaceTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'type': InterfaceTypeChoices.TYPE_1GE_FIXED,
             'enabled': True,
             'lag': interfaces[3].pk,
-            # 'mac_address': EUI('01:02:03:04:05:06'),
             'wwn': EUI('01:02:03:04:05:06:07:08', version=64),
             'mtu': 2000,
             'speed': 1000000,

netbox/dcim/urls.py

@@ -253,7 +253,6 @@ urlpatterns = [
     # MAC addresses
     path('mac-addresses/', views.MACAddressListView.as_view(), name='macaddress_list'),
     path('mac-addresses/add/', views.MACAddressEditView.as_view(), name='macaddress_add'),
-    path('mac-addresses/bulk-add/', views.MACAddressBulkCreateView.as_view(), name='macaddress_bulk_add'),
     path('mac-addresses/import/', views.MACAddressBulkImportView.as_view(), name='macaddress_import'),
     path('mac-addresses/edit/', views.MACAddressBulkEditView.as_view(), name='macaddress_bulk_edit'),
     path('mac-addresses/rename/', views.MACAddressBulkRenameView.as_view(), name='macaddress_bulk_rename'),

netbox/dcim/views.py

@@ -2556,12 +2556,6 @@ class MACAddressView(generic.ObjectView):
     queryset = MACAddress.objects.all()
 
 
-# class MACAddressCreateView(generic.ComponentCreateView):
-#     queryset = MACAddress.objects.all()
-#     form = forms.MACAddressForm
-#     model_form = forms.MACAddressForm
-
-
 @register_model_view(MACAddress, 'edit')
 class MACAddressEditView(generic.ObjectEditView):
     queryset = MACAddress.objects.all()
@@ -2573,14 +2567,6 @@ class MACAddressDeleteView(generic.ObjectDeleteView):
     queryset = MACAddress.objects.all()
 
 
-class MACAddressBulkCreateView(generic.BulkCreateView):
-    queryset = MACAddress.objects.all()
-    form = forms.MACAddressBulkCreateForm
-    model_form = forms.MACAddressBulkAddForm
-    pattern_target = 'mac_address'
-    template_name = 'dcim/macaddress_bulk_add.html'
-
-
 class MACAddressBulkImportView(generic.BulkImportView):
     queryset = MACAddress.objects.all()
     model_form = forms.MACAddressImportForm