From 4cb35dd7bec475c11c79226896b5b5060cc9e937 Mon Sep 17 00:00:00 2001 From: Zexi Date: Mon, 20 May 2019 20:54:46 +0800 Subject: [PATCH] fix: host undo convert not delete isolated_devices --- pkg/compute/models/isolated_devices.go | 3 ++- pkg/compute/tasks/baremetal_unconvert_hypervisor_task.go | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/compute/models/isolated_devices.go b/pkg/compute/models/isolated_devices.go index 83a0e05372..dde96f209f 100644 --- a/pkg/compute/models/isolated_devices.go +++ b/pkg/compute/models/isolated_devices.go @@ -589,7 +589,8 @@ func (manager *SIsolatedDeviceManager) FindByHost(id string) []SIsolatedDevice { func (manager *SIsolatedDeviceManager) FindByHosts(ids []string) []SIsolatedDevice { dest := make([]SIsolatedDevice, 0) - err := manager.Query().In("host_id", ids).All(&dest) + q := manager.Query().In("host_id", ids) + err := db.FetchModelObjects(manager, q, &dest) if err != nil { log.Errorln(err) return nil diff --git a/pkg/compute/tasks/baremetal_unconvert_hypervisor_task.go b/pkg/compute/tasks/baremetal_unconvert_hypervisor_task.go index c6be22f89a..7c2c40d473 100644 --- a/pkg/compute/tasks/baremetal_unconvert_hypervisor_task.go +++ b/pkg/compute/tasks/baremetal_unconvert_hypervisor_task.go @@ -49,6 +49,7 @@ func (self *BaremetalUnconvertHypervisorTask) OnInit(ctx context.Context, obj db } else { self.OnGuestDeleteComplete(ctx, baremetal, nil) } + models.IsolatedDeviceManager.DeleteDevicesByHost(ctx, self.GetUserCred(), baremetal) } func (self *BaremetalUnconvertHypervisorTask) OnGuestDeleteComplete(ctx context.Context, baremetal *models.SHost, body jsonutils.JSONObject) {