From e8d8097627f0cd2b3bf019d974e31af510a13779 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Wed, 13 Feb 2019 15:49:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3:=20disk=20=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=20scheduler=20=E5=8F=82=E6=95=B0=E4=B8=8D=E5=AF=B9,=20size=5Fm?= =?UTF-8?q?b=20=E5=BA=94=E8=AF=A5=E4=B8=BA=20size?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/disks.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkg/compute/models/disks.go b/pkg/compute/models/disks.go index 0555318100..ae4380ed0d 100644 --- a/pkg/compute/models/disks.go +++ b/pkg/compute/models/disks.go @@ -1101,23 +1101,23 @@ func totalDiskSize(projectId string, active tristate.TriState, ready tristate.Tr } type SDiskConfig struct { - ImageId string + ImageId string `json:"image_id"` - SnapshotId string - DiskType string // sys, data, swap, volume + SnapshotId string `json:"snapshot_id"` + DiskType string `json:"disk_type"` // sys, data, swap, volume // ImageDiskFormat string - SizeMb int // MB - Fs string // file system - Format string // - Driver string // - Cache string // - Mountpoint string // - Backend string // stroageType - Medium string - ImageProperties map[string]string + SizeMb int `json:"size"` // MB + Fs string `json:"fs"` // file system + Format string `json:"format"` // + Driver string `json:"driver"` // + Cache string `json:"cache"` // + Mountpoint string `json:"mountpoint"` // + Backend string `json:"backend"` // stroageType + Medium string `json:"medium"` + ImageProperties map[string]string `json:"image_properties"` - DiskId string // import only + DiskId string `json:"-"` // import only } func parseDiskInfo(ctx context.Context, userCred mcclient.TokenCredential, info jsonutils.JSONObject) (*SDiskConfig, error) {