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

Fixes #6376: Fix assignment of VLAN groups to clusters, cluster groups via REST API

Browse Source
This commit is contained in:
jeremystretch 2021-05-12 13:47:42 -04:00
parent cb6999d277
commit c51d3a5e45
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/release-notes/version-2.11.md
View File

@ -6,6 +6,10 @@
* [#6393](https://github.com/netbox-community/netbox/issues/6393) - Add `description` filter for IP addresses * [#6393](https://github.com/netbox-community/netbox/issues/6393) - Add `description` filter for IP addresses
### Bug Fixes
* [#6376](https://github.com/netbox-community/netbox/issues/6376) - Fix assignment of VLAN groups to clusters, cluster groups via REST API
--- ---
## v2.11.3 (2021-05-07) ## v2.11.3 (2021-05-07)

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

@ -7,7 +7,7 @@ from rest_framework.validators import UniqueTogetherValidator
from dcim.api.nested_serializers import NestedDeviceSerializer, NestedSiteSerializer from dcim.api.nested_serializers import NestedDeviceSerializer, NestedSiteSerializer
from ipam.choices import * from ipam.choices import *
from ipam.constants import IPADDRESS_ASSIGNMENT_MODELS from ipam.constants import IPADDRESS_ASSIGNMENT_MODELS, VLANGROUP_SCOPE_TYPES
from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, RouteTarget, Service, VLAN, VLANGroup, VRF from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, RouteTarget, Service, VLAN, VLANGroup, VRF
from netbox.api import ChoiceField, ContentTypeField, SerializedPKRelatedField from netbox.api import ChoiceField, ContentTypeField, SerializedPKRelatedField
from netbox.api.serializers import OrganizationalModelSerializer from netbox.api.serializers import OrganizationalModelSerializer
@ -116,8 +116,7 @@ class VLANGroupSerializer(OrganizationalModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlangroup-detail') url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlangroup-detail')
scope_type = ContentTypeField( scope_type = ContentTypeField(
queryset=ContentType.objects.filter( queryset=ContentType.objects.filter(
app_label='dcim', model__in=VLANGROUP_SCOPE_TYPES
model__in=['region', 'sitegroup', 'site', 'location', 'rack']
), ),
required=False required=False
) )