From 041646f38af3360386ffa1ac0eab362feb73a25b Mon Sep 17 00:00:00 2001 From: DanB Date: Mon, 6 Apr 2015 12:07:34 +0200 Subject: [PATCH] Adding console PostprocessRpcParams method --- console/account.go | 4 ++++ console/account_add.go | 4 ++++ console/accountactions_set.go | 4 ++++ console/action_execute.go | 4 ++++ console/balance_debit.go | 4 ++++ console/balance_set.go | 4 ++++ console/cache_age.go | 4 ++++ console/cache_reload.go | 4 ++++ console/cache_stats.go | 4 ++++ console/callcost.go | 4 ++++ console/cdrs_export.go | 4 ++++ console/cdrs_rem.go | 4 ++++ console/cdrstats_metrics.go | 4 ++++ console/cdrstats_queueids.go | 4 ++++ console/cdrstats_reload.go | 4 ++++ console/cdrstats_reset.go | 4 ++++ console/command.go | 4 ++++ console/cost.go | 4 ++++ console/datacost.go | 4 ++++ console/destination.go | 4 ++++ console/maxduration.go | 4 ++++ console/parse.go | 4 ++++ console/ratingprofile_set.go | 4 ++++ console/scheduler_reload.go | 4 ++++ console/sharedgroup.go | 4 ++++ console/status.go | 4 ++++ console/triggeredaction_add.go | 4 ++++ 27 files changed, 108 insertions(+) diff --git a/console/account.go b/console/account.go index 2ffee401a..17cf5a9b7 100644 --- a/console/account.go +++ b/console/account.go @@ -56,6 +56,10 @@ func (self *CmdGetAccount) RpcParams() interface{} { return self.rpcParams } +func (self *CmdGetAccount) PostprocessRpcParams() error { + return nil +} + func (self *CmdGetAccount) RpcResult() interface{} { return &engine.Account{} } diff --git a/console/account_add.go b/console/account_add.go index ed19ba54c..783de6732 100644 --- a/console/account_add.go +++ b/console/account_add.go @@ -52,6 +52,10 @@ func (self *CmdAddAccount) RpcParams() interface{} { return self.rpcParams } +func (self *CmdAddAccount) PostprocessRpcParams() error { + return nil +} + func (self *CmdAddAccount) RpcResult() interface{} { var s string return &s diff --git a/console/accountactions_set.go b/console/accountactions_set.go index 2522460b3..38914aadb 100644 --- a/console/accountactions_set.go +++ b/console/accountactions_set.go @@ -52,6 +52,10 @@ func (self *CmdSetAccountActions) RpcParams() interface{} { return self.rpcParams } +func (self *CmdSetAccountActions) PostprocessRpcParams() error { + return nil +} + func (self *CmdSetAccountActions) RpcResult() interface{} { var s string return &s diff --git a/console/action_execute.go b/console/action_execute.go index 14e96fd47..d649e62f6 100644 --- a/console/action_execute.go +++ b/console/action_execute.go @@ -53,6 +53,10 @@ func (self *CmdExecuteAction) RpcParams() interface{} { return self.rpcParams } +func (self *CmdExecuteAction) PostprocessRpcParams() error { + return nil +} + func (self *CmdExecuteAction) RpcResult() interface{} { var s string return &s diff --git a/console/balance_debit.go b/console/balance_debit.go index a8934935a..ce89805f7 100644 --- a/console/balance_debit.go +++ b/console/balance_debit.go @@ -55,6 +55,10 @@ func (self *CmdDebitBalance) RpcParams() interface{} { return self.rpcParams } +func (self *CmdDebitBalance) PostprocessRpcParams() error { + return nil +} + func (self *CmdDebitBalance) RpcResult() interface{} { return &engine.CallCost{} } diff --git a/console/balance_set.go b/console/balance_set.go index 465684b91..ec855929e 100644 --- a/console/balance_set.go +++ b/console/balance_set.go @@ -55,6 +55,10 @@ func (self *CmdAddBalance) RpcParams() interface{} { return self.rpcParams } +func (self *CmdAddBalance) PostprocessRpcParams() error { + return nil +} + func (self *CmdAddBalance) RpcResult() interface{} { var s string return &s diff --git a/console/cache_age.go b/console/cache_age.go index 611c88d21..ba6f52a79 100644 --- a/console/cache_age.go +++ b/console/cache_age.go @@ -52,6 +52,10 @@ func (self *CmdGetCacheAge) RpcParams() interface{} { return self.rpcParams } +func (self *CmdGetCacheAge) PostprocessRpcParams() error { + return nil +} + func (self *CmdGetCacheAge) RpcResult() interface{} { return &utils.CachedItemAge{} } diff --git a/console/cache_reload.go b/console/cache_reload.go index 35709caad..6c370d4e9 100644 --- a/console/cache_reload.go +++ b/console/cache_reload.go @@ -53,6 +53,10 @@ func (self *CmdReloadCache) RpcParams() interface{} { return self.rpcParams } +func (self *CmdReloadCache) PostprocessRpcParams() error { + return nil +} + func (self *CmdReloadCache) RpcResult() interface{} { var s string return &s diff --git a/console/cache_stats.go b/console/cache_stats.go index e810b9870..a2f184760 100644 --- a/console/cache_stats.go +++ b/console/cache_stats.go @@ -52,6 +52,10 @@ func (self *CmdGetCacheStats) RpcParams() interface{} { return self.rpcParams } +func (self *CmdGetCacheStats) PostprocessRpcParams() error { + return nil +} + func (self *CmdGetCacheStats) RpcResult() interface{} { return &utils.CacheStats{} } diff --git a/console/callcost.go b/console/callcost.go index 9a779919e..237a9d6b2 100644 --- a/console/callcost.go +++ b/console/callcost.go @@ -57,6 +57,10 @@ func (self *CmdGetCostDetails) RpcParams() interface{} { return self.rpcParams } +func (self *CmdGetCostDetails) PostprocessRpcParams() error { + return nil +} + func (self *CmdGetCostDetails) RpcResult() interface{} { return &engine.CallCost{} } diff --git a/console/cdrs_export.go b/console/cdrs_export.go index 35a82539a..16d309b67 100644 --- a/console/cdrs_export.go +++ b/console/cdrs_export.go @@ -52,6 +52,10 @@ func (self *CmdExportCdrs) RpcParams() interface{} { return self.rpcParams } +func (self *CmdExportCdrs) PostprocessRpcParams() error { + return nil +} + func (self *CmdExportCdrs) RpcResult() interface{} { return &utils.ExportedFileCdrs{} } diff --git a/console/cdrs_rem.go b/console/cdrs_rem.go index d5c661ff5..313d689cc 100644 --- a/console/cdrs_rem.go +++ b/console/cdrs_rem.go @@ -52,6 +52,10 @@ func (self *CmdRemCdrs) RpcParams() interface{} { return self.rpcParams } +func (self *CmdRemCdrs) PostprocessRpcParams() error { + return nil +} + func (self *CmdRemCdrs) RpcResult() interface{} { var s string return &s diff --git a/console/cdrstats_metrics.go b/console/cdrstats_metrics.go index b33bdc561..d9975e630 100644 --- a/console/cdrstats_metrics.go +++ b/console/cdrstats_metrics.go @@ -52,6 +52,10 @@ func (self *CmdCdrStatsMetrics) RpcParams() interface{} { return self.rpcParams } +func (self *CmdCdrStatsMetrics) PostprocessRpcParams() error { + return nil +} + func (self *CmdCdrStatsMetrics) RpcResult() interface{} { return &map[string]float64{} } diff --git a/console/cdrstats_queueids.go b/console/cdrstats_queueids.go index 4c26f681c..b267892e5 100644 --- a/console/cdrstats_queueids.go +++ b/console/cdrstats_queueids.go @@ -49,6 +49,10 @@ func (self *CmdCdrStatsQueueIds) RpcParams() interface{} { return self.rpcParams } +func (self *CmdCdrStatsQueueIds) PostprocessRpcParams() error { + return nil +} + func (self *CmdCdrStatsQueueIds) RpcResult() interface{} { var s []string return &s diff --git a/console/cdrstats_reload.go b/console/cdrstats_reload.go index 581ce4c6d..b3f3c2cad 100644 --- a/console/cdrstats_reload.go +++ b/console/cdrstats_reload.go @@ -54,6 +54,10 @@ func (self *CmdCdrReloadQueues) RpcParams() interface{} { return self.rpcParams } +func (self *CmdCdrReloadQueues) PostprocessRpcParams() error { + return nil +} + func (self *CmdCdrReloadQueues) RpcResult() interface{} { var s string return &s diff --git a/console/cdrstats_reset.go b/console/cdrstats_reset.go index 2538fd85e..8b076f797 100644 --- a/console/cdrstats_reset.go +++ b/console/cdrstats_reset.go @@ -52,6 +52,10 @@ func (self *CmdCdrResetQueues) RpcParams() interface{} { return self.rpcParams } +func (self *CmdCdrResetQueues) PostprocessRpcParams() error { + return nil +} + func (self *CmdCdrResetQueues) RpcResult() interface{} { var s string return &s diff --git a/console/command.go b/console/command.go index 2f22c59ed..dcad504e3 100644 --- a/console/command.go +++ b/console/command.go @@ -34,6 +34,7 @@ type Commander interface { Usage() string // usage message RpcMethod() string // Method which should be called remotely RpcParams() interface{} // Parameters to send out on rpc + PostprocessRpcParams() error // Corrects rpc parameters when needed RpcResult() interface{} // Only requirement is to have a String method to print on console ClientArgs() []string // for autocompletion Name() string @@ -74,6 +75,9 @@ func GetCommandValue(command string, verbose bool) (Commander, error) { if err := cmdVal.FromArgs(cmdArgs, verbose); err != nil { return nil, err } + if err := cmdVal.PostprocessRpcParams(); err != nil { + return nil, err + } return cmdVal, nil } diff --git a/console/cost.go b/console/cost.go index 5293908e5..9130d760a 100644 --- a/console/cost.go +++ b/console/cost.go @@ -54,6 +54,10 @@ func (self *CmdGetCost) RpcParams() interface{} { return self.rpcParams } +func (self *CmdGetCost) PostprocessRpcParams() error { + return nil +} + func (self *CmdGetCost) RpcResult() interface{} { return &engine.CallCost{} } diff --git a/console/datacost.go b/console/datacost.go index c7717f9df..89b83e678 100644 --- a/console/datacost.go +++ b/console/datacost.go @@ -58,6 +58,10 @@ func (self *CmdGetDataCost) RpcParams() interface{} { return self.rpcParams } +func (self *CmdGetDataCost) PostprocessRpcParams() error { + return nil +} + func (self *CmdGetDataCost) RpcResult() interface{} { return &engine.DataCost{} } diff --git a/console/destination.go b/console/destination.go index 6d47379a9..333e3f5a9 100644 --- a/console/destination.go +++ b/console/destination.go @@ -52,6 +52,10 @@ func (self *CmdGetDestination) RpcParams() interface{} { return self.rpcParams } +func (self *CmdGetDestination) PostprocessRpcParams() error { + return nil +} + func (self *CmdGetDestination) RpcResult() interface{} { return &engine.Destination{} } diff --git a/console/maxduration.go b/console/maxduration.go index 3d31ca2ad..47bade62b 100644 --- a/console/maxduration.go +++ b/console/maxduration.go @@ -54,6 +54,10 @@ func (self *CmdGetMaxDuration) RpcParams() interface{} { return self.rpcParams } +func (self *CmdGetMaxDuration) PostprocessRpcParams() error { + return nil +} + func (self *CmdGetMaxDuration) RpcResult() interface{} { var f float64 return &f diff --git a/console/parse.go b/console/parse.go index 60df2c9e3..cc2aba797 100644 --- a/console/parse.go +++ b/console/parse.go @@ -60,6 +60,10 @@ func (self *CmdParse) RpcResult() interface{} { return nil } +func (self *CmdParse) PostprocessRpcParams() error { + return nil +} + func (self *CmdParse) LocalExecute() string { if self.rpcParams.Expression == "" { return "Empty expression error" diff --git a/console/ratingprofile_set.go b/console/ratingprofile_set.go index 3d13b9c4b..016deab0c 100644 --- a/console/ratingprofile_set.go +++ b/console/ratingprofile_set.go @@ -53,6 +53,10 @@ func (self *CmdSetRatingProfile) RpcParams() interface{} { return self.rpcParams } +func (self *CmdSetRatingProfile) PostprocessRpcParams() error { + return nil +} + func (self *CmdSetRatingProfile) RpcResult() interface{} { var s string return &s diff --git a/console/scheduler_reload.go b/console/scheduler_reload.go index 464b60d86..c75ba14d8 100644 --- a/console/scheduler_reload.go +++ b/console/scheduler_reload.go @@ -50,6 +50,10 @@ func (self *CmdReloadScheduler) RpcParams() interface{} { return self.rpcParams } +func (self *CmdReloadScheduler) PostprocessRpcParams() error { + return nil +} + func (self *CmdReloadScheduler) RpcResult() interface{} { var s string return &s diff --git a/console/sharedgroup.go b/console/sharedgroup.go index 9b5d625bc..be19e2816 100644 --- a/console/sharedgroup.go +++ b/console/sharedgroup.go @@ -52,6 +52,10 @@ func (self *CmdGetSharedGroup) RpcParams() interface{} { return self.rpcParams } +func (self *CmdGetSharedGroup) PostprocessRpcParams() error { + return nil +} + func (self *CmdGetSharedGroup) RpcResult() interface{} { return &engine.SharedGroup{} } diff --git a/console/status.go b/console/status.go index 525dcdf0b..8c00d1302 100644 --- a/console/status.go +++ b/console/status.go @@ -49,6 +49,10 @@ func (self *CmdStatus) RpcParams() interface{} { return self.rpcParams } +func (self *CmdStatus) PostprocessRpcParams() error { + return nil +} + func (self *CmdStatus) RpcResult() interface{} { var s map[string]interface{} return &s diff --git a/console/triggeredaction_add.go b/console/triggeredaction_add.go index 4c5d52f0b..6699c5238 100644 --- a/console/triggeredaction_add.go +++ b/console/triggeredaction_add.go @@ -52,6 +52,10 @@ func (self *CmdAddTriggeredAction) RpcParams() interface{} { return self.rpcParams } +func (self *CmdAddTriggeredAction) PostprocessRpcParams() error { + return nil +} + func (self *CmdAddTriggeredAction) RpcResult() interface{} { var s string return &s