NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-22 03:56:53 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Revert REST API changes from #8284

Browse Source
This commit is contained in:
jeremystretch 2022-01-10 08:24:45 -05:00
parent f1472d218e
commit e84a282aa6
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/release-notes/version-3.1.md
View File

@ -4,12 +4,12 @@
### Enhancements ### Enhancements
* [#8262](https://github.com/netbox-community/netbox/issues/8262) - Add cables to tenant stats * [#8262](https://github.com/netbox-community/netbox/issues/8262) - Add cable count to tenant stats
* [#8265](https://github.com/netbox-community/netbox/issues/8265) - Add newer Stackwise-n interface types * [#8265](https://github.com/netbox-community/netbox/issues/8265) - Add Stackwise-n interface types
### Bug Fixes ### Bug Fixes
* [#8287](https://github.com/netbox-community/netbox/issues/8287) - Correct label in Export Template Form * [#8287](https://github.com/netbox-community/netbox/issues/8287) - Correct label in export template form
--- ---

3
netbox/tenancy/api/serializers.py
View File

@ -40,14 +40,13 @@ class TenantSerializer(PrimaryModelSerializer):
vlan_count = serializers.IntegerField(read_only=True) vlan_count = serializers.IntegerField(read_only=True)
vrf_count = serializers.IntegerField(read_only=True) vrf_count = serializers.IntegerField(read_only=True)
cluster_count = serializers.IntegerField(read_only=True) cluster_count = serializers.IntegerField(read_only=True)
cable_count = serializers.IntegerField(read_only=True)
class Meta: class Meta:
model = Tenant model = Tenant
fields = [ fields = [
'id', 'url', 'display', 'name', 'slug', 'group', 'description', 'comments', 'tags', 'custom_fields', 'id', 'url', 'display', 'name', 'slug', 'group', 'description', 'comments', 'tags', 'custom_fields',
'created', 'last_updated', 'circuit_count', 'device_count', 'ipaddress_count', 'prefix_count', 'rack_count', 'created', 'last_updated', 'circuit_count', 'device_count', 'ipaddress_count', 'prefix_count', 'rack_count',
'site_count', 'virtualmachine_count', 'vlan_count', 'vrf_count', 'cluster_count', 'cable_count', 'site_count', 'virtualmachine_count', 'vlan_count', 'vrf_count', 'cluster_count',
] ]

3
netbox/tenancy/api/views.py
View File

@ -47,8 +47,7 @@ class TenantViewSet(CustomFieldModelViewSet):
site_count=count_related(Site, 'tenant'), site_count=count_related(Site, 'tenant'),
virtualmachine_count=count_related(VirtualMachine, 'tenant'), virtualmachine_count=count_related(VirtualMachine, 'tenant'),
vlan_count=count_related(VLAN, 'tenant'), vlan_count=count_related(VLAN, 'tenant'),
vrf_count=count_related(VRF, 'tenant'), vrf_count=count_related(VRF, 'tenant')
cable_count=count_related(Cable, 'tenant')
) )
serializer_class = serializers.TenantSerializer serializer_class = serializers.TenantSerializer
filterset_class = filtersets.TenantFilterSet filterset_class = filtersets.TenantFilterSet