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

fix instance type list marshal error

Browse Source
This commit is contained in:
TangBin
2018-12-13 16:26:42 +08:00
parent 3610828f94
commit fb94b43dc2
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/skus.go
+6 -15
View File
@@ -4,6 +4,7 @@ import (
"context"
"database/sql"
"fmt"
"strconv"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
@@ -283,7 +284,7 @@ func (self *SServerSkuManager) GetPropertyInstanceSpecs(ctx context.Context, use
cpus := jsonutils.NewArray()
mems_mb := jsonutils.NewArray()
cpu_mems_mb := map[int][]int{}
cpu_mems_mb := map[string][]int{}
oc, om := 0, 0
for i := range skus {
@@ -300,10 +301,11 @@ func (self *SServerSkuManager) GetPropertyInstanceSpecs(ctx context.Context, use
om = nm
}
if _, exists := cpu_mems_mb[nc]; !exists {
cpu_mems_mb[nc] = []int{nm}
k := strconv.Itoa(nc)
if _, exists := cpu_mems_mb[k]; !exists {
cpu_mems_mb[k] = []int{nm}
} else {
cpu_mems_mb[nc] = append(cpu_mems_mb[nc], nm)
cpu_mems_mb[k] = append(cpu_mems_mb[k], nm)
}
}
@@ -311,18 +313,7 @@ func (self *SServerSkuManager) GetPropertyInstanceSpecs(ctx context.Context, use
ret.Add(cpus, "cpus")
ret.Add(mems_mb, "mems_mb")
/* r, err := json.Marshal(&cpu_mems_mb)
if err != nil {
log.Errorf("%s", err)
return nil, httperrors.NewInternalServerError("instance specs list marshal failed")
}*/
r_obj := jsonutils.Marshal(&cpu_mems_mb)
/*if err != nil {
log.Errorf("%s", err)
return nil, httperrors.NewInternalServerError("instance specs list parse failed")
}*/
ret.Add(r_obj, "cpu_mems_mb")
return ret, nil
}