fix(baremetal): panic when save desc (#21867)

This commit is contained in:
Zexi Li
2024-12-20 16:18:57 +08:00
committed by GitHub
parent 8d3b5e22b3
commit 234d40de78

View File

@@ -630,8 +630,10 @@ func (b *SBaremetalInstance) SaveDesc(ctx context.Context, desc jsonutils.JSONOb
b.descLock.Lock()
defer b.descLock.Unlock()
if desc != nil {
if desc != nil && b.desc != nil && b.desc.Contains("server_id") && !desc.Contains("server_id") {
desc.(*jsonutils.JSONDict).Set("server_id", jsonutils.NewString(b.server.GetId()))
if b.desc != nil && b.desc.Contains("server_id") && !desc.Contains("server_id") {
if b.server != nil {
desc.(*jsonutils.JSONDict).Set("server_id", jsonutils.NewString(b.server.GetId()))
}
}
b.desc = desc.(*jsonutils.JSONDict)
if b.desc.Contains("sys_info") {