From 71d5736636dd4fe7f7b8a23f978af08a349e04a0 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Thu, 12 Dec 2019 19:54:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=81=BF=E5=85=8D=E6=B1=A1=E6=9F=93clou?= =?UTF-8?q?d=5Fenv=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/cloudregions.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/compute/models/cloudregions.go b/pkg/compute/models/cloudregions.go index 430ca3a492..4d3d2a9478 100644 --- a/pkg/compute/models/cloudregions.go +++ b/pkg/compute/models/cloudregions.go @@ -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()