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

Changed Opts to APIOpts in multiple structs used in apier/

Browse Source
This commit is contained in:
andronache
2021-03-22 09:31:18 +02:00
committed by Dan Christian Bogos
parent f0918ce4e1
commit b573e12233
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
actions/accounts.go
View File

@@ -55,7 +55,7 @@ func (aL *actSetBalance) execute(ctx context.Context, data utils.MapStorage, trg
AccountID: trgID,
Reset: aL.reset,
Diktats: make([]*utils.BalDiktat, len(aL.cfg().Diktats)),
Opts: aL.cfg().Opts,
APIOpts: aL.cfg().Opts,
}
for i, actD := range aL.cfg().Diktats {
var val string
@@ -103,7 +103,7 @@ func (aL *actRemBalance) execute(ctx context.Context, data utils.MapStorage, trg
Tenant: aL.tnt,
AccountID: trgID,
BalanceIDs: make([]string, len(aL.cfg().Diktats)),
Opts: aL.cfg().Opts,
APIOpts: aL.cfg().Opts,
}
for i, actD := range aL.cfg().Diktats {
args.BalanceIDs[i] = actD.Path

10
apier/v1/replicator.go
View File

@@ -356,7 +356,7 @@ func (rplSv1 *ReplicatorSv1) GetItemLoadIDs(itemID *utils.StringWithAPIOpts, rep
// GetIndexes is the remote method coresponding to the dataDb driver method
func (rplSv1 *ReplicatorSv1) GetIndexes(args *utils.GetIndexesArg, reply *map[string]utils.StringSet) error {
engine.UpdateReplicationFilters(utils.CacheInstanceToPrefix[args.IdxItmType], args.TntCtx, utils.IfaceAsString(args.Opts[utils.RemoteHostOpt]))
engine.UpdateReplicationFilters(utils.CacheInstanceToPrefix[args.IdxItmType], args.TntCtx, utils.IfaceAsString(args.APIOpts[utils.RemoteHostOpt]))
indx, err := rplSv1.dm.DataDB().GetIndexesDrv(args.IdxItmType, args.TntCtx, args.IdxKey)
if err != nil {
return err
@@ -726,8 +726,8 @@ func (rplSv1 *ReplicatorSv1) SetIndexes(args *utils.SetIndexesArg, reply *string
for idxKey := range args.Indexes {
cIDs = append(cIDs, utils.ConcatenatedKey(args.TntCtx, idxKey))
}
if err = rplSv1.v1.callCacheMultiple(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
args.Tenant, args.IdxItmType, cIDs, args.Opts); err != nil {
if err = rplSv1.v1.callCacheMultiple(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
args.Tenant, args.IdxItmType, cIDs, args.APIOpts); err != nil {
return
}
*reply = utils.OK
@@ -1061,8 +1061,8 @@ func (rplSv1 *ReplicatorSv1) RemoveIndexes(args *utils.GetIndexesArg, reply *str
if err = rplSv1.dm.DataDB().RemoveIndexesDrv(args.IdxItmType, args.TntCtx, args.IdxKey); err != nil {
return
}
if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
args.Tenant, args.IdxItmType, utils.ConcatenatedKey(args.TntCtx, args.IdxKey), nil, nil, args.Opts); err != nil {
if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
args.Tenant, args.IdxItmType, utils.ConcatenatedKey(args.TntCtx, args.IdxKey), nil, nil, args.APIOpts); err != nil {
return
}
*reply = utils.OK

8
dispatchers/accounts.go
View File

@@ -115,13 +115,13 @@ func (dS *DispatcherService) AccountSv1ActionSetBalance(args *utils.ArgsActSetBa
}
if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
if err = dS.authorize(utils.AccountSv1ActionSetBalance, tnt,
utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
return
}
}
return dS.Dispatch(&utils.CGREvent{
Tenant: tnt,
Opts: args.Opts,
Opts: args.APIOpts,
}, utils.MetaAccounts, utils.AccountSv1ActionSetBalance, args, reply)
}
@@ -132,12 +132,12 @@ func (dS *DispatcherService) AccountSv1ActionRemoveBalance(args *utils.ArgsActRe
}
if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
if err = dS.authorize(utils.AccountSv1ActionRemoveBalance, tnt,
utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
return
}
}
return dS.Dispatch(&utils.CGREvent{
Tenant: tnt,
Opts: args.Opts,
Opts: args.APIOpts,
}, utils.MetaAccounts, utils.AccountSv1ActionRemoveBalance, args, reply)
}

12
dispatchers/replicator.go
View File

@@ -1370,13 +1370,13 @@ func (dS *DispatcherService) ReplicatorSv1GetIndexes(args *utils.GetIndexesArg,
args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
if err = dS.authorize(utils.ReplicatorSv1GetIndexes, args.Tenant,
utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
return
}
}
return dS.Dispatch(&utils.CGREvent{
Tenant: args.Tenant,
Opts: args.Opts,
Opts: args.APIOpts,
}, utils.MetaReplicator, utils.ReplicatorSv1GetIndexes, args, reply)
}
@@ -1388,13 +1388,13 @@ func (dS *DispatcherService) ReplicatorSv1SetIndexes(args *utils.SetIndexesArg,
args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
if err = dS.authorize(utils.ReplicatorSv1SetIndexes, args.Tenant,
utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
return
}
}
return dS.Dispatch(&utils.CGREvent{
Tenant: args.Tenant,
Opts: args.Opts,
Opts: args.APIOpts,
}, utils.MetaReplicator, utils.ReplicatorSv1SetIndexes, args, reply)
}
@@ -1406,13 +1406,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveIndexes(args *utils.GetIndexesAr
args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
if err = dS.authorize(utils.ReplicatorSv1RemoveIndexes, args.Tenant,
utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
return
}
}
return dS.Dispatch(&utils.CGREvent{
Tenant: args.Tenant,
Opts: args.Opts,
Opts: args.APIOpts,
}, utils.MetaReplicator, utils.ReplicatorSv1RemoveIndexes, args, reply)
}

