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

Updated GetAccountsCount

Browse Source
This commit is contained in:
adragusin
2019-12-10 13:54:48 +02:00
parent 076cdc48d2
commit f8bcf0de42
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apier/v1/accounts.go
View File

@@ -594,7 +594,7 @@ func (api *ApierV1) RemoveBalances(attr *utils.AttrSetBalance, reply *string) (e
return nil
}
func (api *ApierV1) CountAccounts(attr utils.TenantArg, reply *int) (err error) {
func (api *ApierV1) GetAccountsCount(attr utils.TenantArg, reply *int) (err error) {
if len(attr.Tenant) == 0 {
return utils.NewErrMandatoryIeMissing("Tenant")
}

2
apier/v1/accounts_it_test.go
View File

@@ -487,7 +487,7 @@ func testAccITCountAccounts(t *testing.T) {
args := &utils.TenantArg{
Tenant: "cgrates.org",
}
if err := accRPC.Call(utils.ApierV1CountAccounts, args, &reply); err != nil {
if err := accRPC.Call(utils.ApierV1GetAccountsCount, args, &reply); err != nil {
t.Error(err)
} else if reply != 10 {
t.Errorf("Expecting: %v, received: %v", 10, reply)

2
apier/v1/cdrs.go
View File

@@ -114,7 +114,7 @@ func (cdrSv1 *CDRsV1) StoreSessionCost(attr *engine.AttrCDRSStoreSMCost, reply *
return cdrSv1.CDRs.V1StoreSessionCost(attr, reply)
}
func (cdrSv1 *CDRsV1) CountCDRs(args *utils.RPCCDRsFilterWithArgDispatcher, reply *int64) error {
func (cdrSv1 *CDRsV1) GetCDRsCount(args *utils.RPCCDRsFilterWithArgDispatcher, reply *int64) error {
return cdrSv1.CDRs.V1CountCDRs(args, reply)
}

4
apier/v1/dispatcher.go
View File

@@ -707,8 +707,8 @@ func (dS *DispatcherSCDRsV1) GetCDRs(args utils.RPCCDRsFilterWithArgDispatcher,
return dS.dS.CDRsV1GetCDRs(args, reply)
}
func (dS *DispatcherSCDRsV1) CountCDRs(args *utils.RPCCDRsFilterWithArgDispatcher, reply *int64) error {
return dS.dS.CDRsV1CountCDRs(args, reply)
func (dS *DispatcherSCDRsV1) GetCDRsCount(args *utils.RPCCDRsFilterWithArgDispatcher, reply *int64) error {
return dS.dS.CDRsV1GetCDRsCount(args, reply)
}
func (dS *DispatcherSCDRsV1) StoreSessionCost(args *engine.AttrCDRSStoreSMCost, reply *string) error {

2
apier/v1/sessions_process_event_it_test.go
View File

@@ -360,7 +360,7 @@ func testSSv1ItProcessCDRForSessionFromProcessEvent(t *testing.T) {
func testSSv1ItGetCDRs(t *testing.T) {
var cdrCnt int64
req := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{}}
if err := sSApierRpc.Call(utils.CDRsV1CountCDRs, req, &cdrCnt); err != nil {
if err := sSApierRpc.Call(utils.CDRsV1GetCDRsCount, req, &cdrCnt); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if cdrCnt != 3 { // 3 for each CDR
t.Error("Unexpected number of CDRs returned: ", cdrCnt)

2
apier/v1/sessionsv1_it_test.go
View File

@@ -640,7 +640,7 @@ func testSSv1ItProcessEvent(t *testing.T) {
func testSSv1ItCDRsGetCdrs(t *testing.T) {
var cdrCnt int64
req := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{}}
if err := sSApierRpc.Call(utils.CDRsV1CountCDRs, req, &cdrCnt); err != nil {
if err := sSApierRpc.Call(utils.CDRsV1GetCDRsCount, req, &cdrCnt); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if cdrCnt != 6 { // 3 for each CDR
t.Error("Unexpected number of CDRs returned: ", cdrCnt)

2
data/tariffplans/dispatchers/Attributes.csv
View File

@@ -14,7 +14,7 @@ cgrates.org,ATTR_API_RSP_AUTH,*auth,*string:~*req.APIKey:rsp12345,,,APIMethods,*
cgrates.org,ATTR_API_CHC_AUTH,*auth,*string:~*req.APIKey:chc12345,,,APIMethods,*constant,CacheSv1.Ping&CacheSv1.GetCacheStats&CacheSv1.LoadCache&CacheSv1.PrecacheStatus&CacheSv1.GetItemIDs&CacheSv1.HasItem&CacheSv1.GetItemExpiryTime&CacheSv1.ReloadCache&CacheSv1.RemoveItem&CacheSv1.FlushCache&CacheSv1.Clear,false,20
cgrates.org,ATTR_API_GRD_AUTH,*auth,*string:~*req.APIKey:grd12345,,,APIMethods,*constant,GuardianSv1.Ping&GuardianSv1.RemoteLock&GuardianSv1.RemoteUnlock,false,20
cgrates.org,ATTR_API_SCHD_AUTH,*auth,*string:~*req.APIKey:sched12345,,,APIMethods,*constant,SchedulerSv1.Ping,false,20
cgrates.org,ATTR_API_CDRS_AUTH,*auth,*string:~*req.APIKey:cdrs12345,,,APIMethods,*constant,CDRsV1.Ping&CDRsV1.ProcessEvent&CDRsV1.GetCDRs&CDRsV1.CountCDRs&CDRsV1.ProcessCDR&CDRsV1.ProcessExternalCDR,false,20
cgrates.org,ATTR_API_CDRS_AUTH,*auth,*string:~*req.APIKey:cdrs12345,,,APIMethods,*constant,CDRsV1.Ping&CDRsV1.ProcessEvent&CDRsV1.GetCDRs&CDRsV1.GetCDRsCount&CDRsV1.ProcessCDR&CDRsV1.ProcessExternalCDR,false,20
cgrates.org,ATTR_API_DSP_AUTH,*auth,*string:~*req.APIKey:dsp12345,,,APIMethods,*constant,DispatcherSv1.Ping&DispatcherSv1.GetProfileForEvent,false,20
cgrates.org,ATTR_API_PSE_AUTH,*auth,*string:~*req.APIKey:pse12345,,,APIMethods,*constant,SessionSv1.Ping&SessionSv1.AuthorizeEvent&SessionSv1.AuthorizeEventWithDigest&SessionSv1.InitiateSession&SessionSv1.InitiateSessionWithDigest&SessionSv1.UpdateSession&SessionSv1.SyncSessions&SessionSv1.TerminateSession&SessionSv1.ProcessCDR&SessionSv1.ProcessMessage&SessionSv1.GetActiveSessions&SessionSv1.GetActiveSessionsCount&SessionSv1.ForceDisconnect&SessionSv1.GetPassiveSessions&SessionSv1.GetPassiveSessionsCount&SessionSv1.ReplicateSessions&SessionSv1.SetPassiveSession&AttributeSv1.ProcessEvent&Responder.Debit&ResourceSv1.AllocateResources&ChargerSv1.ProcessEvent&Responder.MaxDebit,false,20
cgrates.org,ATTR_API_CFG_AUTH,*auth,*string:~*req.APIKey:cfg12345,,,APIMethods,*constant,ConfigSv1.GetJSONSection&ConfigSv1.ReloadConfig,false,20
1 #Tenant ID Contexts FilterIDs ActivationInterval AttributeFilterIDs FieldName Type Value Blocker Weight
14 cgrates.org ATTR_API_CHC_AUTH *auth *string:~*req.APIKey:chc12345 APIMethods *constant CacheSv1.Ping&CacheSv1.GetCacheStats&CacheSv1.LoadCache&CacheSv1.PrecacheStatus&CacheSv1.GetItemIDs&CacheSv1.HasItem&CacheSv1.GetItemExpiryTime&CacheSv1.ReloadCache&CacheSv1.RemoveItem&CacheSv1.FlushCache&CacheSv1.Clear false 20
15 cgrates.org ATTR_API_GRD_AUTH *auth *string:~*req.APIKey:grd12345 APIMethods *constant GuardianSv1.Ping&GuardianSv1.RemoteLock&GuardianSv1.RemoteUnlock false 20
16 cgrates.org ATTR_API_SCHD_AUTH *auth *string:~*req.APIKey:sched12345 APIMethods *constant SchedulerSv1.Ping false 20
17 cgrates.org ATTR_API_CDRS_AUTH *auth *string:~*req.APIKey:cdrs12345 APIMethods *constant CDRsV1.Ping&CDRsV1.ProcessEvent&CDRsV1.GetCDRs&CDRsV1.CountCDRs&CDRsV1.ProcessCDR&CDRsV1.ProcessExternalCDR CDRsV1.Ping&CDRsV1.ProcessEvent&CDRsV1.GetCDRs&CDRsV1.GetCDRsCount&CDRsV1.ProcessCDR&CDRsV1.ProcessExternalCDR false 20
18 cgrates.org ATTR_API_DSP_AUTH *auth *string:~*req.APIKey:dsp12345 APIMethods *constant DispatcherSv1.Ping&DispatcherSv1.GetProfileForEvent false 20
19 cgrates.org ATTR_API_PSE_AUTH *auth *string:~*req.APIKey:pse12345 APIMethods *constant SessionSv1.Ping&SessionSv1.AuthorizeEvent&SessionSv1.AuthorizeEventWithDigest&SessionSv1.InitiateSession&SessionSv1.InitiateSessionWithDigest&SessionSv1.UpdateSession&SessionSv1.SyncSessions&SessionSv1.TerminateSession&SessionSv1.ProcessCDR&SessionSv1.ProcessMessage&SessionSv1.GetActiveSessions&SessionSv1.GetActiveSessionsCount&SessionSv1.ForceDisconnect&SessionSv1.GetPassiveSessions&SessionSv1.GetPassiveSessionsCount&SessionSv1.ReplicateSessions&SessionSv1.SetPassiveSession&AttributeSv1.ProcessEvent&Responder.Debit&ResourceSv1.AllocateResources&ChargerSv1.ProcessEvent&Responder.MaxDebit false 20
20 cgrates.org ATTR_API_CFG_AUTH *auth *string:~*req.APIKey:cfg12345 APIMethods *constant ConfigSv1.GetJSONSection&ConfigSv1.ReloadConfig false 20

6
dispatchers/cdrs.go
View File

@@ -74,7 +74,7 @@ func (dS *DispatcherService) CDRsV1GetCDRs(args utils.RPCCDRsFilterWithArgDispat
utils.CDRsV1GetCDRs, args, reply)
}
func (dS *DispatcherService) CDRsV1CountCDRs(args *utils.RPCCDRsFilterWithArgDispatcher, reply *int64) (err error) {
func (dS *DispatcherService) CDRsV1GetCDRsCount(args *utils.RPCCDRsFilterWithArgDispatcher, reply *int64) (err error) {
tnt := dS.cfg.GeneralCfg().DefaultTenant
if args.TenantArg != nil && args.TenantArg.Tenant != utils.EmptyString {
tnt = args.TenantArg.Tenant
@@ -83,7 +83,7 @@ func (dS *DispatcherService) CDRsV1CountCDRs(args *utils.RPCCDRsFilterWithArgDis
if args.ArgDispatcher == nil {
return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
}
if err = dS.authorize(utils.CDRsV1CountCDRs, tnt,
if err = dS.authorize(utils.CDRsV1GetCDRsCount, tnt,
args.APIKey, utils.TimePointer(time.Now())); err != nil {
return
}
@@ -93,7 +93,7 @@ func (dS *DispatcherService) CDRsV1CountCDRs(args *utils.RPCCDRsFilterWithArgDis
routeID = args.ArgDispatcher.RouteID
}
return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCDRs, routeID,
utils.CDRsV1CountCDRs, args, reply)
utils.CDRsV1GetCDRsCount, args, reply)
}
func (dS *DispatcherService) CDRsV1StoreSessionCost(args *engine.AttrCDRSStoreSMCost, reply *string) (err error) {

4
dispatchers/cdrs_it_test.go
View File

@@ -145,7 +145,7 @@ func testDspCDRsCountCDR(t *testing.T) {
},
}
if err := dispEngine.RPC.Call(utils.CDRsV1CountCDRs, args, &reply); err != nil {
if err := dispEngine.RPC.Call(utils.CDRsV1GetCDRsCount, args, &reply); err != nil {
t.Error(err)
} else if reply != 1 {
t.Errorf("Received: %+v", reply)
@@ -364,7 +364,7 @@ func testDspCDRsCountCDRNoAuth(t *testing.T) {
},
}
if err := dispEngine.RPC.Call(utils.CDRsV1CountCDRs, args, &reply); err != nil {
if err := dispEngine.RPC.Call(utils.CDRsV1GetCDRsCount, args, &reply); err != nil {
t.Error(err)
} else if reply != 1 {
t.Errorf("Received: %+v", reply)

4
utils/consts.go
View File

@@ -1000,7 +1000,7 @@ const (
ApierV1AddBalance = "ApierV1.AddBalance"
ApierV1DebitBalance = "ApierV1.DebitBalance"
ApierV1SetAccount = "ApierV1.SetAccount"
ApierV1CountAccounts = "ApierV1.CountAccounts"
ApierV1GetAccountsCount = "ApierV1.GetAccountsCount"
ApierV1GetDataDBVersions = "ApierV1.GetDataDBVersions"
ApierV1GetStorDBVersions = "ApierV1.GetStorDBVersions"
ApierV1GetCDRs = "ApierV1.GetCDRs"
@@ -1354,7 +1354,7 @@ const (
// Cdrs APIs
const (
CDRsV1 = "CDRsV1"
CDRsV1CountCDRs = "CDRsV1.CountCDRs"
CDRsV1GetCDRsCount = "CDRsV1.GetCDRsCount"
CDRsV1RateCDRs = "CDRsV1.RateCDRs"
CDRsV1GetCDRs = "CDRsV1.GetCDRs"
CDRsV1ProcessCDR = "CDRsV1.ProcessCDR"