Dropped 'Panel' from FrontPanelPort/RearPanelPort names

netbox/dcim/api/serializers.py

@@ -6,9 +6,9 @@ from circuits.models import Circuit, CircuitTermination
 from dcim.constants import *
 from dcim.models import (
     ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay,
-    DeviceBayTemplate, DeviceType, DeviceRole, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceTemplate,
+    DeviceBayTemplate, DeviceType, DeviceRole, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate,
     Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack,
-    RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, VirtualChassis,
+    RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis,
 )
 from extras.api.customfields import CustomFieldModelSerializer
 from ipam.models import IPAddress, VLAN
@@ -302,45 +302,45 @@ class InterfaceTemplateSerializer(ValidatedModelSerializer):
 
 
 #
-# Rear panel port templates
+# Rear port templates
 #
 
-class RearPanelPortTemplateSerializer(ValidatedModelSerializer):
+class RearPortTemplateSerializer(ValidatedModelSerializer):
     device_type = NestedDeviceTypeSerializer()
-    type = ChoiceField(choices=PANELPORT_TYPE_CHOICES)
+    type = ChoiceField(choices=PORT_TYPE_CHOICES)
 
     class Meta:
-        model = RearPanelPortTemplate
+        model = RearPortTemplate
         fields = ['id', 'device_type', 'name', 'type', 'positions']
 
 
-class NestedRearPanelPortTemplateSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearpanelporttemplate-detail')
+class NestedRearPortTemplateSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearporttemplate-detail')
 
     class Meta:
-        model = RearPanelPortTemplate
+        model = RearPortTemplate
         fields = ['id', 'url', 'name']
 
 
 #
-# Front panel port templates
+# Front port templates
 #
 
-class FrontPanelPortTemplateSerializer(ValidatedModelSerializer):
+class FrontPortTemplateSerializer(ValidatedModelSerializer):
     device_type = NestedDeviceTypeSerializer()
-    type = ChoiceField(choices=PANELPORT_TYPE_CHOICES)
-    rear_port = NestedRearPanelPortTemplateSerializer()
+    type = ChoiceField(choices=PORT_TYPE_CHOICES)
+    rear_port = NestedRearPortTemplateSerializer()
 
     class Meta:
-        model = FrontPanelPortTemplate
+        model = FrontPortTemplate
         fields = ['id', 'device_type', 'name', 'type', 'rear_port', 'rear_port_position']
 
 
-class NestedFrontPanelPortTemplateSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontpanelporttemplate-detail')
+class NestedFrontPortTemplateSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontporttemplate-detail')
 
     class Meta:
-        model = FrontPanelPortTemplate
+        model = FrontPortTemplate
         fields = ['id', 'url', 'name']
 
 
