From 23e4a483dc6fbe78070865dda59bf7b5287f5df2 Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Thu, 3 Dec 2020 12:03:59 +0800 Subject: [PATCH] bugfix(region): fix list by srever type normal server list by normal shouldn't contains gpu and backup servers cherrypick: release/3.4 --- pkg/compute/models/guests.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index 459503d300..0944341182 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -417,8 +417,8 @@ func (manager *SGuestManager) ListItemFilter( var trueVal, falseVal = true, false switch query.ServerType { case "normal": - query.Gpu = nil - query.Backup = nil + query.Gpu = &falseVal + query.Backup = &falseVal case "gpu": query.Gpu = &trueVal query.Backup = &falseVal @@ -433,6 +433,8 @@ func (manager *SGuestManager) ListItemFilter( if query.Backup != nil { if *query.Backup { q = q.IsNotEmpty("backup_host_id") + } else { + q = q.IsEmpty("backup_host_id") } }