From 2794f188e585e4456c7e8d34a7a743f4594c4d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Tue, 15 Jan 2019 16:09:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8zone-list=E6=98=BE=E7=A4=BAlo?= =?UTF-8?q?cation=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/zones.go | 6 +++--- pkg/mcclient/modules/mod_zones.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/compute/models/zones.go b/pkg/compute/models/zones.go index 7d99351597..3e65ec5d3e 100644 --- a/pkg/compute/models/zones.go +++ b/pkg/compute/models/zones.go @@ -44,9 +44,9 @@ func init() { type SZone struct { db.SStatusStandaloneResourceBase - Location string `width:"256" charset:"utf8" get:"user" update:"admin"` // = Column(VARCHAR(256, charset='utf8')) - Contacts string `width:"256" charset:"utf8" get:"user" update:"admin"` // = Column(VARCHAR(256, charset='utf8')) - NameCn string `width:"256" charset:"utf8"` // = Column(VARCHAR(256, charset='utf8')) + Location string `width:"256" charset:"utf8" get:"user" list:"user" update:"admin"` // = Column(VARCHAR(256, charset='utf8')) + Contacts string `width:"256" charset:"utf8" get:"user" update:"admin"` // = Column(VARCHAR(256, charset='utf8')) + NameCn string `width:"256" charset:"utf8"` // = Column(VARCHAR(256, charset='utf8')) // status = Column(VARCHAR(36, charset='ascii'), nullable=False, default=ZONE_DISABLE) ManagerUri string `width:"256" charset:"ascii" list:"admin" update:"admin"` // = Column(VARCHAR(256, charset='ascii'), nullable=True) // admin_id = Column(VARCHAR(36, charset='ascii'), nullable=False) diff --git a/pkg/mcclient/modules/mod_zones.go b/pkg/mcclient/modules/mod_zones.go index 7354266b93..e5b9909fc9 100644 --- a/pkg/mcclient/modules/mod_zones.go +++ b/pkg/mcclient/modules/mod_zones.go @@ -6,7 +6,7 @@ var ( func init() { Zones = NewComputeManager("zone", "zones", - []string{"ID", "Name", "Name_CN", "Status", "Cloudregion_ID", "CloudRegion"}, + []string{"ID", "Name", "Name_CN", "Status", "Cloudregion_ID", "CloudRegion", "Location"}, []string{"Manager_URI"}) registerCompute(&Zones)