opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 避免污染cloud_env参数

Browse Source
This commit is contained in:
Qu Xuan
2019-12-12 19:54:19 +08:00
parent 734dfdc6c3
commit 71d5736636
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudregions.go
+4 -4
View File
@@ -60,8 +60,8 @@ type SCloudregion struct {
cloudprovider.SGeographicInfo
CloudEnv string `width:"32" charset:"ascii" list:"user"`
Provider string `width:"64" charset:"ascii" list:"user" nullable:"false" default:"OneCloud"`
Environment string `width:"32" charset:"ascii" list:"user"`
Provider string `width:"64" charset:"ascii" list:"user" nullable:"false" default:"OneCloud"`
}
func (manager *SCloudregionManager) AllowListItems(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) bool {
@@ -403,7 +403,7 @@ func (self *SCloudregion) syncWithCloudRegion(ctx context.Context, userCred mccl
self.Status = cloudRegion.GetStatus()
self.SGeographicInfo = cloudRegion.GetGeographicInfo()
self.Provider = cloudRegion.GetProvider()
self.CloudEnv = cloudRegion.GetCloudEnv()
self.Environment = cloudRegion.GetCloudEnv()
self.IsEmulated = cloudRegion.IsEmulated()
@@ -435,7 +435,7 @@ func (manager *SCloudregionManager) newFromCloudRegion(ctx context.Context, user
region.Status = cloudRegion.GetStatus()
region.Enabled = true
region.Provider = cloudRegion.GetProvider()
region.CloudEnv = cloudRegion.GetCloudEnv()
region.Environment = cloudRegion.GetCloudEnv()
region.IsEmulated = cloudRegion.IsEmulated()