From edcc2d959c09e5f16bce270def90000f3413c5bf Mon Sep 17 00:00:00 2001 From: Trial97 Date: Wed, 21 Oct 2020 09:39:06 +0300 Subject: [PATCH] Updated console RpcParams --- console/attributes_for_event.go | 9 ++++++--- console/attributes_process_event.go | 9 ++++++--- console/attributes_profile_rem.go | 2 +- console/cdrs.go | 4 +++- console/command_executer.go | 4 ++-- console/dispatchers_for_event.go | 5 ++++- console/dispatchers_host_rem.go | 2 +- console/dispatchers_host_set.go | 6 +++++- console/dispatchers_profile_rem.go | 2 +- console/dispatchers_profile_set.go | 6 +++++- console/filter_remove.go | 2 +- console/rates_profile_remove.go | 2 +- console/rates_profile_set.go | 7 ++++++- console/resources.go | 5 ++++- console/resources_allocate.go | 7 ++++++- console/resources_authorize.go | 7 ++++++- console/resources_for_event.go | 7 ++++++- console/resources_profile_rem.go | 2 +- console/resources_profile_set.go | 6 +++++- console/resources_release.go | 7 ++++++- console/routes.go | 7 ++++++- console/routes_profile_remove.go | 2 +- console/routes_profile_set.go | 5 ++++- console/session_authorize_event.go | 7 ++++++- console/session_initiate.go | 7 ++++++- console/session_process_message.go | 7 ++++++- console/session_terminate.go | 7 ++++++- console/session_update.go | 7 ++++++- console/stats_for_event.go | 7 ++++++- console/stats_process_event.go | 7 ++++++- console/stats_profile_rem.go | 2 +- console/stats_profile_set.go | 5 ++++- console/thresholds_for_event.go | 7 ++++++- console/thresholds_process_event.go | 7 ++++++- console/thresholds_profile_remove.go | 2 +- console/thresholds_profile_set.go | 5 ++++- 36 files changed, 151 insertions(+), 41 deletions(-) diff --git a/console/attributes_for_event.go b/console/attributes_for_event.go index a25036b4b..ad83cc637 100644 --- a/console/attributes_for_event.go +++ b/console/attributes_for_event.go @@ -50,9 +50,12 @@ func (self *CmdGetAttributeForEvent) RpcMethod() string { func (self *CmdGetAttributeForEvent) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &engine.AttrArgsProcessEvent{CGREventWithOpts: &utils.CGREventWithOpts{ - Opts: make(map[string]interface{}), - }} + self.rpcParams = &engine.AttrArgsProcessEvent{ + CGREventWithOpts: &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/attributes_process_event.go b/console/attributes_process_event.go index 02239648c..2623f6d40 100644 --- a/console/attributes_process_event.go +++ b/console/attributes_process_event.go @@ -52,9 +52,12 @@ func (self *CmdAttributesProcessEvent) RpcMethod() string { func (self *CmdAttributesProcessEvent) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &engine.AttrArgsProcessEvent{CGREventWithOpts: &utils.CGREventWithOpts{ - Opts: make(map[string]interface{}), - }} + self.rpcParams = &engine.AttrArgsProcessEvent{ + CGREventWithOpts: &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/attributes_profile_rem.go b/console/attributes_profile_rem.go index 26e9ef006..45ec12e5e 100644 --- a/console/attributes_profile_rem.go +++ b/console/attributes_profile_rem.go @@ -47,7 +47,7 @@ func (self *CmdRemoveAttributes) RpcMethod() string { func (self *CmdRemoveAttributes) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.TenantIDWithCache{} + self.rpcParams = &utils.TenantIDWithCache{Opts: make(map[string]interface{})} } return self.rpcParams } diff --git a/console/cdrs.go b/console/cdrs.go index 8b3c93604..0c21257d9 100644 --- a/console/cdrs.go +++ b/console/cdrs.go @@ -50,7 +50,9 @@ func (self *CmdGetCDRs) RpcMethod() string { func (self *CmdGetCDRs) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.RPCCDRsFilterWithOpts{} + self.rpcParams = &utils.RPCCDRsFilterWithOpts{ + RPCCDRsFilter: new(utils.RPCCDRsFilter), + } } return self.rpcParams } diff --git a/console/command_executer.go b/console/command_executer.go index c3b10adb4..3612fcdf9 100644 --- a/console/command_executer.go +++ b/console/command_executer.go @@ -70,7 +70,7 @@ func (ce *CommandExecuter) clientArgs(iface interface{}) (args []string) { for i := 0; i < typ.NumField(); i++ { valField := val.Field(i) typeField := typ.Field(i) - //log.Printf("%v (%v : %v)", typeField.Name, valField.Kind(), typeField.PkgPath) + // log.Printf("%v (%v : %v)", typeField.Name, valField.Kind(), typeField.PkgPath) if len(typeField.PkgPath) > 0 { //unexported field continue } @@ -79,7 +79,7 @@ func (ce *CommandExecuter) clientArgs(iface interface{}) (args []string) { if valField.Kind() == reflect.Ptr { valField = reflect.New(valField.Type().Elem()).Elem() if valField.Kind() != reflect.Struct { - //log.Printf("Here: %v (%v)", typeField.Name, valField.Kind()) + // log.Printf("Here: %v (%v)", typeField.Name, valField.Kind()) args = append(args, typeField.Name) continue } diff --git a/console/dispatchers_for_event.go b/console/dispatchers_for_event.go index 07565d25e..fdffb42d2 100644 --- a/console/dispatchers_for_event.go +++ b/console/dispatchers_for_event.go @@ -50,7 +50,10 @@ func (self *CmdDispatcherProfile) RpcMethod() string { func (self *CmdDispatcherProfile) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.CGREventWithOpts{Opts: make(map[string]interface{})} + self.rpcParams = &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + } } return self.rpcParams } diff --git a/console/dispatchers_host_rem.go b/console/dispatchers_host_rem.go index 032576b75..203a1031f 100644 --- a/console/dispatchers_host_rem.go +++ b/console/dispatchers_host_rem.go @@ -49,7 +49,7 @@ func (self *CmdRemoveDispatcherHost) RpcMethod() string { func (self *CmdRemoveDispatcherHost) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = new(utils.TenantIDWithCache) + self.rpcParams = &utils.TenantIDWithCache{Opts: make(map[string]interface{})} } return self.rpcParams } diff --git a/console/dispatchers_host_set.go b/console/dispatchers_host_set.go index 74368a0c7..6d7bf7dca 100644 --- a/console/dispatchers_host_set.go +++ b/console/dispatchers_host_set.go @@ -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,10 @@ func (self *CmdSetDispatcherHost) RpcMethod() string { func (self *CmdSetDispatcherHost) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = new(v1.DispatcherHostWithCache) + self.rpcParams = &v1.DispatcherHostWithCache{ + DispatcherHost: new(engine.DispatcherHost), + Opts: make(map[string]interface{}), + } } return self.rpcParams } diff --git a/console/dispatchers_profile_rem.go b/console/dispatchers_profile_rem.go index 7fee0edc0..3a3456991 100644 --- a/console/dispatchers_profile_rem.go +++ b/console/dispatchers_profile_rem.go @@ -49,7 +49,7 @@ func (self *CmdRemoveDispatcherProfile) RpcMethod() string { func (self *CmdRemoveDispatcherProfile) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = new(utils.TenantIDWithCache) + self.rpcParams = &utils.TenantIDWithCache{Opts: make(map[string]interface{})} } return self.rpcParams } diff --git a/console/dispatchers_profile_set.go b/console/dispatchers_profile_set.go index 947f6f3d8..9a9917560 100644 --- a/console/dispatchers_profile_set.go +++ b/console/dispatchers_profile_set.go @@ -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,10 @@ func (self *CmdSetDispatcherProfile) RpcMethod() string { func (self *CmdSetDispatcherProfile) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = new(v1.DispatcherWithCache) + self.rpcParams = &v1.DispatcherWithCache{ + DispatcherProfile: new(engine.DispatcherProfile), + Opts: make(map[string]interface{}), + } } return self.rpcParams } diff --git a/console/filter_remove.go b/console/filter_remove.go index 58d7ba296..a0c0a2fb3 100644 --- a/console/filter_remove.go +++ b/console/filter_remove.go @@ -48,7 +48,7 @@ func (self *CmdRemoveFilter) RpcMethod() string { func (self *CmdRemoveFilter) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.TenantIDWithCache{} + self.rpcParams = &utils.TenantIDWithCache{Opts: make(map[string]interface{})} } return self.rpcParams } diff --git a/console/rates_profile_remove.go b/console/rates_profile_remove.go index c9d445bd6..84536f3c7 100644 --- a/console/rates_profile_remove.go +++ b/console/rates_profile_remove.go @@ -47,7 +47,7 @@ func (self *CmdRemoveRateProfile) RpcMethod() string { func (self *CmdRemoveRateProfile) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.TenantIDWithCache{} + self.rpcParams = &utils.TenantIDWithCache{Opts: make(map[string]interface{})} } return self.rpcParams } diff --git a/console/rates_profile_set.go b/console/rates_profile_set.go index 8fa3b0616..ff6f6984d 100644 --- a/console/rates_profile_set.go +++ b/console/rates_profile_set.go @@ -51,7 +51,12 @@ func (self *CmdSetRateProfile) RpcMethod() string { func (self *CmdSetRateProfile) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &v1.RateProfileWithCache{RateProfileWithOpts: new(engine.RateProfileWithOpts)} + self.rpcParams = &v1.RateProfileWithCache{ + RateProfileWithOpts: &engine.RateProfileWithOpts{ + RateProfile: new(engine.RateProfile), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/resources.go b/console/resources.go index 2dc47796f..533665a1b 100644 --- a/console/resources.go +++ b/console/resources.go @@ -51,7 +51,10 @@ func (self *CmdGetResource) RpcMethod() string { func (self *CmdGetResource) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.TenantIDWithOpts{} + self.rpcParams = &utils.TenantIDWithOpts{ + TenantID: new(utils.TenantID), + Opts: map[string]interface{}{}, + } } return self.rpcParams } diff --git a/console/resources_allocate.go b/console/resources_allocate.go index 236cd1290..d93d8607d 100644 --- a/console/resources_allocate.go +++ b/console/resources_allocate.go @@ -52,7 +52,12 @@ func (self *CmdResourceAllocate) RpcMethod() string { func (self *CmdResourceAllocate) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.ArgRSv1ResourceUsage{CGREventWithOpts: &utils.CGREventWithOpts{Opts: make(map[string]interface{})}} + self.rpcParams = &utils.ArgRSv1ResourceUsage{ + CGREventWithOpts: &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/resources_authorize.go b/console/resources_authorize.go index 0df1c2402..bf6200674 100644 --- a/console/resources_authorize.go +++ b/console/resources_authorize.go @@ -52,7 +52,12 @@ func (self *CmdResourceAuthorize) RpcMethod() string { func (self *CmdResourceAuthorize) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.ArgRSv1ResourceUsage{CGREventWithOpts: &utils.CGREventWithOpts{Opts: make(map[string]interface{})}} + self.rpcParams = &utils.ArgRSv1ResourceUsage{ + CGREventWithOpts: &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/resources_for_event.go b/console/resources_for_event.go index df242af74..c9304dc02 100644 --- a/console/resources_for_event.go +++ b/console/resources_for_event.go @@ -53,7 +53,12 @@ func (self *CmdGetResourceForEvent) RpcMethod() string { func (self *CmdGetResourceForEvent) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.ArgRSv1ResourceUsage{CGREventWithOpts: &utils.CGREventWithOpts{Opts: make(map[string]interface{})}} + self.rpcParams = &utils.ArgRSv1ResourceUsage{ + CGREventWithOpts: &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/resources_profile_rem.go b/console/resources_profile_rem.go index c0d13fee6..1414deb18 100644 --- a/console/resources_profile_rem.go +++ b/console/resources_profile_rem.go @@ -48,7 +48,7 @@ func (self *CmdRemoveResource) RpcMethod() string { func (self *CmdRemoveResource) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.TenantIDWithCache{} + self.rpcParams = &utils.TenantIDWithCache{Opts: make(map[string]interface{})} } return self.rpcParams } diff --git a/console/resources_profile_set.go b/console/resources_profile_set.go index 6b69eb647..9b1157f09 100644 --- a/console/resources_profile_set.go +++ b/console/resources_profile_set.go @@ -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,10 @@ func (self *CmdSetResource) RpcMethod() string { func (self *CmdSetResource) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &v1.ResourceWithCache{} + self.rpcParams = &v1.ResourceWithCache{ + ResourceProfile: new(engine.ResourceProfile), + Opts: make(map[string]interface{}), + } } return self.rpcParams } diff --git a/console/resources_release.go b/console/resources_release.go index 856879832..ffc2e4ca8 100644 --- a/console/resources_release.go +++ b/console/resources_release.go @@ -52,7 +52,12 @@ func (self *CmdResourceRelease) RpcMethod() string { func (self *CmdResourceRelease) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.ArgRSv1ResourceUsage{CGREventWithOpts: &utils.CGREventWithOpts{Opts: make(map[string]interface{})}} + self.rpcParams = &utils.ArgRSv1ResourceUsage{ + CGREventWithOpts: &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/routes.go b/console/routes.go index 8a1439d79..3f116819a 100644 --- a/console/routes.go +++ b/console/routes.go @@ -52,7 +52,12 @@ func (self *CmdRoutesSort) RpcMethod() string { func (self *CmdRoutesSort) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &engine.ArgsGetRoutes{CGREventWithOpts: &utils.CGREventWithOpts{Opts: make(map[string]interface{})}} + self.rpcParams = &engine.ArgsGetRoutes{ + CGREventWithOpts: &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/routes_profile_remove.go b/console/routes_profile_remove.go index 3f7274885..2751646c4 100644 --- a/console/routes_profile_remove.go +++ b/console/routes_profile_remove.go @@ -47,7 +47,7 @@ func (self *CmdRemoveRoute) RpcMethod() string { func (self *CmdRemoveRoute) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.TenantIDWithCache{} + self.rpcParams = &utils.TenantIDWithCache{Opts: make(map[string]interface{})} } return self.rpcParams } diff --git a/console/routes_profile_set.go b/console/routes_profile_set.go index 2d2984ec0..e1d6705ee 100644 --- a/console/routes_profile_set.go +++ b/console/routes_profile_set.go @@ -51,7 +51,10 @@ func (self *CmdSetRoute) RpcMethod() string { func (self *CmdSetRoute) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &v1.RouteWithCache{RouteProfile: new(engine.RouteProfile)} + self.rpcParams = &v1.RouteWithCache{ + RouteProfile: new(engine.RouteProfile), + Opts: map[string]interface{}{}, + } } return self.rpcParams } diff --git a/console/session_authorize_event.go b/console/session_authorize_event.go index 4a82e3031..1c27eaa4d 100644 --- a/console/session_authorize_event.go +++ b/console/session_authorize_event.go @@ -52,7 +52,12 @@ func (self *CmdSessionsAuthorize) RpcMethod() string { func (self *CmdSessionsAuthorize) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &sessions.V1AuthorizeArgs{CGREventWithOpts: &utils.CGREventWithOpts{Opts: make(map[string]interface{})}} + self.rpcParams = &sessions.V1AuthorizeArgs{ + CGREventWithOpts: &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/session_initiate.go b/console/session_initiate.go index c4924b9ee..a80a6b8c3 100644 --- a/console/session_initiate.go +++ b/console/session_initiate.go @@ -52,7 +52,12 @@ func (self *CmdSessionsInitiate) RpcMethod() string { func (self *CmdSessionsInitiate) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &sessions.V1InitSessionArgs{CGREventWithOpts: &utils.CGREventWithOpts{Opts: make(map[string]interface{})}} + self.rpcParams = &sessions.V1InitSessionArgs{ + CGREventWithOpts: &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/session_process_message.go b/console/session_process_message.go index a7d6ab161..f290e4c6c 100644 --- a/console/session_process_message.go +++ b/console/session_process_message.go @@ -52,7 +52,12 @@ func (self *CmdSessionsProcessEvent) RpcMethod() string { func (self *CmdSessionsProcessEvent) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &sessions.V1ProcessMessageArgs{CGREventWithOpts: &utils.CGREventWithOpts{Opts: make(map[string]interface{})}} + self.rpcParams = &sessions.V1ProcessMessageArgs{ + CGREventWithOpts: &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/session_terminate.go b/console/session_terminate.go index 5a4f80cc0..6c5b7af5f 100644 --- a/console/session_terminate.go +++ b/console/session_terminate.go @@ -52,7 +52,12 @@ func (self *CmdSessionsTerminate) RpcMethod() string { func (self *CmdSessionsTerminate) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &sessions.V1TerminateSessionArgs{CGREventWithOpts: &utils.CGREventWithOpts{Opts: make(map[string]interface{})}} + self.rpcParams = &sessions.V1TerminateSessionArgs{ + CGREventWithOpts: &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/session_update.go b/console/session_update.go index fc08bdaf6..8f3985565 100644 --- a/console/session_update.go +++ b/console/session_update.go @@ -52,7 +52,12 @@ func (self *CmdSessionsUpdate) RpcMethod() string { func (self *CmdSessionsUpdate) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &sessions.V1UpdateSessionArgs{CGREventWithOpts: &utils.CGREventWithOpts{Opts: make(map[string]interface{})}} + self.rpcParams = &sessions.V1UpdateSessionArgs{ + CGREventWithOpts: &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/stats_for_event.go b/console/stats_for_event.go index cdd302723..7a3194714 100644 --- a/console/stats_for_event.go +++ b/console/stats_for_event.go @@ -53,7 +53,12 @@ func (self *CmdStatsQueueForEvent) RpcMethod() string { func (self *CmdStatsQueueForEvent) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &engine.StatsArgsProcessEvent{CGREventWithOpts: &utils.CGREventWithOpts{Opts: make(map[string]interface{})}} + self.rpcParams = &engine.StatsArgsProcessEvent{ + CGREventWithOpts: &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/stats_process_event.go b/console/stats_process_event.go index d777149ab..c1f4c01d3 100644 --- a/console/stats_process_event.go +++ b/console/stats_process_event.go @@ -53,7 +53,12 @@ func (self *CmdStatQueueProcessEvent) RpcMethod() string { func (self *CmdStatQueueProcessEvent) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &engine.StatsArgsProcessEvent{CGREventWithOpts: &utils.CGREventWithOpts{Opts: make(map[string]interface{})}} + self.rpcParams = &engine.StatsArgsProcessEvent{ + CGREventWithOpts: &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/stats_profile_rem.go b/console/stats_profile_rem.go index 7f8ad82cc..466f2d430 100644 --- a/console/stats_profile_rem.go +++ b/console/stats_profile_rem.go @@ -48,7 +48,7 @@ func (self *CmdRemoveStatQueue) RpcMethod() string { func (self *CmdRemoveStatQueue) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.TenantIDWithCache{} + self.rpcParams = &utils.TenantIDWithCache{Opts: make(map[string]interface{})} } return self.rpcParams } diff --git a/console/stats_profile_set.go b/console/stats_profile_set.go index 59956f909..510f29821 100644 --- a/console/stats_profile_set.go +++ b/console/stats_profile_set.go @@ -51,7 +51,10 @@ func (self *CmdSetStatQueue) RpcMethod() string { func (self *CmdSetStatQueue) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &engine.StatQueueWithCache{StatQueueProfile: new(engine.StatQueueProfile)} + self.rpcParams = &engine.StatQueueWithCache{ + StatQueueProfile: new(engine.StatQueueProfile), + Opts: make(map[string]interface{}), + } } return self.rpcParams } diff --git a/console/thresholds_for_event.go b/console/thresholds_for_event.go index 749036d70..77b505f69 100755 --- a/console/thresholds_for_event.go +++ b/console/thresholds_for_event.go @@ -52,7 +52,12 @@ func (self *CmdThresholdsForEvent) RpcMethod() string { func (self *CmdThresholdsForEvent) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &engine.ThresholdsArgsProcessEvent{CGREventWithOpts: &utils.CGREventWithOpts{Opts: make(map[string]interface{})}} + self.rpcParams = &engine.ThresholdsArgsProcessEvent{ + CGREventWithOpts: &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/thresholds_process_event.go b/console/thresholds_process_event.go index 61bbf6fb5..1cb8d7571 100644 --- a/console/thresholds_process_event.go +++ b/console/thresholds_process_event.go @@ -52,7 +52,12 @@ func (self *CmdThresholdProcessEvent) RpcMethod() string { func (self *CmdThresholdProcessEvent) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &engine.ThresholdsArgsProcessEvent{CGREventWithOpts: &utils.CGREventWithOpts{Opts: make(map[string]interface{})}} + self.rpcParams = &engine.ThresholdsArgsProcessEvent{ + CGREventWithOpts: &utils.CGREventWithOpts{ + CGREvent: new(utils.CGREvent), + Opts: make(map[string]interface{}), + }, + } } return self.rpcParams } diff --git a/console/thresholds_profile_remove.go b/console/thresholds_profile_remove.go index 842ec5a1b..aa06660e6 100644 --- a/console/thresholds_profile_remove.go +++ b/console/thresholds_profile_remove.go @@ -47,7 +47,7 @@ func (self *CmdRemoveThreshold) RpcMethod() string { func (self *CmdRemoveThreshold) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.TenantIDWithCache{} + self.rpcParams = &utils.TenantIDWithCache{Opts: make(map[string]interface{})} } return self.rpcParams } diff --git a/console/thresholds_profile_set.go b/console/thresholds_profile_set.go index f6c82822b..c751864c7 100644 --- a/console/thresholds_profile_set.go +++ b/console/thresholds_profile_set.go @@ -51,7 +51,10 @@ func (self *CmdSetThreshold) RpcMethod() string { func (self *CmdSetThreshold) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &engine.ThresholdWithCache{ThresholdProfile: new(engine.ThresholdProfile)} + self.rpcParams = &engine.ThresholdWithCache{ + ThresholdProfile: new(engine.ThresholdProfile), + Opts: map[string]interface{}{}, + } } return self.rpcParams }