From d8d73762a216510c5332fa227d5b73b7b0ec9776 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Sat, 20 Apr 2019 17:57:58 +0800 Subject: [PATCH] fix: esxi server skus return empty results --- pkg/compute/models/cloudproviderregions.go | 2 +- pkg/compute/models/skus.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/compute/models/cloudproviderregions.go b/pkg/compute/models/cloudproviderregions.go index 4fa4428840..dc4d4ea317 100644 --- a/pkg/compute/models/cloudproviderregions.go +++ b/pkg/compute/models/cloudproviderregions.go @@ -160,7 +160,7 @@ func (self *SCloudproviderregion) Detach(ctx context.Context, userCred mcclient. func (manager *SCloudproviderregionManager) QueryRelatedRegionIds(cloudAccountId string, providerIds ...string) *sqlchemy.SSubQuery { q := manager.Query("cloudregion_id") - if len(providerIds) > 0 { + if len(providerIds) > 0 { q = q.Filter(sqlchemy.In(q.Field("cloudprovider_id"), providerIds)) } diff --git a/pkg/compute/models/skus.go b/pkg/compute/models/skus.go index 60d4fd1321..22e8e9870d 100644 --- a/pkg/compute/models/skus.go +++ b/pkg/compute/models/skus.go @@ -514,7 +514,7 @@ func providerFilter(q *sqlchemy.SQuery, provider string, public_cloud bool) *sql if provider == "all" { // provider 参数为all时。表示查询所有instance type. return q - } else if len(provider) > 0 && !utils.IsInStringArray(provider, []string{api.CLOUD_PROVIDER_ONECLOUD, api.CLOUD_PROVIDER_VMWARE, "kvm"}) { + } else if len(provider) > 0 && !utils.IsInStringArray(provider, []string{api.CLOUD_PROVIDER_ONECLOUD, api.CLOUD_PROVIDER_VMWARE, "kvm", "esxi"}) { q = q.Equals("provider", provider) } else if public_cloud { q = q.IsNotEmpty("provider")