소스 검색

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

jeremystretch 5 년 전
부모
커밋
72d41eac85
2개의 변경된 파일6개의 추가작업 그리고 3개의 파일을 삭제
  1. 4 0
      docs/release-notes/version-2.11.md
  2. 2 3
      netbox/ipam/api/serializers.py

+ 4 - 0
docs/release-notes/version-2.11.md

@@ -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)

+ 2 - 3
netbox/ipam/api/serializers.py

@@ -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=['region', 'sitegroup', 'site', 'location', 'rack']
+            model__in=VLANGROUP_SCOPE_TYPES
         ),
         ),
         required=False
         required=False
     )
     )