Merge pull request #9467 from tb365/bugfix/tb-bugfix-121701

fix(region): skus add cloudenv

pkg/apis/compute/dbinstance_sku.go

@@ -21,6 +21,10 @@ type DBInstanceSkuDetails struct {
 	CloudregionResourceInfo
 
 	SDBInstanceSku
+
+	// 云环境
+	CloudEnv string `json:"cloud_env"`
+
 	Zone1Name string `json:"zone1_name"`
 	Zone2Name string `json:"zone2_name"`
 	Zone3Name string `json:"zone3_name"`

pkg/apis/compute/elasticcachesku.go

@@ -23,4 +23,7 @@ type ElasticcacheSkuDetails struct {
 	SlaveZoneResourceInfoBase
 
 	SElasticcacheSku
+
+	// 云环境
+	CloudEnv string `json:"cloud_env"`
 }

pkg/compute/models/dbinstance_skus.go

@@ -210,6 +210,9 @@ func (manager *SDBInstanceSkuManager) FetchCustomizeColumns(
 			EnabledStatusStandaloneResourceDetails: enableRows[i],
 			CloudregionResourceInfo:                regionRows[i],
 		}
+
+		rows[i].CloudEnv = strings.Split(regionRows[i].RegionExternalId, "/")[0]
+
 		sku := objs[i].(*SDBInstanceSku)
 		for _, zoneId := range []string{sku.Zone1, sku.Zone2, sku.Zone3} {
 			if _, ok := zoneIds[zoneId]; !ok {

pkg/compute/models/elasticcache_skus.go

@@ -17,6 +17,7 @@ package models
 import (
 	"context"
 	"database/sql"
+	"strings"
 
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
@@ -144,6 +145,8 @@ func (manager *SElasticcacheSkuManager) FetchCustomizeColumns(
 			ZoneResourceInfoBase:            zoneRows[i].ZoneResourceInfoBase,
 			SlaveZoneResourceInfoBase:       slavezoneRows[i],
 		}
+
+		rows[i].CloudEnv = strings.Split(regRows[i].RegionExternalId, "/")[0]
 	}
 
 	return rows

pkg/compute/models/skus.go

@@ -265,7 +265,7 @@ func (manager *SServerSkuManager) FetchCustomizeColumns(
 			rows[i].CloudregionResourceInfo = regRows[i]
 		}
 
-		rows[i].CloudEnv = strings.Split(zoneRows[i].RegionExtId, "/")[0]
+		rows[i].CloudEnv = strings.Split(zoneRows[i].RegionExternalId, "/")[0]
 		rows[i].TotalGuestCount = objs[i].(*SServerSku).getTotalGuestCount()
 	}