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

Updated parameters for console commands

Browse Source
This commit is contained in:
Tripon Alexandru-Ionut
2019-05-03 17:04:10 +03:00
parent b35af23bcd
commit cead68b435
36 changed files with 84 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
console/active_sessions.go
View File

@@ -51,7 +51,8 @@ func (self *CmdActiveSessions) RpcMethod() string {
func (self *CmdActiveSessions) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &dispatchers.FilterSessionWithApiKey{}
self.rpcParams = &dispatchers.FilterSessionWithApiKey{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

2
console/attributes_for_event.go
View File

@@ -50,7 +50,7 @@ func (self *CmdGetAttributeForEvent) RpcMethod() string {
func (self *CmdGetAttributeForEvent) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.AttrArgsProcessEvent{}
self.rpcParams = &engine.AttrArgsProcessEvent{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

2
console/attributes_process_event.go
View File

@@ -52,7 +52,7 @@ func (self *CmdAttributesProcessEvent) RpcMethod() string {
func (self *CmdAttributesProcessEvent) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.AttrArgsProcessEvent{}
self.rpcParams = &engine.AttrArgsProcessEvent{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

3
console/attributes_set.go
View File

@@ -20,6 +20,7 @@ package console
import (
v2 "github.com/cgrates/cgrates/apier/v2"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
@@ -50,7 +51,7 @@ func (self *CmdSetAttributes) RpcMethod() string {
func (self *CmdSetAttributes) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &v2.AttributeWithCache{}
self.rpcParams = &v2.AttributeWithCache{ExternalAttributeProfile: new(engine.ExternalAttributeProfile)}
}
return self.rpcParams
}

5
console/chargers_for_event.go
View File

@@ -50,7 +50,10 @@ func (self *CmdGetChargersForEvent) RpcMethod() string {
func (self *CmdGetChargersForEvent) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.CGREventWithArgDispatcher{}
self.rpcParams = &utils.CGREventWithArgDispatcher{
CGREvent: new(utils.CGREvent),
ArgDispatcher: new(utils.ArgDispatcher),
}
}
return self.rpcParams
}

5
console/chargers_process_event.go
View File

@@ -52,7 +52,10 @@ func (self *CmdChargersProcessEvent) RpcMethod() string {
func (self *CmdChargersProcessEvent) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.CGREventWithArgDispatcher{}
self.rpcParams = &utils.CGREventWithArgDispatcher{
CGREvent: new(utils.CGREvent),
ArgDispatcher: new(utils.ArgDispatcher),
}
}
return self.rpcParams
}

3
console/chargers_set.go
View File

@@ -20,6 +20,7 @@ package console
import (
v1 "github.com/cgrates/cgrates/apier/v1"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
@@ -50,7 +51,7 @@ func (self *CmdSetChargers) RpcMethod() string {
func (self *CmdSetChargers) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &v1.ChargerWithCache{}
self.rpcParams = &v1.ChargerWithCache{ChargerProfile: new(engine.ChargerProfile)}
}
return self.rpcParams
}

5
console/cost.go
View File

@@ -19,8 +19,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package console
import (
"github.com/cgrates/cgrates/apier/v1"
v1 "github.com/cgrates/cgrates/apier/v1"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
func init() {
@@ -53,7 +54,7 @@ func (self *CmdGetCost) RpcMethod() string {
func (self *CmdGetCost) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &v1.AttrGetCost{}
self.rpcParams = &v1.AttrGetCost{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

5
console/datacost.go
View File

@@ -19,8 +19,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package console
import (
"github.com/cgrates/cgrates/apier/v1"
v1 "github.com/cgrates/cgrates/apier/v1"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
func init() {
@@ -52,7 +53,7 @@ func (self *CmdGetDataCost) RpcMethod() string {
func (self *CmdGetDataCost) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = new(v1.AttrGetDataCost)
self.rpcParams = &v1.AttrGetDataCost{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

5
console/debit.go
View File

@@ -52,7 +52,10 @@ func (self *CmdDebit) RpcMethod() string {
func (self *CmdDebit) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = new(engine.CallDescriptorWithArgDispatcher)
self.rpcParams = &engine.CallDescriptorWithArgDispatcher{
CallDescriptor: new(engine.CallDescriptor),
ArgDispatcher: new(utils.ArgDispatcher),
}
}
return self.rpcParams
}

10
console/debit_max.go
View File

@@ -18,7 +18,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package console
import "github.com/cgrates/cgrates/engine"
import (
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
func init() {
c := &CmdMaxDebit{
@@ -49,7 +52,10 @@ func (self *CmdMaxDebit) RpcMethod() string {
func (self *CmdMaxDebit) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = new(engine.CallDescriptorWithArgDispatcher)
self.rpcParams = &engine.CallDescriptorWithArgDispatcher{
CallDescriptor: new(engine.CallDescriptor),
ArgDispatcher: new(utils.ArgDispatcher),
}
}
return self.rpcParams
}

2
console/dispatcherprofile.go
View File

@@ -51,7 +51,7 @@ func (self *CmdDispatcherProfile) RpcMethod() string {
func (self *CmdDispatcherProfile) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = new(dispatchers.DispatcherEvent)
self.rpcParams = &dispatchers.DispatcherEvent{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

3
console/filter_set.go
View File

@@ -20,6 +20,7 @@ package console
import (
v1 "github.com/cgrates/cgrates/apier/v1"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
@@ -51,7 +52,7 @@ func (self *CmdSetFilter) RpcMethod() string {
func (self *CmdSetFilter) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &v1.FilterWithCache{}
self.rpcParams = &v1.FilterWithCache{Filter: new(engine.Filter)}
}
return self.rpcParams
}

2
console/get_json_section.go
View File

@@ -51,7 +51,7 @@ func (self *CmdGetJSONConfig) RpcMethod() string {
func (self *CmdGetJSONConfig) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &config.StringWithArgDispatcher{}
self.rpcParams = &config.StringWithArgDispatcher{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

5
console/maxduration.go
View File

@@ -54,7 +54,10 @@ func (self *CmdGetMaxDuration) RpcMethod() string {
func (self *CmdGetMaxDuration) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = new(engine.CallDescriptorWithArgDispatcher)
self.rpcParams = &engine.CallDescriptorWithArgDispatcher{
CallDescriptor: new(engine.CallDescriptor),
ArgDispatcher: new(utils.ArgDispatcher),
}
}
return self.rpcParams
}

2
console/passive_sessions.go
View File

@@ -51,7 +51,7 @@ func (self *CmdPassiveSessions) RpcMethod() string {
func (self *CmdPassiveSessions) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &dispatchers.FilterSessionWithApiKey{}
self.rpcParams = &dispatchers.FilterSessionWithApiKey{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

2
console/resources_for_event.go
View File

@@ -53,7 +53,7 @@ func (self *CmdGetResourceForEvent) RpcMethod() string {
func (self *CmdGetResourceForEvent) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.ArgRSv1ResourceUsage{}
self.rpcParams = &utils.ArgRSv1ResourceUsage{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

2
console/session_authorize_event.go
View File

@@ -52,7 +52,7 @@ func (self *CmdSessionsAuthorize) RpcMethod() string {
func (self *CmdSessionsAuthorize) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &sessions.V1AuthorizeArgs{}
self.rpcParams = &sessions.V1AuthorizeArgs{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

2
console/session_initiate.go
View File

@@ -52,7 +52,7 @@ func (self *CmdSessionsInitiate) RpcMethod() string {
func (self *CmdSessionsInitiate) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &sessions.V1InitSessionArgs{}
self.rpcParams = &sessions.V1InitSessionArgs{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

5
console/session_process_cdr.go
View File

@@ -51,7 +51,10 @@ func (self *CmdSessionsProcessCDR) RpcMethod() string {
func (self *CmdSessionsProcessCDR) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.CGREventWithArgDispatcher{}
self.rpcParams = &utils.CGREventWithArgDispatcher{
CGREvent: new(utils.CGREvent),
ArgDispatcher: new(utils.ArgDispatcher),
}
}
return self.rpcParams
}

2
console/session_process_event.go
View File

@@ -52,7 +52,7 @@ func (self *CmdSessionsProcessEvent) RpcMethod() string {
func (self *CmdSessionsProcessEvent) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &sessions.V1ProcessEventArgs{}
self.rpcParams = &sessions.V1ProcessEventArgs{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

2
console/session_terminate.go
View File

@@ -52,7 +52,7 @@ func (self *CmdSessionsTerminate) RpcMethod() string {
func (self *CmdSessionsTerminate) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &sessions.V1TerminateSessionArgs{}
self.rpcParams = &sessions.V1TerminateSessionArgs{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

2
console/session_update.go
View File

@@ -52,7 +52,7 @@ func (self *CmdSessionsUpdate) RpcMethod() string {
func (self *CmdSessionsUpdate) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &sessions.V1UpdateSessionArgs{}
self.rpcParams = &sessions.V1UpdateSessionArgs{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

3
console/statqueue_set.go
View File

@@ -20,6 +20,7 @@ package console
import (
v1 "github.com/cgrates/cgrates/apier/v1"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
@@ -51,7 +52,7 @@ func (self *CmdSetStatQueue) RpcMethod() string {
func (self *CmdSetStatQueue) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &v1.StatQueueWithCache{}
self.rpcParams = &v1.StatQueueWithCache{StatQueueProfile: new(engine.StatQueueProfile)}
}
return self.rpcParams
}

2
console/stats_for_event.go
View File

@@ -53,7 +53,7 @@ func (self *CmdStatsQueueForEvent) RpcMethod() string {
func (self *CmdStatsQueueForEvent) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.StatsArgsProcessEvent{}
self.rpcParams = &engine.StatsArgsProcessEvent{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

5
console/stats_metrics.go
View File

@@ -50,7 +50,10 @@ func (self *CmdGetStatQueueStringMetrics) RpcMethod() string {
func (self *CmdGetStatQueueStringMetrics) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.TenantIDWithArgDispatcher{}
self.rpcParams = &utils.TenantIDWithArgDispatcher{
TenantID: new(utils.TenantID),
ArgDispatcher: new(utils.ArgDispatcher),
}
}
return self.rpcParams
}

2
console/stats_process_event.go
View File

@@ -53,7 +53,7 @@ func (self *CmdStatQueueProcessEvent) RpcMethod() string {
func (self *CmdStatQueueProcessEvent) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.StatsArgsProcessEvent{}
self.rpcParams = &engine.StatsArgsProcessEvent{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

5
console/status.go
View File

@@ -46,7 +46,10 @@ func (self *CmdStatus) RpcMethod() string {
func (self *CmdStatus) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.TenantWithArgDispatcher{}
self.rpcParams = &utils.TenantWithArgDispatcher{
TenantArg: new(utils.TenantArg),
ArgDispatcher: new(utils.ArgDispatcher),
}
}
return self.rpcParams
}

4
console/supplier_profiles_for_event.go
View File

@@ -50,7 +50,9 @@ func (self *CmdGetSupplierForEvent) RpcMethod() string {
func (self *CmdGetSupplierForEvent) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.CGREventWithArgDispatcher{}
self.rpcParams = &utils.CGREventWithArgDispatcher{
CGREvent: new(utils.CGREvent),
ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

3
console/supplier_set.go
View File

@@ -20,6 +20,7 @@ package console
import (
v1 "github.com/cgrates/cgrates/apier/v1"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
@@ -50,7 +51,7 @@ func (self *CmdSetSupplier) RpcMethod() string {
func (self *CmdSetSupplier) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &v1.SupplierWithCache{}
self.rpcParams = &v1.SupplierWithCache{SupplierProfile: new(engine.SupplierProfile)}
}
return self.rpcParams
}

2
console/suppliers.go
View File

@@ -52,7 +52,7 @@ func (self *CmdSuppliersSort) RpcMethod() string {
func (self *CmdSuppliersSort) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.ArgsGetSuppliers{}
self.rpcParams = &engine.ArgsGetSuppliers{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

5
console/threshold.go
View File

@@ -50,7 +50,10 @@ func (self *CmdGetThreshold) RpcMethod() string {
func (self *CmdGetThreshold) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.TenantIDWithArgDispatcher{}
self.rpcParams = &utils.TenantIDWithArgDispatcher{
TenantID: new(utils.TenantID),
ArgDispatcher: new(utils.ArgDispatcher),
}
}
return self.rpcParams
}

3
console/threshold_set.go
View File

@@ -20,6 +20,7 @@ package console
import (
v1 "github.com/cgrates/cgrates/apier/v1"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
@@ -51,7 +52,7 @@ func (self *CmdSetThreshold) RpcMethod() string {
func (self *CmdSetThreshold) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &v1.ThresholdWithCache{}
self.rpcParams = &v1.ThresholdWithCache{ThresholdProfile: new(engine.ThresholdProfile)}
}
return self.rpcParams
}

2
console/thresholds_for_event.go
View File

@@ -52,7 +52,7 @@ func (self *CmdThresholdsForEvent) RpcMethod() string {
func (self *CmdThresholdsForEvent) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.ArgsProcessEvent{}
self.rpcParams = &engine.ArgsProcessEvent{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

2
console/thresholds_process_event.go
View File

@@ -52,7 +52,7 @@ func (self *CmdThresholdProcessEvent) RpcMethod() string {
func (self *CmdThresholdProcessEvent) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.ArgsProcessEvent{}
self.rpcParams = &engine.ArgsProcessEvent{ArgDispatcher: new(utils.ArgDispatcher)}
}
return self.rpcParams
}

9
sessions/sessions_bench_test.go
View File

@@ -38,7 +38,7 @@ var (
sBenchCfg *config.CGRConfig
sBenchRPC *rpc.Client
connOnce sync.Once
initRuns = flag.Int("init_runs", 25000, "number of loops to run in init")
initRuns = flag.Int("runs", 25000, "number of loops to run in init")
cps = flag.Int("cps", 2000, "number of loops to run in init")
maxCps = make(chan struct{}, *cps)
)
@@ -127,7 +127,7 @@ func sendInit() {
initArgs.ID = utils.UUIDSha1Prefix()
initArgs.Event[utils.OriginID] = utils.UUIDSha1Prefix()
initArgs.Event[utils.Account] = fmt.Sprintf("1001%v", i)
initArgs.Event[utils.Subject] = initArgs.Event[utils.Account]
initArgs.Event[utils.Subject] = "1001" //initArgs.Event[utils.Account]
initArgs.Event[utils.Destination] = fmt.Sprintf("1002%v", i)
var initRpl *V1InitSessionReply
@@ -143,8 +143,9 @@ func sendInit() {
func getCount() int {
var count int
if err := sBenchRPC.Call(utils.SessionSv1GetActiveSessionsCount,
map[string]string{}, &count); err != nil {
if err := sBenchRPC.Call(utils.SessionSv1GetActiveSessionsCount, map[string]interface{}{
"Filters": map[string]string{utils.ToR: utils.VOICE},
}, &count); err != nil {
log.Fatal(err)
}
return count