opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-08-31 01:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: baremetal-event-list support since/until filter

Browse Source
This commit is contained in:
Qiu Jian
2019-11-05 22:31:59 +08:00
parent 29502b9e58
commit 4e46db8bb0
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/climc/shell/baremetalevents.go
+2
View File
@@ -30,6 +30,8 @@ func init() {
PagingMarker string `help:"marker for pagination"`
Limit int `help:"page limit, default 20" default:"20"`
Severity string `help:"filter by severity"`
Since string `help:"Show logs since specific date" metavar:"DATETIME"`
Until string `help:"Show logs until specific date" metavar:"DATETIME"`
}
R(&BaremetalEventListOptions{}, "baremetal-event-list", "List baremetal events", func(s *mcclient.ClientSession, args *BaremetalEventListOptions) error {
params := jsonutils.Marshal(args)
pkg/logger/models/baremetalevents.go
+12 -19
View File
@@ -15,12 +15,15 @@
package models
import (
"context"
"fmt"
"time"
"yunion.io/x/jsonutils"
"yunion.io/x/sqlchemy"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/util/rbacutils"
)
@@ -81,24 +84,14 @@ func (manager *SBaremetalEventManager) GetPagingConfig() *db.SPagingConfig {
}
}
/*func (manager *SBaremetalEventManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
hostId, _ := data.GetString("host_id")
eventId, _ := data.GetString("event_id")
q := manager.Query().Equals("host_id", hostId).Equals("event_id", eventId)
cnt, err := q.CountWithError()
if err != nil {
return nil, httperrors.NewGeneralError(err)
func (manager *SBaremetalEventManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (*sqlchemy.SQuery, error) {
since, _ := query.GetTime("since")
if !since.IsZero() {
q = q.GT("created", since)
}
if cnt > 0 {
return nil, httperrors.NewConflictError("duplicate log")
until, _ := query.GetTime("until")
if !until.IsZero() {
q = q.LE("created", until)
}
return manager.SModelBaseManager.ValidateCreateData(ctx, userCred, ownerId, query, data)
}*/
/*func (event *SBaremetalEvent) ValidateDeleteCondition(ctx context.Context) error {
return httperrors.NewForbiddenError("read only event")
}*/
/*func (event *SBaremetalEvent) ValidateUpdateCondition(ctx context.Context) error {
return httperrors.NewForbiddenError("read only event")
}*/
return q, nil
}