NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-31 04:46:26 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

7699 fixes

Browse Source
This commit is contained in:
Arthur Hanson 2024-10-23 14:17:24 -07:00
parent 7e6bb0e6bc
commit 8a63707386
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netbox/virtualization/api/serializers_/clusters.py
View File

@ -1,8 +1,6 @@
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from drf_spectacular.utils import extend_schema_field from drf_spectacular.utils import extend_schema_field
from rest_framework import serializers from rest_framework import serializers
from dcim.api.serializers_.sites import SiteSerializer
from netbox.api.fields import ChoiceField, ContentTypeField, RelatedObjectCountField from netbox.api.fields import ChoiceField, ContentTypeField, RelatedObjectCountField
from netbox.api.serializers import NetBoxModelSerializer from netbox.api.serializers import NetBoxModelSerializer
from tenancy.api.serializers_.tenants import TenantSerializer from tenancy.api.serializers_.tenants import TenantSerializer
@ -51,7 +49,6 @@ class ClusterSerializer(NetBoxModelSerializer):
group = ClusterGroupSerializer(nested=True, required=False, allow_null=True, default=None) group = ClusterGroupSerializer(nested=True, required=False, allow_null=True, default=None)
status = ChoiceField(choices=ClusterStatusChoices, required=False) status = ChoiceField(choices=ClusterStatusChoices, required=False)
tenant = TenantSerializer(nested=True, required=False, allow_null=True) tenant = TenantSerializer(nested=True, required=False, allow_null=True)
site = SiteSerializer(nested=True, required=False, allow_null=True, default=None)
scope_type = ContentTypeField( scope_type = ContentTypeField(
queryset=ContentType.objects.filter( queryset=ContentType.objects.filter(
model__in=CLUSTER_SCOPE_TYPES model__in=CLUSTER_SCOPE_TYPES

10
netbox/virtualization/migrations/0043_clusters_cached_relations.py
View File

@ -81,5 +81,15 @@ class Migration(migrations.Migration):
model_name='cluster', model_name='cluster',
name='site', name='site',
), ),
migrations.RemoveConstraint(
model_name='cluster',
name='virtualization_cluster_unique_site_name',
),
migrations.AddConstraint(
model_name='cluster',
constraint=models.UniqueConstraint(
fields=('_site', 'name'), name='virtualization_cluster_unique__site_name'
),
),
] ]

4
netbox/virtualization/models/clusters.py
View File

@ -148,8 +148,8 @@ class Cluster(ContactsMixin, PrimaryModel):
name='%(app_label)s_%(class)s_unique_group_name' name='%(app_label)s_%(class)s_unique_group_name'
), ),
models.UniqueConstraint( models.UniqueConstraint(
fields=('site', 'name'), fields=('_site', 'name'),
name='%(app_label)s_%(class)s_unique_site_name' name='%(app_label)s_%(class)s_unique__site_name'
), ),
) )
verbose_name = _('cluster') verbose_name = _('cluster')