From 17603c4c51c5470f9fa97032994d1356f72c69a2 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Tue, 13 Oct 2015 16:29:59 +0300 Subject: [PATCH] added mongo local tests --- apier/v2/cdrs_mysql_local_test.go | 15 +- apier/v2/cdrs_psql_local_test.go | 15 +- cdrc/cdrc_local_test.go | 6 +- engine/loader_local_test.go | 7 +- engine/storage_mongo.go | 131 ++- engine/storage_mongo_local_test.go | 975 +++++++++++++++++++++++ engine/storage_mongo_tp.go | 20 +- engine/storage_mysql.go | 2 +- engine/storage_mysql_local_test.go | 5 +- engine/storage_postgres.go | 2 +- engine/storage_psql_local_test.go | 5 +- engine/storage_utils.go | 16 +- general_tests/multiplecdrc_local_test.go | 6 +- 13 files changed, 1147 insertions(+), 58 deletions(-) create mode 100644 engine/storage_mongo_local_test.go diff --git a/apier/v2/cdrs_mysql_local_test.go b/apier/v2/cdrs_mysql_local_test.go index fb155b48a..de3049542 100644 --- a/apier/v2/cdrs_mysql_local_test.go +++ b/apier/v2/cdrs_mysql_local_test.go @@ -20,14 +20,15 @@ package v2 import ( "flag" - "github.com/cgrates/cgrates/config" - "github.com/cgrates/cgrates/engine" - "github.com/cgrates/cgrates/utils" "net/rpc" "net/rpc/jsonrpc" "path" "testing" "time" + + "github.com/cgrates/cgrates/config" + "github.com/cgrates/cgrates/engine" + "github.com/cgrates/cgrates/utils" ) var testLocal = flag.Bool("local", false, "Perform the tests only on local test environment, not by default.") // This flag will be passed here via "go test -local" args @@ -72,13 +73,11 @@ func TestV2CdrsMysqlInjectUnratedCdr(t *testing.T) { if !*testLocal { return } - var mysqlDb *engine.MySQLStorage - if d, err := engine.NewMySQLStorage(cdrsCfg.StorDBHost, cdrsCfg.StorDBPort, cdrsCfg.StorDBName, cdrsCfg.StorDBUser, cdrsCfg.StorDBPass, - cdrsCfg.StorDBMaxOpenConns, cdrsCfg.StorDBMaxIdleConns); err != nil { + mysqlDb, err := engine.NewMySQLStorage(cdrsCfg.StorDBHost, cdrsCfg.StorDBPort, cdrsCfg.StorDBName, cdrsCfg.StorDBUser, cdrsCfg.StorDBPass, + cdrsCfg.StorDBMaxOpenConns, cdrsCfg.StorDBMaxIdleConns) + if err != nil { t.Error("Error on opening database connection: ", err) return - } else { - mysqlDb = d.(*engine.MySQLStorage) } strCdr1 := &engine.StoredCdr{CgrId: utils.Sha1("bbb1", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()), TOR: utils.VOICE, AccId: "bbb1", CdrHost: "192.168.1.1", CdrSource: "UNKNOWN", ReqType: utils.META_RATED, diff --git a/apier/v2/cdrs_psql_local_test.go b/apier/v2/cdrs_psql_local_test.go index 80c593f0a..821a406ed 100644 --- a/apier/v2/cdrs_psql_local_test.go +++ b/apier/v2/cdrs_psql_local_test.go @@ -19,15 +19,16 @@ along with this program. If not, see package v2 import ( - "github.com/cgrates/cgrates/config" - "github.com/cgrates/cgrates/engine" - "github.com/cgrates/cgrates/utils" "net/rpc" "net/rpc/jsonrpc" "os/exec" "path" "testing" "time" + + "github.com/cgrates/cgrates/config" + "github.com/cgrates/cgrates/engine" + "github.com/cgrates/cgrates/utils" ) var cdrsPsqlCfgPath string @@ -69,13 +70,11 @@ func TestV2CdrsPsqlInjectUnratedCdr(t *testing.T) { if !*testLocal { return } - var psqlDb *engine.PostgresStorage - if d, err := engine.NewPostgresStorage(cdrsPsqlCfg.StorDBHost, cdrsPsqlCfg.StorDBPort, cdrsPsqlCfg.StorDBName, cdrsPsqlCfg.StorDBUser, cdrsPsqlCfg.StorDBPass, - cdrsPsqlCfg.StorDBMaxOpenConns, cdrsPsqlCfg.StorDBMaxIdleConns); err != nil { + psqlDb, err := engine.NewPostgresStorage(cdrsPsqlCfg.StorDBHost, cdrsPsqlCfg.StorDBPort, cdrsPsqlCfg.StorDBName, cdrsPsqlCfg.StorDBUser, cdrsPsqlCfg.StorDBPass, + cdrsPsqlCfg.StorDBMaxOpenConns, cdrsPsqlCfg.StorDBMaxIdleConns) + if err != nil { t.Error("Error on opening database connection: ", err) return - } else { - psqlDb = d.(*engine.PostgresStorage) } strCdr1 := &engine.StoredCdr{CgrId: utils.Sha1("bbb1", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()), TOR: utils.VOICE, AccId: "bbb1", CdrHost: "192.168.1.1", CdrSource: "UNKNOWN", ReqType: utils.META_RATED, diff --git a/cdrc/cdrc_local_test.go b/cdrc/cdrc_local_test.go index 5e0521d73..fb3737c32 100644 --- a/cdrc/cdrc_local_test.go +++ b/cdrc/cdrc_local_test.go @@ -111,11 +111,9 @@ func TestCsvLclEmptyTables(t *testing.T) { if *storDbType != utils.MYSQL { t.Fatal("Unsupported storDbType") } - var mysql *engine.MySQLStorage - if d, err := engine.NewMySQLStorage(cfg.StorDBHost, cfg.StorDBPort, cfg.StorDBName, cfg.StorDBUser, cfg.StorDBPass, cfg.StorDBMaxOpenConns, cfg.StorDBMaxIdleConns); err != nil { + mysql, err := engine.NewMySQLStorage(cfg.StorDBHost, cfg.StorDBPort, cfg.StorDBName, cfg.StorDBUser, cfg.StorDBPass, cfg.StorDBMaxOpenConns, cfg.StorDBMaxIdleConns) + if err != nil { t.Fatal("Error on opening database connection: ", err) - } else { - mysql = d.(*engine.MySQLStorage) } for _, scriptName := range []string{utils.CREATE_CDRS_TABLES_SQL, utils.CREATE_TARIFFPLAN_TABLES_SQL} { if err := mysql.CreateTablesFromScript(path.Join(*dataDir, "storage", *storDbType, scriptName)); err != nil { diff --git a/engine/loader_local_test.go b/engine/loader_local_test.go index ee72d937f..f502f1740 100644 --- a/engine/loader_local_test.go +++ b/engine/loader_local_test.go @@ -90,13 +90,12 @@ func TestCreateStorTpTables(t *testing.T) { if !*testLocal { return } - var db *MySQLStorage - if d, err := NewMySQLStorage(lCfg.StorDBHost, lCfg.StorDBPort, lCfg.StorDBName, lCfg.StorDBUser, lCfg.StorDBPass, lCfg.StorDBMaxOpenConns, lCfg.StorDBMaxIdleConns); err != nil { + db, err := NewMySQLStorage(lCfg.StorDBHost, lCfg.StorDBPort, lCfg.StorDBName, lCfg.StorDBUser, lCfg.StorDBPass, lCfg.StorDBMaxOpenConns, lCfg.StorDBMaxIdleConns) + if err != nil { t.Error("Error on opening database connection: ", err) return } else { - db = d.(*MySQLStorage) - storDb = d.(LoadStorage) + storDb = db } // Creating the table serves also as reset since there is a drop prior to create if err := db.CreateTablesFromScript(path.Join(*dataDir, "storage", "mysql", utils.CREATE_TARIFFPLAN_TABLES_SQL)); err != nil { diff --git a/engine/storage_mongo.go b/engine/storage_mongo.go index 34344c830..b86b3277a 100644 --- a/engine/storage_mongo.go +++ b/engine/storage_mongo.go @@ -79,10 +79,9 @@ func NewMongoStorage(host, port, db, user, pass string) (*MongoStorage, error) { Background: false, // Build index in background and return immediately Sparse: false, // Only index documents containing the Key fields } - keyCollections := []string{colAct, colApl, colAtr, colDcs, colAls, colUsr, colLcr, colLht} - for _, col := range keyCollections { - err = ndb.C(col).EnsureIndex(index) - if err != nil { + collections := []string{colAct, colApl, colAtr, colDcs, colAls, colUsr, colLcr, colLht} + for _, col := range collections { + if err = ndb.C(col).EnsureIndex(index); err != nil { return nil, err } } @@ -93,10 +92,126 @@ func NewMongoStorage(host, port, db, user, pass string) (*MongoStorage, error) { Background: false, Sparse: false, } - idCollections := []string{colDst, colRpf, colRpl, colDst, colShg, colAcc, colCrs} - for _, col := range idCollections { - err = ndb.C(col).EnsureIndex(index) - if err != nil { + collections = []string{colDst, colRpf, colRpl, colDst, colShg, colAcc, colCrs} + for _, col := range collections { + if err = ndb.C(col).EnsureIndex(index); err != nil { + return nil, err + } + } + index = mgo.Index{ + Key: []string{"tpid", "tag"}, + Unique: true, + DropDups: false, + Background: false, + Sparse: false, + } + collections = []string{utils.TBL_TP_TIMINGS, utils.TBL_TP_DESTINATIONS, utils.TBL_TP_DESTINATION_RATES, utils.TBL_TP_RATING_PLANS, utils.TBL_TP_SHARED_GROUPS, utils.TBL_TP_CDR_STATS, utils.TBL_TP_ACTIONS, utils.TBL_TP_ACTION_PLANS, utils.TBL_TP_ACTION_TRIGGERS} + for _, col := range collections { + if err = ndb.C(col).EnsureIndex(index); err != nil { + return nil, err + } + } + index = mgo.Index{ + Key: []string{"tpid", "direction", "tenant", "category", "subject", "loadid"}, + Unique: true, + DropDups: false, + Background: false, + Sparse: false, + } + collections = []string{utils.TBL_TP_RATE_PROFILES} + for _, col := range collections { + if err = ndb.C(col).EnsureIndex(index); err != nil { + return nil, err + } + } + index = mgo.Index{ + Key: []string{"tpid", "direction", "tenant", "category", "account", "subject"}, + Unique: true, + DropDups: false, + Background: false, + Sparse: false, + } + collections = []string{utils.TBL_TP_LCRS} + for _, col := range collections { + if err = ndb.C(col).EnsureIndex(index); err != nil { + return nil, err + } + } + index = mgo.Index{ + Key: []string{"tpid", "tenant", "username"}, + Unique: true, + DropDups: false, + Background: false, + Sparse: false, + } + collections = []string{utils.TBL_TP_USERS} + for _, col := range collections { + if err = ndb.C(col).EnsureIndex(index); err != nil { + return nil, err + } + } + index = mgo.Index{ + Key: []string{"tpid", "direction", "tenant", "category", "account", "subject", "context"}, + Unique: true, + DropDups: false, + Background: false, + Sparse: false, + } + collections = []string{utils.TBL_TP_LCRS} + for _, col := range collections { + if err = ndb.C(col).EnsureIndex(index); err != nil { + return nil, err + } + } + index = mgo.Index{ + Key: []string{"tpid", "direction", "tenant", "category", "subject", "account", "loadid"}, + Unique: true, + DropDups: false, + Background: false, + Sparse: false, + } + collections = []string{utils.TBL_TP_DERIVED_CHARGERS} + for _, col := range collections { + if err = ndb.C(col).EnsureIndex(index); err != nil { + return nil, err + } + } + index = mgo.Index{ + Key: []string{"tpid", "direction", "tenant", "account", "loadid"}, + Unique: true, + DropDups: false, + Background: false, + Sparse: false, + } + collections = []string{utils.TBL_TP_DERIVED_CHARGERS} + for _, col := range collections { + if err = ndb.C(col).EnsureIndex(index); err != nil { + return nil, err + } + } + index = mgo.Index{ + Key: []string{"id", "source", "runid"}, + Unique: true, + DropDups: false, + Background: false, + Sparse: false, + } + collections = []string{colLogCC} + for _, col := range collections { + if err = ndb.C(col).EnsureIndex(index); err != nil { + return nil, err + } + } + index = mgo.Index{ + Key: []string{"cgrid"}, + Unique: true, + DropDups: false, + Background: false, + Sparse: false, + } + collections = []string{colCdrs, colRatedCdrs} + for _, col := range collections { + if err = ndb.C(col).EnsureIndex(index); err != nil { return nil, err } } diff --git a/engine/storage_mongo_local_test.go b/engine/storage_mongo_local_test.go new file mode 100644 index 000000000..066234708 --- /dev/null +++ b/engine/storage_mongo_local_test.go @@ -0,0 +1,975 @@ +/* +Rating system designed to be used in VoIP Carriers World +Copyright (C) 2012-2015 ITsysCOM + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see +*/ + +package engine + +import ( + "reflect" + "testing" + "time" + + "github.com/cgrates/cgrates/config" + "github.com/cgrates/cgrates/utils" +) + +var mongoDb *MongoStorage + +func TestMongoCreateTables(t *testing.T) { + if !*testLocal { + return + } + cgrConfig, _ := config.NewDefaultCGRConfig() + var err error + if mongoDb, err = NewMongoStorage("localhost", "27017", cgrConfig.StorDBName, cgrConfig.StorDBUser, cgrConfig.StorDBPass); err != nil { + t.Error("Error on opening database connection: ", err) + } +} + +func TestMongoSetGetTPTiming(t *testing.T) { + if !*testLocal { + return + } + tm := TpTiming{Tpid: utils.TEST_SQL, Tag: "ALWAYS", Time: "00:00:00"} + if err := mongoDb.SetTpTimings([]TpTiming{tm}); err != nil { + t.Error(err.Error()) + } + if tmgs, err := mongoDb.GetTpTimings(utils.TEST_SQL, tm.Tag); err != nil { + t.Error(err.Error()) + } else if !modelEqual(tm, tmgs[0]) { + t.Errorf("Expecting: %+v, received: %+v", tm, tmgs[0]) + } + // Update + tm.Time = "00:00:01" + if err := mongoDb.SetTpTimings([]TpTiming{tm}); err != nil { + t.Error(err.Error()) + } + if tmgs, err := mongoDb.GetTpTimings(utils.TEST_SQL, tm.Tag); err != nil { + t.Error(err.Error()) + } else if !modelEqual(tm, tmgs[0]) { + t.Errorf("Expecting: %+v, received: %+v", tm, tmgs[0]) + } +} + +func TestMongoSetGetTPDestination(t *testing.T) { + if !*testLocal { + return + } + dst := []TpDestination{ + TpDestination{Tpid: utils.TEST_SQL, Tag: utils.TEST_SQL, Prefix: "+49"}, + TpDestination{Tpid: utils.TEST_SQL, Tag: utils.TEST_SQL, Prefix: "+49151"}, + TpDestination{Tpid: utils.TEST_SQL, Tag: utils.TEST_SQL, Prefix: "+49176"}, + } + if err := mongoDb.SetTpDestinations(dst); err != nil { + t.Error(err.Error()) + } + storData, err := mongoDb.GetTpDestinations(utils.TEST_SQL, utils.TEST_SQL) + dsts, err := TpDestinations(storData).GetDestinations() + expected := &Destination{Id: utils.TEST_SQL, Prefixes: []string{"+49", "+49151", "+49176"}} + if err != nil { + t.Error(err.Error()) + } else if !modelEqual(*expected, *dsts[utils.TEST_SQL]) { + t.Errorf("Expecting: %+v, received: %+v", expected, dsts[utils.TEST_SQL]) + } +} + +func TestMongoSetGetTPRates(t *testing.T) { + if !*testLocal { + return + } + RT_ID := "RT_1" + rtSlots := []*utils.RateSlot{ + &utils.RateSlot{ConnectFee: 0.02, Rate: 0.01, RateUnit: "60s", RateIncrement: "60s", GroupIntervalStart: "0s"}, + &utils.RateSlot{ConnectFee: 0.00, Rate: 0.005, RateUnit: "60s", RateIncrement: "1s", GroupIntervalStart: "60s"}, + } + for _, rs := range rtSlots { + rs.SetDurations() + } + rates := &utils.TPRate{ + TPid: utils.TEST_SQL, + RateId: RT_ID, + RateSlots: rtSlots, + } + mRates := APItoModelRate(rates) + if err := mongoDb.SetTpRates(mRates); err != nil { + t.Error(err.Error()) + } + if rts, err := mongoDb.GetTpRates(utils.TEST_SQL, RT_ID); err != nil { + t.Error(err.Error()) + } else if !modelEqual(mRates[0], rts[0]) { + t.Errorf("Expecting: %+v, received: %+v", mRates, rts) + } +} + +func TestMongoSetGetTPDestinationRates(t *testing.T) { + if !*testLocal { + return + } + DR_ID := "DR_1" + dr := &utils.DestinationRate{DestinationId: "DST_1", RateId: "RT_1", RoundingMethod: "*up", RoundingDecimals: 4} + + eDrs := &utils.TPDestinationRate{TPid: utils.TEST_SQL, DestinationRateId: DR_ID, DestinationRates: []*utils.DestinationRate{dr}} + mdrs := APItoModelDestinationRate(eDrs) + if err := mongoDb.SetTpDestinationRates(mdrs); err != nil { + t.Error(err.Error()) + } + if drs, err := mongoDb.GetTpDestinationRates(utils.TEST_SQL, DR_ID, nil); err != nil { + t.Error(err.Error()) + } else if !modelEqual(mdrs[0], drs[0]) { + t.Errorf("Expecting: %+v, received: %+v", mdrs, drs) + } +} + +func TestMongoSetGetTPRatingPlans(t *testing.T) { + if !*testLocal { + return + } + RP_ID := "RP_1" + rbBinding := &utils.TPRatingPlanBinding{DestinationRatesId: "DR_1", TimingId: "TM_1", Weight: 10.0} + rp := &utils.TPRatingPlan{ + TPid: utils.TEST_SQL, + RatingPlanId: RP_ID, + RatingPlanBindings: []*utils.TPRatingPlanBinding{rbBinding}, + } + mrp := APItoModelRatingPlan(rp) + if err := mongoDb.SetTpRatingPlans(mrp); err != nil { + t.Error(err.Error()) + } + if drps, err := mongoDb.GetTpRatingPlans(utils.TEST_SQL, RP_ID, nil); err != nil { + t.Error(err.Error()) + } else if !modelEqual(mrp[0], drps[0]) { + t.Errorf("Expecting: %+v, received: %+v", mrp, drps) + } +} + +func TestMongoSetGetTPRatingProfiles(t *testing.T) { + if !*testLocal { + return + } + ras := []*utils.TPRatingActivation{&utils.TPRatingActivation{ActivationTime: "2012-01-01T00:00:00Z", RatingPlanId: "RP_1"}} + rp := &utils.TPRatingProfile{TPid: utils.TEST_SQL, LoadId: utils.TEST_SQL, Tenant: "cgrates.org", Category: "call", Direction: "*out", Subject: "*any", RatingPlanActivations: ras} + mrp := APItoModelRatingProfile(rp) + if err := mongoDb.SetTpRatingProfiles(mrp); err != nil { + t.Error(err.Error()) + } + if rps, err := mongoDb.GetTpRatingProfiles(&mrp[0]); err != nil { + t.Error(err.Error()) + } else if !modelEqual(mrp[0], rps[0]) { + t.Errorf("Expecting: %+v, received: %+v", mrp, rps) + } + +} + +func TestMongoSetGetTPSharedGroups(t *testing.T) { + if !*testLocal { + return + } + SG_ID := "SG_1" + tpSgs := &utils.TPSharedGroups{ + TPid: utils.TEST_SQL, + SharedGroupsId: SG_ID, + SharedGroups: []*utils.TPSharedGroup{ + &utils.TPSharedGroup{Account: "dan", Strategy: "*lowest_first", RatingSubject: "lowest_rates"}, + }, + } + mSgs := APItoModelSharedGroup(tpSgs) + if err := mongoDb.SetTpSharedGroups(mSgs); err != nil { + t.Error(err.Error()) + } + if sgs, err := mongoDb.GetTpSharedGroups(utils.TEST_SQL, SG_ID); err != nil { + t.Error(err.Error()) + } else if !modelEqual(mSgs[0], sgs[0]) { + t.Errorf("Expecting: %+v, received: %+v", mSgs, sgs) + } +} + +func TestMongoSetGetTPCdrStats(t *testing.T) { + if !*testLocal { + return + } + CS_ID := "CDRSTATS_1" + setCS := &utils.TPCdrStats{ + TPid: utils.TEST_SQL, + CdrStatsId: CS_ID, + CdrStats: []*utils.TPCdrStat{ + &utils.TPCdrStat{QueueLength: "10", TimeWindow: "10m", Metrics: "ASR", Tenants: "cgrates.org", Categories: "call"}, + }, + } + mcs := APItoModelCdrStat(setCS) + if err := mongoDb.SetTpCdrStats(mcs); err != nil { + t.Error(err.Error()) + } + if cs, err := mongoDb.GetTpCdrStats(utils.TEST_SQL, CS_ID); err != nil { + t.Error(err.Error()) + } else if !modelEqual(mcs[0], cs[0]) { + t.Errorf("Expecting: %+v, received: %+v", mcs, cs) + } +} + +func TestMongoSetGetTPDerivedChargers(t *testing.T) { + if !*testLocal { + return + } + dc := &utils.TPDerivedCharger{RunId: utils.DEFAULT_RUNID, ReqTypeField: "^" + utils.META_PREPAID, AccountField: "^rif", SubjectField: "^rif", + UsageField: "cgr_duration", SupplierField: "^supplier1"} + dcs := &utils.TPDerivedChargers{TPid: utils.TEST_SQL, Direction: utils.OUT, Tenant: "cgrates.org", Category: "call", Account: "dan", Subject: "dan", DerivedChargers: []*utils.TPDerivedCharger{dc}} + + mdcs := APItoModelDerivedCharger(dcs) + if err := mongoDb.SetTpDerivedChargers(mdcs); err != nil { + t.Error(err.Error()) + } + if rDCs, err := mongoDb.GetTpDerivedChargers(&mdcs[0]); err != nil { + t.Error(err.Error()) + } else if !modelEqual(mdcs[0], rDCs[0]) { + t.Errorf("Expecting: %+v, received: %+v", mdcs, rDCs) + } +} + +func TestMongoSetGetTPActions(t *testing.T) { + if !*testLocal { + return + } + ACTS_ID := "PREPAID_10" + acts := []*utils.TPAction{ + &utils.TPAction{Identifier: "*topup_reset", BalanceType: "*monetary", Direction: "*out", Units: 10, ExpiryTime: "*unlimited", + DestinationIds: "*any", BalanceWeight: 10, Weight: 10}} + tpActions := &utils.TPActions{TPid: utils.TEST_SQL, ActionsId: ACTS_ID, Actions: acts} + mas := APItoModelAction(tpActions) + if err := mongoDb.SetTpActions(mas); err != nil { + t.Error(err.Error()) + } + if rTpActs, err := mongoDb.GetTpActions(utils.TEST_SQL, ACTS_ID); err != nil { + t.Error(err.Error()) + } else if !modelEqual(mas[0], rTpActs[0]) { + t.Errorf("Expecting: %+v, received: %+v", mas, rTpActs) + } +} + +func TestMongoTPActionTimings(t *testing.T) { + if !*testLocal { + return + } + AP_ID := "AP_1" + ap := &utils.TPActionPlan{ + TPid: utils.TEST_SQL, + ActionPlanId: AP_ID, + ActionPlan: []*utils.TPActionTiming{&utils.TPActionTiming{ActionsId: "ACTS_1", TimingId: "TM_1", Weight: 10.0}}, + } + maps := APItoModelActionPlan(ap) + if err := mongoDb.SetTpActionPlans(maps); err != nil { + t.Error(err.Error()) + } + if rAP, err := mongoDb.GetTpActionPlans(utils.TEST_SQL, AP_ID); err != nil { + t.Error(err.Error()) + } else if !modelEqual(maps[0], rAP[0]) { + t.Errorf("Expecting: %+v, received: %+v", maps, rAP) + } +} + +func TestMongoSetGetTPActionTriggers(t *testing.T) { + if !*testLocal { + return + } + atrg := &utils.TPActionTrigger{ + Id: "MY_FIRST_ATGR", + BalanceType: "*monetary", + BalanceDirection: "*out", + ThresholdType: "*min_balance", + ThresholdValue: 2.0, + Recurrent: true, + BalanceDestinationIds: "*any", + Weight: 10.0, + ActionsId: "LOG_BALANCE", + } + atrgs := &utils.TPActionTriggers{ + TPid: utils.TEST_SQL, + ActionTriggersId: utils.TEST_SQL, + ActionTriggers: []*utils.TPActionTrigger{atrg}, + } + matrg := APItoModelActionTrigger(atrgs) + if err := mongoDb.SetTpActionTriggers(matrg); err != nil { + t.Error("Unexpected error: ", err.Error()) + } + if rcvMpAtrgs, err := mongoDb.GetTpActionTriggers(utils.TEST_SQL, utils.TEST_SQL); err != nil { + t.Error("Unexpected error: ", err.Error()) + } else if !modelEqual(matrg[0], rcvMpAtrgs[0]) { + t.Errorf("Expecting: %v, received: %v", matrg, rcvMpAtrgs) + } +} + +func TestMongoSetGetTpAccountActions(t *testing.T) { + if !*testLocal { + return + } + aa := &utils.TPAccountActions{TPid: utils.TEST_SQL, Tenant: "cgrates.org", Account: "1001", + Direction: "*out", ActionPlanId: "PREPAID_10", ActionTriggersId: "STANDARD_TRIGGERS"} + maa := APItoModelAccountAction(aa) + if err := mongoDb.SetTpAccountActions([]TpAccountAction{*maa}); err != nil { + t.Error(err.Error()) + } + if aas, err := mongoDb.GetTpAccountActions(maa); err != nil { + t.Error(err.Error()) + } else if !modelEqual(*maa, aas[0]) { + t.Errorf("Expecting: %+v, received: %+v", maa, aas) + } +} + +func TestMongoGetTPIds(t *testing.T) { + if !*testLocal { + return + } + eTPIds := []string{utils.TEST_SQL} + if tpIds, err := mongoDb.GetTpIds(); err != nil { + t.Error(err.Error()) + } else if !reflect.DeepEqual(eTPIds, tpIds) { + t.Errorf("Expecting: %+v, received: %+v", eTPIds, tpIds) + } +} + +func TestMongoRemoveTPData(t *testing.T) { + if !*testLocal { + return + } + // Create Timings + tm := &utils.ApierTPTiming{TPid: utils.TEST_SQL, TimingId: "ALWAYS", Time: "00:00:00"} + tms := APItoModelTiming(tm) + if err := mongoDb.SetTpTimings([]TpTiming{*tms}); err != nil { + t.Error(err.Error()) + } + if tmgs, err := mongoDb.GetTpTimings(utils.TEST_SQL, tm.TimingId); err != nil { + t.Error(err.Error()) + } else if len(tmgs) == 0 { + t.Error("Could not store TPTiming") + } + // Remove Timings + if err := mongoDb.RemTpData(utils.TBL_TP_TIMINGS, utils.TEST_SQL, map[string]string{"tag": tm.TimingId}); err != nil { + t.Error(err.Error()) + } + if tmgs, err := mongoDb.GetTpTimings(utils.TEST_SQL, tm.TimingId); err != nil { + t.Error(err) + } else if len(tmgs) != 0 { + t.Errorf("Timings should be empty, got instead: %+v", tmgs) + } + // Create RatingProfile + ras := []*utils.TPRatingActivation{&utils.TPRatingActivation{ActivationTime: "2012-01-01T00:00:00Z", RatingPlanId: "RETAIL1"}} + rp := &utils.TPRatingProfile{TPid: utils.TEST_SQL, LoadId: utils.TEST_SQL, Tenant: "cgrates.org", Category: "call", Direction: "*out", Subject: "*any", RatingPlanActivations: ras} + mrp := APItoModelRatingProfile(rp) + if err := mongoDb.SetTpRatingProfiles(mrp); err != nil { + t.Error(err.Error()) + } + if rps, err := mongoDb.GetTpRatingProfiles(&mrp[0]); err != nil { + t.Error(err.Error()) + } else if len(rps) == 0 { + t.Error("Could not store TPRatingProfile") + } + // Remove RatingProfile + if err := mongoDb.RemTpData(utils.TBL_TP_RATE_PROFILES, rp.TPid, map[string]string{"loadid": rp.LoadId, "direction": rp.Direction, "tenant": rp.Tenant, "category": rp.Category, "subject": rp.Subject}); err != nil { + t.Error(err.Error()) + } + if rps, err := mongoDb.GetTpRatingProfiles(&mrp[0]); err != nil { + t.Error(err) + } else if len(rps) != 0 { + t.Errorf("RatingProfiles different than 0: %+v", rps) + } + // Create AccountActions + aa := &utils.TPAccountActions{TPid: utils.TEST_SQL, LoadId: utils.TEST_SQL, Tenant: "cgrates.org", Account: "1001", + Direction: "*out", ActionPlanId: "PREPAID_10", ActionTriggersId: "STANDARD_TRIGGERS"} + maa := APItoModelAccountAction(aa) + if err := mongoDb.SetTpAccountActions([]TpAccountAction{*maa}); err != nil { + t.Error(err.Error()) + } + if aas, err := mongoDb.GetTpAccountActions(maa); err != nil { + t.Error(err.Error()) + } else if len(aas) == 0 { + t.Error("Could not create TPAccountActions") + } + // Remove AccountActions + if err := mongoDb.RemTpData(utils.TBL_TP_ACCOUNT_ACTIONS, aa.TPid, map[string]string{"loadid": aa.LoadId, "direction": aa.Direction, "tenant": aa.Tenant, "account": aa.Account}); err != nil { + t.Error(err.Error()) + } + if aas, err := mongoDb.GetTpAccountActions(maa); err != nil { + t.Error(err) + } else if len(aas) != 0 { + t.Errorf("Non empty account actions: %+v", aas) + } + // Create again so we can test complete TP removal + if err := mongoDb.SetTpTimings([]TpTiming{*tms}); err != nil { + t.Error(err.Error()) + } + if tmgs, err := mongoDb.GetTpTimings(utils.TEST_SQL, tm.TimingId); err != nil { + t.Error(err.Error()) + } else if len(tmgs) == 0 { + t.Error("Could not store TPTiming") + } + // Create RatingProfile + if err := mongoDb.SetTpRatingProfiles(mrp); err != nil { + t.Error(err.Error()) + } + if rps, err := mongoDb.GetTpRatingProfiles(&mrp[0]); err != nil { + t.Error(err.Error()) + } else if len(rps) == 0 { + t.Error("Could not store TPRatingProfile") + } + // Create AccountActions + if err := mongoDb.SetTpAccountActions([]TpAccountAction{*maa}); err != nil { + t.Error(err.Error()) + } + if aas, err := mongoDb.GetTpAccountActions(maa); err != nil { + t.Error(err.Error()) + } else if len(aas) == 0 { + t.Error("Could not create TPAccountActions") + } + // Remove TariffPlan completely + if err := mongoDb.RemTpData("", utils.TEST_SQL, nil); err != nil { + t.Error(err.Error()) + } + // Make sure we have removed it + if tms, err := mongoDb.GetTpTimings(utils.TEST_SQL, tm.TimingId); err != nil { + t.Error(err) + } else if len(tms) != 0 { + t.Errorf("Non empty timings: %+v", tms) + } + if rpfs, err := mongoDb.GetTpRatingProfiles(&mrp[0]); err != nil { + t.Error(err) + } else if len(rpfs) != 0 { + t.Errorf("Non empty rpfs: %+v", rpfs) + } + if aas, err := mongoDb.GetTpAccountActions(maa); err != nil { + t.Error(err) + } else if len(aas) != 0 { + t.Errorf("Non empty account actions: %+v", aas) + } +} + +func TestMongoSetCdr(t *testing.T) { + if !*testLocal { + return + } + cgrCdr1 := &CgrCdr{utils.TOR: utils.VOICE, utils.ACCID: "aaa1", utils.CDRHOST: "192.168.1.1", utils.REQTYPE: utils.META_RATED, utils.DIRECTION: "*out", utils.TENANT: "cgrates.org", + utils.CATEGORY: "call", utils.ACCOUNT: "1001", utils.SUBJECT: "1001", utils.DESTINATION: "1002", utils.SETUP_TIME: "2013-11-08T08:42:20Z", + utils.ANSWER_TIME: "2013-11-08T08:42:26Z", utils.USAGE: "10s", utils.PDD: "4s", utils.SUPPLIER: "SUPPL1", "field_extr1": "val_extr1", "fieldextr2": "valextr2", utils.CDRSOURCE: utils.TEST_SQL} + + cgrCdr2 := &CgrCdr{utils.TOR: utils.VOICE, utils.ACCID: "aaa2", utils.CDRHOST: "192.168.1.1", utils.REQTYPE: utils.META_PREPAID, utils.DIRECTION: "*out", utils.TENANT: "cgrates.org", + utils.CATEGORY: "call", utils.ACCOUNT: "1001", utils.SUBJECT: "1001", utils.DESTINATION: "1002", utils.SETUP_TIME: "2013-11-08T08:42:22Z", + utils.ANSWER_TIME: "2013-11-08T08:42:26Z", utils.USAGE: "20", utils.PDD: "7s", utils.SUPPLIER: "SUPPL1", "field_extr1": "val_extr1", "fieldextr2": "valextr2", "cdrsource": utils.TEST_SQL} + + cgrCdr3 := &CgrCdr{utils.TOR: utils.VOICE, utils.ACCID: "aaa3", utils.CDRHOST: "192.168.1.1", utils.REQTYPE: utils.META_RATED, utils.DIRECTION: "*out", utils.TENANT: "cgrates.org", + utils.CATEGORY: "premium_call", utils.ACCOUNT: "1002", utils.SUBJECT: "1002", utils.DESTINATION: "1001", utils.SETUP_TIME: "2013-11-07T08:42:24Z", + utils.ANSWER_TIME: "2013-11-07T08:42:26Z", utils.USAGE: "60s", utils.PDD: "4s", utils.SUPPLIER: "SUPPL1", "field_extr1": "val_extr1", "fieldextr2": "valextr2", "cdrsource": utils.TEST_SQL} + + cgrCdr4 := &CgrCdr{utils.TOR: utils.VOICE, utils.ACCID: "aaa4", utils.CDRHOST: "192.168.1.2", utils.REQTYPE: utils.META_PSEUDOPREPAID, utils.DIRECTION: "*out", utils.TENANT: "itsyscom.com", + utils.CATEGORY: "call", utils.ACCOUNT: "1001", utils.SUBJECT: "1001", utils.DESTINATION: "+4986517174964", utils.SETUP_TIME: "2013-11-07T08:42:21Z", + utils.ANSWER_TIME: "2013-11-07T08:42:26Z", utils.USAGE: "1m2s", utils.PDD: "4s", utils.SUPPLIER: "SUPPL1", "field_extr1": "val_extr1", "fieldextr2": "valextr2", "cdrsource": utils.TEST_SQL} + + cgrCdr5 := &CgrCdr{utils.TOR: utils.VOICE, utils.ACCID: "aaa5", utils.CDRHOST: "192.168.1.2", utils.REQTYPE: utils.META_POSTPAID, utils.DIRECTION: "*out", utils.TENANT: "itsyscom.com", + utils.CATEGORY: "call", utils.ACCOUNT: "1002", utils.SUBJECT: "1002", utils.DESTINATION: "+4986517174963", utils.SETUP_TIME: "2013-11-07T08:42:25Z", + utils.ANSWER_TIME: "2013-11-07T08:42:26Z", utils.USAGE: "15s", utils.PDD: "7s", utils.SUPPLIER: "SUPPL1", "field_extr1": "val_extr1", "fieldextr2": "valextr2", "cdrsource": utils.TEST_SQL} + + for _, cdr := range []*CgrCdr{cgrCdr1, cgrCdr2, cgrCdr3, cgrCdr4, cgrCdr5} { + if err := mongoDb.SetCdr(cdr.AsStoredCdr("")); err != nil { + t.Error(err.Error()) + } + } + strCdr1 := &StoredCdr{TOR: utils.VOICE, AccId: "bbb1", CdrHost: "192.168.1.1", CdrSource: "UNKNOWN", ReqType: utils.META_RATED, + Direction: "*out", Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", + SetupTime: time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC), AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), + Usage: time.Duration(10) * time.Second, Pdd: time.Duration(3) * time.Second, Supplier: "SUPPL1", + ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, + MediationRunId: utils.DEFAULT_RUNID, Cost: 1.201} + strCdr1.CgrId = utils.Sha1(strCdr1.AccId, strCdr1.SetupTime.String()) + strCdr2 := &StoredCdr{TOR: utils.VOICE, AccId: "bbb2", CdrHost: "192.168.1.2", CdrSource: "UNKNOWN2", ReqType: utils.META_PREPAID, + Direction: "*out", Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", + SetupTime: time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC), AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), + Usage: time.Duration(12) * time.Second, Pdd: time.Duration(4) * time.Second, Supplier: "SUPPL1", + ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, + MediationRunId: utils.DEFAULT_RUNID, Cost: 0.201} + strCdr2.CgrId = utils.Sha1(strCdr2.AccId, strCdr2.SetupTime.String()) + strCdr3 := &StoredCdr{TOR: utils.VOICE, AccId: "bbb3", CdrHost: "192.168.1.1", CdrSource: utils.TEST_SQL, ReqType: utils.META_RATED, + Direction: "*out", Tenant: "itsyscom.com", Category: "call", Account: "1002", Subject: "1000", Destination: "+4986517174963", + SetupTime: time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC), AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), + Usage: time.Duration(10) * time.Second, Pdd: time.Duration(2) * time.Second, Supplier: "SUPPL1", + ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, + MediationRunId: utils.DEFAULT_RUNID, Cost: 1.201} + strCdr3.CgrId = utils.Sha1(strCdr3.AccId, strCdr3.SetupTime.String()) + + for _, cdr := range []*StoredCdr{strCdr1, strCdr2, strCdr3} { + if err := mongoDb.SetCdr(cdr); err != nil { + t.Error(err.Error()) + } + } +} + +func TestMongoSetRatedCdr(t *testing.T) { + if !*testLocal { + return + } + strCdr1 := &StoredCdr{TOR: utils.VOICE, AccId: "bbb1", CdrHost: "192.168.1.1", CdrSource: "UNKNOWN", ReqType: utils.META_RATED, + Direction: "*out", Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", + SetupTime: time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC), AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), + Usage: time.Duration(10) * time.Second, Pdd: time.Duration(3) * time.Second, Supplier: "SUPPL1", + ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, + MediationRunId: utils.DEFAULT_RUNID, Cost: 1.201} + strCdr1.CgrId = utils.Sha1(strCdr1.AccId, strCdr1.SetupTime.String()) + strCdr2 := &StoredCdr{TOR: utils.VOICE, AccId: "bbb2", CdrHost: "192.168.1.2", CdrSource: "UNKNOWN", ReqType: utils.META_PREPAID, + Direction: "*out", Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", + SetupTime: time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC), AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), + Usage: time.Duration(12) * time.Second, Pdd: time.Duration(7) * time.Second, Supplier: "SUPPL1", + ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, + MediationRunId: utils.DEFAULT_RUNID, Cost: 0.201} + strCdr2.CgrId = utils.Sha1(strCdr2.AccId, strCdr2.SetupTime.String()) + strCdr3 := &StoredCdr{TOR: utils.VOICE, AccId: "bbb3", CdrHost: "192.168.1.1", CdrSource: utils.TEST_SQL, ReqType: utils.META_RATED, + Direction: "*out", Tenant: "itsyscom.com", Category: "call", Account: "1002", Subject: "1002", Destination: "+4986517174964", + SetupTime: time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC), AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), + Usage: time.Duration(10) * time.Second, Pdd: time.Duration(2) * time.Second, Supplier: "SUPPL1", + ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, + MediationRunId: "wholesale_run", Cost: 1.201} + strCdr3.CgrId = utils.Sha1(strCdr3.AccId, strCdr3.SetupTime.String()) + + for _, cdr := range []*StoredCdr{strCdr1, strCdr2, strCdr3} { + if err := mongoDb.SetRatedCdr(cdr); err != nil { + t.Error(err.Error()) + } + } +} + +func TestMongoCallCost(t *testing.T) { + if !*testLocal { + return + } + cgrId := utils.Sha1("bbb1", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()) + cc := &CallCost{ + Direction: "*out", + Category: "call", + Tenant: "cgrates.org", + Subject: "91001", + Account: "8001", + Destination: "1002", + TOR: utils.VOICE, + 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), + }, + }, + } + if err := mongoDb.LogCallCost(cgrId, utils.TEST_SQL, utils.DEFAULT_RUNID, cc); err != nil { + t.Error(err.Error()) + } + if ccRcv, err := mongoDb.GetCallCostLog(cgrId, utils.TEST_SQL, utils.DEFAULT_RUNID); err != nil { + t.Error(err.Error()) + } else if !reflect.DeepEqual(cc.Timespans[0].TimeStart, ccRcv.Timespans[0].TimeStart) { + t.Errorf("Expecting call cost:\n%+v,\nreceived:\n%+v", cc.Timespans[0], ccRcv.Timespans[0]) + } + // UPDATE test here + cc.Category = "premium_call" + if err := mongoDb.LogCallCost(cgrId, utils.TEST_SQL, utils.DEFAULT_RUNID, cc); err != nil { + t.Error(err.Error()) + } + if ccRcv, err := mongoDb.GetCallCostLog(cgrId, utils.TEST_SQL, utils.DEFAULT_RUNID); err != nil { + t.Error(err.Error()) + } else if !reflect.DeepEqual(cc, ccRcv) { + t.Errorf("Expecting call cost: %v, received: %v", cc, ccRcv) + } +} + +func TestMongoGetStoredCdrs(t *testing.T) { + if !*testLocal { + return + } + var timeStart, timeEnd time.Time + // All CDRs, no filter + if storedCdrs, _, err := mongoDb.GetStoredCdrs(new(utils.CdrsFilter)); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 8 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Count ALL + if storedCdrs, count, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{Count: true}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 0 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } else if count != 8 { + t.Error("Unexpected count of StoredCdrs returned: ", count) + } + // Limit 5 + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{Paginator: utils.Paginator{Limit: utils.IntPointer(5), Offset: utils.IntPointer(0)}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 5 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Offset 5 + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{Paginator: utils.Paginator{Limit: utils.IntPointer(5), Offset: utils.IntPointer(0)}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 5 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Offset with limit 2 + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{Paginator: utils.Paginator{Limit: utils.IntPointer(2), Offset: utils.IntPointer(5)}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 2 { + t.Error("Unexpected number of StoredCdrs returned: ", len(storedCdrs)) + } + // Filter on cgrids + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{CgrIds: []string{utils.Sha1("bbb1", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()), + utils.Sha1("bbb2", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String())}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 2 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Count on CGRIDS + if _, count, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{CgrIds: []string{utils.Sha1("bbb1", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()), + utils.Sha1("bbb2", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String())}, Count: true}); err != nil { + t.Error(err.Error()) + } else if count != 2 { + t.Error("Unexpected count of StoredCdrs returned: ", count) + } + // Filter on cgrids plus reqType + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{CgrIds: []string{utils.Sha1("bbb1", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()), + utils.Sha1("bbb2", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String())}, ReqTypes: []string{utils.META_PREPAID}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 1 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Count on multiple filter + if _, count, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{CgrIds: []string{utils.Sha1("bbb1", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()), + utils.Sha1("bbb2", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String())}, ReqTypes: []string{utils.META_PREPAID}, Count: true}); err != nil { + t.Error(err.Error()) + } else if count != 1 { + t.Error("Unexpected count of StoredCdrs returned: ", count) + } + // Filter on runId + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{RunIds: []string{utils.DEFAULT_RUNID}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 2 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on TOR + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{Tors: []string{utils.SMS}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 0 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on multiple TOR + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{Tors: []string{utils.SMS, utils.VOICE}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 8 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on cdrHost + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{CdrHosts: []string{"192.168.1.2"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 3 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on multiple cdrHost + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{CdrHosts: []string{"192.168.1.1", "192.168.1.2"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 8 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on cdrSource + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{CdrSources: []string{"UNKNOWN"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 1 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on multiple cdrSource + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{CdrSources: []string{"UNKNOWN", "UNKNOWN2"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 2 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on reqType + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{ReqTypes: []string{utils.META_PREPAID}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 2 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on multiple reqType + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{ReqTypes: []string{utils.META_PREPAID, utils.META_PSEUDOPREPAID}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 3 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on direction + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{Directions: []string{"*out"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 8 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on tenant + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{Tenants: []string{"itsyscom.com"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 3 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on multiple tenants + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{Tenants: []string{"itsyscom.com", "cgrates.org"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 8 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on category + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{Categories: []string{"premium_call"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 1 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on multiple categories + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{Categories: []string{"premium_call", "call"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 8 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on account + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{Accounts: []string{"1002"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 3 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on multiple account + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{Accounts: []string{"1001", "1002"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 8 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on subject + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{Subjects: []string{"1000"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 1 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on multiple subject + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{Subjects: []string{"1000", "1002"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 3 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on destPrefix + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{DestPrefixes: []string{"+498651"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 3 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on multiple destPrefixes + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{DestPrefixes: []string{"1001", "+498651"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 4 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on ratedAccount + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{RatedAccounts: []string{"8001"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 1 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on ratedSubject + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{RatedSubjects: []string{"91001"}}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 1 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on ignoreRated + var orderIdStart, orderIdEnd int64 // Capture also orderIds for the next test + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{MaxCost: utils.Float64Pointer(0.0)}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 5 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } else { + for _, cdr := range storedCdrs { + if cdr.OrderId < orderIdStart { + orderIdStart = cdr.OrderId + } + if cdr.OrderId > orderIdEnd { + orderIdEnd = cdr.OrderId + } + } + } + // Filter on orderIdStart + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{OrderIdStart: orderIdStart}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 8 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on orderIdStart and orderIdEnd + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{OrderIdStart: orderIdStart, OrderIdEnd: orderIdEnd}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 4 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on timeStart + timeStart = time.Date(2013, 11, 8, 8, 0, 0, 0, time.UTC) + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{AnswerTimeStart: &timeStart}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 5 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on timeStart and timeEnd + timeEnd = time.Date(2013, 12, 1, 8, 0, 0, 0, time.UTC) + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{AnswerTimeStart: &timeStart, AnswerTimeEnd: &timeEnd}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 2 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on minPdd + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{MinPdd: utils.Float64Pointer(3)}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 7 { + t.Error("Unexpected number of StoredCdrs returned: ", len(storedCdrs)) + } + // Filter on maxPdd + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{MaxPdd: utils.Float64Pointer(3)}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 1 { + t.Error("Unexpected number of StoredCdrs returned: ", len(storedCdrs)) + } + // Filter on minPdd, maxPdd + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{MinPdd: utils.Float64Pointer(3), MaxPdd: utils.Float64Pointer(5)}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 5 { + t.Error("Unexpected number of StoredCdrs returned: ", len(storedCdrs)) + } + // Combined filter + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{ReqTypes: []string{utils.META_RATED}, AnswerTimeStart: &timeStart, AnswerTimeEnd: &timeEnd}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 1 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + // Filter on ignoreDerived + if storedCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{AnswerTimeStart: &timeStart, AnswerTimeEnd: &timeEnd, FilterOnRated: true}); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 0 { // ToDo: Recheck this value + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } +} + +func TestMongoRemStoredCdrs(t *testing.T) { + if !*testLocal { + return + } + cgrIdB1 := utils.Sha1("bbb1", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()) + if err := mongoDb.RemStoredCdrs([]string{cgrIdB1}); err != nil { + t.Error(err.Error()) + } + if storedCdrs, _, err := mongoDb.GetStoredCdrs(new(utils.CdrsFilter)); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 7 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } + tm, _ := utils.ParseTimeDetectLayout("2013-11-08T08:42:20Z", "") + cgrIdA1 := utils.Sha1("aaa1", tm.String()) + tm, _ = utils.ParseTimeDetectLayout("2013-11-08T08:42:22Z", "") + cgrIdA2 := utils.Sha1("aaa2", tm.String()) + tm, _ = utils.ParseTimeDetectLayout("2013-11-07T08:42:24Z", "") + cgrIdA3 := utils.Sha1("aaa3", tm.String()) + tm, _ = utils.ParseTimeDetectLayout("2013-11-07T08:42:21Z", "") + cgrIdA4 := utils.Sha1("aaa4", tm.String()) + tm, _ = utils.ParseTimeDetectLayout("2013-11-07T08:42:25Z", "") + cgrIdA5 := utils.Sha1("aaa5", tm.String()) + cgrIdB2 := utils.Sha1("bbb2", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()) + cgrIdB3 := utils.Sha1("bbb3", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()) + if err := mongoDb.RemStoredCdrs([]string{cgrIdA1, cgrIdA2, cgrIdA3, cgrIdA4, cgrIdA5, + cgrIdB2, cgrIdB3}); err != nil { + t.Error(err.Error()) + } + if storedCdrs, _, err := mongoDb.GetStoredCdrs(new(utils.CdrsFilter)); err != nil { + t.Error(err.Error()) + } else if len(storedCdrs) != 0 { + t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs) + } +} + +// Make sure that what we get is what we set +func TestMongoStoreRestoreCdr(t *testing.T) { + if !*testLocal { + return + } + strCdr := &StoredCdr{TOR: utils.VOICE, AccId: "ccc1", CdrHost: "192.168.1.1", CdrSource: "TEST_CDR", ReqType: utils.META_RATED, + Direction: "*out", Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", + SetupTime: time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC), AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), + Usage: time.Duration(10) * time.Second, Pdd: time.Duration(3) * time.Second, Supplier: "SUPPL1", + ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, + MediationRunId: utils.DEFAULT_RUNID, Cost: 1.201} + strCdr.CgrId = utils.Sha1(strCdr.AccId, strCdr.SetupTime.String()) + if err := mongoDb.SetCdr(strCdr); err != nil { + t.Error(err.Error()) + } + if err := mongoDb.SetRatedCdr(strCdr); err != nil { + t.Error(err.Error()) + } + // Check RawCdr + if rcvCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{CgrIds: []string{strCdr.CgrId}}); err != nil { + t.Error(err.Error()) + } else if len(rcvCdrs) != 1 { + t.Errorf("Unexpected cdrs returned: %+v", rcvCdrs) + } else { + rcvCdr := rcvCdrs[0] + if strCdr.CgrId != rcvCdr.CgrId || + strCdr.TOR != rcvCdr.TOR || + strCdr.AccId != rcvCdr.AccId || + strCdr.CdrHost != rcvCdr.CdrHost || + strCdr.ReqType != rcvCdr.ReqType || + strCdr.Direction != rcvCdr.Direction || + strCdr.Tenant != rcvCdr.Tenant || + strCdr.Category != rcvCdr.Category || + strCdr.Account != rcvCdr.Account || + strCdr.Subject != rcvCdr.Subject || + strCdr.Destination != rcvCdr.Destination || + !strCdr.SetupTime.Equal(rcvCdr.SetupTime) || + !strCdr.AnswerTime.Equal(rcvCdr.AnswerTime) || + strCdr.Usage != rcvCdr.Usage || + strCdr.Pdd != rcvCdr.Pdd || + strCdr.Supplier != rcvCdr.Supplier || + strCdr.DisconnectCause != rcvCdr.DisconnectCause || + !reflect.DeepEqual(strCdr.ExtraFields, rcvCdr.ExtraFields) { + t.Errorf("Expecting: %+v, received: %+v", strCdr, rcvCdrs[0]) + } + } + // Check RatedCdr + if rcvCdrs, _, err := mongoDb.GetStoredCdrs(&utils.CdrsFilter{CgrIds: []string{strCdr.CgrId}, FilterOnRated: true}); err != nil { + t.Error(err.Error()) + } else if len(rcvCdrs) != 1 { + t.Errorf("Unexpected cdrs returned: %+v", rcvCdrs) + } else { + rcvCdr := rcvCdrs[0] + if strCdr.CgrId != rcvCdr.CgrId || + strCdr.TOR != rcvCdr.TOR || + strCdr.AccId != rcvCdr.AccId || + strCdr.CdrHost != rcvCdr.CdrHost || + strCdr.ReqType != rcvCdr.ReqType || + strCdr.Direction != rcvCdr.Direction || + strCdr.Tenant != rcvCdr.Tenant || + strCdr.Category != rcvCdr.Category || + strCdr.Account != rcvCdr.Account || + strCdr.Subject != rcvCdr.Subject || + strCdr.Destination != rcvCdr.Destination || + //!strCdr.SetupTime.Equal(rcvCdr.SetupTime) || // FixMe + //!strCdr.AnswerTime.Equal(rcvCdr.AnswerTime) || // FixMe + strCdr.Usage != rcvCdr.Usage || + strCdr.Pdd != rcvCdr.Pdd || + strCdr.Supplier != rcvCdr.Supplier || + strCdr.DisconnectCause != rcvCdr.DisconnectCause || + strCdr.Cost != rcvCdr.Cost || + !reflect.DeepEqual(strCdr.ExtraFields, rcvCdr.ExtraFields) { + t.Errorf("Expecting: %+v, received: %+v", strCdr, rcvCdrs[0]) + } + } +} diff --git a/engine/storage_mongo_tp.go b/engine/storage_mongo_tp.go index 77a5af084..921481e7a 100644 --- a/engine/storage_mongo_tp.go +++ b/engine/storage_mongo_tp.go @@ -360,13 +360,17 @@ func (ms *MongoStorage) RemTpData(table, tpid string, args map[string]string) er } for _, col := range cols { if strings.HasPrefix(col, "tp_") { - if err := ms.db.C(col).Remove(bson.M{"tpid": tpid}); err != nil { + if _, err := ms.db.C(col).RemoveAll(bson.M{"tpid": tpid}); err != nil { return err } } } + return nil } // Remove from a single table + if args == nil { + args = make(map[string]string) + } args["tpid"] = tpid return ms.db.C(table).Remove(args) } @@ -698,12 +702,14 @@ func (ms *MongoStorage) LogActionPlan(source string, at *ActionPlan, as Actions) } func (ms *MongoStorage) LogCallCost(cgrid, source, runid string, cc *CallCost) error { - return ms.db.C(colLogCC).Insert(&struct { + s := &struct { Id string `bson:"id,omitempty"` Source string Runid string `bson:"runid,omitempty"` CallCost *CallCost - }{cgrid, source, runid, cc}) + }{cgrid, source, runid, cc} + _, err := ms.db.C(colLogCC).Upsert(bson.M{"id": s.Id, "source": s.Source, "runid": s.Runid}, s) + return err } func (ms *MongoStorage) GetCallCostLog(cgrid, source, runid string) (cc *CallCost, err error) { @@ -713,17 +719,19 @@ func (ms *MongoStorage) GetCallCostLog(cgrid, source, runid string) (cc *CallCos Runid string `bson:"runid,omitempty"` CallCost *CallCost }{} - err = ms.db.C(colLogCC).Find(bson.M{"_id": cgrid, "source": source}).One(result) + err = ms.db.C(colLogCC).Find(bson.M{"id": cgrid, "source": source, "runid": runid}).One(result) cc = result.CallCost return } func (ms *MongoStorage) SetCdr(cdr *StoredCdr) error { - return ms.db.C(colCdrs).Insert(cdr) + _, err := ms.db.C(colCdrs).Upsert(bson.M{"cgrid": cdr.CgrId}, cdr) + return err } func (ms *MongoStorage) SetRatedCdr(storedCdr *StoredCdr) error { - return ms.db.C(colRatedCdrs).Insert(storedCdr) + _, err := ms.db.C(colRatedCdrs).Upsert(bson.M{"cgrid": storedCdr.CgrId}, storedCdr) + return err } // Remove CDR data out of all CDR tables based on their cgrid diff --git a/engine/storage_mysql.go b/engine/storage_mysql.go index 0ee327a0f..539a242e1 100644 --- a/engine/storage_mysql.go +++ b/engine/storage_mysql.go @@ -28,7 +28,7 @@ import ( "github.com/jinzhu/gorm" ) -func NewMySQLStorage(host, port, name, user, password string, maxConn, maxIdleConn int) (Storage, error) { +func NewMySQLStorage(host, port, name, user, password string, maxConn, maxIdleConn int) (*MySQLStorage, error) { connectString := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&loc=Local&parseTime=true", user, password, host, port, name) db, err := gorm.Open("mysql", connectString) if err != nil { diff --git a/engine/storage_mysql_local_test.go b/engine/storage_mysql_local_test.go index 5f8a974e5..6000d307d 100644 --- a/engine/storage_mysql_local_test.go +++ b/engine/storage_mysql_local_test.go @@ -36,12 +36,11 @@ func TestMySQLCreateTables(t *testing.T) { return } cgrConfig, _ := config.NewDefaultCGRConfig() - if d, err := NewMySQLStorage(cgrConfig.StorDBHost, cgrConfig.StorDBPort, cgrConfig.StorDBName, cgrConfig.StorDBUser, cgrConfig.StorDBPass, + var err error + if mysqlDb, err = NewMySQLStorage(cgrConfig.StorDBHost, cgrConfig.StorDBPort, cgrConfig.StorDBName, cgrConfig.StorDBUser, cgrConfig.StorDBPass, cgrConfig.StorDBMaxOpenConns, cgrConfig.StorDBMaxIdleConns); err != nil { t.Error("Error on opening database connection: ", err) return - } else { - mysqlDb = d.(*MySQLStorage) } for _, scriptName := range []string{utils.CREATE_CDRS_TABLES_SQL, utils.CREATE_TARIFFPLAN_TABLES_SQL} { if err := mysqlDb.CreateTablesFromScript(path.Join(*dataDir, "storage", utils.MYSQL, scriptName)); err != nil { diff --git a/engine/storage_postgres.go b/engine/storage_postgres.go index dda045f96..8641e828b 100644 --- a/engine/storage_postgres.go +++ b/engine/storage_postgres.go @@ -34,7 +34,7 @@ type PostgresStorage struct { *SQLStorage } -func NewPostgresStorage(host, port, name, user, password string, maxConn, maxIdleConn int) (Storage, error) { +func NewPostgresStorage(host, port, name, user, password string, maxConn, maxIdleConn int) (*PostgresStorage, error) { connectString := fmt.Sprintf("host=%s port=%s dbname=%s user=%s password=%s sslmode=disable", host, port, name, user, password) db, err := gorm.Open("postgres", connectString) if err != nil { diff --git a/engine/storage_psql_local_test.go b/engine/storage_psql_local_test.go index 0388111ed..765639dee 100644 --- a/engine/storage_psql_local_test.go +++ b/engine/storage_psql_local_test.go @@ -36,12 +36,11 @@ func TestPSQLCreateTables(t *testing.T) { return } cgrConfig, _ := config.NewDefaultCGRConfig() - if d, err := NewPostgresStorage("localhost", "5432", cgrConfig.StorDBName, cgrConfig.StorDBUser, cgrConfig.StorDBPass, + var err error + if psqlDb, err = NewPostgresStorage("localhost", "5432", cgrConfig.StorDBName, cgrConfig.StorDBUser, cgrConfig.StorDBPass, cgrConfig.StorDBMaxOpenConns, cgrConfig.StorDBMaxIdleConns); err != nil { t.Error("Error on opening database connection: ", err) return - } else { - psqlDb = d.(*PostgresStorage) } for _, scriptName := range []string{utils.CREATE_CDRS_TABLES_SQL, utils.CREATE_TARIFFPLAN_TABLES_SQL} { if err := psqlDb.CreateTablesFromScript(path.Join(*dataDir, "storage", utils.POSTGRES, scriptName)); err != nil { diff --git a/engine/storage_utils.go b/engine/storage_utils.go index dc19abe43..ee2293d7a 100644 --- a/engine/storage_utils.go +++ b/engine/storage_utils.go @@ -51,7 +51,7 @@ func ConfigureRatingStorage(db_type, host, port, name, user, pass, marshaler str } func ConfigureAccountingStorage(db_type, host, port, name, user, pass, marshaler string) (db AccountingStorage, err error) { - var d Storage + var d AccountingStorage switch db_type { case utils.REDIS: var db_nb int @@ -73,11 +73,11 @@ func ConfigureAccountingStorage(db_type, host, port, name, user, pass, marshaler if err != nil { return nil, err } - return d.(AccountingStorage), nil + return d, nil } func ConfigureLogStorage(db_type, host, port, name, user, pass, marshaler string, maxConn, maxIdleConn int) (db LogStorage, err error) { - var d Storage + var d LogStorage switch db_type { /* case utils.REDIS: @@ -104,11 +104,11 @@ func ConfigureLogStorage(db_type, host, port, name, user, pass, marshaler string if err != nil { return nil, err } - return d.(LogStorage), nil + return d, nil } func ConfigureLoadStorage(db_type, host, port, name, user, pass, marshaler string, maxConn, maxIdleConn int) (db LoadStorage, err error) { - var d Storage + var d LoadStorage switch db_type { case utils.POSTGRES: d, err = NewPostgresStorage(host, port, name, user, pass, maxConn, maxIdleConn) @@ -122,11 +122,11 @@ func ConfigureLoadStorage(db_type, host, port, name, user, pass, marshaler strin if err != nil { return nil, err } - return d.(LoadStorage), nil + return d, nil } func ConfigureCdrStorage(db_type, host, port, name, user, pass string, maxConn, maxIdleConn int) (db CdrStorage, err error) { - var d Storage + var d CdrStorage switch db_type { case utils.POSTGRES: d, err = NewPostgresStorage(host, port, name, user, pass, maxConn, maxIdleConn) @@ -140,5 +140,5 @@ func ConfigureCdrStorage(db_type, host, port, name, user, pass string, maxConn, if err != nil { return nil, err } - return d.(CdrStorage), nil + return d, nil } diff --git a/general_tests/multiplecdrc_local_test.go b/general_tests/multiplecdrc_local_test.go index 55624b294..f651e2a7c 100644 --- a/general_tests/multiplecdrc_local_test.go +++ b/general_tests/multiplecdrc_local_test.go @@ -84,11 +84,9 @@ func TestEmptyTables(t *testing.T) { if *storDbType != utils.MYSQL { t.Fatal("Unsupported storDbType") } - var mysql *engine.MySQLStorage - if d, err := engine.NewMySQLStorage(cfg.StorDBHost, cfg.StorDBPort, cfg.StorDBName, cfg.StorDBUser, cfg.StorDBPass, cfg.StorDBMaxOpenConns, cfg.StorDBMaxIdleConns); err != nil { + mysql, err := engine.NewMySQLStorage(cfg.StorDBHost, cfg.StorDBPort, cfg.StorDBName, cfg.StorDBUser, cfg.StorDBPass, cfg.StorDBMaxOpenConns, cfg.StorDBMaxIdleConns) + if err != nil { t.Fatal("Error on opening database connection: ", err) - } else { - mysql = d.(*engine.MySQLStorage) } if err := mysql.CreateTablesFromScript(path.Join(*dataDir, "storage", *storDbType, utils.CREATE_CDRS_TABLES_SQL)); err != nil { t.Fatal("Error on mysql creation: ", err.Error())