From 820c30d98e4bf335e34de179f3d03e903d92a1ab Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Mon, 9 Nov 2015 19:59:34 +0200 Subject: [PATCH] more account test fixes --- apier/v1/accounts.go | 19 ++++++++----------- apier/v1/apier_local_test.go | 4 ++-- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/apier/v1/accounts.go b/apier/v1/accounts.go index d6ca55be5..aca99a981 100644 --- a/apier/v1/accounts.go +++ b/apier/v1/accounts.go @@ -30,9 +30,8 @@ import ( ) type AttrAcntAction struct { - Tenant string - Account string - Direction string + Tenant string + Account string } type AccountActionTiming struct { @@ -43,7 +42,7 @@ type AccountActionTiming struct { } func (self *ApierV1) GetAccountActionPlan(attrs AttrAcntAction, reply *[]*AccountActionTiming) error { - if missing := utils.MissingStructFields(&attrs, []string{"Tenant", "Account", "Direction"}); len(missing) != 0 { + if missing := utils.MissingStructFields(&attrs, []string{"Tenant", "Account"}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(strings.Join(missing, ","), "") } accountATs := make([]*AccountActionTiming, 0) @@ -67,7 +66,6 @@ type AttrRemActionTiming struct { ActionTimingId string // Internal CGR id identifying particular ActionTiming, *all for all user related ActionTimings to be canceled Tenant string // Tenant he account belongs to Account string // Account name - Direction string // Traffic direction ReloadScheduler bool // If set it will reload the scheduler after adding } @@ -77,7 +75,7 @@ func (self *ApierV1) RemActionTiming(attrs AttrRemActionTiming, reply *string) e return utils.NewErrMandatoryIeMissing(missing...) } if len(attrs.Account) != 0 { // Presence of Account requires complete account details to be provided - if missing := utils.MissingStructFields(&attrs, []string{"Tenant", "Account", "Direction"}); len(missing) != 0 { + if missing := utils.MissingStructFields(&attrs, []string{"Tenant", "Account"}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } } @@ -107,7 +105,7 @@ func (self *ApierV1) RemActionTiming(attrs AttrRemActionTiming, reply *string) e // Returns a list of ActionTriggers on an account func (self *ApierV1) GetAccountActionTriggers(attrs AttrAcntAction, reply *engine.ActionTriggers) error { - if missing := utils.MissingStructFields(&attrs, []string{"Tenant", "Account", "Direction"}); len(missing) != 0 { + if missing := utils.MissingStructFields(&attrs, []string{"Tenant", "Account"}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } if balance, err := self.AccountDb.GetAccount(utils.AccountKey(attrs.Tenant, attrs.Account)); err != nil { @@ -121,13 +119,12 @@ func (self *ApierV1) GetAccountActionTriggers(attrs AttrAcntAction, reply *engin type AttrRemAcntActionTriggers struct { Tenant string // Tenant he account belongs to Account string // Account name - Direction string // Traffic direction ActionTriggersId string // Id filtering only specific id to remove (can be regexp pattern) } // Returns a list of ActionTriggers on an account func (self *ApierV1) RemAccountActionTriggers(attrs AttrRemAcntActionTriggers, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"Tenant", "Account", "Direction"}); len(missing) != 0 { + if missing := utils.MissingStructFields(&attrs, []string{"Tenant", "Account"}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } balanceId := utils.AccountKey(attrs.Tenant, attrs.Account) @@ -158,7 +155,7 @@ func (self *ApierV1) RemAccountActionTriggers(attrs AttrRemAcntActionTriggers, r // Ads a new account into dataDb. If already defined, returns success. func (self *ApierV1) SetAccount(attr utils.AttrSetAccount, reply *string) error { - if missing := utils.MissingStructFields(&attr, []string{"Tenant", "Direction", "Account"}); len(missing) != 0 { + if missing := utils.MissingStructFields(&attr, []string{"Tenant", "Account"}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } balanceId := utils.AccountKey(attr.Tenant, attr.Account) @@ -226,7 +223,7 @@ func (self *ApierV1) SetAccount(attr utils.AttrSetAccount, reply *string) error } func (self *ApierV1) RemoveAccount(attr utils.AttrRemoveAccount, reply *string) error { - if missing := utils.MissingStructFields(&attr, []string{"Tenant", "Direction", "Account"}); len(missing) != 0 { + if missing := utils.MissingStructFields(&attr, []string{"Tenant", "Account"}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } accountId := utils.AccountKey(attr.Tenant, attr.Account) diff --git a/apier/v1/apier_local_test.go b/apier/v1/apier_local_test.go index 2c9cc9db1..4ddb088c2 100644 --- a/apier/v1/apier_local_test.go +++ b/apier/v1/apier_local_test.go @@ -826,12 +826,12 @@ func TestApierGetCacheStats(t *testing.T) { return } var rcvStats *utils.CacheStats - expectedStats := &utils.CacheStats{Destinations: 3, RatingPlans: 1, RatingProfiles: 2, Actions: 2, LastLoadId: utils.NOT_AVAILABLE, LastLoadTime: utils.NOT_AVAILABLE} + expectedStats := &utils.CacheStats{Destinations: 3, RatingPlans: 1, RatingProfiles: 2, Actions: 2, ActionPlans: 1, LastLoadId: utils.NOT_AVAILABLE, LastLoadTime: utils.NOT_AVAILABLE} var args utils.AttrCacheStats if err := rater.Call("ApierV1.GetCacheStats", args, &rcvStats); err != nil { t.Error("Got error on ApierV1.GetCacheStats: ", err.Error()) } else if !reflect.DeepEqual(expectedStats, rcvStats) { - t.Errorf("Calling ApierV1.GetCacheStats expected: %v, received: %v", expectedStats, rcvStats) + t.Errorf("Calling ApierV1.GetCacheStats expected: %+v, received: %+v", expectedStats, rcvStats) } }