NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-07 16:18:16 -06:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge d1fdfc9343 into 651d462456

Browse Source
This commit is contained in:
Armin Fisslthaler 2017-10-11 17:14:46 +00:00 committed by GitHub
commit f9e1f64b68
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
netbox/dcim/api/views.py
View File

@ -83,7 +83,7 @@ class RackRoleViewSet(ModelViewSet):
# #
class RackViewSet(WritableSerializerMixin, CustomFieldModelViewSet): class RackViewSet(WritableSerializerMixin, CustomFieldModelViewSet):
queryset = Rack.objects.select_related('site', 'group__site', 'tenant') queryset = Rack.objects.select_related('site', 'group__site', 'tenant', 'role')
serializer_class = serializers.RackSerializer serializer_class = serializers.RackSerializer
write_serializer_class = serializers.WritableRackSerializer write_serializer_class = serializers.WritableRackSerializer
filter_class = filters.RackFilter filter_class = filters.RackFilter
@ -219,6 +219,7 @@ class DeviceViewSet(WritableSerializerMixin, CustomFieldModelViewSet):
queryset = Device.objects.select_related( queryset = Device.objects.select_related(
'device_type__manufacturer', 'device_role', 'tenant', 'platform', 'site', 'rack', 'parent_bay', 'device_type__manufacturer', 'device_role', 'tenant', 'platform', 'site', 'rack', 'parent_bay',
).prefetch_related( ).prefetch_related(
'primary_ip4', 'primary_ip6',
'primary_ip4__nat_outside', 'primary_ip6__nat_outside', 'primary_ip4__nat_outside', 'primary_ip6__nat_outside',
) )
serializer_class = serializers.DeviceSerializer serializer_class = serializers.DeviceSerializer
@ -320,7 +321,15 @@ class PowerOutletViewSet(WritableSerializerMixin, ModelViewSet):
class InterfaceViewSet(WritableSerializerMixin, ModelViewSet): class InterfaceViewSet(WritableSerializerMixin, ModelViewSet):
queryset = Interface.objects.select_related('device') queryset = Interface.objects.select_related(
'circuit_termination__circuit',
'circuit_termination__interface',
'connected_as_a__interface_b',
'connected_as_a__interface_b__device',
'connected_as_b__interface_a',
'connected_as_b__interface_a__device',
'device',
'lag')
serializer_class = serializers.InterfaceSerializer serializer_class = serializers.InterfaceSerializer
write_serializer_class = serializers.WritableInterfaceSerializer write_serializer_class = serializers.WritableInterfaceSerializer
filter_class = filters.InterfaceFilter filter_class = filters.InterfaceFilter

2
netbox/extras/api/views.py
View File

@ -92,6 +92,6 @@ class RecentActivityViewSet(ReadOnlyModelViewSet):
""" """
List all UserActions to provide a log of recent activity. List all UserActions to provide a log of recent activity.
""" """
queryset = UserAction.objects.all() queryset = UserAction.objects.select_related('user')
serializer_class = serializers.UserActionSerializer serializer_class = serializers.UserActionSerializer
filter_class = filters.UserActionFilter filter_class = filters.UserActionFilter

13
netbox/ipam/api/views.py
View File

@ -134,7 +134,18 @@ class PrefixViewSet(WritableSerializerMixin, CustomFieldModelViewSet):
# #
class IPAddressViewSet(WritableSerializerMixin, CustomFieldModelViewSet): class IPAddressViewSet(WritableSerializerMixin, CustomFieldModelViewSet):
queryset = IPAddress.objects.select_related('vrf__tenant', 'tenant', 'interface__device', 'nat_inside') queryset = IPAddress.objects.select_related(
'interface',
'interface__circuit_termination',
'interface__connected_as_a__interface_b',
'interface__connected_as_a__interface_b__device',
'interface__connected_as_b__interface_a',
'interface__connected_as_b__interface_a__device',
'interface__device',
'nat_inside',
'nat_outside',
'tenant',
'vrf__tenant')
serializer_class = serializers.IPAddressSerializer serializer_class = serializers.IPAddressSerializer
write_serializer_class = serializers.WritableIPAddressSerializer write_serializer_class = serializers.WritableIPAddressSerializer
filter_class = filters.IPAddressFilter filter_class = filters.IPAddressFilter