@@ -703,47 +703,47 @@ class InterfaceSerializer(TaggitSerializer, IsConnectedMixin, ValidatedModelSeri
 
 
 #
-# Rear panel ports
+# Rear ports
 #
 
-class RearPanelPortSerializer(ValidatedModelSerializer):
+class RearPortSerializer(ValidatedModelSerializer):
     device = NestedDeviceSerializer()
-    type = ChoiceField(choices=PANELPORT_TYPE_CHOICES)
+    type = ChoiceField(choices=PORT_TYPE_CHOICES)
     tags = TagListSerializerField(required=False)
 
     class Meta:
-        model = RearPanelPort
+        model = RearPort
         fields = ['id', 'device', 'name', 'type', 'positions', 'tags']
 
 
-class NestedRearPanelPortSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearpanelport-detail')
+class NestedRearPortSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail')
 
     class Meta:
-        model = RearPanelPort
+        model = RearPort
         fields = ['id', 'url', 'name']
 
 
 #
-# Front panel ports
+# Front ports
 #
 
-class FrontPanelPortSerializer(ValidatedModelSerializer):
+class FrontPortSerializer(ValidatedModelSerializer):
     device = NestedDeviceSerializer()
-    type = ChoiceField(choices=PANELPORT_TYPE_CHOICES)
-    rear_port = NestedRearPanelPortSerializer()
+    type = ChoiceField(choices=PORT_TYPE_CHOICES)
+    rear_port = NestedRearPortSerializer()
     tags = TagListSerializerField(required=False)
 
     class Meta:
-        model = FrontPanelPort
+        model = FrontPort
         fields = ['id', 'device', 'name', 'type', 'rear_port', 'rear_port_position', 'tags']
 
 
-class NestedFrontPanelPortSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontpanelport-detail')
+class NestedFrontPortSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontport-detail')
 
     class Meta:
-        model = FrontPanelPort
+        model = FrontPort
         fields = ['id', 'url', 'name']
 
 

netbox/dcim/api/urls.py

@@ -37,8 +37,8 @@ router.register(r'console-server-port-templates', views.ConsoleServerPortTemplat
 router.register(r'power-port-templates', views.PowerPortTemplateViewSet)
 router.register(r'power-outlet-templates', views.PowerOutletTemplateViewSet)
 router.register(r'interface-templates', views.InterfaceTemplateViewSet)
-router.register(r'front-panel-port-templates', views.FrontPanelPortTemplateViewSet)
-router.register(r'rear-panel-port-templates', views.RearPanelPortTemplateViewSet)
+router.register(r'front-port-templates', views.FrontPortTemplateViewSet)
+router.register(r'rear-port-templates', views.RearPortTemplateViewSet)
 router.register(r'device-bay-templates', views.DeviceBayTemplateViewSet)
 
 # Devices
@@ -52,8 +52,8 @@ router.register(r'console-server-ports', views.ConsoleServerPortViewSet)
 router.register(r'power-ports', views.PowerPortViewSet)
 router.register(r'power-outlets', views.PowerOutletViewSet)
 router.register(r'interfaces', views.InterfaceViewSet)
-router.register(r'front-panel-ports', views.FrontPanelPortViewSet)
-router.register(r'rear-panel-ports', views.RearPanelPortViewSet)
+router.register(r'front-ports', views.FrontPortViewSet)
+router.register(r'rear-ports', views.RearPortViewSet)
 router.register(r'device-bays', views.DeviceBayViewSet)
 router.register(r'inventory-items', views.InventoryItemViewSet)
 

netbox/dcim/api/views.py

@@ -15,9 +15,9 @@ from rest_framework.viewsets import GenericViewSet, ViewSet
 from dcim import filters
 from dcim.models import (
     ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay,
-    DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceTemplate,
+    DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate,
     Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack,
-    RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, VirtualChassis,
+    RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis,
 )
 from extras.api.serializers import RenderedGraphSerializer
 from extras.api.views import CustomFieldModelViewSet
@@ -191,16 +191,16 @@ class InterfaceTemplateViewSet(ModelViewSet):
     filter_class = filters.InterfaceTemplateFilter
 
 
-class FrontPanelPortTemplateViewSet(ModelViewSet):
-    queryset = FrontPanelPortTemplate.objects.select_related('device_type__manufacturer')
-    serializer_class = serializers.FrontPanelPortTemplateSerializer
-    filter_class = filters.FrontPanelPortTemplateFilter
+class FrontPortTemplateViewSet(ModelViewSet):
+    queryset = FrontPortTemplate.objects.select_related('device_type__manufacturer')
+    serializer_class = serializers.FrontPortTemplateSerializer
+    filter_class = filters.FrontPortTemplateFilter
 
 
-class RearPanelPortTemplateViewSet(ModelViewSet):
-    queryset = RearPanelPortTemplate.objects.select_related('device_type__manufacturer')
-    serializer_class = serializers.RearPanelPortTemplateSerializer
-    filter_class = filters.RearPanelPortTemplateFilter
+class RearPortTemplateViewSet(ModelViewSet):
+    queryset = RearPortTemplate.objects.select_related('device_type__manufacturer')
+    serializer_class = serializers.RearPortTemplateSerializer
+    filter_class = filters.RearPortTemplateFilter
 
 
 class DeviceBayTemplateViewSet(ModelViewSet):
@@ -369,16 +369,16 @@ class InterfaceViewSet(ModelViewSet):
         return Response(serializer.data)
 
 
-class FrontPanelPortViewSet(ModelViewSet):
-    queryset = FrontPanelPort.objects.select_related('device__device_type__manufacturer', 'rear_port')
-    serializer_class = serializers.FrontPanelPortSerializer
-    filter_class = filters.FrontPanelPortFilter
+class FrontPortViewSet(ModelViewSet):
+    queryset = FrontPort.objects.select_related('device__device_type__manufacturer', 'rear_port')
+    serializer_class = serializers.FrontPortSerializer
+    filter_class = filters.FrontPortFilter
 
 
-class RearPanelPortViewSet(ModelViewSet):
-    queryset = RearPanelPort.objects.select_related('device__device_type__manufacturer')
-    serializer_class = serializers.RearPanelPortSerializer
-    filter_class = filters.RearPanelPortFilter
+class RearPortViewSet(ModelViewSet):
+    queryset = RearPort.objects.select_related('device__device_type__manufacturer')
+    serializer_class = serializers.RearPortSerializer
+    filter_class = filters.RearPortFilter
 
 
 class DeviceBayViewSet(ModelViewSet):