Merge pull request #12113 from ioito/automated-cherry-pick-of-#12112-upstream-release-3.8

Automated cherry pick of #12112: fix(region): sku region info
This commit is contained in:
yunion-ci-robot
2021-09-06 00:16:24 +08:00
committed by GitHub
+1 -3
View File
@@ -270,9 +270,7 @@ func (manager *SServerSkuManager) FetchCustomizeColumns(
rows[i] = api.ServerSkuDetails{
EnabledStatusStandaloneResourceDetails: stdRows[i],
ZoneResourceInfoBase: zoneRows[i].ZoneResourceInfoBase,
}
if len(rows[i].Zone) == 0 {
rows[i].CloudregionResourceInfo = regRows[i]
CloudregionResourceInfo: regRows[i],
}
rows[i].CloudEnv = strings.Split(zoneRows[i].RegionExternalId, "/")[0]