diff --git a/pkg/cloudnet/models/routes.go b/pkg/cloudnet/models/routes.go index 3080117127..2cb6eceb76 100644 --- a/pkg/cloudnet/models/routes.go +++ b/pkg/cloudnet/models/routes.go @@ -103,7 +103,7 @@ func (man *SRouteManager) ValidateCreateData(ctx context.Context, userCred mccli router.Name+"-"+iface.Name+"-"+rand.String(4)), ) } - return nil, nil + return data, nil } func (man *SRouteManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (*sqlchemy.SQuery, error) { diff --git a/pkg/cloudnet/models/rules.go b/pkg/cloudnet/models/rules.go index 433f93a30f..186a05c82f 100644 --- a/pkg/cloudnet/models/rules.go +++ b/pkg/cloudnet/models/rules.go @@ -115,7 +115,7 @@ func (man *SRuleManager) validateData(ctx context.Context, userCred mcclient.Tok protoV := validators.NewStringChoicesValidator("match_proto", protoChoices) srcPortV := validators.NewPortValidator("match_src_port") destPortV := validators.NewPortValidator("match_dest_port") - actionV := validators.NewStringChoicesValidator("action", protoChoices) + actionV := validators.NewStringChoicesValidator("action", actionChoices) actionOptsV := validators.NewStringLenRangeValidator("action_options", 0, 256) if isUpdate { inIfnameV.Default(rule.MatchInIfname) @@ -200,7 +200,7 @@ func (man *SRuleManager) ValidateCreateData(ctx context.Context, userCred mcclie if err := man.validateData(ctx, userCred, ownerId, query, data, nil); err != nil { return nil, err } - return nil, nil + return data, nil } func (man *SRuleManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (*sqlchemy.SQuery, error) { diff --git a/pkg/mcclient/options/cloudnet/rules.go b/pkg/mcclient/options/cloudnet/rules.go index 9607e38f9f..f25616a74a 100644 --- a/pkg/mcclient/options/cloudnet/rules.go +++ b/pkg/mcclient/options/cloudnet/rules.go @@ -26,8 +26,8 @@ type RuleCreateOptions struct { MatchSrcNet string MatchDestNet string MatchProto string - MatchSrcPort int - MatchDestPort int + MatchSrcPort int `json:",omitzero"` + MatchDestPort int `json:",omitzero"` MatchInIfname string MatchOutIfname string