Merge pull request #13024 from zexi/automated-cherry-pick-of-#13022-upstream-master

Automated cherry pick of #13022: fix(region): gpu fuzzy match model name exactly
This commit is contained in:
Zexi Li
2021-12-24 18:10:02 +08:00
committed by GitHub
+7 -3
View File
@@ -303,8 +303,13 @@ func (manager *SIsolatedDeviceManager) fuzzyMatchModel(fuzzyStr string) *SIsolat
dev := SIsolatedDevice{}
dev.SetModelManager(manager, &dev)
q := manager.Query().Contains("model", fuzzyStr)
err := q.First(&dev)
q := manager.Query().Equals("model", fuzzyStr)
cnt, err := q.CountWithError()
if err != nil || cnt == 0 {
q = manager.Query().Contains("model", fuzzyStr)
}
err = q.First(&dev)
if err == nil {
return &dev
}
@@ -354,7 +359,6 @@ func (manager *SIsolatedDeviceManager) parseDeviceInfo(userCred mcclient.TokenCr
} else {
devConfig.Vendor = matchDev.getVendorId()
}
} else {
devObj, err := manager.FetchById(devId)
if err != nil {