uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-20 06:38:45 +05:00
Code Issues Packages Projects Releases Wiki Activity

Replaced TenantIDWithOpts with TenantIDWithAPIOpts

Browse Source
This commit is contained in:
andronache
2021-03-17 16:51:14 +02:00
committed by Dan Christian Bogos
parent 8b0748b139
commit a6f41adaf9
105 changed files with 943 additions and 943 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/action.go
View File

@@ -486,7 +486,7 @@ func setddestinations(ub *Account, a *Action, acs Actions, extraData interface{}
}
var sts StatQueue
if err = connMgr.Call(config.CgrConfig().RalsCfg().StatSConns, nil, utils.StatSv1GetStatQueue,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: statID,
@@ -1051,7 +1051,7 @@ func export(ub *Account, a *Action, acs Actions, extraData interface{}) (err err
}
func resetThreshold(ub *Account, a *Action, acs Actions, extraData interface{}) (err error) {
args := &utils.TenantIDWithOpts{
args := &utils.TenantIDWithAPIOpts{
TenantID: utils.NewTenantID(a.ExtraParameters),
}
var rply string
@@ -1060,7 +1060,7 @@ func resetThreshold(ub *Account, a *Action, acs Actions, extraData interface{})
}
func resetStatQueue(ub *Account, a *Action, acs Actions, extraData interface{}) (err error) {
args := &utils.TenantIDWithOpts{
args := &utils.TenantIDWithAPIOpts{
TenantID: utils.NewTenantID(a.ExtraParameters),
}
var rply string

4
engine/calldesc.go
View File

@@ -1043,7 +1043,7 @@ func (cd *CallDescriptor) RemoteHost() net.Addr {
return utils.LocalAddr()
}
type CallDescriptorWithOpts struct {
type CallDescriptorWithAPIOpts struct {
*CallDescriptor
Opts map[string]interface{}
APIOpts map[string]interface{}
}

16
engine/cdrs.go
View File

@@ -276,9 +276,9 @@ func (cdrS *CDRServer) getCostFromRater(cdr *CDRWithOpts) (*CallCost, error) {
if reqTypes.Has(cdr.RequestType) { // Prepaid - Cost can be recalculated in case of missing records from SM
err = cdrS.connMgr.Call(cdrS.cgrCfg.CdrsCfg().RaterConns, nil,
utils.ResponderDebit,
&CallDescriptorWithOpts{
&CallDescriptorWithAPIOpts{
CallDescriptor: cd,
Opts: cdr.Opts,
APIOpts: cdr.Opts,
}, cc)
if err != nil && err.Error() == utils.ErrAccountNotFound.Error() &&
cdr.RequestType == utils.MetaDynaprepaid {
@@ -294,17 +294,17 @@ func (cdrS *CDRServer) getCostFromRater(cdr *CDRWithOpts) (*CallCost, error) {
// execute again the Debit operation
err = cdrS.connMgr.Call(cdrS.cgrCfg.CdrsCfg().RaterConns, nil,
utils.ResponderDebit,
&CallDescriptorWithOpts{
&CallDescriptorWithAPIOpts{
CallDescriptor: cd,
Opts: cdr.Opts,
APIOpts: cdr.Opts,
}, cc)
}
} else {
err = cdrS.connMgr.Call(cdrS.cgrCfg.CdrsCfg().RaterConns, nil,
utils.ResponderGetCost,
&CallDescriptorWithOpts{
&CallDescriptorWithAPIOpts{
CallDescriptor: cd,
Opts: cdr.Opts,
APIOpts: cdr.Opts,
}, cc)
}
if err != nil {
@@ -341,7 +341,7 @@ func (cdrS *CDRServer) refundEventCost(ec *EventCost, reqType, tor string) (rfnd
var acnt Account
if err = cdrS.connMgr.Call(cdrS.cgrCfg.CdrsCfg().RaterConns, nil,
utils.ResponderRefundIncrements,
&CallDescriptorWithOpts{CallDescriptor: cd}, &acnt); err != nil {
&CallDescriptorWithAPIOpts{CallDescriptor: cd}, &acnt); err != nil {
return
}
return true, nil
@@ -983,7 +983,7 @@ func (cdrS *CDRServer) V2StoreSessionCost(args *ArgsV2CDRSStoreSMCost, reply *st
var response float64
if err := cdrS.connMgr.Call(cdrS.cgrCfg.CdrsCfg().RaterConns, nil,
utils.ResponderRefundRounding,
&CallDescriptorWithOpts{CallDescriptor: cd},
&CallDescriptorWithAPIOpts{CallDescriptor: cd},
&response); err != nil {
utils.Logger.Warning(
fmt.Sprintf("<CDRS> RefundRounding for cc: %+v, got error: %s",

124
engine/datamanager.go
View File

@@ -679,9 +679,9 @@ func (dm *DataManager) GetStatQueue(tenant, id string,
if err != nil {
if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaStatQueues]; err == utils.ErrNotFound && itm.Remote {
if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetStatQueue,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
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)),
}, &sq); err == nil {
@@ -815,9 +815,9 @@ func (dm *DataManager) RemoveStatQueue(tenant, id string, transactionID string)
config.CgrConfig().DataDbCfg().RplFiltered,
utils.StatQueuePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
utils.ReplicatorSv1RemoveStatQueue,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return
@@ -847,9 +847,9 @@ func (dm *DataManager) GetFilter(tenant, id string, cacheRead, cacheWrite bool,
if err != nil {
if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaFilters]; err == utils.ErrNotFound && itm.Remote {
if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetFilter,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
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)),
}, &fltr); err == nil {
@@ -945,9 +945,9 @@ func (dm *DataManager) RemoveFilter(tenant, id, transactionID string, withIndex
config.CgrConfig().DataDbCfg().RplFiltered,
utils.FilterPrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
utils.ReplicatorSv1RemoveFilter,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return
@@ -972,9 +972,9 @@ func (dm *DataManager) GetThreshold(tenant, id string,
if err != nil {
if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaThresholds]; err == utils.ErrNotFound && itm.Remote {
if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
utils.ReplicatorSv1GetThreshold, &utils.TenantIDWithOpts{
utils.ReplicatorSv1GetThreshold, &utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
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)),
}, &th); err == nil {
@@ -1051,9 +1051,9 @@ func (dm *DataManager) RemoveThreshold(tenant, id, transactionID string) (err er
config.CgrConfig().DataDbCfg().RplFiltered,
utils.ThresholdPrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
utils.ReplicatorSv1RemoveThreshold,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return
@@ -1079,9 +1079,9 @@ func (dm *DataManager) GetThresholdProfile(tenant, id string, cacheRead, cacheWr
if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaThresholdProfiles]; err == utils.ErrNotFound && itm.Remote {
if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
utils.ReplicatorSv1GetThresholdProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
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)),
}, &th); err == nil {
@@ -1179,9 +1179,9 @@ func (dm *DataManager) RemoveThresholdProfile(tenant, id,
config.CgrConfig().DataDbCfg().RplFiltered,
utils.ThresholdProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
utils.ReplicatorSv1RemoveThresholdProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return
@@ -1207,9 +1207,9 @@ func (dm *DataManager) GetStatQueueProfile(tenant, id string, cacheRead, cacheWr
if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaStatQueueProfiles]; err == utils.ErrNotFound && itm.Remote {
if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
utils.ReplicatorSv1GetStatQueueProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
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)),
}, &sqp); err == nil {
@@ -1307,9 +1307,9 @@ func (dm *DataManager) RemoveStatQueueProfile(tenant, id,
config.CgrConfig().DataDbCfg().RplFiltered,
utils.StatQueueProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
utils.ReplicatorSv1RemoveStatQueueProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return
@@ -1426,9 +1426,9 @@ func (dm *DataManager) GetResource(tenant, id string, cacheRead, cacheWrite bool
if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaResources]; err == utils.ErrNotFound && itm.Remote {
if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
utils.ReplicatorSv1GetResource,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
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)),
}, &rs); err == nil {
@@ -1514,9 +1514,9 @@ func (dm *DataManager) RemoveResource(tenant, id, transactionID string) (err err
config.CgrConfig().DataDbCfg().RplFiltered,
utils.ResourcesPrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
utils.ReplicatorSv1RemoveResource,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return
@@ -1541,9 +1541,9 @@ func (dm *DataManager) GetResourceProfile(tenant, id string, cacheRead, cacheWri
if err != nil {
if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaResourceProfile]; err == utils.ErrNotFound && itm.Remote {
if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
utils.ReplicatorSv1GetResourceProfile, &utils.TenantIDWithOpts{
utils.ReplicatorSv1GetResourceProfile, &utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
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)),
}, &rp); err == nil {
@@ -1641,9 +1641,9 @@ func (dm *DataManager) RemoveResourceProfile(tenant, id, transactionID string, w
config.CgrConfig().DataDbCfg().RplFiltered,
utils.ResourceProfilesPrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
utils.ReplicatorSv1RemoveResourceProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return
@@ -2358,9 +2358,9 @@ func (dm *DataManager) GetRouteProfile(tenant, id string, cacheRead, cacheWrite
if err != nil {
if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaRouteProfiles]; err == utils.ErrNotFound && itm.Remote {
if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetRouteProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
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)),
}, &rpp); err == nil {
@@ -2461,9 +2461,9 @@ func (dm *DataManager) RemoveRouteProfile(tenant, id, transactionID string, with
config.CgrConfig().DataDbCfg().RplFiltered,
utils.RouteProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
utils.ReplicatorSv1RemoveRouteProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return
@@ -2492,9 +2492,9 @@ func (dm *DataManager) GetAttributeProfile(tenant, id string, cacheRead, cacheWr
if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaAttributeProfiles]; err == utils.ErrNotFound && itm.Remote {
if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
utils.ReplicatorSv1GetAttributeProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
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)),
}, &attrPrfl); err == nil {
@@ -2599,9 +2599,9 @@ func (dm *DataManager) RemoveAttributeProfile(tenant, id string, transactionID s
config.CgrConfig().DataDbCfg().RplFiltered,
utils.AttributeProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
utils.ReplicatorSv1RemoveAttributeProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return
@@ -2627,9 +2627,9 @@ func (dm *DataManager) GetChargerProfile(tenant, id string, cacheRead, cacheWrit
if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaChargerProfiles]; err == utils.ErrNotFound && itm.Remote {
if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
utils.ReplicatorSv1GetChargerProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
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)),
}, &cpp); err == nil {
@@ -2727,9 +2727,9 @@ func (dm *DataManager) RemoveChargerProfile(tenant, id string,
config.CgrConfig().DataDbCfg().RplFiltered,
utils.ChargerProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
utils.ReplicatorSv1RemoveChargerProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return
@@ -2755,9 +2755,9 @@ func (dm *DataManager) GetDispatcherProfile(tenant, id string, cacheRead, cacheW
if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaDispatcherProfiles]; err == utils.ErrNotFound && itm.Remote {
if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
utils.ReplicatorSv1GetDispatcherProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
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)),
}, &dpp); err == nil {
@@ -2859,9 +2859,9 @@ func (dm *DataManager) RemoveDispatcherProfile(tenant, id string,
config.CgrConfig().DataDbCfg().RplFiltered,
utils.DispatcherProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
utils.ReplicatorSv1RemoveDispatcherProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return
@@ -2887,9 +2887,9 @@ func (dm *DataManager) GetDispatcherHost(tenant, id string, cacheRead, cacheWrit
if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaDispatcherHosts]; err == utils.ErrNotFound && itm.Remote {
if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
utils.ReplicatorSv1GetDispatcherHost,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
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)),
}, &dH); err == nil {
@@ -2957,9 +2957,9 @@ func (dm *DataManager) RemoveDispatcherHost(tenant, id string,
config.CgrConfig().DataDbCfg().RplFiltered,
utils.DispatcherHostPrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
utils.ReplicatorSv1RemoveDispatcherHost,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return
@@ -3056,9 +3056,9 @@ func (dm *DataManager) GetRateProfile(tenant, id string, cacheRead, cacheWrite b
if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaRateProfiles]; err == utils.ErrNotFound && itm.Remote {
if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
utils.ReplicatorSv1GetRateProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
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)),
}, &rpp); err == nil {
@@ -3198,9 +3198,9 @@ func (dm *DataManager) RemoveRateProfile(tenant, id string,
config.CgrConfig().DataDbCfg().RplFiltered,
utils.RateProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
utils.ReplicatorSv1RemoveRateProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return
@@ -3326,9 +3326,9 @@ func (dm *DataManager) GetActionProfile(tenant, id string, cacheRead, cacheWrite
if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaActionProfiles]; err == utils.ErrNotFound && itm.Remote {
if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
utils.ReplicatorSv1GetActionProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
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)),
}, &ap); err == nil {
@@ -3423,9 +3423,9 @@ func (dm *DataManager) RemoveActionProfile(tenant, id string,
config.CgrConfig().DataDbCfg().RplFiltered,
utils.ActionProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
utils.ReplicatorSv1RemoveActionProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return
@@ -3608,9 +3608,9 @@ func (dm *DataManager) checkFilters(tenant string, ids []string) (brokenReferenc
if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaFilters]; err == utils.ErrNotFound && itm.Remote {
var fltr *Filter
err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetFilter,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
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)),
}, &fltr)
@@ -3635,9 +3635,9 @@ func (dm *DataManager) GetAccountProfile(tenant, id string) (ap *utils.AccountPr
if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaAccountProfiles]; err == utils.ErrNotFound && itm.Remote {
if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
utils.ReplicatorSv1GetAccountProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
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)),
}, &ap); err == nil {
@@ -3718,9 +3718,9 @@ func (dm *DataManager) RemoveAccountProfile(tenant, id string,
config.CgrConfig().DataDbCfg().RplFiltered,
utils.AccountProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
utils.ReplicatorSv1RemoveAccountProfile,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{Tenant: tenant, ID: id},
Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
}
return

2
engine/dynamicdp.go
View File

@@ -114,7 +114,7 @@ func (dDP *dynamicDP) fieldAsInterface(fldPath []string) (val interface{}, err e
var statValues map[string]float64
if err := connMgr.Call(dDP.stsConns, nil, utils.StatSv1GetQueueFloatMetrics,
&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: dDP.tenant, ID: fldPath[1]}},
&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: dDP.tenant, ID: fldPath[1]}},
&statValues); err != nil {
return nil, err
}

