uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-12 18:46:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Rename default_opts to opts

Browse Source
This commit is contained in:
ionutboangiu
2021-09-07 14:54:26 +03:00
committed by Dan Christian Bogos
parent e8ea08c109
commit adfaea31c5
18 changed files with 101 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/routes.go
View File

@@ -269,7 +269,7 @@ func (rpS *RouteService) V1GetRoutes(ctx *context.Context, args *utils.CGREvent,
args.APIOpts[utils.Subsys] = utils.MetaRoutes
args.APIOpts[utils.OptsContext] = utils.FirstNonEmpty(
utils.IfaceAsString(args.APIOpts[utils.OptsContext]),
rpS.cfg.RouteSCfg().DefaultOpts.Context,
rpS.cfg.RouteSCfg().Opts.Context,
utils.MetaRoutes)
attrArgs := &AttrArgsProcessEvent{
CGREvent: args,
@@ -390,7 +390,7 @@ func (rpS *RouteService) sortedRoutesForEvent(ctx *context.Context, tnt string,
prfCount := len(rPrfs) // if the option is not present return for all profiles
prfCountOptInf, has := args.APIOpts[utils.OptsRoutesProfileCount]
if !has {
prfCountOptInf = rpS.cfg.RouteSCfg().DefaultOpts.ProfileCount
prfCountOptInf = rpS.cfg.RouteSCfg().Opts.ProfileCount
}
if prfCountOptInf != nil {
prfCountOpt, err := utils.IfaceAsTInt64(prfCountOptInf)
@@ -401,7 +401,7 @@ func (rpS *RouteService) sortedRoutesForEvent(ctx *context.Context, tnt string,
}
}
var extraOpts *optsGetRoutes
if extraOpts, err = newOptsGetRoutes(args, rpS.cfg.RouteSCfg().DefaultOpts); err != nil { // convert routes arguments into internal options used to limit data
if extraOpts, err = newOptsGetRoutes(args, rpS.cfg.RouteSCfg().Opts); err != nil { // convert routes arguments into internal options used to limit data
return
}

8
engine/routes_test.go
View File

@@ -1482,7 +1482,7 @@ func TestRoutesNewOptsGetRoutes(t *testing.T) {
maxCost: 10.0,
paginator: &utils.Paginator{},
}
sprf, err := newOptsGetRoutes(ev, config.CgrConfig().RouteSCfg().DefaultOpts)
sprf, err := newOptsGetRoutes(ev, config.CgrConfig().RouteSCfg().Opts)
if err != nil {
t.Errorf("Error: %+v", err)
}
@@ -1492,7 +1492,7 @@ func TestRoutesNewOptsGetRoutes(t *testing.T) {
}
func TestRoutesNewOptsGetRoutesFromCfg(t *testing.T) {
config.CgrConfig().RouteSCfg().DefaultOpts.IgnoreErrors = true
config.CgrConfig().RouteSCfg().Opts.IgnoreErrors = true
ev := &utils.CGREvent{
APIOpts: map[string]interface{}{},
}
@@ -1500,7 +1500,7 @@ func TestRoutesNewOptsGetRoutesFromCfg(t *testing.T) {
ignoreErrors: true,
paginator: &utils.Paginator{},
}
sprf, err := newOptsGetRoutes(ev, config.CgrConfig().RouteSCfg().DefaultOpts)
sprf, err := newOptsGetRoutes(ev, config.CgrConfig().RouteSCfg().Opts)
if err != nil {
t.Errorf("Error: %+v", err)
}
@@ -1519,7 +1519,7 @@ func TestRoutesNewOptsGetRoutesIgnoreErrors(t *testing.T) {
ignoreErrors: true,
paginator: &utils.Paginator{},
}
sprf, err := newOptsGetRoutes(ev, config.CgrConfig().RouteSCfg().DefaultOpts)
sprf, err := newOptsGetRoutes(ev, config.CgrConfig().RouteSCfg().Opts)
if err != nil {
t.Errorf("Error: %+v", err)
}