uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-25 09:08:45 +05:00
Code Issues Packages Projects Releases Wiki Activity

move resources to dedicated package

Browse Source
This commit is contained in:
ionutboangiu
2025-04-29 02:04:00 +03:00
committed by Dan Christian Bogos
parent 40c2c11158
commit eeecae4576
68 changed files with 3191 additions and 3433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
general_tests/attributes_it_test.go
View File

@@ -533,7 +533,7 @@ func testAttributeSProcessEventWithStatFull(t *testing.T) {
func testAttributeSProcessEventWithResource(t *testing.T) {
//create a resourceProfile
rlsConfig := &engine.ResourceProfile{
rlsConfig := &utils.ResourceProfile{
Tenant: "cgrates.org",
ID: "ResTest",
UsageTTL: time.Minute,
@@ -548,13 +548,13 @@ func testAttributeSProcessEventWithResource(t *testing.T) {
}
var result string
if err := attrRPC.Call(context.Background(), utils.AdminSv1SetResourceProfile, &engine.ResourceProfileWithAPIOpts{ResourceProfile: rlsConfig}, &result); err != nil {
if err := attrRPC.Call(context.Background(), utils.AdminSv1SetResourceProfile, &utils.ResourceProfileWithAPIOpts{ResourceProfile: rlsConfig}, &result); err != nil {
t.Error(err)
} else if result != utils.OK {
t.Error("Unexpected reply returned", result)
}
var reply *engine.ResourceProfile
var reply *utils.ResourceProfile
if err := attrRPC.Call(context.Background(), utils.AdminSv1GetResourceProfile,
&utils.TenantID{Tenant: "cgrates.org", ID: rlsConfig.ID}, &reply); err != nil {
t.Error(err)

6
general_tests/doubleremove_it_test.go
View File

@@ -445,15 +445,15 @@ func testdoubleRemoveChargerProfile(t *testing.T) {
func testdoubleRemoveResourceProfile(t *testing.T) {
// check
var reply *engine.ResourceProfile
var reply *utils.ResourceProfile
if err := doubleRemoveRPC.Call(context.Background(), utils.AdminSv1GetResourceProfile,
&utils.TenantID{Tenant: doubleRemoveTenant, ID: "RESOURCE_PROFILE"}, &reply); err == nil ||
err.Error() != utils.ErrNotFound.Error() {
t.Error(err)
}
// set
resPrf := &engine.ResourceProfileWithAPIOpts{
ResourceProfile: &engine.ResourceProfile{
resPrf := &utils.ResourceProfileWithAPIOpts{
ResourceProfile: &utils.ResourceProfile{
Tenant: doubleRemoveTenant,
ID: "RESOURCE_PROFILE",
FilterIDs: []string{"*string:~*req.Account:1001"},

4
general_tests/export_it_test.go
View File

@@ -327,7 +327,7 @@ func testExpVerifyThresholds(t *testing.T) {
}
func testExpVerifyResources(t *testing.T) {
rPrf := &engine.ResourceProfile{
rPrf := &utils.ResourceProfile{
Tenant: "cgrates.org",
ID: "RES_ACNT_1001",
FilterIDs: []string{"FLTR_ACCOUNT_1001"},
@@ -344,7 +344,7 @@ func testExpVerifyResources(t *testing.T) {
if *utils.Encoding == utils.MetaGOB {
rPrf.ThresholdIDs = nil
}
var reply *engine.ResourceProfile
var reply *utils.ResourceProfile
if err := expRpc.Call(context.Background(), utils.AdminSv1GetResourceProfile,
&utils.TenantID{Tenant: "cgrates.org", ID: "RES_ACNT_1001"}, &reply); err != nil {
t.Error(err)

6
general_tests/filtered_replication_it_test.go
View File

@@ -740,8 +740,8 @@ func testFltrRplThresholdProfile(t *testing.T) {
// func testFltrRplResourceProfile(t *testing.T) {
// resID := "RES1"
// resPrf := &engine.ResourceProfileWithAPIOpts{
// ResourceProfile: &engine.ResourceProfile{
// resPrf := &utils.ResourceProfileWithAPIOpts{
// ResourceProfile: &utils.ResourceProfile{
// Tenant: "cgrates.org",
// ID: resID,
// FilterIDs: []string{"*string:~*req.Account:dan"},
@@ -759,7 +759,7 @@ func testFltrRplThresholdProfile(t *testing.T) {
// Usages: make(map[string]*engine.ResourceUsage),
// }
// var result string
// var replyPrfl *engine.ResourceProfile
// var replyPrfl *utils.ResourceProfile
// var rplyIDs []string
// var replyRs engine.Resource

12
general_tests/filters_it_test.go
View File

@@ -432,7 +432,7 @@ func testV1FltrGetThresholdForEvent2(t *testing.T) {
func testV1FltrPopulateResources(t *testing.T) {
//create a resourceProfile
rlsConfig := &engine.ResourceProfile{
rlsConfig := &utils.ResourceProfile{
Tenant: "cgrates.org",
ID: "ResTest",
UsageTTL: time.Minute,
@@ -448,13 +448,13 @@ func testV1FltrPopulateResources(t *testing.T) {
}
var result string
if err := fltrRpc.Call(context.Background(), utils.AdminSv1SetResourceProfile, &engine.ResourceProfileWithAPIOpts{ResourceProfile: rlsConfig}, &result); err != nil {
if err := fltrRpc.Call(context.Background(), utils.AdminSv1SetResourceProfile, &utils.ResourceProfileWithAPIOpts{ResourceProfile: rlsConfig}, &result); err != nil {
t.Error(err)
} else if result != utils.OK {
t.Error("Unexpected reply returned", result)
}
var reply *engine.ResourceProfile
var reply *utils.ResourceProfile
if err := fltrRpc.Call(context.Background(), utils.AdminSv1GetResourceProfile,
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{
@@ -593,7 +593,7 @@ func testV1FltrPopulateResources(t *testing.T) {
func testV1FltrPopulateResourcesAvailableUnits(t *testing.T) {
//create a resourceProfile
rlsConfig := &engine.ResourceProfile{
rlsConfig := &utils.ResourceProfile{
Tenant: "cgrates.org",
ID: "RES_TEST",
UsageTTL: time.Minute,
@@ -609,13 +609,13 @@ func testV1FltrPopulateResourcesAvailableUnits(t *testing.T) {
}
var result string
if err := fltrRpc.Call(context.Background(), utils.AdminSv1SetResourceProfile, &engine.ResourceProfileWithAPIOpts{ResourceProfile: rlsConfig}, &result); err != nil {
if err := fltrRpc.Call(context.Background(), utils.AdminSv1SetResourceProfile, &utils.ResourceProfileWithAPIOpts{ResourceProfile: rlsConfig}, &result); err != nil {
t.Error(err)
} else if result != utils.OK {
t.Error("Unexpected reply returned", result)
}
var reply *engine.ResourceProfile
var reply *utils.ResourceProfile
if err := fltrRpc.Call(context.Background(), utils.AdminSv1GetResourceProfile,
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{

15
general_tests/resourcesv1_it_test.go
View File

@@ -28,6 +28,7 @@ import (
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/resources"
"github.com/cgrates/cgrates/utils"
)
@@ -97,8 +98,8 @@ func testV1RsRpcConn(t *testing.T) {
}
func testV1RsSetProfile(t *testing.T) {
rls := &engine.ResourceProfileWithAPIOpts{
ResourceProfile: &engine.ResourceProfile{
rls := &utils.ResourceProfileWithAPIOpts{
ResourceProfile: &utils.ResourceProfile{
Tenant: "cgrates.org",
ID: "RES_GR_TEST",
FilterIDs: []string{"*string:~*req.Account:1001"},
@@ -163,7 +164,7 @@ func testV1RsAllocate(t *testing.T) {
}
func testV1RsAuthorize(t *testing.T) {
var reply *engine.Resources
var reply *resources.Resources
args := &utils.CGREvent{
Tenant: "cgrates.org",
ID: utils.UUIDSha1Prefix(),
@@ -189,11 +190,11 @@ func testV1RsAuthorize(t *testing.T) {
if len(*reply) != 1 {
t.Errorf("Expecting: %+v, received: %+v", 1, len(*reply))
}
if (*reply)[0].ID != "RES_GR_TEST" {
t.Errorf("Expecting: %+v, received: %+v", "RES_GR_TEST", (*reply)[0].ID)
if (*reply)[0].Resource.ID != "RES_GR_TEST" {
t.Errorf("Expecting: %+v, received: %+v", "RES_GR_TEST", (*reply)[0].Resource.ID)
}
if len((*reply)[0].Usages) != 2 {
t.Errorf("Expecting: %+v, received: %+v", 2, len((*reply)[0].Usages))
if len((*reply)[0].Resource.Usages) != 2 {
t.Errorf("Expecting: %+v, received: %+v", 2, len((*reply)[0].Resource.Usages))
}
var reply2 string

16
general_tests/route_it_test.go
View File

@@ -295,8 +295,8 @@ func testV1SplSAddNewSplPrf(t *testing.T) {
func testV1SplSAddNewResPrf(t *testing.T) {
var result string
//add ResourceSupplier1
rPrf := &engine.ResourceProfileWithAPIOpts{
ResourceProfile: &engine.ResourceProfile{
rPrf := &utils.ResourceProfileWithAPIOpts{
ResourceProfile: &utils.ResourceProfile{
Tenant: "cgrates.org",
ID: "ResourceSupplier1",
FilterIDs: []string{"*string:~*req.Supplier:route1", "*string:~*req.ResID:ResourceSupplier1"},
@@ -318,8 +318,8 @@ func testV1SplSAddNewResPrf(t *testing.T) {
t.Error("Unexpected reply returned", result)
}
//add Resource2Supplier1
rPrf2 := &engine.ResourceProfileWithAPIOpts{
ResourceProfile: &engine.ResourceProfile{
rPrf2 := &utils.ResourceProfileWithAPIOpts{
ResourceProfile: &utils.ResourceProfile{
Tenant: "cgrates.org",
ID: "Resource2Supplier1",
FilterIDs: []string{"*string:~*req.Supplier:route1", "*string:~*req.ResID:Resource2Supplier1"},
@@ -341,8 +341,8 @@ func testV1SplSAddNewResPrf(t *testing.T) {
t.Error("Unexpected reply returned", result)
}
//add ResourceSupplier2
rPrf3 := &engine.ResourceProfileWithAPIOpts{
ResourceProfile: &engine.ResourceProfile{
rPrf3 := &utils.ResourceProfileWithAPIOpts{
ResourceProfile: &utils.ResourceProfile{
Tenant: "cgrates.org",
ID: "ResourceSupplier2",
FilterIDs: []string{"*string:~*req.Supplier:route2", "*string:~*req.ResID:ResourceSupplier2"},
@@ -364,8 +364,8 @@ func testV1SplSAddNewResPrf(t *testing.T) {
t.Error("Unexpected reply returned", result)
}
//add ResourceSupplier2
rPrf4 := &engine.ResourceProfileWithAPIOpts{
ResourceProfile: &engine.ResourceProfile{
rPrf4 := &utils.ResourceProfileWithAPIOpts{
ResourceProfile: &utils.ResourceProfile{
Tenant: "cgrates.org",
ID: "ResourceSupplier3",
FilterIDs: []string{"*string:~*req.Supplier:route3", "*string:~*req.ResID:ResourceSupplier3"},

20
general_tests/routes_cases_it_test.go
View File

@@ -1353,15 +1353,15 @@ func testV1RtsCasesSortingRoutesReasNotAllRoutes(t *testing.T) {
{
RouteID: "vendor1",
SortingData: map[string]any{
utils.ResourceUsage: 6.0,
utils.Weight: 0.,
utils.ResourceUsageStr: 6.0,
utils.Weight: 0.,
},
},
{
RouteID: "vendor2",
SortingData: map[string]any{
utils.ResourceUsage: 7.0,
utils.Weight: 0.,
utils.ResourceUsageStr: 7.0,
utils.Weight: 0.,
},
},
},
@@ -1412,22 +1412,22 @@ func testV1RtsCasesSortingRoutesReasAllRoutes(t *testing.T) {
{
RouteID: "vendor3",
SortingData: map[string]any{
utils.ResourceUsage: 7.0,
utils.Weight: 10.,
utils.ResourceUsageStr: 7.0,
utils.Weight: 10.,
},
},
{
RouteID: "vendor2",
SortingData: map[string]any{
utils.ResourceUsage: 7.0,
utils.Weight: 0.,
utils.ResourceUsageStr: 7.0,
utils.Weight: 0.,
},
},
{
RouteID: "vendor1",
SortingData: map[string]any{
utils.ResourceUsage: 9.0,
utils.Weight: 0.,
utils.ResourceUsageStr: 9.0,
utils.Weight: 0.,
},
},
},

8
general_tests/set_rmv_prfl_dlay_it_test.go
View File

@@ -123,8 +123,8 @@ func TestSetRemoveProfilesWithCachingDelay(t *testing.T) {
t.Run("SetResourceProfile", func(t *testing.T) {
eRscPrf := &engine.ResourceProfileWithAPIOpts{
ResourceProfile: &engine.ResourceProfile{
eRscPrf := &utils.ResourceProfileWithAPIOpts{
ResourceProfile: &utils.ResourceProfile{
Tenant: "cgrates.org",
ID: "RSC_1",
},
@@ -307,8 +307,8 @@ func TestSetRemoveProfilesWithCachingDelay(t *testing.T) {
t.Run("ReplicatorSv1SetResourceProfile", func(t *testing.T) {
eRscPrf := &engine.ResourceProfileWithAPIOpts{
ResourceProfile: &engine.ResourceProfile{
eRscPrf := &utils.ResourceProfileWithAPIOpts{
ResourceProfile: &utils.ResourceProfile{
Tenant: "cgrates.org",
ID: "RSC_2",
},