From bd9e5ee68212927ec10d22d9a3d770e6821b43e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Wed, 5 Sep 2018 13:35:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BA=91=E7=9B=98=E6=97=B6=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81storage=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/storages.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/compute/models/storages.go b/pkg/compute/models/storages.go index 313797ab1d..418b928a82 100644 --- a/pkg/compute/models/storages.go +++ b/pkg/compute/models/storages.go @@ -62,12 +62,12 @@ type SStorage struct { SInfrastructure SManagedResourceBase - Capacity int `nullable:"false" list:"admin" update:"admin" create:"admin_required"` // Column(Integer, nullable=False) # capacity of disk in MB - Reserved int `nullable:"true" default:"0" list:"admin" update:"admin"` // Column(Integer, nullable=True, default=0) - StorageType string `width:"32" charset:"ascii" nullable:"false" list:"admin" update:"admin" create:"admin_required"` // Column(VARCHAR(32, charset='ascii'), nullable=False) - MediumType string `width:"32" charset:"ascii" nullable:"false" list:"admin" update:"admin" create:"admin_required"` // Column(VARCHAR(32, charset='ascii'), nullable=False) - Cmtbound float32 `nullable:"true" list:"admin" update:"admin"` // Column(Float, nullable=True) - StorageConf jsonutils.JSONObject `nullable:"true" get:"admin" update:"admin"` // = Column(JSONEncodedDict, nullable=True) + Capacity int `nullable:"false" list:"admin" update:"admin" create:"admin_required"` // Column(Integer, nullable=False) # capacity of disk in MB + Reserved int `nullable:"true" default:"0" list:"admin" update:"admin"` // Column(Integer, nullable=True, default=0) + StorageType string `width:"32" charset:"ascii" nullable:"false" list:"user" update:"admin" create:"admin_required"` // Column(VARCHAR(32, charset='ascii'), nullable=False) + MediumType string `width:"32" charset:"ascii" nullable:"false" list:"user" update:"admin" create:"admin_required"` // Column(VARCHAR(32, charset='ascii'), nullable=False) + Cmtbound float32 `nullable:"true" list:"admin" update:"admin"` // Column(Float, nullable=True) + StorageConf jsonutils.JSONObject `nullable:"true" get:"admin" update:"admin"` // = Column(JSONEncodedDict, nullable=True) ZoneId string `width:"36" charset:"ascii" nullable:"false" list:"admin" create:"admin_required"` From 60ad925b78e75f08cbb7779a0873fe04828382e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Wed, 5 Sep 2018 14:57:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?storage-cache-image-list=E9=9C=80=E8=A6=81s?= =?UTF-8?q?toragecache=5Fid=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/storages.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/compute/models/storages.go b/pkg/compute/models/storages.go index 418b928a82..853b0c960f 100644 --- a/pkg/compute/models/storages.go +++ b/pkg/compute/models/storages.go @@ -71,7 +71,7 @@ type SStorage struct { ZoneId string `width:"36" charset:"ascii" nullable:"false" list:"admin" create:"admin_required"` - StoragecacheId string `width:"36" charset:"ascii" nullable:"true" get:"admin"` + StoragecacheId string `width:"36" charset:"ascii" nullable:"true" list:"admin" get:"admin"` } func (manager *SStorageManager) GetContextManager() []db.IModelManager {