opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.7.0 -> release/2.8.0

Browse Source 
* commit '2a0600e7e063105d22f9bc504381697d57f724f9':
  兼容disk json参数
This commit is contained in:
邱剑
2019-03-18 20:55:12 +08:00
parent 98e4b70606 2a0600e7e0
commit 21b464ab9e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+8 -8
View File
@@ -907,21 +907,21 @@ func (manager *SGuestManager) ValidateCreateData(ctx context.Context, userCred m
data.Add(jsonutils.NewInt(int64(vcpuCount)), "vcpu_count")
}
dataDiskDefs := make([]string, 0)
dataDiskDefs := []jsonutils.JSONObject{}
if sku != nil && sku.AttachedDiskCount > 0 {
for i := 0; i < sku.AttachedDiskCount; i += 1 {
dataDiskDefs = append(dataDiskDefs, fmt.Sprintf("%dg:%s", sku.AttachedDiskSizeGB, sku.AttachedDiskType))
dataDisk := jsonutils.Marshal(map[string]interface{}{
"size_mb": sku.AttachedDiskSizeGB * 1024,
"backend": strings.ToLower(sku.AttachedDiskType),
})
dataDiskDefs = append(dataDiskDefs, dataDisk)
}
}
// start from data disk
jsonArray := jsonutils.GetArrayOfPrefix(data, "disk")
for idx := 1; idx < len(jsonArray); idx += 1 { // data.Contains(fmt.Sprintf("disk.%d", idx))
diskJson, err := jsonArray[idx].GetString() // data.GetString(fmt.Sprintf("disk.%d", idx))
if err != nil {
return nil, httperrors.NewInputParameterError("invalid disk description %s", err)
}
dataDiskDefs = append(dataDiskDefs, diskJson)
dataDiskDefs = append(dataDiskDefs, jsonArray[idx])
}
rootDiskConfig, err := parseDiskInfo(ctx, userCred, jsonArray[0])
@@ -938,7 +938,7 @@ func (manager *SGuestManager) ValidateCreateData(ctx context.Context, userCred m
data.Set("disk.0", jsonutils.Marshal(rootDiskConfig))
for i := 0; i < len(dataDiskDefs); i += 1 {
diskConfig, err := parseDiskInfo(ctx, userCred, jsonutils.NewString(dataDiskDefs[i]))
diskConfig, err := parseDiskInfo(ctx, userCred, dataDiskDefs[i])
if err != nil {
return nil, httperrors.NewInputParameterError("parse disk description error %s", err)
}