6
engine/datamanager.go
View File

@@ -3470,7 +3470,7 @@ func (dm *DataManager) GetIndexes(idxItmType, tntCtx, idxKey string,
TntCtx: tntCtx,
IdxKey: idxKey,
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
config.CgrConfig().GeneralCfg().NodeID)),
}, &indexes); err == nil {
@@ -3521,7 +3521,7 @@ func (dm *DataManager) SetIndexes(idxItmType, tntCtx string,
TntCtx: tntCtx,
Indexes: indexes,
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return
@@ -3544,7 +3544,7 @@ func (dm *DataManager) RemoveIndexes(idxItmType, tntCtx, idxKey string) (err err
TntCtx: tntCtx,
IdxKey: idxKey,
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return

4
utils/accountprofile.go
View File

@@ -485,7 +485,7 @@ type ArgsActSetBalance struct {
AccountID string
Diktats []*BalDiktat
Reset bool
Opts map[string]interface{}
APIOpts map[string]interface{}
}
type BalDiktat struct {
@@ -497,5 +497,5 @@ type ArgsActRemoveBalances struct {
Tenant string
AccountID string
BalanceIDs []string
Opts map[string]interface{}
APIOpts map[string]interface{}
}

4
utils/coreutils.go
View File

@@ -952,7 +952,7 @@ type GetIndexesArg struct {
TntCtx string
IdxKey string
Tenant string
Opts map[string]interface{}
APIOpts map[string]interface{}
}
// SetIndexesArg the API arguments needed for seting an index
@@ -961,7 +961,7 @@ type SetIndexesArg struct {
TntCtx string
Indexes map[string]StringSet
Tenant string
Opts map[string]interface{}
APIOpts map[string]interface{}
}
type DurationArgs struct {