From 583b53c1437f3a9f80c47e9605d4fc9aad620646 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Fri, 29 Jan 2016 10:52:59 +0200 Subject: [PATCH] moved test data from tut and renamed prepaid1cent --- apier/v1/apier_local_test.go | 4 +- apier/v1/triggers.go | 65 ------------------- .../AccountActions.csv | 1 + .../ActionPlans.csv | 1 + .../ActionTriggers.csv | 0 .../{prepaid1centpsec => testtp}/Actions.csv | 1 + .../{prepaid1centpsec => testtp}/Aliases.csv | 0 .../{prepaid1centpsec => testtp}/CdrStats.csv | 0 .../DerivedChargers.csv | 0 .../DestinationRates.csv | 0 .../Destinations.csv | 0 .../{prepaid1centpsec => testtp}/LcrRules.csv | 0 .../{prepaid1centpsec => testtp}/README.md | 0 .../{prepaid1centpsec => testtp}/Rates.csv | 0 .../RatingPlans.csv | 0 .../RatingProfiles.csv | 0 .../SharedGroups.csv | 0 .../{prepaid1centpsec => testtp}/Timings.csv | 2 +- .../{prepaid1centpsec => testtp}/Users.csv | 0 data/tariffplans/tutorial/AccountActions.csv | 1 - data/tariffplans/tutorial/ActionPlans.csv | 1 - data/tariffplans/tutorial/Actions.csv | 1 - data/tariffplans/tutorial/Timings.csv | 3 +- engine/loader_local_test.go | 2 +- general_tests/multiplecdrc_local_test.go | 2 +- 25 files changed, 9 insertions(+), 75 deletions(-) rename data/tariffplans/{prepaid1centpsec => testtp}/AccountActions.csv (91%) rename data/tariffplans/{prepaid1centpsec => testtp}/ActionPlans.csv (76%) rename data/tariffplans/{prepaid1centpsec => testtp}/ActionTriggers.csv (100%) rename data/tariffplans/{prepaid1centpsec => testtp}/Actions.csv (88%) rename data/tariffplans/{prepaid1centpsec => testtp}/Aliases.csv (100%) rename data/tariffplans/{prepaid1centpsec => testtp}/CdrStats.csv (100%) rename data/tariffplans/{prepaid1centpsec => testtp}/DerivedChargers.csv (100%) rename data/tariffplans/{prepaid1centpsec => testtp}/DestinationRates.csv (100%) rename data/tariffplans/{prepaid1centpsec => testtp}/Destinations.csv (100%) rename data/tariffplans/{prepaid1centpsec => testtp}/LcrRules.csv (100%) rename data/tariffplans/{prepaid1centpsec => testtp}/README.md (100%) rename data/tariffplans/{prepaid1centpsec => testtp}/Rates.csv (100%) rename data/tariffplans/{prepaid1centpsec => testtp}/RatingPlans.csv (100%) rename data/tariffplans/{prepaid1centpsec => testtp}/RatingProfiles.csv (100%) rename data/tariffplans/{prepaid1centpsec => testtp}/SharedGroups.csv (100%) rename data/tariffplans/{prepaid1centpsec => testtp}/Timings.csv (71%) rename data/tariffplans/{prepaid1centpsec => testtp}/Users.csv (100%) diff --git a/apier/v1/apier_local_test.go b/apier/v1/apier_local_test.go index 36b4fc86e..10ced4435 100644 --- a/apier/v1/apier_local_test.go +++ b/apier/v1/apier_local_test.go @@ -52,7 +52,7 @@ README: * Flush tables in storDb to start clean. * Start engine with default configuration and give it some time to listen (here caching can slow down, hence the command argument parameter). * Connect rpc client depending on encoding defined in configuration. - * Execute remote Apis and test their replies(follow prepaid1cent scenario so we can test load in dataDb also). + * Execute remote Apis and test their replies(follow testtp scenario so we can test load in dataDb also). */ var cfgPath string @@ -1226,7 +1226,7 @@ func TestApierLoadTariffPlanFromFolder(t *testing.T) { t.Error(err) } // Simple test that command is executed without errors - attrs = &utils.AttrLoadTpFromFolder{FolderPath: path.Join(*dataDir, "tariffplans", "prepaid1centpsec")} + attrs = &utils.AttrLoadTpFromFolder{FolderPath: path.Join(*dataDir, "tariffplans", "testtp")} if err := rater.Call("ApierV1.LoadTariffPlanFromFolder", attrs, &reply); err != nil { t.Error("Got error on ApierV1.LoadTariffPlanFromFolder: ", err.Error()) } else if reply != "OK" { diff --git a/apier/v1/triggers.go b/apier/v1/triggers.go index 1ea6a0fae..59791e49b 100644 --- a/apier/v1/triggers.go +++ b/apier/v1/triggers.go @@ -5,71 +5,6 @@ import ( "github.com/cgrates/cgrates/utils" ) -type AttrAddActionTrigger struct { - ActionTriggersId string - ActionTriggersUniqueId string - Tenant string - Account string - ThresholdType string - ThresholdValue float64 - BalanceId string - BalanceType string - BalanceDirection string - BalanceDestinationIds string - BalanceRatingSubject string //ToDo - BalanceWeight float64 - BalanceExpiryTime string - BalanceSharedGroup string //ToDo - Weight float64 - ActionsId string -} - -func (self *ApierV1) AddTriggeredAction(attr AttrAddActionTrigger, reply *string) error { - if attr.BalanceDirection == "" { - attr.BalanceDirection = utils.OUT - } - balExpiryTime, err := utils.ParseTimeDetectLayout(attr.BalanceExpiryTime, self.Config.DefaultTimezone) - if err != nil { - return utils.NewErrServerError(err) - } - at := &engine.ActionTrigger{ - ID: attr.ActionTriggersId, - UniqueID: attr.ActionTriggersUniqueId, - ThresholdType: attr.ThresholdType, - ThresholdValue: attr.ThresholdValue, - BalanceId: attr.BalanceId, - BalanceType: attr.BalanceType, - BalanceDirections: utils.ParseStringMap(attr.BalanceDirection), - BalanceDestinationIds: utils.ParseStringMap(attr.BalanceDestinationIds), - BalanceWeight: attr.BalanceWeight, - BalanceExpirationDate: balExpiryTime, - Weight: attr.Weight, - ActionsId: attr.ActionsId, - Executed: false, - } - - tag := utils.AccountKey(attr.Tenant, attr.Account) - _, err = engine.Guardian.Guard(func() (interface{}, error) { - userBalance, err := self.AccountDb.GetAccount(tag) - if err != nil { - return 0, err - } - - userBalance.ActionTriggers = append(userBalance.ActionTriggers, at) - - if err = self.AccountDb.SetAccount(userBalance); err != nil { - return 0, err - } - return 0, nil - }, 0, tag) - if err != nil { - *reply = err.Error() - return err - } - *reply = OK - return nil -} - type AttrSetAccountActionTriggers struct { Tenant string Account string diff --git a/data/tariffplans/prepaid1centpsec/AccountActions.csv b/data/tariffplans/testtp/AccountActions.csv similarity index 91% rename from data/tariffplans/prepaid1centpsec/AccountActions.csv rename to data/tariffplans/testtp/AccountActions.csv index 1e3d995b5..ca940949b 100644 --- a/data/tariffplans/prepaid1centpsec/AccountActions.csv +++ b/data/tariffplans/testtp/AccountActions.csv @@ -4,3 +4,4 @@ cgrates.org,1002,PREPAID_10,STANDARD_TRIGGERS,, cgrates.org,1003,PREPAID_10,STANDARD_TRIGGERS,, cgrates.org,1004,PREPAID_10,STANDARD_TRIGGERS,, cgrates.org,1005,PREPAID_10,STANDARD_TRIGGERS,, +cgrates.org,1009,TEST_EXE,,, \ No newline at end of file diff --git a/data/tariffplans/prepaid1centpsec/ActionPlans.csv b/data/tariffplans/testtp/ActionPlans.csv similarity index 76% rename from data/tariffplans/prepaid1centpsec/ActionPlans.csv rename to data/tariffplans/testtp/ActionPlans.csv index 756ee2ede..670cf8c93 100644 --- a/data/tariffplans/prepaid1centpsec/ActionPlans.csv +++ b/data/tariffplans/testtp/ActionPlans.csv @@ -1,3 +1,4 @@ #Tag,ActionsTag,TimingTag,Weight PREPAID_10,PREPAID_10,ASAP,10 PREPAID_10,BONUS_1,ASAP,10 +TEST_EXE,TOPUP_EXE,ALWAYS,10 \ No newline at end of file diff --git a/data/tariffplans/prepaid1centpsec/ActionTriggers.csv b/data/tariffplans/testtp/ActionTriggers.csv similarity index 100% rename from data/tariffplans/prepaid1centpsec/ActionTriggers.csv rename to data/tariffplans/testtp/ActionTriggers.csv diff --git a/data/tariffplans/prepaid1centpsec/Actions.csv b/data/tariffplans/testtp/Actions.csv similarity index 88% rename from data/tariffplans/prepaid1centpsec/Actions.csv rename to data/tariffplans/testtp/Actions.csv index 2729b8c77..045fc0666 100644 --- a/data/tariffplans/prepaid1centpsec/Actions.csv +++ b/data/tariffplans/testtp/Actions.csv @@ -4,3 +4,4 @@ BONUS_1,*topup,,,,*monetary,*out,,*any,,,*unlimited,,1,10,false,false,10 LOG_BALANCE,*log,,,,,,,,,,,,,,false,false,10 CDRST_WARN_HTTP,*call_url,http://localhost:8080,,,,,,,,,,,,,false,false,10 CDRST_LOG,*log,,,,,,,,,,,,,,false,false,10 +TOPUP_EXE,*topup,,,,*monetary,*out,,*any,,,*unlimited,,5,10,false,false,10 \ No newline at end of file diff --git a/data/tariffplans/prepaid1centpsec/Aliases.csv b/data/tariffplans/testtp/Aliases.csv similarity index 100% rename from data/tariffplans/prepaid1centpsec/Aliases.csv rename to data/tariffplans/testtp/Aliases.csv diff --git a/data/tariffplans/prepaid1centpsec/CdrStats.csv b/data/tariffplans/testtp/CdrStats.csv similarity index 100% rename from data/tariffplans/prepaid1centpsec/CdrStats.csv rename to data/tariffplans/testtp/CdrStats.csv diff --git a/data/tariffplans/prepaid1centpsec/DerivedChargers.csv b/data/tariffplans/testtp/DerivedChargers.csv similarity index 100% rename from data/tariffplans/prepaid1centpsec/DerivedChargers.csv rename to data/tariffplans/testtp/DerivedChargers.csv diff --git a/data/tariffplans/prepaid1centpsec/DestinationRates.csv b/data/tariffplans/testtp/DestinationRates.csv similarity index 100% rename from data/tariffplans/prepaid1centpsec/DestinationRates.csv rename to data/tariffplans/testtp/DestinationRates.csv diff --git a/data/tariffplans/prepaid1centpsec/Destinations.csv b/data/tariffplans/testtp/Destinations.csv similarity index 100% rename from data/tariffplans/prepaid1centpsec/Destinations.csv rename to data/tariffplans/testtp/Destinations.csv diff --git a/data/tariffplans/prepaid1centpsec/LcrRules.csv b/data/tariffplans/testtp/LcrRules.csv similarity index 100% rename from data/tariffplans/prepaid1centpsec/LcrRules.csv rename to data/tariffplans/testtp/LcrRules.csv diff --git a/data/tariffplans/prepaid1centpsec/README.md b/data/tariffplans/testtp/README.md similarity index 100% rename from data/tariffplans/prepaid1centpsec/README.md rename to data/tariffplans/testtp/README.md diff --git a/data/tariffplans/prepaid1centpsec/Rates.csv b/data/tariffplans/testtp/Rates.csv similarity index 100% rename from data/tariffplans/prepaid1centpsec/Rates.csv rename to data/tariffplans/testtp/Rates.csv diff --git a/data/tariffplans/prepaid1centpsec/RatingPlans.csv b/data/tariffplans/testtp/RatingPlans.csv similarity index 100% rename from data/tariffplans/prepaid1centpsec/RatingPlans.csv rename to data/tariffplans/testtp/RatingPlans.csv diff --git a/data/tariffplans/prepaid1centpsec/RatingProfiles.csv b/data/tariffplans/testtp/RatingProfiles.csv similarity index 100% rename from data/tariffplans/prepaid1centpsec/RatingProfiles.csv rename to data/tariffplans/testtp/RatingProfiles.csv diff --git a/data/tariffplans/prepaid1centpsec/SharedGroups.csv b/data/tariffplans/testtp/SharedGroups.csv similarity index 100% rename from data/tariffplans/prepaid1centpsec/SharedGroups.csv rename to data/tariffplans/testtp/SharedGroups.csv diff --git a/data/tariffplans/prepaid1centpsec/Timings.csv b/data/tariffplans/testtp/Timings.csv similarity index 71% rename from data/tariffplans/prepaid1centpsec/Timings.csv rename to data/tariffplans/testtp/Timings.csv index f6c4a6ffb..8e6f78589 100644 --- a/data/tariffplans/prepaid1centpsec/Timings.csv +++ b/data/tariffplans/testtp/Timings.csv @@ -1,3 +1,3 @@ #Tag,Years,Months,MonthDays,WeekDays,Time ALWAYS,*any,*any,*any,*any,00:00:00 -ASAP,*any,*any,*any,*any,*asap +ASAP,*any,*any,*any,*any,*asap \ No newline at end of file diff --git a/data/tariffplans/prepaid1centpsec/Users.csv b/data/tariffplans/testtp/Users.csv similarity index 100% rename from data/tariffplans/prepaid1centpsec/Users.csv rename to data/tariffplans/testtp/Users.csv diff --git a/data/tariffplans/tutorial/AccountActions.csv b/data/tariffplans/tutorial/AccountActions.csv index bfdad1dd0..97bcd5f64 100644 --- a/data/tariffplans/tutorial/AccountActions.csv +++ b/data/tariffplans/tutorial/AccountActions.csv @@ -4,4 +4,3 @@ cgrates.org,1002,PACKAGE_10,STANDARD_TRIGGERS,, cgrates.org,1003,PACKAGE_10,STANDARD_TRIGGERS,, cgrates.org,1004,PACKAGE_10,STANDARD_TRIGGERS,, cgrates.org,1007,USE_SHARED_A,STANDARD_TRIGGERS,, -cgrates.org,1009,TEST_EXE,,, diff --git a/data/tariffplans/tutorial/ActionPlans.csv b/data/tariffplans/tutorial/ActionPlans.csv index ec5a53cce..3d59fe3e9 100644 --- a/data/tariffplans/tutorial/ActionPlans.csv +++ b/data/tariffplans/tutorial/ActionPlans.csv @@ -6,4 +6,3 @@ USE_SHARED_A,SHARED_A_0,*asap,10 PACKAGE_1001,TOPUP_RST_5,*asap,10 PACKAGE_1001,TOPUP_RST_SHARED_5,*asap,10 PACKAGE_1001,TOPUP_120_DST1003,*asap,10 -TEST_EXE,TOPUP_EXE,DAILY,10 \ No newline at end of file diff --git a/data/tariffplans/tutorial/Actions.csv b/data/tariffplans/tutorial/Actions.csv index 690285fc3..93a3faa1f 100644 --- a/data/tariffplans/tutorial/Actions.csv +++ b/data/tariffplans/tutorial/Actions.csv @@ -4,7 +4,6 @@ TOPUP_RST_5,*topup_reset,,,,*monetary,*out,,*any,,,*unlimited,,5,20,false,false, TOPUP_RST_5,*topup_reset,,,,*voice,*out,,DST_1002,SPECIAL_1002,,*unlimited,,90,20,false,false,10 TOPUP_120_DST1003,*topup_reset,,,,*voice,*out,,DST_1003,,,*unlimited,,120,20,false,false,10 TOPUP_RST_SHARED_5,*topup,,,,*monetary,*out,,*any,,SHARED_A,*unlimited,,5,10,false,false,10 -TOPUP_EXE,*topup,,,,*monetary,*out,,*any,,,*unlimited,,5,10,false,false,10 SHARED_A_0,*topup_reset,,,,*monetary,*out,,*any,,SHARED_A,*unlimited,,0,10,false,false,10 LOG_WARNING,*log,,,,,,,,,,,,,,false,false,10 DISABLE_AND_LOG,*log,,,,,,,,,,,,,,false,false,10 diff --git a/data/tariffplans/tutorial/Timings.csv b/data/tariffplans/tutorial/Timings.csv index d957c710f..d5018f529 100644 --- a/data/tariffplans/tutorial/Timings.csv +++ b/data/tariffplans/tutorial/Timings.csv @@ -4,5 +4,4 @@ ASAP,*any,*any,*any,*any,*asap PEAK,*any,*any,*any,1;2;3;4;5,08:00:00 OFFPEAK_MORNING,*any,*any,*any,1;2;3;4;5,00:00:00 OFFPEAK_EVENING,*any,*any,*any,1;2;3;4;5,19:00:00 -OFFPEAK_WEEKEND,*any,*any,*any,6;7,00:00:00 -DAILY,*any,*any,*any,*any,00:00:00 \ No newline at end of file +OFFPEAK_WEEKEND,*any,*any,*any,6;7,00:00:00 \ No newline at end of file diff --git a/engine/loader_local_test.go b/engine/loader_local_test.go index 0320f6840..e03f8e485 100644 --- a/engine/loader_local_test.go +++ b/engine/loader_local_test.go @@ -47,7 +47,7 @@ var accountDbCsv, accountDbStor, accountDbApier AccountingStorage // Each rating var storDb LoadStorage var lCfg *config.CGRConfig -var tpCsvScenario = flag.String("tp_scenario", "prepaid1centpsec", "Use this scenario folder to import tp csv data from") +var tpCsvScenario = flag.String("tp_scenario", "testtp", "Use this scenario folder to import tp csv data from") // Create connection to ratingDb // Will use 3 different datadbs in order to be able to see differences in data loaded diff --git a/general_tests/multiplecdrc_local_test.go b/general_tests/multiplecdrc_local_test.go index 0d393554e..651404bda 100644 --- a/general_tests/multiplecdrc_local_test.go +++ b/general_tests/multiplecdrc_local_test.go @@ -135,7 +135,7 @@ func TestMCDRCApierLoadTariffPlanFromFolder(t *testing.T) { } reply := "" // Simple test that command is executed without errors - attrs := &utils.AttrLoadTpFromFolder{FolderPath: path.Join(*dataDir, "tariffplans", "prepaid1centpsec")} + attrs := &utils.AttrLoadTpFromFolder{FolderPath: path.Join(*dataDir, "tariffplans", "testtp")} if err := rater.Call("ApierV1.LoadTariffPlanFromFolder", attrs, &reply); err != nil { t.Error("Got error on ApierV1.LoadTariffPlanFromFolder: ", err.Error()) } else if reply != "OK" {