diff --git a/apier/v1/accounts.go b/apier/v1/accounts.go index 4c3bd1a7b..2ff7a6a1b 100644 --- a/apier/v1/accounts.go +++ b/apier/v1/accounts.go @@ -137,7 +137,7 @@ func (apierSv1 *APIerSv1) RemoveActionTiming(attrs *AttrRemoveActionTiming, repl } if err := apierSv1.ConnMgr.Call(apierSv1.Config.ApierCfg().CachesConns, nil, utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithOpts{ - ArgsCache: map[string][]string{utils.ActionPlanIDs: []string{attrs.ActionPlanId}}, + ArgsCache: map[string][]string{utils.ActionPlanIDs: {attrs.ActionPlanId}}, }, reply); err != nil { return 0, err } @@ -171,7 +171,7 @@ func (apierSv1 *APIerSv1) RemoveActionTiming(attrs *AttrRemoveActionTiming, repl return nil } -// Ads a new account into dataDb. If already defined, returns success. +// SetAccount adds a new account into dataDb. If already defined, returns success. func (apierSv1 *APIerSv1) SetAccount(attr *utils.AttrSetAccount, reply *string) (err error) { if missing := utils.MissingStructFields(attr, []string{"Tenant", "Account"}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) @@ -247,7 +247,7 @@ func (apierSv1 *APIerSv1) SetAccount(attr *utils.AttrSetAccount, reply *string) } if err := apierSv1.ConnMgr.Call(apierSv1.Config.ApierCfg().CachesConns, nil, utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithOpts{ - ArgsCache: map[string][]string{utils.AccountActionPlanIDs: []string{accID}, utils.ActionPlanIDs: apIDs}, + ArgsCache: map[string][]string{utils.AccountActionPlanIDs: {accID}, utils.ActionPlanIDs: apIDs}, }, reply); err != nil { return 0, err } @@ -343,7 +343,7 @@ func (apierSv1 *APIerSv1) RemoveAccount(attr *utils.AttrRemoveAccount, reply *st } if err = apierSv1.ConnMgr.Call(apierSv1.Config.ApierCfg().CachesConns, nil, utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithOpts{ - ArgsCache: map[string][]string{utils.AccountActionPlanIDs: []string{accID}}, + ArgsCache: map[string][]string{utils.AccountActionPlanIDs: {accID}}, }, reply); err != nil { return } @@ -688,7 +688,7 @@ func (apierSv1 *APIerSv1) RemoveBalances(attr *utils.AttrSetBalance, reply *stri return nil } -func (apierSv1 *APIerSv1) GetAccountsCount(attr *utils.TenantArg, reply *int) (err error) { +func (apierSv1 *APIerSv1) GetAccountsCount(attr *utils.TenantWithOpts, reply *int) (err error) { if len(attr.Tenant) == 0 { return utils.NewErrMandatoryIeMissing("Tenant") } diff --git a/apier/v1/accounts_it_test.go b/apier/v1/accounts_it_test.go index a3273cf20..fe710a732 100644 --- a/apier/v1/accounts_it_test.go +++ b/apier/v1/accounts_it_test.go @@ -516,7 +516,7 @@ func testAccITGetDisabledAccounts(t *testing.T) { } func testAccITCountAccounts(t *testing.T) { var reply int - args := &utils.TenantArg{ + args := &utils.TenantWithOpts{ Tenant: "cgrates.org", } if err := accRPC.Call(utils.APIerSv1GetAccountsCount, &args, &reply); err != nil { diff --git a/apier/v1/accounts_test.go b/apier/v1/accounts_test.go index 6e5c06d67..105338df9 100644 --- a/apier/v1/accounts_test.go +++ b/apier/v1/accounts_test.go @@ -45,15 +45,15 @@ func TestSetAccounts(t *testing.T) { iscTenant := "itsyscom.com" b10 := &engine.Balance{Value: 10, Weight: 10} cgrAcnt1 := &engine.Account{ID: utils.ConcatenatedKey(cgrTenant, "account1"), - BalanceMap: map[string]engine.Balances{utils.MONETARY + utils.META_OUT: engine.Balances{b10}}} + BalanceMap: map[string]engine.Balances{utils.MONETARY + utils.META_OUT: {b10}}} cgrAcnt2 := &engine.Account{ID: utils.ConcatenatedKey(cgrTenant, "account2"), - BalanceMap: map[string]engine.Balances{utils.MONETARY + utils.META_OUT: engine.Balances{b10}}} + BalanceMap: map[string]engine.Balances{utils.MONETARY + utils.META_OUT: {b10}}} cgrAcnt3 := &engine.Account{ID: utils.ConcatenatedKey(cgrTenant, "account3"), - BalanceMap: map[string]engine.Balances{utils.MONETARY + utils.META_OUT: engine.Balances{b10}}} + BalanceMap: map[string]engine.Balances{utils.MONETARY + utils.META_OUT: {b10}}} iscAcnt1 := &engine.Account{ID: utils.ConcatenatedKey(iscTenant, "account1"), - BalanceMap: map[string]engine.Balances{utils.MONETARY + utils.META_OUT: engine.Balances{b10}}} + BalanceMap: map[string]engine.Balances{utils.MONETARY + utils.META_OUT: {b10}}} iscAcnt2 := &engine.Account{ID: utils.ConcatenatedKey(iscTenant, "account2"), - BalanceMap: map[string]engine.Balances{utils.MONETARY + utils.META_OUT: engine.Balances{b10}}} + BalanceMap: map[string]engine.Balances{utils.MONETARY + utils.META_OUT: {b10}}} for _, account := range []*engine.Account{cgrAcnt1, cgrAcnt2, cgrAcnt3, iscAcnt1, iscAcnt2} { if err := apierAcntsAcntStorage.SetAccountDrv(account); err != nil { t.Error(err) diff --git a/apier/v1/analyzer.go b/apier/v1/analyzer.go index 0d4fed736..654973e9b 100755 --- a/apier/v1/analyzer.go +++ b/apier/v1/analyzer.go @@ -28,7 +28,7 @@ func NewAnalyzerSv1(aS *analyzers.AnalyzerService) *AnalyzerSv1 { return &AnalyzerSv1{aS: aS} } -// Exports RPC from RLs +// AnalyzerSv1 exports RPC from RLs type AnalyzerSv1 struct { aS *analyzers.AnalyzerService } @@ -40,7 +40,7 @@ func (aSv1 *AnalyzerSv1) Call(serviceMethod string, } // Ping return pong if the service is active -func (alSv1 *AnalyzerSv1) Ping(ign *utils.CGREvent, reply *string) error { +func (aSv1 *AnalyzerSv1) Ping(ign *utils.CGREvent, reply *string) error { *reply = utils.Pong return nil } diff --git a/apier/v1/api_interfaces.go b/apier/v1/api_interfaces.go index ab8d77b5b..c021ea463 100644 --- a/apier/v1/api_interfaces.go +++ b/apier/v1/api_interfaces.go @@ -167,7 +167,7 @@ type RALsV1Interface interface { } type ConfigSv1Interface interface { - GetJSONSection(section *config.StringWithOpts, reply *map[string]interface{}) (err error) + GetJSONSection(section *config.SectionWithOpts, reply *map[string]interface{}) (err error) ReloadConfigFromPath(section *config.ConfigReloadWithOpts, reply *string) (err error) ReloadConfigFromJSON(args *config.JSONReloadWithOpts, reply *string) (err error) } diff --git a/apier/v1/apier.go b/apier/v1/apier.go index 78b9114d3..b3c3a1b6d 100644 --- a/apier/v1/apier.go +++ b/apier/v1/apier.go @@ -157,7 +157,7 @@ func (apierSv1 *APIerSv1) SetDestination(attrs *utils.AttrSetDestination, reply if err := apierSv1.ConnMgr.Call(apierSv1.Config.ApierCfg().CachesConns, nil, utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithOpts{ ArgsCache: map[string][]string{utils.ReverseDestinationIDs: dest.Prefixes, - utils.DestinationIDs: []string{attrs.Id}}, + utils.DestinationIDs: {attrs.Id}}, }, reply); err != nil { return err } @@ -232,7 +232,7 @@ func (apierSv1 *APIerSv1) LoadDestination(attrs *AttrLoadDestination, reply *str } if err := apierSv1.ConnMgr.Call(apierSv1.Config.ApierCfg().CachesConns, nil, utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithOpts{ - ArgsCache: map[string][]string{utils.DestinationIDs: []string{attrs.ID}}, + ArgsCache: map[string][]string{utils.DestinationIDs: {attrs.ID}}, }, reply); err != nil { return err } @@ -451,7 +451,7 @@ func (apierSv1 *APIerSv1) SetRatingProfile(attrs *utils.AttrSetRatingProfile, re } // GetRatingProfileIDs returns list of resourceProfile IDs registered for a tenant -func (apierSv1 *APIerSv1) GetRatingProfileIDs(args *utils.TenantArgWithPaginator, rsPrfIDs *[]string) error { +func (apierSv1 *APIerSv1) GetRatingProfileIDs(args *utils.PaginatorWithTenant, rsPrfIDs *[]string) error { if missing := utils.MissingStructFields(args, []string{utils.Tenant}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } @@ -725,7 +725,7 @@ func (apierSv1 *APIerSv1) SetActionPlan(attrs *AttrSetActionPlan, reply *string) } if err := apierSv1.ConnMgr.Call(apierSv1.Config.ApierCfg().CachesConns, nil, utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithOpts{ - ArgsCache: map[string][]string{utils.ActionPlanIDs: []string{ap.Id}}, + ArgsCache: map[string][]string{utils.ActionPlanIDs: {ap.Id}}, }, reply); err != nil { return 0, err } @@ -1385,7 +1385,7 @@ func (apierSv1 *APIerSv1) ComputeActionPlanIndexes(_ string, reply *string) (err } // GetActionPlanIDs returns list of ActionPlan IDs registered for a tenant -func (apierSv1 *APIerSv1) GetActionPlanIDs(args *utils.TenantArgWithPaginator, attrPrfIDs *[]string) error { +func (apierSv1 *APIerSv1) GetActionPlanIDs(args *utils.PaginatorWithTenant, attrPrfIDs *[]string) error { prfx := utils.ACTION_PLAN_PREFIX keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(utils.ACTION_PLAN_PREFIX) if err != nil { @@ -1403,7 +1403,7 @@ func (apierSv1 *APIerSv1) GetActionPlanIDs(args *utils.TenantArgWithPaginator, a } // GetRatingPlanIDs returns list of RatingPlan IDs registered for a tenant -func (apierSv1 *APIerSv1) GetRatingPlanIDs(args *utils.TenantArgWithPaginator, attrPrfIDs *[]string) error { +func (apierSv1 *APIerSv1) GetRatingPlanIDs(args *utils.PaginatorWithTenant, attrPrfIDs *[]string) error { prfx := utils.RATING_PLAN_PREFIX keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(utils.RATING_PLAN_PREFIX) if err != nil { diff --git a/apier/v1/apier2_it_test.go b/apier/v1/apier2_it_test.go index 0013593d8..be6cbcf7f 100644 --- a/apier/v1/apier2_it_test.go +++ b/apier/v1/apier2_it_test.go @@ -298,7 +298,7 @@ func testAPIerGetRatingPlanCost3(t *testing.T) { func testAPIerGetActionPlanIDs(t *testing.T) { var reply []string if err := apierRPC.Call(utils.APIerSv1GetActionPlanIDs, - &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{Tenant: "cgrates.org"}}, + &utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &reply); err != nil { t.Error(err) } else if len(reply) != 1 { @@ -312,7 +312,7 @@ func testAPIerGetRatingPlanIDs(t *testing.T) { var reply []string expected := []string{"RP_1002_LOW", "RP_1003", "RP_1001", "RP_MMS", "RP_SMS", "RP_1002"} if err := apierRPC.Call(utils.APIerSv1GetRatingPlanIDs, - &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{Tenant: "cgrates.org"}}, + &utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &reply); err != nil { t.Error(err) } @@ -329,7 +329,7 @@ func testAPIerSetActionPlanDfltTime(t *testing.T) { hourlyAP := &AttrSetActionPlan{ Id: "AP_HOURLY", ActionPlan: []*AttrActionPlan{ - &AttrActionPlan{ + { ActionsId: "ACT_TOPUP_RST_10", Time: utils.MetaHourly, Weight: 20.0, @@ -345,7 +345,7 @@ func testAPIerSetActionPlanDfltTime(t *testing.T) { dailyAP := &AttrSetActionPlan{ Id: "AP_DAILY", ActionPlan: []*AttrActionPlan{ - &AttrActionPlan{ + { ActionsId: "ACT_TOPUP_RST_10", Time: utils.MetaDaily, Weight: 20.0, @@ -361,7 +361,7 @@ func testAPIerSetActionPlanDfltTime(t *testing.T) { weeklyAP := &AttrSetActionPlan{ Id: "AP_WEEKLY", ActionPlan: []*AttrActionPlan{ - &AttrActionPlan{ + { ActionsId: "ACT_TOPUP_RST_10", Time: utils.MetaWeekly, Weight: 20.0, @@ -377,7 +377,7 @@ func testAPIerSetActionPlanDfltTime(t *testing.T) { monthlyAP := &AttrSetActionPlan{ Id: "AP_MONTHLY", ActionPlan: []*AttrActionPlan{ - &AttrActionPlan{ + { ActionsId: "ACT_TOPUP_RST_10", Time: utils.MetaMonthly, Weight: 20.0, diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index 413e70f2b..0d2e37e0e 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -941,7 +941,7 @@ func testAPIerSv1GetRatingProfile(t *testing.T) { expectedIds := []string{"call:dan", "call:*any"} var result []string - if err := rater.Call(utils.APIerSv1GetRatingProfileIDs, &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{Tenant: "cgrates.org"}}, &result); err != nil { + if err := rater.Call(utils.APIerSv1GetRatingProfileIDs, &utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &result); err != nil { t.Error(err) } else if len(expectedIds) != len(result) { t.Errorf("Expecting : %+v, received: %+v", expected, result) diff --git a/apier/v1/attributes.go b/apier/v1/attributes.go index 0be4ad676..f983e757b 100644 --- a/apier/v1/attributes.go +++ b/apier/v1/attributes.go @@ -42,7 +42,7 @@ func (apierSv1 *APIerSv1) GetAttributeProfile(arg *utils.TenantIDWithOpts, reply } // GetAttributeProfileIDs returns list of attributeProfile IDs registered for a tenant -func (apierSv1 *APIerSv1) GetAttributeProfileIDs(args *utils.TenantArgWithPaginator, attrPrfIDs *[]string) error { +func (apierSv1 *APIerSv1) GetAttributeProfileIDs(args *utils.PaginatorWithTenant, attrPrfIDs *[]string) error { if missing := utils.MissingStructFields(args, []string{utils.Tenant}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } @@ -64,7 +64,7 @@ func (apierSv1 *APIerSv1) GetAttributeProfileIDs(args *utils.TenantArgWithPagina // GetAttributeProfileIDsCount sets in reply var the total number of AttributeProfileIDs registered for a tenant // returns ErrNotFound in case of 0 AttributeProfileIDs -func (apierSv1 *APIerSv1) GetAttributeProfileIDsCount(args *utils.TenantArg, reply *int) (err error) { +func (apierSv1 *APIerSv1) GetAttributeProfileIDsCount(args *utils.TenantWithOpts, reply *int) (err error) { if missing := utils.MissingStructFields(args, []string{utils.Tenant}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } @@ -80,6 +80,7 @@ func (apierSv1 *APIerSv1) GetAttributeProfileIDsCount(args *utils.TenantArg, rep return } +// AttributeWithCache the arguments for SetAttributeProfile type AttributeWithCache struct { *engine.AttributeProfile Cache *string @@ -141,6 +142,7 @@ func (apierSv1 *APIerSv1) RemoveAttributeProfile(arg *utils.TenantIDWithCache, r return nil } +// NewAttributeSv1 returns the RPC Object for AttributeS func NewAttributeSv1(attrS *engine.AttributeService) *AttributeSv1 { return &AttributeSv1{attrS: attrS} } @@ -168,6 +170,7 @@ func (alSv1 *AttributeSv1) ProcessEvent(args *engine.AttrArgsProcessEvent, return alSv1.attrS.V1ProcessEvent(args, reply) } +// Ping return pong if the service is active func (alSv1 *AttributeSv1) Ping(ign *utils.CGREventWithOpts, reply *string) error { *reply = utils.Pong return nil diff --git a/apier/v1/attributes_it_test.go b/apier/v1/attributes_it_test.go index 5b71ad310..d69a0f129 100644 --- a/apier/v1/attributes_it_test.go +++ b/apier/v1/attributes_it_test.go @@ -732,17 +732,17 @@ func testAttributeSProcessEventWithHeader(t *testing.T) { func testAttributeSGetAttPrfIDs(t *testing.T) { expected := []string{"ATTR_2", "ATTR_PASS", "ATTR_1", "ATTR_3", "ATTR_Header", "AttributeWithNonSubstitute"} var result []string - if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.TenantArgWithPaginator{}, &result); err == nil || + if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.PaginatorWithTenant{}, &result); err == nil || err.Error() != utils.NewErrMandatoryIeMissing("Tenant").Error() { t.Errorf("Expected error recived reply %+v with err=%v", result, err) } - if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{Tenant: "cgrates.org"}}, &result); err != nil { + if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &result); err != nil { t.Error(err) } else if len(expected) != len(result) { t.Errorf("Expecting : %+v, received: %+v", expected, result) } - if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.TenantArgWithPaginator{ - TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, + if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.PaginatorWithTenant{ + Tenant: "cgrates.org", Paginator: utils.Paginator{Limit: utils.IntPointer(10)}, }, &result); err != nil { t.Error(err) @@ -1257,7 +1257,7 @@ func testAttributeSProcessWithMultipleRuns2(t *testing.T) { func testAttributeSGetAttributeProfileIDsCount(t *testing.T) { var reply int if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDsCount, - &utils.TenantArg{Tenant: "cgrates.org"}, &reply); err != nil { + &utils.TenantWithOpts{Tenant: "cgrates.org"}, &reply); err != nil { t.Error(err) } else if reply != 7 { t.Errorf("Expecting: 7, received: %+v", reply) @@ -1273,7 +1273,7 @@ func testAttributeSGetAttributeProfileIDsCount(t *testing.T) { t.Error("Unexpected reply returned", resp) } if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDsCount, - &utils.TenantArg{Tenant: "cgrates.org"}, &reply); err != nil { + &utils.TenantWithOpts{Tenant: "cgrates.org"}, &reply); err != nil { t.Error(err) } else if reply != 6 { t.Errorf("Expecting: 6, received: %+v", reply) @@ -1288,7 +1288,7 @@ func testAttributeSGetAttributeProfileIDsCount(t *testing.T) { t.Error("Unexpected reply returned", resp) } if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDsCount, - &utils.TenantArg{Tenant: "cgrates.org"}, &reply); err != nil { + &utils.TenantWithOpts{Tenant: "cgrates.org"}, &reply); err != nil { t.Error(err) } else if reply != 5 { t.Errorf("Expecting: 5, received: %+v", reply) @@ -1303,7 +1303,7 @@ func testAttributeSGetAttributeProfileIDsCount(t *testing.T) { t.Error("Unexpected reply returned", resp) } if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDsCount, - &utils.TenantArg{Tenant: "cgrates.org"}, &reply); err != nil { + &utils.TenantWithOpts{Tenant: "cgrates.org"}, &reply); err != nil { t.Error(err) } else if reply != 4 { t.Errorf("Expecting: 4, received: %+v", reply) @@ -1318,7 +1318,7 @@ func testAttributeSGetAttributeProfileIDsCount(t *testing.T) { t.Error("Unexpected reply returned", resp) } if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDsCount, - &utils.TenantArg{Tenant: "cgrates.org"}, &reply); err != nil { + &utils.TenantWithOpts{Tenant: "cgrates.org"}, &reply); err != nil { t.Error(err) } else if reply != 3 { t.Errorf("Expecting: 3, received: %+v", reply) @@ -1333,7 +1333,7 @@ func testAttributeSGetAttributeProfileIDsCount(t *testing.T) { t.Error("Unexpected reply returned", resp) } if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDsCount, - &utils.TenantArg{Tenant: "cgrates.org"}, &reply); err != nil { + &utils.TenantWithOpts{Tenant: "cgrates.org"}, &reply); err != nil { t.Error(err) } else if reply != 2 { t.Errorf("Expecting: 2, received: %+v", reply) @@ -1348,7 +1348,7 @@ func testAttributeSGetAttributeProfileIDsCount(t *testing.T) { t.Error("Unexpected reply returned", resp) } if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDsCount, - &utils.TenantArg{Tenant: "cgrates.org"}, &reply); err != nil { + &utils.TenantWithOpts{Tenant: "cgrates.org"}, &reply); err != nil { t.Error(err) } else if reply != 1 { t.Errorf("Expecting: 1, received: %+v", reply) @@ -1363,7 +1363,7 @@ func testAttributeSGetAttributeProfileIDsCount(t *testing.T) { t.Error("Unexpected reply returned", resp) } if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDsCount, - &utils.TenantArg{Tenant: "cgrates.org"}, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { + &utils.TenantWithOpts{Tenant: "cgrates.org"}, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { t.Error(err) } } @@ -1427,7 +1427,7 @@ func testAttributeSCachingMetaNone(t *testing.T) { //check in dataManager expected := []string{"ATTR_1"} var rcvIDs []string - if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{Tenant: "cgrates.org"}}, &rcvIDs); err != nil { + if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &rcvIDs); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, rcvIDs) { t.Errorf("Expecting : %+v, received: %+v", expected, rcvIDs) @@ -1498,7 +1498,7 @@ func testAttributeSCachingMetaLoad(t *testing.T) { //check in dataManager expected := []string{"ATTR_1"} var rcvIDs []string - if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{Tenant: "cgrates.org"}}, &rcvIDs); err != nil { + if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &rcvIDs); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, rcvIDs) { t.Errorf("Expecting : %+v, received: %+v", expected, rcvIDs) @@ -1530,7 +1530,7 @@ func testAttributeSCachingMetaLoad(t *testing.T) { } //check in dataManager - if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{Tenant: "cgrates.org"}}, &rcvIDs); err == nil || + if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &rcvIDs); err == nil || err.Error() != utils.ErrNotFound.Error() { t.Fatalf("Expected error: %s received error: %s and reply: %v ", utils.ErrNotFound, err, rcvIDs) @@ -1589,7 +1589,7 @@ func testAttributeSCachingMetaReload1(t *testing.T) { //check in dataManager expected := []string{"ATTR_1"} var rcvIDs []string - if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{Tenant: "cgrates.org"}}, &rcvIDs); err != nil { + if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &rcvIDs); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, rcvIDs) { t.Errorf("Expecting : %+v, received: %+v", expected, rcvIDs) @@ -1768,7 +1768,7 @@ func testAttributeSCachingMetaRemove(t *testing.T) { //check in dataManager expected := []string{"ATTR_1"} var rcvIDs []string - if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{Tenant: "cgrates.org"}}, &rcvIDs); err != nil { + if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &rcvIDs); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, rcvIDs) { t.Errorf("Expecting : %+v, received: %+v", expected, rcvIDs) diff --git a/apier/v1/caches.go b/apier/v1/caches.go index 04cd03576..7577d1b22 100644 --- a/apier/v1/caches.go +++ b/apier/v1/caches.go @@ -30,7 +30,7 @@ func NewCacheSv1(cacheS *engine.CacheS) *CacheSv1 { return &CacheSv1{cacheS: cacheS} } -// Exports RPC from CacheS +// CacheSv1 exports RPC from CacheS type CacheSv1 struct { cacheS *engine.CacheS } diff --git a/apier/v1/caches_it_test.go b/apier/v1/caches_it_test.go index aa6248c6a..c0b01210b 100644 --- a/apier/v1/caches_it_test.go +++ b/apier/v1/caches_it_test.go @@ -390,8 +390,8 @@ func testCacheSRemoveItems(t *testing.T) { } var remReply string if err := chcRPC.Call(utils.CacheSv1RemoveItems, utils.AttrReloadCacheWithOpts{ - Opts: make(map[string]interface{}), - TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, + Opts: make(map[string]interface{}), + Tenant: "cgrates.org", ArgsCache: map[string][]string{ utils.StatsQueueProfileIDs: {"cgrates.org:Stats1"}, utils.RouteProfileIDs: {"cgrates.org:ROUTE_1"}, diff --git a/apier/v1/chargers.go b/apier/v1/chargers.go index 20ec9db3d..dccd6ee60 100644 --- a/apier/v1/chargers.go +++ b/apier/v1/chargers.go @@ -39,7 +39,7 @@ func (apierSv1 *APIerSv1) GetChargerProfile(arg *utils.TenantID, reply *engine.C } // GetChargerProfileIDs returns list of chargerProfile IDs registered for a tenant -func (apierSv1 *APIerSv1) GetChargerProfileIDs(args *utils.TenantArgWithPaginator, chPrfIDs *[]string) error { +func (apierSv1 *APIerSv1) GetChargerProfileIDs(args *utils.PaginatorWithTenant, chPrfIDs *[]string) error { if missing := utils.MissingStructFields(args, []string{utils.Tenant}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } diff --git a/apier/v1/chargers_it_test.go b/apier/v1/chargers_it_test.go index e6ecda817..c7751f856 100755 --- a/apier/v1/chargers_it_test.go +++ b/apier/v1/chargers_it_test.go @@ -382,13 +382,13 @@ func testChargerSSetChargerProfile(t *testing.T) { func testChargerSGetChargerProfileIDs(t *testing.T) { expected := []string{"Charger1", "Charger2", "ApierTest", "ChargerNotMatching"} var result []string - if err := chargerRPC.Call(utils.APIerSv1GetChargerProfileIDs, utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{Tenant: "cgrates.org"}}, &result); err != nil { + if err := chargerRPC.Call(utils.APIerSv1GetChargerProfileIDs, utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &result); err != nil { t.Error(err) } else if len(expected) != len(result) { t.Errorf("Expecting : %+v, received: %+v", expected, result) } - if err := chargerRPC.Call(utils.APIerSv1GetChargerProfileIDs, utils.TenantArgWithPaginator{ - TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, + if err := chargerRPC.Call(utils.APIerSv1GetChargerProfileIDs, utils.PaginatorWithTenant{ + Tenant: "cgrates.org", Paginator: utils.Paginator{Limit: utils.IntPointer(1)}, }, &result); err != nil { t.Error(err) diff --git a/apier/v1/config.go b/apier/v1/config.go index 78cffbb17..5cc1f241c 100644 --- a/apier/v1/config.go +++ b/apier/v1/config.go @@ -34,7 +34,7 @@ type ConfigSv1 struct { } // GetJSONSection will retrieve from CGRConfig a section -func (cSv1 *ConfigSv1) GetJSONSection(section *config.StringWithOpts, reply *map[string]interface{}) (err error) { +func (cSv1 *ConfigSv1) GetJSONSection(section *config.SectionWithOpts, reply *map[string]interface{}) (err error) { return cSv1.cfg.V1GetConfigSection(section, reply) } diff --git a/apier/v1/config_it_test.go b/apier/v1/config_it_test.go index 31e576c12..cdf332c69 100644 --- a/apier/v1/config_it_test.go +++ b/apier/v1/config_it_test.go @@ -174,7 +174,7 @@ func testConfigSReloadConfigFromJSONSessionS(t *testing.T) { exp["ThreshSConns"] = empty } var rpl map[string]interface{} - if err := configRPC.Call(utils.ConfigSv1GetJSONSection, &config.StringWithOpts{ + if err := configRPC.Call(utils.ConfigSv1GetJSONSection, &config.SectionWithOpts{ Section: config.SessionSJson, }, &rpl); err != nil { t.Error(err) @@ -227,7 +227,7 @@ func testConfigSReloadConfigFromJSONEEs(t *testing.T) { "Exporters": []interface{}{eporter}, } var rpl map[string]interface{} - if err := configRPC.Call(utils.ConfigSv1GetJSONSection, &config.StringWithOpts{ + if err := configRPC.Call(utils.ConfigSv1GetJSONSection, &config.SectionWithOpts{ Section: config.EEsJson, }, &rpl); err != nil { t.Error(err) diff --git a/apier/v1/core.go b/apier/v1/core.go index 5010c50a3..20331c527 100644 --- a/apier/v1/core.go +++ b/apier/v1/core.go @@ -29,7 +29,7 @@ func NewCoreSv1(cS *engine.CoreService) *CoreSv1 { return &CoreSv1{cS: cS} } -// Exports RPC from RLs +// CoreSv1 exports RPC from RLs type CoreSv1 struct { cS *engine.CoreService } diff --git a/apier/v1/dispatcher.go b/apier/v1/dispatcher.go index 3032c537f..178e32f0a 100755 --- a/apier/v1/dispatcher.go +++ b/apier/v1/dispatcher.go @@ -43,7 +43,7 @@ func (apierSv1 *APIerSv1) GetDispatcherProfile(arg *utils.TenantID, reply *engin } // GetDispatcherProfileIDs returns list of dispatcherProfile IDs registered for a tenant -func (apierSv1 *APIerSv1) GetDispatcherProfileIDs(tenantArg *utils.TenantArgWithPaginator, dPrfIDs *[]string) error { +func (apierSv1 *APIerSv1) GetDispatcherProfileIDs(tenantArg *utils.PaginatorWithTenant, dPrfIDs *[]string) error { if missing := utils.MissingStructFields(tenantArg, []string{utils.Tenant}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } @@ -127,7 +127,7 @@ func (apierSv1 *APIerSv1) GetDispatcherHost(arg *utils.TenantID, reply *engine.D } // GetDispatcherHostIDs returns list of dispatcherHost IDs registered for a tenant -func (apierSv1 *APIerSv1) GetDispatcherHostIDs(tenantArg *utils.TenantArgWithPaginator, dPrfIDs *[]string) error { +func (apierSv1 *APIerSv1) GetDispatcherHostIDs(tenantArg *utils.PaginatorWithTenant, dPrfIDs *[]string) error { if missing := utils.MissingStructFields(tenantArg, []string{utils.Tenant}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } @@ -805,7 +805,7 @@ type DispatcherConfigSv1 struct { dS *dispatchers.DispatcherService } -func (dS *DispatcherConfigSv1) GetJSONSection(args *config.StringWithOpts, reply *map[string]interface{}) (err error) { +func (dS *DispatcherConfigSv1) GetJSONSection(args *config.SectionWithOpts, reply *map[string]interface{}) (err error) { return dS.dS.ConfigSv1GetJSONSection(args, reply) } diff --git a/apier/v1/dispatcher_it_test.go b/apier/v1/dispatcher_it_test.go index 1b1d361c6..6ba9bdcb4 100644 --- a/apier/v1/dispatcher_it_test.go +++ b/apier/v1/dispatcher_it_test.go @@ -162,12 +162,12 @@ func testDispatcherSSetDispatcherProfile(t *testing.T) { func testDispatcherSGetDispatcherProfileIDs(t *testing.T) { var result []string if err := dispatcherRPC.Call(utils.APIerSv1GetDispatcherProfileIDs, - &utils.TenantArgWithPaginator{}, &result); err == nil { + &utils.PaginatorWithTenant{}, &result); err == nil { t.Errorf("Expected: %s , received: %v", utils.NewErrMandatoryIeMissing(utils.Tenant).Error(), err) } expected := []string{"Dsp1"} if err := dispatcherRPC.Call(utils.APIerSv1GetDispatcherProfileIDs, - &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{Tenant: dispatcherProfile.Tenant}}, &result); err != nil { + &utils.PaginatorWithTenant{Tenant: dispatcherProfile.Tenant}, &result); err != nil { t.Error(err) } else if len(result) != len(expected) { t.Errorf("Expecting : %+v, received: %+v", expected, result) @@ -285,12 +285,12 @@ func testDispatcherSSetDispatcherHost(t *testing.T) { func testDispatcherSGetDispatcherHostIDs(t *testing.T) { var result []string if err := dispatcherRPC.Call(utils.APIerSv1GetDispatcherHostIDs, - &utils.TenantArgWithPaginator{}, &result); err == nil { + &utils.PaginatorWithTenant{}, &result); err == nil { t.Errorf("Expected: %s , received: %v", utils.NewErrMandatoryIeMissing(utils.Tenant), err) } expected := []string{"DspHst1"} if err := dispatcherRPC.Call(utils.APIerSv1GetDispatcherHostIDs, - &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{Tenant: dispatcherHost.Tenant}}, &result); err != nil { + &utils.PaginatorWithTenant{Tenant: dispatcherHost.Tenant}, &result); err != nil { t.Error(err) } else if len(result) != len(expected) { t.Errorf("Expecting : %+v, received: %+v", expected, result) diff --git a/apier/v1/filterindexecache_it_test.go b/apier/v1/filterindexecache_it_test.go index 77af4d6f9..8a3c0ba11 100644 --- a/apier/v1/filterindexecache_it_test.go +++ b/apier/v1/filterindexecache_it_test.go @@ -580,7 +580,7 @@ func testV1FIdxCaSetStatQueueProfile(t *testing.T) { QueueLength: 10, TTL: time.Duration(10) * time.Second, Metrics: []*engine.MetricWithFilters{ - &engine.MetricWithFilters{ + { MetricID: "*sum:~*req.Val", }, }, @@ -743,7 +743,7 @@ func testV1FIdxCaUpdateStatQueueProfile(t *testing.T) { QueueLength: 10, TTL: time.Duration(10) * time.Second, Metrics: []*engine.MetricWithFilters{ - &engine.MetricWithFilters{ + { MetricID: "*sum:~*req.Val", }, }, diff --git a/apier/v1/filters.go b/apier/v1/filters.go index dfae09f8f..3eedc09f9 100644 --- a/apier/v1/filters.go +++ b/apier/v1/filters.go @@ -66,7 +66,7 @@ func (apierSv1 *APIerSv1) GetFilter(arg *utils.TenantID, reply *engine.Filter) e } // GetFilterIDs returns list of Filter IDs registered for a tenant -func (apierSv1 *APIerSv1) GetFilterIDs(args *utils.TenantArgWithPaginator, fltrIDs *[]string) error { +func (apierSv1 *APIerSv1) GetFilterIDs(args *utils.PaginatorWithTenant, fltrIDs *[]string) error { if missing := utils.MissingStructFields(args, []string{utils.Tenant}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } diff --git a/apier/v1/filters_it_test.go b/apier/v1/filters_it_test.go index c022c0abf..63a4d8c7d 100644 --- a/apier/v1/filters_it_test.go +++ b/apier/v1/filters_it_test.go @@ -148,7 +148,7 @@ func testFilterSetFilter(t *testing.T) { func testFilterGetFilterIDs(t *testing.T) { expected := []string{"Filter1"} var result []string - if err := filterRPC.Call(utils.APIerSv1GetFilterIDs, &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{Tenant: "cgrates.org"}}, &result); err != nil { + if err := filterRPC.Call(utils.APIerSv1GetFilterIDs, &utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &result); err != nil { t.Error(err) } else if len(expected) != len(result) { t.Errorf("Expecting : %+v, received: %+v", expected, result) diff --git a/apier/v1/libapier.go b/apier/v1/libapier.go index 41d7681e1..2d1a4d740 100644 --- a/apier/v1/libapier.go +++ b/apier/v1/libapier.go @@ -56,9 +56,9 @@ func (apierSv1 *APIerSv1) CallCache(cacheopt *string, tnt, cacheID, itemID strin case utils.MetaClear: method = utils.CacheSv1Clear args = &utils.AttrCacheIDsWithOpts{ - TenantArg: utils.TenantArg{Tenant: tnt}, - CacheIDs: []string{cacheID, utils.CacheInstanceToCacheIndex[cacheID]}, - Opts: opts, + Tenant: tnt, + CacheIDs: []string{cacheID, utils.CacheInstanceToCacheIndex[cacheID]}, + Opts: opts, } } return apierSv1.ConnMgr.Call(apierSv1.Config.ApierCfg().CachesConns, nil, @@ -69,7 +69,7 @@ func (apierSv1 *APIerSv1) CallCache(cacheopt *string, tnt, cacheID, itemID strin // for a specific CacheID func (apierSv1 *APIerSv1) composeArgsReload(tnt, cacheID, itemID string, filterIDs *[]string, contexts []string, opts map[string]interface{}) (rpl utils.AttrReloadCacheWithOpts, err error) { rpl = utils.AttrReloadCacheWithOpts{ - TenantArg: utils.TenantArg{Tenant: tnt}, + Tenant: tnt, ArgsCache: map[string][]string{ utils.CacheInstanceToArg[cacheID]: {itemID}, }, diff --git a/apier/v1/libapier_test.go b/apier/v1/libapier_test.go index e0393bffb..faf1c760b 100644 --- a/apier/v1/libapier_test.go +++ b/apier/v1/libapier_test.go @@ -31,8 +31,8 @@ import ( func TestComposeArgsReload(t *testing.T) { apv1 := &APIerSv1{} expArgs := utils.AttrReloadCacheWithOpts{ - Opts: make(map[string]interface{}), - TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, + Opts: make(map[string]interface{}), + Tenant: "cgrates.org", ArgsCache: map[string][]string{ utils.AttributeProfileIDs: {"cgrates.org:ATTR1"}, }, @@ -67,8 +67,8 @@ func TestComposeArgsReload(t *testing.T) { } expArgs = utils.AttrReloadCacheWithOpts{ - Opts: make(map[string]interface{}), - TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, + Opts: make(map[string]interface{}), + Tenant: "cgrates.org", ArgsCache: map[string][]string{ utils.StatsQueueProfileIDs: {"cgrates.org:Stat2"}, utils.StatFilterIndexIDs: { @@ -133,9 +133,9 @@ func TestCallCache(t *testing.T) { exp := &rpcRequest{ Method: utils.CacheSv1Clear, Params: &utils.AttrCacheIDsWithOpts{ - TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, - CacheIDs: []string{utils.CacheStatQueueProfiles, utils.CacheStatFilterIndexes}, - Opts: make(map[string]interface{}), + Tenant: "cgrates.org", + CacheIDs: []string{utils.CacheStatQueueProfiles, utils.CacheStatFilterIndexes}, + Opts: make(map[string]interface{}), }, } if err := apv1.CallCache(utils.StringPointer(utils.MetaClear), "cgrates.org", utils.CacheStatQueueProfiles, "", nil, nil, make(map[string]interface{})); err != nil { @@ -149,8 +149,8 @@ func TestCallCache(t *testing.T) { exp = &rpcRequest{ Method: utils.CacheSv1ReloadCache, Params: utils.AttrReloadCacheWithOpts{ - Opts: make(map[string]interface{}), - TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, + Opts: make(map[string]interface{}), + Tenant: "cgrates.org", ArgsCache: map[string][]string{ utils.StatsQueueProfileIDs: {"cgrates.org:Stat2"}, utils.StatFilterIndexIDs: { diff --git a/apier/v1/rateprofiles.go b/apier/v1/rateprofiles.go index a1c3cd0e0..0c943a036 100644 --- a/apier/v1/rateprofiles.go +++ b/apier/v1/rateprofiles.go @@ -44,7 +44,7 @@ func (apierSv1 *APIerSv1) GetRateProfile(arg *utils.TenantIDWithOpts, reply *eng } // GetRateProfileIDs returns list of rate profile IDs registered for a tenant -func (apierSv1 *APIerSv1) GetRateProfileIDs(args *utils.TenantArgWithPaginator, attrPrfIDs *[]string) error { +func (apierSv1 *APIerSv1) GetRateProfileIDs(args *utils.PaginatorWithTenant, attrPrfIDs *[]string) error { if missing := utils.MissingStructFields(args, []string{utils.Tenant}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } @@ -66,7 +66,7 @@ func (apierSv1 *APIerSv1) GetRateProfileIDs(args *utils.TenantArgWithPaginator, // GetRateProfileIDsCount sets in reply var the total number of RateProfileIDs registered for a tenant // returns ErrNotFound in case of 0 RateProfileIDs -func (apierSv1 *APIerSv1) GetRateProfileIDsCount(args *utils.TenantArg, reply *int) (err error) { +func (apierSv1 *APIerSv1) GetRateProfileIDsCount(args *utils.TenantWithOpts, reply *int) (err error) { if missing := utils.MissingStructFields(args, []string{utils.Tenant}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } diff --git a/apier/v1/rateprofiles_it_test.go b/apier/v1/rateprofiles_it_test.go index d1be2ed9c..9c72dd49c 100644 --- a/apier/v1/rateprofiles_it_test.go +++ b/apier/v1/rateprofiles_it_test.go @@ -146,18 +146,18 @@ func testV1RatePrfVerifyRateProfile(t *testing.T) { MaxCost: 0.6, MaxCostStrategy: "*free", Rates: map[string]*engine.Rate{ - "RT_WEEK": &engine.Rate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.12, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Minute), }, - &engine.IntervalRate{ + { IntervalStart: time.Duration(1 * time.Minute), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -165,12 +165,12 @@ func testV1RatePrfVerifyRateProfile(t *testing.T) { }, }, }, - "RT_WEEKEND": &engine.Rate{ + "RT_WEEKEND": { ID: "RT_WEEKEND", Weight: 10, ActivationTime: "* * * * 0,6", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -178,12 +178,12 @@ func testV1RatePrfVerifyRateProfile(t *testing.T) { }, }, }, - "RT_CHRISTMAS": &engine.Rate{ + "RT_CHRISTMAS": { ID: "RT_CHRISTMAS", Weight: 30, ActivationTime: "* * 24 12 *", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -222,12 +222,12 @@ func testV1RatePrfSetRateProfileRates(t *testing.T) { MaxCost: 0.6, MaxCostStrategy: "*free", Rates: map[string]*engine.Rate{ - "RT_WEEK": &engine.Rate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.12, Unit: time.Duration(1 * time.Minute), @@ -252,18 +252,18 @@ func testV1RatePrfSetRateProfileRates(t *testing.T) { Tenant: "cgrates.org", ID: "RP1", Rates: map[string]*engine.Rate{ - "RT_WEEK": &engine.Rate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.12, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Minute), }, - &engine.IntervalRate{ + { IntervalStart: time.Duration(1 * time.Minute), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -271,12 +271,12 @@ func testV1RatePrfSetRateProfileRates(t *testing.T) { }, }, }, - "RT_WEEKEND": &engine.Rate{ + "RT_WEEKEND": { ID: "RT_WEEKEND", Weight: 10, ActivationTime: "* * * * 0,6", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -284,12 +284,12 @@ func testV1RatePrfSetRateProfileRates(t *testing.T) { }, }, }, - "RT_CHRISTMAS": &engine.Rate{ + "RT_CHRISTMAS": { ID: "RT_CHRISTMAS", Weight: 30, ActivationTime: "* * 24 12 *", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -321,18 +321,18 @@ func testV1RatePrfSetRateProfileRates(t *testing.T) { MaxCost: 0.6, MaxCostStrategy: "*free", Rates: map[string]*engine.Rate{ - "RT_WEEK": &engine.Rate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.12, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Minute), }, - &engine.IntervalRate{ + { IntervalStart: time.Duration(1 * time.Minute), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -340,12 +340,12 @@ func testV1RatePrfSetRateProfileRates(t *testing.T) { }, }, }, - "RT_WEEKEND": &engine.Rate{ + "RT_WEEKEND": { ID: "RT_WEEKEND", Weight: 10, ActivationTime: "* * * * 0,6", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -353,12 +353,12 @@ func testV1RatePrfSetRateProfileRates(t *testing.T) { }, }, }, - "RT_CHRISTMAS": &engine.Rate{ + "RT_CHRISTMAS": { ID: "RT_CHRISTMAS", Weight: 30, ActivationTime: "* * 24 12 *", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -392,18 +392,18 @@ func testV1RatePrfRemoveRateProfileRates(t *testing.T) { MaxCost: 0.6, MaxCostStrategy: "*free", Rates: map[string]*engine.Rate{ - "RT_WEEK": &engine.Rate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.12, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Minute), }, - &engine.IntervalRate{ + { IntervalStart: time.Duration(1 * time.Minute), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -411,12 +411,12 @@ func testV1RatePrfRemoveRateProfileRates(t *testing.T) { }, }, }, - "RT_WEEKEND": &engine.Rate{ + "RT_WEEKEND": { ID: "RT_WEEKEND", Weight: 10, ActivationTime: "* * * * 0,6", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -424,12 +424,12 @@ func testV1RatePrfRemoveRateProfileRates(t *testing.T) { }, }, }, - "RT_CHRISTMAS": &engine.Rate{ + "RT_CHRISTMAS": { ID: "RT_CHRISTMAS", Weight: 30, ActivationTime: "* * 24 12 *", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -473,18 +473,18 @@ func testV1RatePrfRemoveRateProfileRates(t *testing.T) { MaxCost: 0.6, MaxCostStrategy: "*free", Rates: map[string]*engine.Rate{ - "RT_WEEK": &engine.Rate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.12, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Minute), }, - &engine.IntervalRate{ + { IntervalStart: time.Duration(1 * time.Minute), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -492,12 +492,12 @@ func testV1RatePrfRemoveRateProfileRates(t *testing.T) { }, }, }, - "RT_CHRISTMAS": &engine.Rate{ + "RT_CHRISTMAS": { ID: "RT_CHRISTMAS", Weight: 30, ActivationTime: "* * 24 12 *", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), diff --git a/apier/v1/remote_it_test.go b/apier/v1/remote_it_test.go index 03c335cfa..e743fe270 100644 --- a/apier/v1/remote_it_test.go +++ b/apier/v1/remote_it_test.go @@ -359,10 +359,10 @@ func testInternalRemoteITGetStatQueueProfile(t *testing.T) { TTL: -1, MinItems: 0, Metrics: []*engine.MetricWithFilters{ - &engine.MetricWithFilters{ + { MetricID: utils.MetaTCC, }, - &engine.MetricWithFilters{ + { MetricID: utils.MetaTCD, }, }, @@ -383,10 +383,10 @@ func testInternalRemoteITGetStatQueueProfile(t *testing.T) { TTL: -1, MinItems: 0, Metrics: []*engine.MetricWithFilters{ - &engine.MetricWithFilters{ + { MetricID: utils.MetaTCD, }, - &engine.MetricWithFilters{ + { MetricID: utils.MetaTCC, }, }, @@ -725,18 +725,18 @@ func testInternalRemoteITGetRouteProfile(t *testing.T) { MaxCost: 0.6, MaxCostStrategy: "*free", Rates: map[string]*engine.Rate{ - "RT_WEEK": &engine.Rate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.12, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Minute), }, - &engine.IntervalRate{ + { IntervalStart: time.Duration(1 * time.Minute), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -744,12 +744,12 @@ func testInternalRemoteITGetRouteProfile(t *testing.T) { }, }, }, - "RT_WEEKEND": &engine.Rate{ + "RT_WEEKEND": { ID: "RT_WEEKEND", Weight: 10, ActivationTime: "* * * * 0,6", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -757,12 +757,12 @@ func testInternalRemoteITGetRouteProfile(t *testing.T) { }, }, }, - "RT_CHRISTMAS": &engine.Rate{ + "RT_CHRISTMAS": { ID: "RT_CHRISTMAS", Weight: 30, ActivationTime: "* * 24 12 *", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -1142,10 +1142,10 @@ func testInternalReplicateStats(t *testing.T) { QueueLength: 10, TTL: time.Duration(10) * time.Second, Metrics: []*engine.MetricWithFilters{ - &engine.MetricWithFilters{ + { MetricID: utils.MetaACD, }, - &engine.MetricWithFilters{ + { MetricID: utils.MetaTCD, }, }, diff --git a/apier/v1/replicate_it_test.go b/apier/v1/replicate_it_test.go index c0bf1e472..0b0be12e9 100644 --- a/apier/v1/replicate_it_test.go +++ b/apier/v1/replicate_it_test.go @@ -301,7 +301,7 @@ func testInternalReplicateITRatingProfile(t *testing.T) { Category: "call", Subject: "Subject", RatingPlanActivations: []*utils.TPRatingActivation{ - &utils.TPRatingActivation{ + { ActivationTime: "2012-01-01T00:00:00Z", RatingPlanId: "RP_1001", FallbackSubjects: "FallbackSubjects"}, @@ -648,10 +648,10 @@ func testInternalReplicateITDispatcherHost(t *testing.T) { Tenant: "cgrates.org", ID: "DspHst1", Conns: []*config.RemoteHost{ - &config.RemoteHost{ + { Address: "*internal", }, - &config.RemoteHost{ + { Address: ":2012", Transport: utils.MetaJSON, TLS: true, @@ -928,7 +928,7 @@ func testInternalReplicateITActionPlan(t *testing.T) { atms1 := &AttrSetActionPlan{ Id: "ATMS_1", ActionPlan: []*AttrActionPlan{ - &AttrActionPlan{ + { ActionsId: "ACTS_1", Time: utils.ASAP, Weight: 20.0}, @@ -1366,18 +1366,18 @@ func testInternalReplicateITRateProfile(t *testing.T) { MaxCost: 0.6, MaxCostStrategy: "*free", Rates: map[string]*engine.Rate{ - "RT_WEEK": &engine.Rate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.12, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Minute), }, - &engine.IntervalRate{ + { IntervalStart: time.Duration(1 * time.Minute), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -1385,12 +1385,12 @@ func testInternalReplicateITRateProfile(t *testing.T) { }, }, }, - "RT_WEEKEND": &engine.Rate{ + "RT_WEEKEND": { ID: "RT_WEEKEND", Weight: 10, ActivationTime: "* * * * 0,6", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -1398,12 +1398,12 @@ func testInternalReplicateITRateProfile(t *testing.T) { }, }, }, - "RT_CHRISTMAS": &engine.Rate{ + "RT_CHRISTMAS": { ID: "RT_CHRISTMAS", Weight: 30, ActivationTime: "* * 24 12 *", IntervalRates: []*engine.IntervalRate{ - &engine.IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), diff --git a/apier/v1/resourcesv1.go b/apier/v1/resourcesv1.go index 24f82f1e6..e24a3f0b9 100644 --- a/apier/v1/resourcesv1.go +++ b/apier/v1/resourcesv1.go @@ -78,7 +78,7 @@ 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.TenantArgWithPaginator, rsPrfIDs *[]string) error { +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...) } diff --git a/apier/v1/resourcesv1_it_test.go b/apier/v1/resourcesv1_it_test.go index 1b4dd9b77..efdcf4483 100644 --- a/apier/v1/resourcesv1_it_test.go +++ b/apier/v1/resourcesv1_it_test.go @@ -716,7 +716,7 @@ 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.TenantArgWithPaginator{TenantArg: utils.TenantArg{Tenant: "cgrates.org"}}, &result); err != nil { + if err := rlsV1Rpc.Call(utils.APIerSv1GetResourceProfileIDs, utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &result); err != nil { t.Error(err) } sort.Strings(result) diff --git a/apier/v1/routes.go b/apier/v1/routes.go index 7f62bb00f..dfe2c8ed3 100644 --- a/apier/v1/routes.go +++ b/apier/v1/routes.go @@ -39,7 +39,7 @@ func (apierSv1 *APIerSv1) GetRouteProfile(arg *utils.TenantID, reply *engine.Rou } // GetRouteProfileIDs returns list of routeProfile IDs registered for a tenant -func (apierSv1 *APIerSv1) GetRouteProfileIDs(args *utils.TenantArgWithPaginator, sppPrfIDs *[]string) error { +func (apierSv1 *APIerSv1) GetRouteProfileIDs(args *utils.PaginatorWithTenant, sppPrfIDs *[]string) error { if missing := utils.MissingStructFields(args, []string{utils.Tenant}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } diff --git a/apier/v1/routes_it_test.go b/apier/v1/routes_it_test.go index 32cd67ee1..0cbc82a31 100644 --- a/apier/v1/routes_it_test.go +++ b/apier/v1/routes_it_test.go @@ -920,7 +920,7 @@ func testV1RouteGetRouteProfileIDs(t *testing.T) { "TEST_PROFILE1", "ROUTE_LOAD_DIST", "ROUTE_LCR"} var result []string if err := splSv1Rpc.Call(utils.APIerSv1GetRouteProfileIDs, - &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{"cgrates.org"}}, &result); err != nil { + &utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &result); err != nil { t.Error(err) } else if len(expected) != len(result) { t.Errorf("Expecting : %+v, received: %+v", expected, result) @@ -1043,7 +1043,7 @@ func testV1RouteGetRouteForEvent(t *testing.T) { Sorting: utils.MetaLC, SortingParameters: []string{}, Routes: []*engine.Route{ - &engine.Route{ + { ID: "route_1", FilterIDs: nil, AccountIDs: nil, @@ -1054,7 +1054,7 @@ func testV1RouteGetRouteForEvent(t *testing.T) { Blocker: false, RouteParameters: "", }, - &engine.Route{ + { ID: "route_2", FilterIDs: nil, AccountIDs: nil, diff --git a/apier/v1/schedulers_it_test.go b/apier/v1/schedulers_it_test.go index 6ab122d66..968a92e64 100644 --- a/apier/v1/schedulers_it_test.go +++ b/apier/v1/schedulers_it_test.go @@ -281,7 +281,7 @@ func testSchedExecuteAction(t *testing.T) { if err := schedRpc.Call(utils.APIerSv1SetActionPlan, &AttrSetActionPlan{ Id: "CustomAP", ActionPlan: []*AttrActionPlan{ - &AttrActionPlan{ + { ActionsId: "ACT_TOPUP_RST_10", Time: utils.MetaHourly, Weight: 20.0}, diff --git a/apier/v1/stats.go b/apier/v1/stats.go index 64bc885da..04cdc5609 100644 --- a/apier/v1/stats.go +++ b/apier/v1/stats.go @@ -40,7 +40,7 @@ func (apierSv1 *APIerSv1) GetStatQueueProfile(arg *utils.TenantID, reply *engine } // GetStatQueueProfileIDs returns list of statQueueProfile IDs registered for a tenant -func (apierSv1 *APIerSv1) GetStatQueueProfileIDs(args *utils.TenantArgWithPaginator, stsPrfIDs *[]string) error { +func (apierSv1 *APIerSv1) GetStatQueueProfileIDs(args *utils.PaginatorWithTenant, stsPrfIDs *[]string) error { if missing := utils.MissingStructFields(args, []string{utils.Tenant}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } diff --git a/apier/v1/stats_it_test.go b/apier/v1/stats_it_test.go index 4d0f9819e..94848950f 100644 --- a/apier/v1/stats_it_test.go +++ b/apier/v1/stats_it_test.go @@ -150,7 +150,7 @@ func testV1STSGetStats(t *testing.T) { var reply []string expectedIDs := []string{"Stats1"} if err := stsV1Rpc.Call(utils.StatSv1GetQueueIDs, - &utils.TenantWithOpts{TenantArg: &utils.TenantArg{"cgrates.org"}}, &reply); err != nil { + &utils.TenantWithOpts{Tenant: "cgrates.org"}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(expectedIDs, reply) { t.Errorf("expecting: %+v, received reply: %s", expectedIDs, reply) @@ -420,7 +420,7 @@ func testV1STSSetStatQueueProfile(t *testing.T) { func testV1STSGetStatQueueProfileIDs(t *testing.T) { expected := []string{"Stats1", "TEST_PROFILE1"} var result []string - if err := stsV1Rpc.Call(utils.APIerSv1GetStatQueueProfileIDs, &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{Tenant: "cgrates.org"}}, &result); err != nil { + if err := stsV1Rpc.Call(utils.APIerSv1GetStatQueueProfileIDs, &utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &result); err != nil { t.Error(err) } else if len(expected) != len(result) { t.Errorf("Expecting : %+v, received: %+v", expected, result) @@ -497,15 +497,15 @@ func testV1STSProcessMetricsWithFilter(t *testing.T) { QueueLength: 100, TTL: time.Duration(1) * time.Second, Metrics: []*engine.MetricWithFilters{ - &engine.MetricWithFilters{ + { MetricID: utils.MetaACD, FilterIDs: []string{"*gt:~*req.Usage:10s"}, }, - &engine.MetricWithFilters{ + { MetricID: utils.MetaTCD, FilterIDs: []string{"*gt:~*req.Usage:5s"}, }, - &engine.MetricWithFilters{ + { MetricID: utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+"CustomValue"), FilterIDs: []string{"*exists:~*req.CustomValue:", "*gte:~*req.CustomValue:10.0"}, }, @@ -626,10 +626,10 @@ func testV1STSProcessStaticMetrics(t *testing.T) { QueueLength: 100, TTL: time.Duration(1) * time.Second, Metrics: []*engine.MetricWithFilters{ - &engine.MetricWithFilters{ + { MetricID: utils.ConcatenatedKey(utils.MetaSum, "1"), }, - &engine.MetricWithFilters{ + { MetricID: utils.ConcatenatedKey(utils.MetaAverage, "2"), }, }, diff --git a/apier/v1/thresholds.go b/apier/v1/thresholds.go index bf689b9f2..c99ff85d2 100644 --- a/apier/v1/thresholds.go +++ b/apier/v1/thresholds.go @@ -74,7 +74,7 @@ func (apierSv1 *APIerSv1) GetThresholdProfile(arg *utils.TenantID, reply *engine } // GetThresholdProfileIDs returns list of thresholdProfile IDs registered for a tenant -func (apierSv1 *APIerSv1) GetThresholdProfileIDs(args *utils.TenantArgWithPaginator, thPrfIDs *[]string) error { +func (apierSv1 *APIerSv1) GetThresholdProfileIDs(args *utils.PaginatorWithTenant, thPrfIDs *[]string) error { if missing := utils.MissingStructFields(args, []string{utils.Tenant}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } @@ -96,7 +96,7 @@ func (apierSv1 *APIerSv1) GetThresholdProfileIDs(args *utils.TenantArgWithPagina // GetThresholdProfileIDsCount sets in reply var the total number of ThresholdProfileIDs registered for the received tenant // returns ErrNotFound in case of 0 ThresholdProfileIDs -func (apierSv1 *APIerSv1) GetThresholdProfileIDsCount(args *utils.TenantArg, reply *int) (err error) { +func (apierSv1 *APIerSv1) GetThresholdProfileIDsCount(args *utils.TenantWithOpts, reply *int) (err error) { if missing := utils.MissingStructFields(&args, []string{utils.Tenant}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } diff --git a/apier/v1/thresholds_it_test.go b/apier/v1/thresholds_it_test.go index fb0d6f48e..3fa090922 100644 --- a/apier/v1/thresholds_it_test.go +++ b/apier/v1/thresholds_it_test.go @@ -283,7 +283,7 @@ func testV1TSGetThresholds(t *testing.T) { var tIDs []string expectedIDs := []string{"THD_RES_1", "THD_STATS_2", "THD_STATS_1", "THD_ACNT_BALANCE_1", "THD_ACNT_EXPIRED", "THD_STATS_3", "THD_CDRS_1"} if err := tSv1Rpc.Call(utils.ThresholdSv1GetThresholdIDs, - &utils.TenantWithOpts{TenantArg: &utils.TenantArg{Tenant: "cgrates.org"}}, &tIDs); err != nil { + &utils.TenantWithOpts{Tenant: "cgrates.org"}, &tIDs); err != nil { t.Error(err) } else if len(expectedIDs) != len(tIDs) { t.Errorf("expecting: %+v, received reply: %s", expectedIDs, tIDs) @@ -358,7 +358,7 @@ func testV1TSGetThresholdsAfterProcess(t *testing.T) { var tIDs []string expectedIDs := []string{"THD_RES_1", "THD_STATS_2", "THD_STATS_1", "THD_ACNT_BALANCE_1", "THD_ACNT_EXPIRED"} if err := tSv1Rpc.Call(utils.ThresholdSv1GetThresholdIDs, - &utils.TenantWithOpts{TenantArg: &utils.TenantArg{Tenant: "cgrates.org"}}, &tIDs); err != nil { + &utils.TenantWithOpts{Tenant: "cgrates.org"}, &tIDs); err != nil { t.Error(err) } else if len(expectedIDs) != len(tIDs) { // THD_STATS_3 is not reccurent, so it was removed t.Errorf("expecting: %+v, received reply: %s", expectedIDs, tIDs) @@ -398,7 +398,7 @@ func testV1TSGetThresholdsAfterRestart(t *testing.T) { func testv1TSGetThresholdProfileIDs(t *testing.T) { expected := []string{"THD_STATS_1", "THD_STATS_2", "THD_STATS_3", "THD_RES_1", "THD_CDRS_1", "THD_ACNT_BALANCE_1", "THD_ACNT_EXPIRED"} var result []string - if err := tSv1Rpc.Call(utils.APIerSv1GetThresholdProfileIDs, &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{"cgrates.org"}}, &result); err != nil { + if err := tSv1Rpc.Call(utils.APIerSv1GetThresholdProfileIDs, &utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &result); err != nil { t.Error(err) } else if len(expected) != len(result) { t.Errorf("Expecting : %+v, received: %+v", expected, result) diff --git a/config/cachecfg_test.go b/config/cachecfg_test.go index dea29f333..6d8dd7ba6 100644 --- a/config/cachecfg_test.go +++ b/config/cachecfg_test.go @@ -29,7 +29,7 @@ import ( func TestAsTransCacheConfig(t *testing.T) { a := &CacheCfg{ Partitions: map[string]*CacheParamCfg{ - "test": &CacheParamCfg{ + "test": { Limit: 50, TTL: time.Duration(60 * time.Second), StaticTTL: true, @@ -75,9 +75,9 @@ func TestCacheCfgloadFromJsonCfg(t *testing.T) { }` expected = &CacheCfg{ Partitions: map[string]*CacheParamCfg{ - "*destinations": &CacheParamCfg{Limit: -1, TTL: time.Duration(0), StaticTTL: false, Precache: false}, - "*reverse_destinations": &CacheParamCfg{Limit: -1, TTL: time.Duration(0), StaticTTL: false, Precache: false}, - "*rating_plans": &CacheParamCfg{Limit: -1, TTL: time.Duration(0), StaticTTL: false, Precache: false}, + "*destinations": {Limit: -1, TTL: time.Duration(0), StaticTTL: false, Precache: false}, + "*reverse_destinations": {Limit: -1, TTL: time.Duration(0), StaticTTL: false, Precache: false}, + "*rating_plans": {Limit: -1, TTL: time.Duration(0), StaticTTL: false, Precache: false}, }, } cachecfg = new(CacheCfg) diff --git a/config/config.go b/config/config.go index 0c3b87da0..1ea455c11 100755 --- a/config/config.go +++ b/config/config.go @@ -1074,14 +1074,14 @@ func (cfg *CGRConfig) Call(serviceMethod string, } // ToDo: move this structure in utils as is used in other packages -type StringWithOpts struct { - Opts map[string]interface{} - utils.TenantArg +type SectionWithOpts struct { + Opts map[string]interface{} + Tenant string Section string } //V1GetConfigSection will retrieve from CGRConfig a section -func (cfg *CGRConfig) V1GetConfigSection(args *StringWithOpts, reply *map[string]interface{}) (err error) { +func (cfg *CGRConfig) V1GetConfigSection(args *SectionWithOpts, reply *map[string]interface{}) (err error) { var jsonString string switch args.Section { case GENERAL_JSN: @@ -1164,8 +1164,8 @@ func (cfg *CGRConfig) V1GetConfigSection(args *StringWithOpts, reply *map[string } type ConfigReloadWithOpts struct { - Opts map[string]interface{} - utils.TenantArg + Opts map[string]interface{} + Tenant string Path string Section string } @@ -1418,9 +1418,9 @@ func (cfg *CGRConfig) initChanels() { // JSONReloadWithOpts the API params for V1ReloadConfigFromJSON type JSONReloadWithOpts struct { - Opts map[string]interface{} - utils.TenantArg - JSON map[string]interface{} + Opts map[string]interface{} + Tenant string + JSON map[string]interface{} } // V1ReloadConfigFromJSON reloads the sections of configz diff --git a/config/config_it_test.go b/config/config_it_test.go index 48be18c2d..e1453afbd 100644 --- a/config/config_it_test.go +++ b/config/config_it_test.go @@ -557,7 +557,7 @@ func testCGRConfigReloadFreeswitchAgent(t *testing.T) { ExtraFields: RSRParsers{}, MaxWaitConnection: 2 * time.Second, EventSocketConns: []*FsConnCfg{ - &FsConnCfg{ + { Address: "1.2.3.4:8021", Password: "ClueCon", Reconnects: 5, @@ -900,7 +900,7 @@ func testCgrCfgV1ReloadConfigSection(t *testing.T) { t.Errorf("Expected: %s \n,received: %s", utils.OK, reply) } - if err := cfg.V1GetConfigSection(&StringWithOpts{Section: ERsJson}, &rcv); err != nil { + if err := cfg.V1GetConfigSection(&SectionWithOpts{Section: ERsJson}, &rcv); err != nil { t.Error(err) } else if utils.ToJSON(expected) != utils.ToJSON(rcv) { t.Errorf("Expected: %+v, \n received: %+v", utils.ToJSON(expected), utils.ToJSON(rcv)) diff --git a/config/config_test.go b/config/config_test.go index 715b6fcde..9803e32ab 100755 --- a/config/config_test.go +++ b/config/config_test.go @@ -1885,7 +1885,7 @@ func TestCgrCfgV1GetConfigSection(t *testing.T) { var rcv map[string]interface{} if cgrCfg, err := NewCGRConfigFromJsonStringWithDefaults(jsnCfg); err != nil { t.Error(err) - } else if err := cgrCfg.V1GetConfigSection(&StringWithOpts{Section: LISTEN_JSN}, &rcv); err != nil { + } else if err := cgrCfg.V1GetConfigSection(&SectionWithOpts{Section: LISTEN_JSN}, &rcv); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, rcv) { t.Errorf("Expected: %+v, received: %+v", expected, rcv) @@ -2473,7 +2473,7 @@ func TestRpcConnsDefaults(t *testing.T) { Strategy: rpcclient.PoolFirst, PoolSize: 0, Conns: []*RemoteHost{ - &RemoteHost{ + { Address: utils.MetaInternal, }, }, @@ -2482,7 +2482,7 @@ func TestRpcConnsDefaults(t *testing.T) { Strategy: rpcclient.PoolFirst, PoolSize: 0, Conns: []*RemoteHost{ - &RemoteHost{ + { Address: "127.0.0.1:2012", Transport: utils.MetaJSON, }, diff --git a/config/eescfg_test.go b/config/eescfg_test.go index 652957972..5424f7173 100644 --- a/config/eescfg_test.go +++ b/config/eescfg_test.go @@ -145,14 +145,14 @@ func TestEventExporterSameID(t *testing.T) { Enabled: true, AttributeSConns: []string{"conn1"}, Cache: map[string]*CacheParamCfg{ - utils.MetaFileCSV: &CacheParamCfg{ + utils.MetaFileCSV: { Limit: -1, TTL: time.Duration(5 * time.Second), StaticTTL: false, }, }, Exporters: []*EventExporterCfg{ - &EventExporterCfg{ + { ID: utils.MetaDefault, Type: utils.META_NONE, FieldSep: ",", diff --git a/config/fctemplate_test.go b/config/fctemplate_test.go index b86aec687..ca71ea213 100755 --- a/config/fctemplate_test.go +++ b/config/fctemplate_test.go @@ -51,14 +51,14 @@ func TestNewFCTemplateFromFCTemplateJsonCfg(t *testing.T) { func TestFCTemplatesFromFCTemplatesJsonCfg(t *testing.T) { jsnCfgs := []*FcTemplateJsonCfg{ - &FcTemplateJsonCfg{ + { Tag: utils.StringPointer("Tenant"), Type: utils.StringPointer("*composed"), Path: utils.StringPointer("Tenant"), Filters: &[]string{"Filter1", "Filter2"}, Value: utils.StringPointer("cgrates.org"), }, - &FcTemplateJsonCfg{ + { Tag: utils.StringPointer("RunID"), Type: utils.StringPointer("*composed"), Path: utils.StringPointer("RunID"), @@ -67,7 +67,7 @@ func TestFCTemplatesFromFCTemplatesJsonCfg(t *testing.T) { }, } expected := []*FCTemplate{ - &FCTemplate{ + { Tag: "Tenant", Type: "*composed", Path: "Tenant", @@ -75,7 +75,7 @@ func TestFCTemplatesFromFCTemplatesJsonCfg(t *testing.T) { Value: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), Layout: time.RFC3339, }, - &FCTemplate{ + { Tag: "RunID", Type: "*composed", Path: "RunID", @@ -96,21 +96,21 @@ func TestFCTemplatesFromFCTemplatesJsonCfg(t *testing.T) { func TestFCTemplateInflate1(t *testing.T) { fcTmp1 := []*FCTemplate{ - &FCTemplate{ + { Tag: "Tenant", Type: "*composed", Path: "Tenant", Filters: []string{"Filter1", "Filter2"}, Value: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), }, - &FCTemplate{ + { Tag: "RunID", Type: "*composed", Path: "RunID", Filters: []string{"Filter1_1", "Filter2_2"}, Value: NewRSRParsersMustCompile("SampleValue", utils.INFIELD_SEP), }, - &FCTemplate{ + { Tag: "TmpMap", Type: "*template", Filters: []string{"Filter1_1", "Filter2_2"}, @@ -118,15 +118,15 @@ func TestFCTemplateInflate1(t *testing.T) { }, } fcTmpMp := map[string][]*FCTemplate{ - "TmpMap": []*FCTemplate{ - &FCTemplate{ + "TmpMap": { + { Tag: "Elem1", Type: "*composed", Path: "Elem1", Filters: []string{"Filter1", "Filter2"}, Value: NewRSRParsersMustCompile("Elem1", utils.INFIELD_SEP), }, - &FCTemplate{ + { Tag: "Elem2", Type: "*composed", Path: "Elem2", @@ -134,15 +134,15 @@ func TestFCTemplateInflate1(t *testing.T) { Value: NewRSRParsersMustCompile("Elem2", utils.INFIELD_SEP), }, }, - "TmpMap2": []*FCTemplate{ - &FCTemplate{ + "TmpMap2": { + { Tag: "Elem2.1", Type: "*composed", Path: "Elem2.1", Filters: []string{"Filter1", "Filter2"}, Value: NewRSRParsersMustCompile("Elem2.1", utils.INFIELD_SEP), }, - &FCTemplate{ + { Tag: "Elem2.2", Type: "*composed", Path: "Elem2.2", @@ -152,28 +152,28 @@ func TestFCTemplateInflate1(t *testing.T) { }, } expFC := []*FCTemplate{ - &FCTemplate{ + { Tag: "Tenant", Type: "*composed", Path: "Tenant", Filters: []string{"Filter1", "Filter2"}, Value: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), }, - &FCTemplate{ + { Tag: "RunID", Type: "*composed", Path: "RunID", Filters: []string{"Filter1_1", "Filter2_2"}, Value: NewRSRParsersMustCompile("SampleValue", utils.INFIELD_SEP), }, - &FCTemplate{ + { Tag: "Elem1", Type: "*composed", Path: "Elem1", Filters: []string{"Filter1", "Filter2"}, Value: NewRSRParsersMustCompile("Elem1", utils.INFIELD_SEP), }, - &FCTemplate{ + { Tag: "Elem2", Type: "*composed", Path: "Elem2", @@ -190,21 +190,21 @@ func TestFCTemplateInflate1(t *testing.T) { func TestFCTemplateInflate2(t *testing.T) { fcTmp1 := []*FCTemplate{ - &FCTemplate{ + { Tag: "Tenant", Type: "*composed", Path: "Tenant", Filters: []string{"Filter1", "Filter2"}, Value: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), }, - &FCTemplate{ + { Tag: "RunID", Type: "*composed", Path: "RunID", Filters: []string{"Filter1_1", "Filter2_2"}, Value: NewRSRParsersMustCompile("SampleValue", utils.INFIELD_SEP), }, - &FCTemplate{ + { Tag: "TmpMap3", Type: "*template", Filters: []string{"Filter1_1", "Filter2_2"}, @@ -212,15 +212,15 @@ func TestFCTemplateInflate2(t *testing.T) { }, } fcTmpMp := map[string][]*FCTemplate{ - "TmpMap": []*FCTemplate{ - &FCTemplate{ + "TmpMap": { + { Tag: "Elem1", Type: "*composed", Path: "Elem1", Filters: []string{"Filter1", "Filter2"}, Value: NewRSRParsersMustCompile("Elem1", utils.INFIELD_SEP), }, - &FCTemplate{ + { Tag: "Elem2", Type: "*composed", Path: "Elem2", @@ -228,15 +228,15 @@ func TestFCTemplateInflate2(t *testing.T) { Value: NewRSRParsersMustCompile("Elem2", utils.INFIELD_SEP), }, }, - "TmpMap2": []*FCTemplate{ - &FCTemplate{ + "TmpMap2": { + { Tag: "Elem2.1", Type: "*composed", Path: "Elem2.1", Filters: []string{"Filter1", "Filter2"}, Value: NewRSRParsersMustCompile("Elem2.1", utils.INFIELD_SEP), }, - &FCTemplate{ + { Tag: "Elem2.2", Type: "*composed", Path: "Elem2.2", @@ -252,21 +252,21 @@ func TestFCTemplateInflate2(t *testing.T) { func TestFCTemplateInflate3(t *testing.T) { fcTmp1 := []*FCTemplate{ - &FCTemplate{ + { Tag: "Tenant", Type: "*composed", Path: "Tenant", Filters: []string{"Filter1", "Filter2"}, Value: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), }, - &FCTemplate{ + { Tag: "RunID", Type: "*composed", Path: "RunID", Filters: []string{"Filter1_1", "Filter2_2"}, Value: NewRSRParsersMustCompile("SampleValue", utils.INFIELD_SEP), }, - &FCTemplate{ + { Tag: "TmpMap", Type: "*template", Filters: []string{"Filter1_1", "Filter2_2"}, @@ -274,16 +274,16 @@ func TestFCTemplateInflate3(t *testing.T) { }, } fcTmpMp := map[string][]*FCTemplate{ - "TmpMap": []*FCTemplate{}, - "TmpMap2": []*FCTemplate{ - &FCTemplate{ + "TmpMap": {}, + "TmpMap2": { + { Tag: "Elem2.1", Type: "*composed", Path: "Elem2.1", Filters: []string{"Filter1", "Filter2"}, Value: NewRSRParsersMustCompile("Elem2.1", utils.INFIELD_SEP), }, - &FCTemplate{ + { Tag: "Elem2.2", Type: "*composed", Path: "Elem2.2", diff --git a/config/multifiles_it_test.go b/config/multifiles_it_test.go index 5325e452d..057e22534 100644 --- a/config/multifiles_it_test.go +++ b/config/multifiles_it_test.go @@ -89,7 +89,7 @@ func TestMfHttpAgentMultipleFields(t *testing.T) { t.Errorf("Expected: 2, recived: %+v", len(mfCgrCfg.HttpAgentCfg())) } expected := []*HttpAgentCfg{ - &HttpAgentCfg{ + { ID: "conecto1", Url: "/newConecto", SessionSConns: []string{utils.MetaLocalHost}, @@ -162,7 +162,7 @@ func TestMfHttpAgentMultipleFields(t *testing.T) { }, }, }, - &HttpAgentCfg{ + { ID: "conecto_xml", Url: "/conecto_xml", SessionSConns: []string{utils.MetaLocalHost}, diff --git a/config/navigablemap_test.go b/config/navigablemap_test.go index 75c42c56a..1ae6079c0 100644 --- a/config/navigablemap_test.go +++ b/config/navigablemap_test.go @@ -81,16 +81,16 @@ func TestNMAsXMLElements(t *testing.T) { t.Error(err) } eXMLElmnts := []*XMLElement{ - &XMLElement{ + { XMLName: xml.Name{Local: order[0][0].String()}, Elements: []*XMLElement{ - &XMLElement{ + { XMLName: xml.Name{Local: order[0][1].String()}, Elements: []*XMLElement{ - &XMLElement{ + { XMLName: xml.Name{Local: order[0][2].String()}, Attributes: []*xml.Attr{ - &xml.Attr{ + { Name: xml.Name{Local: "attribute1"}, Value: "attrVal1", }, @@ -99,14 +99,14 @@ func TestNMAsXMLElements(t *testing.T) { }, }, }, - &XMLElement{ + { XMLName: xml.Name{Local: "Field3"}, Value: "Value3", }, - &XMLElement{ + { XMLName: xml.Name{Local: order[3][1].String()}, Attributes: []*xml.Attr{ - &xml.Attr{ + { Name: xml.Name{Local: "attribute5"}, Value: "attrVal5", }, @@ -115,16 +115,16 @@ func TestNMAsXMLElements(t *testing.T) { }, }, }, - &XMLElement{ + { XMLName: xml.Name{Local: order[1][0].String()}, Elements: []*XMLElement{ - &XMLElement{ + { XMLName: xml.Name{Local: order[1][1].String()}, Elements: []*XMLElement{ - &XMLElement{ + { XMLName: xml.Name{Local: order[1][2].String()}, Elements: []*XMLElement{ - &XMLElement{ + { XMLName: xml.Name{Local: "Fld1"}, Value: "Val1", }, @@ -134,23 +134,23 @@ func TestNMAsXMLElements(t *testing.T) { }, }, }, - &XMLElement{ + { XMLName: xml.Name{Local: order[4][0].String()}, Attributes: []*xml.Attr{ - &xml.Attr{ + { Name: xml.Name{Local: "attribute2"}, Value: "attrVal2", }, }, Value: "Val4", }, - &XMLElement{ + { XMLName: xml.Name{Local: order[5][0].String()}, Elements: []*XMLElement{ - &XMLElement{ + { XMLName: xml.Name{Local: order[5][1].String()}, Attributes: []*xml.Attr{ - &xml.Attr{ + { Name: xml.Name{Local: "attribute6"}, Value: "attrVal6", }, diff --git a/config/rjreader_test.go b/config/rjreader_test.go index 6576cf326..9d9a1dced 100644 --- a/config/rjreader_test.go +++ b/config/rjreader_test.go @@ -263,7 +263,7 @@ func TestIsWhiteSpace(t *testing.T) { func TestReadEnv(t *testing.T) { key := "TESTVAR2" - if _, err := ReadEnv(key); !reflect.DeepEqual(err, utils.ErrEnvNotFound(key)) { + if _, err := ReadEnv(key); err == nil || err.Error() != utils.ErrEnvNotFound(key).Error() { t.Errorf("Expected: %+v, recived: %+v", utils.ErrEnvNotFound(key), err) } expected := "cgRates" diff --git a/console/accounts.go b/console/accounts.go index 3419aa12b..a077adb80 100644 --- a/console/accounts.go +++ b/console/accounts.go @@ -67,6 +67,6 @@ func (self *CmdGetAccounts) RpcResult() interface{} { func (self *CmdGetAccounts) GetFormatedResult(result interface{}) string { return GetFormatedSliceResult(result, map[string]struct{}{ - "MinSleep": struct{}{}, + "MinSleep": {}, }) } diff --git a/console/active_sessions.go b/console/active_sessions.go index a648ebd07..5799ba555 100644 --- a/console/active_sessions.go +++ b/console/active_sessions.go @@ -69,9 +69,9 @@ func (self *CmdActiveSessions) RpcResult() interface{} { func (self *CmdActiveSessions) GetFormatedResult(result interface{}) string { return GetFormatedSliceResult(result, map[string]struct{}{ - "Usage": struct{}{}, - "DurationIndex": struct{}{}, - "MaxRateUnit": struct{}{}, - "DebitInterval": struct{}{}, + "Usage": {}, + "DurationIndex": {}, + "MaxRateUnit": {}, + "DebitInterval": {}, }) } diff --git a/console/attributes_process_event.go b/console/attributes_process_event.go index 4114e2132..02239648c 100644 --- a/console/attributes_process_event.go +++ b/console/attributes_process_event.go @@ -73,6 +73,6 @@ func (self *CmdAttributesProcessEvent) RpcResult() interface{} { func (self *CmdAttributesProcessEvent) GetFormatedResult(result interface{}) string { return GetFormatedResult(result, map[string]struct{}{ - "Usage": struct{}{}, + "Usage": {}, }) } diff --git a/console/attributes_profile_ids.go b/console/attributes_profile_ids.go index 4149b8468..4fead1b70 100644 --- a/console/attributes_profile_ids.go +++ b/console/attributes_profile_ids.go @@ -26,7 +26,7 @@ func init() { c := &CmdGetAttributeIDs{ name: "attributes_profile_ids", rpcMethod: utils.APIerSv1GetAttributeProfileIDs, - rpcParams: &utils.TenantArgWithPaginator{}, + rpcParams: &utils.PaginatorWithTenant{}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} @@ -36,7 +36,7 @@ func init() { type CmdGetAttributeIDs struct { name string rpcMethod string - rpcParams *utils.TenantArgWithPaginator + rpcParams *utils.PaginatorWithTenant *CommandExecuter } @@ -50,7 +50,7 @@ func (self *CmdGetAttributeIDs) RpcMethod() string { func (self *CmdGetAttributeIDs) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.TenantArgWithPaginator{} + self.rpcParams = &utils.PaginatorWithTenant{} } return self.rpcParams } diff --git a/console/chargers_process_event.go b/console/chargers_process_event.go index 4169dac52..e42a4023f 100644 --- a/console/chargers_process_event.go +++ b/console/chargers_process_event.go @@ -75,6 +75,6 @@ func (self *CmdChargersProcessEvent) RpcResult() interface{} { func (self *CmdChargersProcessEvent) GetFormatedResult(result interface{}) string { return GetFormatedResult(result, map[string]struct{}{ - "Usage": struct{}{}, + "Usage": {}, }) } diff --git a/console/chargers_profile_ids.go b/console/chargers_profile_ids.go index 360ff1fb9..2548866e0 100644 --- a/console/chargers_profile_ids.go +++ b/console/chargers_profile_ids.go @@ -26,7 +26,7 @@ func init() { c := &CmdGetChargerIDs{ name: "chargers_profile_ids", rpcMethod: utils.APIerSv1GetChargerProfileIDs, - rpcParams: &utils.TenantArgWithPaginator{}, + rpcParams: &utils.PaginatorWithTenant{}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} @@ -36,7 +36,7 @@ func init() { type CmdGetChargerIDs struct { name string rpcMethod string - rpcParams *utils.TenantArgWithPaginator + rpcParams *utils.PaginatorWithTenant *CommandExecuter } @@ -50,7 +50,7 @@ func (self *CmdGetChargerIDs) RpcMethod() string { func (self *CmdGetChargerIDs) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.TenantArgWithPaginator{} + self.rpcParams = &utils.PaginatorWithTenant{} } return self.rpcParams } diff --git a/console/command_executer_test.go b/console/command_executer_test.go index ce66fed5d..df8faae05 100644 --- a/console/command_executer_test.go +++ b/console/command_executer_test.go @@ -153,7 +153,7 @@ func TestGetStringValue(t *testing.T) { expected = `{"ID":"id1","TimeValue":"1s"}` if rply := getStringValue(map[string]interface{}{ "ID": "id1", - "TimeValue": int64(time.Second)}, map[string]struct{}{"TimeValue": struct{}{}}); rply != expected { + "TimeValue": int64(time.Second)}, map[string]struct{}{"TimeValue": {}}); rply != expected { t.Errorf("Expecting: %s , received: %s", expected, rply) } @@ -188,7 +188,7 @@ func TestGetMapAsString(t *testing.T) { expected = `{"ID":"id1","TimeValue":"1s"}` if rply := getStringValue(map[string]interface{}{ "ID": "id1", - "TimeValue": int64(time.Second)}, map[string]struct{}{"TimeValue": struct{}{}}); rply != expected { + "TimeValue": int64(time.Second)}, map[string]struct{}{"TimeValue": {}}); rply != expected { t.Errorf("Expecting: %s , received: %s", expected, rply) } } @@ -211,7 +211,7 @@ func TestGetFormatedResult(t *testing.T) { }` if rply := GetFormatedResult(map[string]interface{}{ "ID": "id1", - "TimeValue": int64(time.Second)}, map[string]struct{}{"TimeValue": struct{}{}}); rply != expected { + "TimeValue": int64(time.Second)}, map[string]struct{}{"TimeValue": {}}); rply != expected { t.Errorf("Expecting: %s , received: %s", expected, rply) } diff --git a/console/cost.go b/console/cost.go index 72518fa60..eeb9b4057 100644 --- a/console/cost.go +++ b/console/cost.go @@ -73,9 +73,9 @@ func (self *CmdGetCost) ClientArgs() []string { func (self *CmdGetCost) GetFormatedResult(result interface{}) string { return GetFormatedResult(result, map[string]struct{}{ - "Usage": struct{}{}, - "GroupIntervalStart": struct{}{}, - "RateIncrement": struct{}{}, - "RateUnit": struct{}{}, + "Usage": {}, + "GroupIntervalStart": {}, + "RateIncrement": {}, + "RateUnit": {}, }) } diff --git a/console/cost_details.go b/console/cost_details.go index 90f065f06..a1f163058 100644 --- a/console/cost_details.go +++ b/console/cost_details.go @@ -66,9 +66,9 @@ func (self *CmdGetCostDetails) RpcResult() interface{} { func (self *CmdGetCostDetails) GetFormatedResult(result interface{}) string { return GetFormatedResult(result, map[string]struct{}{ - "Usage": struct{}{}, - "GroupIntervalStart": struct{}{}, - "RateIncrement": struct{}{}, - "RateUnit": struct{}{}, + "Usage": {}, + "GroupIntervalStart": {}, + "RateIncrement": {}, + "RateUnit": {}, }) } diff --git a/console/datacost.go b/console/datacost.go index 286c55bac..2728ce29d 100644 --- a/console/datacost.go +++ b/console/datacost.go @@ -72,9 +72,9 @@ func (self *CmdGetDataCost) ClientArgs() []string { func (self *CmdGetDataCost) GetFormatedResult(result interface{}) string { return GetFormatedResult(result, map[string]struct{}{ - "Usage": struct{}{}, - "GroupIntervalStart": struct{}{}, - "RateIncrement": struct{}{}, - "RateUnit": struct{}{}, + "Usage": {}, + "GroupIntervalStart": {}, + "RateIncrement": {}, + "RateUnit": {}, }) } diff --git a/console/dispatchers_host_ids.go b/console/dispatchers_host_ids.go index f4b9b1885..9ca328e79 100644 --- a/console/dispatchers_host_ids.go +++ b/console/dispatchers_host_ids.go @@ -35,7 +35,7 @@ func init() { type CmdGetDispatcherHostIDs struct { name string rpcMethod string - rpcParams *utils.TenantArgWithPaginator + rpcParams *utils.PaginatorWithTenant *CommandExecuter } @@ -49,7 +49,7 @@ func (self *CmdGetDispatcherHostIDs) RpcMethod() string { func (self *CmdGetDispatcherHostIDs) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = new(utils.TenantArgWithPaginator) + self.rpcParams = new(utils.PaginatorWithTenant) } return self.rpcParams } diff --git a/console/dispatchers_profile_ids.go b/console/dispatchers_profile_ids.go index b58055377..8ec5f9963 100644 --- a/console/dispatchers_profile_ids.go +++ b/console/dispatchers_profile_ids.go @@ -35,7 +35,7 @@ func init() { type CmdGetDispatcherProfileIDs struct { name string rpcMethod string - rpcParams *utils.TenantArgWithPaginator + rpcParams *utils.PaginatorWithTenant *CommandExecuter } @@ -49,7 +49,7 @@ func (self *CmdGetDispatcherProfileIDs) RpcMethod() string { func (self *CmdGetDispatcherProfileIDs) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = new(utils.TenantArgWithPaginator) + self.rpcParams = new(utils.PaginatorWithTenant) } return self.rpcParams } diff --git a/console/filter_ids.go b/console/filter_ids.go index 40321c9f1..725f64c47 100644 --- a/console/filter_ids.go +++ b/console/filter_ids.go @@ -26,7 +26,7 @@ func init() { c := &CmdGetFilterIDs{ name: "filter_ids", rpcMethod: utils.APIerSv1GetFilterIDs, - rpcParams: &utils.TenantArgWithPaginator{}, + rpcParams: &utils.PaginatorWithTenant{}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} @@ -36,7 +36,7 @@ func init() { type CmdGetFilterIDs struct { name string rpcMethod string - rpcParams *utils.TenantArgWithPaginator + rpcParams *utils.PaginatorWithTenant *CommandExecuter } @@ -50,7 +50,7 @@ func (self *CmdGetFilterIDs) RpcMethod() string { func (self *CmdGetFilterIDs) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.TenantArgWithPaginator{} + self.rpcParams = &utils.PaginatorWithTenant{} } return self.rpcParams } diff --git a/console/get_json_section.go b/console/get_json_section.go index b89975946..e2f9a653a 100644 --- a/console/get_json_section.go +++ b/console/get_json_section.go @@ -27,7 +27,7 @@ func init() { c := &CmdGetJSONConfig{ name: "get_json_section", rpcMethod: utils.ConfigSv1GetJSONSection, - rpcParams: &config.StringWithOpts{}, + rpcParams: &config.SectionWithOpts{}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} @@ -37,7 +37,7 @@ func init() { type CmdGetJSONConfig struct { name string rpcMethod string - rpcParams *config.StringWithOpts + rpcParams *config.SectionWithOpts *CommandExecuter } @@ -51,7 +51,7 @@ func (self *CmdGetJSONConfig) RpcMethod() string { func (self *CmdGetJSONConfig) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &config.StringWithOpts{Opts: make(map[string]interface{})} + self.rpcParams = &config.SectionWithOpts{Opts: make(map[string]interface{})} } return self.rpcParams } diff --git a/console/passive_sessions.go b/console/passive_sessions.go index ce30799a4..136d9fe15 100644 --- a/console/passive_sessions.go +++ b/console/passive_sessions.go @@ -68,9 +68,9 @@ func (self *CmdPassiveSessions) RpcResult() interface{} { func (self *CmdPassiveSessions) GetFormatedResult(result interface{}) string { return GetFormatedSliceResult(result, map[string]struct{}{ - "Usage": struct{}{}, - "DurationIndex": struct{}{}, - "MaxRateUnit": struct{}{}, - "DebitInterval": struct{}{}, + "Usage": {}, + "DurationIndex": {}, + "MaxRateUnit": {}, + "DebitInterval": {}, }) } diff --git a/console/rates_profile_ids.go b/console/rates_profile_ids.go index 829ae5813..d754c7d75 100644 --- a/console/rates_profile_ids.go +++ b/console/rates_profile_ids.go @@ -26,7 +26,7 @@ func init() { c := &CmdRateProfileIDs{ name: "rates_profile_ids", rpcMethod: utils.APIerSv1GetRateProfileIDs, - rpcParams: &utils.TenantArgWithPaginator{}, + rpcParams: &utils.PaginatorWithTenant{}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} @@ -36,7 +36,7 @@ func init() { type CmdRateProfileIDs struct { name string rpcMethod string - rpcParams *utils.TenantArgWithPaginator + rpcParams *utils.PaginatorWithTenant *CommandExecuter } @@ -50,7 +50,7 @@ func (self *CmdRateProfileIDs) RpcMethod() string { func (self *CmdRateProfileIDs) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.TenantArgWithPaginator{} + self.rpcParams = &utils.PaginatorWithTenant{} } return self.rpcParams } diff --git a/console/ratingprofile_ids.go b/console/ratingprofile_ids.go index b8e4ef7dc..43cad5726 100644 --- a/console/ratingprofile_ids.go +++ b/console/ratingprofile_ids.go @@ -35,7 +35,7 @@ func init() { type CmdGetRatingProfileIDs struct { name string rpcMethod string - rpcParams *utils.TenantArgWithPaginator + rpcParams *utils.PaginatorWithTenant *CommandExecuter } @@ -49,7 +49,7 @@ func (self *CmdGetRatingProfileIDs) RpcMethod() string { func (self *CmdGetRatingProfileIDs) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = new(utils.TenantArgWithPaginator) + self.rpcParams = new(utils.PaginatorWithTenant) } return self.rpcParams } diff --git a/console/resources_profile.go b/console/resources_profile.go index f3c53befb..1e737d35d 100644 --- a/console/resources_profile.go +++ b/console/resources_profile.go @@ -67,6 +67,6 @@ func (self *CmdGetResourceProfile) RpcResult() interface{} { func (self *CmdGetResourceProfile) GetFormatedResult(result interface{}) string { return GetFormatedResult(result, map[string]struct{}{ - "UsageTTL": struct{}{}, + "UsageTTL": {}, }) } diff --git a/console/resources_profile_ids.go b/console/resources_profile_ids.go index 86d246750..505b5102b 100644 --- a/console/resources_profile_ids.go +++ b/console/resources_profile_ids.go @@ -26,7 +26,7 @@ func init() { c := &CmdGetResourceIDs{ name: "resources_profile_ids", rpcMethod: utils.APIerSv1GetResourceProfileIDs, - rpcParams: &utils.TenantArgWithPaginator{}, + rpcParams: &utils.PaginatorWithTenant{}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} @@ -36,7 +36,7 @@ func init() { type CmdGetResourceIDs struct { name string rpcMethod string - rpcParams *utils.TenantArgWithPaginator + rpcParams *utils.PaginatorWithTenant *CommandExecuter } @@ -50,7 +50,7 @@ func (self *CmdGetResourceIDs) RpcMethod() string { func (self *CmdGetResourceIDs) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.TenantArgWithPaginator{} + self.rpcParams = &utils.PaginatorWithTenant{} } return self.rpcParams } diff --git a/console/routes_profile_ids.go b/console/routes_profile_ids.go index 8719521fd..99531b098 100644 --- a/console/routes_profile_ids.go +++ b/console/routes_profile_ids.go @@ -26,7 +26,7 @@ func init() { c := &CmdRouteIDs{ name: "route_profile_ids", rpcMethod: utils.APIerSv1GetRouteProfileIDs, - rpcParams: &utils.TenantArgWithPaginator{}, + rpcParams: &utils.PaginatorWithTenant{}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} @@ -35,7 +35,7 @@ func init() { type CmdRouteIDs struct { name string rpcMethod string - rpcParams *utils.TenantArgWithPaginator + rpcParams *utils.PaginatorWithTenant *CommandExecuter } @@ -49,7 +49,7 @@ func (self *CmdRouteIDs) RpcMethod() string { func (self *CmdRouteIDs) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.TenantArgWithPaginator{} + self.rpcParams = &utils.PaginatorWithTenant{} } return self.rpcParams } diff --git a/console/session_initiate.go b/console/session_initiate.go index 8dfb98434..c4924b9ee 100644 --- a/console/session_initiate.go +++ b/console/session_initiate.go @@ -72,7 +72,7 @@ func (self *CmdSessionsInitiate) RpcResult() interface{} { func (self *CmdSessionsInitiate) GetFormatedResult(result interface{}) string { return GetFormatedResult(result, map[string]struct{}{ - "Usage": struct{}{}, - "MaxUsage": struct{}{}, + "Usage": {}, + "MaxUsage": {}, }) } diff --git a/console/session_process_message.go b/console/session_process_message.go index 23fc3af59..a7d6ab161 100644 --- a/console/session_process_message.go +++ b/console/session_process_message.go @@ -72,7 +72,7 @@ func (self *CmdSessionsProcessEvent) RpcResult() interface{} { func (self *CmdSessionsProcessEvent) GetFormatedResult(result interface{}) string { return GetFormatedResult(result, map[string]struct{}{ - "Usage": struct{}{}, - "MaxUsage": struct{}{}, + "Usage": {}, + "MaxUsage": {}, }) } diff --git a/console/session_update.go b/console/session_update.go index 78911fd1f..fc08bdaf6 100644 --- a/console/session_update.go +++ b/console/session_update.go @@ -72,7 +72,7 @@ func (self *CmdSessionsUpdate) RpcResult() interface{} { func (self *CmdSessionsUpdate) GetFormatedResult(result interface{}) string { return GetFormatedResult(result, map[string]struct{}{ - "Usage": struct{}{}, - "MaxUsage": struct{}{}, + "Usage": {}, + "MaxUsage": {}, }) } diff --git a/console/stats_profile.go b/console/stats_profile.go index ca2203f7b..d33973667 100644 --- a/console/stats_profile.go +++ b/console/stats_profile.go @@ -67,6 +67,6 @@ func (self *CmdGetStatQueueProfile) RpcResult() interface{} { func (self *CmdGetStatQueueProfile) GetFormatedResult(result interface{}) string { return GetFormatedResult(result, map[string]struct{}{ - "TTL": struct{}{}, + "TTL": {}, }) } diff --git a/console/stats_profile_ids.go b/console/stats_profile_ids.go index 16b6f06fb..036e1ff45 100644 --- a/console/stats_profile_ids.go +++ b/console/stats_profile_ids.go @@ -26,7 +26,7 @@ func init() { c := &CmdGetStatQueueIDs{ name: "stats_profile_ids", rpcMethod: utils.APIerSv1GetStatQueueProfileIDs, - rpcParams: &utils.TenantArgWithPaginator{}, + rpcParams: &utils.PaginatorWithTenant{}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} @@ -36,7 +36,7 @@ func init() { type CmdGetStatQueueIDs struct { name string rpcMethod string - rpcParams *utils.TenantArgWithPaginator + rpcParams *utils.PaginatorWithTenant *CommandExecuter } @@ -50,7 +50,7 @@ func (self *CmdGetStatQueueIDs) RpcMethod() string { func (self *CmdGetStatQueueIDs) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.TenantArgWithPaginator{} + self.rpcParams = &utils.PaginatorWithTenant{} } return self.rpcParams } diff --git a/console/status.go b/console/status.go index c4a50e1f2..6e7da6830 100644 --- a/console/status.go +++ b/console/status.go @@ -47,8 +47,7 @@ func (self *CmdStatus) RpcMethod() string { func (self *CmdStatus) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { self.rpcParams = &utils.TenantWithOpts{ - TenantArg: new(utils.TenantArg), - Opts: make(map[string]interface{}), + Opts: make(map[string]interface{}), } } return self.rpcParams diff --git a/console/thresholds_profile.go b/console/thresholds_profile.go index 0ee3865df..b023707fa 100644 --- a/console/thresholds_profile.go +++ b/console/thresholds_profile.go @@ -69,6 +69,6 @@ func (self *CmdGetThresholdProfile) RpcResult() interface{} { func (self *CmdGetThresholdProfile) GetFormatedResult(result interface{}) string { return GetFormatedResult(result, map[string]struct{}{ - "MinSleep": struct{}{}, + "MinSleep": {}, }) } diff --git a/console/thresholds_profile_ids.go b/console/thresholds_profile_ids.go index ed2104321..53f858c7b 100644 --- a/console/thresholds_profile_ids.go +++ b/console/thresholds_profile_ids.go @@ -26,7 +26,7 @@ func init() { c := &CmdGetThresholdIDs{ name: "thresholds_profile_ids", rpcMethod: utils.APIerSv1GetThresholdProfileIDs, - rpcParams: &utils.TenantArgWithPaginator{}, + rpcParams: &utils.PaginatorWithTenant{}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} @@ -35,7 +35,7 @@ func init() { type CmdGetThresholdIDs struct { name string rpcMethod string - rpcParams *utils.TenantArgWithPaginator + rpcParams *utils.PaginatorWithTenant *CommandExecuter } @@ -49,7 +49,7 @@ func (self *CmdGetThresholdIDs) RpcMethod() string { func (self *CmdGetThresholdIDs) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.TenantArgWithPaginator{} + self.rpcParams = &utils.PaginatorWithTenant{} } return self.rpcParams } diff --git a/console/triggers.go b/console/triggers.go index 48927d414..dc76fd4b9 100644 --- a/console/triggers.go +++ b/console/triggers.go @@ -68,6 +68,6 @@ func (self *CmdGetTriggers) RpcResult() interface{} { func (self *CmdGetTriggers) GetFormatedResult(result interface{}) string { return GetFormatedSliceResult(result, map[string]struct{}{ - "MinSleep": struct{}{}, + "MinSleep": {}, }) } diff --git a/dispatcherh/dispatcherh_it_test.go b/dispatcherh/dispatcherh_it_test.go index d8ffa4f0a..94c3504af 100644 --- a/dispatcherh/dispatcherh_it_test.go +++ b/dispatcherh/dispatcherh_it_test.go @@ -127,10 +127,8 @@ func testDsphLoadData(t *testing.T) { func testDsphGetNodeID() (id string, err error) { var status map[string]interface{} if err = dspRPC.Call(utils.CoreSv1Status, utils.TenantWithOpts{ - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, - Opts: map[string]interface{}{}, + Tenant: "cgrates.org", + Opts: map[string]interface{}{}, }, &status); err != nil { return } diff --git a/dispatchers/caches.go b/dispatchers/caches.go index fd75b8133..34b8ebec6 100644 --- a/dispatchers/caches.go +++ b/dispatchers/caches.go @@ -48,8 +48,8 @@ func (dS *DispatcherService) CacheSv1Ping(args *utils.CGREventWithOpts, func (dS *DispatcherService) CacheSv1GetItemIDs(args *utils.ArgsGetCacheItemIDsWithOpts, reply *[]string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CacheSv1GetItemIDs, tnt, @@ -69,8 +69,8 @@ func (dS *DispatcherService) CacheSv1GetItemIDs(args *utils.ArgsGetCacheItemIDsW func (dS *DispatcherService) CacheSv1HasItem(args *utils.ArgsGetCacheItemWithOpts, reply *bool) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CacheSv1HasItem, tnt, @@ -91,8 +91,8 @@ func (dS *DispatcherService) CacheSv1HasItem(args *utils.ArgsGetCacheItemWithOpt func (dS *DispatcherService) CacheSv1GetItemExpiryTime(args *utils.ArgsGetCacheItemWithOpts, reply *time.Time) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CacheSv1GetItemExpiryTime, tnt, @@ -113,8 +113,8 @@ func (dS *DispatcherService) CacheSv1GetItemExpiryTime(args *utils.ArgsGetCacheI func (dS *DispatcherService) CacheSv1RemoveItem(args *utils.ArgsGetCacheItemWithOpts, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CacheSv1RemoveItem, tnt, @@ -134,8 +134,8 @@ func (dS *DispatcherService) CacheSv1RemoveItem(args *utils.ArgsGetCacheItemWith func (dS *DispatcherService) CacheSv1RemoveItems(args utils.AttrReloadCacheWithOpts, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CacheSv1RemoveItems, tnt, @@ -155,8 +155,8 @@ func (dS *DispatcherService) CacheSv1RemoveItems(args utils.AttrReloadCacheWithO func (dS *DispatcherService) CacheSv1Clear(args *utils.AttrCacheIDsWithOpts, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CacheSv1Clear, tnt, @@ -176,8 +176,8 @@ func (dS *DispatcherService) CacheSv1Clear(args *utils.AttrCacheIDsWithOpts, func (dS *DispatcherService) CacheSv1GetCacheStats(args *utils.AttrCacheIDsWithOpts, reply *map[string]*ltcache.CacheStats) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CacheSv1GetCacheStats, tnt, @@ -196,8 +196,8 @@ func (dS *DispatcherService) CacheSv1GetCacheStats(args *utils.AttrCacheIDsWithO // CacheSv1PrecacheStatus checks status of active precache processes func (dS *DispatcherService) CacheSv1PrecacheStatus(args *utils.AttrCacheIDsWithOpts, reply *map[string]string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CacheSv1PrecacheStatus, tnt, @@ -217,8 +217,8 @@ func (dS *DispatcherService) CacheSv1PrecacheStatus(args *utils.AttrCacheIDsWith func (dS *DispatcherService) CacheSv1HasGroup(args *utils.ArgsGetGroupWithOpts, reply *bool) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CacheSv1HasGroup, tnt, @@ -234,12 +234,12 @@ func (dS *DispatcherService) CacheSv1HasGroup(args *utils.ArgsGetGroupWithOpts, }, utils.MetaCaches, utils.CacheSv1HasGroup, args, reply) } -// GetGroupItemIDs returns a list of itemIDs in a cache group +// CacheSv1GetGroupItemIDs returns a list of itemIDs in a cache group func (dS *DispatcherService) CacheSv1GetGroupItemIDs(args *utils.ArgsGetGroupWithOpts, reply *[]string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CacheSv1GetGroupItemIDs, tnt, @@ -255,11 +255,11 @@ func (dS *DispatcherService) CacheSv1GetGroupItemIDs(args *utils.ArgsGetGroupWit }, utils.MetaCaches, utils.CacheSv1GetGroupItemIDs, args, reply) } -// RemoveGroup will remove a group and all items belonging to it from cache +// CacheSv1RemoveGroup will remove a group and all items belonging to it from cache func (dS *DispatcherService) CacheSv1RemoveGroup(args *utils.ArgsGetGroupWithOpts, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CacheSv1RemoveGroup, tnt, @@ -275,11 +275,11 @@ func (dS *DispatcherService) CacheSv1RemoveGroup(args *utils.ArgsGetGroupWithOpt }, utils.MetaCaches, utils.CacheSv1RemoveGroup, args, reply) } -// ReloadCache reloads cache from DB for a prefix or completely +// CacheSv1ReloadCache reloads cache from DB for a prefix or completely func (dS *DispatcherService) CacheSv1ReloadCache(args utils.AttrReloadCacheWithOpts, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CacheSv1ReloadCache, tnt, @@ -295,11 +295,11 @@ func (dS *DispatcherService) CacheSv1ReloadCache(args utils.AttrReloadCacheWithO }, utils.MetaCaches, utils.CacheSv1ReloadCache, args, reply) } -// LoadCache loads cache from DB for a prefix or completely +// CacheSv1LoadCache loads cache from DB for a prefix or completely func (dS *DispatcherService) CacheSv1LoadCache(args utils.AttrReloadCacheWithOpts, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CacheSv1LoadCache, tnt, @@ -315,11 +315,11 @@ func (dS *DispatcherService) CacheSv1LoadCache(args utils.AttrReloadCacheWithOpt }, utils.MetaCaches, utils.CacheSv1LoadCache, args, reply) } -// ReplicateRemove remove an item +// CacheSv1ReplicateRemove remove an item func (dS *DispatcherService) CacheSv1ReplicateRemove(args *utils.ArgCacheReplicateRemove, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CacheSv1ReplicateRemove, tnt, @@ -335,11 +335,11 @@ func (dS *DispatcherService) CacheSv1ReplicateRemove(args *utils.ArgCacheReplica }, utils.MetaCaches, utils.CacheSv1ReplicateRemove, args, reply) } -// ReplicateSet replicate an item +// CacheSv1ReplicateSet replicate an item func (dS *DispatcherService) CacheSv1ReplicateSet(args *utils.ArgCacheReplicateSet, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CacheSv1ReplicateSet, tnt, diff --git a/dispatchers/caches_it_test.go b/dispatchers/caches_it_test.go index 7e86bf41e..4ffd0dc8a 100644 --- a/dispatchers/caches_it_test.go +++ b/dispatchers/caches_it_test.go @@ -107,9 +107,7 @@ func testDspChcLoadAfterFolder(t *testing.T) { Opts: map[string]interface{}{ utils.OptsAPIKey: "chc12345", }, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", } if err := dispEngine.RPC.Call(utils.CacheSv1GetCacheStats, args, &rcvStats); err != nil { t.Error(err) @@ -122,9 +120,7 @@ func testDspChcLoadAfterFolder(t *testing.T) { Opts: map[string]interface{}{ utils.OptsAPIKey: "chc12345", }, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", ArgsCache: utils.NewAttrReloadCacheWithOpts().ArgsCache, }, &reply); err != nil { t.Error(err) @@ -250,9 +246,7 @@ func testDspChcPrecacheStatus(t *testing.T) { Opts: map[string]interface{}{ utils.OptsAPIKey: "chc12345", }, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", }, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, reply) { @@ -270,9 +264,7 @@ func testDspChcGetItemIDs(t *testing.T) { Opts: map[string]interface{}{ utils.OptsAPIKey: "chc12345", }, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", } if err := dispEngine.RPC.Call(utils.CacheSv1GetItemIDs, argsAPI, &rcvKeys); err != nil { t.Fatalf("Got error on APIerSv1.GetCacheStats: %s ", err.Error()) @@ -294,9 +286,7 @@ func testDspChcHasItem(t *testing.T) { Opts: map[string]interface{}{ utils.OptsAPIKey: "chc12345", }, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", } if err := dispEngine.RPC.Call(utils.CacheSv1HasItem, argsAPI, &reply); err != nil { t.Error(err) @@ -316,9 +306,7 @@ func testDspChcGetItemExpiryTime(t *testing.T) { Opts: map[string]interface{}{ utils.OptsAPIKey: "chc12345", }, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", } if err := dispEngine.RPC.Call(utils.CacheSv1GetItemExpiryTime, argsAPI, &reply); err != nil { t.Error(err) @@ -333,9 +321,7 @@ func testDspChcReloadCache(t *testing.T) { Opts: map[string]interface{}{ utils.OptsAPIKey: "chc12345", }, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", }, &reply); err != nil { t.Error("Got error on CacheSv1.ReloadCache: ", err.Error()) } else if reply != utils.OK { @@ -353,9 +339,7 @@ func testDspChcRemoveItem(t *testing.T) { Opts: map[string]interface{}{ utils.OptsAPIKey: "chc12345", }, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", } if err := dispEngine.RPC.Call(utils.CacheSv1HasItem, argsAPI, &reply); err != nil { t.Error(err) @@ -381,9 +365,7 @@ func testDspChcClear(t *testing.T) { Opts: map[string]interface{}{ utils.OptsAPIKey: "chc12345", }, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", }, &reply); err != nil { t.Error(err) } else if reply != utils.OK { @@ -395,9 +377,7 @@ func testDspChcClear(t *testing.T) { Opts: map[string]interface{}{ utils.OptsAPIKey: "chc12345", }, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", }, &rcvStats); err != nil { t.Error("Got error on CacheSv1.GetCacheStats: ", err.Error()) } else if !reflect.DeepEqual(expStats, rcvStats) { diff --git a/dispatchers/cdrs.go b/dispatchers/cdrs.go index 6c5bf9298..92cf6d518 100644 --- a/dispatchers/cdrs.go +++ b/dispatchers/cdrs.go @@ -48,8 +48,8 @@ func (dS *DispatcherService) CDRsV1Ping(args *utils.CGREventWithOpts, // CDRsV1GetCDRs returns the CDRs that match the filter func (dS *DispatcherService) CDRsV1GetCDRs(args *utils.RPCCDRsFilterWithOpts, reply *[]*engine.CDR) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg != nil && args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CDRsV1GetCDRs, tnt, @@ -68,8 +68,8 @@ func (dS *DispatcherService) CDRsV1GetCDRs(args *utils.RPCCDRsFilterWithOpts, re // CDRsV1GetCDRsCount counts the cdrs that match the filter func (dS *DispatcherService) CDRsV1GetCDRsCount(args *utils.RPCCDRsFilterWithOpts, reply *int64) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg != nil && args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CDRsV1GetCDRsCount, tnt, @@ -87,8 +87,8 @@ func (dS *DispatcherService) CDRsV1GetCDRsCount(args *utils.RPCCDRsFilterWithOpt func (dS *DispatcherService) CDRsV1StoreSessionCost(args *engine.AttrCDRSStoreSMCost, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg != nil && args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CDRsV1StoreSessionCost, tnt, @@ -106,8 +106,8 @@ func (dS *DispatcherService) CDRsV1StoreSessionCost(args *engine.AttrCDRSStoreSM func (dS *DispatcherService) CDRsV1RateCDRs(args *engine.ArgRateCDRs, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg != nil && args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CDRsV1RateCDRs, tnt, @@ -193,8 +193,8 @@ func (dS *DispatcherService) CDRsV2ProcessEvent(args *engine.ArgV1ProcessEvent, func (dS *DispatcherService) CDRsV2StoreSessionCost(args *engine.ArgsV2CDRSStoreSMCost, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg != nil && args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CDRsV2StoreSessionCost, tnt, diff --git a/dispatchers/cdrs_it_test.go b/dispatchers/cdrs_it_test.go index 42abb61d4..8fc92115c 100644 --- a/dispatchers/cdrs_it_test.go +++ b/dispatchers/cdrs_it_test.go @@ -158,9 +158,7 @@ func testDspCDRsCountCDR(t *testing.T) { Accounts: []string{"1001"}, RunIDs: []string{utils.MetaDefault}, }, - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "cdrs12345", }, @@ -180,9 +178,7 @@ func testDspCDRsGetCDR(t *testing.T) { Accounts: []string{"1001"}, RunIDs: []string{utils.MetaDefault}, }, - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "cdrs12345", }, @@ -253,9 +249,7 @@ func testDspCDRsGetCDR2(t *testing.T) { RunIDs: []string{utils.MetaDefault}, OriginIDs: []string{"testDspCDRsProcessCDR"}, }, - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "cdrs12345", }, @@ -309,9 +303,7 @@ func testDspCDRsGetCDR3(t *testing.T) { RunIDs: []string{utils.MetaDefault}, OriginIDs: []string{"testDspCDRsProcessExternalCDR"}, }, - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "cdrs12345", }, @@ -457,9 +449,7 @@ func testDspCDRsCountCDRNoAuth(t *testing.T) { Accounts: []string{"1001"}, RunIDs: []string{utils.MetaDefault}, }, - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", } if err := dispEngine.RPC.Call(utils.CDRsV1GetCDRsCount, args, &reply); err != nil { @@ -476,9 +466,7 @@ func testDspCDRsGetCDRNoAuth(t *testing.T) { Accounts: []string{"1001"}, RunIDs: []string{utils.MetaDefault}, }, - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", } if err := dispEngine.RPC.Call(utils.CDRsV1GetCDRs, &args, &reply); err != nil { @@ -540,9 +528,7 @@ func testDspCDRsGetCDR2NoAuth(t *testing.T) { RunIDs: []string{utils.MetaDefault}, OriginIDs: []string{"testDspCDRsProcessCDR"}, }, - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", } if err := dispEngine.RPC.Call(utils.CDRsV1GetCDRs, &args, &reply); err != nil { @@ -590,9 +576,7 @@ func testDspCDRsGetCDR3NoAuth(t *testing.T) { RunIDs: []string{utils.MetaDefault}, OriginIDs: []string{"testDspCDRsProcessExternalCDR"}, }, - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", } if err := dispEngine.RPC.Call(utils.CDRsV1GetCDRs, &args, &reply); err != nil { diff --git a/dispatchers/config.go b/dispatchers/config.go index 235a6c47b..b2bd65c7b 100644 --- a/dispatchers/config.go +++ b/dispatchers/config.go @@ -25,10 +25,10 @@ import ( "github.com/cgrates/cgrates/utils" ) -func (dS *DispatcherService) ConfigSv1GetJSONSection(args *config.StringWithOpts, reply *map[string]interface{}) (err error) { +func (dS *DispatcherService) ConfigSv1GetJSONSection(args *config.SectionWithOpts, reply *map[string]interface{}) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ConfigSv1GetJSONSection, tnt, @@ -46,8 +46,8 @@ func (dS *DispatcherService) ConfigSv1GetJSONSection(args *config.StringWithOpts func (dS *DispatcherService) ConfigSv1ReloadConfigFromPath(args *config.ConfigReloadWithOpts, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ConfigSv1ReloadConfigFromPath, tnt, @@ -65,8 +65,8 @@ func (dS *DispatcherService) ConfigSv1ReloadConfigFromPath(args *config.ConfigRe func (dS *DispatcherService) ConfigSv1ReloadConfigFromJSON(args *config.JSONReloadWithOpts, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ConfigSv1ReloadConfigFromJSON, tnt, diff --git a/dispatchers/config_it_test.go b/dispatchers/config_it_test.go index 36329c1cb..9514c7df3 100644 --- a/dispatchers/config_it_test.go +++ b/dispatchers/config_it_test.go @@ -69,10 +69,8 @@ func testDspConfigSv1GetJSONSection(t *testing.T) { "RPCJSONTLSListen": "127.0.0.1:2022", } var reply map[string]interface{} - if err := dispEngine.RPC.Call(utils.ConfigSv1GetJSONSection, &config.StringWithOpts{ - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + if err := dispEngine.RPC.Call(utils.ConfigSv1GetJSONSection, &config.SectionWithOpts{ + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "cfg12345", }, diff --git a/dispatchers/core.go b/dispatchers/core.go index 05e008cd0..183c5a5c3 100644 --- a/dispatchers/core.go +++ b/dispatchers/core.go @@ -27,8 +27,8 @@ import ( func (dS *DispatcherService) CoreSv1Status(args *utils.TenantWithOpts, reply *map[string]interface{}) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg != nil && args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CoreSv1Status, tnt, @@ -61,8 +61,8 @@ func (dS *DispatcherService) CoreSv1Ping(args *utils.CGREventWithOpts, reply *st func (dS *DispatcherService) CoreSv1Sleep(args *utils.DurationArgs, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg != nil && args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CoreSv1Sleep, tnt, diff --git a/dispatchers/core_it_test.go b/dispatchers/core_it_test.go index 8b835a482..5cda64e09 100644 --- a/dispatchers/core_it_test.go +++ b/dispatchers/core_it_test.go @@ -62,9 +62,7 @@ func TestDspCoreIT(t *testing.T) { func testDspCoreLoad(t *testing.T) { var status map[string]interface{} statusTnt := utils.TenantWithOpts{ - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "core12345", utils.OptsRouteID: "core1", @@ -79,9 +77,7 @@ func testDspCoreLoad(t *testing.T) { } dur := &utils.DurationArgs{ DurationTime: 500 * time.Millisecond, - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "core12345", utils.OptsRouteID: "core1", @@ -90,9 +86,7 @@ func testDspCoreLoad(t *testing.T) { } var rply string statusTnt2 := utils.TenantWithOpts{ - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "core12345", "EventType": "LoadDispatcher", diff --git a/dispatchers/guardian.go b/dispatchers/guardian.go index 8bfdbf00d..b5ac4a5b2 100644 --- a/dispatchers/guardian.go +++ b/dispatchers/guardian.go @@ -44,8 +44,8 @@ func (dS *DispatcherService) GuardianSv1Ping(args *utils.CGREventWithOpts, func (dS *DispatcherService) GuardianSv1RemoteLock(args AttrRemoteLockWithOpts, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.GuardianSv1RemoteLock, tnt, @@ -65,8 +65,8 @@ func (dS *DispatcherService) GuardianSv1RemoteLock(args AttrRemoteLockWithOpts, func (dS *DispatcherService) GuardianSv1RemoteUnlock(args AttrRemoteUnlockWithOpts, reply *[]string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.GuardianSv1RemoteUnlock, tnt, diff --git a/dispatchers/guardian_it_test.go b/dispatchers/guardian_it_test.go index e4220f67b..3d450e3f1 100644 --- a/dispatchers/guardian_it_test.go +++ b/dispatchers/guardian_it_test.go @@ -91,9 +91,7 @@ func testDspGrdLock(t *testing.T) { var reply string if err := dispEngine.RPC.Call(utils.GuardianSv1RemoteLock, &AttrRemoteLockWithOpts{ AttrRemoteLock: args, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "grd12345", }, @@ -103,10 +101,8 @@ func testDspGrdLock(t *testing.T) { var unlockReply []string if err := dispEngine.RPC.Call(utils.GuardianSv1RemoteUnlock, &AttrRemoteUnlockWithOpts{ - RefID: reply, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + RefID: reply, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "grd12345", }, diff --git a/dispatchers/replicator.go b/dispatchers/replicator.go index e572d9a3e..c79af6ef8 100644 --- a/dispatchers/replicator.go +++ b/dispatchers/replicator.go @@ -43,16 +43,16 @@ func (dS *DispatcherService) ReplicatorSv1GetAccount(args *utils.StringWithOpts, if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1GetAccount, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1GetAccount, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1GetAccount, args, rpl) @@ -62,16 +62,16 @@ func (dS *DispatcherService) ReplicatorSv1GetDestination(args *utils.StringWithO if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1GetDestination, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1GetDestination, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1GetDestination, args, rpl) @@ -81,16 +81,16 @@ func (dS *DispatcherService) ReplicatorSv1GetReverseDestination(args *utils.Stri if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1GetReverseDestination, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1GetReverseDestination, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1GetReverseDestination, args, rpl) @@ -200,16 +200,16 @@ func (dS *DispatcherService) ReplicatorSv1GetTiming(args *utils.StringWithOpts, if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1GetTiming, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1GetTiming, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1GetTiming, args, rpl) @@ -259,16 +259,16 @@ func (dS *DispatcherService) ReplicatorSv1GetActionTriggers(args *utils.StringWi if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1GetActionTriggers, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1GetActionTriggers, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1GetActionTriggers, args, rpl) @@ -278,16 +278,16 @@ func (dS *DispatcherService) ReplicatorSv1GetSharedGroup(args *utils.StringWithO if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1GetSharedGroup, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1GetSharedGroup, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1GetSharedGroup, args, rpl) @@ -297,16 +297,16 @@ func (dS *DispatcherService) ReplicatorSv1GetActions(args *utils.StringWithOpts, if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1GetActions, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1GetActions, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1GetActions, args, rpl) @@ -316,16 +316,16 @@ func (dS *DispatcherService) ReplicatorSv1GetActionPlan(args *utils.StringWithOp if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1GetActionPlan, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1GetActionPlan, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1GetActionPlan, args, rpl) @@ -335,16 +335,16 @@ func (dS *DispatcherService) ReplicatorSv1GetAllActionPlans(args *utils.StringWi if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1GetAllActionPlans, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1GetAllActionPlans, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1GetAllActionPlans, args, rpl) @@ -354,16 +354,16 @@ func (dS *DispatcherService) ReplicatorSv1GetAccountActionPlans(args *utils.Stri if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1GetAccountActionPlans, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1GetAccountActionPlans, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1GetAccountActionPlans, args, rpl) @@ -373,16 +373,16 @@ func (dS *DispatcherService) ReplicatorSv1GetRatingPlan(args *utils.StringWithOp if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1GetRatingPlan, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1GetRatingPlan, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1GetRatingPlan, args, rpl) @@ -392,16 +392,16 @@ func (dS *DispatcherService) ReplicatorSv1GetRatingProfile(args *utils.StringWit if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1GetRatingProfile, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1GetRatingProfile, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1GetRatingProfile, args, rpl) @@ -531,16 +531,16 @@ func (dS *DispatcherService) ReplicatorSv1GetItemLoadIDs(args *utils.StringWithO if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1GetItemLoadIDs, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1GetItemLoadIDs, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1GetItemLoadIDs, args, rpl) @@ -1025,16 +1025,16 @@ func (dS *DispatcherService) ReplicatorSv1RemoveDestination(args *utils.StringWi if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1RemoveDestination, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1RemoveDestination, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveDestination, args, rpl) @@ -1044,16 +1044,16 @@ func (dS *DispatcherService) ReplicatorSv1SetLoadIDs(args *utils.LoadIDsWithOpts if args == nil { args = &utils.LoadIDsWithOpts{} } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1SetLoadIDs, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1SetLoadIDs, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetLoadIDs, args, rpl) @@ -1063,16 +1063,16 @@ func (dS *DispatcherService) ReplicatorSv1RemoveAccount(args *utils.StringWithOp if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1RemoveAccount, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1RemoveAccount, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveAccount, args, rpl) @@ -1158,16 +1158,16 @@ func (dS *DispatcherService) ReplicatorSv1RemoveTiming(args *utils.StringWithOpt if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1RemoveTiming, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1RemoveTiming, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveTiming, args, rpl) @@ -1215,16 +1215,16 @@ func (dS *DispatcherService) ReplicatorSv1RemoveActionTriggers(args *utils.Strin if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1RemoveActionTriggers, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1RemoveActionTriggers, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveActionTriggers, args, rpl) @@ -1234,16 +1234,16 @@ func (dS *DispatcherService) ReplicatorSv1RemoveSharedGroup(args *utils.StringWi if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1RemoveSharedGroup, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1RemoveSharedGroup, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveSharedGroup, args, rpl) @@ -1253,16 +1253,16 @@ func (dS *DispatcherService) ReplicatorSv1RemoveActions(args *utils.StringWithOp if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1RemoveActions, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1RemoveActions, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveActions, args, rpl) @@ -1272,16 +1272,16 @@ func (dS *DispatcherService) ReplicatorSv1RemoveActionPlan(args *utils.StringWit if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1RemoveActionPlan, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1RemoveActionPlan, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveActionPlan, args, rpl) @@ -1291,16 +1291,16 @@ func (dS *DispatcherService) ReplicatorSv1RemAccountActionPlans(args *engine.Rem if args == nil { args = &engine.RemAccountActionPlansArgsWithOpts{} } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1RemAccountActionPlans, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1RemAccountActionPlans, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1RemAccountActionPlans, args, rpl) @@ -1310,16 +1310,16 @@ func (dS *DispatcherService) ReplicatorSv1RemoveRatingPlan(args *utils.StringWit if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1RemoveRatingPlan, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1RemoveRatingPlan, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveRatingPlan, args, rpl) @@ -1329,16 +1329,16 @@ func (dS *DispatcherService) ReplicatorSv1RemoveRatingProfile(args *utils.String if args == nil { args = new(utils.StringWithOpts) } - args.TenantArg.Tenant = utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant) + args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1RemoveRatingProfile, args.TenantArg.Tenant, + if err = dS.authorize(utils.ReplicatorSv1RemoveRatingProfile, args.Tenant, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ - Tenant: args.TenantArg.Tenant, + Tenant: args.Tenant, }, Opts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveRatingProfile, args, rpl) diff --git a/dispatchers/replicator_it_test.go b/dispatchers/replicator_it_test.go index 8f3ddf6e2..e2ec10b24 100644 --- a/dispatchers/replicator_it_test.go +++ b/dispatchers/replicator_it_test.go @@ -910,9 +910,7 @@ func testDspRplTiming(t *testing.T) { ID: "testTimings", Years: utils.Years{1999}, }, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -925,10 +923,8 @@ func testDspRplTiming(t *testing.T) { // Get Timing var reply utils.TPTiming argsTiming := &utils.StringWithOpts{ - Arg: "testTimings", - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Arg: "testTimings", + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -983,9 +979,8 @@ func testDspRplActionTriggers(t *testing.T) { // Get ActionTriggers var reply engine.ActionTriggers argsActionTriggers := &utils.StringWithOpts{ - Arg: "testActionTriggers", - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org"}, + Arg: "testActionTriggers", + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -1038,10 +1033,8 @@ func testDspRplSharedGroup(t *testing.T) { // Get SharedGroup var reply engine.SharedGroup argsSharedGroup := &utils.StringWithOpts{ - Arg: "IDSharedGroup", - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Arg: "IDSharedGroup", + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -1085,8 +1078,7 @@ func testDspRplActions(t *testing.T) { ActionType: utils.LOG, }, }, - Key: "KeyActions", - TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -1099,10 +1091,8 @@ func testDspRplActions(t *testing.T) { // Get Actions var reply engine.Actions argsActions := &utils.StringWithOpts{ - Arg: "KeyActions", - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Arg: "KeyActions", + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -1153,8 +1143,7 @@ func testDspRplActionPlan(t *testing.T) { }, }, }, - Key: "KeyActionPlan", - TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -1167,10 +1156,8 @@ func testDspRplActionPlan(t *testing.T) { // Get ActionPlan var reply engine.ActionPlan argsActionPlan := &utils.StringWithOpts{ - Arg: "KeyActionPlan", - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Arg: "KeyActionPlan", + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -1210,8 +1197,7 @@ func testDspRplAccountActionPlans(t *testing.T) { setAccountActionPlans := &engine.SetAccountActionPlansArgWithOpts{ AplIDs: []string{"KeyAccountActionPlans"}, Overwrite: true, - AcntID: "KeyAccountActionPlans", - TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -1224,10 +1210,8 @@ func testDspRplAccountActionPlans(t *testing.T) { // Get AccountActionPlans var reply []string argsAccountActionPlans := &utils.StringWithOpts{ - Arg: "KeyAccountActionPlans", - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Arg: "KeyAccountActionPlans", + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -1272,9 +1256,7 @@ func testDspRplRatingPlan(t *testing.T) { Ratings: map[string]*engine.RIRate{"Ratings": {ConnectFee: 0.7}}, Timings: map[string]*engine.RITiming{"Timings": {Months: utils.Months{4}}}, }, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -1287,8 +1269,7 @@ func testDspRplRatingPlan(t *testing.T) { // Get RatingPlan var reply engine.RatingPlan argsRatingPlan := &utils.StringWithOpts{ - Arg: "id", - TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -1331,9 +1312,7 @@ func testDspRplRatingProfile(t *testing.T) { RatingPlanActivations: engine.RatingPlanActivations{ &engine.RatingPlanActivation{RatingPlanId: "RatingPlanId"}}, }, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -1346,8 +1325,7 @@ func testDspRplRatingProfile(t *testing.T) { // Get RatingProfile var reply engine.RatingProfile argsRatingProfile := &utils.StringWithOpts{ - Arg: "idRatingProfile", - TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -1388,9 +1366,7 @@ func testDspRplDestination(t *testing.T) { setDestination := &engine.DestinationWithOpts{ Destination: &engine.Destination{ Id: "idDestination"}, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -1403,8 +1379,7 @@ func testDspRplDestination(t *testing.T) { // Get Destination var reply engine.Destination argsDestination := &utils.StringWithOpts{ - Arg: "idDestination", - TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -1445,9 +1420,7 @@ func testDspRplLoadIDs(t *testing.T) { LoadIDs: map[string]int64{ "LoadID1": 1, "LoadID2": 2}, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, @@ -1460,8 +1433,7 @@ func testDspRplLoadIDs(t *testing.T) { // Get LoadIDs var reply map[string]int64 argsLoadIDs := &utils.StringWithOpts{ - Arg: "idLoadIDs", - TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, diff --git a/dispatchers/responder_it_test.go b/dispatchers/responder_it_test.go index 126cb2127..0bc8d9ed4 100644 --- a/dispatchers/responder_it_test.go +++ b/dispatchers/responder_it_test.go @@ -71,9 +71,7 @@ func testDspResponderStatus(t *testing.T) { t.Errorf("Received: %s", reply) } ev := utils.TenantWithOpts{ - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "rsp12345", }, @@ -108,9 +106,7 @@ func getNodeWithRoute(route string, t *testing.T) string { }, } ev := utils.TenantWithOpts{ - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "rsp12345", utils.OptsRouteID: route, @@ -145,9 +141,7 @@ func testDspResponderShutdown(t *testing.T) { var reply string var statusReply map[string]interface{} ev := utils.TenantWithOpts{ - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "rsp12345", }, @@ -223,9 +217,7 @@ func testDspResponderInternal(t *testing.T) { }, } ev := utils.TenantWithOpts{ - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "rsp12345", utils.OptsRouteID: route, diff --git a/dispatchers/routes_it_test.go b/dispatchers/routes_it_test.go index 6a554ebd9..8f4c8ce7b 100755 --- a/dispatchers/routes_it_test.go +++ b/dispatchers/routes_it_test.go @@ -382,7 +382,7 @@ func testDspSupGetSupplierForEvent(t *testing.T) { Sorting: utils.MetaLC, SortingParameters: []string{}, Routes: []*engine.Route{ - &engine.Route{ + { ID: "route1", FilterIDs: nil, AccountIDs: nil, @@ -393,7 +393,7 @@ func testDspSupGetSupplierForEvent(t *testing.T) { Blocker: false, RouteParameters: "", }, - &engine.Route{ + { ID: "route2", FilterIDs: nil, AccountIDs: nil, diff --git a/dispatchers/servicemanager.go b/dispatchers/servicemanager.go index 5ba5cfdea..b3f86616e 100644 --- a/dispatchers/servicemanager.go +++ b/dispatchers/servicemanager.go @@ -43,8 +43,8 @@ func (dS *DispatcherService) ServiceManagerV1Ping(args *utils.CGREventWithOpts, func (dS *DispatcherService) ServiceManagerV1StartService(args ArgStartServiceWithOpts, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ServiceManagerV1StartService, tnt, @@ -63,8 +63,8 @@ func (dS *DispatcherService) ServiceManagerV1StartService(args ArgStartServiceWi func (dS *DispatcherService) ServiceManagerV1StopService(args ArgStartServiceWithOpts, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ServiceManagerV1StopService, tnt, @@ -83,8 +83,8 @@ func (dS *DispatcherService) ServiceManagerV1StopService(args ArgStartServiceWit func (dS *DispatcherService) ServiceManagerV1ServiceStatus(args ArgStartServiceWithOpts, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ServiceManagerV1ServiceStatus, tnt, diff --git a/dispatchers/sessions.go b/dispatchers/sessions.go index d59559518..3dea08d99 100755 --- a/dispatchers/sessions.go +++ b/dispatchers/sessions.go @@ -99,8 +99,8 @@ func (dS *DispatcherService) SessionSv1UpdateSession(args *sessions.V1UpdateSess func (dS *DispatcherService) SessionSv1SyncSessions(args *utils.TenantWithOpts, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg != nil && args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.SessionSv1SyncSessions, tnt, @@ -279,8 +279,8 @@ func (dS *DispatcherService) SessionSv1GetPassiveSessionsCount(args *utils.Sessi func (dS *DispatcherService) SessionSv1ReplicateSessions(args ArgsReplicateSessionsWithOpts, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.SessionSv1ReplicateSessions, tnt, diff --git a/dispatchers/sessions_it_test.go b/dispatchers/sessions_it_test.go index 5ff7472c5..efd6d50b8 100755 --- a/dispatchers/sessions_it_test.go +++ b/dispatchers/sessions_it_test.go @@ -762,9 +762,7 @@ func testDspSessionReplicate(t *testing.T) { Opts: map[string]interface{}{ utils.OptsAPIKey: "ses12345", }, - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", ArgsReplicateSessions: sessions.ArgsReplicateSessions{ CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", Passive: false, diff --git a/dispatchers/stats.go b/dispatchers/stats.go index 37b7a25cc..4b90b2a62 100755 --- a/dispatchers/stats.go +++ b/dispatchers/stats.go @@ -106,8 +106,8 @@ func (dS *DispatcherService) StatSv1GetQueueFloatMetrics(args *utils.TenantIDWit func (dS *DispatcherService) StatSv1GetQueueIDs(args *utils.TenantWithOpts, reply *[]string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg != nil && args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.StatSv1GetQueueIDs, tnt, diff --git a/dispatchers/stats_it_test.go b/dispatchers/stats_it_test.go index 3b5b4fce2..6cbd09ad1 100755 --- a/dispatchers/stats_it_test.go +++ b/dispatchers/stats_it_test.go @@ -331,9 +331,7 @@ func testDspStsTestAuthKey3(t *testing.T) { estats := []string{"Stats2", "Stats2_1"} if err := dispEngine.RPC.Call(utils.StatSv1GetQueueIDs, &utils.TenantWithOpts{ - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "stat12345", }, diff --git a/dispatchers/thresholds.go b/dispatchers/thresholds.go index 54e1793ba..92d9e18d4 100755 --- a/dispatchers/thresholds.go +++ b/dispatchers/thresholds.go @@ -67,8 +67,8 @@ func (dS *DispatcherService) ThresholdSv1ProcessEvent(args *engine.ThresholdsArg func (dS *DispatcherService) ThresholdSv1GetThresholdIDs(args *utils.TenantWithOpts, tIDs *[]string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.TenantArg != nil && args.TenantArg.Tenant != utils.EmptyString { - tnt = args.TenantArg.Tenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ThresholdSv1GetThresholdIDs, diff --git a/dispatchers/thresholds_it_test.go b/dispatchers/thresholds_it_test.go index 0deeadc09..a709dac95 100755 --- a/dispatchers/thresholds_it_test.go +++ b/dispatchers/thresholds_it_test.go @@ -256,9 +256,7 @@ func testDspThTestAuthKey3(t *testing.T) { eIDs := []string{"THD_ACNT_1002"} if err := dispEngine.RPC.Call(utils.ThresholdSv1GetThresholdIDs, &utils.TenantWithOpts{ - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "thr12345", }, diff --git a/dispatchers/utils.go b/dispatchers/utils.go index 466ca1274..3b80515e5 100755 --- a/dispatchers/utils.go +++ b/dispatchers/utils.go @@ -36,26 +36,26 @@ var ( //var used in all tests ) type ArgsReplicateSessionsWithOpts struct { - Opts map[string]interface{} - utils.TenantArg + Opts map[string]interface{} + Tenant string sessions.ArgsReplicateSessions } type AttrRemoteLockWithOpts struct { - Opts map[string]interface{} - utils.TenantArg + Opts map[string]interface{} + Tenant string utils.AttrRemoteLock } type AttrRemoteUnlockWithOpts struct { - Opts map[string]interface{} - utils.TenantArg - RefID string + Opts map[string]interface{} + Tenant string + RefID string } type ArgStartServiceWithOpts struct { - Opts map[string]interface{} - utils.TenantArg + Opts map[string]interface{} + Tenant string servmanager.ArgStartService } diff --git a/engine/action_plan_test.go b/engine/action_plan_test.go index 659fa7584..30b6dfc0c 100644 --- a/engine/action_plan_test.go +++ b/engine/action_plan_test.go @@ -29,7 +29,7 @@ import ( func TestActionTimingTasks(t *testing.T) { //empty check actionTiming := new(ActionTiming) - eOut := []*Task{&Task{Uuid: "", ActionsID: ""}} + eOut := []*Task{{Uuid: "", ActionsID: ""}} rcv := actionTiming.Tasks() if !reflect.DeepEqual(eOut, rcv) { t.Errorf("Expecting: %+v, received: %+v", eOut, rcv) @@ -39,9 +39,9 @@ func TestActionTimingTasks(t *testing.T) { actionTiming.Uuid = "test" actionTiming.accountIDs = utils.StringMap{"1001": true, "1002": true, "1003": true} eOut = []*Task{ - &Task{Uuid: "test", AccountID: "1001", ActionsID: "test"}, - &Task{Uuid: "test", AccountID: "1002", ActionsID: "test"}, - &Task{Uuid: "test", AccountID: "1003", ActionsID: "test"}, + {Uuid: "test", AccountID: "1001", ActionsID: "test"}, + {Uuid: "test", AccountID: "1002", ActionsID: "test"}, + {Uuid: "test", AccountID: "1003", ActionsID: "test"}, } rcv = actionTiming.Tasks() sort.Slice(rcv, func(i, j int) bool { return rcv[i].AccountID < rcv[j].AccountID }) @@ -93,7 +93,7 @@ func TestActionPlanClone(t *testing.T) { Id: "test", AccountIDs: utils.StringMap{"one": true, "two": true, "three": true}, ActionTimings: []*ActionTiming{ - &ActionTiming{ + { Uuid: "Uuid_test1", ActionsID: "ActionsID_test1", Weight: 0.8, diff --git a/engine/action_trigger_test.go b/engine/action_trigger_test.go index 6dee7e98b..b2c6bf21d 100644 --- a/engine/action_trigger_test.go +++ b/engine/action_trigger_test.go @@ -96,18 +96,18 @@ func TestActionTriggersClone(t *testing.T) { } atpl = []*ActionTrigger{ - &ActionTrigger{ + { ID: "test1", }, - &ActionTrigger{ + { ID: "test2", }, } eOut = []*ActionTrigger{ - &ActionTrigger{ + { ID: "test1", }, - &ActionTrigger{ + { ID: "test2", }, } diff --git a/engine/balance_filter_test.go b/engine/balance_filter_test.go index 20a5c45d7..1f308bb0d 100644 --- a/engine/balance_filter_test.go +++ b/engine/balance_filter_test.go @@ -124,8 +124,8 @@ func TestBalanceFilterClone(t *testing.T) { "TimingIDs_false": false, }, Timings: []*RITiming{ - &RITiming{Years: utils.Years{2019}}, - &RITiming{Months: utils.Months{4}}, + {Years: utils.Years{2019}}, + {Months: utils.Months{4}}, }, Disabled: utils.BoolPointer(true), Factor: &ValueFactor{AccountActionsCSVContent: 0.7}, @@ -158,8 +158,8 @@ func TestBalanceFilterClone(t *testing.T) { "TimingIDs_false": false, }, Timings: []*RITiming{ - &RITiming{Years: utils.Years{2019}}, - &RITiming{Months: utils.Months{4}}, + {Years: utils.Years{2019}}, + {Months: utils.Months{4}}, }, Disabled: utils.BoolPointer(true), Factor: &ValueFactor{AccountActionsCSVContent: 0.7}, diff --git a/engine/callcost_test.go b/engine/callcost_test.go index 19ac3cca7..f352fd8b7 100644 --- a/engine/callcost_test.go +++ b/engine/callcost_test.go @@ -167,11 +167,11 @@ func TestCallCostGetDurationZero(t *testing.T) { func TestCallCostGetDuration(t *testing.T) { cc := &CallCost{ Timespans: []*TimeSpan{ - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 13, 40, 0, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 13, 41, 0, 0, time.UTC), }, - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 13, 41, 0, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 13, 41, 30, 0, time.UTC), }, diff --git a/engine/calldesc_test.go b/engine/calldesc_test.go index 93ef4acb0..989d5c54c 100644 --- a/engine/calldesc_test.go +++ b/engine/calldesc_test.go @@ -149,7 +149,7 @@ func TestSerialDebit(t *testing.T) { moneyConcurent := &Account{ ID: "cgrates.org:moneyp", BalanceMap: map[string]Balances{ - utils.MONETARY: Balances{ + utils.MONETARY: { &Balance{Value: initialBalance, Weight: 10}, }}, } @@ -186,7 +186,7 @@ func TestParallelDebit(t *testing.T) { moneyConcurent := &Account{ ID: "cgrates.org:moneyp", BalanceMap: map[string]Balances{ - utils.MONETARY: Balances{ + utils.MONETARY: { &Balance{Value: initialBalance, Weight: 10}, }}, } @@ -253,7 +253,7 @@ func TestSplitSpansWeekend(t *testing.T) { MatchedDestId: "SPN_MOB", ActivationTime: time.Date(2015, 4, 23, 0, 0, 0, 0, time.UTC), RateIntervals: []*RateInterval{ - &RateInterval{ + { Timing: &RITiming{ WeekDays: []time.Weekday{time.Monday, time.Tuesday, time.Wednesday, time.Thursday, time.Friday}, StartTime: "08:00:00", @@ -267,7 +267,7 @@ func TestSplitSpansWeekend(t *testing.T) { }, }, }, - &RateInterval{ + { Timing: &RITiming{ WeekDays: []time.Weekday{time.Monday, time.Tuesday, time.Wednesday, time.Thursday, time.Friday}, StartTime: "00:00:00", @@ -281,7 +281,7 @@ func TestSplitSpansWeekend(t *testing.T) { }, }, }, - &RateInterval{ + { Timing: &RITiming{ WeekDays: []time.Weekday{time.Saturday, time.Sunday}, StartTime: "00:00:00", @@ -1631,10 +1631,10 @@ func TestCDRefundIncrements(t *testing.T) { ub := &Account{ ID: "test:ref", BalanceMap: map[string]Balances{ - utils.MONETARY: Balances{ + utils.MONETARY: { &Balance{Uuid: "moneya", Value: 100}, }, - utils.VOICE: Balances{ + utils.VOICE: { &Balance{Uuid: "minutea", Value: 10 * float64(time.Second), Weight: 20, @@ -1669,10 +1669,10 @@ func TestCDRefundIncrementsZeroValue(t *testing.T) { ub := &Account{ ID: "test:ref", BalanceMap: map[string]Balances{ - utils.MONETARY: Balances{ + utils.MONETARY: { &Balance{Uuid: "moneya", Value: 100}, }, - utils.VOICE: Balances{ + utils.VOICE: { &Balance{Uuid: "minutea", Value: 10, Weight: 20, DestinationIDs: utils.StringMap{"NAT": true}}, &Balance{Uuid: "minuteb", Value: 10, DestinationIDs: utils.StringMap{"RET": true}}, }, @@ -1698,7 +1698,7 @@ func TestCDDebitBalanceSubjectWithFallback(t *testing.T) { acnt := &Account{ ID: "TCDDBSWF:account1", BalanceMap: map[string]Balances{ - utils.VOICE: Balances{ + utils.VOICE: { &Balance{ID: "voice1", Value: 60 * float64(time.Second), RatingSubject: "SubjTCDDBSWF"}, }}, @@ -1710,7 +1710,7 @@ func TestCDDebitBalanceSubjectWithFallback(t *testing.T) { rpSubj := &RatingPlan{ Id: "RP_TCDDBSWF", Timings: map[string]*RITiming{ - "30eab300": &RITiming{ + "30eab300": { Years: utils.Years{}, Months: utils.Months{}, MonthDays: utils.MonthDays{}, @@ -1719,10 +1719,10 @@ func TestCDDebitBalanceSubjectWithFallback(t *testing.T) { }, }, Ratings: map[string]*RIRate{ - "b457f86d": &RIRate{ + "b457f86d": { Rates: []*RGRate{ - &RGRate{ + { GroupIntervalStart: 0, Value: 0, RateIncrement: 60 * time.Second, @@ -1735,7 +1735,7 @@ func TestCDDebitBalanceSubjectWithFallback(t *testing.T) { }, DestinationRates: map[string]RPRateList{ dst.Id: []*RPRate{ - &RPRate{ + { Timing: "30eab300", Rating: "b457f86d", Weight: 10, @@ -1746,7 +1746,7 @@ func TestCDDebitBalanceSubjectWithFallback(t *testing.T) { rpDflt := &RatingPlan{ Id: "RP_DFLT", Timings: map[string]*RITiming{ - "30eab301": &RITiming{ + "30eab301": { Years: utils.Years{}, Months: utils.Months{}, MonthDays: utils.MonthDays{}, @@ -1755,9 +1755,9 @@ func TestCDDebitBalanceSubjectWithFallback(t *testing.T) { }, }, Ratings: map[string]*RIRate{ - "b457f861": &RIRate{ + "b457f861": { Rates: []*RGRate{ - &RGRate{ + { GroupIntervalStart: 0, Value: 0.01, RateIncrement: time.Second, @@ -1770,7 +1770,7 @@ func TestCDDebitBalanceSubjectWithFallback(t *testing.T) { }, DestinationRates: map[string]RPRateList{ dst.Id: []*RPRate{ - &RPRate{ + { Timing: "30eab301", Rating: "b457f861", Weight: 10, diff --git a/engine/cdr_test.go b/engine/cdr_test.go index 057f217be..a94bc3c2a 100644 --- a/engine/cdr_test.go +++ b/engine/cdr_test.go @@ -244,13 +244,13 @@ func TestFieldAsStringForCostDetails(t *testing.T) { Tenant: "cgrates.org", ID: "AccountFromAccountSummary", BalanceSummaries: []*BalanceSummary{ - &BalanceSummary{ + { UUID: "f9be602747f4", ID: "monetary", Type: utils.MONETARY, Value: 0.5, }, - &BalanceSummary{ + { UUID: "2e02510ab90a", ID: "voice", Type: utils.VOICE, @@ -1198,7 +1198,7 @@ func TestCDRcombimedCdrFieldVal(t *testing.T) { } groupCDRs := []*CDR{ cdr, - &CDR{ + { CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 124, ToR: utils.VOICE, @@ -1217,7 +1217,7 @@ func TestCDRcombimedCdrFieldVal(t *testing.T) { Usage: time.Duration(10) * time.Second, Cost: 1.22, }, - &CDR{ + { CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 125, ToR: utils.VOICE, diff --git a/engine/cdrs.go b/engine/cdrs.go index 366918aaf..1347bed61 100644 --- a/engine/cdrs.go +++ b/engine/cdrs.go @@ -973,8 +973,8 @@ func (cdrS *CDRServer) V2StoreSessionCost(args *ArgsV2CDRSStoreSMCost, reply *st type ArgRateCDRs struct { Flags []string utils.RPCCDRsFilter - *utils.TenantArg - Opts map[string]interface{} + Tenant string + Opts map[string]interface{} } // V1RateCDRs is used for re-/rate CDRs which are already stored within StorDB diff --git a/engine/datamanager.go b/engine/datamanager.go index 8e12573f1..1a34b5325 100644 --- a/engine/datamanager.go +++ b/engine/datamanager.go @@ -308,8 +308,8 @@ func (dm *DataManager) GetDestination(key string, skipCache bool, transactionID if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaDestinations]; err == utils.ErrNotFound && itm.Remote { if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetDestination, &utils.StringWithOpts{ - Arg: key, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: key, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -340,7 +340,7 @@ func (dm *DataManager) SetDestination(dest *Destination, transactionID string) ( utils.ReplicatorSv1SetDestination, &DestinationWithOpts{ Destination: dest, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -364,8 +364,8 @@ func (dm *DataManager) RemoveDestination(destID string, transactionID string) (e var reply string dm.connMgr.Call(config.CgrConfig().DataDbCfg().RplConns, nil, utils.ReplicatorSv1RemoveDestination, &utils.StringWithOpts{ - Arg: destID, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: destID, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -404,8 +404,8 @@ func (dm *DataManager) GetReverseDestination(prefix string, if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaReverseDestinations]; err == utils.ErrNotFound && itm.Remote { if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetReverseDestination, &utils.StringWithOpts{ - Arg: prefix, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: prefix, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -443,8 +443,8 @@ func (dm *DataManager) GetAccount(id string) (acc *Account, err error) { tenant := utils.FirstNonEmpty(splt[0], config.CgrConfig().GeneralCfg().DefaultTenant) if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetAccount, &utils.StringWithOpts{ - Arg: id, - TenantArg: utils.TenantArg{Tenant: tenant}, + Arg: id, + Tenant: tenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -499,8 +499,8 @@ func (dm *DataManager) RemoveAccount(id string) (err error) { dm.connMgr.Call(config.CgrConfig().DataDbCfg().RplConns, nil, utils.ReplicatorSv1RemoveAccount, &utils.StringWithOpts{ - Arg: id, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: id, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1129,8 +1129,8 @@ func (dm *DataManager) GetTiming(id string, skipCache bool, if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaTimings]; err == utils.ErrNotFound && itm.Remote { if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetTiming, &utils.StringWithOpts{ - Arg: id, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: id, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1448,8 +1448,8 @@ func (dm *DataManager) GetActionTriggers(id string, skipCache bool, if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaActionTriggers]; err == utils.ErrNotFound && itm.Remote { if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetActionTriggers, &utils.StringWithOpts{ - Arg: id, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: id, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1493,8 +1493,8 @@ func (dm *DataManager) RemoveActionTriggers(id, transactionID string) (err error dm.connMgr.Call(config.CgrConfig().DataDbCfg().RplConns, nil, utils.ReplicatorSv1RemoveActionTriggers, &utils.StringWithOpts{ - Arg: id, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: id, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1505,10 +1505,10 @@ func (dm *DataManager) RemoveActionTriggers(id, transactionID string) (err error //SetActionTriggersArgWithOpts is used to send the key and the ActionTriggers to Replicator type SetActionTriggersArgWithOpts struct { - Key string - Attrs ActionTriggers - utils.TenantArg - Opts map[string]interface{} + Key string + Attrs ActionTriggers + Tenant string + Opts map[string]interface{} } func (dm *DataManager) SetActionTriggers(key string, attr ActionTriggers, @@ -1532,7 +1532,7 @@ func (dm *DataManager) SetActionTriggers(key string, attr ActionTriggers, utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, }, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, }, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -1560,8 +1560,8 @@ func (dm *DataManager) GetSharedGroup(key string, skipCache bool, if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaSharedGroups]; err == utils.ErrNotFound && itm.Remote { if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetSharedGroup, &utils.StringWithOpts{ - Arg: key, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: key, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1607,7 +1607,7 @@ func (dm *DataManager) SetSharedGroup(sg *SharedGroup, utils.ReplicatorSv1SetSharedGroup, &SharedGroupWithOpts{ SharedGroup: sg, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1636,8 +1636,8 @@ func (dm *DataManager) RemoveSharedGroup(id, transactionID string) (err error) { dm.connMgr.Call(config.CgrConfig().DataDbCfg().RplConns, nil, utils.ReplicatorSv1RemoveSharedGroup, &utils.StringWithOpts{ - Arg: id, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: id, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1667,8 +1667,8 @@ func (dm *DataManager) GetActions(key string, skipCache bool, transactionID stri if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaActions]; err == utils.ErrNotFound && itm.Remote { if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetActions, &utils.StringWithOpts{ - Arg: key, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: key, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1697,10 +1697,10 @@ func (dm *DataManager) GetActions(key string, skipCache bool, transactionID stri //SetActionsArgsWithOpts is used to send the key and the Actions to replicator type SetActionsArgsWithOpts struct { - Key string - Acs Actions - utils.TenantArg - Opts map[string]interface{} + Key string + Acs Actions + Tenant string + Opts map[string]interface{} } func (dm *DataManager) SetActions(key string, as Actions, transactionID string) (err error) { @@ -1719,7 +1719,7 @@ func (dm *DataManager) SetActions(key string, as Actions, transactionID string) if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RplConns, nil, utils.ReplicatorSv1SetActions, &SetActionsArgsWithOpts{ Key: key, Acs: as, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1747,8 +1747,8 @@ func (dm *DataManager) RemoveActions(key, transactionID string) (err error) { var reply string dm.connMgr.Call(config.CgrConfig().DataDbCfg().RplConns, nil, utils.ReplicatorSv1RemoveActions, &utils.StringWithOpts{ - Arg: key, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: key, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1766,8 +1766,8 @@ func (dm *DataManager) GetActionPlan(key string, skipCache bool, transactionID s if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaActionPlans]; err == utils.ErrNotFound && itm.Remote { if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetActionPlan, &utils.StringWithOpts{ - Arg: key, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: key, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1788,8 +1788,8 @@ type SetActionPlanArgWithOpts struct { Key string Ats *ActionPlan Overwrite bool - utils.TenantArg - Opts map[string]interface{} + Tenant string + Opts map[string]interface{} } func (dm *DataManager) SetActionPlan(key string, ats *ActionPlan, @@ -1808,7 +1808,7 @@ func (dm *DataManager) SetActionPlan(key string, ats *ActionPlan, Key: key, Ats: ats, Overwrite: overwrite, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1830,8 +1830,8 @@ func (dm *DataManager) GetAllActionPlans() (ats map[string]*ActionPlan, err erro err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetAllActionPlans, &utils.StringWithOpts{ - Arg: utils.EmptyString, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: utils.EmptyString, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1858,8 +1858,8 @@ func (dm *DataManager) RemoveActionPlan(key string, transactionID string) (err e dm.connMgr.Call(config.CgrConfig().DataDbCfg().RplConns, nil, utils.ReplicatorSv1RemoveActionPlan, &utils.StringWithOpts{ - Arg: key, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: key, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1878,8 +1878,8 @@ func (dm *DataManager) GetAccountActionPlans(acntID string, if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetAccountActionPlans, &utils.StringWithOpts{ - Arg: acntID, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: acntID, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1900,8 +1900,8 @@ type SetAccountActionPlansArgWithOpts struct { AcntID string AplIDs []string Overwrite bool - utils.TenantArg - Opts map[string]interface{} + Tenant string + Opts map[string]interface{} } func (dm *DataManager) SetAccountActionPlans(acntID string, aPlIDs []string, overwrite bool) (err error) { @@ -1919,7 +1919,7 @@ func (dm *DataManager) SetAccountActionPlans(acntID string, aPlIDs []string, ove AcntID: acntID, AplIDs: aPlIDs, Overwrite: overwrite, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1935,8 +1935,8 @@ func (dm *DataManager) SetAccountActionPlans(acntID string, aPlIDs []string, ove type RemAccountActionPlansArgsWithOpts struct { AcntID string ApIDs []string - utils.TenantArg - Opts map[string]interface{} + Tenant string + Opts map[string]interface{} } func (dm *DataManager) RemAccountActionPlans(acntID string, apIDs []string) (err error) { @@ -1953,7 +1953,7 @@ func (dm *DataManager) RemAccountActionPlans(acntID string, apIDs []string) (err utils.ReplicatorSv1RemAccountActionPlans, &RemAccountActionPlansArgsWithOpts{ AcntID: acntID, ApIDs: apIDs, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -1982,8 +1982,8 @@ func (dm *DataManager) GetRatingPlan(key string, skipCache bool, if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetRatingPlan, &utils.StringWithOpts{ - Arg: key, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: key, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -2027,7 +2027,7 @@ func (dm *DataManager) SetRatingPlan(rp *RatingPlan, transactionID string) (err utils.ReplicatorSv1SetRatingPlan, &RatingPlanWithOpts{ RatingPlan: rp, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -2056,8 +2056,8 @@ func (dm *DataManager) RemoveRatingPlan(key string, transactionID string) (err e dm.connMgr.Call(config.CgrConfig().DataDbCfg().RplConns, nil, utils.ReplicatorSv1RemoveRatingPlan, &utils.StringWithOpts{ - Arg: key, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: key, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -2089,8 +2089,8 @@ func (dm *DataManager) GetRatingProfile(key string, skipCache bool, if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetRatingProfile, &utils.StringWithOpts{ - Arg: key, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: key, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -2135,7 +2135,7 @@ func (dm *DataManager) SetRatingProfile(rpf *RatingProfile, utils.ReplicatorSv1SetRatingProfile, &RatingProfileWithOpts{ RatingProfile: rpf, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -2165,8 +2165,8 @@ func (dm *DataManager) RemoveRatingProfile(key string, dm.connMgr.Call(config.CgrConfig().DataDbCfg().RplConns, nil, utils.ReplicatorSv1RemoveRatingProfile, &utils.StringWithOpts{ - Arg: key, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: key, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -2827,8 +2827,8 @@ func (dm *DataManager) GetItemLoadIDs(itemIDPrefix string, cacheWrite bool) (loa if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetItemLoadIDs, &utils.StringWithOpts{ - Arg: itemIDPrefix, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Arg: itemIDPrefix, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -2875,8 +2875,8 @@ func (dm *DataManager) SetLoadIDs(loadIDs map[string]int64) (err error) { if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RplConns, nil, utils.ReplicatorSv1SetLoadIDs, &utils.LoadIDsWithOpts{ - LoadIDs: loadIDs, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + LoadIDs: loadIDs, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -3187,7 +3187,7 @@ func (dm *DataManager) GetIndexes(idxItmType, tntCtx, idxKey string, IdxItmType: idxItmType, TntCtx: tntCtx, IdxKey: idxKey, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -3239,7 +3239,7 @@ func (dm *DataManager) SetIndexes(idxItmType, tntCtx string, IdxItmType: idxItmType, TntCtx: tntCtx, Indexes: indexes, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, @@ -3267,7 +3267,7 @@ func (dm *DataManager) RemoveIndexes(idxItmType, tntCtx, idxKey string) (err err IdxItmType: idxItmType, TntCtx: tntCtx, IdxKey: idxKey, - TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, + Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, Opts: map[string]interface{}{ utils.OptsAPIKey: itm.APIKey, utils.OptsRouteID: itm.RouteID, diff --git a/engine/destinations.go b/engine/destinations.go index f04652cc8..193794474 100644 --- a/engine/destinations.go +++ b/engine/destinations.go @@ -39,8 +39,8 @@ type Destination struct { type DestinationWithOpts struct { *Destination - utils.TenantArg - Opts map[string]interface{} + Tenant string + Opts map[string]interface{} } // returns prefix precision diff --git a/engine/eventcost_test.go b/engine/eventcost_test.go index 965b2d4f5..457b2ba21 100644 --- a/engine/eventcost_test.go +++ b/engine/eventcost_test.go @@ -33,28 +33,28 @@ var testEC = &EventCost{ RunID: utils.MetaDefault, StartTime: time.Date(2017, 1, 9, 16, 18, 21, 0, time.UTC), Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "c1a5ab9", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(0), Cost: 0.1, AccountingID: "9bdad10", CompressFactor: 1, }, - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0, AccountingID: "3455b83", CompressFactor: 10, }, - &ChargingIncrement{ + { Usage: time.Duration(10 * time.Second), Cost: 0.01, AccountingID: "a012888", CompressFactor: 2, }, - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.005, AccountingID: "44d6c02", @@ -63,10 +63,10 @@ var testEC = &EventCost{ }, CompressFactor: 1, }, - &ChargingInterval{ + { RatingID: "c1a5ab9", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.01, AccountingID: "a012888", @@ -75,22 +75,22 @@ var testEC = &EventCost{ }, CompressFactor: 4, }, - &ChargingInterval{ + { RatingID: "c1a5ab9", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0, AccountingID: "3455b83", CompressFactor: 10, }, - &ChargingIncrement{ + { Usage: time.Duration(10 * time.Second), Cost: 0.01, AccountingID: "a012888", CompressFactor: 2, }, - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.005, AccountingID: "44d6c02", @@ -104,17 +104,17 @@ var testEC = &EventCost{ Tenant: "cgrates.org", ID: "dan", BalanceSummaries: []*BalanceSummary{ - &BalanceSummary{ + { UUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010", Type: utils.MONETARY, Value: 50, }, - &BalanceSummary{ + { UUID: "7a54a9e9-d610-4c82-bcb5-a315b9a65010", Type: utils.MONETARY, Value: 25, }, - &BalanceSummary{ + { UUID: "4b8b53d7-c1a1-4159-b845-4623a00a0165", Type: utils.VOICE, Value: 200, @@ -298,16 +298,16 @@ func TestNewEventCostFromCallCost(t *testing.T) { Tenant: "cgrates.org", ID: "dan", BalanceSummaries: []*BalanceSummary{ - &BalanceSummary{ + { Type: "*monetary", Value: 50, Disabled: false}, - &BalanceSummary{ + { ID: "4b8b53d7-c1a1-4159-b845-4623a00a0165", Type: "*monetary", Value: 25, Disabled: false}, - &BalanceSummary{ + { Type: "*voice", Value: 200, Disabled: false, @@ -479,22 +479,22 @@ func TestNewEventCostFromCallCost(t *testing.T) { Cost: utils.Float64Pointer(0.85), Usage: utils.DurationPointer(time.Duration(2 * time.Minute)), Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "f2518464-68b8-42f4-acec-aef23d714314", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(0), Cost: 0.1, AccountingID: "44e97dec-8a7e-43d0-8b0a-736d46b5613e", CompressFactor: 1, }, - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0, AccountingID: "a555cde8-4bd0-408a-afbc-c3ba64888927", CompressFactor: 30, }, - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.005, AccountingID: "906bfd0f-035c-40a3-93a8-46f71627983e", @@ -506,10 +506,10 @@ func TestNewEventCostFromCallCost(t *testing.T) { cost: utils.Float64Pointer(0.25), ecUsageIdx: utils.DurationPointer(time.Duration(0)), }, - &ChargingInterval{ + { RatingID: "f2518464-68b8-42f4-acec-aef23d714314", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.01, AccountingID: "c890a899-df43-497a-9979-38492713f57b", @@ -931,16 +931,16 @@ func TestECAsCallCost(t *testing.T) { Tenant: "cgrates.org", ID: "dan", BalanceSummaries: []*BalanceSummary{ - &BalanceSummary{ + { Type: "*monetary", Value: 50, Disabled: false}, - &BalanceSummary{ + { ID: "4b8b53d7-c1a1-4159-b845-4623a00a0165", Type: "*monetary", Value: 25, Disabled: false}, - &BalanceSummary{ + { Type: "*voice", Value: 200, Disabled: false, @@ -956,22 +956,22 @@ func TestECAsCallCost(t *testing.T) { Cost: utils.Float64Pointer(0.85), Usage: utils.DurationPointer(time.Duration(2 * time.Minute)), Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "f2518464-68b8-42f4-acec-aef23d714314", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(0), Cost: 0.1, AccountingID: "44e97dec-8a7e-43d0-8b0a-736d46b5613e", CompressFactor: 1, }, - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0, AccountingID: "a555cde8-4bd0-408a-afbc-c3ba64888927", CompressFactor: 30, }, - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.005, AccountingID: "906bfd0f-035c-40a3-93a8-46f71627983e", @@ -980,10 +980,10 @@ func TestECAsCallCost(t *testing.T) { }, CompressFactor: 1, }, - &ChargingInterval{ + { RatingID: "f2518464-68b8-42f4-acec-aef23d714314", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.01, AccountingID: "c890a899-df43-497a-9979-38492713f57b", @@ -1257,28 +1257,28 @@ func TestECTrimMiddle1(t *testing.T) { ec := testEC.Clone() eEC := testEC.Clone() eEC.Charges = []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "c1a5ab9", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(0), Cost: 0.1, AccountingID: "9bdad10", CompressFactor: 1, }, - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0, AccountingID: "3455b83", CompressFactor: 10, }, - &ChargingIncrement{ + { Usage: time.Duration(10 * time.Second), Cost: 0.01, AccountingID: "a012888", CompressFactor: 2, }, - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.005, AccountingID: "44d6c02", @@ -1287,10 +1287,10 @@ func TestECTrimMiddle1(t *testing.T) { }, CompressFactor: 1, }, - &ChargingInterval{ + { RatingID: "c1a5ab9", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.01, AccountingID: "a012888", @@ -1299,10 +1299,10 @@ func TestECTrimMiddle1(t *testing.T) { }, CompressFactor: 2, }, - &ChargingInterval{ + { RatingID: "c1a5ab9", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.01, AccountingID: "a012888", @@ -1315,10 +1315,10 @@ func TestECTrimMiddle1(t *testing.T) { eSrplsEC := testEC.Clone() eSrplsEC.StartTime = time.Date(2017, 1, 9, 16, 21, 31, 0, time.UTC) eSrplsEC.Charges = []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "c1a5ab9", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.01, AccountingID: "a012888", @@ -1327,10 +1327,10 @@ func TestECTrimMiddle1(t *testing.T) { }, CompressFactor: 1, }, - &ChargingInterval{ + { RatingID: "c1a5ab9", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.01, AccountingID: "a012888", @@ -1339,22 +1339,22 @@ func TestECTrimMiddle1(t *testing.T) { }, CompressFactor: 1, }, - &ChargingInterval{ + { RatingID: "c1a5ab9", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0, AccountingID: "3455b83", CompressFactor: 10, }, - &ChargingIncrement{ + { Usage: time.Duration(10 * time.Second), Cost: 0.01, AccountingID: "a012888", CompressFactor: 2, }, - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.005, AccountingID: "44d6c02", @@ -1483,10 +1483,10 @@ func TestECMergeGT(t *testing.T) { RunID: utils.MetaDefault, StartTime: time.Date(2018, 7, 27, 0, 59, 21, 0, time.UTC), Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "cc68da4", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "0d87a64", CompressFactor: 103, @@ -1499,7 +1499,7 @@ func TestECMergeGT(t *testing.T) { Tenant: "cgrates.org", ID: "dan", BalanceSummaries: []*BalanceSummary{ - &BalanceSummary{ + { UUID: "9a767726-fe69-4940-b7bd-f43de9f0f8a5", ID: "addon_data", Type: utils.DATA, @@ -1541,10 +1541,10 @@ func TestECMergeGT(t *testing.T) { RunID: utils.MetaDefault, StartTime: time.Date(2018, 7, 27, 0, 59, 38, 0105472, time.UTC), Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "6a83227", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "9288f93", CompressFactor: 84, @@ -1557,7 +1557,7 @@ func TestECMergeGT(t *testing.T) { Tenant: "cgrates.org", ID: "dan", BalanceSummaries: []*BalanceSummary{ - &BalanceSummary{ + { UUID: "9a767726-fe69-4940-b7bd-f43de9f0f8a5", ID: "addon_data", Type: utils.DATA, @@ -1600,10 +1600,10 @@ func TestECMergeGT(t *testing.T) { RunID: utils.MetaDefault, StartTime: time.Date(2018, 7, 27, 0, 59, 21, 0, time.UTC), Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "cc68da4", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "0d87a64", CompressFactor: 187, @@ -1616,7 +1616,7 @@ func TestECMergeGT(t *testing.T) { Tenant: "cgrates.org", ID: "dan", BalanceSummaries: []*BalanceSummary{ - &BalanceSummary{ + { UUID: "9a767726-fe69-4940-b7bd-f43de9f0f8a5", ID: "addon_data", Type: utils.DATA, @@ -1666,10 +1666,10 @@ func TestECAppendCIlFromEC(t *testing.T) { // Standard compressing 1-1 ec := &EventCost{ Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "cc68da4", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "0d87a64", CompressFactor: 103, @@ -1710,10 +1710,10 @@ func TestECAppendCIlFromEC(t *testing.T) { } oEC := &EventCost{ Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "6a83227", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "9288f93", CompressFactor: 84, @@ -1755,10 +1755,10 @@ func TestECAppendCIlFromEC(t *testing.T) { ec.appendCIlFromEC(oEC, 0) eEC := &EventCost{ Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "cc68da4", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "0d87a64", CompressFactor: 187, @@ -1804,10 +1804,10 @@ func TestECAppendCIlFromEC(t *testing.T) { // Second case, do not compress if first interval's compress factor is different than 1 ec = &EventCost{ Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "cc68da4", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "0d87a64", CompressFactor: 103, @@ -1848,10 +1848,10 @@ func TestECAppendCIlFromEC(t *testing.T) { } oEC = &EventCost{ Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "6a83227", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "9288f93", CompressFactor: 84, @@ -1893,10 +1893,10 @@ func TestECAppendCIlFromEC(t *testing.T) { ec.appendCIlFromEC(oEC, 0) eEC = &EventCost{ Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "cc68da4", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "0d87a64", CompressFactor: 103, @@ -1904,10 +1904,10 @@ func TestECAppendCIlFromEC(t *testing.T) { }, CompressFactor: 2, }, - &ChargingInterval{ + { RatingID: "cc68da4", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "0d87a64", CompressFactor: 84, @@ -1953,10 +1953,10 @@ func TestECAppendCIlFromEC(t *testing.T) { // Third case, split oEC ec = &EventCost{ Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "cc68da4", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(100), AccountingID: "0d87a64", CompressFactor: 1, @@ -1964,10 +1964,10 @@ func TestECAppendCIlFromEC(t *testing.T) { }, CompressFactor: 1, }, - &ChargingInterval{ + { RatingID: "cc68da4", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "0d87a64", CompressFactor: 103, @@ -2008,15 +2008,15 @@ func TestECAppendCIlFromEC(t *testing.T) { } oEC = &EventCost{ Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "6a83227", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "9288f93", CompressFactor: 42, }, - &ChargingIncrement{ + { Usage: time.Duration(10240), AccountingID: "9288f93", CompressFactor: 20, @@ -2058,10 +2058,10 @@ func TestECAppendCIlFromEC(t *testing.T) { ec.appendCIlFromEC(oEC, 0) eEC = &EventCost{ Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "cc68da4", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(100), AccountingID: "0d87a64", CompressFactor: 1, @@ -2069,10 +2069,10 @@ func TestECAppendCIlFromEC(t *testing.T) { }, CompressFactor: 1, }, - &ChargingInterval{ + { RatingID: "cc68da4", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "0d87a64", CompressFactor: 145, @@ -2080,10 +2080,10 @@ func TestECAppendCIlFromEC(t *testing.T) { }, CompressFactor: 1, }, - &ChargingInterval{ + { RatingID: "cc68da4", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(10240), AccountingID: "0d87a64", CompressFactor: 20, @@ -2091,15 +2091,15 @@ func TestECAppendCIlFromEC(t *testing.T) { }, CompressFactor: 1, }, - &ChargingInterval{ + { RatingID: "cc68da4", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "0d87a64", CompressFactor: 42, }, - &ChargingIncrement{ + { Usage: time.Duration(10240), AccountingID: "0d87a64", CompressFactor: 20, @@ -2145,10 +2145,10 @@ func TestECAppendCIlFromEC(t *testing.T) { // Fourth case, increase ChargingInterval.CompressFactor ec = &EventCost{ Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "cc68da4", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "0d87a64", CompressFactor: 103, @@ -2189,10 +2189,10 @@ func TestECAppendCIlFromEC(t *testing.T) { } oEC = &EventCost{ Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "6a83227", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "9288f93", CompressFactor: 103, @@ -2234,10 +2234,10 @@ func TestECAppendCIlFromEC(t *testing.T) { ec.appendCIlFromEC(oEC, 0) eEC = &EventCost{ Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "cc68da4", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(102400), AccountingID: "0d87a64", CompressFactor: 103, @@ -2345,28 +2345,28 @@ func TestECSyncKeys(t *testing.T) { RunID: utils.MetaDefault, StartTime: time.Date(2017, 1, 9, 16, 18, 21, 0, time.UTC), Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "21a5ab9", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(0), Cost: 0.1, AccountingID: "9bdad10", CompressFactor: 1, }, - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0, AccountingID: "3455b83", CompressFactor: 10, }, - &ChargingIncrement{ + { Usage: time.Duration(10 * time.Second), Cost: 0.01, AccountingID: "2012888", CompressFactor: 2, }, - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.005, AccountingID: "44d6c02", @@ -2375,10 +2375,10 @@ func TestECSyncKeys(t *testing.T) { }, CompressFactor: 1, }, - &ChargingInterval{ + { RatingID: "21a5ab9", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.01, AccountingID: "2012888", @@ -2387,22 +2387,22 @@ func TestECSyncKeys(t *testing.T) { }, CompressFactor: 4, }, - &ChargingInterval{ + { RatingID: "21a5ab9", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0, AccountingID: "3455b83", CompressFactor: 10, }, - &ChargingIncrement{ + { Usage: time.Duration(10 * time.Second), Cost: 0.01, AccountingID: "2012888", CompressFactor: 2, }, - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.005, AccountingID: "44d6c02", @@ -2416,17 +2416,17 @@ func TestECSyncKeys(t *testing.T) { Tenant: "cgrates.org", ID: "dan", BalanceSummaries: []*BalanceSummary{ - &BalanceSummary{ + { UUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010", Type: utils.MONETARY, Value: 50, Disabled: false}, - &BalanceSummary{ + { UUID: "7a54a9e9-d610-4c82-bcb5-a315b9a65010", Type: utils.MONETARY, Value: 25, Disabled: false}, - &BalanceSummary{ + { UUID: "4b8b53d7-c1a1-4159-b845-4623a00a0165", Type: "*voice", Value: 200, @@ -2602,19 +2602,19 @@ func TestEventCostfieldAsInterface(t *testing.T) { } eventCost = &EventCost{ Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "RatingID1", }, - &ChargingInterval{ + { RatingID: "RatingID2", }, }, } expectedCharges := []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "RatingID1", }, - &ChargingInterval{ + { RatingID: "RatingID2", }, } @@ -2847,12 +2847,12 @@ func TestEventCostfieldAsInterface(t *testing.T) { //default case, utils.Charges eventCost = &EventCost{ Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "RatingID", }, }, } - eCharges := []*ChargingInterval{&ChargingInterval{RatingID: "RatingID"}} + eCharges := []*ChargingInterval{{RatingID: "RatingID"}} if rcv, err := eventCost.fieldAsInterface([]string{utils.Charges}); err != nil { t.Error(err) } else if !reflect.DeepEqual(eCharges, rcv) { @@ -2953,7 +2953,7 @@ func TestEventCostgetChargesForPath(t *testing.T) { eventCost = &EventCost{} chargingInterval = &ChargingInterval{ Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { AccountingID: "AccountingID", }, }, @@ -2967,7 +2967,7 @@ func TestEventCostgetChargesForPath(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", eChargingIncrement, rcv) } eIncrements := []*ChargingIncrement{ - &ChargingIncrement{ + { AccountingID: "AccountingID", }, } @@ -3195,7 +3195,7 @@ func TestEventCostgetAcountingForPath(t *testing.T) { eventCost = &EventCost{ AccountSummary: &AccountSummary{ BalanceSummaries: BalanceSummaries{ - &BalanceSummary{ + { ID: "ID", }, }, @@ -3221,7 +3221,7 @@ func TestEventCostgetAcountingForPath(t *testing.T) { eventCost = &EventCost{ AccountSummary: &AccountSummary{ BalanceSummaries: BalanceSummaries{ - &BalanceSummary{ + { ID: "ID", }, }, diff --git a/engine/libattributes_test.go b/engine/libattributes_test.go index 02aa6bab6..f3840b1d6 100644 --- a/engine/libattributes_test.go +++ b/engine/libattributes_test.go @@ -39,7 +39,7 @@ func TestConvertExternalToProfile(t *testing.T) { ExpiryTime: time.Date(2014, 7, 14, 14, 35, 0, 0, time.UTC), }, Attributes: []*ExternalAttribute{ - &ExternalAttribute{ + { Path: utils.MetaReq + utils.NestingSep + "Account", Value: "1001", }, @@ -108,7 +108,7 @@ func TestConvertExternalToProfileMissing2(t *testing.T) { ExpiryTime: time.Date(2014, 7, 14, 14, 35, 0, 0, time.UTC), }, Attributes: []*ExternalAttribute{ - &ExternalAttribute{ + { Path: utils.MetaReq + utils.NestingSep + "Account", }, }, @@ -128,7 +128,7 @@ func TestNewAttributeFromInline(t *testing.T) { Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, ID: attrID, Contexts: []string{utils.META_ANY}, - Attributes: []*Attribute{&Attribute{ + Attributes: []*Attribute{{ Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaSum, Value: config.NewRSRParsersMustCompile("10;~*req.NumField;20", utils.INFIELD_SEP), @@ -148,12 +148,12 @@ func TestNewAttributeFromInlineWithMultipleRuns(t *testing.T) { Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, ID: attrID, Contexts: []string{utils.META_ANY}, - Attributes: []*Attribute{&Attribute{ + Attributes: []*Attribute{{ Path: utils.MetaReq + utils.NestingSep + "RequestType", Type: utils.META_CONSTANT, Value: config.NewRSRParsersMustCompile("*rated", utils.INFIELD_SEP), }, - &Attribute{ + { Path: utils.MetaReq + utils.NestingSep + "Category", Type: utils.META_CONSTANT, Value: config.NewRSRParsersMustCompile("call", utils.INFIELD_SEP), diff --git a/engine/libeventcost_test.go b/engine/libeventcost_test.go index 45ca09df1..84e34b432 100755 --- a/engine/libeventcost_test.go +++ b/engine/libeventcost_test.go @@ -31,13 +31,13 @@ func TestChargingIntervalPartiallyEquals(t *testing.T) { ci1 := &ChargingInterval{ RatingID: "Rating1", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 2.345, Usage: time.Duration(2 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 1.23, @@ -49,13 +49,13 @@ func TestChargingIntervalPartiallyEquals(t *testing.T) { ci2 := &ChargingInterval{ RatingID: "Rating1", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 2.345, Usage: time.Duration(2 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 1.23, @@ -82,19 +82,19 @@ func TestChargingIntervalUsage(t *testing.T) { ci1 := &ChargingInterval{ RatingID: "Rating1", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 2.345, Usage: time.Duration(2 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 1.23, Usage: time.Duration(5 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 3, Cost: 1.23, @@ -114,19 +114,19 @@ func TestChargingIntervalTotalUsage(t *testing.T) { ci1 := &ChargingInterval{ RatingID: "Rating1", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 2.345, Usage: time.Duration(2 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 1.23, Usage: time.Duration(5 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 3, Cost: 1.23, @@ -146,19 +146,19 @@ func TestChargingIntervalEventCostUsageIndex(t *testing.T) { ci1 := &ChargingInterval{ RatingID: "Rating1", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 2.345, Usage: time.Duration(2 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 1.23, Usage: time.Duration(5 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 3, Cost: 1.23, @@ -179,19 +179,19 @@ func TestChargingIntervalStartTime(t *testing.T) { ci1 := &ChargingInterval{ RatingID: "Rating1", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 2.345, Usage: time.Duration(2 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 1.23, Usage: time.Duration(5 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 3, Cost: 1.23, @@ -212,19 +212,19 @@ func TestChargingIntervalEndTime(t *testing.T) { ci1 := &ChargingInterval{ RatingID: "Rating1", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 2.345, Usage: time.Duration(2 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 1.23, Usage: time.Duration(5 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 3, Cost: 1.23, @@ -245,19 +245,19 @@ func TestChargingIntervalCost(t *testing.T) { ci1 := &ChargingInterval{ RatingID: "Rating1", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 2.345, Usage: time.Duration(2 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 1.23, Usage: time.Duration(5 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 3, Cost: 1.23, @@ -277,19 +277,19 @@ func TestChargingIntervalTotalCost(t *testing.T) { ci1 := &ChargingInterval{ RatingID: "Rating1", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 2.345, Usage: time.Duration(2 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 1.23, Usage: time.Duration(5 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 3, Cost: 1.23, @@ -309,19 +309,19 @@ func TestChargingIntervalClone(t *testing.T) { ci1 := &ChargingInterval{ RatingID: "Rating1", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 2.345, Usage: time.Duration(2 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 2, Cost: 1.23, Usage: time.Duration(5 * time.Second), }, - &ChargingIncrement{ + { AccountingID: "Acc1", CompressFactor: 3, Cost: 1.23, diff --git a/engine/libroutes_test.go b/engine/libroutes_test.go index 1019f5cde..4f7632977 100644 --- a/engine/libroutes_test.go +++ b/engine/libroutes_test.go @@ -27,7 +27,7 @@ import ( func TestLibSuppliersSortCost(t *testing.T) { sSpls := &SortedRoutes{ SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { RouteID: "supplier1", SortingData: map[string]interface{}{ utils.Cost: 0.1, @@ -35,7 +35,7 @@ func TestLibSuppliersSortCost(t *testing.T) { }, RouteParameters: "param1", }, - &SortedRoute{ + { RouteID: "supplier2", SortingData: map[string]interface{}{ utils.Cost: 0.1, @@ -43,7 +43,7 @@ func TestLibSuppliersSortCost(t *testing.T) { }, RouteParameters: "param2", }, - &SortedRoute{ + { RouteID: "supplier3", SortingData: map[string]interface{}{ utils.Cost: 0.05, @@ -56,7 +56,7 @@ func TestLibSuppliersSortCost(t *testing.T) { sSpls.SortLeastCost() eOrderedSpls := &SortedRoutes{ SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { RouteID: "supplier3", SortingData: map[string]interface{}{ utils.Cost: 0.05, @@ -64,7 +64,7 @@ func TestLibSuppliersSortCost(t *testing.T) { }, RouteParameters: "param3", }, - &SortedRoute{ + { RouteID: "supplier2", SortingData: map[string]interface{}{ utils.Cost: 0.1, @@ -72,7 +72,7 @@ func TestLibSuppliersSortCost(t *testing.T) { }, RouteParameters: "param2", }, - &SortedRoute{ + { RouteID: "supplier1", SortingData: map[string]interface{}{ utils.Cost: 0.1, @@ -91,21 +91,21 @@ func TestLibSuppliersSortCost(t *testing.T) { func TestLibRoutesSortWeight(t *testing.T) { sSpls := &SortedRoutes{ SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { RouteID: "supplier1", SortingData: map[string]interface{}{ utils.Weight: 10.0, }, RouteParameters: "param1", }, - &SortedRoute{ + { RouteID: "supplier2", SortingData: map[string]interface{}{ utils.Weight: 20.0, }, RouteParameters: "param2", }, - &SortedRoute{ + { RouteID: "supplier3", SortingData: map[string]interface{}{ utils.Weight: 10.5, @@ -117,21 +117,21 @@ func TestLibRoutesSortWeight(t *testing.T) { sSpls.SortWeight() eOrderedSpls := &SortedRoutes{ SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { RouteID: "supplier2", SortingData: map[string]interface{}{ utils.Weight: 20.0, }, RouteParameters: "param2", }, - &SortedRoute{ + { RouteID: "supplier3", SortingData: map[string]interface{}{ utils.Weight: 10.5, }, RouteParameters: "param3", }, - &SortedRoute{ + { RouteID: "supplier1", SortingData: map[string]interface{}{ utils.Weight: 10.0, @@ -151,14 +151,14 @@ func TestSortedRoutesDigest(t *testing.T) { ProfileID: "SPL_WEIGHT_1", Sorting: utils.MetaWeight, SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { RouteID: "supplier2", SortingData: map[string]interface{}{ "Weight": 20.0, }, RouteParameters: "param2", }, - &SortedRoute{ + { RouteID: "supplier1", SortingData: map[string]interface{}{ "Weight": 10.0, @@ -179,14 +179,14 @@ func TestSortedRoutesDigest2(t *testing.T) { ProfileID: "SPL_WEIGHT_1", Sorting: utils.MetaWeight, SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { RouteID: "supplier1", SortingData: map[string]interface{}{ "Weight": 30.0, }, RouteParameters: "param1", }, - &SortedRoute{ + { RouteID: "supplier2", SortingData: map[string]interface{}{ "Weight": 20.0, @@ -218,7 +218,7 @@ func TestSortedRoutesDigest3(t *testing.T) { func TestLibRoutesSortHighestCost(t *testing.T) { sSpls := &SortedRoutes{ SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { RouteID: "supplier1", SortingData: map[string]interface{}{ utils.Cost: 0.1, @@ -226,7 +226,7 @@ func TestLibRoutesSortHighestCost(t *testing.T) { }, RouteParameters: "param1", }, - &SortedRoute{ + { RouteID: "supplier2", SortingData: map[string]interface{}{ utils.Cost: 0.2, @@ -234,7 +234,7 @@ func TestLibRoutesSortHighestCost(t *testing.T) { }, RouteParameters: "param2", }, - &SortedRoute{ + { RouteID: "supplier3", SortingData: map[string]interface{}{ utils.Cost: 0.05, @@ -247,7 +247,7 @@ func TestLibRoutesSortHighestCost(t *testing.T) { sSpls.SortHighestCost() eOrderedSpls := &SortedRoutes{ SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { RouteID: "supplier2", SortingData: map[string]interface{}{ utils.Cost: 0.2, @@ -255,7 +255,7 @@ func TestLibRoutesSortHighestCost(t *testing.T) { }, RouteParameters: "param2", }, - &SortedRoute{ + { RouteID: "supplier1", SortingData: map[string]interface{}{ utils.Cost: 0.1, @@ -263,7 +263,7 @@ func TestLibRoutesSortHighestCost(t *testing.T) { }, RouteParameters: "param1", }, - &SortedRoute{ + { RouteID: "supplier3", SortingData: map[string]interface{}{ utils.Cost: 0.05, @@ -283,7 +283,7 @@ func TestLibRoutesSortHighestCost(t *testing.T) { func TestLibRoutesSortQOS(t *testing.T) { sSpls := &SortedRoutes{ SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { //the average value for supplier1 for *acd is 0.5 , *tcd 1.1 RouteID: "supplier1", SortingData: map[string]interface{}{ @@ -293,7 +293,7 @@ func TestLibRoutesSortQOS(t *testing.T) { utils.MetaTCD: 1.1, }, }, - &SortedRoute{ + { //the average value for supplier2 for *acd is 0.5 , *tcd 4.1 RouteID: "supplier2", SortingData: map[string]interface{}{ @@ -303,7 +303,7 @@ func TestLibRoutesSortQOS(t *testing.T) { utils.MetaTCD: 4.1, }, }, - &SortedRoute{ + { //the average value for supplier3 for *acd is 0.4 , *tcd 5.1 RouteID: "supplier3", SortingData: map[string]interface{}{ @@ -334,7 +334,7 @@ func TestLibRoutesSortQOS(t *testing.T) { func TestLibRoutesSortQOS2(t *testing.T) { sSpls := &SortedRoutes{ SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { //the average value for supplier1 for *acd is 0.5 , *tcd 1.1 RouteID: "supplier1", SortingData: map[string]interface{}{ @@ -343,7 +343,7 @@ func TestLibRoutesSortQOS2(t *testing.T) { utils.MetaTCD: 1.1, }, }, - &SortedRoute{ + { //the worst value for supplier1 for *acd is 0.5 , *tcd 1.1 //supplier1 and supplier2 have the same value for *acd and *tcd //will be sorted based on weight @@ -354,7 +354,7 @@ func TestLibRoutesSortQOS2(t *testing.T) { utils.MetaTCD: 1.1, }, }, - &SortedRoute{ + { RouteID: "supplier3", SortingData: map[string]interface{}{ @@ -383,7 +383,7 @@ func TestLibRoutesSortQOS2(t *testing.T) { func TestLibRoutesSortQOS3(t *testing.T) { sSpls := &SortedRoutes{ SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { //the worst value for supplier1 for *pdd is 0.7 , *tcd 1.1 //supplier1 and supplier3 have the same value for *pdd //will be sorted based on weight @@ -394,7 +394,7 @@ func TestLibRoutesSortQOS3(t *testing.T) { utils.MetaTCD: 1.1, }, }, - &SortedRoute{ + { //the worst value for supplier2 for *pdd is 1.2, *tcd 1.1 RouteID: "supplier2", SortingData: map[string]interface{}{ @@ -403,7 +403,7 @@ func TestLibRoutesSortQOS3(t *testing.T) { utils.MetaTCD: 1.1, }, }, - &SortedRoute{ + { //the worst value for supplier3 for *pdd is 0.7, *tcd 10.1 RouteID: "supplier3", SortingData: map[string]interface{}{ @@ -430,7 +430,7 @@ func TestLibRoutesSortQOS3(t *testing.T) { func TestLibRoutesSortQOS4(t *testing.T) { sSpls := &SortedRoutes{ SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { RouteID: "supplier1", SortingData: map[string]interface{}{ utils.MetaACD: 0.2, @@ -438,7 +438,7 @@ func TestLibRoutesSortQOS4(t *testing.T) { utils.MetaASR: 1.2, }, }, - &SortedRoute{ + { RouteID: "supplier2", SortingData: map[string]interface{}{ utils.MetaACD: 0.2, @@ -446,7 +446,7 @@ func TestLibRoutesSortQOS4(t *testing.T) { utils.MetaASR: -1.0, }, }, - &SortedRoute{ + { RouteID: "supplier3", SortingData: map[string]interface{}{ utils.MetaACD: 0.1, @@ -472,7 +472,7 @@ func TestLibRoutesSortQOS4(t *testing.T) { func TestLibRoutesSortQOS5(t *testing.T) { sSpls := &SortedRoutes{ SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { RouteID: "supplier1", SortingData: map[string]interface{}{ utils.MetaACD: 0.2, @@ -481,7 +481,7 @@ func TestLibRoutesSortQOS5(t *testing.T) { utils.MetaTCC: 10.1, }, }, - &SortedRoute{ + { RouteID: "supplier2", SortingData: map[string]interface{}{ utils.MetaACD: 0.2, @@ -490,7 +490,7 @@ func TestLibRoutesSortQOS5(t *testing.T) { utils.MetaTCC: 10.1, }, }, - &SortedRoute{ + { RouteID: "supplier3", SortingData: map[string]interface{}{ utils.MetaACD: 0.1, @@ -517,21 +517,21 @@ func TestLibRoutesSortQOS5(t *testing.T) { func TestLibRoutesSortQOS6(t *testing.T) { sSpls := &SortedRoutes{ SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { RouteID: "supplier1", SortingData: map[string]interface{}{ utils.Weight: 15.0, utils.MetaACD: 0.2, }, }, - &SortedRoute{ + { RouteID: "supplier2", SortingData: map[string]interface{}{ utils.Weight: 25.0, utils.MetaACD: 0.2, }, }, - &SortedRoute{ + { RouteID: "supplier3", SortingData: map[string]interface{}{ utils.Weight: 20.0, @@ -556,21 +556,21 @@ func TestLibRoutesSortQOS6(t *testing.T) { func TestLibRoutesSortQOS7(t *testing.T) { sSpls := &SortedRoutes{ SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { RouteID: "supplier1", SortingData: map[string]interface{}{ utils.Weight: 15.0, utils.MetaACD: -1.0, }, }, - &SortedRoute{ + { RouteID: "supplier2", SortingData: map[string]interface{}{ utils.Weight: 25.0, utils.MetaACD: -1.0, }, }, - &SortedRoute{ + { RouteID: "supplier3", SortingData: map[string]interface{}{ utils.Weight: 20.0, @@ -595,21 +595,21 @@ func TestLibRoutesSortQOS7(t *testing.T) { func TestLibRoutesSortQOS8(t *testing.T) { sSpls := &SortedRoutes{ SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { RouteID: "supplier1", SortingData: map[string]interface{}{ utils.Weight: 15.0, utils.MetaACD: -1.0, }, }, - &SortedRoute{ + { RouteID: "supplier2", SortingData: map[string]interface{}{ utils.Weight: 25.0, utils.MetaACD: -1.0, }, }, - &SortedRoute{ + { RouteID: "supplier3", SortingData: map[string]interface{}{ utils.Weight: 20.0, @@ -634,7 +634,7 @@ func TestLibRoutesSortQOS8(t *testing.T) { func TestLibRoutesSortLoadDistribution(t *testing.T) { sSpls := &SortedRoutes{ SortedRoutes: []*SortedRoute{ - &SortedRoute{ + { RouteID: "supplier1", SortingData: map[string]interface{}{ utils.Weight: 25.0, @@ -642,7 +642,7 @@ func TestLibRoutesSortLoadDistribution(t *testing.T) { utils.Load: 3.0, }, }, - &SortedRoute{ + { RouteID: "supplier2", SortingData: map[string]interface{}{ utils.Weight: 15.0, @@ -650,7 +650,7 @@ func TestLibRoutesSortLoadDistribution(t *testing.T) { utils.Load: 5.0, }, }, - &SortedRoute{ + { RouteID: "supplier3", SortingData: map[string]interface{}{ utils.Weight: 25.0, diff --git a/engine/libstats_test.go b/engine/libstats_test.go index 8c8ec9432..d92c8752b 100644 --- a/engine/libstats_test.go +++ b/engine/libstats_test.go @@ -53,8 +53,8 @@ func TestStatRemEventWithID(t *testing.T) { Answered: 1, Count: 2, Events: map[string]*StatWithCompress{ - "cgrates.org:TestRemEventWithID_1": &StatWithCompress{Stat: 1, CompressFactor: 1}, - "cgrates.org:TestRemEventWithID_2": &StatWithCompress{Stat: 0, CompressFactor: 1}, + "cgrates.org:TestRemEventWithID_1": {Stat: 1, CompressFactor: 1}, + "cgrates.org:TestRemEventWithID_2": {Stat: 0, CompressFactor: 1}, }, }, }, @@ -96,8 +96,8 @@ func TestStatRemEventWithID2(t *testing.T) { Answered: 2, Count: 4, Events: map[string]*StatWithCompress{ - "cgrates.org:TestRemEventWithID_1": &StatWithCompress{Stat: 1, CompressFactor: 2}, - "cgrates.org:TestRemEventWithID_2": &StatWithCompress{Stat: 0, CompressFactor: 2}, + "cgrates.org:TestRemEventWithID_1": {Stat: 1, CompressFactor: 2}, + "cgrates.org:TestRemEventWithID_2": {Stat: 0, CompressFactor: 2}, }, }, }, @@ -141,16 +141,16 @@ func TestStatRemExpired(t *testing.T) { Answered: 2, Count: 3, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_1": &StatWithCompress{Stat: 1, CompressFactor: 1}, - "cgrates.org:TestStatRemExpired_2": &StatWithCompress{Stat: 0, CompressFactor: 1}, - "cgrates.org:TestStatRemExpired_3": &StatWithCompress{Stat: 1, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_1": {Stat: 1, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_2": {Stat: 0, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_3": {Stat: 1, CompressFactor: 1}, }, }, }, SQItems: []SQItem{ - SQItem{"cgrates.org:TestStatRemExpired_1", utils.TimePointer(time.Now())}, - SQItem{"cgrates.org:TestStatRemExpired_2", utils.TimePointer(time.Now())}, - SQItem{"cgrates.org:TestStatRemExpired_3", utils.TimePointer(time.Now().Add(time.Duration(time.Minute)))}, + {"cgrates.org:TestStatRemExpired_1", utils.TimePointer(time.Now())}, + {"cgrates.org:TestStatRemExpired_2", utils.TimePointer(time.Now())}, + {"cgrates.org:TestStatRemExpired_3", utils.TimePointer(time.Now().Add(time.Duration(time.Minute)))}, }, } asrMetric := sq.SQMetrics[utils.MetaASR].(*StatASR) @@ -210,7 +210,7 @@ func TestStatAddStatEvent(t *testing.T) { Answered: 1, Count: 1, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_1": &StatWithCompress{Stat: 1, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_1": {Stat: 1, CompressFactor: 1}, }, }, }, @@ -250,13 +250,13 @@ func TestStatRemOnQueueLength2(t *testing.T) { utils.MetaTCD: &StatTCD{ FilterIDs: []string{"*string:~*req.Account:1002"}, Events: map[string]*DurationWithCompress{ - "cgrates.org:TestStatRemExpired_2": &DurationWithCompress{Duration: 1 * time.Minute, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_2": {Duration: 1 * time.Minute, CompressFactor: 1}, }, }, utils.MetaASR: &StatASR{ FilterIDs: []string{"*string:~*req.Account:1001"}, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_1": &StatWithCompress{Stat: 1, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_1": {Stat: 1, CompressFactor: 1}, }, }, }, @@ -272,17 +272,17 @@ func TestStatCompress(t *testing.T) { Answered: 2, Count: 4, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_1": &StatWithCompress{Stat: 1, CompressFactor: 1}, - "cgrates.org:TestStatRemExpired_2": &StatWithCompress{Stat: 0, CompressFactor: 1}, - "cgrates.org:TestStatRemExpired_3": &StatWithCompress{Stat: 1, CompressFactor: 1}, - "cgrates.org:TestStatRemExpired_4": &StatWithCompress{Stat: 0, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_1": {Stat: 1, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_2": {Stat: 0, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_3": {Stat: 1, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_4": {Stat: 0, CompressFactor: 1}, }, } expectedASR := &StatASR{ Answered: 2, Count: 4, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_4": &StatWithCompress{Stat: 0.5, CompressFactor: 4}, + "cgrates.org:TestStatRemExpired_4": {Stat: 0.5, CompressFactor: 4}, }, } sqItems := []SQItem{ @@ -319,32 +319,32 @@ func TestStatCompress2(t *testing.T) { Answered: 2, Count: 4, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_1": &StatWithCompress{Stat: 1, CompressFactor: 1}, - "cgrates.org:TestStatRemExpired_2": &StatWithCompress{Stat: 0, CompressFactor: 1}, - "cgrates.org:TestStatRemExpired_3": &StatWithCompress{Stat: 1, CompressFactor: 1}, - "cgrates.org:TestStatRemExpired_4": &StatWithCompress{Stat: 0, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_1": {Stat: 1, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_2": {Stat: 0, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_3": {Stat: 1, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_4": {Stat: 0, CompressFactor: 1}, }, } expectedASR := &StatASR{ Answered: 2, Count: 4, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_4": &StatWithCompress{Stat: 0.5, CompressFactor: 4}, + "cgrates.org:TestStatRemExpired_4": {Stat: 0.5, CompressFactor: 4}, }, } tcd := &StatTCD{ Sum: 3 * time.Minute, Count: 2, Events: map[string]*DurationWithCompress{ - "cgrates.org:TestStatRemExpired_2": &DurationWithCompress{Duration: 1 * time.Minute, CompressFactor: 1}, - "cgrates.org:TestStatRemExpired_3": &DurationWithCompress{Duration: 2 * time.Minute, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_2": {Duration: 1 * time.Minute, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_3": {Duration: 2 * time.Minute, CompressFactor: 1}, }, } expectedTCD := &StatTCD{ Sum: 3 * time.Minute, Count: 2, Events: map[string]*DurationWithCompress{ - "cgrates.org:TestStatRemExpired_4": &DurationWithCompress{Duration: 1*time.Minute + 30*time.Second, CompressFactor: 2}, + "cgrates.org:TestStatRemExpired_4": {Duration: 1*time.Minute + 30*time.Second, CompressFactor: 2}, }, } sqItems := []SQItem{ @@ -387,33 +387,33 @@ func TestStatCompress3(t *testing.T) { Answered: 2, Count: 4, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_1": &StatWithCompress{Stat: 1, CompressFactor: 1}, - "cgrates.org:TestStatRemExpired_2": &StatWithCompress{Stat: 0, CompressFactor: 1}, - "cgrates.org:TestStatRemExpired_3": &StatWithCompress{Stat: 1, CompressFactor: 1}, - "cgrates.org:TestStatRemExpired_4": &StatWithCompress{Stat: 0, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_1": {Stat: 1, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_2": {Stat: 0, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_3": {Stat: 1, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_4": {Stat: 0, CompressFactor: 1}, }, } expectedASR := &StatASR{ Answered: 2, Count: 4, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_4": &StatWithCompress{Stat: 0.5, CompressFactor: 4}, + "cgrates.org:TestStatRemExpired_4": {Stat: 0.5, CompressFactor: 4}, }, } tcd := &StatTCD{ Sum: 3 * time.Minute, Count: 2, Events: map[string]*DurationWithCompress{ - "cgrates.org:TestStatRemExpired_2": &DurationWithCompress{Duration: 1 * time.Minute, CompressFactor: 1}, - "cgrates.org:TestStatRemExpired_3": &DurationWithCompress{Duration: 2 * time.Minute, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_2": {Duration: 1 * time.Minute, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_3": {Duration: 2 * time.Minute, CompressFactor: 1}, }, } expectedTCD := &StatTCD{ Sum: 3 * time.Minute, Count: 2, Events: map[string]*DurationWithCompress{ - "cgrates.org:TestStatRemExpired_2": &DurationWithCompress{Duration: 1 * time.Minute, CompressFactor: 1}, - "cgrates.org:TestStatRemExpired_3": &DurationWithCompress{Duration: 2 * time.Minute, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_2": {Duration: 1 * time.Minute, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_3": {Duration: 2 * time.Minute, CompressFactor: 1}, }, } sqItems := []SQItem{ @@ -457,14 +457,14 @@ func TestStatExpand(t *testing.T) { Answered: 2, Count: 4, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_4": &StatWithCompress{Stat: 0.5, CompressFactor: 4}, + "cgrates.org:TestStatRemExpired_4": {Stat: 0.5, CompressFactor: 4}, }, } asr := &StatASR{ Answered: 2, Count: 4, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_4": &StatWithCompress{Stat: 0.5, CompressFactor: 4}, + "cgrates.org:TestStatRemExpired_4": {Stat: 0.5, CompressFactor: 4}, }, } expectedSqItems := []SQItem{ @@ -497,28 +497,28 @@ func TestStatExpand2(t *testing.T) { Answered: 2, Count: 4, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_4": &StatWithCompress{Stat: 0.5, CompressFactor: 4}, + "cgrates.org:TestStatRemExpired_4": {Stat: 0.5, CompressFactor: 4}, }, } asr := &StatASR{ Answered: 2, Count: 4, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_4": &StatWithCompress{Stat: 0.5, CompressFactor: 4}, + "cgrates.org:TestStatRemExpired_4": {Stat: 0.5, CompressFactor: 4}, }, } expectedTCD := &StatTCD{ Sum: 3 * time.Minute, Count: 2, Events: map[string]*DurationWithCompress{ - "cgrates.org:TestStatRemExpired_4": &DurationWithCompress{Duration: 1*time.Minute + 30*time.Second, CompressFactor: 2}, + "cgrates.org:TestStatRemExpired_4": {Duration: 1*time.Minute + 30*time.Second, CompressFactor: 2}, }, } tcd := &StatTCD{ Sum: 3 * time.Minute, Count: 2, Events: map[string]*DurationWithCompress{ - "cgrates.org:TestStatRemExpired_4": &DurationWithCompress{Duration: 1*time.Minute + 30*time.Second, CompressFactor: 2}, + "cgrates.org:TestStatRemExpired_4": {Duration: 1*time.Minute + 30*time.Second, CompressFactor: 2}, }, } expectedSqItems := []SQItem{ @@ -556,30 +556,30 @@ func TestStatExpand3(t *testing.T) { Answered: 2, Count: 4, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_3": &StatWithCompress{Stat: 0.5, CompressFactor: 4}, + "cgrates.org:TestStatRemExpired_3": {Stat: 0.5, CompressFactor: 4}, }, } asr := &StatASR{ Answered: 2, Count: 4, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_3": &StatWithCompress{Stat: 0.5, CompressFactor: 4}, + "cgrates.org:TestStatRemExpired_3": {Stat: 0.5, CompressFactor: 4}, }, } expectedTCD := &StatTCD{ Sum: 3 * time.Minute, Count: 2, Events: map[string]*DurationWithCompress{ - "cgrates.org:TestStatRemExpired_2": &DurationWithCompress{Duration: 1 * time.Minute, CompressFactor: 1}, - "cgrates.org:TestStatRemExpired_4": &DurationWithCompress{Duration: 2 * time.Minute, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_2": {Duration: 1 * time.Minute, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_4": {Duration: 2 * time.Minute, CompressFactor: 1}, }, } tcd := &StatTCD{ Sum: 3 * time.Minute, Count: 2, Events: map[string]*DurationWithCompress{ - "cgrates.org:TestStatRemExpired_2": &DurationWithCompress{Duration: 1 * time.Minute, CompressFactor: 1}, - "cgrates.org:TestStatRemExpired_4": &DurationWithCompress{Duration: 2 * time.Minute, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_2": {Duration: 1 * time.Minute, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_4": {Duration: 2 * time.Minute, CompressFactor: 1}, }, } expectedSqItems := []SQItem{ @@ -623,7 +623,7 @@ func TestStatRemoveExpiredTTL(t *testing.T) { Answered: 1, Count: 1, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_1": &StatWithCompress{Stat: 1, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_1": {Stat: 1, CompressFactor: 1}, }, }, }, @@ -657,7 +657,7 @@ func TestStatRemoveExpiredQueue(t *testing.T) { Answered: 1, Count: 1, Events: map[string]*StatWithCompress{ - "cgrates.org:TestStatRemExpired_1": &StatWithCompress{Stat: 1, CompressFactor: 1}, + "cgrates.org:TestStatRemExpired_1": {Stat: 1, CompressFactor: 1}, }, }, }, diff --git a/engine/loader_csv_test.go b/engine/loader_csv_test.go index a09fe4d61..f9bb7a99a 100644 --- a/engine/loader_csv_test.go +++ b/engine/loader_csv_test.go @@ -1434,18 +1434,18 @@ func TestLoadRateProfiles(t *testing.T) { MaxCost: 0.6, MaxCostStrategy: "*free", Rates: map[string]*utils.TPRate{ - "RT_WEEK": &utils.TPRate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*utils.TPIntervalRate{ - &utils.TPIntervalRate{ + { IntervalStart: "0s", Value: 0.12, Unit: "1m", Increment: "1m", }, - &utils.TPIntervalRate{ + { IntervalStart: "1m", Value: 0.06, Unit: "1m", @@ -1453,12 +1453,12 @@ func TestLoadRateProfiles(t *testing.T) { }, }, }, - "RT_WEEKEND": &utils.TPRate{ + "RT_WEEKEND": { ID: "RT_WEEKEND", Weight: 10, ActivationTime: "* * * * 0,6", IntervalRates: []*utils.TPIntervalRate{ - &utils.TPIntervalRate{ + { IntervalStart: "0s", Value: 0.06, Unit: "1m", @@ -1466,12 +1466,12 @@ func TestLoadRateProfiles(t *testing.T) { }, }, }, - "RT_CHRISTMAS": &utils.TPRate{ + "RT_CHRISTMAS": { ID: "RT_CHRISTMAS", Weight: 30, ActivationTime: "* * 24 12 *", IntervalRates: []*utils.TPIntervalRate{ - &utils.TPIntervalRate{ + { IntervalStart: "0s", Value: 0.06, Unit: "1m", diff --git a/engine/mapevent_test.go b/engine/mapevent_test.go index c7f4a0a68..ac1aedde3 100644 --- a/engine/mapevent_test.go +++ b/engine/mapevent_test.go @@ -458,28 +458,28 @@ func TestMapEventAsCDR(t *testing.T) { RunID: utils.MetaDefault, StartTime: time.Date(2017, 1, 9, 16, 18, 21, 0, time.UTC), Charges: []*ChargingInterval{ - &ChargingInterval{ + { RatingID: "c1a5ab9", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(0), Cost: 0.1, AccountingID: "9bdad10", CompressFactor: 1, }, - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0, AccountingID: "3455b83", CompressFactor: 10, }, - &ChargingIncrement{ + { Usage: time.Duration(10 * time.Second), Cost: 0.01, AccountingID: "a012888", CompressFactor: 2, }, - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.005, AccountingID: "44d6c02", @@ -488,10 +488,10 @@ func TestMapEventAsCDR(t *testing.T) { }, CompressFactor: 1, }, - &ChargingInterval{ + { RatingID: "c1a5ab9", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.01, AccountingID: "a012888", @@ -500,22 +500,22 @@ func TestMapEventAsCDR(t *testing.T) { }, CompressFactor: 4, }, - &ChargingInterval{ + { RatingID: "c1a5ab9", Increments: []*ChargingIncrement{ - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0, AccountingID: "3455b83", CompressFactor: 10, }, - &ChargingIncrement{ + { Usage: time.Duration(10 * time.Second), Cost: 0.01, AccountingID: "a012888", CompressFactor: 2, }, - &ChargingIncrement{ + { Usage: time.Duration(1 * time.Second), Cost: 0.005, AccountingID: "44d6c02", @@ -529,16 +529,16 @@ func TestMapEventAsCDR(t *testing.T) { Tenant: "cgrates.org", ID: "dan", BalanceSummaries: []*BalanceSummary{ - &BalanceSummary{ + { Type: "*monetary", Value: 50, Disabled: false}, - &BalanceSummary{ + { ID: "4b8b53d7-c1a1-4159-b845-4623a00a0165", Type: "*monetary", Value: 25, Disabled: false}, - &BalanceSummary{ + { Type: "*voice", Value: 200, Disabled: false, diff --git a/engine/model_helpers_test.go b/engine/model_helpers_test.go index 374654f86..c8b9e926d 100644 --- a/engine/model_helpers_test.go +++ b/engine/model_helpers_test.go @@ -86,11 +86,11 @@ func TestTpDestinationsAsMapDestinations(t *testing.T) { TpDestination{Tpid: "TEST_TPID", Tag: "TEST_DEST2", Prefix: "+492"}, } eOut = map[string]*Destination{ - "TEST_DEST1": &Destination{ + "TEST_DEST1": { Id: "TEST_DEST1", Prefixes: []string{"+491"}, }, - "TEST_DEST2": &Destination{ + "TEST_DEST2": { Id: "TEST_DEST2", Prefixes: []string{"+492"}, }, @@ -110,15 +110,15 @@ func TestTpDestinationsAsMapDestinations(t *testing.T) { TpDestination{Tpid: "TEST_ID", Tag: "", Prefix: ""}, } eOut = map[string]*Destination{ - "TEST_DEST1": &Destination{ + "TEST_DEST1": { Id: "TEST_DEST1", Prefixes: []string{"+491"}, }, - "TEST_DEST2": &Destination{ + "TEST_DEST2": { Id: "TEST_DEST2", Prefixes: []string{"+492"}, }, - "": &Destination{ + "": { Id: "", Prefixes: []string{""}, }, @@ -126,7 +126,7 @@ func TestTpDestinationsAsMapDestinations(t *testing.T) { if rcv, err = in.AsMapDestinations(); err != nil { t.Error(err) } - for key, _ := range rcv { + for key := range rcv { if !reflect.DeepEqual(rcv[key], eOut[key]) { t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eOut[key]), utils.ToJSON(rcv[key])) } @@ -185,13 +185,13 @@ func TestMapTPTimings(t *testing.T) { } tps = []*utils.ApierTPTiming{ - &utils.ApierTPTiming{ + { TPid: "TPid1", ID: "ID1", }, } eOut = map[string]*utils.TPTiming{ - "ID1": &utils.TPTiming{ + "ID1": { ID: "ID1", Years: utils.Years{}, Months: utils.Months{}, @@ -205,14 +205,14 @@ func TestMapTPTimings(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eOut), utils.ToJSON(rcv)) } tps = []*utils.ApierTPTiming{ - &utils.ApierTPTiming{ + { TPid: "TPid1", ID: "ID1", Months: "1;2;3;4", }, } eOut = map[string]*utils.TPTiming{ - "ID1": &utils.TPTiming{ + "ID1": { ID: "ID1", Years: utils.Years{}, Months: utils.Months{1, 2, 3, 4}, @@ -227,19 +227,19 @@ func TestMapTPTimings(t *testing.T) { } //same id error tps = []*utils.ApierTPTiming{ - &utils.ApierTPTiming{ + { TPid: "TPid1", ID: "ID1", Months: "1;2;3;4", }, - &utils.ApierTPTiming{ + { TPid: "TPid1", ID: "ID1", Months: "1;2;3;4", }, } eOut = map[string]*utils.TPTiming{ - "ID1": &utils.TPTiming{ + "ID1": { ID: "ID1", Years: utils.Years{}, Months: utils.Months{1, 2, 3, 4}, @@ -262,7 +262,7 @@ func TestMapTPRates(t *testing.T) { } s = []*utils.TPRateRALs{ - &utils.TPRateRALs{ + { ID: "ID", TPid: "TPid", RateSlots: []*utils.RateSlot{ @@ -309,7 +309,7 @@ func TestMapTPRates(t *testing.T) { } s = []*utils.TPRateRALs{ - &utils.TPRateRALs{ + { ID: "", TPid: "", RateSlots: []*utils.RateSlot{ @@ -334,7 +334,7 @@ func TestMapTPRates(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eOut), utils.ToJSON(rcv)) } s = []*utils.TPRateRALs{ - &utils.TPRateRALs{ + { ID: "SameID", TPid: "", RateSlots: []*utils.RateSlot{ @@ -342,7 +342,7 @@ func TestMapTPRates(t *testing.T) { {ConnectFee: 0.7}, }, }, - &utils.TPRateRALs{ + { ID: "SameID", TPid: "", RateSlots: []*utils.RateSlot{ @@ -364,7 +364,7 @@ func TestAPItoModelTimings(t *testing.T) { } ts = []*utils.ApierTPTiming{ - &utils.ApierTPTiming{ + { TPid: "TPid1", ID: "ID1", Months: "1;2;3;4", @@ -381,12 +381,12 @@ func TestAPItoModelTimings(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eOut), utils.ToJSON(rcv)) } ts = []*utils.ApierTPTiming{ - &utils.ApierTPTiming{ + { TPid: "TPid1", ID: "ID1", Months: "1;2;3;4", }, - &utils.ApierTPTiming{ + { TPid: "TPid2", ID: "ID2", Months: "1;2;3;4", @@ -461,15 +461,15 @@ func TestAPItoModelRates(t *testing.T) { } rs = []*utils.TPRateRALs{ - &utils.TPRateRALs{ + { ID: "SomeID", TPid: "TPid", RateSlots: []*utils.RateSlot{ - &utils.RateSlot{ + { ConnectFee: 0.7, Rate: 0.8, }, - &utils.RateSlot{ + { ConnectFee: 0.77, Rate: 0.88, }, @@ -494,7 +494,7 @@ func TestAPItoModelRates(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eOut), utils.ToJSON(rcv)) } rs = []*utils.TPRateRALs{ - &utils.TPRateRALs{ + { ID: "SomeID", TPid: "TPid", RateSlots: []*utils.RateSlot{}, @@ -569,7 +569,7 @@ func TestAPItoModelDestinationRates(t *testing.T) { t.Errorf("Expecting: nil, received: %+v", rcv) } drs = []*utils.TPDestinationRate{ - &utils.TPDestinationRate{ + { TPid: "TEST_TPID", ID: "TEST_DSTRATE", DestinationRates: []*utils.DestinationRate{ @@ -632,11 +632,11 @@ func TestTpDestinationRatesAsTPDestinationRates(t *testing.T) { }, } eOut = []*utils.TPDestinationRate{ - &utils.TPDestinationRate{ + { TPid: "Tpid", ID: "Tag", DestinationRates: []*utils.DestinationRate{ - &utils.DestinationRate{ + { DestinationId: "DestinationsTag", RateId: "RatesTag", RoundingMethod: "*up", @@ -665,7 +665,7 @@ func TestMapTPDestinationRates(t *testing.T) { } s = []*utils.TPDestinationRate{ - &utils.TPDestinationRate{ + { TPid: "TEST_TPID", ID: "TEST_DSTRATE", DestinationRates: []*utils.DestinationRate{ @@ -683,17 +683,17 @@ func TestMapTPDestinationRates(t *testing.T) { }, } eOut = map[string]*utils.TPDestinationRate{ - "TEST_DSTRATE": &utils.TPDestinationRate{ + "TEST_DSTRATE": { TPid: "TEST_TPID", ID: "TEST_DSTRATE", DestinationRates: []*utils.DestinationRate{ - &utils.DestinationRate{ + { DestinationId: "TEST_DEST1", RateId: "TEST_RATE1", RoundingMethod: "*up", RoundingDecimals: 4, }, - &utils.DestinationRate{ + { DestinationId: "TEST_DEST2", RateId: "TEST_RATE2", RoundingMethod: "*up", @@ -708,12 +708,12 @@ func TestMapTPDestinationRates(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eOut), utils.ToJSON(rcv)) } s = []*utils.TPDestinationRate{ - &utils.TPDestinationRate{ + { TPid: "TEST_TPID", ID: "TEST_DSTRATE", DestinationRates: []*utils.DestinationRate{}, }, - &utils.TPDestinationRate{ + { TPid: "TEST_TPID", ID: "TEST_DSTRATE", DestinationRates: []*utils.DestinationRate{}, @@ -846,11 +846,11 @@ func TestAPItoModelRatingPlans(t *testing.T) { t.Errorf("Expecting: nil, received: %+v", utils.ToJSON(rcv)) } rps = []*utils.TPRatingPlan{ - &utils.TPRatingPlan{ + { ID: "ID", TPid: "TPid", RatingPlanBindings: []*utils.TPRatingPlanBinding{ - &utils.TPRatingPlanBinding{ + { DestinationRatesId: "DestinationRatesId", TimingId: "TimingId", Weight: 0.7, @@ -985,14 +985,14 @@ func TestAPItoModelRatingProfiles(t *testing.T) { t.Errorf("Expecting: nil, received: %+v", rcv) } rps = []*utils.TPRatingProfile{ - &utils.TPRatingProfile{ + { TPid: "TEST_TPID", LoadId: "TEST_LOADID", Tenant: "cgrates.org", Category: "call", Subject: "*any", }, - &utils.TPRatingProfile{ + { TPid: "TEST_TPID2", LoadId: "TEST_LOADID2", Tenant: "cgrates.org", @@ -1113,7 +1113,7 @@ func TestAPItoModelSharedGroups(t *testing.T) { t.Errorf("Expecting: nil, received: %+v", rcv) } sgs = []*utils.TPSharedGroups{ - &utils.TPSharedGroups{ + { TPid: "TEST_TPID", ID: "SHARED_GROUP_TEST", SharedGroups: []*utils.TPSharedGroup{ @@ -1148,7 +1148,7 @@ func TestAPItoModelSharedGroups(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eOut), utils.ToJSON(rcv)) } sgs = []*utils.TPSharedGroups{ - &utils.TPSharedGroups{ + { TPid: "TEST_TPID", ID: "SHARED_GROUP_TEST", }, @@ -1163,7 +1163,7 @@ func TestAPItoModelSharedGroups(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eOut), utils.ToJSON(rcv)) } sgs = []*utils.TPSharedGroups{ - &utils.TPSharedGroups{ + { TPid: "TEST_TPID", ID: "SHARED_GROUP_TEST", SharedGroups: []*utils.TPSharedGroup{ @@ -1177,7 +1177,7 @@ func TestAPItoModelSharedGroups(t *testing.T) { RatingSubject: "special2"}, }, }, - &utils.TPSharedGroups{ + { TPid: "TEST_TPID2", ID: "SHARED_GROUP_TEST2", SharedGroups: []*utils.TPSharedGroup{ @@ -1320,7 +1320,7 @@ func TestAPItoModelActionPlans(t *testing.T) { t.Errorf("Expecting: nil, received: %+v", rcv) } a = []*utils.TPActionPlan{ - &utils.TPActionPlan{ + { TPid: "TEST_TPID", ID: "PACKAGE_10", ActionPlan: []*utils.TPActionTiming{ @@ -1355,7 +1355,7 @@ func TestAPItoModelActionPlans(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eOut), utils.ToJSON(rcv)) } a = []*utils.TPActionPlan{ - &utils.TPActionPlan{ + { TPid: "TEST_TPID", ID: "PACKAGE_10", }, @@ -1578,7 +1578,7 @@ func TestAPItoModelActionTriggers(t *testing.T) { t.Errorf("Expecting: nil, received: %+v", rcv) } ts = []*utils.TPActionTriggers{ - &utils.TPActionTriggers{ + { TPid: "TEST_TPID", ID: "STANDARD_TRIGGERS", ActionTriggers: []*utils.TPActionTrigger{ @@ -1700,11 +1700,11 @@ func TestAPItoModelActions(t *testing.T) { t.Errorf("Expecting: nil, received: %+v", rcv) } as = []*utils.TPActions{ - &utils.TPActions{ + { TPid: "TEST_TPID", ID: "TEST_ACTIONS", }, - &utils.TPActions{ + { TPid: "TEST_TPID2", ID: "TEST_ACTIONS2", }, @@ -1723,7 +1723,7 @@ func TestAPItoModelActions(t *testing.T) { t.Errorf("Expecting: %+v,\nreceived: %+v", utils.ToJSON(eOut), utils.ToJSON(rcv)) } as = []*utils.TPActions{ - &utils.TPActions{ + { TPid: "TEST_TPID", ID: "TEST_ACTIONS", Actions: []*utils.TPAction{ @@ -2225,7 +2225,7 @@ func TestAPItoModelAccountActions(t *testing.T) { t.Errorf("Expecting: nil , Received: %+v", utils.ToIJSON(rcv)) } aas = []*utils.TPAccountActions{ - &utils.TPAccountActions{ + { TPid: "TEST_TPID", LoadId: "TEST_LOADID", Tenant: "cgrates.org", @@ -2233,7 +2233,7 @@ func TestAPItoModelAccountActions(t *testing.T) { ActionPlanId: "PACKAGE_10_SHARED_A_5", ActionTriggersId: "STANDARD_TRIGGERS", }, - &utils.TPAccountActions{ + { TPid: "TEST_TPID2", LoadId: "TEST_LOADID2", Tenant: "cgrates.org", @@ -2667,13 +2667,13 @@ func TestAPItoModelTPFilter(t *testing.T) { th = &utils.TPFilterProfile{ ID: "someID", Filters: []*utils.TPFilter{ - &utils.TPFilter{ + { Type: utils.MetaPrefix, Element: "Account", Values: []string{"1010"}, }, - &utils.TPFilter{ + { Type: utils.MetaPrefix, Element: "Account", Values: []string{"0708"}, @@ -4161,18 +4161,18 @@ func TestRateProfileToAPI(t *testing.T) { MaxCost: 0.6, MaxCostStrategy: "*free", Rates: map[string]*Rate{ - "RT_WEEK": &Rate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*IntervalRate{ - &IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.12, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Minute), }, - &IntervalRate{ + { IntervalStart: time.Duration(1 * time.Minute), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -4180,12 +4180,12 @@ func TestRateProfileToAPI(t *testing.T) { }, }, }, - "RT_WEEKEND": &Rate{ + "RT_WEEKEND": { ID: "RT_WEEKEND", Weight: 10, ActivationTime: "* * * * 0,6", IntervalRates: []*IntervalRate{ - &IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -4193,12 +4193,12 @@ func TestRateProfileToAPI(t *testing.T) { }, }, }, - "RT_CHRISTMAS": &Rate{ + "RT_CHRISTMAS": { ID: "RT_CHRISTMAS", Weight: 30, ActivationTime: "* * 24 12 *", IntervalRates: []*IntervalRate{ - &IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -4221,18 +4221,18 @@ func TestRateProfileToAPI(t *testing.T) { MaxCost: 0.6, MaxCostStrategy: "*free", Rates: map[string]*utils.TPRate{ - "RT_WEEK": &utils.TPRate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*utils.TPIntervalRate{ - &utils.TPIntervalRate{ + { IntervalStart: "0s", Value: 0.12, Unit: "1m0s", Increment: "1m0s", }, - &utils.TPIntervalRate{ + { IntervalStart: "1m0s", Value: 0.06, Unit: "1m0s", @@ -4240,12 +4240,12 @@ func TestRateProfileToAPI(t *testing.T) { }, }, }, - "RT_WEEKEND": &utils.TPRate{ + "RT_WEEKEND": { ID: "RT_WEEKEND", Weight: 10, ActivationTime: "* * * * 0,6", IntervalRates: []*utils.TPIntervalRate{ - &utils.TPIntervalRate{ + { IntervalStart: "0s", Value: 0.06, Unit: "1m0s", @@ -4253,12 +4253,12 @@ func TestRateProfileToAPI(t *testing.T) { }, }, }, - "RT_CHRISTMAS": &utils.TPRate{ + "RT_CHRISTMAS": { ID: "RT_CHRISTMAS", Weight: 30, ActivationTime: "* * 24 12 *", IntervalRates: []*utils.TPIntervalRate{ - &utils.TPIntervalRate{ + { IntervalStart: "0s", Value: 0.06, Unit: "1m0s", @@ -4286,18 +4286,18 @@ func TestAPIToRateProfile(t *testing.T) { MaxCost: 0.6, MaxCostStrategy: "*free", Rates: map[string]*Rate{ - "RT_WEEK": &Rate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*IntervalRate{ - &IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.12, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Minute), }, - &IntervalRate{ + { IntervalStart: time.Duration(1 * time.Minute), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -4305,12 +4305,12 @@ func TestAPIToRateProfile(t *testing.T) { }, }, }, - "RT_WEEKEND": &Rate{ + "RT_WEEKEND": { ID: "RT_WEEKEND", Weight: 10, ActivationTime: "* * * * 0,6", IntervalRates: []*IntervalRate{ - &IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -4318,12 +4318,12 @@ func TestAPIToRateProfile(t *testing.T) { }, }, }, - "RT_CHRISTMAS": &Rate{ + "RT_CHRISTMAS": { ID: "RT_CHRISTMAS", Weight: 30, ActivationTime: "* * 24 12 *", IntervalRates: []*IntervalRate{ - &IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -4346,18 +4346,18 @@ func TestAPIToRateProfile(t *testing.T) { MaxCost: 0.6, MaxCostStrategy: "*free", Rates: map[string]*utils.TPRate{ - "RT_WEEK": &utils.TPRate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*utils.TPIntervalRate{ - &utils.TPIntervalRate{ + { IntervalStart: "0s", Value: 0.12, Unit: "1m0s", Increment: "1m0s", }, - &utils.TPIntervalRate{ + { IntervalStart: "1m0s", Value: 0.06, Unit: "1m0s", @@ -4365,12 +4365,12 @@ func TestAPIToRateProfile(t *testing.T) { }, }, }, - "RT_WEEKEND": &utils.TPRate{ + "RT_WEEKEND": { ID: "RT_WEEKEND", Weight: 10, ActivationTime: "* * * * 0,6", IntervalRates: []*utils.TPIntervalRate{ - &utils.TPIntervalRate{ + { IntervalStart: "0s", Value: 0.06, Unit: "1m0s", @@ -4378,12 +4378,12 @@ func TestAPIToRateProfile(t *testing.T) { }, }, }, - "RT_CHRISTMAS": &utils.TPRate{ + "RT_CHRISTMAS": { ID: "RT_CHRISTMAS", Weight: 30, ActivationTime: "* * 24 12 *", IntervalRates: []*utils.TPIntervalRate{ - &utils.TPIntervalRate{ + { IntervalStart: "0s", Value: 0.06, Unit: "1m0s", @@ -4414,18 +4414,18 @@ func TestAPItoModelTPRateProfile(t *testing.T) { MaxCost: 0.6, MaxCostStrategy: "*free", Rates: map[string]*utils.TPRate{ - "RT_WEEK": &utils.TPRate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*utils.TPIntervalRate{ - &utils.TPIntervalRate{ + { IntervalStart: "0s", Value: 0.12, Unit: "1m0s", Increment: "1m0s", }, - &utils.TPIntervalRate{ + { IntervalStart: "1m", Value: 0.06, Unit: "1m0s", @@ -4613,18 +4613,18 @@ func TestAsTPRateProfile(t *testing.T) { MaxCost: 0.6, MaxCostStrategy: "*free", Rates: map[string]*utils.TPRate{ - "RT_WEEK": &utils.TPRate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*utils.TPIntervalRate{ - &utils.TPIntervalRate{ + { IntervalStart: "1m", Value: 0.06, Unit: "1m", Increment: "1s", }, - &utils.TPIntervalRate{ + { IntervalStart: "0s", Value: 0.12, Unit: "1m", diff --git a/engine/rateprofile_test.go b/engine/rateprofile_test.go index abde2f34c..831d181c2 100644 --- a/engine/rateprofile_test.go +++ b/engine/rateprofile_test.go @@ -31,18 +31,18 @@ func TestRateProfileSort(t *testing.T) { Tenant: "cgrates.org", ID: "RP1", Rates: map[string]*Rate{ - "RT_WEEK": &Rate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*IntervalRate{ - &IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.12, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Minute), }, - &IntervalRate{ + { IntervalStart: time.Duration(1 * time.Minute), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -50,30 +50,30 @@ func TestRateProfileSort(t *testing.T) { }, }, }, - "RT_Custom": &Rate{ + "RT_Custom": { ID: "RT_Custom", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*IntervalRate{ - &IntervalRate{ + { IntervalStart: time.Duration(1 * time.Second), Value: 0.12, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Minute), }, - &IntervalRate{ + { IntervalStart: time.Duration(1 * time.Second), Value: 0.19, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Second), }, - &IntervalRate{ + { IntervalStart: time.Duration(15 * time.Second), Value: 0.4, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Second), }, - &IntervalRate{ + { IntervalStart: time.Duration(10 * time.Second), Value: 0.27, Unit: time.Duration(1 * time.Minute), @@ -81,24 +81,24 @@ func TestRateProfileSort(t *testing.T) { }, }, }, - "RT_WEEKEND": &Rate{ + "RT_WEEKEND": { ID: "RT_WEEKEND", Weight: 10, ActivationTime: "* * * * 0,6", IntervalRates: []*IntervalRate{ - &IntervalRate{ + { IntervalStart: time.Duration(10 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Second), }, - &IntervalRate{ + { IntervalStart: time.Duration(1 * time.Minute), Value: 0.18, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Second), }, - &IntervalRate{ + { IntervalStart: time.Duration(18 * time.Second), Value: 0.12, Unit: time.Duration(1 * time.Minute), @@ -106,12 +106,12 @@ func TestRateProfileSort(t *testing.T) { }, }, }, - "RT_CHRISTMAS": &Rate{ + "RT_CHRISTMAS": { ID: "RT_CHRISTMAS", Weight: 30, ActivationTime: "* * 24 12 *", IntervalRates: []*IntervalRate{ - &IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -125,18 +125,18 @@ func TestRateProfileSort(t *testing.T) { Tenant: "cgrates.org", ID: "RP1", Rates: map[string]*Rate{ - "RT_WEEK": &Rate{ + "RT_WEEK": { ID: "RT_WEEK", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*IntervalRate{ - &IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.12, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Minute), }, - &IntervalRate{ + { IntervalStart: time.Duration(1 * time.Minute), Value: 0.06, Unit: time.Duration(1 * time.Minute), @@ -144,24 +144,24 @@ func TestRateProfileSort(t *testing.T) { }, }, }, - "RT_WEEKEND": &Rate{ + "RT_WEEKEND": { ID: "RT_WEEKEND", Weight: 10, ActivationTime: "* * * * 0,6", IntervalRates: []*IntervalRate{ - &IntervalRate{ + { IntervalStart: time.Duration(10 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Second), }, - &IntervalRate{ + { IntervalStart: time.Duration(18 * time.Second), Value: 0.12, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Second), }, - &IntervalRate{ + { IntervalStart: time.Duration(1 * time.Minute), Value: 0.18, Unit: time.Duration(1 * time.Minute), @@ -169,30 +169,30 @@ func TestRateProfileSort(t *testing.T) { }, }, }, - "RT_Custom": &Rate{ + "RT_Custom": { ID: "RT_Custom", Weight: 0, ActivationTime: "* * * * 1-5", IntervalRates: []*IntervalRate{ - &IntervalRate{ + { IntervalStart: time.Duration(1 * time.Second), Value: 0.12, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Minute), }, - &IntervalRate{ + { IntervalStart: time.Duration(1 * time.Second), Value: 0.19, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Second), }, - &IntervalRate{ + { IntervalStart: time.Duration(10 * time.Second), Value: 0.27, Unit: time.Duration(1 * time.Minute), Increment: time.Duration(1 * time.Second), }, - &IntervalRate{ + { IntervalStart: time.Duration(15 * time.Second), Value: 0.4, Unit: time.Duration(1 * time.Minute), @@ -200,12 +200,12 @@ func TestRateProfileSort(t *testing.T) { }, }, }, - "RT_CHRISTMAS": &Rate{ + "RT_CHRISTMAS": { ID: "RT_CHRISTMAS", Weight: 30, ActivationTime: "* * 24 12 *", IntervalRates: []*IntervalRate{ - &IntervalRate{ + { IntervalStart: time.Duration(0 * time.Second), Value: 0.06, Unit: time.Duration(1 * time.Minute), diff --git a/engine/ratingplan.go b/engine/ratingplan.go index 295f108c0..6ebacb8b3 100644 --- a/engine/ratingplan.go +++ b/engine/ratingplan.go @@ -20,8 +20,6 @@ package engine import ( "math" - - "github.com/cgrates/cgrates/utils" ) /* @@ -37,8 +35,8 @@ type RatingPlan struct { // RatingPlanWithOpts is used in replicatorV1 for dispatcher type RatingPlanWithOpts struct { *RatingPlan - utils.TenantArg - Opts map[string]interface{} + Tenant string + Opts map[string]interface{} } type RPRate struct { diff --git a/engine/ratingplan_test.go b/engine/ratingplan_test.go index 5b8a0e85a..e6fbd74dd 100644 --- a/engine/ratingplan_test.go +++ b/engine/ratingplan_test.go @@ -224,8 +224,8 @@ func TestRatingPlanIsContinousEmpty(t *testing.T) { func TestRatingPlanIsContinousBlank(t *testing.T) { rpl := &RatingPlan{ Timings: map[string]*RITiming{ - "blank": &RITiming{StartTime: "00:00:00"}, - "other": &RITiming{WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "00:00:00"}, + "blank": {StartTime: "00:00:00"}, + "other": {WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "00:00:00"}, }, } if !rpl.isContinous() { @@ -236,9 +236,9 @@ func TestRatingPlanIsContinousBlank(t *testing.T) { func TestRatingPlanIsContinousGood(t *testing.T) { rpl := &RatingPlan{ Timings: map[string]*RITiming{ - "first": &RITiming{WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "00:00:00"}, - "second": &RITiming{WeekDays: utils.WeekDays{4, 5, 6}, StartTime: "00:00:00"}, - "third": &RITiming{WeekDays: utils.WeekDays{0}, StartTime: "00:00:00"}, + "first": {WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "00:00:00"}, + "second": {WeekDays: utils.WeekDays{4, 5, 6}, StartTime: "00:00:00"}, + "third": {WeekDays: utils.WeekDays{0}, StartTime: "00:00:00"}, }, } if !rpl.isContinous() { @@ -249,8 +249,8 @@ func TestRatingPlanIsContinousGood(t *testing.T) { func TestRatingPlanisContinousBad(t *testing.T) { rpl := &RatingPlan{ Timings: map[string]*RITiming{ - "first": &RITiming{WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "00:00:00"}, - "second": &RITiming{WeekDays: utils.WeekDays{4, 5, 0}, StartTime: "00:00:00"}, + "first": {WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "00:00:00"}, + "second": {WeekDays: utils.WeekDays{4, 5, 0}, StartTime: "00:00:00"}, }, } if rpl.isContinous() { @@ -261,10 +261,10 @@ func TestRatingPlanisContinousBad(t *testing.T) { func TestRatingPlanIsContinousSpecial(t *testing.T) { rpl := &RatingPlan{ Timings: map[string]*RITiming{ - "special": &RITiming{Years: utils.Years{2015}, Months: utils.Months{5}, MonthDays: utils.MonthDays{1}, StartTime: "00:00:00"}, - "first": &RITiming{WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "00:00:00"}, - "second": &RITiming{WeekDays: utils.WeekDays{4, 5, 6}, StartTime: "00:00:00"}, - "third": &RITiming{WeekDays: utils.WeekDays{0}, StartTime: "00:00:00"}, + "special": {Years: utils.Years{2015}, Months: utils.Months{5}, MonthDays: utils.MonthDays{1}, StartTime: "00:00:00"}, + "first": {WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "00:00:00"}, + "second": {WeekDays: utils.WeekDays{4, 5, 6}, StartTime: "00:00:00"}, + "third": {WeekDays: utils.WeekDays{0}, StartTime: "00:00:00"}, }, } if !rpl.isContinous() { @@ -275,11 +275,11 @@ func TestRatingPlanIsContinousSpecial(t *testing.T) { func TestRatingPlanIsContinousMultiple(t *testing.T) { rpl := &RatingPlan{ Timings: map[string]*RITiming{ - "special": &RITiming{Years: utils.Years{2015}, Months: utils.Months{5}, MonthDays: utils.MonthDays{1}, StartTime: "00:00:00"}, - "first": &RITiming{WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "00:00:00"}, - "first_08": &RITiming{WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "08:00:00"}, - "second": &RITiming{WeekDays: utils.WeekDays{4, 5, 6}, StartTime: "00:00:00"}, - "third": &RITiming{WeekDays: utils.WeekDays{0}, StartTime: "00:00:00"}, + "special": {Years: utils.Years{2015}, Months: utils.Months{5}, MonthDays: utils.MonthDays{1}, StartTime: "00:00:00"}, + "first": {WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "00:00:00"}, + "first_08": {WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "08:00:00"}, + "second": {WeekDays: utils.WeekDays{4, 5, 6}, StartTime: "00:00:00"}, + "third": {WeekDays: utils.WeekDays{0}, StartTime: "00:00:00"}, }, } if !rpl.isContinous() { @@ -290,10 +290,10 @@ func TestRatingPlanIsContinousMultiple(t *testing.T) { func TestRatingPlanIsContinousMissing(t *testing.T) { rpl := &RatingPlan{ Timings: map[string]*RITiming{ - "special": &RITiming{Years: utils.Years{2015}, Months: utils.Months{5}, MonthDays: utils.MonthDays{1}, StartTime: "00:00:00"}, - "first_08": &RITiming{WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "08:00:00"}, - "second": &RITiming{WeekDays: utils.WeekDays{4, 5, 6}, StartTime: "00:00:00"}, - "third": &RITiming{WeekDays: utils.WeekDays{0}, StartTime: "00:00:00"}, + "special": {Years: utils.Years{2015}, Months: utils.Months{5}, MonthDays: utils.MonthDays{1}, StartTime: "00:00:00"}, + "first_08": {WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "08:00:00"}, + "second": {WeekDays: utils.WeekDays{4, 5, 6}, StartTime: "00:00:00"}, + "third": {WeekDays: utils.WeekDays{0}, StartTime: "00:00:00"}, }, } if rpl.isContinous() { @@ -304,7 +304,7 @@ func TestRatingPlanIsContinousMissing(t *testing.T) { func TestRatingPlanSaneTimingsBad(t *testing.T) { rpl := &RatingPlan{ Timings: map[string]*RITiming{ - "one": &RITiming{Years: utils.Years{2015}, WeekDays: utils.WeekDays{time.Monday}, tag: "first"}, + "one": {Years: utils.Years{2015}, WeekDays: utils.WeekDays{time.Monday}, tag: "first"}, }, } if crazyTiming := rpl.getFirstUnsaneTiming(); crazyTiming == "" { @@ -315,8 +315,8 @@ func TestRatingPlanSaneTimingsBad(t *testing.T) { func TestRatingPlanSaneTimingsGood(t *testing.T) { rpl := &RatingPlan{ Timings: map[string]*RITiming{ - "one": &RITiming{Years: utils.Years{2015}, tag: "first"}, - "two": &RITiming{WeekDays: utils.WeekDays{0, 1, 2, 3, 4}, StartTime: "00:00:00", tag: "second"}, + "one": {Years: utils.Years{2015}, tag: "first"}, + "two": {WeekDays: utils.WeekDays{0, 1, 2, 3, 4}, StartTime: "00:00:00", tag: "second"}, }, } if crazyTiming := rpl.getFirstUnsaneTiming(); crazyTiming != "" { @@ -327,7 +327,7 @@ func TestRatingPlanSaneTimingsGood(t *testing.T) { func TestRatingPlanSaneRatingsEqual(t *testing.T) { rpl := &RatingPlan{ Ratings: map[string]*RIRate{ - "one": &RIRate{ + "one": { tag: "first", Rates: RateGroups{ &RGRate{ @@ -350,7 +350,7 @@ func TestRatingPlanSaneRatingsEqual(t *testing.T) { func TestRatingPlanSaneRatingsNotMultiple(t *testing.T) { rpl := &RatingPlan{ Ratings: map[string]*RIRate{ - "one": &RIRate{ + "one": { tag: "first", Rates: RateGroups{ &RGRate{ @@ -373,7 +373,7 @@ func TestRatingPlanSaneRatingsNotMultiple(t *testing.T) { func TestRatingPlanSaneRatingsGoot(t *testing.T) { rpl := &RatingPlan{ Ratings: map[string]*RIRate{ - "one": &RIRate{ + "one": { tag: "first", Rates: RateGroups{ &RGRate{ diff --git a/engine/ratingprofile.go b/engine/ratingprofile.go index 756bf85fa..2dcfa40a4 100644 --- a/engine/ratingprofile.go +++ b/engine/ratingprofile.go @@ -36,8 +36,8 @@ type RatingProfile struct { // RatingProfileWithOpts is used in replicatorV1 for dispatcher type RatingProfileWithOpts struct { *RatingProfile - utils.TenantArg - Opts map[string]interface{} + Tenant string + Opts map[string]interface{} } type RatingPlanActivation struct { diff --git a/engine/route_load_distribution.go b/engine/route_load_distribution.go index b06443ff5..9ad377355 100644 --- a/engine/route_load_distribution.go +++ b/engine/route_load_distribution.go @@ -24,17 +24,19 @@ import ( "github.com/cgrates/cgrates/utils" ) +// NewLoadDistributionSorter . func NewLoadDistributionSorter(rS *RouteService) *LoadDistributionSorter { return &LoadDistributionSorter{rS: rS, sorting: utils.MetaLoad} } -// ResourceAscendentSorter orders suppliers based on their Resource Usage +// LoadDistributionSorter orders suppliers based on their Resource Usage type LoadDistributionSorter struct { sorting string rS *RouteService } +// SortRoutes . func (ws *LoadDistributionSorter) SortRoutes(prflID string, routes []*Route, suplEv *utils.CGREvent, extraOpts *optsGetRoutes) (sortedRoutes *SortedRoutes, err error) { sortedRoutes = &SortedRoutes{ProfileID: prflID, diff --git a/engine/sharedgroup.go b/engine/sharedgroup.go index 41d836898..8c1975c63 100644 --- a/engine/sharedgroup.go +++ b/engine/sharedgroup.go @@ -47,8 +47,8 @@ type SharedGroup struct { // SharedGroupWithOpts is used in replicatorV1 for dispatcher type SharedGroupWithOpts struct { *SharedGroup - utils.TenantArg - Opts map[string]interface{} + Tenant string + Opts map[string]interface{} } type SharingParameters struct { diff --git a/engine/sharedgroup_test.go b/engine/sharedgroup_test.go index 42447f512..d939c4184 100644 --- a/engine/sharedgroup_test.go +++ b/engine/sharedgroup_test.go @@ -40,11 +40,11 @@ func TestSharedGroupClone(t *testing.T) { sharedGroup = &SharedGroup{ Id: "testID", AccountParameters: map[string]*SharingParameters{ - "string1": &SharingParameters{ + "string1": { Strategy: "strategyTEST1", RatingSubject: "RatingSubjectTEST1", }, - "string2": &SharingParameters{ + "string2": { Strategy: "strategyTEST2", RatingSubject: "RatingSubjectTEST2", }, @@ -57,11 +57,11 @@ func TestSharedGroupClone(t *testing.T) { eOut = &SharedGroup{ Id: "testID", AccountParameters: map[string]*SharingParameters{ - "string1": &SharingParameters{ + "string1": { Strategy: "strategyTEST1", RatingSubject: "RatingSubjectTEST1", }, - "string2": &SharingParameters{ + "string2": { Strategy: "strategyTEST2", RatingSubject: "RatingSubjectTEST2", }, @@ -114,7 +114,7 @@ func TestSharedSetGet(t *testing.T) { sg := &SharedGroup{ Id: id, AccountParameters: map[string]*SharingParameters{ - "test": &SharingParameters{Strategy: STRATEGY_HIGHEST}, + "test": {Strategy: STRATEGY_HIGHEST}, }, MemberIds: utils.NewStringMap("1", "2", "3"), } @@ -140,7 +140,7 @@ func TestSharedPopBalanceByStrategyLow(t *testing.T) { &Balance{Value: 3.0}, } sg := &SharedGroup{AccountParameters: map[string]*SharingParameters{ - "test": &SharingParameters{Strategy: STRATEGY_LOWEST}}, + "test": {Strategy: STRATEGY_LOWEST}}, } sbc := sg.SortBalancesByStrategy(bc[1], bc) if len(sbc) != 3 || @@ -157,7 +157,7 @@ func TestSharedPopBalanceByStrategyHigh(t *testing.T) { &Balance{Value: 3.0}, } sg := &SharedGroup{AccountParameters: map[string]*SharingParameters{ - "test": &SharingParameters{Strategy: STRATEGY_HIGHEST}}, + "test": {Strategy: STRATEGY_HIGHEST}}, } sbc := sg.SortBalancesByStrategy(bc[0], bc) if len(sbc) != 3 || @@ -174,7 +174,7 @@ func TestSharedPopBalanceByStrategyMineHigh(t *testing.T) { &Balance{Value: 3.0}, } sg := &SharedGroup{AccountParameters: map[string]*SharingParameters{ - "test": &SharingParameters{Strategy: STRATEGY_MINE_HIGHEST}}, + "test": {Strategy: STRATEGY_MINE_HIGHEST}}, } sbc := sg.SortBalancesByStrategy(bc[0], bc) if len(sbc) != 3 || diff --git a/engine/statmetrics_test.go b/engine/statmetrics_test.go index 86b3f4e1a..0105bccdf 100644 --- a/engine/statmetrics_test.go +++ b/engine/statmetrics_test.go @@ -114,8 +114,8 @@ func TestASRGetStringValue3(t *testing.T) { MinItems: 2, FilterIDs: []string{}} expected := &StatASR{ Events: map[string]*StatWithCompress{ - "EVENT_1": &StatWithCompress{Stat: 1, CompressFactor: 1}, - "EVENT_2": &StatWithCompress{Stat: 0, CompressFactor: 1}, + "EVENT_1": {Stat: 1, CompressFactor: 1}, + "EVENT_2": {Stat: 0, CompressFactor: 1}, }, MinItems: 2, FilterIDs: []string{}, @@ -223,8 +223,8 @@ func TestASRCompress(t *testing.T) { MinItems: 2, FilterIDs: []string{}} expected := &StatASR{ Events: map[string]*StatWithCompress{ - "EVENT_1": &StatWithCompress{Stat: 1, CompressFactor: 1}, - "EVENT_2": &StatWithCompress{Stat: 0, CompressFactor: 1}, + "EVENT_1": {Stat: 1, CompressFactor: 1}, + "EVENT_2": {Stat: 0, CompressFactor: 1}, }, MinItems: 2, FilterIDs: []string{}, @@ -253,7 +253,7 @@ func TestASRCompress(t *testing.T) { } expected = &StatASR{ Events: map[string]*StatWithCompress{ - "EVENT_3": &StatWithCompress{Stat: 0.5, CompressFactor: 2}, + "EVENT_3": {Stat: 0.5, CompressFactor: 2}, }, MinItems: 2, FilterIDs: []string{}, @@ -415,8 +415,8 @@ func TestACDGetStringValue3(t *testing.T) { acd := &StatACD{Events: make(map[string]*DurationWithCompress), MinItems: 2, FilterIDs: []string{}} expected := &StatACD{ Events: map[string]*DurationWithCompress{ - "EVENT_1": &DurationWithCompress{Duration: 2*time.Minute + 30*time.Second, CompressFactor: 2}, - "EVENT_3": &DurationWithCompress{Duration: time.Minute, CompressFactor: 1}, + "EVENT_1": {Duration: 2*time.Minute + 30*time.Second, CompressFactor: 2}, + "EVENT_3": {Duration: time.Minute, CompressFactor: 1}, }, MinItems: 2, FilterIDs: []string{}, @@ -460,8 +460,8 @@ func TestACDCompress(t *testing.T) { acd := &StatACD{Events: make(map[string]*DurationWithCompress), MinItems: 2, FilterIDs: []string{}} expected := &StatACD{ Events: map[string]*DurationWithCompress{ - "EVENT_1": &DurationWithCompress{Duration: 2*time.Minute + 30*time.Second, CompressFactor: 2}, - "EVENT_3": &DurationWithCompress{Duration: time.Minute, CompressFactor: 1}, + "EVENT_1": {Duration: 2*time.Minute + 30*time.Second, CompressFactor: 2}, + "EVENT_3": {Duration: time.Minute, CompressFactor: 1}, }, MinItems: 2, FilterIDs: []string{}, @@ -490,7 +490,7 @@ func TestACDCompress(t *testing.T) { } expected = &StatACD{ Events: map[string]*DurationWithCompress{ - "EVENT_3": &DurationWithCompress{Duration: 2 * time.Minute, CompressFactor: 3}, + "EVENT_3": {Duration: 2 * time.Minute, CompressFactor: 3}, }, MinItems: 2, FilterIDs: []string{}, @@ -765,8 +765,8 @@ func TestTCDGetStringValue3(t *testing.T) { tcd := &StatTCD{Events: make(map[string]*DurationWithCompress), MinItems: 2, FilterIDs: []string{}} expected := &StatTCD{ Events: map[string]*DurationWithCompress{ - "EVENT_1": &DurationWithCompress{Duration: 2*time.Minute + 30*time.Second, CompressFactor: 2}, - "EVENT_3": &DurationWithCompress{Duration: time.Minute, CompressFactor: 1}, + "EVENT_1": {Duration: 2*time.Minute + 30*time.Second, CompressFactor: 2}, + "EVENT_3": {Duration: time.Minute, CompressFactor: 1}, }, MinItems: 2, FilterIDs: []string{}, @@ -919,8 +919,8 @@ func TestTCDCompress(t *testing.T) { tcd := &StatTCD{Events: make(map[string]*DurationWithCompress), MinItems: 2, FilterIDs: []string{}} expected := &StatTCD{ Events: map[string]*DurationWithCompress{ - "EVENT_1": &DurationWithCompress{Duration: 2*time.Minute + 30*time.Second, CompressFactor: 2}, - "EVENT_3": &DurationWithCompress{Duration: time.Minute, CompressFactor: 1}, + "EVENT_1": {Duration: 2*time.Minute + 30*time.Second, CompressFactor: 2}, + "EVENT_3": {Duration: time.Minute, CompressFactor: 1}, }, MinItems: 2, FilterIDs: []string{}, @@ -949,7 +949,7 @@ func TestTCDCompress(t *testing.T) { } expected = &StatTCD{ Events: map[string]*DurationWithCompress{ - "EVENT_3": &DurationWithCompress{Duration: 2 * time.Minute, CompressFactor: 3}, + "EVENT_3": {Duration: 2 * time.Minute, CompressFactor: 3}, }, MinItems: 2, FilterIDs: []string{}, @@ -1081,8 +1081,8 @@ func TestACCGetStringValue3(t *testing.T) { acc := &StatACC{Events: make(map[string]*StatWithCompress), MinItems: 2, FilterIDs: []string{}} expected := &StatACC{ Events: map[string]*StatWithCompress{ - "EVENT_1": &StatWithCompress{Stat: 12.2, CompressFactor: 2}, - "EVENT_3": &StatWithCompress{Stat: 18.3, CompressFactor: 1}, + "EVENT_1": {Stat: 12.2, CompressFactor: 2}, + "EVENT_3": {Stat: 18.3, CompressFactor: 1}, }, MinItems: 2, FilterIDs: []string{}, @@ -1176,8 +1176,8 @@ func TestACCCompress(t *testing.T) { MinItems: 2, FilterIDs: []string{}} expected := &StatACC{ Events: map[string]*StatWithCompress{ - "EVENT_1": &StatWithCompress{Stat: 18.2, CompressFactor: 1}, - "EVENT_2": &StatWithCompress{Stat: 6.2, CompressFactor: 1}, + "EVENT_1": {Stat: 18.2, CompressFactor: 1}, + "EVENT_2": {Stat: 6.2, CompressFactor: 1}, }, MinItems: 2, FilterIDs: []string{}, @@ -1205,7 +1205,7 @@ func TestACCCompress(t *testing.T) { } expected = &StatACC{ Events: map[string]*StatWithCompress{ - "EVENT_3": &StatWithCompress{Stat: 12.2, CompressFactor: 2}, + "EVENT_3": {Stat: 12.2, CompressFactor: 2}, }, MinItems: 2, FilterIDs: []string{}, @@ -1351,8 +1351,8 @@ func TestTCCGetStringValue3(t *testing.T) { tcc := &StatTCC{Events: make(map[string]*StatWithCompress), MinItems: 2, FilterIDs: []string{}} expected := &StatTCC{ Events: map[string]*StatWithCompress{ - "EVENT_1": &StatWithCompress{Stat: 12.2, CompressFactor: 2}, - "EVENT_3": &StatWithCompress{Stat: 18.3, CompressFactor: 1}, + "EVENT_1": {Stat: 12.2, CompressFactor: 2}, + "EVENT_3": {Stat: 18.3, CompressFactor: 1}, }, MinItems: 2, FilterIDs: []string{}, @@ -1449,8 +1449,8 @@ func TestTCCCompress(t *testing.T) { MinItems: 2, FilterIDs: []string{}} expected := &StatTCC{ Events: map[string]*StatWithCompress{ - "EVENT_1": &StatWithCompress{Stat: 18.2, CompressFactor: 1}, - "EVENT_2": &StatWithCompress{Stat: 6.2, CompressFactor: 1}, + "EVENT_1": {Stat: 18.2, CompressFactor: 1}, + "EVENT_2": {Stat: 6.2, CompressFactor: 1}, }, MinItems: 2, FilterIDs: []string{}, @@ -1478,7 +1478,7 @@ func TestTCCCompress(t *testing.T) { } expected = &StatTCC{ Events: map[string]*StatWithCompress{ - "EVENT_3": &StatWithCompress{Stat: 12.2, CompressFactor: 2}, + "EVENT_3": {Stat: 12.2, CompressFactor: 2}, }, MinItems: 2, FilterIDs: []string{}, @@ -1634,8 +1634,8 @@ func TestPDDGetStringValue3(t *testing.T) { pdd := &StatPDD{Events: make(map[string]*DurationWithCompress), MinItems: 2, FilterIDs: []string{}} expected := &StatPDD{ Events: map[string]*DurationWithCompress{ - "EVENT_1": &DurationWithCompress{Duration: 2*time.Minute + 30*time.Second, CompressFactor: 2}, - "EVENT_3": &DurationWithCompress{Duration: time.Minute, CompressFactor: 1}, + "EVENT_1": {Duration: 2*time.Minute + 30*time.Second, CompressFactor: 2}, + "EVENT_3": {Duration: time.Minute, CompressFactor: 1}, }, MinItems: 2, FilterIDs: []string{}, @@ -1805,8 +1805,8 @@ func TestPDDCompress(t *testing.T) { pdd := &StatPDD{Events: make(map[string]*DurationWithCompress), MinItems: 2, FilterIDs: []string{}} expected := &StatPDD{ Events: map[string]*DurationWithCompress{ - "EVENT_1": &DurationWithCompress{Duration: 2*time.Minute + 30*time.Second, CompressFactor: 2}, - "EVENT_3": &DurationWithCompress{Duration: time.Minute, CompressFactor: 1}, + "EVENT_1": {Duration: 2*time.Minute + 30*time.Second, CompressFactor: 2}, + "EVENT_3": {Duration: time.Minute, CompressFactor: 1}, }, MinItems: 2, FilterIDs: []string{}, @@ -1835,7 +1835,7 @@ func TestPDDCompress(t *testing.T) { } expected = &StatPDD{ Events: map[string]*DurationWithCompress{ - "EVENT_3": &DurationWithCompress{Duration: 2 * time.Minute, CompressFactor: 3}, + "EVENT_3": {Duration: 2 * time.Minute, CompressFactor: 3}, }, MinItems: 2, FilterIDs: []string{}, @@ -2020,19 +2020,19 @@ func TestDDCCompress(t *testing.T) { } expected := &StatDDC{ Events: map[string]map[string]int64{ - "EVENT_1": map[string]int64{ + "EVENT_1": { "1001": 2, }, - "EVENT_3": map[string]int64{ + "EVENT_3": { "1002": 1, }, }, FieldValues: map[string]map[string]struct{}{ - "1001": map[string]struct{}{ - "EVENT_1": struct{}{}, + "1001": { + "EVENT_1": {}, }, - "1002": map[string]struct{}{ - "EVENT_3": struct{}{}, + "1002": { + "EVENT_3": {}, }, }, MinItems: 2, @@ -2239,8 +2239,8 @@ func TestStatSumGetStringValue3(t *testing.T) { statSum := &StatSum{Events: make(map[string]*StatWithCompress), MinItems: 2, FilterIDs: []string{}, FieldName: "~*req.Cost"} expected := &StatSum{ Events: map[string]*StatWithCompress{ - "EVENT_1": &StatWithCompress{Stat: 12.2, CompressFactor: 2}, - "EVENT_3": &StatWithCompress{Stat: 18.3, CompressFactor: 1}, + "EVENT_1": {Stat: 12.2, CompressFactor: 2}, + "EVENT_3": {Stat: 18.3, CompressFactor: 1}, }, MinItems: 2, FilterIDs: []string{}, @@ -2286,8 +2286,8 @@ func TestStatSumCompress(t *testing.T) { MinItems: 2, FilterIDs: []string{}} expected := &StatSum{ Events: map[string]*StatWithCompress{ - "EVENT_1": &StatWithCompress{Stat: 18.2, CompressFactor: 1}, - "EVENT_2": &StatWithCompress{Stat: 6.2, CompressFactor: 1}, + "EVENT_1": {Stat: 18.2, CompressFactor: 1}, + "EVENT_2": {Stat: 6.2, CompressFactor: 1}, }, MinItems: 2, FilterIDs: []string{}, @@ -2316,7 +2316,7 @@ func TestStatSumCompress(t *testing.T) { } expected = &StatSum{ Events: map[string]*StatWithCompress{ - "EVENT_3": &StatWithCompress{Stat: 12.2, CompressFactor: 2}, + "EVENT_3": {Stat: 12.2, CompressFactor: 2}, }, MinItems: 2, FilterIDs: []string{}, @@ -2518,8 +2518,8 @@ func TestStatAverageGetStringValue3(t *testing.T) { MinItems: 2, FilterIDs: []string{}, FieldName: "~*req.Cost"} expected := &StatAverage{ Events: map[string]*StatWithCompress{ - "EVENT_1": &StatWithCompress{Stat: 12.2, CompressFactor: 2}, - "EVENT_3": &StatWithCompress{Stat: 18.3, CompressFactor: 1}, + "EVENT_1": {Stat: 12.2, CompressFactor: 2}, + "EVENT_3": {Stat: 18.3, CompressFactor: 1}, }, MinItems: 2, FilterIDs: []string{}, @@ -2565,8 +2565,8 @@ func TestStatAverageCompress(t *testing.T) { MinItems: 2, FilterIDs: []string{}} expected := &StatAverage{ Events: map[string]*StatWithCompress{ - "EVENT_1": &StatWithCompress{Stat: 18.2, CompressFactor: 1}, - "EVENT_2": &StatWithCompress{Stat: 6.2, CompressFactor: 1}, + "EVENT_1": {Stat: 18.2, CompressFactor: 1}, + "EVENT_2": {Stat: 6.2, CompressFactor: 1}, }, MinItems: 2, FilterIDs: []string{}, @@ -2595,7 +2595,7 @@ func TestStatAverageCompress(t *testing.T) { } expected = &StatAverage{ Events: map[string]*StatWithCompress{ - "EVENT_3": &StatWithCompress{Stat: 12.2, CompressFactor: 2}, + "EVENT_3": {Stat: 12.2, CompressFactor: 2}, }, MinItems: 2, FilterIDs: []string{}, @@ -2782,19 +2782,19 @@ func TestStatDistinctCompress(t *testing.T) { } expected := &StatDistinct{ Events: map[string]map[string]int64{ - "EVENT_1": map[string]int64{ + "EVENT_1": { "1001": 2, }, - "EVENT_3": map[string]int64{ + "EVENT_3": { "1002": 1, }, }, FieldValues: map[string]map[string]struct{}{ - "1001": map[string]struct{}{ - "EVENT_1": struct{}{}, + "1001": { + "EVENT_1": {}, }, - "1002": map[string]struct{}{ - "EVENT_3": struct{}{}, + "1002": { + "EVENT_3": {}, }, }, MinItems: 2, diff --git a/engine/stats_test.go b/engine/stats_test.go index 40b95e13a..42891fa31 100644 --- a/engine/stats_test.go +++ b/engine/stats_test.go @@ -42,7 +42,7 @@ var ( QueueLength: 10, TTL: time.Duration(10) * time.Second, Metrics: []*MetricWithFilters{ - &MetricWithFilters{ + { MetricID: "*sum#Usage", }, }, @@ -62,7 +62,7 @@ var ( QueueLength: 10, TTL: time.Duration(10) * time.Second, Metrics: []*MetricWithFilters{ - &MetricWithFilters{ + { MetricID: "*sum#Usage", }, }, @@ -82,7 +82,7 @@ var ( QueueLength: 10, TTL: time.Duration(10) * time.Second, Metrics: []*MetricWithFilters{ - &MetricWithFilters{ + { MetricID: "*sum#Usage", }, }, @@ -372,7 +372,7 @@ func TestStatQueuesV1ProcessEvent(t *testing.T) { QueueLength: 10, TTL: time.Duration(10) * time.Second, Metrics: []*MetricWithFilters{ - &MetricWithFilters{ + { MetricID: "*sum#Usage", }, }, diff --git a/engine/storage_test.go b/engine/storage_test.go index 2ced5ade6..05da140a8 100644 --- a/engine/storage_test.go +++ b/engine/storage_test.go @@ -204,9 +204,9 @@ func GetUB() *Account { ID: "rif", AllowNegative: true, BalanceMap: map[string]Balances{ - utils.SMS: Balances{&Balance{Value: 14, ExpirationDate: zeroTime}}, - utils.DATA: Balances{&Balance{Value: 1024, ExpirationDate: zeroTime}}, - utils.VOICE: Balances{&Balance{Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, + utils.SMS: {&Balance{Value: 14, ExpirationDate: zeroTime}}, + utils.DATA: {&Balance{Value: 1024, ExpirationDate: zeroTime}}, + utils.VOICE: {&Balance{Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}}}, UnitCounters: UnitCounters{utils.SMS: []*UnitCounter{uc, uc}}, ActionTriggers: ActionTriggers{at, at, at}, diff --git a/engine/storage_utils.go b/engine/storage_utils.go index 9ed4ddd3c..3e929a80f 100644 --- a/engine/storage_utils.go +++ b/engine/storage_utils.go @@ -131,14 +131,14 @@ type AttrCDRSStoreSMCost struct { Cost *SMCost CheckDuplicate bool Opts map[string]interface{} - *utils.TenantArg + Tenant string } type ArgsV2CDRSStoreSMCost struct { Cost *V2SMCost CheckDuplicate bool Opts map[string]interface{} - *utils.TenantArg + Tenant string } type V2SMCost struct { diff --git a/engine/timespans_test.go b/engine/timespans_test.go index d70272392..b755a4999 100644 --- a/engine/timespans_test.go +++ b/engine/timespans_test.go @@ -524,14 +524,14 @@ func TestTimespanSplitMultipleGroup(t *testing.T) { func TestTimespanExpandingPastEnd(t *testing.T) { timespans := []*TimeSpan{ - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 0, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 30, 30, 0, time.UTC), RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{ &RGRate{RateIncrement: 60 * time.Second}, }}}, }, - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 30, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 30, 45, 0, time.UTC), }, @@ -548,14 +548,14 @@ func TestTimespanExpandingPastEnd(t *testing.T) { func TestTimespanExpandingDurationIndex(t *testing.T) { timespans := []*TimeSpan{ - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 0, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 30, 30, 0, time.UTC), RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{ &RGRate{RateIncrement: 60 * time.Second}, }}}, }, - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 30, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 30, 45, 0, time.UTC), }, @@ -570,14 +570,14 @@ func TestTimespanExpandingDurationIndex(t *testing.T) { func TestTimespanExpandingRoundingPastEnd(t *testing.T) { timespans := []*TimeSpan{ - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 0, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 30, 20, 0, time.UTC), RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{ &RGRate{RateIncrement: 15 * time.Second}, }}}, }, - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 20, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 30, 40, 0, time.UTC), }, @@ -594,18 +594,18 @@ func TestTimespanExpandingRoundingPastEnd(t *testing.T) { func TestTimespanExpandingPastEndMultiple(t *testing.T) { timespans := []*TimeSpan{ - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 0, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 30, 30, 0, time.UTC), RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{ &RGRate{RateIncrement: 60 * time.Second}, }}}, }, - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 30, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 30, 40, 0, time.UTC), }, - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 40, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 30, 50, 0, time.UTC), }, @@ -622,18 +622,18 @@ func TestTimespanExpandingPastEndMultiple(t *testing.T) { func TestTimespanExpandingPastEndMultipleEqual(t *testing.T) { timespans := []*TimeSpan{ - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 0, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 30, 30, 0, time.UTC), RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{ &RGRate{RateIncrement: 60 * time.Second}, }}}, }, - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 30, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 30, 40, 0, time.UTC), }, - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 40, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 31, 00, 0, time.UTC), }, @@ -650,14 +650,14 @@ func TestTimespanExpandingPastEndMultipleEqual(t *testing.T) { func TestTimespanExpandingBeforeEnd(t *testing.T) { timespans := []*TimeSpan{ - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 0, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 30, 30, 0, time.UTC), RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{ &RGRate{RateIncrement: 45 * time.Second}, }}}, }, - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 30, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 31, 0, 0, time.UTC), }, @@ -676,18 +676,18 @@ func TestTimespanExpandingBeforeEnd(t *testing.T) { func TestTimespanExpandingBeforeEndMultiple(t *testing.T) { timespans := []*TimeSpan{ - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 0, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 30, 30, 0, time.UTC), RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{ &RGRate{RateIncrement: 45 * time.Second}, }}}, }, - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 30, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 30, 50, 0, time.UTC), }, - &TimeSpan{ + { TimeStart: time.Date(2013, 9, 10, 14, 30, 50, 0, time.UTC), TimeEnd: time.Date(2013, 9, 10, 14, 31, 00, 0, time.UTC), }, diff --git a/engine/units_counter_test.go b/engine/units_counter_test.go index 1e60fce4d..3fbc68d9c 100644 --- a/engine/units_counter_test.go +++ b/engine/units_counter_test.go @@ -94,36 +94,36 @@ func TestUnitCountersClone(t *testing.T) { } ucs = UnitCounters{ "string1": []*UnitCounter{ - &UnitCounter{ + { CounterType: "testCounterType1.1", }, - &UnitCounter{ + { CounterType: "testCounterType1.2", }, }, "string2": []*UnitCounter{ - &UnitCounter{ + { CounterType: "testCounterType2.1", }, - &UnitCounter{ + { CounterType: "testCounterType2.2", }, }, } eOut = UnitCounters{ "string1": []*UnitCounter{ - &UnitCounter{ + { CounterType: "testCounterType1.1", }, - &UnitCounter{ + { CounterType: "testCounterType1.2", }, }, "string2": []*UnitCounter{ - &UnitCounter{ + { CounterType: "testCounterType2.1", }, - &UnitCounter{ + { CounterType: "testCounterType2.2", }, }, diff --git a/ers/ers_reload_it_test.go b/ers/ers_reload_it_test.go index 2e8293d8f..0676fee04 100644 --- a/ers/ers_reload_it_test.go +++ b/ers/ers_reload_it_test.go @@ -140,7 +140,7 @@ func testReloadReloadConfigFromPath(t *testing.T) { func testReloadVerifyFirstReload(t *testing.T) { var reply map[string]interface{} - if err := reloadRPC.Call(utils.ConfigSv1GetJSONSection, &config.StringWithOpts{ + if err := reloadRPC.Call(utils.ConfigSv1GetJSONSection, &config.SectionWithOpts{ Section: config.ERsJson, }, &reply); err != nil { t.Error(err) diff --git a/general_tests/cacherpl_it_test.go b/general_tests/cacherpl_it_test.go index 0a55c5b0a..7ca31215b 100644 --- a/general_tests/cacherpl_it_test.go +++ b/general_tests/cacherpl_it_test.go @@ -308,9 +308,7 @@ func testCacheRplAAAddData(t *testing.T) { func testCacheRplPing(t *testing.T) { var reply map[string]interface{} ev := utils.TenantWithOpts{ - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsRouteID: "testRoute123", }, @@ -339,9 +337,7 @@ func testCacheRplPing(t *testing.T) { func testCacheRplCheckReplication(t *testing.T) { var reply map[string]interface{} ev := utils.TenantWithOpts{ - TenantArg: &utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", } if err := dspEngine2RPC.Call(utils.CoreSv1Status, &ev, &reply); err != nil { t.Error(err) @@ -351,9 +347,7 @@ func testCacheRplCheckReplication(t *testing.T) { var rcvKeys []string expKeys := []string{"testRoute123:*core", "testRoute123:*attributes"} argsAPI := utils.ArgsGetCacheItemIDsWithOpts{ - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", ArgsGetCacheItemIDs: utils.ArgsGetCacheItemIDs{ CacheID: utils.CacheDispatcherRoutes, }, @@ -385,9 +379,7 @@ func testCacheRplCheckReplication(t *testing.T) { func testCacheRplAACheckReplication(t *testing.T) { var rcvKeys []string argsAPI := utils.ArgsGetCacheItemIDsWithOpts{ - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", ArgsGetCacheItemIDs: utils.ArgsGetCacheItemIDs{ CacheID: utils.CacheDispatcherRoutes, }, @@ -453,9 +445,7 @@ func testCacheRplAACheckReplication(t *testing.T) { func testCacheRplAACheckLoadReplication(t *testing.T) { var rcvKeys []string argsAPI := utils.ArgsGetCacheItemIDsWithOpts{ - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", ArgsGetCacheItemIDs: utils.ArgsGetCacheItemIDs{ CacheID: utils.CacheDispatcherLoads, }, @@ -524,9 +514,7 @@ func testCacheRplAACheckLoadReplication(t *testing.T) { "testRouteFromDispatcher1:*chargers", "testRouteFromDispatcher2:*attributes", "testRouteFromDispatcher2:*chargers"} argsAPI = utils.ArgsGetCacheItemIDsWithOpts{ - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", ArgsGetCacheItemIDs: utils.ArgsGetCacheItemIDs{ CacheID: utils.CacheDispatcherRoutes, }, @@ -550,9 +538,7 @@ func testCacheRplAACheckLoadReplication(t *testing.T) { expKeys = []string{"cgrates.org:Engine2"} argsAPI = utils.ArgsGetCacheItemIDsWithOpts{ - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", ArgsGetCacheItemIDs: utils.ArgsGetCacheItemIDs{ CacheID: utils.CacheDispatcherLoads, }, @@ -578,9 +564,7 @@ func testCacheRplAACheckLoadReplication(t *testing.T) { func testCacheRplCheckLoadReplication(t *testing.T) { var rcvKeys []string argsAPI := utils.ArgsGetCacheItemIDsWithOpts{ - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", ArgsGetCacheItemIDs: utils.ArgsGetCacheItemIDs{ CacheID: utils.CacheDispatcherLoads, }, @@ -618,9 +602,7 @@ func testCacheRplCheckLoadReplication(t *testing.T) { wg.Wait() expKeys := []string{"testRoute123:*core", "testRoute123:*attributes", "testRoute123:*chargers"} argsAPI = utils.ArgsGetCacheItemIDsWithOpts{ - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", ArgsGetCacheItemIDs: utils.ArgsGetCacheItemIDs{ CacheID: utils.CacheDispatcherRoutes, }, @@ -636,9 +618,7 @@ func testCacheRplCheckLoadReplication(t *testing.T) { expKeys = []string{"cgrates.org:Engine2"} argsAPI = utils.ArgsGetCacheItemIDsWithOpts{ - TenantArg: utils.TenantArg{ - Tenant: "cgrates.org", - }, + Tenant: "cgrates.org", ArgsGetCacheItemIDs: utils.ArgsGetCacheItemIDs{ CacheID: utils.CacheDispatcherLoads, }, diff --git a/general_tests/cdrs_it_test.go b/general_tests/cdrs_it_test.go index bcd79eeae..d92a8de94 100644 --- a/general_tests/cdrs_it_test.go +++ b/general_tests/cdrs_it_test.go @@ -614,7 +614,7 @@ func testV2CDRsGetThreshold1(t *testing.T) { expected := []string{"THD_ACNT_1001", "THD_PoccessCDR"} var result []string if err := cdrsRpc.Call(utils.APIerSv1GetThresholdProfileIDs, - &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{"cgrates.org"}}, &result); err != nil { + &utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &result); err != nil { t.Error(err) } else if len(expected) != len(result) { t.Errorf("Expecting : %+v, received: %+v", expected, result) diff --git a/general_tests/cgrloader_it_test.go b/general_tests/cgrloader_it_test.go index 1439175ca..78ec38fea 100644 --- a/general_tests/cgrloader_it_test.go +++ b/general_tests/cgrloader_it_test.go @@ -126,7 +126,7 @@ func testCGRLoaderGetData(t *testing.T) { "ATTR_1001_SESSIONAUTH", "ATTR_1002_SESSIONAUTH", "ATTR_1003_SESSIONAUTH", "ATTR_ACC_ALIAS"} var result []string - if err := cgrloaderRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{Tenant: "cgrates.org"}}, &result); err != nil { + if err := cgrloaderRPC.Call(utils.APIerSv1GetAttributeProfileIDs, &utils.PaginatorWithTenant{Tenant: "cgrates.org"}, &result); err != nil { t.Error(err) } else if len(expected) != len(result) { t.Errorf("Expecting : %+v, received: %+v", expected, result) diff --git a/general_tests/export_it_test.go b/general_tests/export_it_test.go index 8a59dcc87..6ef412f8c 100644 --- a/general_tests/export_it_test.go +++ b/general_tests/export_it_test.go @@ -295,10 +295,10 @@ func testExpVerifyStats(t *testing.T) { QueueLength: 100, TTL: time.Duration(-1), Metrics: []*engine.MetricWithFilters{ - &engine.MetricWithFilters{ + { MetricID: utils.MetaTCC, }, - &engine.MetricWithFilters{ + { MetricID: utils.MetaTCD, }, }, @@ -319,10 +319,10 @@ func testExpVerifyStats(t *testing.T) { QueueLength: 100, TTL: time.Duration(-1), Metrics: []*engine.MetricWithFilters{ - &engine.MetricWithFilters{ + { MetricID: utils.MetaTCD, }, - &engine.MetricWithFilters{ + { MetricID: utils.MetaTCC, }, }, diff --git a/sessions/sessions.go b/sessions/sessions.go index fff5f8ac3..c0d3464d2 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -673,9 +673,7 @@ func (sS *SessionS) storeSCost(s *Session, sRunIdx int) (err error) { Cost: smCost, CheckDuplicate: true, Opts: s.OptsStart, - TenantArg: &utils.TenantArg{ - Tenant: s.Tenant, - }, + Tenant: s.Tenant, } var reply string if err := sS.connMgr.Call(sS.cgrCfg.SessionSCfg().CDRsConns, nil, utils.CDRsV2StoreSessionCost, diff --git a/sessions/sessions_it_test.go b/sessions/sessions_it_test.go index 62cc9e26c..bc6ccf22b 100644 --- a/sessions/sessions_it_test.go +++ b/sessions/sessions_it_test.go @@ -305,7 +305,7 @@ func testSessionsItTerminatePassive(t *testing.T) { CGRID: cgrID, EventStart: sEv, SRuns: []*SRun{ - &SRun{ + { Event: sEv, TotalUsage: time.Minute, CD: &engine.CallDescriptor{}, diff --git a/utils/apitpdata.go b/utils/apitpdata.go index 5148150f6..2d167344c 100755 --- a/utils/apitpdata.go +++ b/utils/apitpdata.go @@ -180,8 +180,8 @@ type TPTiming struct { // TPTimingWithOpts is used in replicatorV1 for dispatcher type TPTimingWithOpts struct { *TPTiming - TenantArg - Opts map[string]interface{} + Tenant string + Opts map[string]interface{} } func NewTiming(ID, years, mounths, mounthdays, weekdays, time string) (rt *TPTiming) { @@ -1308,19 +1308,19 @@ func AppendToSMCostFilter(smcFilter *SMCostFilter, fieldType, fieldName string, type RPCCDRsFilterWithOpts struct { *RPCCDRsFilter - Opts map[string]interface{} - *TenantArg + Opts map[string]interface{} + Tenant string } type ArgsGetCacheItemIDsWithOpts struct { - Opts map[string]interface{} - TenantArg + Opts map[string]interface{} + Tenant string ArgsGetCacheItemIDs } type ArgsGetCacheItemWithOpts struct { - Opts map[string]interface{} - TenantArg + Opts map[string]interface{} + Tenant string ArgsGetCacheItem } @@ -1366,20 +1366,20 @@ func NewAttrReloadCacheWithOpts() *AttrReloadCacheWithOpts { } type AttrReloadCacheWithOpts struct { - Opts map[string]interface{} - TenantArg + Opts map[string]interface{} + Tenant string ArgsCache map[string][]string } type AttrCacheIDsWithOpts struct { - Opts map[string]interface{} - TenantArg + Opts map[string]interface{} + Tenant string CacheIDs []string } type ArgsGetGroupWithOpts struct { - Opts map[string]interface{} - TenantArg + Opts map[string]interface{} + Tenant string ArgsGetGroup } @@ -1454,14 +1454,14 @@ type ArgCacheReplicateSet struct { ItemID string Value interface{} Opts map[string]interface{} - TenantArg + Tenant string } type ArgCacheReplicateRemove struct { CacheID string ItemID string Opts map[string]interface{} - TenantArg + Tenant string } type AttrsExecuteActions struct { @@ -1469,7 +1469,7 @@ type AttrsExecuteActions struct { TimeStart time.Time TimeEnd time.Time // replay the action timings between the two dates Opts map[string]interface{} - TenantArg + Tenant string } type AttrsExecuteActionPlans struct { @@ -1477,7 +1477,6 @@ type AttrsExecuteActionPlans struct { Tenant string AccountID string Opts map[string]interface{} - TenantArg } type TPRateProfile struct { diff --git a/utils/coreutils.go b/utils/coreutils.go index d42fcce85..2eb362eaf 100644 --- a/utils/coreutils.go +++ b/utils/coreutils.go @@ -746,18 +746,14 @@ func NewTenantID(tntID string) *TenantID { return &TenantID{Tenant: tIDSplt[0], ID: ConcatenatedKey(tIDSplt[1:]...)} } -type TenantArg struct { +type PaginatorWithTenant struct { Tenant string -} - -type TenantArgWithPaginator struct { - TenantArg Paginator } type TenantWithOpts struct { - *TenantArg - Opts map[string]interface{} + Tenant string + Opts map[string]interface{} } type TenantID struct { @@ -898,17 +894,16 @@ func LongExecTimeDetector(logID string, maxDur time.Duration) (endchan chan stru } type StringWithOpts struct { - Opts map[string]interface{} - TenantArg - Arg string + Opts map[string]interface{} + Tenant string + Arg string } func CastRPCErr(err error) error { if _, has := ErrMap[err.Error()]; has { return ErrMap[err.Error()] - } else { - return err } + return err } // RandomInteger returns a random integer between min and max values @@ -918,8 +913,8 @@ func RandomInteger(min, max int) int { type LoadIDsWithOpts struct { LoadIDs map[string]int64 - TenantArg - Opts map[string]interface{} + Tenant string + Opts map[string]interface{} } // IsURL returns if the path is an URL @@ -933,8 +928,8 @@ type GetIndexesArg struct { IdxItmType string TntCtx string IdxKey string - TenantArg - Opts map[string]interface{} + Tenant string + Opts map[string]interface{} } // SetIndexesArg the API arguments needed for seting an index @@ -942,12 +937,12 @@ type SetIndexesArg struct { IdxItmType string TntCtx string Indexes map[string]StringSet - TenantArg - Opts map[string]interface{} + Tenant string + Opts map[string]interface{} } type DurationArgs struct { DurationTime time.Duration Opts map[string]interface{} - *TenantArg + Tenant string } diff --git a/utils/orderednavigablemap_test.go b/utils/orderednavigablemap_test.go index 2bf3c0f7a..9e4e1558c 100644 --- a/utils/orderednavigablemap_test.go +++ b/utils/orderednavigablemap_test.go @@ -30,7 +30,7 @@ func TestOrderedNavigableMap(t *testing.T) { PathItems: PathItems{{Field: "Field1"}}, }, NewNMData(10)) expOrder := []PathItems{ - PathItems{{Field: "Field1"}}, + {{Field: "Field1"}}, } if !reflect.DeepEqual(expOrder, onm.GetOrder()) { t.Errorf("Expected %s ,received: %s", expOrder, ToJSON(onm.GetOrder())) @@ -41,8 +41,8 @@ func TestOrderedNavigableMap(t *testing.T) { PathItems: PathItems{{Field: "Field2", Index: StringPointer("0")}}, }, NewNMData("1001")) expOrder = []PathItems{ - PathItems{{Field: "Field1"}}, - PathItems{{Field: "Field2", Index: StringPointer("0")}}, + {{Field: "Field1"}}, + {{Field: "Field2", Index: StringPointer("0")}}, } if !reflect.DeepEqual(expOrder, onm.GetOrder()) { t.Errorf("Expected %s ,received: %s", expOrder, ToJSON(onm.GetOrder())) @@ -55,9 +55,9 @@ func TestOrderedNavigableMap(t *testing.T) { {Field: "Account", Index: StringPointer("0")}}, }, NewNMData(10)) expOrder = []PathItems{ - PathItems{{Field: "Field1"}}, - PathItems{{Field: "Field2", Index: StringPointer("0")}}, - PathItems{ + {{Field: "Field1"}}, + {{Field: "Field2", Index: StringPointer("0")}}, + { {Field: "Field2", Index: StringPointer("1")}, {Field: "Account", Index: StringPointer("0")}}, } @@ -72,12 +72,12 @@ func TestOrderedNavigableMap(t *testing.T) { {Field: "Account", Index: StringPointer("1")}}, }, NewNMData(11)) expOrder = []PathItems{ - PathItems{{Field: "Field1"}}, - PathItems{{Field: "Field2", Index: StringPointer("0")}}, - PathItems{ + {{Field: "Field1"}}, + {{Field: "Field2", Index: StringPointer("0")}}, + { {Field: "Field2", Index: StringPointer("1")}, {Field: "Account", Index: StringPointer("0")}}, - PathItems{ + { {Field: "Field2", Index: StringPointer("1")}, {Field: "Account", Index: StringPointer("1")}}, } @@ -90,15 +90,15 @@ func TestOrderedNavigableMap(t *testing.T) { PathItems: PathItems{{Field: "Field2", Index: StringPointer("2")}}, }, NewNMData(111)) expOrder = []PathItems{ - PathItems{{Field: "Field1"}}, - PathItems{{Field: "Field2", Index: StringPointer("0")}}, - PathItems{ + {{Field: "Field1"}}, + {{Field: "Field2", Index: StringPointer("0")}}, + { {Field: "Field2", Index: StringPointer("1")}, {Field: "Account", Index: StringPointer("0")}}, - PathItems{ + { {Field: "Field2", Index: StringPointer("1")}, {Field: "Account", Index: StringPointer("1")}}, - PathItems{{Field: "Field2", Index: StringPointer("2")}}, + {{Field: "Field2", Index: StringPointer("2")}}, } if !reflect.DeepEqual(expOrder, onm.GetOrder()) { t.Errorf("Expected %s ,received: %s", expOrder, ToJSON(onm.GetOrder())) @@ -112,16 +112,16 @@ func TestOrderedNavigableMap(t *testing.T) { {Field: "Field5"}}, }, NewNMData(5)) expOrder = []PathItems{ - PathItems{{Field: "Field1"}}, - PathItems{{Field: "Field2", Index: StringPointer("0")}}, - PathItems{ + {{Field: "Field1"}}, + {{Field: "Field2", Index: StringPointer("0")}}, + { {Field: "Field2", Index: StringPointer("1")}, {Field: "Account", Index: StringPointer("0")}}, - PathItems{ + { {Field: "Field2", Index: StringPointer("1")}, {Field: "Account", Index: StringPointer("1")}}, - PathItems{{Field: "Field2", Index: StringPointer("2")}}, - PathItems{ + {{Field: "Field2", Index: StringPointer("2")}}, + { {Field: "Field3"}, {Field: "Field4"}, {Field: "Field5"}}, @@ -168,13 +168,13 @@ func TestOrderedNavigableMap(t *testing.T) { t.Errorf("Expected %q ,received: %q", exp, val.Interface()) } expOrder = []PathItems{ - PathItems{{Field: "Field1"}}, - PathItems{ + {{Field: "Field1"}}, + { {Field: "Field3"}, {Field: "Field4"}, {Field: "Field5"}}, - PathItems{{Field: "Field2", Index: StringPointer("0")}}, - PathItems{{Field: "Field2", Index: StringPointer("1")}}, + {{Field: "Field2", Index: StringPointer("0")}}, + {{Field: "Field2", Index: StringPointer("1")}}, } if !reflect.DeepEqual(expOrder, onm.GetOrder()) { t.Errorf("Expected %s ,received: %s", expOrder, onm.GetOrder()) diff --git a/utils/reflect.go b/utils/reflect.go index 1a164ef5e..09dc55a01 100644 --- a/utils/reflect.go +++ b/utils/reflect.go @@ -391,7 +391,6 @@ func GetUniformType(item interface{}) (interface{}, error) { default: return nil, errors.New("incomparable") } - return item, nil } func GetBasicType(item interface{}) interface{} { @@ -406,7 +405,6 @@ func GetBasicType(item interface{}) interface{} { default: return item } - return item } // GreaterThan attempts to compare two items diff --git a/utils/value_formula.go b/utils/value_formula.go index 9ee2217e7..a9a794f96 100644 --- a/utils/value_formula.go +++ b/utils/value_formula.go @@ -26,7 +26,7 @@ import ( "time" ) -//for computing a dynamic value for Value field +// ValueFormula for computing a dynamic value for Value field type ValueFormula struct { Method string Params map[string]interface{}