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

Replace ArgRSv1ResourceUsage struct with CGREvent and fix tests

Browse Source
This commit is contained in:
ionutboangiu
2021-11-09 18:03:30 +02:00
committed by Dan Christian Bogos
parent 89782f8bdb
commit 007cc0e7c8
28 changed files with 1216 additions and 1517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
console/resources_allocate.go
View File

@@ -28,7 +28,7 @@ func init() {
c := &CmdResourceAllocate{
name: "resources_allocate",
rpcMethod: utils.ResourceSv1AllocateResources,
rpcParams: &utils.ArgRSv1ResourceUsage{},
rpcParams: &utils.CGREvent{},
}
commands[c.Name()] = c
c.CommandExecuter = &CommandExecuter{c}
@@ -38,7 +38,7 @@ func init() {
type CmdResourceAllocate struct {
name string
rpcMethod string
rpcParams *utils.ArgRSv1ResourceUsage
rpcParams *utils.CGREvent
*CommandExecuter
}
@@ -52,17 +52,14 @@ func (self *CmdResourceAllocate) RpcMethod() string {
func (self *CmdResourceAllocate) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.ArgRSv1ResourceUsage{
CGREvent: new(utils.CGREvent),
}
self.rpcParams = new(utils.CGREvent)
}
return self.rpcParams
}
func (self *CmdResourceAllocate) PostprocessRpcParams() error {
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.CGREvent.Time == nil {
self.rpcParams.CGREvent.Time = utils.TimePointer(time.Now())
if self.rpcParams != nil && self.rpcParams.Time == nil {
self.rpcParams.Time = utils.TimePointer(time.Now())
}
return nil
}

13
console/resources_authorize.go
View File

@@ -28,7 +28,7 @@ func init() {
c := &CmdResourceAuthorize{
name: "resources_authorize",
rpcMethod: utils.ResourceSv1AuthorizeResources,
rpcParams: &utils.ArgRSv1ResourceUsage{},
rpcParams: &utils.CGREvent{},
}
commands[c.Name()] = c
c.CommandExecuter = &CommandExecuter{c}
@@ -38,7 +38,7 @@ func init() {
type CmdResourceAuthorize struct {
name string
rpcMethod string
rpcParams *utils.ArgRSv1ResourceUsage
rpcParams *utils.CGREvent
*CommandExecuter
}
@@ -52,17 +52,14 @@ func (self *CmdResourceAuthorize) RpcMethod() string {
func (self *CmdResourceAuthorize) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.ArgRSv1ResourceUsage{
CGREvent: new(utils.CGREvent),
}
self.rpcParams = new(utils.CGREvent)
}
return self.rpcParams
}
func (self *CmdResourceAuthorize) PostprocessRpcParams() error {
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.CGREvent.Time == nil {
self.rpcParams.CGREvent.Time = utils.TimePointer(time.Now())
if self.rpcParams != nil && self.rpcParams.Time == nil {
self.rpcParams.Time = utils.TimePointer(time.Now())
}
return nil
}

13
console/resources_for_event.go
View File

@@ -29,7 +29,7 @@ func init() {
c := &CmdGetResourceForEvent{
name: "resources_for_event",
rpcMethod: utils.ResourceSv1GetResourcesForEvent,
rpcParams: &utils.ArgRSv1ResourceUsage{},
rpcParams: &utils.CGREvent{},
}
commands[c.Name()] = c
c.CommandExecuter = &CommandExecuter{c}
@@ -39,7 +39,7 @@ func init() {
type CmdGetResourceForEvent struct {
name string
rpcMethod string
rpcParams *utils.ArgRSv1ResourceUsage
rpcParams *utils.CGREvent
*CommandExecuter
}
@@ -53,17 +53,14 @@ func (self *CmdGetResourceForEvent) RpcMethod() string {
func (self *CmdGetResourceForEvent) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.ArgRSv1ResourceUsage{
CGREvent: new(utils.CGREvent),
}
self.rpcParams = new(utils.CGREvent)
}
return self.rpcParams
}
func (self *CmdGetResourceForEvent) PostprocessRpcParams() error {
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.CGREvent.Time == nil {
self.rpcParams.CGREvent.Time = utils.TimePointer(time.Now())
if self.rpcParams != nil && self.rpcParams.Time == nil {
self.rpcParams.Time = utils.TimePointer(time.Now())
}
return nil
}

13
console/resources_release.go
View File

@@ -28,7 +28,7 @@ func init() {
c := &CmdResourceRelease{
name: "resources_release",
rpcMethod: utils.ResourceSv1ReleaseResources,
rpcParams: &utils.ArgRSv1ResourceUsage{},
rpcParams: &utils.CGREvent{},
}
commands[c.Name()] = c
c.CommandExecuter = &CommandExecuter{c}
@@ -38,7 +38,7 @@ func init() {
type CmdResourceRelease struct {
name string
rpcMethod string
rpcParams *utils.ArgRSv1ResourceUsage
rpcParams *utils.CGREvent
*CommandExecuter
}
@@ -52,17 +52,14 @@ func (self *CmdResourceRelease) RpcMethod() string {
func (self *CmdResourceRelease) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.ArgRSv1ResourceUsage{
CGREvent: new(utils.CGREvent),
}
self.rpcParams = new(utils.CGREvent)
}
return self.rpcParams
}
func (self *CmdResourceRelease) PostprocessRpcParams() error {
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.CGREvent.Time == nil {
self.rpcParams.CGREvent.Time = utils.TimePointer(time.Now())
if self.rpcParams != nil && self.rpcParams.Time == nil {
self.rpcParams.Time = utils.TimePointer(time.Now())
}
return nil
}