4
engine/resources.go
View File

@@ -798,7 +798,7 @@ func (rS *ResourceService) V1ReleaseResource(args utils.ArgRSv1ResourceUsage, re
}
// V1GetResource returns a resource configuration
func (rS *ResourceService) V1GetResource(arg *utils.TenantIDWithOpts, reply *Resource) error {
func (rS *ResourceService) V1GetResource(arg *utils.TenantIDWithAPIOpts, reply *Resource) error {
if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
return utils.NewErrMandatoryIeMissing(missing...)
}
@@ -819,7 +819,7 @@ type ResourceWithConfig struct {
Config *ResourceProfile
}
func (rS *ResourceService) V1GetResourceWithConfig(arg *utils.TenantIDWithOpts, reply *ResourceWithConfig) (err error) {
func (rS *ResourceService) V1GetResourceWithConfig(arg *utils.TenantIDWithAPIOpts, reply *ResourceWithConfig) (err error) {
if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
return utils.NewErrMandatoryIeMissing(missing...)
}

12
engine/responder.go
View File

@@ -65,7 +65,7 @@ func (rs *Responder) usageAllowed(tor string, reqUsage time.Duration) (allowed b
/*
RPC method that provides the external RPC interface for getting the rating information.
*/
func (rs *Responder) GetCost(arg *CallDescriptorWithOpts, reply *CallCost) (err error) {
func (rs *Responder) GetCost(arg *CallDescriptorWithAPIOpts, reply *CallCost) (err error) {
// RPC caching
if arg.CgrID != utils.EmptyString && config.CgrConfig().CacheCfg().Partitions[utils.CacheRPCResponses].Limit != 0 {
cacheKey := utils.ConcatenatedKey(utils.ResponderGetCost, arg.CgrID)
@@ -171,7 +171,7 @@ func (rs *Responder) GetCostOnRatingPlans(arg *utils.GetCostOnRatingPlansArgs, r
return
}
func (rs *Responder) Debit(arg *CallDescriptorWithOpts, reply *CallCost) (err error) {
func (rs *Responder) Debit(arg *CallDescriptorWithAPIOpts, reply *CallCost) (err error) {
// RPC caching
if arg.Tenant == utils.EmptyString {
arg.Tenant = config.CgrConfig().GeneralCfg().DefaultTenant
@@ -212,7 +212,7 @@ func (rs *Responder) Debit(arg *CallDescriptorWithOpts, reply *CallCost) (err er
return
}
func (rs *Responder) MaxDebit(arg *CallDescriptorWithOpts, reply *CallCost) (err error) {
func (rs *Responder) MaxDebit(arg *CallDescriptorWithAPIOpts, reply *CallCost) (err error) {
// RPC caching
if arg.Tenant == utils.EmptyString {
arg.Tenant = config.CgrConfig().GeneralCfg().DefaultTenant
@@ -252,7 +252,7 @@ func (rs *Responder) MaxDebit(arg *CallDescriptorWithOpts, reply *CallCost) (err
return
}
func (rs *Responder) RefundIncrements(arg *CallDescriptorWithOpts, reply *Account) (err error) {
func (rs *Responder) RefundIncrements(arg *CallDescriptorWithAPIOpts, reply *Account) (err error) {
// RPC caching
if arg.Tenant == utils.EmptyString {
arg.Tenant = config.CgrConfig().GeneralCfg().DefaultTenant
@@ -293,7 +293,7 @@ func (rs *Responder) RefundIncrements(arg *CallDescriptorWithOpts, reply *Accoun
return
}
func (rs *Responder) RefundRounding(arg *CallDescriptorWithOpts, reply *float64) (err error) {
func (rs *Responder) RefundRounding(arg *CallDescriptorWithAPIOpts, reply *float64) (err error) {
// RPC caching
if arg.Tenant == utils.EmptyString {
arg.Tenant = config.CgrConfig().GeneralCfg().DefaultTenant
@@ -327,7 +327,7 @@ func (rs *Responder) RefundRounding(arg *CallDescriptorWithOpts, reply *float64)
return
}
func (rs *Responder) GetMaxSessionTime(arg *CallDescriptorWithOpts, reply *time.Duration) (err error) {
func (rs *Responder) GetMaxSessionTime(arg *CallDescriptorWithAPIOpts, reply *time.Duration) (err error) {
if arg.Tenant == utils.EmptyString {
arg.Tenant = config.CgrConfig().GeneralCfg().DefaultTenant
}

24
engine/responder_test.go
View File

@@ -152,7 +152,7 @@ func TestResponderGetCostMaxUsageANY(t *testing.T) {
}
tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "")
cd := &CallDescriptorWithOpts{
cd := &CallDescriptorWithAPIOpts{
CallDescriptor: &CallDescriptor{
Category: "call",
Tenant: "cgrates.org",
@@ -179,7 +179,7 @@ func TestResponderGetCostMaxUsageVOICE(t *testing.T) {
}
tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "")
cd := &CallDescriptorWithOpts{
cd := &CallDescriptorWithAPIOpts{
CallDescriptor: &CallDescriptor{
Category: "call",
Tenant: "cgrates.org",
@@ -206,7 +206,7 @@ func TestResponderDebitMaxUsageANY(t *testing.T) {
}
tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "")
cd := &CallDescriptorWithOpts{
cd := &CallDescriptorWithAPIOpts{
CallDescriptor: &CallDescriptor{
Category: "call",
Tenant: "cgrates.org",
@@ -233,7 +233,7 @@ func TestResponderDebitMaxUsageVOICE(t *testing.T) {
}
tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "")
cd := &CallDescriptorWithOpts{
cd := &CallDescriptorWithAPIOpts{
CallDescriptor: &CallDescriptor{
Category: "call",
Tenant: "cgrates.org",
@@ -260,7 +260,7 @@ func TestResponderMaxDebitMaxUsageANY(t *testing.T) {
}
tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "")
cd := &CallDescriptorWithOpts{
cd := &CallDescriptorWithAPIOpts{
CallDescriptor: &CallDescriptor{
Category: "call",
Tenant: "cgrates.org",
@@ -287,7 +287,7 @@ func TestResponderMaxDebitMaxUsageVOICE(t *testing.T) {
}
tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "")
cd := &CallDescriptorWithOpts{
cd := &CallDescriptorWithAPIOpts{
CallDescriptor: &CallDescriptor{
Category: "call",
Tenant: "cgrates.org",
@@ -314,7 +314,7 @@ func TestResponderRefundIncrementsMaxUsageANY(t *testing.T) {
}
tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "")
cd := &CallDescriptorWithOpts{
cd := &CallDescriptorWithAPIOpts{
CallDescriptor: &CallDescriptor{
Category: "call",
Tenant: "cgrates.org",
@@ -341,7 +341,7 @@ func TestResponderRefundIncrementsMaxUsageVOICE(t *testing.T) {
}
tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "")
cd := &CallDescriptorWithOpts{
cd := &CallDescriptorWithAPIOpts{
CallDescriptor: &CallDescriptor{
Category: "call",
Tenant: "cgrates.org",
@@ -368,7 +368,7 @@ func TestResponderRefundRoundingMaxUsageANY(t *testing.T) {
}
tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "")
cd := &CallDescriptorWithOpts{
cd := &CallDescriptorWithAPIOpts{
CallDescriptor: &CallDescriptor{
Category: "call",
Tenant: "cgrates.org",
@@ -395,7 +395,7 @@ func TestResponderRefundRoundingMaxUsageVOICE(t *testing.T) {
}
tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "")
cd := &CallDescriptorWithOpts{
cd := &CallDescriptorWithAPIOpts{
CallDescriptor: &CallDescriptor{
Category: "call",
Tenant: "cgrates.org",
@@ -422,7 +422,7 @@ func TestResponderGetMaxSessionTimeMaxUsageANY(t *testing.T) {
}
tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "")
cd := &CallDescriptorWithOpts{
cd := &CallDescriptorWithAPIOpts{
CallDescriptor: &CallDescriptor{
Category: "call",
Tenant: "cgrates.org",
@@ -449,7 +449,7 @@ func TestResponderGetMaxSessionTimeMaxUsageVOICE(t *testing.T) {
}
tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "")
cd := &CallDescriptorWithOpts{
cd := &CallDescriptorWithAPIOpts{
CallDescriptor: &CallDescriptor{
Category: "call",
Tenant: "cgrates.org",

6
engine/routes.go
View File

@@ -302,7 +302,7 @@ func (rpS *RouteService) statMetrics(statIDs []string, tenant string) (stsMetric
for _, statID := range statIDs {
var metrics map[string]float64
if err = rpS.connMgr.Call(rpS.cgrcfg.RouteSCfg().StatSConns, nil, utils.StatSv1GetQueueFloatMetrics,
&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: statID}}, &metrics); err != nil &&
&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: statID}}, &metrics); err != nil &&
err.Error() != utils.ErrNotFound.Error() {
utils.Logger.Warning(
fmt.Sprintf("<%s> error: %s getting statMetrics for stat : %s", utils.RouteS, err.Error(), statID))
@@ -335,7 +335,7 @@ func (rpS *RouteService) statMetricsForLoadDistribution(statIDs []string, tenant
if err = rpS.connMgr.Call(
rpS.cgrcfg.RouteSCfg().StatSConns, nil,
utils.StatSv1GetQueueFloatMetrics,
&utils.TenantIDWithOpts{
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{
Tenant: tenant, ID: statWithMetric[0]}},
&metrics); err != nil &&
@@ -376,7 +376,7 @@ func (rpS *RouteService) resourceUsage(resIDs []string, tenant string) (tUsage f
for _, resID := range resIDs {
var res Resource
if err = rpS.connMgr.Call(rpS.cgrcfg.RouteSCfg().ResourceSConns, nil, utils.ResourceSv1GetResource,
&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: resID}}, &res); err != nil && err.Error() != utils.ErrNotFound.Error() {
&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: resID}}, &res); err != nil && err.Error() != utils.ErrNotFound.Error() {
utils.Logger.Warning(
fmt.Sprintf("<%s> error: %s getting resource for ID : %s", utils.RouteS, err.Error(), resID))
continue

2
engine/stats.go
View File

@@ -407,7 +407,7 @@ func (sS *StatService) V1GetStatQueuesForEvent(args *StatsArgsProcessEvent, repl
}
// V1GetStatQueue returns a StatQueue object
func (sS *StatService) V1GetStatQueue(args *utils.TenantIDWithOpts, reply *StatQueue) (err error) {
func (sS *StatService) V1GetStatQueue(args *utils.TenantIDWithAPIOpts, reply *StatQueue) (err error) {
if missing := utils.MissingStructFields(args, []string{utils.ID}); len(missing) != 0 { //Params missing
return utils.NewErrMandatoryIeMissing(missing...)
}