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

region: specs panic when host sysinfo is nil

Browse Source
This commit is contained in:
Zexi Li
2018-12-12 17:46:56 +08:00
parent 0c9315ec4d
commit b64c3b3333
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/hosts.go
+13 -8
View File
@@ -733,16 +733,21 @@ func (self *SHost) GetSpec(statusCheck bool) *jsonutils.JSONDict {
}
}
spec.Set("nic_count", jsonutils.NewInt(nicCount))
manufacture, err := self.SysInfo.Get("manufacture")
if err != nil {
manufacture = jsonutils.NewString("Unknown")
var manufacture string
var model string
if self.SysInfo != nil {
manufacture, _ = self.SysInfo.GetString("manufacture")
model, _ = self.SysInfo.GetString("model")
}
spec.Set("manufacture", manufacture)
model, err := self.SysInfo.Get("model")
if err != nil {
model = jsonutils.NewString("Unknown")
if manufacture == "" {
manufacture = "Unknown"
}
spec.Set("model", model)
if model == "" {
model = "Unknown"
}
spec.Set("manufacture", jsonutils.NewString(manufacture))
spec.Set("model", jsonutils.NewString(model))
return spec
}