Merge pull request #1344 from ioito/hotfix/qx-dns-product-type

fix(aliyun): dns product type

Author: ioito

pkg/cloudprovider/dnszone.go

@@ -75,11 +75,14 @@ const (
 )
 
 const (
-	DnsProductEnterpriseUltimate   = TDnsProductType("DP_EnterpriseUltimate")
-	DnsProductEnterpriseStandard   = TDnsProductType("DP_EnterpriseStandard")
-	DnsProductEnterpriseBasic      = TDnsProductType("DP_EnterpriseBasic")
-	DnsProductPersonalProfessional = TDnsProductType("DP_PersonalProfessional")
-	DnsProductFree                 = TDnsProductType("DP_Free")
+	// 旗舰版
+	DnsProductUltimate = TDnsProductType("Ultimate")
+	// 企业版
+	DnsProductEnterprise = TDnsProductType("Enterprise")
+	// 专业版
+	DnsProductProfessional = TDnsProductType("Professional")
+	// 免费版
+	DnsProductFree = TDnsProductType("Free")
 )
 
 var (
@@ -505,9 +508,7 @@ func (ttlR TTlRange) GetSuppportedTTL(ttl int64) int64 {
 	return ttl
 }
 
-var TtlRangeAliyunEnterpriseUltimate = TTlRange{RangeType: ContinuousTTlRange, TTLMinValue: 1, TTLMaxValue: 86400}
-var TtlRangeAliyunEnterpriseStandard = TTlRange{RangeType: ContinuousTTlRange, TTLMinValue: 60, TTLMaxValue: 86400}
-var TtlRangeAliyunPersonal = TTlRange{RangeType: ContinuousTTlRange, TTLMinValue: 600, TTLMaxValue: 86400}
+var TtlRangeAliyunEnterprise = TTlRange{RangeType: ContinuousTTlRange, TTLMinValue: 1, TTLMaxValue: 86400}
 var TtlRangeAliyunFree = TTlRange{RangeType: ContinuousTTlRange, TTLMinValue: 600, TTLMaxValue: 86400}
 
 var TtlRangeAliyunPvtz = TTlRange{RangeType: DiscreteTTlRange, AllowedTTLs: []int64{5, 10, 15, 20, 30, 60, 120, 300, 600, 1800, 3600, 43200, 86400}}

pkg/multicloud/aliyun/dns_domain.go

@@ -18,7 +18,6 @@ import (
 	"strconv"
 
 	"yunion.io/x/jsonutils"
-	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
 
 	api "yunion.io/x/cloudmux/pkg/apis/compute"
@@ -333,60 +332,20 @@ func (self *SDomain) Delete() error {
 	return self.client.DeleteDomain(self.DomainName)
 }
 
-func TDnsProductType(productName string) cloudprovider.TDnsProductType {
-	switch productName {
-	case "企业旗舰版":
-		return cloudprovider.DnsProductEnterpriseUltimate
-	case "企业标准版":
-		return cloudprovider.DnsProductEnterpriseStandard
-	case "个人版":
-		return cloudprovider.DnsProductPersonalProfessional
-	default:
-		return cloudprovider.DnsProductFree
-	}
-}
-
 func (self *SDomain) GetDnsProductType() cloudprovider.TDnsProductType {
-	sproducts, err := self.client.GetAllDnsProductInstances()
-	if err != nil {
-		log.Errorf("self.client.GetAllDnsProductInstances():%s", err)
+	switch self.VersionCode {
+	case "version_enterprise_advanced":
+		return cloudprovider.DnsProductEnterprise
+	case "mianfei":
 		return cloudprovider.DnsProductFree
+	default:
+		return cloudprovider.TDnsProductType(self.VersionCode)
 	}
-	// https://help.aliyun.com/document_detail/29806.html?spm=a2c4g.11186623.4.1.67728197c8SCN9
-	// 免费版，最低600
-	self.ttlMinValue = 600
-	for i := 0; i < len(sproducts); i++ {
-		if sproducts[i].Domain == self.DomainName {
-			return TDnsProductType(sproducts[i].VersionName)
-		}
-	}
-	return cloudprovider.DnsProductFree
-}
-
-func (self *SDomain) fetchTTLMinValue() (int64, error) {
-	if self.ttlMinValue != 0 {
-		return self.ttlMinValue, nil
-	}
-	sproducts, err := self.client.GetAllDnsProductInstances()
-	if err != nil {
-		return 0, errors.Wrap(err, "self.client.GetAllDnsProductInstances()")
-	}
-	// https://help.aliyun.com/document_detail/29806.html?spm=a2c4g.11186623.4.1.67728197c8SCN9
-	// 免费版，最低600
-	self.ttlMinValue = 600
-	for i := 0; i < len(sproducts); i++ {
-		if sproducts[i].Domain == self.DomainName {
-			self.ttlMinValue = sproducts[i].TTLMinValue
-			return self.ttlMinValue, nil
-		}
-	}
-	return self.ttlMinValue, nil
 }
 
 func (self *SDomain) GetProperlyTTL(ttl int64) int64 {
-	ttlMin, err := self.fetchTTLMinValue()
-	if err != nil {
-		log.Errorf("self.fetchTTLMinValue():%s", err)
+	ttlMin := int64(1)
+	if self.GetDnsProductType() == cloudprovider.DnsProductFree {
 		ttlMin = 600
 	}
 	if ttl <= ttlMin {

pkg/multicloud/aliyun/provider/provider.go

@@ -118,12 +118,8 @@ func (self *SAliyunProviderFactory) GetTTLRange(zoneType cloudprovider.TDnsZoneT
 	if zoneType == cloudprovider.PublicZone {
 		if len(productType) > 0 {
 			switch productType {
-			case cloudprovider.DnsProductEnterpriseUltimate:
-				return cloudprovider.TtlRangeAliyunEnterpriseUltimate
-			case cloudprovider.DnsProductEnterpriseStandard:
-				return cloudprovider.TtlRangeAliyunEnterpriseStandard
-			case cloudprovider.DnsProductPersonalProfessional:
-				return cloudprovider.TtlRangeAliyunPersonal
+			case cloudprovider.DnsProductEnterprise:
+				return cloudprovider.TtlRangeAliyunEnterprise
 			default:
 				return cloudprovider.TtlRangeAliyunFree
 			}

pkg/multicloud/aliyun/shell/dns_domain.go

@@ -130,6 +130,7 @@ func init() {
 		opts.DnsValue = args.VALUE
 		opts.Ttl = args.TTL
 		opts.PolicyType = cloudprovider.TDnsPolicyType(args.PolicyType)
+		opts.PolicyValue = cloudprovider.TDnsPolicyValue(args.PolicyValue)
 
 		_, err := cli.GetClient().AddDomainRecord(args.DOMAINNAME, opts)
 		if err != nil {

pkg/multicloud/qcloud/dnspod_domain.go

@@ -248,13 +248,11 @@ func (self *SDomian) AddDnsRecord(opts *cloudprovider.DnsRecord) (string, error)
 func (self *SDomian) GetDnsProductType() cloudprovider.TDnsProductType {
 	switch self.GradeTitle {
 	case "企业旗舰版":
-		return cloudprovider.DnsProductEnterpriseUltimate
-	case "企业标准版":
-		return cloudprovider.DnsProductEnterpriseStandard
-	case "企业基础版":
-		return cloudprovider.DnsProductEnterpriseBasic
+		return cloudprovider.DnsProductUltimate
+	case "企业标准版", "企业基础版":
+		return cloudprovider.DnsProductEnterprise
 	case "个人专业版":
-		return cloudprovider.DnsProductPersonalProfessional
+		return cloudprovider.DnsProductProfessional
 	case "免费版":
 		return cloudprovider.DnsProductFree
 	default:

pkg/multicloud/qcloud/provider/provider.go

@@ -138,13 +138,11 @@ func (self *SQcloudProviderFactory) GetSupportedDnsPolicyValues() map[cloudprovi
 func (self *SQcloudProviderFactory) GetTTLRange(zoneType cloudprovider.TDnsZoneType, productType cloudprovider.TDnsProductType) cloudprovider.TTlRange {
 	if len(productType) > 0 {
 		switch productType {
-		case cloudprovider.DnsProductEnterpriseUltimate:
+		case cloudprovider.DnsProductUltimate:
 			return cloudprovider.TtlRangeQcloudEnterpriseUltimate
-		case cloudprovider.DnsProductEnterpriseStandard:
+		case cloudprovider.DnsProductEnterprise:
 			return cloudprovider.TtlRangeQcloudEnterpriseStandard
-		case cloudprovider.DnsProductEnterpriseBasic:
-			return cloudprovider.TtlRangeQcloudEnterpriseBasic
-		case cloudprovider.DnsProductPersonalProfessional:
+		case cloudprovider.DnsProductProfessional:
 			return cloudprovider.TtlRangeQcloudPersonalProfessional
 		case cloudprovider.DnsProductFree:
 			return cloudprovider.TtlRangeQcloudFree