From dc5d41ddbbbaf0b4f62739a7c53c5cdca010dbd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Tue, 13 May 2025 16:30:45 +0800 Subject: [PATCH] fix(region): add dns brand (#22522) --- pkg/compute/models/capabilities.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/compute/models/capabilities.go b/pkg/compute/models/capabilities.go index 449318328e..6ae7cbd35b 100644 --- a/pkg/compute/models/capabilities.go +++ b/pkg/compute/models/capabilities.go @@ -75,6 +75,9 @@ type SCapabilities struct { DisabledModelartsPoolsBrands []string `json:",allowempty"` ModelartsPoolsBrands []string `json:",allowempty"` + DisabledDnsBrands []string `json:",allowempty"` + DnsBrands []string `json:",allowempty"` + ContainerBrands []string `json:",allowempty"` DisabledContainerBrands []string `json:",allowempty"` @@ -119,6 +122,9 @@ type SCapabilities struct { ReadOnlyModelartsPoolsBrands []string `json:",allowempty"` ReadOnlyDisabledModelartsPoolsBrands []string `json:",allowempty"` + ReadOnlyDnsBrands []string `json:",allowempty"` + ReadOnlyDisabledDnsBrands []string `json:",allowempty"` + ReadOnlyContainerBrands []string `json:",allowempty"` ReadOnlyDisabledContainerBrands []string `json:",allowempty"` @@ -422,6 +428,7 @@ func getBrands(region *SCloudregion, domainId string, capa *SCapabilities) { capa.SecurityGroupBrands = append(capa.SecurityGroupBrands, api.ONECLOUD_BRAND_ONECLOUD) capa.ComputeEngineBrands = append(capa.ComputeEngineBrands, api.ONECLOUD_BRAND_ONECLOUD) capa.SnapshotPolicyBrands = append(capa.SnapshotPolicyBrands, api.ONECLOUD_BRAND_ONECLOUD) + capa.DnsBrands = append(capa.DnsBrands, api.ONECLOUD_BRAND_ONECLOUD) } else if utils.IsInStringArray(api.HYPERVISOR_POD, capa.Hypervisors) { capa.Brands = append(capa.Brands, api.ONECLOUD_BRAND_ONECLOUD) capa.ComputeEngineBrands = append(capa.ComputeEngineBrands, api.ONECLOUD_BRAND_ONECLOUD) @@ -519,6 +526,8 @@ func getBrands(region *SCloudregion, domainId string, capa *SCapabilities) { appendBrand(&capa.SnapshotPolicyBrands, &capa.DisabledSnapshotPolicyBrands, &capa.ReadOnlySnapshotPolicyBrands, &capa.ReadOnlyDisabledSnapshotPolicyBrands, brand, capability, enabled, readOnly) case cloudprovider.CLOUD_CAPABILITY_MODELARTES: appendBrand(&capa.ModelartsPoolsBrands, &capa.DisabledModelartsPoolsBrands, &capa.ReadOnlyModelartsPoolsBrands, &capa.ReadOnlyDisabledModelartsPoolsBrands, brand, capability, enabled, readOnly) + case cloudprovider.CLOUD_CAPABILITY_DNSZONE: + appendBrand(&capa.DnsBrands, &capa.DisabledDnsBrands, &capa.ReadOnlyDnsBrands, &capa.ReadOnlyDisabledDnsBrands, brand, capability, enabled, readOnly) default: } }