Просмотр исходного кода

Standard naming of reverse relationship to Device from component models

Jeremy Stretch 7 лет назад
Родитель
Сommit
8ebf7a7ad0

+ 2 - 2
netbox/dcim/migrations/0065_front_rear_ports.py

@@ -21,7 +21,7 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=64)),
                 ('type', models.PositiveSmallIntegerField()),
                 ('rear_port_position', models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(64)])),
-                ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_ports', to='dcim.Device')),
+                ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='frontports', to='dcim.Device')),
             ],
             options={
                 'ordering': ['device', 'name'],
@@ -46,7 +46,7 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=64)),
                 ('type', models.PositiveSmallIntegerField()),
                 ('positions', models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(64)])),
-                ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rear_ports', to='dcim.Device')),
+                ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rearports', to='dcim.Device')),
                 ('tags', taggit.managers.TaggableManager(through='taggit.TaggedItem', to='taggit.Tag')),
             ],
             options={

+ 10 - 0
netbox/dcim/migrations/0066_cables.py

@@ -156,6 +156,11 @@ class Migration(migrations.Migration):
             old_name='cs_port',
             new_name='connected_endpoint'
         ),
+        migrations.AlterField(
+            model_name='consoleport',
+            name='device',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='consoleports', to='dcim.Device'),
+        ),
         migrations.AlterField(
             model_name='consoleport',
             name='connected_endpoint',
@@ -183,6 +188,11 @@ class Migration(migrations.Migration):
             old_name='power_outlet',
             new_name='connected_endpoint'
         ),
+        migrations.AlterField(
+            model_name='powerport',
+            name='device',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='powerports', to='dcim.Device'),
+        ),
         migrations.AlterField(
             model_name='powerport',
             name='connected_endpoint',

+ 4 - 4
netbox/dcim/models.py

@@ -1595,7 +1595,7 @@ class ConsolePort(CableTermination, ComponentModel):
     device = models.ForeignKey(
         to='dcim.Device',
         on_delete=models.CASCADE,
-        related_name='console_ports'
+        related_name='consoleports'
     )
     name = models.CharField(
         max_length=50
@@ -1687,7 +1687,7 @@ class PowerPort(CableTermination, ComponentModel):
     device = models.ForeignKey(
         to='dcim.Device',
         on_delete=models.CASCADE,
-        related_name='power_ports'
+        related_name='powerports'
     )
     name = models.CharField(
         max_length=50
@@ -1991,7 +1991,7 @@ class FrontPort(CableTermination, ComponentModel):
     device = models.ForeignKey(
         to='dcim.Device',
         on_delete=models.CASCADE,
-        related_name='front_ports'
+        related_name='frontports'
     )
     name = models.CharField(
         max_length=64
@@ -2045,7 +2045,7 @@ class RearPort(CableTermination, ComponentModel):
     device = models.ForeignKey(
         to='dcim.Device',
         on_delete=models.CASCADE,
-        related_name='rear_ports'
+        related_name='rearports'
     )
     name = models.CharField(
         max_length=64

+ 4 - 4
netbox/dcim/views.py

@@ -884,7 +884,7 @@ class DeviceView(View):
 
         # Console ports
         console_ports = natsorted(
-            device.console_ports.select_related('connected_endpoint__device', 'cable'),
+            device.consoleports.select_related('connected_endpoint__device', 'cable'),
             key=attrgetter('name')
         )
 
@@ -893,7 +893,7 @@ class DeviceView(View):
 
         # Power ports
         power_ports = natsorted(
-            device.power_ports.select_related('connected_endpoint__device', 'cable'),
+            device.powerports.select_related('connected_endpoint__device', 'cable'),
             key=attrgetter('name')
         )
 
@@ -910,10 +910,10 @@ class DeviceView(View):
         )
 
         # Front ports
-        front_ports = device.front_ports.select_related('rear_port', 'cable')
+        front_ports = device.frontports.select_related('rear_port', 'cable')
 
         # Rear ports
-        rear_ports = device.rear_ports.select_related('cable')
+        rear_ports = device.rearports.select_related('cable')
 
         # Device bays
         device_bays = natsorted(