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

Fixed issues with terminations in dcim and APIs

Browse Source
This commit is contained in:
Nathan Gotz 2016-09-14 18:29:16 -05:00
parent 047ccaa14e
commit 6510c6e70e
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/circuits/api/serializers.py
View File

@ -49,13 +49,10 @@ class CircuitSerializer(CustomFieldSerializer, serializers.ModelSerializer):
provider = ProviderNestedSerializer() provider = ProviderNestedSerializer()
type = CircuitTypeNestedSerializer() type = CircuitTypeNestedSerializer()
tenant = TenantNestedSerializer() tenant = TenantNestedSerializer()
site = SiteNestedSerializer()
interface = InterfaceNestedSerializer()
class Meta: class Meta:
model = Circuit model = Circuit
fields = ['id', 'cid', 'provider', 'type', 'tenant', 'site', 'interface', 'install_date', 'port_speed', fields = ['id', 'cid', 'provider', 'type', 'tenant', 'install_date', 'custom_fields']
'upstream_speed', 'commit_rate', 'xconnect_id', 'comments', 'custom_fields']
class CircuitNestedSerializer(CircuitSerializer): class CircuitNestedSerializer(CircuitSerializer):

4
netbox/circuits/api/views.py
View File

@ -43,7 +43,7 @@ class CircuitListView(CustomFieldModelAPIView, generics.ListAPIView):
""" """
List circuits (filterable) List circuits (filterable)
""" """
queryset = Circuit.objects.select_related('type', 'tenant', 'provider', 'site', 'interface__device')\ queryset = Circuit.objects.select_related('type', 'tenant', 'provider')\
.prefetch_related('custom_field_values__field') .prefetch_related('custom_field_values__field')
serializer_class = serializers.CircuitSerializer serializer_class = serializers.CircuitSerializer
filter_class = CircuitFilter filter_class = CircuitFilter
@ -53,6 +53,6 @@ class CircuitDetailView(CustomFieldModelAPIView, generics.RetrieveAPIView):
""" """
Retrieve a single circuit Retrieve a single circuit
""" """
queryset = Circuit.objects.select_related('type', 'tenant', 'provider', 'site', 'interface__device')\ queryset = Circuit.objects.select_related('type', 'tenant', 'provider')\
.prefetch_related('custom_field_values__field') .prefetch_related('custom_field_values__field')
serializer_class = serializers.CircuitSerializer serializer_class = serializers.CircuitSerializer

2
netbox/dcim/api/serializers.py
View File

@ -20,7 +20,7 @@ class SiteSerializer(CustomFieldSerializer, serializers.ModelSerializer):
class Meta: class Meta:
model = Site model = Site
fields = ['id', 'name', 'slug', 'tenant', 'facility', 'asn', 'physical_address', 'shipping_address', 'comments', fields = ['id', 'name', 'slug', 'tenant', 'facility', 'asn', 'physical_address', 'shipping_address', 'comments',
'custom_fields', 'count_prefixes', 'count_vlans', 'count_racks', 'count_devices', 'count_circuits'] 'custom_fields', 'count_prefixes', 'count_vlans', 'count_racks', 'count_devices']
class SiteNestedSerializer(SiteSerializer): class SiteNestedSerializer(SiteSerializer):

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

@ -484,7 +484,7 @@ class RelatedConnectionsView(APIView):
# Interface connections # Interface connections
interfaces = Interface.objects.filter(device=device).select_related('connected_as_a', 'connected_as_b', interfaces = Interface.objects.filter(device=device).select_related('connected_as_a', 'connected_as_b',
'circuit') 'termination')
for iface in interfaces: for iface in interfaces:
data = serializers.InterfaceDetailSerializer(instance=iface).data data = serializers.InterfaceDetailSerializer(instance=iface).data
del(data['device']) del(data['device'])

1
netbox/dcim/tests/test_apis.py
View File

@ -26,7 +26,6 @@ class SiteTest(APITestCase):
'count_vlans', 'count_vlans',
'count_racks', 'count_racks',
'count_devices', 'count_devices',
'count_circuits'
] ]
nested_fields = [ nested_fields = [