From 9ee7ace4823cf5b52c693f0e1e0a043b438c617e Mon Sep 17 00:00:00 2001 From: ioito Date: Thu, 24 Mar 2022 17:04:02 +0800 Subject: [PATCH] fix(region): bingo node attr --- pkg/multicloud/bingocloud/node.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkg/multicloud/bingocloud/node.go b/pkg/multicloud/bingocloud/node.go index b6a46f9a77..e34ba602ae 100644 --- a/pkg/multicloud/bingocloud/node.go +++ b/pkg/multicloud/bingocloud/node.go @@ -115,14 +115,20 @@ func (self *SNode) GetCpuMhz() int { } func (self *SNode) GetCpuCmtbound() float32 { + if self.CpuMax > self.CpuNode { + return float32(self.CpuMax) / float32(self.CpuNode) + } return 1 } func (self *SNode) GetMemSizeMB() int { - return self.MemoryMax + return self.MemNode } func (self *SNode) GetMemCmtbound() float32 { + if self.MemoryMax > self.MemNode { + return float32(self.MemoryMax) / float32(self.MemNode) + } return 1 } @@ -131,7 +137,10 @@ func (self *SNode) GetReservedMemoryMb() int { } func (self *SNode) GetStorageSizeMB() int { - return self.DiskMax * 1024 + if self.DiskMax > 0 { + return self.DiskMax * 1024 + } + return self.DiskNode * 1024 } func (self *SNode) GetStorageType() string {