This commit is contained in:
屈轩
2018-08-29 21:15:36 +08:00
parent 9af6692003
commit 99c2295920
2 changed files with 3 additions and 12 deletions
+1 -12
View File
@@ -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)
}
+2
View File
@@ -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 {