diff --git a/pkg/cloudcommon/db/db_dispatcher.go b/pkg/cloudcommon/db/db_dispatcher.go index 3fe2dd3556..57b6ea13c9 100644 --- a/pkg/cloudcommon/db/db_dispatcher.go +++ b/pkg/cloudcommon/db/db_dispatcher.go @@ -394,10 +394,6 @@ func fetchContextObjectId(manager IModelManager, ctx context.Context, userCred m } } -type Data struct { - Name string -} - func listItems(manager IModelManager, ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, ctxId string) (*modules.ListResult, error) { var maxLimit int64 = 2048 limit, _ := query.Int("limit") @@ -423,13 +419,7 @@ func listItems(manager IModelManager, ctx context.Context, userCred mcclient.Tok return nil, err } totalCnt := int64(q.Count()) - data := Data{} - q.First(&data) - log.Debugf("total count %d result: %v", totalCnt, data) - { - retList, _ := query2List(manager, ctx, userCred, q, queryDict) - log.Errorf("result: %s", retList) - } + log.Debugf("total count %d", totalCnt) if totalCnt == 0 { emptyList := modules.ListResult{Data: []jsonutils.JSONObject{}} return &emptyList, nil @@ -468,7 +458,6 @@ func listItems(manager IModelManager, ctx context.Context, userCred mcclient.Tok q = q.Offset(int(offset)) } retList, err := query2List(manager, ctx, userCred, q, queryDict) - log.Errorf("result: %s", retList) if err != nil { return nil, httperrors.NewGeneralError(err) } diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index 417425b5fc..daa4057ebb 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -129,6 +129,7 @@ var HYPERVISOR_HOSTTYPE = map[string]string{ HYPERVISOR_ESXI: HOST_TYPE_ESXI, HYPERVISOR_CONTAINER: HOST_TYPE_KUBELET, HYPERVISOR_ALIYUN: HOST_TYPE_ALIYUN, + HYPERVISOR_AZURE: HOST_TYPE_AZURE, } var HOSTTYPE_HYPERVISOR = map[string]string{ @@ -137,6 +138,7 @@ var HOSTTYPE_HYPERVISOR = map[string]string{ HOST_TYPE_ESXI: HYPERVISOR_ESXI, HOST_TYPE_KUBELET: HYPERVISOR_CONTAINER, HOST_TYPE_ALIYUN: HYPERVISOR_ALIYUN, + HOST_TYPE_AZURE: HYPERVISOR_AZURE, } type SGuestManager struct {