From 5e138dd5677524f4c18fa17dc773870f693c14a0 Mon Sep 17 00:00:00 2001 From: gouqi11 <66834753+gouqi11@users.noreply.github.com> Date: Wed, 8 May 2024 19:58:59 +0800 Subject: [PATCH] fix(region): add modelarts capability (#20214) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 马鸿飞 --- pkg/compute/models/capabilities.go | 70 ++++++++++++++++-------------- 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/pkg/compute/models/capabilities.go b/pkg/compute/models/capabilities.go index 454cb29ba7..a8a1631d1a 100644 --- a/pkg/compute/models/capabilities.go +++ b/pkg/compute/models/capabilities.go @@ -56,22 +56,24 @@ type SCapabilities struct { CloudIdBrands []string `json:",allowempty"` DisabledCloudIdBrands []string `json:",allowempty"` // 支持SAML 2.0 - SamlAuthBrands []string `json:",allowempty"` - DisabledSamlAuthBrands []string `json:",allowempty"` - NatBrands []string `json:",allowempty"` - DisabledNatBrands []string `json:",allowempty"` - NasBrands []string `json:",allowempty"` - DisabledNasBrands []string `json:",allowempty"` - WafBrands []string `json:",allowempty"` - DisabledWafBrands []string `json:",allowempty"` - CdnBrands []string `json:",allowempty"` - DisabledCdnBrands []string `json:",allowempty"` - PublicIpBrands []string `json:",allowempty"` - DisabledPublicIpBrands []string `json:",allowempty"` - NetworkManageBrands []string `json:",allowempty"` - DisabledNetworkManageBrands []string `json:",allowempty"` - ObjectStorageBrands []string `json:",allowempty"` - DisabledObjectStorageBrands []string `json:",allowempty"` + SamlAuthBrands []string `json:",allowempty"` + DisabledSamlAuthBrands []string `json:",allowempty"` + NatBrands []string `json:",allowempty"` + DisabledNatBrands []string `json:",allowempty"` + NasBrands []string `json:",allowempty"` + DisabledNasBrands []string `json:",allowempty"` + WafBrands []string `json:",allowempty"` + DisabledWafBrands []string `json:",allowempty"` + CdnBrands []string `json:",allowempty"` + DisabledCdnBrands []string `json:",allowempty"` + PublicIpBrands []string `json:",allowempty"` + DisabledPublicIpBrands []string `json:",allowempty"` + NetworkManageBrands []string `json:",allowempty"` + DisabledNetworkManageBrands []string `json:",allowempty"` + ObjectStorageBrands []string `json:",allowempty"` + DisabledObjectStorageBrands []string `json:",allowempty"` + DisabledModelartsPoolsBrands []string `json:",allowempty"` + ModelartsPoolsBrands []string `json:",allowempty"` ContainerBrands []string `json:",allowempty"` DisabledContainerBrands []string `json:",allowempty"` @@ -98,22 +100,24 @@ type SCapabilities struct { ReadOnlyCloudIdBrands []string `json:",allowempty"` ReadOnlyDisabledCloudIdBrands []string `json:",allowempty"` // 支持SAML 2.0 - ReadOnlySamlAuthBrands []string `json:",allowempty"` - ReadOnlyDisabledSamlAuthBrands []string `json:",allowempty"` - ReadOnlyNatBrands []string `json:",allowempty"` - ReadOnlyDisabledNatBrands []string `json:",allowempty"` - ReadOnlyNasBrands []string `json:",allowempty"` - ReadOnlyDisabledNasBrands []string `json:",allowempty"` - ReadOnlyWafBrands []string `json:",allowempty"` - ReadOnlyDisabledWafBrands []string `json:",allowempty"` - ReadOnlyCdnBrands []string `json:",allowempty"` - ReadOnlyDisabledCdnBrands []string `json:",allowempty"` - ReadOnlyPublicIpBrands []string `json:",allowempty"` - ReadOnlyDisabledPublicIpBrands []string `json:",allowempty"` - ReadOnlyNetworkManageBrands []string `json:",allowempty"` - ReadOnlyDisabledNetworkManageBrands []string `json:",allowempty"` - ReadOnlyObjectStorageBrands []string `json:",allowempty"` - ReadOnlyDisabledObjectStorageBrands []string `json:",allowempty"` + ReadOnlySamlAuthBrands []string `json:",allowempty"` + ReadOnlyDisabledSamlAuthBrands []string `json:",allowempty"` + ReadOnlyNatBrands []string `json:",allowempty"` + ReadOnlyDisabledNatBrands []string `json:",allowempty"` + ReadOnlyNasBrands []string `json:",allowempty"` + ReadOnlyDisabledNasBrands []string `json:",allowempty"` + ReadOnlyWafBrands []string `json:",allowempty"` + ReadOnlyDisabledWafBrands []string `json:",allowempty"` + ReadOnlyCdnBrands []string `json:",allowempty"` + ReadOnlyDisabledCdnBrands []string `json:",allowempty"` + ReadOnlyPublicIpBrands []string `json:",allowempty"` + ReadOnlyDisabledPublicIpBrands []string `json:",allowempty"` + ReadOnlyNetworkManageBrands []string `json:",allowempty"` + ReadOnlyDisabledNetworkManageBrands []string `json:",allowempty"` + ReadOnlyObjectStorageBrands []string `json:",allowempty"` + ReadOnlyDisabledObjectStorageBrands []string `json:",allowempty"` + ReadOnlyModelartsPoolsBrands []string `json:",allowempty"` + ReadOnlyDisabledModelartsPoolsBrands []string `json:",allowempty"` ReadOnlyContainerBrands []string `json:",allowempty"` ReadOnlyDisabledContainerBrands []string `json:",allowempty"` @@ -491,6 +495,8 @@ func getBrands(region *SCloudregion, zone *SZone, domainId string, capa *SCapabi appendBrand(&capa.SecurityGroupBrands, &capa.DisabledSecurityGroupBrands, &capa.ReadOnlySecurityGroupBrands, &capa.ReadOnlyDisabledSecurityGroupBrands, brand, capability, enabled, readOnly) case cloudprovider.CLOUD_CAPABILITY_SNAPSHOT_POLICY: 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) default: } }