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

Updated tests and methods for resourcesv1.go with default tenant value

Browse Source
This commit is contained in:
porosnicuadrian
2020-10-13 17:45:12 +03:00
committed by Dan Christian Bogos
parent 0903fdbbf5
commit bce6f6acd3
2 changed files with 82 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
apier/v1/resourcesv1.go
View File

@@ -66,10 +66,14 @@ func (rsv1 *ResourceSv1) GetResource(args *utils.TenantIDWithOpts, reply *engine
// GetResourceProfile returns a resource configuration
func (apierSv1 *APIerSv1) GetResourceProfile(arg utils.TenantID, reply *engine.ResourceProfile) error {
if missing := utils.MissingStructFields(&arg, []string{"Tenant", "ID"}); len(missing) != 0 { //Params missing
if missing := utils.MissingStructFields(&arg, []string{utils.ID}); len(missing) != 0 { //Params missing
return utils.NewErrMandatoryIeMissing(missing...)
}
if rcfg, err := apierSv1.DataManager.GetResourceProfile(arg.Tenant, arg.ID, true, true, utils.NonTransactional); err != nil {
tnt := utils.EmptyString
if tnt == utils.EmptyString {
tnt = apierSv1.Config.GeneralCfg().DefaultTenant
}
if rcfg, err := apierSv1.DataManager.GetResourceProfile(tnt, arg.ID, true, true, utils.NonTransactional); err != nil {
return utils.APIErrorHandler(err)
} else {
*reply = *rcfg
@@ -79,10 +83,11 @@ func (apierSv1 *APIerSv1) GetResourceProfile(arg utils.TenantID, reply *engine.R
// GetResourceProfileIDs returns list of resourceProfile IDs registered for a tenant
func (apierSv1 *APIerSv1) GetResourceProfileIDs(args utils.PaginatorWithTenant, rsPrfIDs *[]string) error {
if missing := utils.MissingStructFields(&args, []string{utils.Tenant}); len(missing) != 0 { //Params missing
return utils.NewErrMandatoryIeMissing(missing...)
tnt := args.Tenant
if tnt == utils.EmptyString {
tnt = apierSv1.Config.GeneralCfg().DefaultTenant
}
prfx := utils.ResourceProfilesPrefix + args.Tenant + ":"
prfx := utils.ResourceProfilesPrefix + tnt + ":"
keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx)
if err != nil {
return err
@@ -106,9 +111,12 @@ type ResourceWithCache struct {
//SetResourceProfile adds a new resource configuration
func (apierSv1 *APIerSv1) SetResourceProfile(arg *ResourceWithCache, reply *string) (err error) {
if missing := utils.MissingStructFields(arg.ResourceProfile, []string{"Tenant", "ID"}); len(missing) != 0 {
if missing := utils.MissingStructFields(arg.ResourceProfile, []string{utils.ID}); len(missing) != 0 {
return utils.NewErrMandatoryIeMissing(missing...)
}
if arg.Tenant == utils.EmptyString {
arg.Tenant = apierSv1.Config.GeneralCfg().DefaultTenant
}
if err = apierSv1.DataManager.SetResourceProfile(arg.ResourceProfile, true); err != nil {
return utils.APIErrorHandler(err)
}
@@ -145,18 +153,22 @@ func (apierSv1 *APIerSv1) SetResourceProfile(arg *ResourceWithCache, reply *stri
//RemoveResourceProfile remove a specific resource configuration
func (apierSv1 *APIerSv1) RemoveResourceProfile(arg *utils.TenantIDWithCache, reply *string) error {
if missing := utils.MissingStructFields(arg, []string{"Tenant", "ID"}); len(missing) != 0 { //Params missing
if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
return utils.NewErrMandatoryIeMissing(missing...)
}
if err := apierSv1.DataManager.RemoveResourceProfile(arg.Tenant, arg.ID, utils.NonTransactional, true); err != nil {
tnt := arg.Tenant
if tnt == utils.EmptyString {
tnt = apierSv1.Config.GeneralCfg().DefaultTenant
}
if err := apierSv1.DataManager.RemoveResourceProfile(tnt, arg.ID, utils.NonTransactional, true); err != nil {
return utils.APIErrorHandler(err)
}
//handle caching for ResourceProfile
if err := apierSv1.CallCache(arg.Cache, arg.Tenant, utils.CacheResourceProfiles,
arg.TenantID(), nil, nil, arg.Opts); err != nil {
if err := apierSv1.CallCache(arg.Cache, tnt, utils.CacheResourceProfiles,
utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.Opts); err != nil {
return utils.APIErrorHandler(err)
}
if err := apierSv1.DataManager.RemoveResource(arg.Tenant, arg.ID, utils.NonTransactional); err != nil {
if err := apierSv1.DataManager.RemoveResource(tnt, arg.ID, utils.NonTransactional); err != nil {
return utils.APIErrorHandler(err)
}
//generate a loadID for CacheResourceProfiles and CacheResources and store it in database
@@ -166,8 +178,8 @@ func (apierSv1 *APIerSv1) RemoveResourceProfile(arg *utils.TenantIDWithCache, re
return utils.APIErrorHandler(err)
}
//handle caching for Resource
if err := apierSv1.CallCache(arg.Cache, arg.Tenant, utils.CacheResources,
arg.TenantID(), nil, nil, arg.Opts); err != nil {
if err := apierSv1.CallCache(arg.Cache, tnt, utils.CacheResources,
utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.Opts); err != nil {
return utils.APIErrorHandler(err)
}
*reply = utils.OK

57
apier/v1/resourcesv1_it_test.go
View File

@@ -63,6 +63,8 @@ var (
testV1RsResourcePing,
testV1RsMatchNotFound,
testV1RsAllocateUnlimited,
testV1RsGetResourceProfileWithoutTenant,
testV1RsRemResourceProfileWithoutTenant,
testV1RsStopEngine,
}
)
@@ -722,6 +724,9 @@ func testV1RsGetResourceProfileIDs(t *testing.T) {
expected := []string{"ResGroup2", "ResGroup1", "ResGroup3", "RES_GR_TEST"}
sort.Strings(expected)
var result []string
if err := rlsV1Rpc.Call(utils.APIerSv1GetResourceProfileIDs, utils.PaginatorWithTenant{}, &result); err != nil {
t.Error(err)
}
if err := rlsV1Rpc.Call(utils.APIerSv1GetResourceProfileIDs, utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &result); err != nil {
t.Error(err)
}
@@ -911,3 +916,55 @@ func testV1RsStopEngine(t *testing.T) {
t.Error(err)
}
}
func testV1RsGetResourceProfileWithoutTenant(t *testing.T) {
rlsConfig = &ResourceWithCache{
ResourceProfile: &engine.ResourceProfile{
ID: rlsConfig.ID,
FilterIDs: []string{"*string:~*req.CustomField:UnlimitedEvent"},
ActivationInterval: &utils.ActivationInterval{
ActivationTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC),
ExpiryTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC),
},
UsageTTL: time.Duration(1) * time.Nanosecond,
Limit: 10,
AllocationMessage: "MessageAllocation",
Blocker: true,
Stored: true,
Weight: 20,
ThresholdIDs: []string{"Val1"},
},
}
var reply string
if err := rlsV1Rpc.Call(utils.APIerSv1SetResourceProfile, rlsConfig, &reply); err != nil {
t.Error(err)
} else if reply != utils.OK {
t.Error("Unexpected reply returned", reply)
}
rlsConfig.Tenant = "cgrates.org"
var result *engine.ResourceProfile
if err := rlsV1Rpc.Call(utils.APIerSv1GetResourceProfile,
&utils.TenantID{ID: rlsConfig.ID},
&result); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(rlsConfig.ResourceProfile, result) {
t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(rlsConfig.ResourceProfile), utils.ToJSON(result))
}
}
func testV1RsRemResourceProfileWithoutTenant(t *testing.T) {
var reply string
if err := rlsV1Rpc.Call(utils.APIerSv1RemoveResourceProfile,
&utils.TenantIDWithCache{ID: rlsConfig.ID},
&reply); err != nil {
t.Error(err)
} else if reply != utils.OK {
t.Error("Unexpected reply returned", reply)
}
var result *engine.ResourceProfile
if err := rlsV1Rpc.Call(utils.APIerSv1GetResourceProfile,
&utils.TenantID{ID: rlsConfig.ID},
&result); err == nil || utils.ErrNotFound.Error() != err.Error() {
t.Error(err)
}
}