diff --git a/apier/v1/api_interfaces.go b/apier/v1/api_interfaces.go index a10faf7d1..a1a34c22e 100644 --- a/apier/v1/api_interfaces.go +++ b/apier/v1/api_interfaces.go @@ -47,10 +47,10 @@ type StatSv1Interface interface { } type ResourceSv1Interface interface { - GetResourcesForEvent(args *utils.ArgRSv1ResourceUsage, reply *engine.Resources) error - AuthorizeResources(args *utils.ArgRSv1ResourceUsage, reply *string) error - AllocateResources(args *utils.ArgRSv1ResourceUsage, reply *string) error - ReleaseResources(args *utils.ArgRSv1ResourceUsage, reply *string) error + GetResourcesForEvent(args *utils.CGREvent, reply *engine.Resources) error + AuthorizeResources(args *utils.CGREvent, reply *string) error + AllocateResources(args *utils.CGREvent, reply *string) error + ReleaseResources(args *utils.CGREvent, reply *string) error GetResource(args *utils.TenantIDWithAPIOpts, reply *engine.Resource) error GetResourceWithConfig(args *utils.TenantIDWithAPIOpts, reply *engine.ResourceWithConfig) error Ping(ign *utils.CGREvent, reply *string) error diff --git a/apier/v1/dispatcher.go b/apier/v1/dispatcher.go index 96a24f10f..04e155f7f 100644 --- a/apier/v1/dispatcher.go +++ b/apier/v1/dispatcher.go @@ -303,9 +303,9 @@ func (dRs *DispatcherResourceSv1) Ping(args *utils.CGREvent, reply *string) erro } // GetResourcesForEvent implements ResourceSv1GetResourcesForEvent -func (dRs *DispatcherResourceSv1) GetResourcesForEvent(args *utils.ArgRSv1ResourceUsage, +func (dRs *DispatcherResourceSv1) GetResourcesForEvent(args *utils.CGREvent, reply *engine.Resources) error { - return dRs.dRs.ResourceSv1GetResourcesForEvent(*args, reply) + return dRs.dRs.ResourceSv1GetResourcesForEvent(args, reply) } func (dRs *DispatcherResourceSv1) GetResource(args *utils.TenantIDWithAPIOpts, reply *engine.Resource) error { @@ -316,19 +316,19 @@ func (dRs *DispatcherResourceSv1) GetResourceWithConfig(args *utils.TenantIDWith return dRs.dRs.ResourceSv1GetResourceWithConfig(args, reply) } -func (dRs *DispatcherResourceSv1) AuthorizeResources(args *utils.ArgRSv1ResourceUsage, +func (dRs *DispatcherResourceSv1) AuthorizeResources(args *utils.CGREvent, reply *string) error { - return dRs.dRs.ResourceSv1AuthorizeResources(*args, reply) + return dRs.dRs.ResourceSv1AuthorizeResources(args, reply) } -func (dRs *DispatcherResourceSv1) AllocateResources(args *utils.ArgRSv1ResourceUsage, +func (dRs *DispatcherResourceSv1) AllocateResources(args *utils.CGREvent, reply *string) error { - return dRs.dRs.ResourceSv1AllocateResources(*args, reply) + return dRs.dRs.ResourceSv1AllocateResources(args, reply) } -func (dRs *DispatcherResourceSv1) ReleaseResources(args *utils.ArgRSv1ResourceUsage, +func (dRs *DispatcherResourceSv1) ReleaseResources(args *utils.CGREvent, reply *string) error { - return dRs.dRs.ResourceSv1ReleaseResources(*args, reply) + return dRs.dRs.ResourceSv1ReleaseResources(args, reply) } func NewDispatcherRouteSv1(dps *dispatchers.DispatcherService) *DispatcherRouteSv1 { diff --git a/apier/v1/filterindexecache_it_test.go b/apier/v1/filterindexecache_it_test.go index b73e4609b..ce4515d2a 100644 --- a/apier/v1/filterindexecache_it_test.go +++ b/apier/v1/filterindexecache_it_test.go @@ -1228,37 +1228,35 @@ func testV1FIdxCaRemoveAttributeProfile(t *testing.T) { // ResourceProfile func testV1FIdxCaGetResourceProfileWithNotFound(t *testing.T) { var reply string - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - utils.AccountField: "1002", - utils.Subject: "1001", - utils.Destination: "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", - utils.OptsResourcesUnits: 6, - }, + cgrEv := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + utils.AccountField: "1002", + utils.Subject: "1001", + utils.Destination: "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", + utils.OptsResourcesUnits: 6, }, } if err := tFIdxCaRpc.Call(utils.ResourceSv1AllocateResources, - argsRU, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { + cgrEv, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { t.Error(err) } if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, - &argsRU, &reply); err.Error() != utils.ErrNotFound.Error() { + &cgrEv, &reply); err.Error() != utils.ErrNotFound.Error() { t.Error(err) } - argsRU.Tenant = utils.EmptyString + cgrEv.Tenant = utils.EmptyString if err := tFIdxCaRpc.Call(utils.ResourceSv1AllocateResources, - argsRU, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { + cgrEv, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { t.Error(err) } if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, - &argsRU, &reply); err.Error() != utils.ErrNotFound.Error() { + &cgrEv, &reply); err.Error() != utils.ErrNotFound.Error() { t.Error(err) } @@ -1318,30 +1316,28 @@ func testV1FIdxCaSetResourceProfile(t *testing.T) { } else if result != utils.OK { t.Error("Unexpected reply returned", result) } - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - utils.AccountField: "1001", - utils.Subject: "1002", - utils.Destination: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", - utils.OptsResourcesUnits: 6, - }, + cgrEv := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + utils.AccountField: "1001", + utils.Subject: "1002", + utils.Destination: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", + utils.OptsResourcesUnits: 6, }, } if err := tFIdxCaRpc.Call(utils.ResourceSv1AllocateResources, - argsRU, &result); err != nil { + cgrEv, &result); err != nil { t.Error(err) } else if result != "Approved" { t.Error("Unexpected reply returned", result) } if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, - &argsRU, &result); err != nil { + &cgrEv, &result); err != nil { t.Error(err) } else if result != "Approved" { t.Error("Unexpected reply returned", result) @@ -1350,51 +1346,47 @@ func testV1FIdxCaSetResourceProfile(t *testing.T) { func testV1FIdxCaGetResourceProfileFromTP(t *testing.T) { var reply string - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - utils.AccountField: "1001", - utils.Subject: "1002", - utils.Destination: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e63", - utils.OptsResourcesUnits: 6, - }, + cgrEv := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + utils.AccountField: "1001", + utils.Subject: "1002", + utils.Destination: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e63", + utils.OptsResourcesUnits: 6, }, } if err := tFIdxCaRpc.Call(utils.ResourceSv1AllocateResources, - argsRU, &reply); err != nil { + cgrEv, &reply); err != nil { t.Error(err) } else if reply != "Approved" { t.Error("Unexpected reply returned", reply) } if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, - &argsRU, &reply); err != nil { + &cgrEv, &reply); err != nil { t.Error(err) } else if reply != "Approved" { t.Error("Unexpected reply returned", reply) } - argsReU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - utils.AccountField: "1002", - utils.Subject: "1001", - utils.Destination: "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", - utils.OptsResourcesUnits: 6, - }, + ev := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + utils.AccountField: "1002", + utils.Subject: "1001", + utils.Destination: "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", + utils.OptsResourcesUnits: 6, }, } if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, - &argsReU, &reply); err != nil { + &ev, &reply); err != nil { t.Error(err) } else if reply != "ResGroup1" { t.Error("Unexpected reply returned", reply) @@ -1457,23 +1449,21 @@ func testV1FIdxCaUpdateResourceProfile(t *testing.T) { } else if result != utils.OK { t.Error("Unexpected reply returned", result) } - argsReU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - utils.AccountField: "2002", - utils.Subject: "2001", - utils.Destination: "2002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", - utils.OptsResourcesUnits: 6, - }, + cgrEv := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + utils.AccountField: "2002", + utils.Subject: "2001", + utils.Destination: "2002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", + utils.OptsResourcesUnits: 6, }, } if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, - &argsReU, &result); err != nil { + &cgrEv, &result); err != nil { t.Error(err) } else if result != "MessageAllocation" { t.Error("Unexpected reply returned", result) @@ -1526,22 +1516,20 @@ func testV1FIdxCaUpdateResourceProfileFromTP(t *testing.T) { } else if result != utils.OK { t.Error("Unexpected reply returned", result) } - argsReU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - utils.AccountField: "1002", - utils.Subject: "1001", - utils.Destination: "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e65", - utils.OptsResourcesUnits: 6, - }, + ev := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + utils.AccountField: "1002", + utils.Subject: "1001", + utils.Destination: "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e65", + utils.OptsResourcesUnits: 6, }, } - if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, &argsReU, &result); err != nil { + if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, &ev, &result); err != nil { t.Error(err) } else if result != "ResGroup1" { t.Error("Unexpected reply returned", result) @@ -1550,47 +1538,43 @@ func testV1FIdxCaUpdateResourceProfileFromTP(t *testing.T) { func testV1FIdxCaRemoveResourceProfile(t *testing.T) { var resp string - argsReU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - utils.AccountField: "2002", - utils.Subject: "2001", - utils.Destination: "2002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "653a8db2-4f67-4cf8-b622-169e8a482e61", - utils.OptsResourcesUnits: 6, - }, + ev := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + utils.AccountField: "2002", + utils.Subject: "2001", + utils.Destination: "2002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "653a8db2-4f67-4cf8-b622-169e8a482e61", + utils.OptsResourcesUnits: 6, }, } - if err := tFIdxCaRpc.Call(utils.ResourceSv1AllocateResources, argsReU, &resp); err != nil { + if err := tFIdxCaRpc.Call(utils.ResourceSv1AllocateResources, ev, &resp); err != nil { t.Error(err) } else if resp != "MessageAllocation" { t.Error("Unexpected reply returned", resp) } - if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, &argsReU, &resp); err != nil { + if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, &ev, &resp); err != nil { t.Error(err) } else if resp != "MessageAllocation" { t.Error("Unexpected reply returned", resp) } - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - utils.AccountField: "1002", - utils.Subject: "1001", - utils.Destination: "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "654a8db2-4f67-4cf8-b622-169e8a482e61", - utils.OptsResourcesUnits: 6, - }, + ev2 := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + utils.AccountField: "1002", + utils.Subject: "1001", + utils.Destination: "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "654a8db2-4f67-4cf8-b622-169e8a482e61", + utils.OptsResourcesUnits: 6, }, } - if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, &argsRU, &resp); err != nil { + if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, &ev2, &resp); err != nil { t.Error(err) } else if resp != "ResGroup1" { t.Error("Unexpected reply returned", resp) diff --git a/apier/v1/resourcesv1.go b/apier/v1/resourcesv1.go index 3a47e5963..f33487227 100644 --- a/apier/v1/resourcesv1.go +++ b/apier/v1/resourcesv1.go @@ -40,23 +40,23 @@ func (rsv1 *ResourceSv1) Call(serviceMethod string, args interface{}, reply inte } // GetResourcesForEvent returns Resources matching a specific event -func (rsv1 *ResourceSv1) GetResourcesForEvent(args *utils.ArgRSv1ResourceUsage, reply *engine.Resources) error { - return rsv1.rls.V1ResourcesForEvent(*args, reply) +func (rsv1 *ResourceSv1) GetResourcesForEvent(args *utils.CGREvent, reply *engine.Resources) error { + return rsv1.rls.V1ResourcesForEvent(args, reply) } // AuthorizeResources checks if there are limits imposed for event -func (rsv1 *ResourceSv1) AuthorizeResources(args *utils.ArgRSv1ResourceUsage, reply *string) error { - return rsv1.rls.V1AuthorizeResources(*args, reply) +func (rsv1 *ResourceSv1) AuthorizeResources(args *utils.CGREvent, reply *string) error { + return rsv1.rls.V1AuthorizeResources(args, reply) } // V1InitiateResourceUsage records usage for an event -func (rsv1 *ResourceSv1) AllocateResources(args *utils.ArgRSv1ResourceUsage, reply *string) error { - return rsv1.rls.V1AllocateResources(*args, reply) +func (rsv1 *ResourceSv1) AllocateResources(args *utils.CGREvent, reply *string) error { + return rsv1.rls.V1AllocateResources(args, reply) } // V1TerminateResourceUsage releases usage for an event -func (rsv1 *ResourceSv1) ReleaseResources(args *utils.ArgRSv1ResourceUsage, reply *string) error { - return rsv1.rls.V1ReleaseResources(*args, reply) +func (rsv1 *ResourceSv1) ReleaseResources(args *utils.CGREvent, reply *string) error { + return rsv1.rls.V1ReleaseResources(args, reply) } // GetResource returns a resource configuration diff --git a/apier/v1/resourcesv1_it_test.go b/apier/v1/resourcesv1_it_test.go index 616300db9..478d704f7 100644 --- a/apier/v1/resourcesv1_it_test.go +++ b/apier/v1/resourcesv1_it_test.go @@ -207,21 +207,19 @@ func testV1RsFromFolder(t *testing.T) { func testV1RsGetResourcesForEvent(t *testing.T) { var reply *engine.Resources - args := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "Event1", - Event: map[string]interface{}{"Unknown": "unknown"}, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RandomUsageID", - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "Event1", + Event: map[string]interface{}{"Unknown": "unknown"}, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RandomUsageID", }, } if err := rlsV1Rpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { t.Error(err) } - args.CGREvent.Event = map[string]interface{}{"Destination": "10", "Account": "1001"} - args.CGREvent.ID = utils.UUIDSha1Prefix() + args.Event = map[string]interface{}{"Destination": "10", "Account": "1001"} + args.ID = utils.UUIDSha1Prefix() args.APIOpts[utils.OptsResourcesUsageID] = "RandomUsageID2" if err := rlsV1Rpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &reply); err != nil { t.Error(err) @@ -240,15 +238,15 @@ func testV1RsGetResourcesForEvent(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", "ResGroup2", (*reply)[0].ID) } - args.CGREvent.Event = map[string]interface{}{"Destination": "20"} - args.CGREvent.ID = utils.UUIDSha1Prefix() + args.Event = map[string]interface{}{"Destination": "20"} + args.ID = utils.UUIDSha1Prefix() args.APIOpts[utils.OptsResourcesUsageID] = "RandomUsageID3" if err := rlsV1Rpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { t.Error(err) } - args.CGREvent.Event = map[string]interface{}{"Account": "1002", "Subject": "test", "Destination": "1002"} - args.CGREvent.ID = utils.UUIDSha1Prefix() + args.Event = map[string]interface{}{"Account": "1002", "Subject": "test", "Destination": "1002"} + args.ID = utils.UUIDSha1Prefix() args.APIOpts[utils.OptsResourcesUsageID] = "RandomUsageID5" if err := rlsV1Rpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &reply); err != nil { t.Error(err) @@ -257,8 +255,8 @@ func testV1RsGetResourcesForEvent(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", 2, len(*reply)) } - args.CGREvent.Event = map[string]interface{}{"Account": "1002", "Subject": "test", "Destination": "1001"} - args.CGREvent.ID = utils.UUIDSha1Prefix() + args.Event = map[string]interface{}{"Account": "1002", "Subject": "test", "Destination": "1001"} + args.ID = utils.UUIDSha1Prefix() if err := rlsV1Rpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &reply); err != nil { t.Error(err) } @@ -269,8 +267,8 @@ func testV1RsGetResourcesForEvent(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", "ResGroup2", (*reply)[0].ID) } - args.CGREvent.Tenant = utils.EmptyString - args.CGREvent.ID = utils.UUIDSha1Prefix() + args.Tenant = utils.EmptyString + args.ID = utils.UUIDSha1Prefix() if err := rlsV1Rpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &reply); err != nil { t.Error(err) } @@ -284,75 +282,67 @@ func testV1RsGetResourcesForEvent(t *testing.T) { func testV1RsTTL0(t *testing.T) { // only matching Resource3 - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "3001", - "Destination": "3002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e21", - utils.OptsResourcesUnits: 1, - }, + ev := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "3001", + "Destination": "3002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e21", + utils.OptsResourcesUnits: 1, }, } var reply string if err := rlsV1Rpc.Call(utils.ResourceSv1AllocateResources, - argsRU, &reply); err != nil { + ev, &reply); err != nil { t.Error(err) } // overwrite the first allocation - argsRU = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "3001", - "Destination": "3002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e21", - utils.OptsResourcesUnits: 2, - }, + ev = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "3001", + "Destination": "3002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e21", + utils.OptsResourcesUnits: 2, }, } - if err := rlsV1Rpc.Call(utils.ResourceSv1AllocateResources, argsRU, &reply); err != nil { + if err := rlsV1Rpc.Call(utils.ResourceSv1AllocateResources, ev, &reply); err != nil { t.Error(err) } // too many units should be rejected - argsRU = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "3001", - "Destination": "3002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e22", - utils.OptsResourcesUnits: 4, - }, + ev = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "3001", + "Destination": "3002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e22", + utils.OptsResourcesUnits: 4, }, } - if err := rlsV1Rpc.Call(utils.ResourceSv1AllocateResources, argsRU, &reply); err == nil || + if err := rlsV1Rpc.Call(utils.ResourceSv1AllocateResources, ev, &reply); err == nil || err.Error() != utils.ErrResourceUnavailable.Error() { t.Error(err) } // check the record var rs *engine.Resources - args := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "3001", - "Destination": "3002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e21", - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "3001", + "Destination": "3002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e21", }, } expiryTime, err := utils.ParseTimeDetectLayout("0001-01-01T00:00:00Z", "") @@ -388,27 +378,25 @@ func testV1RsTTL0(t *testing.T) { } // release should not give out errors var releaseReply string - argsRU = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "3001", - "Destination": "3002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e25", // same ID should be accepted by first group since the previous resource should be expired - }, + ev = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "3001", + "Destination": "3002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e25", // same ID should be accepted by first group since the previous resource should be expired }, } if err := rlsV1Rpc.Call(utils.ResourceSv1ReleaseResources, - argsRU, &releaseReply); err != nil { + ev, &releaseReply); err != nil { t.Error(err) } - argsRU.Tenant = utils.EmptyString + ev.Tenant = utils.EmptyString if err := rlsV1Rpc.Call(utils.ResourceSv1ReleaseResources, - argsRU, &releaseReply); err != nil { + ev, &releaseReply); err != nil { t.Error(err) } } @@ -416,23 +404,21 @@ func testV1RsTTL0(t *testing.T) { func testV1RsAllocateResource(t *testing.T) { // first event matching Resource1 var reply string - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", - utils.OptsResourcesUnits: 3, - }, + ev := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", + utils.OptsResourcesUnits: 3, }, } if err := rlsV1Rpc.Call(utils.ResourceSv1AllocateResources, - argsRU, &reply); err != nil { + ev, &reply); err != nil { t.Error(err) } eAllocationMsg := "ResGroup1" @@ -440,23 +426,21 @@ func testV1RsAllocateResource(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", eAllocationMsg, reply) } // Second event to test matching of exact limit of first resource - argsRU = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e52", - utils.OptsResourcesUnits: 4, - }, + ev = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e52", + utils.OptsResourcesUnits: 4, }, } if err := rlsV1Rpc.Call(utils.ResourceSv1AllocateResources, - argsRU, &reply); err != nil { + ev, &reply); err != nil { t.Error(err) } eAllocationMsg = "ResGroup1" @@ -464,23 +448,21 @@ func testV1RsAllocateResource(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", eAllocationMsg, reply) } // Third event testing overflow to second resource which still has one resource available - argsRU = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "dan", - "Subject": "dan", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e53", - utils.OptsResourcesUnits: 1, - }, + ev = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "dan", + "Subject": "dan", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e53", + utils.OptsResourcesUnits: 1, }, } if err := rlsV1Rpc.Call(utils.ResourceSv1AllocateResources, - argsRU, &reply); err != nil { + ev, &reply); err != nil { t.Error(err) } eAllocationMsg = "SPECIAL_1002" @@ -488,45 +470,41 @@ func testV1RsAllocateResource(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", eAllocationMsg, reply) } // Test resource unavailable - argsRU = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e54", // same ID should be accepted by first group since the previous resource should be expired - utils.OptsResourcesUnits: 1, - }, + ev = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e54", // same ID should be accepted by first group since the previous resource should be expired + utils.OptsResourcesUnits: 1, }, } if err := rlsV1Rpc.Call(utils.ResourceSv1AllocateResources, - argsRU, &reply); err == nil || err.Error() != utils.ErrResourceUnavailable.Error() { + ev, &reply); err == nil || err.Error() != utils.ErrResourceUnavailable.Error() { t.Error(err) } eAllocationMsg = "ResGroup1" time.Sleep(time.Second) // Give time for allocations on first resource to expire - argsRU = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e55", // same ID should be accepted by first group since the previous resource should be expired - utils.OptsResourcesUnits: 1, - }, + ev = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e55", // same ID should be accepted by first group since the previous resource should be expired + utils.OptsResourcesUnits: 1, }, } if err := rlsV1Rpc.Call(utils.ResourceSv1AllocateResources, - argsRU, &reply); err != nil { + ev, &reply); err != nil { t.Error(err) } eAllocationMsg = "ResGroup1" @@ -537,19 +515,17 @@ func testV1RsAllocateResource(t *testing.T) { func testV1RsAuthorizeResources(t *testing.T) { var reply string - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUnits: 6, - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", - }, + argsRU := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUnits: 6, + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", }, } if err := rlsV1Rpc.Call(utils.ResourceSv1AuthorizeResources, &argsRU, &reply); err != nil { @@ -557,19 +533,17 @@ func testV1RsAuthorizeResources(t *testing.T) { } else if reply != "ResGroup1" { // already 3 usages active before allow call, we should have now more than allowed t.Error("Unexpected reply returned", reply) } - argsRU = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", - utils.OptsResourcesUnits: 7, - }, + argsRU = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", + utils.OptsResourcesUnits: 7, }, } if err := rlsV1Rpc.Call(utils.ResourceSv1AuthorizeResources, @@ -581,18 +555,16 @@ func testV1RsAuthorizeResources(t *testing.T) { func testV1RsReleaseResource(t *testing.T) { // release the only resource active for Resource1 var reply string - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e55", // same ID should be accepted by first group since the previous resource should be expired - }, + argsRU := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e55", // same ID should be accepted by first group since the previous resource should be expired }, } if err := rlsV1Rpc.Call(utils.ResourceSv1ReleaseResources, @@ -601,19 +573,17 @@ func testV1RsReleaseResource(t *testing.T) { } // try reserving with full units for Resource1, case which did not work in previous test // only match Resource1 since we don't want for storing of the resource2 bellow - argsRU = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", - utils.OptsResourcesUnits: 7, - }, + argsRU = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", + utils.OptsResourcesUnits: 7, }, } if err := rlsV1Rpc.Call(utils.ResourceSv1AuthorizeResources, &argsRU, &reply); err != nil { @@ -622,18 +592,16 @@ func testV1RsReleaseResource(t *testing.T) { t.Error("Unexpected reply returned", reply) } var rs *engine.Resources - args := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "Event5", - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: utils.UUIDSha1Prefix(), - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "Event5", + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: utils.UUIDSha1Prefix(), }, } if err := rlsV1Rpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &rs); err != nil { @@ -652,18 +620,16 @@ func testV1RsReleaseResource(t *testing.T) { } } // release an empty resource should return error - argsRU = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e55", // same ID should be accepted by first group since the previous resource should be expired - }, + argsRU = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e55", // same ID should be accepted by first group since the previous resource should be expired }, } if err := rlsV1Rpc.Call(utils.ResourceSv1ReleaseResources, @@ -676,19 +642,17 @@ func testV1RsDBStore(t *testing.T) { if rlsV1ConfDIR == "tutinternal" { t.SkipNow() } - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e71", - utils.OptsResourcesUnits: 1, - }, + argsRU := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e71", + utils.OptsResourcesUnits: 1, }, } var reply string @@ -699,18 +663,16 @@ func testV1RsDBStore(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", eAllocationMsg, reply) } var rs *engine.Resources - args := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "Event3", - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e71", - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "Event3", + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e71", }, } if err := rlsV1Rpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &rs); err != nil { @@ -743,18 +705,16 @@ func testV1RsDBStore(t *testing.T) { t.Fatal("Could not connect to rater: ", err.Error()) } rs = new(engine.Resources) - args = &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "Event4", - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e71", - }, + args = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "Event4", + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e71", }, } if err := rlsV1Rpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &rs); err != nil { @@ -925,18 +885,16 @@ func testV1RsMatchNotFound(t *testing.T) { t.Error("Unexpected reply returned", result) } - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "CustomTest", - "Custom": "", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "test", - utils.OptsResourcesUnits: 1, - }, + argsRU := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "CustomTest", + "Custom": "", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "test", + utils.OptsResourcesUnits: 1, }, } var reply string @@ -971,21 +929,19 @@ func testV1RsAllocateUnlimited(t *testing.T) { t.Error("Unexpected reply returned", result) } var reply string - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "CustomField": "UnlimitedEvent", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", - utils.OptsResourcesUnits: 1, - }, + ev := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "CustomField": "UnlimitedEvent", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", + utils.OptsResourcesUnits: 1, }, } if err := rlsV1Rpc.Call(utils.ResourceSv1AllocateResources, - argsRU, &reply); err != nil { + ev, &reply); err != nil { t.Error(err) } else if reply != "CustomUnlimitedMessage" { t.Errorf("Expecting: %+v, received: %+v", "CustomUnlimitedMessage", reply) @@ -1102,30 +1058,28 @@ func testV1RsSetResourceProfileWithOpts(t *testing.T) { func testV1RsAuthorizeResourcesWithOpts(t *testing.T) { var reply string - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "TEST_WITH_OPTS", - Event: map[string]interface{}{ - "Subject": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - "CustomField": "1007", - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e45", - utils.OptsResourcesUnits: 6, - }, + ev := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "TEST_WITH_OPTS", + Event: map[string]interface{}{ + "Subject": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + "CustomField": "1007", + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e45", + utils.OptsResourcesUnits: 6, }, } if err := rlsV1Rpc.Call(utils.ResourceSv1AuthorizeResources, - &argsRU, + &ev, &reply); err != nil { t.Error(err) } else if reply != "TEST_WITH_OPTS" { t.Error("Unexpected reply returned", reply) } if err := rlsV1Rpc.Call(utils.ResourceSv1AllocateResources, - &argsRU, + &ev, &reply); err != nil { t.Error(err) } else if reply != "TEST_WITH_OPTS" { @@ -1302,20 +1256,18 @@ func testResourceSSetResourceProfile(t *testing.T) { func testResourceSCheckThresholdAfterResourceAllocate(t *testing.T) { var reply string - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "EV_1", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_1", - utils.OptsResourcesUnits: 5, - }, + ev := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "EV_1", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_1", + utils.OptsResourcesUnits: 5, }, } - if err := rlsV1Rpc.Call(utils.ResourceSv1AllocateResources, argsRU, + if err := rlsV1Rpc.Call(utils.ResourceSv1AllocateResources, ev, &reply); err != nil { t.Error(err) } else if reply != "Approved" { @@ -1336,20 +1288,18 @@ func testResourceSCheckThresholdAfterResourceAllocate(t *testing.T) { } func testResourceSCheckThresholdAfterResourceRelease(t *testing.T) { - argsRU := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "EV_1", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_1", - }, + ev := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "EV_1", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_1", }, } var reply string - if err := rlsV1Rpc.Call(utils.ResourceSv1ReleaseResources, argsRU, + if err := rlsV1Rpc.Call(utils.ResourceSv1ReleaseResources, ev, &reply); err != nil { t.Error(err) } diff --git a/config/config_json_test.go b/config/config_json_test.go index 254a6f08f..fb21e4814 100644 --- a/config/config_json_test.go +++ b/config/config_json_test.go @@ -1096,6 +1096,11 @@ func TestDfResourceLimiterSJsonCfg(t *testing.T) { Prefix_indexed_fields: &[]string{}, Suffix_indexed_fields: &[]string{}, Nested_fields: utils.BoolPointer(false), + Opts: &ResourcesOptsJson{ + UsageID: utils.StringPointer(utils.EmptyString), + UsageTTL: utils.StringPointer("72h"), + Units: utils.Float64Pointer(1), + }, } dfCgrJSONCfg, err := NewCgrJsonCfgFromBytes([]byte(CGRATES_CFG_JSON)) if err != nil { diff --git a/config/config_test.go b/config/config_test.go index 5e4d36ecf..dc5872cf9 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -718,6 +718,11 @@ func TestCgrCfgJSONDefaultsResLimCfg(t *testing.T) { StringIndexedFields: nil, PrefixIndexedFields: &[]string{}, SuffixIndexedFields: &[]string{}, + Opts: &ResourcesOpts{ + UsageID: utils.EmptyString, + UsageTTL: 72 * time.Hour, + Units: 1, + }, } if !reflect.DeepEqual(cgrCfg.resourceSCfg, eResLiCfg) { t.Errorf("expecting: %s, received: %s", utils.ToJSON(eResLiCfg), utils.ToJSON(cgrCfg.resourceSCfg)) @@ -1990,6 +1995,11 @@ func TestResourceSConfig(t *testing.T) { PrefixIndexedFields: &[]string{}, SuffixIndexedFields: &[]string{}, NestedFields: false, + Opts: &ResourcesOpts{ + UsageID: "", + UsageTTL: 72 * time.Hour, + Units: 1, + }, } cgrConfig := NewDefaultCGRConfig() if err != nil { @@ -4067,6 +4077,11 @@ func TestV1GetConfigResourceS(t *testing.T) { utils.PrefixIndexedFieldsCfg: []string{}, utils.SuffixIndexedFieldsCfg: []string{}, utils.NestedFieldsCfg: false, + utils.OptsCfg: map[string]interface{}{ + utils.MetaUsageTTLCfg: 72 * time.Hour, + utils.MetaUnitsCfg: 1., + utils.MetaUsageIDCfg: "", + }, }, } cfgCgr := NewDefaultCGRConfig() @@ -4916,7 +4931,7 @@ func TestV1GetConfigAsJSONChargerS(t *testing.T) { func TestV1GetConfigAsJSONResourceS(t *testing.T) { var reply string - expected := `{"resources":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","suffix_indexed_fields":[],"thresholds_conns":[]}}` + expected := `{"resources":{"enabled":false,"indexed_selects":true,"nested_fields":false,"opts":{"*units":1,"*usageID":"","*usageTTL":259200000000000},"prefix_indexed_fields":[],"store_interval":"","suffix_indexed_fields":[],"thresholds_conns":[]}}` cgrCfg := NewDefaultCGRConfig() if err := cgrCfg.V1GetConfigAsJSON(&SectionWithAPIOpts{Section: RESOURCES_JSON}, &reply); err != nil { t.Error(err) @@ -5219,7 +5234,7 @@ func TestV1GetConfigAsJSONAllConfig(t *testing.T) { }` var reply string cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSON) - expected := `{"analyzers":{"cleanup_interval":"1h0m0s","db_path":"/var/spool/cgrates/analyzers","enabled":false,"index_type":"*scorch","ttl":"24h0m0s"},"apiban":{"enabled":false,"keys":[]},"apiers":{"attributes_conns":[],"caches_conns":["*internal"],"ees_conns":[],"enabled":false,"scheduler_conns":[]},"asterisk_agent":{"asterisk_conns":[{"address":"127.0.0.1:8088","alias":"","connect_attempts":3,"password":"CGRateS.org","reconnects":5,"user":"cgrates"}],"create_cdr":false,"enabled":false,"sessions_conns":["*birpc_internal"]},"attributes":{"any_context":true,"apiers_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"opts":{"*processRuns":1,"*profileIDs":[],"*profileIgnoreFilters":false,"*profileRuns":0},"prefix_indexed_fields":[],"resources_conns":[],"stats_conns":[],"suffix_indexed_fields":[]},"caches":{"partitions":{"*account_action_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*action_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*action_triggers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*actions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*apiban":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"2m0s"},"*attribute_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*attribute_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*caps_events":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*cdr_ids":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10m0s"},"*charger_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*charger_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*closed_sessions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10s"},"*destinations":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*diameter_messages":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*dispatcher_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*dispatcher_hosts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*dispatcher_loads":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*dispatcher_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*dispatcher_routes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*dispatchers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*event_charges":{"limit":0,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10s"},"*event_resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*filters":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*load_ids":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*rating_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*rating_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*replication_hosts":{"limit":0,"precache":false,"replicate":false,"static_ttl":false},"*resource_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*resource_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*reverse_destinations":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*reverse_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*route_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*route_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*rpc_connections":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*rpc_responses":{"limit":0,"precache":false,"replicate":false,"static_ttl":false,"ttl":"2s"},"*shared_groups":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*stat_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*statqueue_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*statqueues":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*stir":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*threshold_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*threshold_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*thresholds":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*timings":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*uch":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"}},"replication_conns":[]},"cdrs":{"attributes_conns":[],"chargers_conns":[],"ees_conns":[],"enabled":false,"extra_fields":[],"online_cdr_exports":[],"rals_conns":[],"scheduler_conns":[],"session_cost_retries":5,"stats_conns":[],"store_cdrs":true,"thresholds_conns":[]},"chargers":{"attributes_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"suffix_indexed_fields":[]},"configs":{"enabled":false,"root_dir":"/var/spool/cgrates/configs","url":"/configs/"},"cores":{"caps":0,"caps_stats_interval":"0","caps_strategy":"*busy","shutdown_timeout":"1s"},"data_db":{"db_host":"127.0.0.1","db_name":"10","db_password":"","db_port":6379,"db_type":"*redis","db_user":"cgrates","items":{"*account_action_plans":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*accounts":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*action_plans":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*action_triggers":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*actions":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*attribute_filter_indexes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*attribute_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*charger_filter_indexes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*charger_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*destinations":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*dispatcher_filter_indexes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*dispatcher_hosts":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*dispatcher_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*filters":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*load_ids":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*rating_plans":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*rating_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*resource_filter_indexes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*resource_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*resources":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*reverse_destinations":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*reverse_filter_indexes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*route_filter_indexes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*route_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*shared_groups":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*stat_filter_indexes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*statqueue_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*statqueues":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*threshold_filter_indexes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*threshold_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*thresholds":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*timings":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*versions":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false}},"opts":{"mongoQueryTimeout":"10s","redisCACertificate":"","redisClientCertificate":"","redisClientKey":"","redisCluster":false,"redisClusterOndownDelay":"0","redisClusterSync":"5s","redisSentinel":"","redisTLS":false},"remote_conn_id":"","remote_conns":[],"replication_cache":"","replication_conns":[],"replication_filtered":false},"diameter_agent":{"asr_template":"","concurrent_requests":-1,"dictionaries_path":"/usr/share/cgrates/diameter/dict/","enabled":false,"forced_disconnect":"*none","listen":"127.0.0.1:3868","listen_net":"tcp","origin_host":"CGR-DA","origin_realm":"cgrates.org","product_name":"CGRateS","rar_template":"","request_processors":[],"sessions_conns":["*birpc_internal"],"synced_conn_requests":false,"vendor_id":0},"dispatchers":{"any_subsystem":true,"attributes_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"suffix_indexed_fields":[]},"dns_agent":{"enabled":false,"listen":"127.0.0.1:2053","listen_net":"udp","request_processors":[],"sessions_conns":["*internal"],"timezone":""},"ees":{"attributes_conns":[],"cache":{"*file_csv":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"5s"}},"enabled":false,"exporters":[{"attempts":1,"attribute_context":"","attribute_ids":[],"concurrent_requests":0,"export_path":"/var/spool/cgrates/ees","failed_posts_dir":"/var/spool/cgrates/failed_posts","fields":[],"filters":[],"flags":[],"id":"*default","opts":{},"synchronous":false,"timezone":"","type":"*none"}]},"ers":{"enabled":false,"partial_cache_ttl":"1s","readers":[{"cache_dump_fields":[],"concurrent_requests":1024,"fields":[{"mandatory":true,"path":"*cgreq.ToR","tag":"ToR","type":"*variable","value":"~*req.2"},{"mandatory":true,"path":"*cgreq.OriginID","tag":"OriginID","type":"*variable","value":"~*req.3"},{"mandatory":true,"path":"*cgreq.RequestType","tag":"RequestType","type":"*variable","value":"~*req.4"},{"mandatory":true,"path":"*cgreq.Tenant","tag":"Tenant","type":"*variable","value":"~*req.6"},{"mandatory":true,"path":"*cgreq.Category","tag":"Category","type":"*variable","value":"~*req.7"},{"mandatory":true,"path":"*cgreq.Account","tag":"Account","type":"*variable","value":"~*req.8"},{"mandatory":true,"path":"*cgreq.Subject","tag":"Subject","type":"*variable","value":"~*req.9"},{"mandatory":true,"path":"*cgreq.Destination","tag":"Destination","type":"*variable","value":"~*req.10"},{"mandatory":true,"path":"*cgreq.SetupTime","tag":"SetupTime","type":"*variable","value":"~*req.11"},{"mandatory":true,"path":"*cgreq.AnswerTime","tag":"AnswerTime","type":"*variable","value":"~*req.12"},{"mandatory":true,"path":"*cgreq.Usage","tag":"Usage","type":"*variable","value":"~*req.13"}],"filters":[],"flags":[],"id":"*default","opts":{"csvFieldSeparator":",","csvHeaderDefineChar":":","csvRowLength":0,"natsSubject":"cgrates_cdrs","partialCacheAction":"*none","partialOrderField":"~*req.AnswerTime","xmlRootPath":""},"partial_commit_fields":[],"processed_path":"/var/spool/cgrates/ers/out","run_delay":"0","source_path":"/var/spool/cgrates/ers/in","tenant":"","timezone":"","type":"*none"}],"sessions_conns":["*internal"]},"filters":{"apiers_conns":[],"resources_conns":[],"stats_conns":[]},"freeswitch_agent":{"create_cdr":false,"empty_balance_ann_file":"","empty_balance_context":"","enabled":false,"event_socket_conns":[{"address":"127.0.0.1:8021","alias":"127.0.0.1:8021","password":"ClueCon","reconnects":5}],"extra_fields":"","low_balance_ann_file":"","max_wait_connection":"2s","sessions_conns":["*birpc_internal"],"subscribe_park":true},"general":{"connect_attempts":5,"connect_timeout":"1s","dbdata_encoding":"*msgpack","default_caching":"*reload","default_category":"call","default_request_type":"*rated","default_tenant":"cgrates.org","default_timezone":"Local","digest_equal":":","digest_separator":",","failed_posts_dir":"/var/spool/cgrates/failed_posts","failed_posts_ttl":"5s","locking_timeout":"0","log_level":6,"logger":"*syslog","max_parallel_conns":100,"node_id":"ENGINE1","poster_attempts":3,"reconnects":-1,"reply_timeout":"2s","rounding_decimals":5,"rsr_separator":";","tpexport_dir":"/var/spool/cgrates/tpe"},"http":{"auth_users":{},"client_opts":{"dialFallbackDelay":"300ms","dialKeepAlive":"30s","dialTimeout":"30s","disableCompression":false,"disableKeepAlives":false,"expectContinueTimeout":"0","forceAttemptHttp2":true,"idleConnTimeout":"90s","maxConnsPerHost":0,"maxIdleConns":100,"maxIdleConnsPerHost":2,"responseHeaderTimeout":"0","skipTlsVerify":false,"tlsHandshakeTimeout":"10s"},"freeswitch_cdrs_url":"/freeswitch_json","http_cdrs":"/cdr_http","json_rpc_url":"/jsonrpc","registrars_url":"/registrar","use_basic_auth":false,"ws_url":"/ws"},"http_agent":[],"kamailio_agent":{"create_cdr":false,"enabled":false,"evapi_conns":[{"address":"127.0.0.1:8448","alias":"","reconnects":5}],"sessions_conns":["*birpc_internal"],"timezone":""},"listen":{"http":"127.0.0.1:2080","http_tls":"127.0.0.1:2280","rpc_gob":"127.0.0.1:2013","rpc_gob_tls":"127.0.0.1:2023","rpc_json":"127.0.0.1:2012","rpc_json_tls":"127.0.0.1:2022"},"loader":{"caches_conns":["*localhost"],"data_path":"./","disable_reverse":false,"field_separator":",","gapi_credentials":".gapi/credentials.json","gapi_token":".gapi/token.json","scheduler_conns":["*localhost"],"tpid":""},"loaders":[{"caches_conns":["*internal"],"data":[{"fields":[{"mandatory":true,"path":"Tenant","tag":"TenantID","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ProfileID","type":"*variable","value":"~*req.1"},{"path":"Contexts","tag":"Contexts","type":"*variable","value":"~*req.2"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.3"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.4"},{"path":"AttributeFilterIDs","tag":"AttributeFilterIDs","type":"*variable","value":"~*req.5"},{"path":"Path","tag":"Path","type":"*variable","value":"~*req.6"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.7"},{"path":"Value","tag":"Value","type":"*variable","value":"~*req.8"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.9"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.10"}],"file_name":"Attributes.csv","flags":null,"type":"*attributes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.2"},{"path":"Element","tag":"Element","type":"*variable","value":"~*req.3"},{"path":"Values","tag":"Values","type":"*variable","value":"~*req.4"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.5"}],"file_name":"Filters.csv","flags":null,"type":"*filters"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"UsageTTL","tag":"TTL","type":"*variable","value":"~*req.4"},{"path":"Limit","tag":"Limit","type":"*variable","value":"~*req.5"},{"path":"AllocationMessage","tag":"AllocationMessage","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.8"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.9"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.10"}],"file_name":"Resources.csv","flags":null,"type":"*resources"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"QueueLength","tag":"QueueLength","type":"*variable","value":"~*req.4"},{"path":"TTL","tag":"TTL","type":"*variable","value":"~*req.5"},{"path":"MinItems","tag":"MinItems","type":"*variable","value":"~*req.6"},{"path":"MetricIDs","tag":"MetricIDs","type":"*variable","value":"~*req.7"},{"path":"MetricFilterIDs","tag":"MetricFilterIDs","type":"*variable","value":"~*req.8"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.9"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.10"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.11"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.12"}],"file_name":"Stats.csv","flags":null,"type":"*stats"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"MaxHits","tag":"MaxHits","type":"*variable","value":"~*req.4"},{"path":"MinHits","tag":"MinHits","type":"*variable","value":"~*req.5"},{"path":"MinSleep","tag":"MinSleep","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.8"},{"path":"ActionIDs","tag":"ActionIDs","type":"*variable","value":"~*req.9"},{"path":"Async","tag":"Async","type":"*variable","value":"~*req.10"}],"file_name":"Thresholds.csv","flags":null,"type":"*thresholds"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"Sorting","tag":"Sorting","type":"*variable","value":"~*req.4"},{"path":"SortingParameters","tag":"SortingParameters","type":"*variable","value":"~*req.5"},{"path":"RouteID","tag":"RouteID","type":"*variable","value":"~*req.6"},{"path":"RouteFilterIDs","tag":"RouteFilterIDs","type":"*variable","value":"~*req.7"},{"path":"RouteAccountIDs","tag":"RouteAccountIDs","type":"*variable","value":"~*req.8"},{"path":"RouteRatingPlanIDs","tag":"RouteRatingPlanIDs","type":"*variable","value":"~*req.9"},{"path":"RouteResourceIDs","tag":"RouteResourceIDs","type":"*variable","value":"~*req.10"},{"path":"RouteStatIDs","tag":"RouteStatIDs","type":"*variable","value":"~*req.11"},{"path":"RouteWeight","tag":"RouteWeight","type":"*variable","value":"~*req.12"},{"path":"RouteBlocker","tag":"RouteBlocker","type":"*variable","value":"~*req.13"},{"path":"RouteParameters","tag":"RouteParameters","type":"*variable","value":"~*req.14"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.15"}],"file_name":"Routes.csv","flags":null,"type":"*routes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"RunID","tag":"RunID","type":"*variable","value":"~*req.4"},{"path":"AttributeIDs","tag":"AttributeIDs","type":"*variable","value":"~*req.5"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.6"}],"file_name":"Chargers.csv","flags":null,"type":"*chargers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Contexts","tag":"Contexts","type":"*variable","value":"~*req.2"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.3"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.4"},{"path":"Strategy","tag":"Strategy","type":"*variable","value":"~*req.5"},{"path":"StrategyParameters","tag":"StrategyParameters","type":"*variable","value":"~*req.6"},{"path":"ConnID","tag":"ConnID","type":"*variable","value":"~*req.7"},{"path":"ConnFilterIDs","tag":"ConnFilterIDs","type":"*variable","value":"~*req.8"},{"path":"ConnWeight","tag":"ConnWeight","type":"*variable","value":"~*req.9"},{"path":"ConnBlocker","tag":"ConnBlocker","type":"*variable","value":"~*req.10"},{"path":"ConnParameters","tag":"ConnParameters","type":"*variable","value":"~*req.11"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.12"}],"file_name":"DispatcherProfiles.csv","flags":null,"type":"*dispatchers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Address","tag":"Address","type":"*variable","value":"~*req.2"},{"path":"Transport","tag":"Transport","type":"*variable","value":"~*req.3"},{"path":"ConnectAttempts","tag":"ConnectAttempts","type":"*variable","value":"~*req.4"},{"path":"Reconnects","tag":"Reconnects","type":"*variable","value":"~*req.5"},{"path":"ConnectTimeout","tag":"ConnectTimeout","type":"*variable","value":"~*req.6"},{"path":"ReplyTimeout","tag":"ReplyTimeout","type":"*variable","value":"~*req.7"},{"path":"TLS","tag":"TLS","type":"*variable","value":"~*req.8"},{"path":"ClientKey","tag":"ClientKey","type":"*variable","value":"~*req.9"},{"path":"ClientCertificate","tag":"ClientCertificate","type":"*variable","value":"~*req.10"},{"path":"CaCertificate","tag":"CaCertificate","type":"*variable","value":"~*req.11"}],"file_name":"DispatcherHosts.csv","flags":null,"type":"*dispatcher_hosts"}],"dry_run":false,"enabled":false,"field_separator":",","id":"*default","lockfile_path":".cgr.lck","run_delay":"0","tenant":"","tp_in_dir":"/var/spool/cgrates/loader/in","tp_out_dir":"/var/spool/cgrates/loader/out"}],"mailer":{"auth_password":"CGRateS.org","auth_user":"cgrates","from_address":"cgr-mailer@localhost.localdomain","server":"localhost"},"migrator":{"out_datadb_encoding":"msgpack","out_datadb_host":"127.0.0.1","out_datadb_name":"10","out_datadb_opts":{"redisCACertificate":"","redisClientCertificate":"","redisClientKey":"","redisCluster":false,"redisClusterOndownDelay":"0","redisClusterSync":"5s","redisSentinel":"","redisTLS":false},"out_datadb_password":"","out_datadb_port":"6379","out_datadb_type":"redis","out_datadb_user":"cgrates","out_stordb_host":"127.0.0.1","out_stordb_name":"cgrates","out_stordb_opts":{},"out_stordb_password":"","out_stordb_port":"3306","out_stordb_type":"mysql","out_stordb_user":"cgrates","users_filters":[]},"radius_agent":{"client_dictionaries":{"*default":"/usr/share/cgrates/radius/dict/"},"client_secrets":{"*default":"CGRateS.org"},"enabled":false,"listen_acct":"127.0.0.1:1813","listen_auth":"127.0.0.1:1812","listen_net":"udp","request_processors":[],"sessions_conns":["*internal"]},"rals":{"balance_rating_subject":{"*any":"*zero1ns","*voice":"*zero1s"},"enabled":false,"max_computed_usage":{"*any":"189h0m0s","*data":"107374182400","*mms":"10000","*sms":"10000","*voice":"72h0m0s"},"max_increments":1000000,"remove_expired":true,"rp_subject_prefix_matching":false,"stats_conns":[],"thresholds_conns":[]},"registrarc":{"dispatchers":{"hosts":[],"refresh_interval":"5m0s","registrars_conns":[]},"rpc":{"hosts":[],"refresh_interval":"5m0s","registrars_conns":[]}},"resources":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","suffix_indexed_fields":[],"thresholds_conns":[]},"routes":{"attributes_conns":[],"default_ratio":1,"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"rals_conns":[],"resources_conns":[],"stats_conns":[],"suffix_indexed_fields":[]},"rpc_conns":{"*bijson_localhost":{"conns":[{"address":"127.0.0.1:2014","transport":"*birpc_json"}],"poolSize":0,"strategy":"*first"},"*birpc_internal":{"conns":[{"address":"*birpc_internal","transport":""}],"poolSize":0,"strategy":"*first"},"*internal":{"conns":[{"address":"*internal","transport":""}],"poolSize":0,"strategy":"*first"},"*localhost":{"conns":[{"address":"127.0.0.1:2012","transport":"*json"}],"poolSize":0,"strategy":"*first"}},"schedulers":{"cdrs_conns":[],"dynaprepaid_actionplans":[],"enabled":false,"filters":[],"stats_conns":[],"thresholds_conns":[]},"sessions":{"alterable_fields":[],"attributes_conns":[],"cdrs_conns":[],"channel_sync_interval":"0","chargers_conns":[],"client_protocol":1,"debit_interval":"0","default_usage":{"*any":"3h0m0s","*data":"1048576","*sms":"1","*voice":"3h0m0s"},"enabled":false,"listen_bigob":"","listen_bijson":"127.0.0.1:2014","min_dur_low_balance":"0","rals_conns":[],"replication_conns":[],"resources_conns":[],"routes_conns":[],"scheduler_conns":[],"session_indexes":[],"session_ttl":"0","stats_conns":[],"stir":{"allowed_attest":["*any"],"default_attest":"A","payload_maxduration":"-1","privatekey_path":"","publickey_path":""},"store_session_costs":false,"terminate_attempts":5,"thresholds_conns":[]},"sip_agent":{"enabled":false,"listen":"127.0.0.1:5060","listen_net":"udp","request_processors":[],"retransmission_timer":1000000000,"sessions_conns":["*internal"],"timezone":""},"stats":{"enabled":false,"indexed_selects":true,"nested_fields":false,"opts":{"*profileIDs":[],"*profileIgnoreFilters":false},"prefix_indexed_fields":[],"store_interval":"","store_uncompressed_limit":0,"suffix_indexed_fields":[],"thresholds_conns":[]},"stor_db":{"db_host":"127.0.0.1","db_name":"cgrates","db_password":"","db_port":3306,"db_type":"*mysql","db_user":"cgrates","items":{"*cdrs":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*session_costs":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_account_actions":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_action_plans":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_action_triggers":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_actions":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_attributes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_chargers":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_destination_rates":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_destinations":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_dispatcher_hosts":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_dispatcher_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_filters":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_rates":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_rating_plans":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_rating_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_resources":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_routes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_shared_groups":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_stats":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_thresholds":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_timings":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*versions":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false}},"opts":{"mongoQueryTimeout":"10s","mysqlLocation":"Local","postgresSSLMode":"disable","sqlConnMaxLifetime":0,"sqlMaxIdleConns":10,"sqlMaxOpenConns":100},"prefix_indexed_fields":[],"remote_conns":null,"replication_conns":null,"string_indexed_fields":[]},"suretax":{"bill_to_number":"","business_unit":"","client_number":"","client_tracking":"~*req.CGRID","customer_number":"~*req.Subject","include_local_cost":false,"orig_number":"~*req.Subject","p2pplus4":"","p2pzipcode":"","plus4":"","regulatory_code":"03","response_group":"03","response_type":"D4","return_file_code":"0","sales_type_code":"R","tax_exemption_code_list":"","tax_included":"0","tax_situs_rule":"04","term_number":"~*req.Destination","timezone":"UTC","trans_type_code":"010101","unit_type":"00","units":"1","url":"","validation_key":"","zipcode":""},"templates":{"*asr":[{"mandatory":true,"path":"*diamreq.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*diamreq.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*req.Destination-Host"},{"mandatory":true,"path":"*diamreq.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*req.Destination-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Realm","tag":"DestinationRealm","type":"*variable","value":"~*req.Origin-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Host","tag":"DestinationHost","type":"*variable","value":"~*req.Origin-Host"},{"mandatory":true,"path":"*diamreq.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"}],"*cca":[{"mandatory":true,"path":"*rep.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"path":"*rep.Result-Code","tag":"ResultCode","type":"*constant","value":"2001"},{"mandatory":true,"path":"*rep.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*vars.OriginHost"},{"mandatory":true,"path":"*rep.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*vars.OriginRealm"},{"mandatory":true,"path":"*rep.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"},{"mandatory":true,"path":"*rep.CC-Request-Type","tag":"CCRequestType","type":"*variable","value":"~*req.CC-Request-Type"},{"mandatory":true,"path":"*rep.CC-Request-Number","tag":"CCRequestNumber","type":"*variable","value":"~*req.CC-Request-Number"}],"*cdrLog":[{"mandatory":true,"path":"*cdr.ToR","tag":"ToR","type":"*variable","value":"~*req.BalanceType"},{"mandatory":true,"path":"*cdr.OriginHost","tag":"OriginHost","type":"*constant","value":"127.0.0.1"},{"mandatory":true,"path":"*cdr.RequestType","tag":"RequestType","type":"*constant","value":"*none"},{"mandatory":true,"path":"*cdr.Tenant","tag":"Tenant","type":"*variable","value":"~*req.Tenant"},{"mandatory":true,"path":"*cdr.Account","tag":"Account","type":"*variable","value":"~*req.Account"},{"mandatory":true,"path":"*cdr.Subject","tag":"Subject","type":"*variable","value":"~*req.Account"},{"mandatory":true,"path":"*cdr.Cost","tag":"Cost","type":"*variable","value":"~*req.Cost"},{"mandatory":true,"path":"*cdr.Source","tag":"Source","type":"*constant","value":"*cdrLog"},{"mandatory":true,"path":"*cdr.Usage","tag":"Usage","type":"*constant","value":"1"},{"mandatory":true,"path":"*cdr.RunID","tag":"RunID","type":"*variable","value":"~*req.ActionType"},{"mandatory":true,"path":"*cdr.SetupTime","tag":"SetupTime","type":"*constant","value":"*now"},{"mandatory":true,"path":"*cdr.AnswerTime","tag":"AnswerTime","type":"*constant","value":"*now"},{"mandatory":true,"path":"*cdr.PreRated","tag":"PreRated","type":"*constant","value":"true"}],"*err":[{"mandatory":true,"path":"*rep.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*rep.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*vars.OriginHost"},{"mandatory":true,"path":"*rep.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*vars.OriginRealm"}],"*errSip":[{"mandatory":true,"path":"*rep.Request","tag":"Request","type":"*constant","value":"SIP/2.0 500 Internal Server Error"}],"*rar":[{"mandatory":true,"path":"*diamreq.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*diamreq.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*req.Destination-Host"},{"mandatory":true,"path":"*diamreq.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*req.Destination-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Realm","tag":"DestinationRealm","type":"*variable","value":"~*req.Origin-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Host","tag":"DestinationHost","type":"*variable","value":"~*req.Origin-Host"},{"mandatory":true,"path":"*diamreq.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"},{"path":"*diamreq.Re-Auth-Request-Type","tag":"ReAuthRequestType","type":"*constant","value":"0"}]},"thresholds":{"enabled":false,"indexed_selects":true,"nested_fields":false,"opts":{"*profileIDs":[],"*profileIgnoreFilters":false},"prefix_indexed_fields":[],"store_interval":"","suffix_indexed_fields":[]},"tls":{"ca_certificate":"","client_certificate":"","client_key":"","server_certificate":"","server_key":"","server_name":"","server_policy":4}}` + expected := `{"analyzers":{"cleanup_interval":"1h0m0s","db_path":"/var/spool/cgrates/analyzers","enabled":false,"index_type":"*scorch","ttl":"24h0m0s"},"apiban":{"enabled":false,"keys":[]},"apiers":{"attributes_conns":[],"caches_conns":["*internal"],"ees_conns":[],"enabled":false,"scheduler_conns":[]},"asterisk_agent":{"asterisk_conns":[{"address":"127.0.0.1:8088","alias":"","connect_attempts":3,"password":"CGRateS.org","reconnects":5,"user":"cgrates"}],"create_cdr":false,"enabled":false,"sessions_conns":["*birpc_internal"]},"attributes":{"any_context":true,"apiers_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"opts":{"*processRuns":1,"*profileIDs":[],"*profileIgnoreFilters":false,"*profileRuns":0},"prefix_indexed_fields":[],"resources_conns":[],"stats_conns":[],"suffix_indexed_fields":[]},"caches":{"partitions":{"*account_action_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*action_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*action_triggers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*actions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*apiban":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"2m0s"},"*attribute_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*attribute_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*caps_events":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*cdr_ids":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10m0s"},"*charger_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*charger_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*closed_sessions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10s"},"*destinations":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*diameter_messages":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*dispatcher_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*dispatcher_hosts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*dispatcher_loads":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*dispatcher_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*dispatcher_routes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*dispatchers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*event_charges":{"limit":0,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10s"},"*event_resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*filters":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*load_ids":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*rating_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*rating_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*replication_hosts":{"limit":0,"precache":false,"replicate":false,"static_ttl":false},"*resource_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*resource_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*reverse_destinations":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*reverse_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*route_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*route_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*rpc_connections":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*rpc_responses":{"limit":0,"precache":false,"replicate":false,"static_ttl":false,"ttl":"2s"},"*shared_groups":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*stat_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*statqueue_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*statqueues":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*stir":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*threshold_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*threshold_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*thresholds":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*timings":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false},"*uch":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"}},"replication_conns":[]},"cdrs":{"attributes_conns":[],"chargers_conns":[],"ees_conns":[],"enabled":false,"extra_fields":[],"online_cdr_exports":[],"rals_conns":[],"scheduler_conns":[],"session_cost_retries":5,"stats_conns":[],"store_cdrs":true,"thresholds_conns":[]},"chargers":{"attributes_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"suffix_indexed_fields":[]},"configs":{"enabled":false,"root_dir":"/var/spool/cgrates/configs","url":"/configs/"},"cores":{"caps":0,"caps_stats_interval":"0","caps_strategy":"*busy","shutdown_timeout":"1s"},"data_db":{"db_host":"127.0.0.1","db_name":"10","db_password":"","db_port":6379,"db_type":"*redis","db_user":"cgrates","items":{"*account_action_plans":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*accounts":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*action_plans":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*action_triggers":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*actions":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*attribute_filter_indexes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*attribute_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*charger_filter_indexes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*charger_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*destinations":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*dispatcher_filter_indexes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*dispatcher_hosts":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*dispatcher_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*filters":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*load_ids":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*rating_plans":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*rating_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*resource_filter_indexes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*resource_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*resources":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*reverse_destinations":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*reverse_filter_indexes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*route_filter_indexes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*route_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*shared_groups":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*stat_filter_indexes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*statqueue_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*statqueues":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*threshold_filter_indexes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*threshold_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*thresholds":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*timings":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*versions":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false}},"opts":{"mongoQueryTimeout":"10s","redisCACertificate":"","redisClientCertificate":"","redisClientKey":"","redisCluster":false,"redisClusterOndownDelay":"0","redisClusterSync":"5s","redisSentinel":"","redisTLS":false},"remote_conn_id":"","remote_conns":[],"replication_cache":"","replication_conns":[],"replication_filtered":false},"diameter_agent":{"asr_template":"","concurrent_requests":-1,"dictionaries_path":"/usr/share/cgrates/diameter/dict/","enabled":false,"forced_disconnect":"*none","listen":"127.0.0.1:3868","listen_net":"tcp","origin_host":"CGR-DA","origin_realm":"cgrates.org","product_name":"CGRateS","rar_template":"","request_processors":[],"sessions_conns":["*birpc_internal"],"synced_conn_requests":false,"vendor_id":0},"dispatchers":{"any_subsystem":true,"attributes_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"suffix_indexed_fields":[]},"dns_agent":{"enabled":false,"listen":"127.0.0.1:2053","listen_net":"udp","request_processors":[],"sessions_conns":["*internal"],"timezone":""},"ees":{"attributes_conns":[],"cache":{"*file_csv":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"5s"}},"enabled":false,"exporters":[{"attempts":1,"attribute_context":"","attribute_ids":[],"concurrent_requests":0,"export_path":"/var/spool/cgrates/ees","failed_posts_dir":"/var/spool/cgrates/failed_posts","fields":[],"filters":[],"flags":[],"id":"*default","opts":{},"synchronous":false,"timezone":"","type":"*none"}]},"ers":{"enabled":false,"partial_cache_ttl":"1s","readers":[{"cache_dump_fields":[],"concurrent_requests":1024,"fields":[{"mandatory":true,"path":"*cgreq.ToR","tag":"ToR","type":"*variable","value":"~*req.2"},{"mandatory":true,"path":"*cgreq.OriginID","tag":"OriginID","type":"*variable","value":"~*req.3"},{"mandatory":true,"path":"*cgreq.RequestType","tag":"RequestType","type":"*variable","value":"~*req.4"},{"mandatory":true,"path":"*cgreq.Tenant","tag":"Tenant","type":"*variable","value":"~*req.6"},{"mandatory":true,"path":"*cgreq.Category","tag":"Category","type":"*variable","value":"~*req.7"},{"mandatory":true,"path":"*cgreq.Account","tag":"Account","type":"*variable","value":"~*req.8"},{"mandatory":true,"path":"*cgreq.Subject","tag":"Subject","type":"*variable","value":"~*req.9"},{"mandatory":true,"path":"*cgreq.Destination","tag":"Destination","type":"*variable","value":"~*req.10"},{"mandatory":true,"path":"*cgreq.SetupTime","tag":"SetupTime","type":"*variable","value":"~*req.11"},{"mandatory":true,"path":"*cgreq.AnswerTime","tag":"AnswerTime","type":"*variable","value":"~*req.12"},{"mandatory":true,"path":"*cgreq.Usage","tag":"Usage","type":"*variable","value":"~*req.13"}],"filters":[],"flags":[],"id":"*default","opts":{"csvFieldSeparator":",","csvHeaderDefineChar":":","csvRowLength":0,"natsSubject":"cgrates_cdrs","partialCacheAction":"*none","partialOrderField":"~*req.AnswerTime","xmlRootPath":""},"partial_commit_fields":[],"processed_path":"/var/spool/cgrates/ers/out","run_delay":"0","source_path":"/var/spool/cgrates/ers/in","tenant":"","timezone":"","type":"*none"}],"sessions_conns":["*internal"]},"filters":{"apiers_conns":[],"resources_conns":[],"stats_conns":[]},"freeswitch_agent":{"create_cdr":false,"empty_balance_ann_file":"","empty_balance_context":"","enabled":false,"event_socket_conns":[{"address":"127.0.0.1:8021","alias":"127.0.0.1:8021","password":"ClueCon","reconnects":5}],"extra_fields":"","low_balance_ann_file":"","max_wait_connection":"2s","sessions_conns":["*birpc_internal"],"subscribe_park":true},"general":{"connect_attempts":5,"connect_timeout":"1s","dbdata_encoding":"*msgpack","default_caching":"*reload","default_category":"call","default_request_type":"*rated","default_tenant":"cgrates.org","default_timezone":"Local","digest_equal":":","digest_separator":",","failed_posts_dir":"/var/spool/cgrates/failed_posts","failed_posts_ttl":"5s","locking_timeout":"0","log_level":6,"logger":"*syslog","max_parallel_conns":100,"node_id":"ENGINE1","poster_attempts":3,"reconnects":-1,"reply_timeout":"2s","rounding_decimals":5,"rsr_separator":";","tpexport_dir":"/var/spool/cgrates/tpe"},"http":{"auth_users":{},"client_opts":{"dialFallbackDelay":"300ms","dialKeepAlive":"30s","dialTimeout":"30s","disableCompression":false,"disableKeepAlives":false,"expectContinueTimeout":"0","forceAttemptHttp2":true,"idleConnTimeout":"90s","maxConnsPerHost":0,"maxIdleConns":100,"maxIdleConnsPerHost":2,"responseHeaderTimeout":"0","skipTlsVerify":false,"tlsHandshakeTimeout":"10s"},"freeswitch_cdrs_url":"/freeswitch_json","http_cdrs":"/cdr_http","json_rpc_url":"/jsonrpc","registrars_url":"/registrar","use_basic_auth":false,"ws_url":"/ws"},"http_agent":[],"kamailio_agent":{"create_cdr":false,"enabled":false,"evapi_conns":[{"address":"127.0.0.1:8448","alias":"","reconnects":5}],"sessions_conns":["*birpc_internal"],"timezone":""},"listen":{"http":"127.0.0.1:2080","http_tls":"127.0.0.1:2280","rpc_gob":"127.0.0.1:2013","rpc_gob_tls":"127.0.0.1:2023","rpc_json":"127.0.0.1:2012","rpc_json_tls":"127.0.0.1:2022"},"loader":{"caches_conns":["*localhost"],"data_path":"./","disable_reverse":false,"field_separator":",","gapi_credentials":".gapi/credentials.json","gapi_token":".gapi/token.json","scheduler_conns":["*localhost"],"tpid":""},"loaders":[{"caches_conns":["*internal"],"data":[{"fields":[{"mandatory":true,"path":"Tenant","tag":"TenantID","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ProfileID","type":"*variable","value":"~*req.1"},{"path":"Contexts","tag":"Contexts","type":"*variable","value":"~*req.2"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.3"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.4"},{"path":"AttributeFilterIDs","tag":"AttributeFilterIDs","type":"*variable","value":"~*req.5"},{"path":"Path","tag":"Path","type":"*variable","value":"~*req.6"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.7"},{"path":"Value","tag":"Value","type":"*variable","value":"~*req.8"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.9"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.10"}],"file_name":"Attributes.csv","flags":null,"type":"*attributes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.2"},{"path":"Element","tag":"Element","type":"*variable","value":"~*req.3"},{"path":"Values","tag":"Values","type":"*variable","value":"~*req.4"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.5"}],"file_name":"Filters.csv","flags":null,"type":"*filters"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"UsageTTL","tag":"TTL","type":"*variable","value":"~*req.4"},{"path":"Limit","tag":"Limit","type":"*variable","value":"~*req.5"},{"path":"AllocationMessage","tag":"AllocationMessage","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.8"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.9"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.10"}],"file_name":"Resources.csv","flags":null,"type":"*resources"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"QueueLength","tag":"QueueLength","type":"*variable","value":"~*req.4"},{"path":"TTL","tag":"TTL","type":"*variable","value":"~*req.5"},{"path":"MinItems","tag":"MinItems","type":"*variable","value":"~*req.6"},{"path":"MetricIDs","tag":"MetricIDs","type":"*variable","value":"~*req.7"},{"path":"MetricFilterIDs","tag":"MetricFilterIDs","type":"*variable","value":"~*req.8"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.9"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.10"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.11"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.12"}],"file_name":"Stats.csv","flags":null,"type":"*stats"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"MaxHits","tag":"MaxHits","type":"*variable","value":"~*req.4"},{"path":"MinHits","tag":"MinHits","type":"*variable","value":"~*req.5"},{"path":"MinSleep","tag":"MinSleep","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.8"},{"path":"ActionIDs","tag":"ActionIDs","type":"*variable","value":"~*req.9"},{"path":"Async","tag":"Async","type":"*variable","value":"~*req.10"}],"file_name":"Thresholds.csv","flags":null,"type":"*thresholds"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"Sorting","tag":"Sorting","type":"*variable","value":"~*req.4"},{"path":"SortingParameters","tag":"SortingParameters","type":"*variable","value":"~*req.5"},{"path":"RouteID","tag":"RouteID","type":"*variable","value":"~*req.6"},{"path":"RouteFilterIDs","tag":"RouteFilterIDs","type":"*variable","value":"~*req.7"},{"path":"RouteAccountIDs","tag":"RouteAccountIDs","type":"*variable","value":"~*req.8"},{"path":"RouteRatingPlanIDs","tag":"RouteRatingPlanIDs","type":"*variable","value":"~*req.9"},{"path":"RouteResourceIDs","tag":"RouteResourceIDs","type":"*variable","value":"~*req.10"},{"path":"RouteStatIDs","tag":"RouteStatIDs","type":"*variable","value":"~*req.11"},{"path":"RouteWeight","tag":"RouteWeight","type":"*variable","value":"~*req.12"},{"path":"RouteBlocker","tag":"RouteBlocker","type":"*variable","value":"~*req.13"},{"path":"RouteParameters","tag":"RouteParameters","type":"*variable","value":"~*req.14"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.15"}],"file_name":"Routes.csv","flags":null,"type":"*routes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"RunID","tag":"RunID","type":"*variable","value":"~*req.4"},{"path":"AttributeIDs","tag":"AttributeIDs","type":"*variable","value":"~*req.5"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.6"}],"file_name":"Chargers.csv","flags":null,"type":"*chargers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Contexts","tag":"Contexts","type":"*variable","value":"~*req.2"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.3"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.4"},{"path":"Strategy","tag":"Strategy","type":"*variable","value":"~*req.5"},{"path":"StrategyParameters","tag":"StrategyParameters","type":"*variable","value":"~*req.6"},{"path":"ConnID","tag":"ConnID","type":"*variable","value":"~*req.7"},{"path":"ConnFilterIDs","tag":"ConnFilterIDs","type":"*variable","value":"~*req.8"},{"path":"ConnWeight","tag":"ConnWeight","type":"*variable","value":"~*req.9"},{"path":"ConnBlocker","tag":"ConnBlocker","type":"*variable","value":"~*req.10"},{"path":"ConnParameters","tag":"ConnParameters","type":"*variable","value":"~*req.11"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.12"}],"file_name":"DispatcherProfiles.csv","flags":null,"type":"*dispatchers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Address","tag":"Address","type":"*variable","value":"~*req.2"},{"path":"Transport","tag":"Transport","type":"*variable","value":"~*req.3"},{"path":"ConnectAttempts","tag":"ConnectAttempts","type":"*variable","value":"~*req.4"},{"path":"Reconnects","tag":"Reconnects","type":"*variable","value":"~*req.5"},{"path":"ConnectTimeout","tag":"ConnectTimeout","type":"*variable","value":"~*req.6"},{"path":"ReplyTimeout","tag":"ReplyTimeout","type":"*variable","value":"~*req.7"},{"path":"TLS","tag":"TLS","type":"*variable","value":"~*req.8"},{"path":"ClientKey","tag":"ClientKey","type":"*variable","value":"~*req.9"},{"path":"ClientCertificate","tag":"ClientCertificate","type":"*variable","value":"~*req.10"},{"path":"CaCertificate","tag":"CaCertificate","type":"*variable","value":"~*req.11"}],"file_name":"DispatcherHosts.csv","flags":null,"type":"*dispatcher_hosts"}],"dry_run":false,"enabled":false,"field_separator":",","id":"*default","lockfile_path":".cgr.lck","run_delay":"0","tenant":"","tp_in_dir":"/var/spool/cgrates/loader/in","tp_out_dir":"/var/spool/cgrates/loader/out"}],"mailer":{"auth_password":"CGRateS.org","auth_user":"cgrates","from_address":"cgr-mailer@localhost.localdomain","server":"localhost"},"migrator":{"out_datadb_encoding":"msgpack","out_datadb_host":"127.0.0.1","out_datadb_name":"10","out_datadb_opts":{"redisCACertificate":"","redisClientCertificate":"","redisClientKey":"","redisCluster":false,"redisClusterOndownDelay":"0","redisClusterSync":"5s","redisSentinel":"","redisTLS":false},"out_datadb_password":"","out_datadb_port":"6379","out_datadb_type":"redis","out_datadb_user":"cgrates","out_stordb_host":"127.0.0.1","out_stordb_name":"cgrates","out_stordb_opts":{},"out_stordb_password":"","out_stordb_port":"3306","out_stordb_type":"mysql","out_stordb_user":"cgrates","users_filters":[]},"radius_agent":{"client_dictionaries":{"*default":"/usr/share/cgrates/radius/dict/"},"client_secrets":{"*default":"CGRateS.org"},"enabled":false,"listen_acct":"127.0.0.1:1813","listen_auth":"127.0.0.1:1812","listen_net":"udp","request_processors":[],"sessions_conns":["*internal"]},"rals":{"balance_rating_subject":{"*any":"*zero1ns","*voice":"*zero1s"},"enabled":false,"max_computed_usage":{"*any":"189h0m0s","*data":"107374182400","*mms":"10000","*sms":"10000","*voice":"72h0m0s"},"max_increments":1000000,"remove_expired":true,"rp_subject_prefix_matching":false,"stats_conns":[],"thresholds_conns":[]},"registrarc":{"dispatchers":{"hosts":[],"refresh_interval":"5m0s","registrars_conns":[]},"rpc":{"hosts":[],"refresh_interval":"5m0s","registrars_conns":[]}},"resources":{"enabled":false,"indexed_selects":true,"nested_fields":false,"opts":{"*units":1,"*usageID":"","*usageTTL":259200000000000},"prefix_indexed_fields":[],"store_interval":"","suffix_indexed_fields":[],"thresholds_conns":[]},"routes":{"attributes_conns":[],"default_ratio":1,"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"rals_conns":[],"resources_conns":[],"stats_conns":[],"suffix_indexed_fields":[]},"rpc_conns":{"*bijson_localhost":{"conns":[{"address":"127.0.0.1:2014","transport":"*birpc_json"}],"poolSize":0,"strategy":"*first"},"*birpc_internal":{"conns":[{"address":"*birpc_internal","transport":""}],"poolSize":0,"strategy":"*first"},"*internal":{"conns":[{"address":"*internal","transport":""}],"poolSize":0,"strategy":"*first"},"*localhost":{"conns":[{"address":"127.0.0.1:2012","transport":"*json"}],"poolSize":0,"strategy":"*first"}},"schedulers":{"cdrs_conns":[],"dynaprepaid_actionplans":[],"enabled":false,"filters":[],"stats_conns":[],"thresholds_conns":[]},"sessions":{"alterable_fields":[],"attributes_conns":[],"cdrs_conns":[],"channel_sync_interval":"0","chargers_conns":[],"client_protocol":1,"debit_interval":"0","default_usage":{"*any":"3h0m0s","*data":"1048576","*sms":"1","*voice":"3h0m0s"},"enabled":false,"listen_bigob":"","listen_bijson":"127.0.0.1:2014","min_dur_low_balance":"0","rals_conns":[],"replication_conns":[],"resources_conns":[],"routes_conns":[],"scheduler_conns":[],"session_indexes":[],"session_ttl":"0","stats_conns":[],"stir":{"allowed_attest":["*any"],"default_attest":"A","payload_maxduration":"-1","privatekey_path":"","publickey_path":""},"store_session_costs":false,"terminate_attempts":5,"thresholds_conns":[]},"sip_agent":{"enabled":false,"listen":"127.0.0.1:5060","listen_net":"udp","request_processors":[],"retransmission_timer":1000000000,"sessions_conns":["*internal"],"timezone":""},"stats":{"enabled":false,"indexed_selects":true,"nested_fields":false,"opts":{"*profileIDs":[],"*profileIgnoreFilters":false},"prefix_indexed_fields":[],"store_interval":"","store_uncompressed_limit":0,"suffix_indexed_fields":[],"thresholds_conns":[]},"stor_db":{"db_host":"127.0.0.1","db_name":"cgrates","db_password":"","db_port":3306,"db_type":"*mysql","db_user":"cgrates","items":{"*cdrs":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*session_costs":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_account_actions":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_action_plans":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_action_triggers":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_actions":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_attributes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_chargers":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_destination_rates":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_destinations":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_dispatcher_hosts":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_dispatcher_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_filters":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_rates":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_rating_plans":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_rating_profiles":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_resources":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_routes":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_shared_groups":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_stats":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_thresholds":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*tp_timings":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false},"*versions":{"limit":-1,"remote":false,"replicate":false,"static_ttl":false}},"opts":{"mongoQueryTimeout":"10s","mysqlLocation":"Local","postgresSSLMode":"disable","sqlConnMaxLifetime":0,"sqlMaxIdleConns":10,"sqlMaxOpenConns":100},"prefix_indexed_fields":[],"remote_conns":null,"replication_conns":null,"string_indexed_fields":[]},"suretax":{"bill_to_number":"","business_unit":"","client_number":"","client_tracking":"~*req.CGRID","customer_number":"~*req.Subject","include_local_cost":false,"orig_number":"~*req.Subject","p2pplus4":"","p2pzipcode":"","plus4":"","regulatory_code":"03","response_group":"03","response_type":"D4","return_file_code":"0","sales_type_code":"R","tax_exemption_code_list":"","tax_included":"0","tax_situs_rule":"04","term_number":"~*req.Destination","timezone":"UTC","trans_type_code":"010101","unit_type":"00","units":"1","url":"","validation_key":"","zipcode":""},"templates":{"*asr":[{"mandatory":true,"path":"*diamreq.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*diamreq.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*req.Destination-Host"},{"mandatory":true,"path":"*diamreq.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*req.Destination-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Realm","tag":"DestinationRealm","type":"*variable","value":"~*req.Origin-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Host","tag":"DestinationHost","type":"*variable","value":"~*req.Origin-Host"},{"mandatory":true,"path":"*diamreq.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"}],"*cca":[{"mandatory":true,"path":"*rep.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"path":"*rep.Result-Code","tag":"ResultCode","type":"*constant","value":"2001"},{"mandatory":true,"path":"*rep.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*vars.OriginHost"},{"mandatory":true,"path":"*rep.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*vars.OriginRealm"},{"mandatory":true,"path":"*rep.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"},{"mandatory":true,"path":"*rep.CC-Request-Type","tag":"CCRequestType","type":"*variable","value":"~*req.CC-Request-Type"},{"mandatory":true,"path":"*rep.CC-Request-Number","tag":"CCRequestNumber","type":"*variable","value":"~*req.CC-Request-Number"}],"*cdrLog":[{"mandatory":true,"path":"*cdr.ToR","tag":"ToR","type":"*variable","value":"~*req.BalanceType"},{"mandatory":true,"path":"*cdr.OriginHost","tag":"OriginHost","type":"*constant","value":"127.0.0.1"},{"mandatory":true,"path":"*cdr.RequestType","tag":"RequestType","type":"*constant","value":"*none"},{"mandatory":true,"path":"*cdr.Tenant","tag":"Tenant","type":"*variable","value":"~*req.Tenant"},{"mandatory":true,"path":"*cdr.Account","tag":"Account","type":"*variable","value":"~*req.Account"},{"mandatory":true,"path":"*cdr.Subject","tag":"Subject","type":"*variable","value":"~*req.Account"},{"mandatory":true,"path":"*cdr.Cost","tag":"Cost","type":"*variable","value":"~*req.Cost"},{"mandatory":true,"path":"*cdr.Source","tag":"Source","type":"*constant","value":"*cdrLog"},{"mandatory":true,"path":"*cdr.Usage","tag":"Usage","type":"*constant","value":"1"},{"mandatory":true,"path":"*cdr.RunID","tag":"RunID","type":"*variable","value":"~*req.ActionType"},{"mandatory":true,"path":"*cdr.SetupTime","tag":"SetupTime","type":"*constant","value":"*now"},{"mandatory":true,"path":"*cdr.AnswerTime","tag":"AnswerTime","type":"*constant","value":"*now"},{"mandatory":true,"path":"*cdr.PreRated","tag":"PreRated","type":"*constant","value":"true"}],"*err":[{"mandatory":true,"path":"*rep.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*rep.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*vars.OriginHost"},{"mandatory":true,"path":"*rep.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*vars.OriginRealm"}],"*errSip":[{"mandatory":true,"path":"*rep.Request","tag":"Request","type":"*constant","value":"SIP/2.0 500 Internal Server Error"}],"*rar":[{"mandatory":true,"path":"*diamreq.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*diamreq.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*req.Destination-Host"},{"mandatory":true,"path":"*diamreq.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*req.Destination-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Realm","tag":"DestinationRealm","type":"*variable","value":"~*req.Origin-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Host","tag":"DestinationHost","type":"*variable","value":"~*req.Origin-Host"},{"mandatory":true,"path":"*diamreq.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"},{"path":"*diamreq.Re-Auth-Request-Type","tag":"ReAuthRequestType","type":"*constant","value":"0"}]},"thresholds":{"enabled":false,"indexed_selects":true,"nested_fields":false,"opts":{"*profileIDs":[],"*profileIgnoreFilters":false},"prefix_indexed_fields":[],"store_interval":"","suffix_indexed_fields":[]},"tls":{"ca_certificate":"","client_certificate":"","client_key":"","server_certificate":"","server_key":"","server_name":"","server_policy":4}}` if err != nil { t.Fatal(err) } diff --git a/config/resourcescfg_test.go b/config/resourcescfg_test.go index c24e3e927..0bd974a79 100644 --- a/config/resourcescfg_test.go +++ b/config/resourcescfg_test.go @@ -45,6 +45,10 @@ func TestResourceSConfigloadFromJsonCfgCase1(t *testing.T) { PrefixIndexedFields: &[]string{"*req.index1"}, SuffixIndexedFields: &[]string{"*req.index1"}, NestedFields: true, + Opts: &ResourcesOpts{ + UsageTTL: 72 * time.Hour, + Units: 1, + }, } cfg := NewDefaultCGRConfig() if err = cfg.resourceSCfg.loadFromJSONCfg(cfgJSON); err != nil { @@ -77,6 +81,11 @@ func TestResourceSConfigAsMapInterface(t *testing.T) { utils.PrefixIndexedFieldsCfg: []string{}, utils.SuffixIndexedFieldsCfg: []string{}, utils.NestedFieldsCfg: false, + utils.OptsCfg: map[string]interface{}{ + utils.MetaUnitsCfg: 1., + utils.MetaUsageTTLCfg: 72 * time.Hour, + utils.MetaUsageIDCfg: "", + }, } if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr); err != nil { t.Error(err) @@ -107,6 +116,11 @@ func TestResourceSConfigAsMapInterface1(t *testing.T) { utils.PrefixIndexedFieldsCfg: []string{"*req.prefix_indexed_fields1", "*req.prefix_indexed_fields2"}, utils.SuffixIndexedFieldsCfg: []string{"*req.prefix_indexed_fields1"}, utils.NestedFieldsCfg: true, + utils.OptsCfg: map[string]interface{}{ + utils.MetaUnitsCfg: 1., + utils.MetaUsageTTLCfg: 72 * time.Hour, + utils.MetaUsageIDCfg: "", + }, } if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr); err != nil { t.Error(err) @@ -125,6 +139,7 @@ func TestResourceSConfigClone(t *testing.T) { PrefixIndexedFields: &[]string{"*req.index1"}, SuffixIndexedFields: &[]string{"*req.index1"}, NestedFields: true, + Opts: &ResourcesOpts{}, } rcv := ban.Clone() if !reflect.DeepEqual(ban, rcv) { diff --git a/console/resources_allocate.go b/console/resources_allocate.go index c7263a0d2..1bde570af 100644 --- a/console/resources_allocate.go +++ b/console/resources_allocate.go @@ -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 } diff --git a/console/resources_authorize.go b/console/resources_authorize.go index e6fd85cb8..a67dd2a48 100644 --- a/console/resources_authorize.go +++ b/console/resources_authorize.go @@ -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 } diff --git a/console/resources_for_event.go b/console/resources_for_event.go index 7e73675bc..f73522118 100644 --- a/console/resources_for_event.go +++ b/console/resources_for_event.go @@ -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 } diff --git a/console/resources_release.go b/console/resources_release.go index 752d48118..75353b4e6 100644 --- a/console/resources_release.go +++ b/console/resources_release.go @@ -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 } diff --git a/dispatchers/resources.go b/dispatchers/resources.go index dcbbdacea..4d5a32737 100644 --- a/dispatchers/resources.go +++ b/dispatchers/resources.go @@ -39,64 +39,64 @@ func (dS *DispatcherService) ResourceSv1Ping(args *utils.CGREvent, rpl *string) return dS.Dispatch(args, utils.MetaResources, utils.ResourceSv1Ping, args, rpl) } -func (dS *DispatcherService) ResourceSv1GetResourcesForEvent(args utils.ArgRSv1ResourceUsage, +func (dS *DispatcherService) ResourceSv1GetResourcesForEvent(args *utils.CGREvent, reply *engine.Resources) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.CGREvent != nil && args.CGREvent.Tenant != utils.EmptyString { - tnt = args.CGREvent.Tenant + if args != nil && args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ResourceSv1GetResourcesForEvent, tnt, - utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } - return dS.Dispatch(args.CGREvent, utils.MetaResources, utils.ResourceSv1GetResourcesForEvent, args, reply) + return dS.Dispatch(args, utils.MetaResources, utils.ResourceSv1GetResourcesForEvent, args, reply) } -func (dS *DispatcherService) ResourceSv1AuthorizeResources(args utils.ArgRSv1ResourceUsage, +func (dS *DispatcherService) ResourceSv1AuthorizeResources(args *utils.CGREvent, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.CGREvent != nil && args.CGREvent.Tenant != utils.EmptyString { - tnt = args.CGREvent.Tenant + if args != nil && args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ResourceSv1AuthorizeResources, tnt, - utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } - return dS.Dispatch(args.CGREvent, utils.MetaResources, utils.ResourceSv1AuthorizeResources, args, reply) + return dS.Dispatch(args, utils.MetaResources, utils.ResourceSv1AuthorizeResources, args, reply) } -func (dS *DispatcherService) ResourceSv1AllocateResources(args utils.ArgRSv1ResourceUsage, +func (dS *DispatcherService) ResourceSv1AllocateResources(args *utils.CGREvent, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.CGREvent != nil && args.CGREvent.Tenant != utils.EmptyString { - tnt = args.CGREvent.Tenant + if args != nil && args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ResourceSv1AllocateResources, tnt, - utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } - return dS.Dispatch(args.CGREvent, utils.MetaResources, utils.ResourceSv1AllocateResources, args, reply) + return dS.Dispatch(args, utils.MetaResources, utils.ResourceSv1AllocateResources, args, reply) } -func (dS *DispatcherService) ResourceSv1ReleaseResources(args utils.ArgRSv1ResourceUsage, +func (dS *DispatcherService) ResourceSv1ReleaseResources(args *utils.CGREvent, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.CGREvent != nil && args.CGREvent.Tenant != utils.EmptyString { - tnt = args.CGREvent.Tenant + if args != nil && args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ResourceSv1ReleaseResources, tnt, - utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } - return dS.Dispatch(args.CGREvent, utils.MetaResources, utils.ResourceSv1ReleaseResources, args, reply) + return dS.Dispatch(args, utils.MetaResources, utils.ResourceSv1ReleaseResources, args, reply) } func (dS *DispatcherService) ResourceSv1GetResource(args *utils.TenantIDWithAPIOpts, reply *engine.Resource) (err error) { diff --git a/dispatchers/resources_it_test.go b/dispatchers/resources_it_test.go index 47efc3de1..0deecb69d 100644 --- a/dispatchers/resources_it_test.go +++ b/dispatchers/resources_it_test.go @@ -119,19 +119,16 @@ func testDspResPing(t *testing.T) { func testDspResTestAuthKey(t *testing.T) { var rs *engine.Resources - args := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - utils.AccountField: "1001", - utils.Destination: "1002", - }, - - APIOpts: map[string]interface{}{ - utils.OptsAPIKey: "12345", - utils.OptsResourcesUsageID: utils.UUIDSha1Prefix(), - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + utils.AccountField: "1001", + utils.Destination: "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsAPIKey: "12345", + utils.OptsResourcesUsageID: utils.UUIDSha1Prefix(), }, } @@ -143,18 +140,16 @@ func testDspResTestAuthKey(t *testing.T) { func testDspResTestAuthKey2(t *testing.T) { var rs *engine.Resources - args := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - utils.AccountField: "1001", - utils.Destination: "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsAPIKey: "res12345", - utils.OptsResourcesUsageID: utils.UUIDSha1Prefix(), - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + utils.AccountField: "1001", + utils.Destination: "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsAPIKey: "res12345", + utils.OptsResourcesUsageID: utils.UUIDSha1Prefix(), }, } eRs := &engine.Resources{ @@ -176,23 +171,21 @@ func testDspResTestAuthKey2(t *testing.T) { func testDspResTestAuthKey3(t *testing.T) { // first event matching Resource1 var reply string - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002"}, - APIOpts: map[string]interface{}{ - utils.OptsAPIKey: "res12345", - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", - utils.OptsResourcesUnits: 1, - }, + ev := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002"}, + APIOpts: map[string]interface{}{ + utils.OptsAPIKey: "res12345", + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", + utils.OptsResourcesUnits: 1, }, } if err := dispEngine.RPC.Call(utils.ResourceSv1AllocateResources, - argsRU, &reply); err != nil { + ev, &reply); err != nil { t.Error(err) } eAllocationMsg := "ResGroup1" @@ -200,85 +193,77 @@ func testDspResTestAuthKey3(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", eAllocationMsg, reply) } - if err := dispEngine.RPC.Call(utils.ResourceSv1AuthorizeResources, &argsRU, &reply); err != nil { + if err := dispEngine.RPC.Call(utils.ResourceSv1AuthorizeResources, &ev, &reply); err != nil { t.Error(err) } else if reply != eAllocationMsg { // already 3 usages active before allow call, we should have now more than allowed t.Errorf("Expecting: %+v, received: %+v", eAllocationMsg, reply) } - argsRU = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002"}, - APIOpts: map[string]interface{}{ - utils.OptsAPIKey: "res12345", - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", - utils.OptsResourcesUnits: 17, - }, + ev = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002"}, + APIOpts: map[string]interface{}{ + utils.OptsAPIKey: "res12345", + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", + utils.OptsResourcesUnits: 17, }, } if err := dispEngine.RPC.Call(utils.ResourceSv1AuthorizeResources, - &argsRU, &reply); err == nil || err.Error() != utils.ErrResourceUnauthorized.Error() { + &ev, &reply); err == nil || err.Error() != utils.ErrResourceUnauthorized.Error() { t.Error(err) } // relase the only resource active for Resource1 - argsRU = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002"}, - APIOpts: map[string]interface{}{ - utils.OptsAPIKey: "res12345", - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e55", - }, + ev = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002"}, + APIOpts: map[string]interface{}{ + utils.OptsAPIKey: "res12345", + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e55", }, } if err := dispEngine.RPC.Call(utils.ResourceSv1ReleaseResources, - argsRU, &reply); err != nil { + ev, &reply); err != nil { t.Error(err) } // try reserving with full units for Resource1, case which did not work in previous test // only match Resource1 since we don't want for storing of the resource2 bellow - argsRU = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002"}, - APIOpts: map[string]interface{}{ - utils.OptsAPIKey: "res12345", - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", - utils.OptsResourcesUnits: 6, - }, + ev = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002"}, + APIOpts: map[string]interface{}{ + utils.OptsAPIKey: "res12345", + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", + utils.OptsResourcesUnits: 6, }, } - if err := dispEngine.RPC.Call(utils.ResourceSv1AuthorizeResources, &argsRU, &reply); err != nil { + if err := dispEngine.RPC.Call(utils.ResourceSv1AuthorizeResources, &ev, &reply); err != nil { t.Error(err) } else if reply != "ResGroup1" { t.Error("Unexpected reply returned", reply) } var rs *engine.Resources - args := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "Event5", - Event: map[string]interface{}{ - "Account": "1002", - "Subject": "1001", - "Destination": "1002"}, - APIOpts: map[string]interface{}{ - utils.OptsAPIKey: "res12345", - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "Event5", + Event: map[string]interface{}{ + "Account": "1002", + "Subject": "1001", + "Destination": "1002"}, + APIOpts: map[string]interface{}{ + utils.OptsAPIKey: "res12345", + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", }, } if err := dispEngine.RPC.Call(utils.ResourceSv1GetResourcesForEvent, args, &rs); err != nil { diff --git a/dispatchers/resources_test.go b/dispatchers/resources_test.go index 135e51863..56bc9ff0a 100644 --- a/dispatchers/resources_test.go +++ b/dispatchers/resources_test.go @@ -71,10 +71,8 @@ func TestDspResourceSv1GetResourcesForEventNil(t *testing.T) { cgrCfg := config.NewDefaultCGRConfig() dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil) cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"} - CGREvent := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "tenant", - }, + CGREvent := &utils.CGREvent{ + Tenant: "tenant", } var reply *engine.Resources result := dspSrv.ResourceSv1GetResourcesForEvent(CGREvent, reply) @@ -87,10 +85,8 @@ func TestDspResourceSv1GetResourcesForEventNil(t *testing.T) { func TestDspResourceSv1GetResourcesForEventErrorNil(t *testing.T) { cgrCfg := config.NewDefaultCGRConfig() dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil) - CGREvent := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "tenant", - }, + CGREvent := &utils.CGREvent{ + Tenant: "tenant", } var reply *engine.Resources result := dspSrv.ResourceSv1GetResourcesForEvent(CGREvent, reply) @@ -104,10 +100,8 @@ func TestDspResourceSv1AuthorizeResourcesNil(t *testing.T) { cgrCfg := config.NewDefaultCGRConfig() dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil) cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"} - CGREvent := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "tenant", - }, + CGREvent := &utils.CGREvent{ + Tenant: "tenant", } var reply *string result := dspSrv.ResourceSv1AuthorizeResources(CGREvent, reply) @@ -120,10 +114,8 @@ func TestDspResourceSv1AuthorizeResourcesNil(t *testing.T) { func TestDspResourceSv1AuthorizeResourcesErrorNil(t *testing.T) { cgrCfg := config.NewDefaultCGRConfig() dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil) - CGREvent := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "tenant", - }, + CGREvent := &utils.CGREvent{ + Tenant: "tenant", } var reply *string result := dspSrv.ResourceSv1AuthorizeResources(CGREvent, reply) @@ -137,10 +129,8 @@ func TestDspResourceSv1ReleaseResourcesNil(t *testing.T) { cgrCfg := config.NewDefaultCGRConfig() dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil) cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"} - CGREvent := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "tenant", - }, + CGREvent := &utils.CGREvent{ + Tenant: "tenant", } var reply *string result := dspSrv.ResourceSv1ReleaseResources(CGREvent, reply) @@ -153,10 +143,8 @@ func TestDspResourceSv1ReleaseResourcesNil(t *testing.T) { func TestDspResourceSv1ReleaseResourcesErrorNil(t *testing.T) { cgrCfg := config.NewDefaultCGRConfig() dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil) - CGREvent := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "tenant", - }, + CGREvent := &utils.CGREvent{ + Tenant: "tenant", } var reply *string result := dspSrv.ResourceSv1ReleaseResources(CGREvent, reply) @@ -203,10 +191,8 @@ func TestDspResourceSv1AllocateResourcesNil(t *testing.T) { cgrCfg := config.NewDefaultCGRConfig() dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil) cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"} - CGREvent := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "tenant", - }, + CGREvent := &utils.CGREvent{ + Tenant: "tenant", } var reply *string result := dspSrv.ResourceSv1AllocateResources(CGREvent, reply) @@ -219,10 +205,8 @@ func TestDspResourceSv1AllocateResourcesNil(t *testing.T) { func TestDspResourceSv1AllocateResourcesErrorNil(t *testing.T) { cgrCfg := config.NewDefaultCGRConfig() dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil) - CGREvent := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "tenant", - }, + CGREvent := &utils.CGREvent{ + Tenant: "tenant", } var reply *string result := dspSrv.ResourceSv1AllocateResources(CGREvent, reply) diff --git a/engine/resources.go b/engine/resources.go index 40c74fcbf..4f37f2e08 100644 --- a/engine/resources.go +++ b/engine/resources.go @@ -671,11 +671,11 @@ func (rS *ResourceService) matchingResourcesForEvent(tnt string, ev *utils.CGREv } // V1ResourcesForEvent returns active resource configs matching the event -func (rS *ResourceService) V1ResourcesForEvent(args utils.ArgRSv1ResourceUsage, reply *Resources) (err error) { - if args.CGREvent == nil { +func (rS *ResourceService) V1ResourcesForEvent(args *utils.CGREvent, reply *Resources) (err error) { + if args == nil { return utils.NewErrMandatoryIeMissing(utils.Event) } - if missing := utils.MissingStructFields(args.CGREvent, []string{utils.ID, utils.Event}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(args, []string{utils.ID, utils.Event}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } usageID := rS.cgrcfg.ResourceSCfg().Opts.UsageID @@ -717,7 +717,7 @@ func (rS *ResourceService) V1ResourcesForEvent(args utils.ArgRSv1ResourceUsage, } usageTTL := utils.DurationPointer(ttl) var mtcRLs Resources - if mtcRLs, err = rS.matchingResourcesForEvent(tnt, args.CGREvent, usageID, usageTTL); err != nil { + if mtcRLs, err = rS.matchingResourcesForEvent(tnt, args, usageID, usageTTL); err != nil { return err } *reply = mtcRLs @@ -726,11 +726,11 @@ func (rS *ResourceService) V1ResourcesForEvent(args utils.ArgRSv1ResourceUsage, } // V1AuthorizeResources queries service to find if an Usage is allowed -func (rS *ResourceService) V1AuthorizeResources(args utils.ArgRSv1ResourceUsage, reply *string) (err error) { - if args.CGREvent == nil { +func (rS *ResourceService) V1AuthorizeResources(args *utils.CGREvent, reply *string) (err error) { + if args == nil { return utils.NewErrMandatoryIeMissing(utils.Event) } - if missing := utils.MissingStructFields(args.CGREvent, []string{utils.ID, utils.Event}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(args, []string{utils.ID, utils.Event}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } usageID := rS.cgrcfg.ResourceSCfg().Opts.UsageID @@ -772,7 +772,7 @@ func (rS *ResourceService) V1AuthorizeResources(args utils.ArgRSv1ResourceUsage, } usageTTL := utils.DurationPointer(ttl) var mtcRLs Resources - if mtcRLs, err = rS.matchingResourcesForEvent(tnt, args.CGREvent, usageID, usageTTL); err != nil { + if mtcRLs, err = rS.matchingResourcesForEvent(tnt, args, usageID, usageTTL); err != nil { return err } defer mtcRLs.unlock() @@ -799,11 +799,11 @@ func (rS *ResourceService) V1AuthorizeResources(args utils.ArgRSv1ResourceUsage, } // V1AllocateResources is called when a resource requires allocation -func (rS *ResourceService) V1AllocateResources(args utils.ArgRSv1ResourceUsage, reply *string) (err error) { - if args.CGREvent == nil { +func (rS *ResourceService) V1AllocateResources(args *utils.CGREvent, reply *string) (err error) { + if args == nil { return utils.NewErrMandatoryIeMissing(utils.Event) } - if missing := utils.MissingStructFields(args.CGREvent, []string{utils.ID, utils.Event}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(args, []string{utils.ID, utils.Event}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } usageID := rS.cgrcfg.ResourceSCfg().Opts.UsageID @@ -845,7 +845,7 @@ func (rS *ResourceService) V1AllocateResources(args utils.ArgRSv1ResourceUsage, } usageTTL := utils.DurationPointer(ttl) var mtcRLs Resources - if mtcRLs, err = rS.matchingResourcesForEvent(tnt, args.CGREvent, usageID, + if mtcRLs, err = rS.matchingResourcesForEvent(tnt, args, usageID, usageTTL); err != nil { return err } @@ -876,11 +876,11 @@ func (rS *ResourceService) V1AllocateResources(args utils.ArgRSv1ResourceUsage, } // V1ReleaseResources is called when we need to clear an allocation -func (rS *ResourceService) V1ReleaseResources(args utils.ArgRSv1ResourceUsage, reply *string) (err error) { - if args.CGREvent == nil { +func (rS *ResourceService) V1ReleaseResources(args *utils.CGREvent, reply *string) (err error) { + if args == nil { return utils.NewErrMandatoryIeMissing(utils.Event) } - if missing := utils.MissingStructFields(args.CGREvent, []string{utils.ID, utils.Event}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(args, []string{utils.ID, utils.Event}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } usageID := rS.cgrcfg.ResourceSCfg().Opts.UsageID @@ -922,7 +922,7 @@ func (rS *ResourceService) V1ReleaseResources(args utils.ArgRSv1ResourceUsage, r } usageTTL := utils.DurationPointer(ttl) var mtcRLs Resources - if mtcRLs, err = rS.matchingResourcesForEvent(tnt, args.CGREvent, usageID, + if mtcRLs, err = rS.matchingResourcesForEvent(tnt, args, usageID, usageTTL); err != nil { return } diff --git a/engine/z_resources_test.go b/engine/z_resources_test.go index 1a0b24ff2..381a53f15 100644 --- a/engine/z_resources_test.go +++ b/engine/z_resources_test.go @@ -928,24 +928,20 @@ func TestResourceV1AuthorizeResourceMissingStruct(t *testing.T) { t.Errorf("Error: %+v", err) } var reply *string - argsMissingTenant := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "id1", - Event: map[string]interface{}{}, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "test1", // ResourceUsage Identifier - utils.OptsResourcesUnits: 20, - }, + argsMissingTenant := &utils.CGREvent{ + ID: "id1", + Event: map[string]interface{}{}, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "test1", // ResourceUsage Identifier + utils.OptsResourcesUnits: 20, }, } - argsMissingUsageID := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "id1", - Event: map[string]interface{}{}, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUnits: 20, - }, + argsMissingUsageID := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "id1", + Event: map[string]interface{}{}, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUnits: 20, }, } if err := resService.V1AuthorizeResources(argsMissingTenant, reply); err != nil && err.Error() != "MANDATORY_IE_MISSING: [Event]" { @@ -2652,16 +2648,14 @@ func TestResourceAllocateResourceOtherDB(t *testing.T) { } var reply string exp := rProf.ID - if err := rs.V1AllocateResources(utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "ef0f554", - Event: map[string]interface{}{"": ""}, - APIOpts: map[string]interface{}{ - "Resource": "RL_DB", - utils.OptsResourcesUsageID: "56156434-2e44-4f16-a766-086f10b413cd", - utils.OptsResourcesUnits: 1, - }, + if err := rs.V1AllocateResources(&utils.CGREvent{ + Tenant: "cgrates.org", + ID: "ef0f554", + Event: map[string]interface{}{"": ""}, + APIOpts: map[string]interface{}{ + "Resource": "RL_DB", + utils.OptsResourcesUsageID: "56156434-2e44-4f16-a766-086f10b413cd", + utils.OptsResourcesUnits: 1, }, }, &reply); err != nil { t.Fatal(err) @@ -3209,15 +3203,13 @@ func TestResourcesV1ResourcesForEventOK(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "ResourcesForEventTest", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_TEST1", - }, + args := &utils.CGREvent{ + ID: "ResourcesForEventTest", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_TEST1", }, } @@ -3235,7 +3227,7 @@ func TestResourcesV1ResourcesForEventOK(t *testing.T) { }, dirty: utils.BoolPointer(false), tUsage: utils.Float64Pointer(10), - ttl: utils.DurationPointer(time.Minute), + ttl: utils.DurationPointer(72 * time.Hour), TTLIdx: []string{}, }, } @@ -3286,16 +3278,14 @@ func TestResourcesV1ResourcesForEventNotFound(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "ResourcesForEventTest", - Event: map[string]interface{}{ - utils.AccountField: "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_TEST1", - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "ResourcesForEventTest", + Event: map[string]interface{}{ + utils.AccountField: "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_TEST1", }, } @@ -3344,24 +3334,20 @@ func TestResourcesV1ResourcesForEventMissingParameters(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{} - experr := `MANDATORY_IE_MISSING: [Event]` var reply Resources - if err := rS.V1ResourcesForEvent(args, &reply); err == nil || + if err := rS.V1ResourcesForEvent(nil, &reply); err == nil || err.Error() != experr { t.Errorf("expected: <%+v>, \nreceived: <%+v>", experr, err) } - args = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_TEST2", - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_TEST2", }, } @@ -3371,13 +3357,11 @@ func TestResourcesV1ResourcesForEventMissingParameters(t *testing.T) { t.Errorf("expected: <%+v>, \nreceived: <%+v>", experr, err) } - args = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "ResourcesForEventTest", - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_TEST3", - }, + args = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "ResourcesForEventTest", + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_TEST3", }, } @@ -3387,13 +3371,11 @@ func TestResourcesV1ResourcesForEventMissingParameters(t *testing.T) { t.Errorf("expected: <%+v>, \nreceived: <%+v>", experr, err) } - args = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "ResourcesForEventTest", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, + args = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "ResourcesForEventTest", + Event: map[string]interface{}{ + utils.AccountField: "1001", }, } @@ -3455,15 +3437,13 @@ func TestResourcesV1ResourcesForEventCacheReplyExists(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "ResourcesForEventTest", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_TEST1", - }, + args := &utils.CGREvent{ + ID: "ResourcesForEventTest", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_TEST1", }, } @@ -3552,15 +3532,13 @@ func TestResourcesV1ResourcesForEventCacheReplySet(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "ResourcesForEventTest", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_TEST1", - }, + args := &utils.CGREvent{ + ID: "ResourcesForEventTest", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_TEST1", }, } @@ -3578,7 +3556,7 @@ func TestResourcesV1ResourcesForEventCacheReplySet(t *testing.T) { }, dirty: utils.BoolPointer(false), tUsage: utils.Float64Pointer(10), - ttl: utils.DurationPointer(time.Minute), + ttl: utils.DurationPointer(72 * time.Hour), TTLIdx: []string{}, }, } @@ -3593,7 +3571,7 @@ func TestResourcesV1ResourcesForEventCacheReplySet(t *testing.T) { if itm, has := Cache.Get(utils.CacheRPCResponses, cacheKey); has { resp := itm.(*utils.CachedRPCResponse) if !reflect.DeepEqual(*resp.Result.(*Resources), exp) { - t.Errorf("expected: <%+v>, \nreceived: <%+v>", exp, *resp.Result.(*Resources)) + t.Errorf("expected: <%+v>, \nreceived: <%+v>", utils.ToJSON(exp), utils.ToJSON(*resp.Result.(*Resources))) } } @@ -4117,17 +4095,15 @@ func TestResourcesV1AuthorizeResourcesOK(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } var reply string @@ -4165,18 +4141,16 @@ func TestResourcesV1AuthorizeResourcesNotAuthorized(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } var reply string @@ -4213,18 +4187,16 @@ func TestResourcesV1AuthorizeResourcesNoMatch(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } var reply string @@ -4261,7 +4233,9 @@ func TestResourcesV1AuthorizeResourcesNilCGREvent(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{} + args := &utils.CGREvent{ + ID: "Event", + } experr := `MANDATORY_IE_MISSING: [Event]` var reply string @@ -4297,16 +4271,14 @@ func TestResourcesV1AuthorizeResourcesMissingUsageID(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } experr := `MANDATORY_IE_MISSING: [UsageID]` @@ -4373,17 +4345,15 @@ func TestResourcesV1AuthorizeResourcesCacheReplyExists(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } @@ -4456,17 +4426,15 @@ func TestResourcesV1AuthorizeResourcesCacheReplySet(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 2, - }, + args := &utils.CGREvent{ + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 2, }, } @@ -4514,17 +4482,15 @@ func TestResourcesV1AllocateResourcesOK(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } var reply string @@ -4562,17 +4528,15 @@ func TestResourcesV1AllocateResourcesNoMatch(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } var reply string @@ -4609,16 +4573,14 @@ func TestResourcesV1AllocateResourcesMissingParameters(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } var reply string @@ -4629,14 +4591,12 @@ func TestResourcesV1AllocateResourcesMissingParameters(t *testing.T) { t.Errorf("expected: <%+v>, \nreceived: <%+v>", experr, err) } - args = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args = &utils.CGREvent{ + ID: "EventAuthorizeResource", + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } @@ -4646,16 +4606,14 @@ func TestResourcesV1AllocateResourcesMissingParameters(t *testing.T) { t.Errorf("expected: <%+v>, \nreceived: <%+v>", experr, err) } - args = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args = &utils.CGREvent{ + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } @@ -4664,14 +4622,6 @@ func TestResourcesV1AllocateResourcesMissingParameters(t *testing.T) { err.Error() != experr { t.Errorf("expected: <%+v>, \nreceived: <%+v>", experr, err) } - - args = utils.ArgRSv1ResourceUsage{} - - experr = `MANDATORY_IE_MISSING: [Event]` - if err := rS.V1AllocateResources(args, &reply); err == nil || - err.Error() != experr { - t.Errorf("expected: <%+v>, \nreceived: <%+v>", experr, err) - } } func TestResourcesV1AllocateResourcesCacheReplyExists(t *testing.T) { @@ -4729,17 +4679,15 @@ func TestResourcesV1AllocateResourcesCacheReplyExists(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAllocateResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + ID: "EventAllocateResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } @@ -4812,17 +4760,15 @@ func TestResourcesV1AllocateResourcesCacheReplySet(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAllocateResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 2, - }, + args := &utils.CGREvent{ + ID: "EventAllocateResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 2, }, } @@ -4869,17 +4815,15 @@ func TestResourcesV1AllocateResourcesResAllocErr(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } var reply string @@ -4949,17 +4893,15 @@ func TestResourcesV1AllocateResourcesProcessThErr(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, cM) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } var reply string @@ -4997,17 +4939,15 @@ func TestResourcesV1ReleaseResourcesOK(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } var reply string @@ -5050,17 +4990,15 @@ func TestResourcesV1ReleaseResourcesUsageNotFound(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } var reply string @@ -5070,17 +5008,15 @@ func TestResourcesV1ReleaseResourcesUsageNotFound(t *testing.T) { t.Errorf("Unexpected reply returned: %q", reply) } - args = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test2", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args = &utils.CGREvent{ + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test2", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } @@ -5117,17 +5053,15 @@ func TestResourcesV1ReleaseResourcesNoMatch(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } var reply string @@ -5164,16 +5098,14 @@ func TestResourcesV1ReleaseResourcesMissingParameters(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } var reply string @@ -5184,14 +5116,12 @@ func TestResourcesV1ReleaseResourcesMissingParameters(t *testing.T) { t.Errorf("expected: <%+v>, \nreceived: <%+v>", experr, err) } - args = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args = &utils.CGREvent{ + ID: "EventAuthorizeResource", + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } @@ -5201,16 +5131,14 @@ func TestResourcesV1ReleaseResourcesMissingParameters(t *testing.T) { t.Errorf("expected: <%+v>, \nreceived: <%+v>", experr, err) } - args = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args = &utils.CGREvent{ + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } @@ -5219,22 +5147,6 @@ func TestResourcesV1ReleaseResourcesMissingParameters(t *testing.T) { err.Error() != experr { t.Errorf("expected: <%+v>, \nreceived: <%+v>", experr, err) } - - args = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, - }, - } - - experr = `MANDATORY_IE_MISSING: [Event]` - if err := rS.V1ReleaseResources(args, &reply); err == nil || - err.Error() != experr { - t.Errorf("expected: <%+v>, \nreceived: <%+v>", experr, err) - } } func TestResourcesV1ReleaseResourcesCacheReplyExists(t *testing.T) { @@ -5292,18 +5204,16 @@ func TestResourcesV1ReleaseResourcesCacheReplyExists(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "EventReleaseResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "EventReleaseResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } cacheReply := "cacheReply" @@ -5375,17 +5285,15 @@ func TestResourcesV1ReleaseResourcesCacheReplySet(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, nil) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventReleaseResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 2, - }, + args := &utils.CGREvent{ + ID: "EventReleaseResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 2, }, } @@ -5466,17 +5374,15 @@ func TestResourcesV1ReleaseResourcesProcessThErr(t *testing.T) { fltrs := NewFilterS(cfg, nil, dm) rS := NewResourceService(dm, cfg, fltrs, cM) - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } var reply string @@ -5531,17 +5437,15 @@ func TestResourcesStoreResourceError(t *testing.T) { t.Fatal(err) } - args := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - ID: "EventAuthorizeResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RU_Test", - utils.OptsResourcesUsageTTL: time.Minute, - utils.OptsResourcesUnits: 5, - }, + args := &utils.CGREvent{ + ID: "EventAuthorizeResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RU_Test", + utils.OptsResourcesUsageTTL: time.Minute, + utils.OptsResourcesUnits: 5, }, } cfg.DataDbCfg().Items[utils.MetaResources].Replicate = true diff --git a/general_tests/attributes_it_test.go b/general_tests/attributes_it_test.go index f8f140e43..df4527b61 100644 --- a/general_tests/attributes_it_test.go +++ b/general_tests/attributes_it_test.go @@ -565,17 +565,15 @@ func testAttributeSProcessEventWithResource(t *testing.T) { } // Allocate 3 units for resource ResTest - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "3001", - "Destination": "3002"}, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e21", - utils.OptsResourcesUnits: 3, - }, + argsRU := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "3001", + "Destination": "3002"}, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e21", + utils.OptsResourcesUnits: 3, }, } if err := attrRPC.Call(utils.ResourceSv1AllocateResources, @@ -583,17 +581,15 @@ func testAttributeSProcessEventWithResource(t *testing.T) { t.Error(err) } // Allocate 2 units for resource ResTest - argsRU2 := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "3001", - "Destination": "3002"}, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e22", - utils.OptsResourcesUnits: 2, - }, + argsRU2 := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "3001", + "Destination": "3002"}, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e22", + utils.OptsResourcesUnits: 2, }, } if err := attrRPC.Call(utils.ResourceSv1AllocateResources, diff --git a/general_tests/filtered_replication_it_test.go b/general_tests/filtered_replication_it_test.go index 3be9d7915..4a97ef74c 100644 --- a/general_tests/filtered_replication_it_test.go +++ b/general_tests/filtered_replication_it_test.go @@ -857,17 +857,15 @@ func testFltrRplResourceProfile(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } - rEv := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - utils.AccountField: "dan", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", - utils.OptsResourcesUnits: 6, - }, + rEv := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + utils.AccountField: "dan", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", + utils.OptsResourcesUnits: 6, }, } var rsIDs string diff --git a/general_tests/filters_it_test.go b/general_tests/filters_it_test.go index d874b61eb..52cbfed65 100644 --- a/general_tests/filters_it_test.go +++ b/general_tests/filters_it_test.go @@ -436,18 +436,16 @@ func testV1FltrPopulateResources(t *testing.T) { } // Allocate 3 units for resource ResTest - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "3001", - "Destination": "3002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e21", - utils.OptsResourcesUnits: 3, - }, + argsRU := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "3001", + "Destination": "3002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e21", + utils.OptsResourcesUnits: 3, }, } if err := fltrRpc.Call(utils.ResourceSv1AllocateResources, @@ -582,18 +580,16 @@ func testV1FltrPopulateResourcesAvailableUnits(t *testing.T) { } //Allocate 9 units for resource ResTest - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "3001", - "Destination": "3002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e21", - utils.OptsResourcesUnits: 9, - }, + argsRU := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "3001", + "Destination": "3002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e21", + utils.OptsResourcesUnits: 9, }, } if err := fltrRpc.Call(utils.ResourceSv1AllocateResources, argsRU, &result); err != nil { diff --git a/general_tests/resourcesv1_it_test.go b/general_tests/resourcesv1_it_test.go index d3fdca98a..77acd49bd 100644 --- a/general_tests/resourcesv1_it_test.go +++ b/general_tests/resourcesv1_it_test.go @@ -130,44 +130,40 @@ func testV1RsSetProfile(t *testing.T) { } func testV1RsAllocate(t *testing.T) { - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "chan_1", - utils.OptsResourcesUnits: 1, - }, + cgrEv := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "chan_1", + utils.OptsResourcesUnits: 1, }, } var reply string if err := rlsV1Rpc.Call(utils.ResourceSv1AllocateResources, - argsRU, &reply); err != nil { + cgrEv, &reply); err != nil { t.Error(err) } else if reply != "Account1Channels" { t.Error("Unexpected reply returned", reply) } - argsRU2 := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "chan_2", - utils.OptsResourcesUnits: 1, - }, + cgrEv2 := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "chan_2", + utils.OptsResourcesUnits: 1, }, } if err := rlsV1Rpc.Call(utils.ResourceSv1AllocateResources, - argsRU2, &reply); err != nil { + cgrEv2, &reply); err != nil { t.Error(err) } else if reply != "Account1Channels" { t.Error("Unexpected reply returned", reply) @@ -176,17 +172,15 @@ func testV1RsAllocate(t *testing.T) { func testV1RsAuthorize(t *testing.T) { var reply *engine.Resources - args := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RandomUsageID", - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RandomUsageID", }, } if err := rlsV1Rpc.Call(utils.ResourceSv1GetResourcesForEvent, @@ -211,22 +205,20 @@ func testV1RsAuthorize(t *testing.T) { } var reply2 string - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1001", - "Destination": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "chan_1", - utils.OptsResourcesUnits: 1, - }, + cgrEv := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1001", + "Destination": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "chan_1", + utils.OptsResourcesUnits: 1, }, } if err := rlsV1Rpc.Call(utils.ResourceSv1AuthorizeResources, - &argsRU, &reply2); err.Error() != "RESOURCE_UNAUTHORIZED" { + &cgrEv, &reply2); err.Error() != "RESOURCE_UNAUTHORIZED" { t.Error(err) } } diff --git a/general_tests/route_it_test.go b/general_tests/route_it_test.go index 35d6ef29c..b28bf5673 100644 --- a/general_tests/route_it_test.go +++ b/general_tests/route_it_test.go @@ -341,23 +341,21 @@ func testV1SplSAddNewResPrf(t *testing.T) { func testV1SplSPopulateResUsage(t *testing.T) { var reply string - argsRU := utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "Event1", - Event: map[string]interface{}{ - "Account": "1002", - "Supplier": "route1", - "ResID": "ResourceSupplier1", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RandomID", - utils.OptsResourcesUnits: 4, - }, + cgrEv := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "Event1", + Event: map[string]interface{}{ + "Account": "1002", + "Supplier": "route1", + "ResID": "ResourceSupplier1", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RandomID", + utils.OptsResourcesUnits: 4, }, } if err := splSv1Rpc.Call(utils.ResourceSv1AllocateResources, - argsRU, &reply); err != nil { + cgrEv, &reply); err != nil { t.Error(err) } eAllocationMsg := "ResourceSupplier1" @@ -365,23 +363,21 @@ func testV1SplSPopulateResUsage(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", eAllocationMsg, reply) } - argsRU = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "Event2", - Event: map[string]interface{}{ - "Account": "1002", - "Supplier": "route1", - "ResID": "Resource2Supplier1", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RandomID2", - utils.OptsResourcesUnits: 7, - }, + cgrEv = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "Event2", + Event: map[string]interface{}{ + "Account": "1002", + "Supplier": "route1", + "ResID": "Resource2Supplier1", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RandomID2", + utils.OptsResourcesUnits: 7, }, } if err := splSv1Rpc.Call(utils.ResourceSv1AllocateResources, - argsRU, &reply); err != nil { + cgrEv, &reply); err != nil { t.Error(err) } eAllocationMsg = "Resource2Supplier1" @@ -389,23 +385,21 @@ func testV1SplSPopulateResUsage(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", eAllocationMsg, reply) } - argsRU = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "Event3", - Event: map[string]interface{}{ - "Account": "1002", - "Supplier": "route2", - "ResID": "ResourceSupplier2", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RandomID3", - utils.OptsResourcesUnits: 7, - }, + cgrEv = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "Event3", + Event: map[string]interface{}{ + "Account": "1002", + "Supplier": "route2", + "ResID": "ResourceSupplier2", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RandomID3", + utils.OptsResourcesUnits: 7, }, } if err := splSv1Rpc.Call(utils.ResourceSv1AllocateResources, - argsRU, &reply); err != nil { + cgrEv, &reply); err != nil { t.Error(err) } eAllocationMsg = "ResourceSupplier2" @@ -413,23 +407,21 @@ func testV1SplSPopulateResUsage(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", eAllocationMsg, reply) } - argsRU = utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "Event4", - Event: map[string]interface{}{ - "Account": "1002", - "Supplier": "route3", - "ResID": "ResourceSupplier3", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "RandomID4", - utils.OptsResourcesUnits: 7, - }, + cgrEv = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "Event4", + Event: map[string]interface{}{ + "Account": "1002", + "Supplier": "route3", + "ResID": "ResourceSupplier3", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "RandomID4", + utils.OptsResourcesUnits: 7, }, } if err := splSv1Rpc.Call(utils.ResourceSv1AllocateResources, - argsRU, &reply); err != nil { + cgrEv, &reply); err != nil { t.Error(err) } eAllocationMsg = "ResourceSupplier3" diff --git a/general_tests/routes_cases_it_test.go b/general_tests/routes_cases_it_test.go index ec6c11b96..17bdbe921 100644 --- a/general_tests/routes_cases_it_test.go +++ b/general_tests/routes_cases_it_test.go @@ -653,17 +653,15 @@ func testV1RtsCasesSortingRoutesLowestCostDefaultUsage(t *testing.T) { func testV1RtsCasesSortingRoutesLCSetStatsAndResForMatching(t *testing.T) { //not gonna match our vendor1 filter because 6 > 5 - ev := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", - utils.OptsResourcesUnits: 6, - }, + ev := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", + utils.OptsResourcesUnits: 6, }, } var reply string @@ -758,17 +756,15 @@ func testV1RtsCasesSortingRoutesLowestCostStats(t *testing.T) { func testV1RtsCasesSortingRoutesLowestCosMatchingAllRoutes(t *testing.T) { // deallocate resources for matching vendor1 - evRes := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", - utils.OptsResourcesUnits: 4, - }, + evRes := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", + utils.OptsResourcesUnits: 4, }, } var result string @@ -1147,17 +1143,15 @@ func testV1RtsCasesSortingRoutesQOSNotFound(t *testing.T) { } func testV1RtsCasesSortingRoutesAllocateResources(t *testing.T) { - ev := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", - utils.OptsResourcesUnits: 6, - }, + ev := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", + utils.OptsResourcesUnits: 6, }, } var reply string @@ -1168,17 +1162,15 @@ func testV1RtsCasesSortingRoutesAllocateResources(t *testing.T) { t.Errorf("Unexpected reply returned: %s", reply) } - ev = &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1004", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e31", - utils.OptsResourcesUnits: 7, - }, + ev = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1004", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e31", + utils.OptsResourcesUnits: 7, }, } if err := rtsCaseSv1Rpc.Call(utils.ResourceSv1AllocateResources, @@ -1232,17 +1224,15 @@ func testV1RtsCasesSortingRoutesReasNotAllRoutes(t *testing.T) { } func testV1RtsCasesSortingRoutesReasAllRoutes(t *testing.T) { - evRs := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", - utils.OptsResourcesUnits: 9, - }, + evRs := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", + utils.OptsResourcesUnits: 9, }, } var replyStr string @@ -1479,17 +1469,15 @@ func testV1RtsCasesSortRoutesHigherCostAllocateRes(t *testing.T) { // to match route 1, RES_GRP2 must have *gte available 6 resources // first we have to remove them var result string - evRs := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1004", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e31", - utils.OptsResourcesUnits: 7, - }, + evRs := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1004", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e31", + utils.OptsResourcesUnits: 7, }, } if err := rtsCaseSv1Rpc.Call(utils.ResourceSv1ReleaseResources, @@ -1499,17 +1487,15 @@ func testV1RtsCasesSortRoutesHigherCostAllocateRes(t *testing.T) { t.Errorf("Unexpected result returned: %s", result) } - evRs = &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", - utils.OptsResourcesUnits: 7, - }, + evRs = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", + utils.OptsResourcesUnits: 7, }, } if err := rtsCaseSv1Rpc.Call(utils.ResourceSv1ReleaseResources, @@ -1519,17 +1505,15 @@ func testV1RtsCasesSortRoutesHigherCostAllocateRes(t *testing.T) { t.Errorf("Unexpected result returned: %s", result) } - evRs = &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1004", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e31", - utils.OptsResourcesUnits: 1, - }, + evRs = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1004", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e31", + utils.OptsResourcesUnits: 1, }, } if err := rtsCaseSv1Rpc.Call(utils.ResourceSv1AllocateResources, @@ -1540,17 +1524,15 @@ func testV1RtsCasesSortRoutesHigherCostAllocateRes(t *testing.T) { } // also, to not match route2, totalUsage of RES_GRP1 must be lower than 9 - evRs = &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", - utils.OptsResourcesUnits: 4, - }, + evRs = &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", + utils.OptsResourcesUnits: 4, }, } if err := rtsCaseSv1Rpc.Call(utils.ResourceSv1AllocateResources, @@ -1611,16 +1593,14 @@ func testV1RtsCasesSortRoutesHigherCostV1V3(t *testing.T) { func testV1RtsCasesSortRoutesHigherCostAllRoutes(t *testing.T) { //allocate for matching all routes - evRs := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: utils.UUIDSha1Prefix(), - Event: map[string]interface{}{ - "Account": "1002"}, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", - utils.OptsResourcesUnits: 9, - }, + evRs := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + "Account": "1002"}, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51", + utils.OptsResourcesUnits: 9, }, } var result string diff --git a/general_tests/tutorial_calls_test.go b/general_tests/tutorial_calls_test.go index 6451ee305..61d96ae34 100644 --- a/general_tests/tutorial_calls_test.go +++ b/general_tests/tutorial_calls_test.go @@ -306,18 +306,16 @@ func testCallStatMetricsBefore(t *testing.T) { func testCallCheckResourceBeforeAllocation(t *testing.T) { var rs *engine.Resources - args := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "ResourceEvent", - Event: map[string]interface{}{ - utils.AccountField: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "OriginID", - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "ResourceEvent", + Event: map[string]interface{}{ + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "OriginID", }, } if err := tutorialCallsRpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &rs); err != nil { @@ -459,18 +457,16 @@ func testCallCall1003To1001SecondTime(t *testing.T) { // Check if the resource was Allocated func testCallCheckResourceAllocation(t *testing.T) { var rs *engine.Resources - args := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "ResourceAllocation", - Event: map[string]interface{}{ - utils.AccountField: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "OriginID1", - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "ResourceAllocation", + Event: map[string]interface{}{ + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "OriginID1", }, } if err := tutorialCallsRpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &rs); err != nil { @@ -651,18 +647,16 @@ func testCallStatMetrics(t *testing.T) { func testCallCheckResourceRelease(t *testing.T) { var rs *engine.Resources - args := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "ResourceRelease", - Event: map[string]interface{}{ - utils.AccountField: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "OriginID2", - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "ResourceRelease", + Event: map[string]interface{}{ + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "OriginID2", }, } if err := tutorialCallsRpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &rs); err != nil { @@ -730,18 +724,16 @@ func testCallSyncSessions(t *testing.T) { } //check if resource was allocated for 2 calls(1001->1002;1001->1003) var rs *engine.Resources - args := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "AllocateResource", - Event: map[string]interface{}{ - utils.AccountField: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - }, - APIOpts: map[string]interface{}{ - utils.OptsResourcesUsageID: "OriginID3", - }, + args := &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "AllocateResource", + Event: map[string]interface{}{ + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + }, + APIOpts: map[string]interface{}{ + utils.OptsResourcesUsageID: "OriginID3", }, } if err := tutorialCallsRpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &rs); err != nil { diff --git a/sessions/sessions.go b/sessions/sessions.go index 4d7eec5f8..22226ba69 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -385,20 +385,18 @@ func (sS *SessionS) forceSTerminate(s *Session, extraUsage time.Duration, tUsage // release the resources for the session if len(sS.cgrCfg.SessionSCfg().ResSConns) != 0 && s.ResourceID != "" { var reply string - argsRU := &utils.ArgRSv1ResourceUsage{ - CGREvent: &utils.CGREvent{ - Tenant: s.Tenant, - ID: utils.GenUUID(), - Event: s.EventStart, - APIOpts: s.OptsStart, - }, + cgrEv := &utils.CGREvent{ + Tenant: s.Tenant, + ID: utils.GenUUID(), + Event: s.EventStart, + APIOpts: s.OptsStart, } - argsRU.APIOpts[utils.OptsResourcesUsageID] = s.ResourceID - argsRU.APIOpts[utils.OptsResourcesUnits] = 1 - argsRU.SetCloneable(true) + cgrEv.APIOpts[utils.OptsResourcesUsageID] = s.ResourceID + cgrEv.APIOpts[utils.OptsResourcesUnits] = 1 + cgrEv.SetCloneable(true) if err := sS.connMgr.Call(sS.cgrCfg.SessionSCfg().ResSConns, nil, utils.ResourceSv1ReleaseResources, - argsRU, &reply); err != nil { + cgrEv, &reply); err != nil { utils.Logger.Warning( fmt.Sprintf("<%s> error: %s could not release resource with resourceID: %s", utils.SessionS, err.Error(), s.ResourceID)) @@ -2016,13 +2014,10 @@ func (sS *SessionS) BiRPCv1AuthorizeEvent(clnt rpcclient.ClientConnector, originID = utils.UUIDSha1Prefix() } var allocMsg string - attrRU := &utils.ArgRSv1ResourceUsage{ - CGREvent: args.CGREvent, - } - attrRU.APIOpts[utils.OptsResourcesUsageID] = originID - attrRU.APIOpts[utils.OptsResourcesUnits] = 1 + args.CGREvent.APIOpts[utils.OptsResourcesUsageID] = originID + args.CGREvent.APIOpts[utils.OptsResourcesUnits] = 1 if err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().ResSConns, nil, utils.ResourceSv1AuthorizeResources, - attrRU, &allocMsg); err != nil { + args.CGREvent, &allocMsg); err != nil { return utils.NewErrResourceS(err) } authReply.ResourceAllocation = &allocMsg @@ -2283,14 +2278,11 @@ func (sS *SessionS) BiRPCv1InitiateSession(clnt rpcclient.ClientConnector, if originID == "" { return utils.NewErrMandatoryIeMissing(utils.OriginID) } - attrRU := &utils.ArgRSv1ResourceUsage{ - CGREvent: args.CGREvent, - } - attrRU.APIOpts[utils.OptsResourcesUsageID] = originID - attrRU.APIOpts[utils.OptsResourcesUnits] = 1 + args.CGREvent.APIOpts[utils.OptsResourcesUsageID] = originID + args.CGREvent.APIOpts[utils.OptsResourcesUnits] = 1 var allocMessage string if err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().ResSConns, nil, - utils.ResourceSv1AllocateResources, attrRU, &allocMessage); err != nil { + utils.ResourceSv1AllocateResources, args.CGREvent, &allocMessage); err != nil { return utils.NewErrResourceS(err) } rply.ResourceAllocation = &allocMessage @@ -2699,13 +2691,10 @@ func (sS *SessionS) BiRPCv1TerminateSession(clnt rpcclient.ClientConnector, return utils.NewErrMandatoryIeMissing(utils.OriginID) } var reply string - argsRU := &utils.ArgRSv1ResourceUsage{ - CGREvent: args.CGREvent, - } - argsRU.APIOpts[utils.OptsResourcesUsageID] = originID // same ID should be accepted by first group since the previous resource should be expired - argsRU.APIOpts[utils.OptsResourcesUnits] = 1 + args.CGREvent.APIOpts[utils.OptsResourcesUsageID] = originID // same ID should be accepted by first group since the previous resource should be expired + args.CGREvent.APIOpts[utils.OptsResourcesUnits] = 1 if err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().ResSConns, nil, utils.ResourceSv1ReleaseResources, - argsRU, &reply); err != nil { + args.CGREvent, &reply); err != nil { return utils.NewErrResourceS(err) } } @@ -2978,14 +2967,11 @@ func (sS *SessionS) BiRPCv1ProcessMessage(clnt rpcclient.ClientConnector, if originID == "" { return utils.NewErrMandatoryIeMissing(utils.OriginID) } - attrRU := &utils.ArgRSv1ResourceUsage{ - CGREvent: args.CGREvent, - } - attrRU.APIOpts[utils.OptsResourcesUsageID] = originID - attrRU.APIOpts[utils.OptsResourcesUnits] = 1 + args.CGREvent.APIOpts[utils.OptsResourcesUsageID] = originID + args.CGREvent.APIOpts[utils.OptsResourcesUnits] = 1 var allocMessage string if err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().ResSConns, nil, utils.ResourceSv1AllocateResources, - attrRU, &allocMessage); err != nil { + args.CGREvent, &allocMessage); err != nil { return utils.NewErrResourceS(err) } rply.ResourceAllocation = &allocMessage @@ -3333,20 +3319,16 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, if originID == "" { return utils.NewErrMandatoryIeMissing(utils.OriginID) } - - attrRU := &utils.ArgRSv1ResourceUsage{ - CGREvent: cgrEv, - } - attrRU.APIOpts[utils.OptsResourcesUsageID] = originID - attrRU.APIOpts[utils.OptsResourcesUnits] = 1 - attrRU.SetCloneable(true) + args.CGREvent.APIOpts[utils.OptsResourcesUsageID] = originID + args.CGREvent.APIOpts[utils.OptsResourcesUnits] = 1 + cgrEv.SetCloneable(true) var resMessage string // check what we need to do for resources (*authorization/*allocation) //check for subflags and convert them into utils.FlagsWithParams switch { case resOpt.Has(utils.MetaAuthorize): if err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().ResSConns, nil, utils.ResourceSv1AuthorizeResources, - attrRU, &resMessage); err != nil { + args.CGREvent, &resMessage); err != nil { if blockError { return utils.NewErrResourceS(err) } @@ -3357,7 +3339,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, } case resOpt.Has(utils.MetaAllocate): if err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().ResSConns, nil, utils.ResourceSv1AllocateResources, - attrRU, &resMessage); err != nil { + args.CGREvent, &resMessage); err != nil { if blockError { return utils.NewErrResourceS(err) } @@ -3368,7 +3350,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, } case resOpt.Has(utils.MetaRelease): if err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().ResSConns, nil, utils.ResourceSv1ReleaseResources, - attrRU, &resMessage); err != nil { + args.CGREvent, &resMessage); err != nil { if blockError { return utils.NewErrResourceS(err) } diff --git a/sessions/sessionscover_test.go b/sessions/sessionscover_test.go index ef2644d05..cddecd389 100644 --- a/sessions/sessionscover_test.go +++ b/sessions/sessionscover_test.go @@ -340,6 +340,7 @@ func TestForceSTerminatorReleaseSession(t *testing.T) { NextAutoDebit: utils.TimePointer(time.Date(2020, time.April, 18, 23, 0, 0, 0, time.UTC)), }, }, + OptsStart: engine.MapEvent{}, Chargeable: true, } @@ -937,6 +938,7 @@ func TestDebitLoopSessionWarningSessions(t *testing.T) { debitStop: make(chan struct{}), EventStart: engine.NewMapEvent(nil), DebitInterval: 18, + OptsStart: engine.MapEvent{}, SRuns: []*SRun{ {Event: engine.NewMapEvent(nil), CD: &engine.CallDescriptor{Category: "test"}, @@ -2498,7 +2500,7 @@ func TestBiRPCv1AuthorizeEvent2(t *testing.T) { return nil }, utils.ResourceSv1AuthorizeResources: func(args interface{}, reply interface{}) error { - if args.(*utils.ArgRSv1ResourceUsage).Tenant == "new_tenant" { + if args.(*utils.CGREvent).Tenant == "new_tenant" { return utils.ErrNotImplemented } return nil @@ -2537,6 +2539,7 @@ func TestBiRPCv1AuthorizeEvent2(t *testing.T) { Event: map[string]interface{}{ utils.Usage: "10s", }, + APIOpts: map[string]interface{}{}, } args := NewV1AuthorizeArgs(false, []string{}, false, []string{}, false, []string{}, false, true, @@ -2620,9 +2623,10 @@ func TestBiRPCv1AuthorizeEventWithDigest(t *testing.T) { utils.AttributeSv1ProcessEvent: func(args interface{}, reply interface{}) error { cgrEv := engine.AttrSProcessEventReply{ CGREvent: &utils.CGREvent{ - ID: "TestID", - Tenant: "cgrates.org", - Event: map[string]interface{}{}, + ID: "TestID", + Tenant: "cgrates.org", + Event: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } *reply.(*engine.AttrSProcessEventReply) = cgrEv @@ -2637,6 +2641,7 @@ func TestBiRPCv1AuthorizeEventWithDigest(t *testing.T) { Event: map[string]interface{}{ utils.Usage: "10s", }, + APIOpts: map[string]interface{}{}, }, }, } @@ -2644,7 +2649,7 @@ func TestBiRPCv1AuthorizeEventWithDigest(t *testing.T) { return nil }, utils.ResourceSv1AuthorizeResources: func(args interface{}, reply interface{}) error { - if args.(*utils.ArgRSv1ResourceUsage).Tenant == "new_tenant" { + if args.(*utils.CGREvent).Tenant == "new_tenant" { return utils.ErrNotImplemented } return nil @@ -2694,6 +2699,7 @@ func TestBiRPCv1AuthorizeEventWithDigest(t *testing.T) { Event: map[string]interface{}{ utils.Usage: "10s", }, + APIOpts: map[string]interface{}{}, } args := NewV1AuthorizeArgs(true, []string{}, true, []string{}, true, []string{}, true, true, @@ -2737,6 +2743,7 @@ func TestBiRPCv1InitiateSession1(t *testing.T) { Event: map[string]interface{}{ utils.Usage: "10s", }, + APIOpts: map[string]interface{}{}, }, }, } @@ -2744,13 +2751,13 @@ func TestBiRPCv1InitiateSession1(t *testing.T) { return nil }, utils.ResourceSv1AuthorizeResources: func(args interface{}, reply interface{}) error { - if args.(*utils.ArgRSv1ResourceUsage).Tenant == "new_tenant" { + if args.(*utils.CGREvent).Tenant == "new_tenant" { return utils.ErrNotImplemented } return nil }, utils.ResourceSv1AllocateResources: func(args interface{}, reply interface{}) error { - usageID := utils.IfaceAsString(args.(*utils.ArgRSv1ResourceUsage).APIOpts[utils.OptsResourcesUsageID]) + usageID := utils.IfaceAsString(args.(*utils.CGREvent).APIOpts[utils.OptsResourcesUsageID]) if usageID == "ORIGIN_ID" { return utils.ErrNotImplemented } @@ -2761,6 +2768,17 @@ func TestBiRPCv1InitiateSession1(t *testing.T) { len(attrIDs) != 0 { return utils.ErrNotImplemented } + attrRply := engine.AttrSProcessEventReply{ + CGREvent: &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "TestID", + Event: map[string]interface{}{ + utils.Usage: "10s", + }, + APIOpts: map[string]interface{}{}, + }, + } + *reply.(*engine.AttrSProcessEventReply) = attrRply return nil }, }, @@ -2786,6 +2804,7 @@ func TestBiRPCv1InitiateSession1(t *testing.T) { utils.Usage: "10s", utils.OriginID: "TEST_ID", }, + APIOpts: map[string]interface{}{}, } args := NewV1InitSessionArgs(true, []string{}, false, []string{}, false, []string{}, true, false, @@ -2897,7 +2916,7 @@ func TestBiRPCv1InitiateSession2(t *testing.T) { return nil }, utils.ResourceSv1AuthorizeResources: func(args interface{}, reply interface{}) error { - if args.(*utils.ArgRSv1ResourceUsage).Tenant == "new_tenant" { + if args.(*utils.CGREvent).Tenant == "new_tenant" { return utils.ErrNotImplemented } return nil @@ -2998,9 +3017,10 @@ func TestBiRPCv1InitiateSessionWithDigest(t *testing.T) { utils.AttributeSv1ProcessEvent: func(args interface{}, reply interface{}) error { cgrEv := engine.AttrSProcessEventReply{ CGREvent: &utils.CGREvent{ - ID: "TestID", - Tenant: "cgrates.org", - Event: map[string]interface{}{}, + ID: "TestID", + Tenant: "cgrates.org", + Event: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } *reply.(*engine.AttrSProcessEventReply) = cgrEv @@ -3015,6 +3035,7 @@ func TestBiRPCv1InitiateSessionWithDigest(t *testing.T) { Event: map[string]interface{}{ utils.Usage: "10s", }, + APIOpts: map[string]interface{}{}, }, }, } @@ -3070,6 +3091,7 @@ func TestBiRPCv1InitiateSessionWithDigest(t *testing.T) { utils.Usage: "10s", utils.OriginID: "ORIGIND_ID", }, + APIOpts: map[string]interface{}{}, } args := NewV1InitSessionArgs(true, []string{}, @@ -3408,7 +3430,7 @@ func TestBiRPCv1TerminateSession2(t *testing.T) { clnt := &testMockClients{ calls: map[string]func(args interface{}, reply interface{}) error{ utils.ResourceSv1ReleaseResources: func(args interface{}, reply interface{}) error { - if args.(*utils.ArgRSv1ResourceUsage).Tenant == "CHANGED_ID" { + if args.(*utils.CGREvent).Tenant == "CHANGED_ID" { return nil } return utils.ErrNotImplemented @@ -3432,6 +3454,7 @@ func TestBiRPCv1TerminateSession2(t *testing.T) { utils.Usage: "10s", utils.OriginID: "TEST_ID", }, + APIOpts: map[string]interface{}{}, } args := NewV1TerminateSessionArgs(false, true, false, nil, false, nil, cgrEvent, true) var reply string @@ -3589,7 +3612,7 @@ func TestBiRPCv1ProcessMessage2(t *testing.T) { clnt := &testMockClients{ calls: map[string]func(args interface{}, reply interface{}) error{ utils.ResourceSv1AllocateResources: func(args interface{}, reply interface{}) error { - usageID := utils.IfaceAsString(args.(*utils.ArgRSv1ResourceUsage).APIOpts[utils.OptsResourcesUsageID]) + usageID := utils.IfaceAsString(args.(*utils.CGREvent).APIOpts[utils.OptsResourcesUsageID]) if usageID == "ORIGIN_ID" { return nil } @@ -3640,6 +3663,7 @@ func TestBiRPCv1ProcessMessage2(t *testing.T) { Event: map[string]interface{}{ utils.Usage: "10s", }, + APIOpts: map[string]interface{}{}, } args := NewV1ProcessMessageArgs(false, []string{}, @@ -3952,6 +3976,7 @@ func TestBiRPCv1ProcessEventResources(t *testing.T) { utils.Subject: "ANY2CNT", utils.Destination: "1002", }, + APIOpts: map[string]interface{}{}, }, } diff --git a/utils/apitpdata.go b/utils/apitpdata.go index ede4dc9dd..998e94cff 100644 --- a/utils/apitpdata.go +++ b/utils/apitpdata.go @@ -900,41 +900,6 @@ type TPActivationInterval struct { ExpiryTime string } -type ArgRSv1ResourceUsage struct { - *CGREvent - UsageID string // ResourceUsage Identifier - UsageTTL *time.Duration - Units float64 - clnb bool //rpcclonable -} - -// SetCloneable sets if the args should be clonned on internal connections -func (attr *ArgRSv1ResourceUsage) SetCloneable(rpcCloneable bool) { - attr.clnb = rpcCloneable -} - -// RPCClone implements rpcclient.RPCCloner interface -func (attr *ArgRSv1ResourceUsage) RPCClone() (interface{}, error) { - if !attr.clnb { - return attr, nil - } - return attr.Clone(), nil -} - -// Clone creates a clone of the object -func (attr *ArgRSv1ResourceUsage) Clone() *ArgRSv1ResourceUsage { - var usageTTL *time.Duration - if attr.UsageTTL != nil { - usageTTL = DurationPointer(*attr.UsageTTL) - } - return &ArgRSv1ResourceUsage{ - UsageID: attr.UsageID, - UsageTTL: usageTTL, - Units: attr.Units, - CGREvent: attr.CGREvent.Clone(), - } -} - type ArgsComputeFilterIndexIDs struct { Tenant string Context string diff --git a/utils/apitpdata_test.go b/utils/apitpdata_test.go index 92a03fe43..c0cba9a95 100644 --- a/utils/apitpdata_test.go +++ b/utils/apitpdata_test.go @@ -649,55 +649,6 @@ func TestRPCCDRsFilterAsCDRsFilter(t *testing.T) { } } -func TestArgRSv1ResourceUsageCloneCase1(t *testing.T) { - expectedArgRSv1 := &ArgRSv1ResourceUsage{ - clnb: true, - } - newArgRSv1 := new(ArgRSv1ResourceUsage) - newArgRSv1.SetCloneable(true) - if !reflect.DeepEqual(expectedArgRSv1, newArgRSv1) { - t.Errorf("Expected %+v, received %+v", expectedArgRSv1, newArgRSv1) - } -} - -func TestArgRSv1ResourceUsageCloneCase2(t *testing.T) { - newArgRSv1 := &ArgRSv1ResourceUsage{ - CGREvent: &CGREvent{ - Tenant: "*req.CGRID", - APIOpts: map[string]interface{}{ - OptsResourcesUsageID: "randomID", - OptsResourcesUsageTTL: "2", - OptsResourcesUnits: 1, - }, - }, - } - if replyArgRsv1, err := newArgRSv1.RPCClone(); err != nil { - t.Error(err) - } else if !reflect.DeepEqual(newArgRSv1, replyArgRsv1) { - t.Errorf("Expected %+v \n, received %+v", ToJSON(newArgRSv1), ToJSON(replyArgRsv1)) - } -} - -func TestArgRSv1ResourceUsageCloneCase3(t *testing.T) { - newArgRSv1 := &ArgRSv1ResourceUsage{ - CGREvent: &CGREvent{ - Tenant: "*req.CGRID", - Event: map[string]interface{}{}, - APIOpts: map[string]interface{}{ - OptsResourcesUsageID: "randomID", - OptsResourcesUsageTTL: "2", - OptsResourcesUnits: 1, - }, - }, - clnb: true, - } - if replyArgRsv1, err := newArgRSv1.RPCClone(); err != nil { - t.Error(err) - } else if newArgRSv1.clnb = false; !reflect.DeepEqual(newArgRSv1, replyArgRsv1) { - t.Errorf("Expected %+v \n, received %+v", ToJSON(newArgRSv1), ToJSON(replyArgRsv1)) - } -} - func TestTPActivationIntervalAsActivationInterval(t *testing.T) { tPActivationInterval := &TPActivationInterval{ ActivationTime: "2019-04-04T11:45:26.371Z",