diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md index 65f81a2b5..63cc60b86 100644 --- a/docs/release-notes/version-2.11.md +++ b/docs/release-notes/version-2.11.md @@ -1,5 +1,14 @@ # NetBox v2.11 +## v2.11.5 (FUTURE) + +### Enhancements + +* [#6087](https://github.com/netbox-community/netbox/issues/6087) - Improved prefix hierarchy rendering +* [#6501](https://github.com/netbox-community/netbox/issues/6501) - Expose prefix depth and children on REST API serializer + +--- + ## v2.11.4 (2021-05-25) ### Enhancements diff --git a/netbox/ipam/api/nested_serializers.py b/netbox/ipam/api/nested_serializers.py index a5eb63911..5a48c8030 100644 --- a/netbox/ipam/api/nested_serializers.py +++ b/netbox/ipam/api/nested_serializers.py @@ -102,10 +102,11 @@ class NestedVLANSerializer(WritableNestedSerializer): class NestedPrefixSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:prefix-detail') family = serializers.IntegerField(read_only=True) + _depth = serializers.IntegerField(read_only=True) class Meta: model = models.Prefix - fields = ['id', 'url', 'display', 'family', 'prefix'] + fields = ['id', 'url', 'display', 'family', 'prefix', '_depth'] # diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py index 3270162a5..afd3fb4fe 100644 --- a/netbox/ipam/api/serializers.py +++ b/netbox/ipam/api/serializers.py @@ -197,12 +197,14 @@ class PrefixSerializer(PrimaryModelSerializer): vlan = NestedVLANSerializer(required=False, allow_null=True) status = ChoiceField(choices=PrefixStatusChoices, required=False) role = NestedRoleSerializer(required=False, allow_null=True) + children = serializers.IntegerField(read_only=True) + _depth = serializers.IntegerField(read_only=True) class Meta: model = Prefix fields = [ 'id', 'url', 'display', 'family', 'prefix', 'site', 'vrf', 'tenant', 'vlan', 'status', 'role', 'is_pool', - 'description', 'tags', 'custom_fields', 'created', 'last_updated', + 'description', 'tags', 'custom_fields', 'created', 'last_updated', 'children', '_depth', ] read_only_fields = ['family']