Improve filtering cables by termination device/rack/site

netbox/dcim/migrations/0157_new_cabling_models.py

@@ -20,6 +20,10 @@ class Migration(migrations.Migration):
                 ('termination_id', models.PositiveBigIntegerField()),
                 ('cable', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='terminations', to='dcim.cable')),
                 ('termination_type', models.ForeignKey(limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'circuits'), ('model__in', ('circuittermination',))), models.Q(('app_label', 'dcim'), ('model__in', ('consoleport', 'consoleserverport', 'frontport', 'interface', 'powerfeed', 'poweroutlet', 'powerport', 'rearport'))), _connector='OR')), on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype')),
+                ('_device', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.device')),
+                ('_rack', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.rack')),
+                ('_location', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.location')),
+                ('_site', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.site')),
             ],
             options={
                 'ordering': ('cable', 'cable_end', 'pk'),

netbox/dcim/migrations/0158_populate_cable_terminations.py

@@ -1,10 +1,37 @@
 from django.db import migrations
 
 
+def cache_related_objects(termination):
+    """
+    Replicate caching logic from CableTermination.cache_related_objects()
+    """
+    attrs = {}
+
+    # Device components
+    if getattr(termination, 'device', None):
+        attrs['_device'] = termination.device
+        attrs['_rack'] = termination.device.rack
+        attrs['_location'] = termination.device.location
+        attrs['_site'] = termination.device.site
+
+    # Power feeds
+    elif getattr(termination, 'rack', None):
+        attrs['_rack'] = termination.rack
+        attrs['_location'] = termination.rack.location
+        attrs['_site'] = termination.rack.site
+
+    # Circuit terminations
+    elif getattr(termination, 'site', None):
+        attrs['_site'] = termination.site
+
+    return attrs
+
+
 def populate_cable_terminations(apps, schema_editor):
     """
     Replicate terminations from the Cable model into CableTermination instances.
     """
+    ContentType = apps.get_model('contenttypes', 'ContentType')
     Cable = apps.get_model('dcim', 'Cable')
     CableTermination = apps.get_model('dcim', 'CableTermination')
 
@@ -16,22 +43,20 @@ def populate_cable_terminations(apps, schema_editor):
     # Queue CableTerminations to be created
     cable_terminations = []
     for i, cable in enumerate(cables, start=1):
-        cable_terminations.append(
-            CableTermination(
+        for cable_end in ('a', 'b'):
+            # We must manually instantiate the termination object, because GFK fields are not
+            # supported within migrations.
+            termination_ct = ContentType.objects.get(pk=cable[f'termination_{cable_end}_type'])
+            termination_model = apps.get_model(termination_ct.app_label, termination_ct.model)
+            termination = termination_model.objects.get(pk=cable[f'termination_{cable_end}_id'])
+
+            cable_terminations.append(CableTermination(
                 cable_id=cable['id'],
-                cable_end='A',
-                termination_type_id=cable['termination_a_type'],
-                termination_id=cable['termination_a_id']
-            )
-        )
-        cable_terminations.append(
-            CableTermination(
-                cable_id=cable['id'],
-                cable_end='B',
-                termination_type_id=cable['termination_b_type'],
-                termination_id=cable['termination_b_id']
-            )
-        )
+                cable_end=cable_end.upper(),
+                termination_type_id=cable[f'termination_{cable_end}_type'],
+                termination_id=cable[f'termination_{cable_end}_id'],
+                **cache_related_objects(termination)
+            ))
 
     # Bulk create the termination objects
     CableTermination.objects.bulk_create(cable_terminations, batch_size=100)

netbox/dcim/migrations/0161_cabling_cleanup.py

@@ -34,6 +34,14 @@ class Migration(migrations.Migration):
             model_name='cable',
             name='termination_b_type',
         ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='_termination_a_device',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='_termination_b_device',
+        ),
 
         # Remove old fields from CablePath
         migrations.AlterUniqueTogether(