From 0df9f63409c5d5ef3b52e80a2ce44aac2057522c Mon Sep 17 00:00:00 2001 From: DanB Date: Tue, 22 Sep 2015 11:33:43 +0200 Subject: [PATCH] Tutorial TP - Renamed *Tag into *Id so we do not create confusion with using both naming --- data/tariffplans/tutorial/AccountActions.csv | 2 +- data/tariffplans/tutorial/ActionPlans.csv | 2 +- data/tariffplans/tutorial/ActionTriggers.csv | 2 +- data/tariffplans/tutorial/Actions.csv | 2 +- data/tariffplans/tutorial/CdrStats.csv | 2 +- data/tariffplans/tutorial/DestinationRates.csv | 2 +- data/tariffplans/tutorial/Destinations.csv | 2 +- data/tariffplans/tutorial/Rates.csv | 2 +- data/tariffplans/tutorial/RatingPlans.csv | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/tariffplans/tutorial/AccountActions.csv b/data/tariffplans/tutorial/AccountActions.csv index c3c6a8689..2a6f2fd6a 100644 --- a/data/tariffplans/tutorial/AccountActions.csv +++ b/data/tariffplans/tutorial/AccountActions.csv @@ -1,4 +1,4 @@ -#Tenant,Account,Direction,ActionPlanTag,ActionTriggersTag,AllowNegative,Disabled +#Tenant,Account,Direction,ActionPlanId,ActionTriggersId,AllowNegative,Disabled cgrates.org,1001,*out,PACKAGE_1001,STANDARD_TRIGGERS,, cgrates.org,1002,*out,PACKAGE_10,STANDARD_TRIGGERS,, cgrates.org,1003,*out,PACKAGE_10,STANDARD_TRIGGERS,, diff --git a/data/tariffplans/tutorial/ActionPlans.csv b/data/tariffplans/tutorial/ActionPlans.csv index be0e44974..3d59fe3e9 100644 --- a/data/tariffplans/tutorial/ActionPlans.csv +++ b/data/tariffplans/tutorial/ActionPlans.csv @@ -1,4 +1,4 @@ -#Tag,ActionsTag,TimingTag,Weight +#Id,ActionsId,TimingId,Weight PACKAGE_10,TOPUP_RST_10,*asap,10 PACKAGE_10_SHARED_A_5,TOPUP_RST_5,*asap,10 PACKAGE_10_SHARED_A_5,TOPUP_RST_SHARED_5,*asap,10 diff --git a/data/tariffplans/tutorial/ActionTriggers.csv b/data/tariffplans/tutorial/ActionTriggers.csv index 6994c3d5b..d3d01c319 100644 --- a/data/tariffplans/tutorial/ActionTriggers.csv +++ b/data/tariffplans/tutorial/ActionTriggers.csv @@ -1,4 +1,4 @@ -#Tag[0],UniqueId[1],ThresholdType[2],ThresholdValue[3],Recurrent[4],MinSleep[5],BalanceTag[6],BalanceType[7],BalanceDirection[8],BalanceCategory[9],BalanceDestinationTag[10],BalanceRatingSubject[11],BalanceSharedGroup[12],BalanceExpiryTime[13],BalanceTimingTags[14],BalanceWeight[15],StatsMinQueuedItems[16],ActionsTag[17],Weight[18] +#Tag[0],UniqueId[1],ThresholdType[2],ThresholdValue[3],Recurrent[4],MinSleep[5],BalanceTag[6],BalanceType[7],BalanceDirection[8],BalanceCategory[9],BalanceDestinationId[10],BalanceRatingSubject[11],BalanceSharedGroup[12],BalanceExpiryTime[13],BalanceTimingIds[14],BalanceWeight[15],StatsMinQueuedItems[16],ActionsId[17],Weight[18] STANDARD_TRIGGERS,,*min_balance,2,false,0,,*monetary,*out,,,,,,,,,LOG_WARNING,10 STANDARD_TRIGGERS,,*max_counter,5,false,0,,*monetary,*out,,FS_USERS,,,,,,,LOG_WARNING,10 STANDARD_TRIGGERS,,*max_balance,20,false,0,,*monetary,*out,,,,,,,,,LOG_WARNING,10 diff --git a/data/tariffplans/tutorial/Actions.csv b/data/tariffplans/tutorial/Actions.csv index a3c6bd659..d16f5bc2e 100644 --- a/data/tariffplans/tutorial/Actions.csv +++ b/data/tariffplans/tutorial/Actions.csv @@ -1,4 +1,4 @@ -#ActionsTag[0],Action[1],ExtraParameters[2],BalanceTag[3],BalanceType[4],Direction[5],Category[6],DestinationTag[7],RatingSubject[8],SharedGroup[9],ExpiryTime[10],TimingTags[11],Units[12],BalanceWeight[13],BalanceDisabled[14],Weight[15] +#ActionsId[0],Action[1],ExtraParameters[2],BalanceId[3],BalanceType[4],Direction[5],Category[6],DestinationId[7],RatingSubject[8],SharedGroup[9],ExpiryTime[10],TimingIds[11],Units[12],BalanceWeight[13],BalanceDisabled[14],Weight[15] TOPUP_RST_10,*topup_reset,,,*monetary,*out,,*any,,,*unlimited,,10,10,false,10 TOPUP_RST_5,*topup_reset,,,*monetary,*out,,*any,,,*unlimited,,5,20,false,10 TOPUP_RST_5,*topup_reset,,,*voice,*out,,DST_1002,SPECIAL_1002,,*unlimited,,90,20,false,10 diff --git a/data/tariffplans/tutorial/CdrStats.csv b/data/tariffplans/tutorial/CdrStats.csv index 340bca3ae..e650d7c76 100644 --- a/data/tariffplans/tutorial/CdrStats.csv +++ b/data/tariffplans/tutorial/CdrStats.csv @@ -1,4 +1,4 @@ -#Id[0],QueueLength[1],TimeWindow[2],SaveInerval[3],Metric[4],SetupInterval[5],TOR[6],CdrHost[7],CdrSource[8],ReqType[9],Direction[10],Tenant[11],Category[12],Account[13],Subject[14],DestinationPrefix[15],PddInterval[16],UsageInterval[17],Supplier[18],DisconnectCause[19],MediationRunIds[20],RatedAccount[21],RatedSubject[22],CostInterval[23],Triggers[24] +#Id[0],QueueLength[1],TimeWindow[2],SaveInerval[3],Metric[4],SetupInterval[5],TOR[6],CdrHost[7],CdrSource[8],ReqType[9],Direction[10],Tenant[11],Category[12],Account[13],Subject[14],DestinationIds[15],PddInterval[16],UsageInterval[17],Supplier[18],DisconnectCause[19],RunIds[20],RatedAccount[21],RatedSubject[22],CostInterval[23],Triggers[24] CDRST1,10,0,10s,ASR,,,,,,,cgrates.org,,,,,,,,,*default,,,,CDRST1_WARN CDRST1,,,,ACD,,,,,,,,,,,,,,,,,,,, CDRST1,,,,ACC,,,,,,,,,,,,,,,,,,,, diff --git a/data/tariffplans/tutorial/DestinationRates.csv b/data/tariffplans/tutorial/DestinationRates.csv index ef225e687..2602159d0 100644 --- a/data/tariffplans/tutorial/DestinationRates.csv +++ b/data/tariffplans/tutorial/DestinationRates.csv @@ -1,4 +1,4 @@ -#Tag,DestinationsTag,RatesTag,RoundingMethod,RoundingDecimals,MaxCost,MaxCostStrategy +#Id,DestinationId,RatesTag,RoundingMethod,RoundingDecimals,MaxCost,MaxCostStrategy DR_1002_20CNT,DST_1002,RT_20CNT,*up,4,0, DR_1002_10CNT,DST_1002,RT_10CNT,*up,4,0, DR_1003_20CNT,DST_1003,RT_40CNT,*up,4,0, diff --git a/data/tariffplans/tutorial/Destinations.csv b/data/tariffplans/tutorial/Destinations.csv index 5e01a2632..95e1b9f12 100644 --- a/data/tariffplans/tutorial/Destinations.csv +++ b/data/tariffplans/tutorial/Destinations.csv @@ -1,4 +1,4 @@ -#Tag,Prefix +#Id,Prefix DST_1002,1002 DST_1003,1003 DST_1007,1007 diff --git a/data/tariffplans/tutorial/Rates.csv b/data/tariffplans/tutorial/Rates.csv index 0164076c9..c333bff3e 100644 --- a/data/tariffplans/tutorial/Rates.csv +++ b/data/tariffplans/tutorial/Rates.csv @@ -1,4 +1,4 @@ -#Tag,ConnectFee,Rate,RateUnit,RateIncrement,GroupIntervalStart +#Id,ConnectFee,Rate,RateUnit,RateIncrement,GroupIntervalStart RT_10CNT,0.2,0.1,60s,60s,0s RT_10CNT,0,0.05,60s,1s,60s RT_20CNT,0.4,0.2,60s,60s,0s diff --git a/data/tariffplans/tutorial/RatingPlans.csv b/data/tariffplans/tutorial/RatingPlans.csv index 8b58cb47f..80bb48ee7 100644 --- a/data/tariffplans/tutorial/RatingPlans.csv +++ b/data/tariffplans/tutorial/RatingPlans.csv @@ -1,4 +1,4 @@ -#Tag,DestinationRatesTag,TimingTag,Weight +#Id,DestinationRatesId,TimingTag,Weight RP_RETAIL1,DR_FS_40CNT,PEAK,10 RP_RETAIL1,DR_FS_10CNT,OFFPEAK_MORNING,10 RP_RETAIL1,DR_FS_10CNT,OFFPEAK_EVENING,10