From 08c5f3c816c034e43a0e9a0ce02e37641c847c38 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Wed, 25 Aug 2021 20:15:11 +0800 Subject: [PATCH] fix(region): cdn misc fix --- pkg/compute/models/capabilities.go | 4 ++++ pkg/compute/policy/resources.go | 1 + 2 files changed, 5 insertions(+) diff --git a/pkg/compute/models/capabilities.go b/pkg/compute/models/capabilities.go index 87c994c72e..51858abbe9 100644 --- a/pkg/compute/models/capabilities.go +++ b/pkg/compute/models/capabilities.go @@ -57,6 +57,8 @@ type SCapabilities struct { DisabledNasBrands []string `json:",allowempty"` WafBrands []string `json:",allowempty"` DisabledWafBrands []string `json:",allowempty"` + CdnBrands []string `json:",allowempty"` + DisabledCdnBrands []string `json:",allowempty"` PublicIpBrands []string `json:",allowempty"` NetworkManageBrands []string `json:",allowempty"` DisabledNetworkManageBrands []string `json:",allowempty"` @@ -306,6 +308,7 @@ func getBrands(region *SCloudregion, zone *SZone, domainId string, capa *SCapabi capa.NatBrands, _ = CloudaccountManager.getBrandsOfCapability(region, zone, domainId, tristate.True, cloudprovider.CLOUD_CAPABILITY_NAT) capa.NasBrands, _ = CloudaccountManager.getBrandsOfCapability(region, zone, domainId, tristate.True, cloudprovider.CLOUD_CAPABILITY_NAS) capa.WafBrands, _ = CloudaccountManager.getBrandsOfCapability(region, zone, domainId, tristate.True, cloudprovider.CLOUD_CAPABILITY_WAF) + capa.CdnBrands, _ = CloudaccountManager.getBrandsOfCapability(region, zone, domainId, tristate.True, cloudprovider.CLOUD_CAPABILITY_CDN) if utils.IsInStringArray(api.HYPERVISOR_KVM, capa.Hypervisors) || utils.IsInStringArray(api.HYPERVISOR_BAREMETAL, capa.Hypervisors) { capa.Brands = append(capa.Brands, api.ONECLOUD_BRAND_ONECLOUD) @@ -328,6 +331,7 @@ func getBrands(region *SCloudregion, zone *SZone, domainId string, capa *SCapabi capa.DisabledNatBrands, _ = CloudaccountManager.getBrandsOfCapability(region, zone, domainId, tristate.False, cloudprovider.CLOUD_CAPABILITY_NAT) capa.DisabledNasBrands, _ = CloudaccountManager.getBrandsOfCapability(region, zone, domainId, tristate.False, cloudprovider.CLOUD_CAPABILITY_NAS) capa.DisabledNasBrands, _ = CloudaccountManager.getBrandsOfCapability(region, zone, domainId, tristate.False, cloudprovider.CLOUD_CAPABILITY_WAF) + capa.DisabledCdnBrands, _ = CloudaccountManager.getBrandsOfCapability(region, zone, domainId, tristate.False, cloudprovider.CLOUD_CAPABILITY_CDN) return } diff --git a/pkg/compute/policy/resources.go b/pkg/compute/policy/resources.go index 78727c2ef4..a7bc01e21d 100644 --- a/pkg/compute/policy/resources.go +++ b/pkg/compute/policy/resources.go @@ -63,6 +63,7 @@ var ( "waf_rule_groups", "waf_ipsets", "waf_regexsets", + "cdn_domains", } computeUserResources = []string{ "keypairs",