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

Merge pull request #767 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-spec-memsize to release/2.4.0

Browse Source 
* commit 'efd3d565758de352c4e2965ab06b8bb9b0d762e9':
  region: 如果 memsize < 1024 按MB解析
This commit is contained in:
邱剑
2018-12-15 17:23:09 +08:00
parent f1e5d6d99e efd3d56575
commit 807af86fea
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/hosts.go
+10 -4
View File
@@ -820,9 +820,15 @@ func (self *SHost) GetSpec(statusCheck bool) *jsonutils.JSONDict {
func (manager *SHostManager) GetSpecIdent(spec *jsonutils.JSONDict) []string {
nCpu, _ := spec.Int("cpu")
memSize, _ := spec.Int("mem")
memGB, err := utils.GetSizeGB(fmt.Sprintf("%d", memSize), "M")
if err != nil {
log.Errorf("Get mem size %d GB error: %v", memSize, err)
var memSizeStr string
if memSize < 1024 {
memSizeStr = fmt.Sprintf("mem:%dM", memSize)
} else {
memGB, err := utils.GetSizeGB(fmt.Sprintf("%d", memSize), "M")
if err != nil {
log.Errorf("Get mem size %d GB error: %v", memSize, err)
}
memSizeStr = fmt.Sprintf("mem:%dG", memGB)
}
nicCount, _ := spec.Int("nic_count")
manufacture, _ := spec.GetString("manufacture")
@@ -830,7 +836,7 @@ func (manager *SHostManager) GetSpecIdent(spec *jsonutils.JSONDict) []string {
specKeys := []string{
fmt.Sprintf("cpu:%d", nCpu),
fmt.Sprintf("mem:%dG", memGB),
memSizeStr,
fmt.Sprintf("nic:%d", nicCount),
fmt.Sprintf("manufacture:%s", manufacture),
fmt.Sprintf("model:%s", model),