From 635bdd88b813f2f057be0217a395b5075ebe2dcf Mon Sep 17 00:00:00 2001 From: andronache Date: Mon, 15 Mar 2021 16:51:17 +0200 Subject: [PATCH] Replaced ResourceWithCache with ResourceProfileWithOpts in apier --- apier/v1/filter_indexes_it_test.go | 10 +-- apier/v1/filterindexecache_it_test.go | 6 +- apier/v1/full_remote_it_test.go | 2 +- apier/v1/remote_it_test.go | 2 +- apier/v1/replicate_it_test.go | 2 +- apier/v1/resourcesv1.go | 8 +- apier/v1/resourcesv1_it_test.go | 12 +-- apier/v2/cdrs_it_test.go | 4 +- console/resources_profile_set.go | 7 +- ers/partial_csv_it_test.go | 85 ++++++++++--------- general_tests/attributes_it_test.go | 4 +- general_tests/filtered_replication_it_test.go | 2 +- general_tests/filters_it_test.go | 4 +- general_tests/resourcesv1_it_test.go | 3 +- general_tests/route_it_test.go | 8 +- utils/coreutils.go | 4 - utils/coreutils_test.go | 4 +- 17 files changed, 80 insertions(+), 87 deletions(-) diff --git a/apier/v1/filter_indexes_it_test.go b/apier/v1/filter_indexes_it_test.go index 54f70f027..e84f201f8 100644 --- a/apier/v1/filter_indexes_it_test.go +++ b/apier/v1/filter_indexes_it_test.go @@ -716,7 +716,7 @@ func testV1FIdxSetResourceProfileIndexes(t *testing.T) { &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { t.Error(err) } - rlsConfig = &ResourceWithCache{ + rlsConfig = &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: tenant, ID: "RCFG1", @@ -809,7 +809,7 @@ func testV1FIdxSetSecondResourceProfileIndexes(t *testing.T) { &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { t.Error(err) } - rlsConfig = &ResourceWithCache{ + rlsConfig = &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: tenant, ID: "RCFG2", @@ -2877,7 +2877,7 @@ func testV1FIdxRemoveAttributeProfile(t *testing.T) { func testV1FIdxPopulateDatabase(t *testing.T) { var result string - resPrf := ResourceWithCache{ + resPrf := engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: tenant, ID: "ResProfile1", @@ -2896,7 +2896,7 @@ func testV1FIdxPopulateDatabase(t *testing.T) { } else if result != utils.OK { t.Error("Unexpected reply returned", result) } - resPrf = ResourceWithCache{ + resPrf = engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: tenant, ID: "ResProfile2", @@ -2915,7 +2915,7 @@ func testV1FIdxPopulateDatabase(t *testing.T) { } else if result != utils.OK { t.Error("Unexpected reply returned", result) } - resPrf = ResourceWithCache{ + resPrf = engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: tenant, ID: "ResProfile3", diff --git a/apier/v1/filterindexecache_it_test.go b/apier/v1/filterindexecache_it_test.go index 56ffea94c..1d4c9290d 100644 --- a/apier/v1/filterindexecache_it_test.go +++ b/apier/v1/filterindexecache_it_test.go @@ -1330,7 +1330,7 @@ func testV1FIdxCaSetResourceProfile(t *testing.T) { } else if result != utils.OK { t.Error("Unexpected reply returned", result) } - rlsConfig = &ResourceWithCache{ + rlsConfig = &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: "cgrates.org", ID: "RCFG1", @@ -1459,7 +1459,7 @@ func testV1FIdxCaUpdateResourceProfile(t *testing.T) { } else if result != utils.OK { t.Error("Unexpected reply returned", result) } - rlsConfig = &ResourceWithCache{ + rlsConfig = &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: "cgrates.org", ID: "RCFG1", @@ -1543,7 +1543,7 @@ func testV1FIdxCaUpdateResourceProfileFromTP(t *testing.T) { reply.FilterIDs = []string{"FLTR_RES_RCFG3"} reply.ActivationInterval = &utils.ActivationInterval{ActivationTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC)} - if err := tFIdxCaRpc.Call(utils.APIerSv1SetResourceProfile, &ResourceWithCache{ResourceProfile: &reply}, &result); err != nil { + if err := tFIdxCaRpc.Call(utils.APIerSv1SetResourceProfile, &engine.ResourceProfileWithOpts{ResourceProfile: &reply}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) diff --git a/apier/v1/full_remote_it_test.go b/apier/v1/full_remote_it_test.go index fee871217..82d6f8624 100644 --- a/apier/v1/full_remote_it_test.go +++ b/apier/v1/full_remote_it_test.go @@ -317,7 +317,7 @@ func testFullRemoteITResource(t *testing.T) { } var replySet string - rlsPrf := &ResourceWithCache{ + rlsPrf := &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: "cgrates.org", ID: "ResGroup1", diff --git a/apier/v1/remote_it_test.go b/apier/v1/remote_it_test.go index 108385a1f..cc8fa3d08 100644 --- a/apier/v1/remote_it_test.go +++ b/apier/v1/remote_it_test.go @@ -321,7 +321,7 @@ func testInternalRemoteITGetResource(t *testing.T) { } func testInternalRemoteITGetResourceProfile(t *testing.T) { - rlsPrf := &ResourceWithCache{ + rlsPrf := &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: "cgrates.org", ID: "ResGroup1", diff --git a/apier/v1/replicate_it_test.go b/apier/v1/replicate_it_test.go index cf540f6fa..e8fc996af 100644 --- a/apier/v1/replicate_it_test.go +++ b/apier/v1/replicate_it_test.go @@ -761,7 +761,7 @@ func testInternalReplicateITResourceProfile(t *testing.T) { t.Error(err) } // set - rlsConfig = &ResourceWithCache{ + rlsConfig = &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: "cgrates.org", ID: "RES_GR_TEST", diff --git a/apier/v1/resourcesv1.go b/apier/v1/resourcesv1.go index f2d1153ce..1578d4a80 100644 --- a/apier/v1/resourcesv1.go +++ b/apier/v1/resourcesv1.go @@ -107,14 +107,8 @@ func (apierSv1 *APIerSv1) GetResourceProfileIDs(args *utils.PaginatorWithTenant, return nil } -type ResourceWithCache struct { - *engine.ResourceProfile - Cache *string - Opts map[string]interface{} -} - //SetResourceProfile adds a new resource configuration -func (apierSv1 *APIerSv1) SetResourceProfile(arg *ResourceWithCache, reply *string) (err error) { +func (apierSv1 *APIerSv1) SetResourceProfile(arg *engine.ResourceProfileWithOpts, reply *string) (err error) { if missing := utils.MissingStructFields(arg.ResourceProfile, []string{utils.ID}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } diff --git a/apier/v1/resourcesv1_it_test.go b/apier/v1/resourcesv1_it_test.go index 2cd0df66f..d2fe2dd95 100644 --- a/apier/v1/resourcesv1_it_test.go +++ b/apier/v1/resourcesv1_it_test.go @@ -37,7 +37,7 @@ var ( rlsV1Cfg *config.CGRConfig rlsV1Rpc *rpc.Client rlsV1ConfDIR string //run tests for specific configuration - rlsConfig *ResourceWithCache + rlsConfig *engine.ResourceProfileWithOpts sTestsRLSV1 = []func(t *testing.T){ testV1RsLoadConfig, @@ -664,7 +664,7 @@ func testV1RsGetResourceProfileBeforeSet(t *testing.T) { } func testV1RsSetResourceProfile(t *testing.T) { - rlsConfig = &ResourceWithCache{ + rlsConfig = &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: "cgrates.org", ID: "RES_GR_TEST", @@ -780,7 +780,7 @@ func testV1RsResourcePing(t *testing.T) { } func testV1RsMatchNotFound(t *testing.T) { - rlsConfig = &ResourceWithCache{ + rlsConfig = &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: "cgrates.org", ID: "Res_NotFound", @@ -821,7 +821,7 @@ func testV1RsMatchNotFound(t *testing.T) { } func testV1RsAllocateUnlimited(t *testing.T) { - rlsConfig = &ResourceWithCache{ + rlsConfig = &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: "cgrates.org", ID: "RES_ULTIMITED", @@ -891,7 +891,7 @@ func testV1RsStopEngine(t *testing.T) { } func testV1RsGetResourceProfileWithoutTenant(t *testing.T) { - rlsConfig = &ResourceWithCache{ + rlsConfig = &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ ID: "RES_ULTIMITED2", FilterIDs: []string{"*string:~*req.CustomField:UnlimitedEvent"}, @@ -943,7 +943,7 @@ func testV1RsRemResourceProfileWithoutTenant(t *testing.T) { } func testV1RsSetResourceProfileWithOpts(t *testing.T) { - rlsCfg := &ResourceWithCache{ + rlsCfg := &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: "cgrates.org", ID: "TEST_WITH_OPTS", diff --git a/apier/v2/cdrs_it_test.go b/apier/v2/cdrs_it_test.go index 02f8f3a1f..6bc60f6a8 100644 --- a/apier/v2/cdrs_it_test.go +++ b/apier/v2/cdrs_it_test.go @@ -442,7 +442,9 @@ func testV2CDRsDifferentTenants(t *testing.T) { Blocker: false, Weight: 10, }, - Cache: utils.StringPointer(utils.MetaReload), + Opts: map[string]interface{}{ + utils.CacheOpt: utils.MetaReload, + }, } alsPrf.Compile() var result string diff --git a/console/resources_profile_set.go b/console/resources_profile_set.go index 9b1157f09..3595db4ce 100644 --- a/console/resources_profile_set.go +++ b/console/resources_profile_set.go @@ -19,7 +19,6 @@ along with this program. If not, see package console import ( - v1 "github.com/cgrates/cgrates/apier/v1" "github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/utils" ) @@ -28,7 +27,7 @@ func init() { c := &CmdSetResource{ name: "resources_profile_set", rpcMethod: utils.APIerSv1SetResourceProfile, - rpcParams: &v1.ResourceWithCache{}, + rpcParams: &engine.ResourceProfileWithOpts{}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} @@ -38,7 +37,7 @@ func init() { type CmdSetResource struct { name string rpcMethod string - rpcParams *v1.ResourceWithCache + rpcParams *engine.ResourceProfileWithOpts *CommandExecuter } @@ -52,7 +51,7 @@ func (self *CmdSetResource) RpcMethod() string { func (self *CmdSetResource) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &v1.ResourceWithCache{ + self.rpcParams = &engine.ResourceProfileWithOpts{ ResourceProfile: new(engine.ResourceProfile), Opts: make(map[string]interface{}), } diff --git a/ers/partial_csv_it_test.go b/ers/partial_csv_it_test.go index c284a31d4..ceae1a4e0 100644 --- a/ers/partial_csv_it_test.go +++ b/ers/partial_csv_it_test.go @@ -400,47 +400,7 @@ func TestPartialCSVServe1(t *testing.T) { t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, result) } } -func TestPartialCSVServe2(t *testing.T) { - cfg := config.NewDefaultCGRConfig() - cfg.ERsCfg().Readers = []*config.EventReaderCfg{ - { - ID: utils.MetaDefault, - Type: utils.MetaNone, - RowLength: 0, - FieldSep: ",", - HeaderDefineChar: ":", - RunDelay: -1, - ConcurrentReqs: 1024, - SourcePath: "/var/spool/cgrates/ers/in", - ProcessedPath: "/var/spool/cgrates/ers/out", - XMLRootPath: utils.HierarchyPath{utils.EmptyString}, - Tenant: nil, - Timezone: utils.EmptyString, - Filters: []string{}, - Flags: utils.FlagsWithParams{}, - Fields: nil, - CacheDumpFields: nil, - Opts: make(map[string]interface{}), - }, - } - fltr := &engine.FilterS{} - testStruct := &PartialCSVFileER{ - cgrCfg: cfg, - cfgIdx: 0, - fltrS: fltr, - cache: nil, - rdrDir: "/var/spool/cgrates/ers/in", - rdrEvents: nil, - rdrError: nil, - rdrExit: nil, - conReqs: nil, - } - err := testStruct.Serve() - if err == nil || err.Error() != "no such file or directory" { - t.Errorf("\nExpected <%+v>, \nReceived <%+v>", "no such file or directory", err) - } -} func TestPartialCSVServe3(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.ERsCfg().Readers = []*config.EventReaderCfg{ @@ -565,3 +525,48 @@ func TestPartialCSVProcessFile2(t *testing.T) { t.Errorf("\nExpected <%+v>, \nReceived <%+v>", "open : no such file or directory", err) } } + +/* + +func TestPartialCSVServe2(t *testing.T) { + cfg := config.NewDefaultCGRConfig() + cfg.ERsCfg().Readers = []*config.EventReaderCfg{ + { + ID: utils.MetaDefault, + Type: utils.MetaNone, + RowLength: 0, + FieldSep: ",", + HeaderDefineChar: ":", + RunDelay: -1, + ConcurrentReqs: 1024, + SourcePath: "/var/spool/cgrates/ers/in", + ProcessedPath: "/var/spool/cgrates/ers/out", + XMLRootPath: utils.HierarchyPath{utils.EmptyString}, + Tenant: nil, + Timezone: utils.EmptyString, + Filters: []string{}, + Flags: utils.FlagsWithParams{}, + Fields: nil, + CacheDumpFields: nil, + Opts: make(map[string]interface{}), + }, + } + fltr := &engine.FilterS{} + testStruct := &PartialCSVFileER{ + cgrCfg: cfg, + cfgIdx: 0, + fltrS: fltr, + cache: nil, + rdrDir: "/var/spool/cgrates/ers/in", + rdrEvents: nil, + rdrError: nil, + rdrExit: nil, + conReqs: nil, + } + + err := testStruct.Serve() + if err == nil || err.Error() != "no such file or directory" { + t.Errorf("\nExpected <%+v>, \nReceived <%+v>", "no such file or directory", err) + } +} +*/ diff --git a/general_tests/attributes_it_test.go b/general_tests/attributes_it_test.go index c60846bd7..c34362d15 100644 --- a/general_tests/attributes_it_test.go +++ b/general_tests/attributes_it_test.go @@ -28,8 +28,6 @@ import ( "testing" "time" - v1 "github.com/cgrates/cgrates/apier/v1" - "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/utils" @@ -559,7 +557,7 @@ func testAttributeSProcessEventWithResource(t *testing.T) { } var result string - if err := attrRPC.Call(utils.APIerSv1SetResourceProfile, &v1.ResourceWithCache{ResourceProfile: rlsConfig}, &result); err != nil { + if err := attrRPC.Call(utils.APIerSv1SetResourceProfile, &engine.ResourceProfileWithOpts{ResourceProfile: rlsConfig}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) diff --git a/general_tests/filtered_replication_it_test.go b/general_tests/filtered_replication_it_test.go index 27316f5c1..bfa9e2811 100644 --- a/general_tests/filtered_replication_it_test.go +++ b/general_tests/filtered_replication_it_test.go @@ -740,7 +740,7 @@ func testFltrRplStatQueueProfile(t *testing.T) { func testFltrRplResourceProfile(t *testing.T) { resID := "RES1" - resPrf := &v1.ResourceWithCache{ + resPrf := &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: "cgrates.org", ID: resID, diff --git a/general_tests/filters_it_test.go b/general_tests/filters_it_test.go index 3e23f2312..62995fe16 100644 --- a/general_tests/filters_it_test.go +++ b/general_tests/filters_it_test.go @@ -417,7 +417,7 @@ func testV1FltrPopulateResources(t *testing.T) { } var result string - if err := fltrRpc.Call(utils.APIerSv1SetResourceProfile, &v1.ResourceWithCache{ResourceProfile: rlsConfig}, &result); err != nil { + if err := fltrRpc.Call(utils.APIerSv1SetResourceProfile, &engine.ResourceProfileWithOpts{ResourceProfile: rlsConfig}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) @@ -562,7 +562,7 @@ func testV1FltrPopulateResourcesAvailableUnits(t *testing.T) { } var result string - if err := fltrRpc.Call(utils.APIerSv1SetResourceProfile, &v1.ResourceWithCache{ResourceProfile: rlsConfig}, &result); err != nil { + if err := fltrRpc.Call(utils.APIerSv1SetResourceProfile, &engine.ResourceProfileWithOpts{ResourceProfile: rlsConfig}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) diff --git a/general_tests/resourcesv1_it_test.go b/general_tests/resourcesv1_it_test.go index f830ff209..f4c8d9f97 100644 --- a/general_tests/resourcesv1_it_test.go +++ b/general_tests/resourcesv1_it_test.go @@ -25,7 +25,6 @@ import ( "testing" "time" - v1 "github.com/cgrates/cgrates/apier/v1" "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/utils" @@ -105,7 +104,7 @@ func testV1RsRpcConn(t *testing.T) { } func testV1RsSetProfile(t *testing.T) { - rls := &v1.ResourceWithCache{ + rls := &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: "cgrates.org", ID: "RES_GR_TEST", diff --git a/general_tests/route_it_test.go b/general_tests/route_it_test.go index b0cea9675..1e1ccadb0 100644 --- a/general_tests/route_it_test.go +++ b/general_tests/route_it_test.go @@ -245,7 +245,7 @@ func testV1SplSAddNewSplPrf(t *testing.T) { func testV1SplSAddNewResPrf(t *testing.T) { var result string //add ResourceSupplier1 - rPrf := &v1.ResourceWithCache{ + rPrf := &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: "cgrates.org", ID: "ResourceSupplier1", @@ -268,7 +268,7 @@ func testV1SplSAddNewResPrf(t *testing.T) { t.Error("Unexpected reply returned", result) } //add Resource2Supplier1 - rPrf2 := &v1.ResourceWithCache{ + rPrf2 := &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: "cgrates.org", ID: "Resource2Supplier1", @@ -291,7 +291,7 @@ func testV1SplSAddNewResPrf(t *testing.T) { t.Error("Unexpected reply returned", result) } //add ResourceSupplier2 - rPrf3 := &v1.ResourceWithCache{ + rPrf3 := &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: "cgrates.org", ID: "ResourceSupplier2", @@ -314,7 +314,7 @@ func testV1SplSAddNewResPrf(t *testing.T) { t.Error("Unexpected reply returned", result) } //add ResourceSupplier2 - rPrf4 := &v1.ResourceWithCache{ + rPrf4 := &engine.ResourceProfileWithOpts{ ResourceProfile: &engine.ResourceProfile{ Tenant: "cgrates.org", ID: "ResourceSupplier3", diff --git a/utils/coreutils.go b/utils/coreutils.go index ee554d742..65e947a0d 100644 --- a/utils/coreutils.go +++ b/utils/coreutils.go @@ -766,10 +766,6 @@ type TenantIDWithCache struct { Opts map[string]interface{} } -func (tID *TenantIDWithOpts) TenantID() string { - return ConcatenatedKey(tID.Tenant, tID.ID) -} - func (tID *TenantIDWithOpts) TenantIDConcatenated() string { return ConcatenatedKey(tID.Tenant, tID.ID) } diff --git a/utils/coreutils_test.go b/utils/coreutils_test.go index 785e93656..c1a87bc34 100644 --- a/utils/coreutils_test.go +++ b/utils/coreutils_test.go @@ -1260,12 +1260,12 @@ func TestTenantID(t *testing.T) { func TestTenantIDWithCache(t *testing.T) { tID := &TenantIDWithOpts{TenantID: &TenantID{Tenant: EmptyString, ID: EmptyString}} eOut := ":" - if rcv := tID.TenantID(); rcv != eOut { + if rcv := tID.TenantID.TenantID(); rcv != eOut { t.Errorf("Expecting: %q, received: %q", eOut, rcv) } tID = &TenantIDWithOpts{TenantID: &TenantID{Tenant: "cgrates.org", ID: "id"}} eOut = "cgrates.org:id" - if rcv := tID.TenantID(); rcv != eOut { + if rcv := tID.TenantID.TenantID(); rcv != eOut { t.Errorf("Expecting: %q, received: %q", eOut, rcv) } }