uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-22 23:58:44 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cgrates/cgrates

Browse Source
This commit is contained in:
DanB
2015-11-01 12:36:42 +01:00
parent d9ab417d87 c81db1afcc
commit 02e324aeec
66 changed files with 1939 additions and 1135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
data/storage/mysql/create_tariffplan_tables.sql
View File

@@ -151,13 +151,13 @@ CREATE TABLE `tp_actions` (
`action` varchar(24) NOT NULL,
`balance_tag` varchar(64) NOT NULL,
`balance_type` varchar(24) NOT NULL,
`direction` varchar(8) NOT NULL,
`directions` varchar(8) NOT NULL,
`units` DECIMAL(20,4) NOT NULL,
`expiry_time` varchar(24) NOT NULL,
`timing_tags` varchar(128) NOT NULL,
`destination_tags` varchar(64) NOT NULL,
`rating_subject` varchar(64) NOT NULL,
`category` varchar(32) NOT NULL,
`categories` varchar(32) NOT NULL,
`shared_group` varchar(64) NOT NULL,
`balance_weight` DECIMAL(8,2) NOT NULL,
`balance_disabled` BOOLEAN NOT NULL,
@@ -166,7 +166,7 @@ CREATE TABLE `tp_actions` (
`created_at` TIMESTAMP,
PRIMARY KEY (`id`),
KEY `tpid` (`tpid`),
UNIQUE KEY `unique_action` (`tpid`,`tag`,`action`,`balance_tag`,`balance_type`,`direction`,`expiry_time`,`timing_tags`,`destination_tags`,`shared_group`,`balance_weight`,`weight`)
UNIQUE KEY `unique_action` (`tpid`,`tag`,`action`,`balance_tag`,`balance_type`,`directions`,`expiry_time`,`timing_tags`,`destination_tags`,`shared_group`,`balance_weight`,`weight`)
);
--
@@ -203,8 +203,8 @@ CREATE TABLE `tp_action_triggers` (
`min_sleep` varchar(16) NOT NULL,
`balance_tag` varchar(64) NOT NULL,
`balance_type` varchar(24) NOT NULL,
`balance_direction` varchar(8) NOT NULL,
`balance_category` varchar(32) NOT NULL,
`balance_directions` varchar(8) NOT NULL,
`balance_categories` varchar(32) NOT NULL,
`balance_destination_tags` varchar(64) NOT NULL,
`balance_rating_subject` varchar(64) NOT NULL,
`balance_shared_group` varchar(64) NOT NULL,
@@ -218,7 +218,7 @@ CREATE TABLE `tp_action_triggers` (
`created_at` TIMESTAMP,
PRIMARY KEY (`id`),
KEY `tpid` (`tpid`),
UNIQUE KEY `unique_trigger_definition` (`tpid`,`tag`,`balance_tag`,`balance_type`,`balance_direction`,`threshold_type`,`threshold_value`,`balance_destination_tags`,`actions_tag`)
UNIQUE KEY `unique_trigger_definition` (`tpid`,`tag`,`balance_tag`,`balance_type`,`balance_directions`,`threshold_type`,`threshold_value`,`balance_destination_tags`,`actions_tag`)
);
--
@@ -232,7 +232,6 @@ CREATE TABLE `tp_account_actions` (
`loadid` varchar(64) NOT NULL,
`tenant` varchar(64) NOT NULL,
`account` varchar(64) NOT NULL,
`direction` varchar(8) NOT NULL,
`action_plan_tag` varchar(64),
`action_triggers_tag` varchar(64),
`allow_negative` BOOLEAN NOT NULL,
@@ -240,7 +239,7 @@ CREATE TABLE `tp_account_actions` (
`created_at` TIMESTAMP,
PRIMARY KEY (`id`),
KEY `tpid` (`tpid`),
UNIQUE KEY `unique_tp_account` (`tpid`,`loadid`,`tenant`,`account`,`direction`)
UNIQUE KEY `unique_tp_account` (`tpid`,`loadid`,`tenant`,`account`)
);
--

17
data/storage/postgres/create_tariffplan_tables.sql
View File

@@ -146,20 +146,20 @@ CREATE TABLE tp_actions (
action VARCHAR(24) NOT NULL,
balance_tag VARCHAR(64) NOT NULL,
balance_type VARCHAR(24) NOT NULL,
direction VARCHAR(8) NOT NULL,
directions VARCHAR(8) NOT NULL,
units NUMERIC(20,4) NOT NULL,
expiry_time VARCHAR(24) NOT NULL,
timing_tags VARCHAR(128) NOT NULL,
destination_tags VARCHAR(64) NOT NULL,
rating_subject VARCHAR(64) NOT NULL,
category VARCHAR(32) NOT NULL,
categories VARCHAR(32) NOT NULL,
shared_group VARCHAR(64) NOT NULL,
balance_weight NUMERIC(8,2) NOT NULL,
balance_disabled BOOLEAN NOT NULL,
extra_parameters VARCHAR(256) NOT NULL,
weight NUMERIC(8,2) NOT NULL,
created_at TIMESTAMP,
UNIQUE (tpid, tag, action, balance_tag, balance_type, direction, expiry_time, timing_tags, destination_tags, shared_group, balance_weight, weight)
UNIQUE (tpid, tag, action, balance_tag, balance_type, directions, expiry_time, timing_tags, destination_tags, shared_group, balance_weight, weight)
);
CREATE INDEX tpactions_tpid_idx ON tp_actions (tpid);
CREATE INDEX tpactions_idx ON tp_actions (tpid,tag);
@@ -198,8 +198,8 @@ CREATE TABLE tp_action_triggers (
min_sleep VARCHAR(16) NOT NULL,
balance_tag VARCHAR(64) NOT NULL,
balance_type VARCHAR(24) NOT NULL,
balance_direction VARCHAR(8) NOT NULL,
balance_category VARCHAR(32) NOT NULL,
balance_directions VARCHAR(8) NOT NULL,
balance_categories VARCHAR(32) NOT NULL,
balance_destination_tags VARCHAR(64) NOT NULL,
balance_rating_subject VARCHAR(64) NOT NULL,
balance_shared_group VARCHAR(64) NOT NULL,
@@ -211,7 +211,7 @@ CREATE TABLE tp_action_triggers (
actions_tag VARCHAR(64) NOT NULL,
weight NUMERIC(8,2) NOT NULL,
created_at TIMESTAMP,
UNIQUE (tpid, tag, balance_tag, balance_type, balance_direction, threshold_type, threshold_value, balance_destination_tags, actions_tag)
UNIQUE (tpid, tag, balance_tag, balance_type, balance_directions, threshold_type, threshold_value, balance_destination_tags, actions_tag)
);
CREATE INDEX tpactiontrigers_tpid_idx ON tp_action_triggers (tpid);
CREATE INDEX tpactiontrigers_idx ON tp_action_triggers (tpid,tag);
@@ -227,16 +227,15 @@ CREATE TABLE tp_account_actions (
loadid VARCHAR(64) NOT NULL,
tenant VARCHAR(64) NOT NULL,
account VARCHAR(64) NOT NULL,
direction VARCHAR(8) NOT NULL,
action_plan_tag VARCHAR(64),
action_triggers_tag VARCHAR(64),
allow_negative BOOLEAN NOT NULL,
disabled BOOLEAN NOT NULL,
created_at TIMESTAMP,
UNIQUE (tpid, loadid, tenant, account, direction)
UNIQUE (tpid, loadid, tenant, account)
);
CREATE INDEX tpaccountactions_tpid_idx ON tp_account_actions (tpid);
CREATE INDEX tpaccountactions_idx ON tp_account_actions (tpid,loadid,tenant,account,direction);
CREATE INDEX tpaccountactions_idx ON tp_account_actions (tpid,loadid,tenant,account);
--
-- Table structure for table `tp_lcr_rules`

2
data/tariffplans/cdrstats/ActionTriggers.csv
View File

@@ -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],BalanceDisabled[16],StatsMinQueuedItems[17],ActionsTag[18],Weight[19]
#Tag[0],UniqueId[1],ThresholdType[2],ThresholdValue[3],Recurrent[4],MinSleep[5],BalanceTag[6],BalanceType[7],BalanceDirections[8],BalanceCategories[9],BalanceDestinationTags[10],BalanceRatingSubject[11],BalanceSharedGroup[12],BalanceExpiryTime[13],BalanceTimingTags[14],BalanceWeight[15],BalanceDisabled[16],StatsMinQueuedItems[17],ActionsTag[18],Weight[19]
CDRST3_WARN_ASR,,*min_asr,45,true,1h,,,,,,,,,,,,3,CDRST_LOG,10
CDRST3_WARN_ACD,,*min_acd,10,true,1h,,,,,,,,,,,,5,CDRST_LOG,10
CDRST3_WARN_ACC,,*max_acc,10,true,10m,,,,,,,,,,,,5,CDRST_LOG,10
1 #Tag[0] UniqueId[1] ThresholdType[2] ThresholdValue[3] Recurrent[4] MinSleep[5] BalanceTag[6] BalanceType[7] BalanceDirection[8] BalanceDirections[8] BalanceCategory[9] BalanceCategories[9] BalanceDestinationTag[10] BalanceDestinationTags[10] BalanceRatingSubject[11] BalanceSharedGroup[12] BalanceExpiryTime[13] BalanceTimingTags[14] BalanceWeight[15] BalanceDisabled[16] StatsMinQueuedItems[17] ActionsTag[18] Weight[19]
2 CDRST3_WARN_ASR *min_asr 45 true 1h 3 CDRST_LOG 10
3 CDRST3_WARN_ACD *min_acd 10 true 1h 5 CDRST_LOG 10
4 CDRST3_WARN_ACC *max_acc 10 true 10m 5 CDRST_LOG 10

2
data/tariffplans/cdrstats/Actions.csv
View File

@@ -1,2 +1,2 @@
#ActionsTag,Action,BalanceTag,BalanceType,Direction,Units,ExpiryTime,TimingTags,DestinationTag,RatingSubject,Category,BalanceWeight,SharedGroup,ExtraParameters,Weight
#ActionsTag,Action,BalanceTag,BalanceType,Directions,Units,ExpiryTime,TimingTags,DestinationTags,RatingSubject,Categories,BalanceWeight,SharedGroup,ExtraParameters,Weight
CDRST_LOG,*log,,,,,,,,,,,,,false,10
1 #ActionsTag,Action,BalanceTag,BalanceType,Direction,Units,ExpiryTime,TimingTags,DestinationTag,RatingSubject,Category,BalanceWeight,SharedGroup,ExtraParameters,Weight #ActionsTag,Action,BalanceTag,BalanceType,Directions,Units,ExpiryTime,TimingTags,DestinationTags,RatingSubject,Categories,BalanceWeight,SharedGroup,ExtraParameters,Weight
2 CDRST_LOG,*log,,,,,,,,,,,,,false,10 CDRST_LOG,*log,,,,,,,,,,,,,false,10

12
data/tariffplans/prepaid1centpsec/AccountActions.csv
View File

@@ -1,6 +1,6 @@
#Tenant,Account,Direction,ActionPlanId,ActionTriggersId,AllowNegative,Disabled
cgrates.org,1001,*out,PREPAID_10,STANDARD_TRIGGERS,,
cgrates.org,1002,*out,PREPAID_10,STANDARD_TRIGGERS,,
cgrates.org,1003,*out,PREPAID_10,STANDARD_TRIGGERS,,
cgrates.org,1004,*out,PREPAID_10,STANDARD_TRIGGERS,,
cgrates.org,1005,*out,PREPAID_10,STANDARD_TRIGGERS,,
#Tenant,Account,ActionPlanId,ActionTriggersId,AllowNegative,Disabled
cgrates.org,1001,PREPAID_10,STANDARD_TRIGGERS,,
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,,
1 #Tenant Account Direction ActionPlanId ActionTriggersId AllowNegative Disabled
2 cgrates.org 1001 *out PREPAID_10 STANDARD_TRIGGERS
3 cgrates.org 1002 *out PREPAID_10 STANDARD_TRIGGERS
4 cgrates.org 1003 *out PREPAID_10 STANDARD_TRIGGERS
5 cgrates.org 1004 *out PREPAID_10 STANDARD_TRIGGERS
6 cgrates.org 1005 *out PREPAID_10 STANDARD_TRIGGERS

2
data/tariffplans/prepaid1centpsec/ActionTriggers.csv
View File

@@ -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],BalanceDisabled[16],StatsMinQueuedItems[17],ActionsTag[18],Weight[19]
#Tag[0],UniqueId[1],ThresholdType[2],ThresholdValue[3],Recurrent[4],MinSleep[5],BalanceTag[6],BalanceType[7],BalanceDirections[8],BalanceCategories[9],BalanceDestinationTags[10],BalanceRatingSubject[11],BalanceSharedGroup[12],BalanceExpiryTime[13],BalanceTimingTags[14],BalanceWeight[15],BalanceDisabled[16],StatsMinQueuedItems[17],ActionsTag[18],Weight[19]
STANDARD_TRIGGERS,,*min_balance,2,false,0,,*monetary,*out,,,,,,,,,,LOG_BALANCE,10
STANDARD_TRIGGERS,,*max_balance,20,false,0,,*monetary,*out,,,,,,,,,,LOG_BALANCE,10
STANDARD_TRIGGERS,,*max_counter,15,false,0,,*monetary,*out,,FS_USERS,,,,,,,,LOG_BALANCE,10
1 #Tag[0] UniqueId[1] ThresholdType[2] ThresholdValue[3] Recurrent[4] MinSleep[5] BalanceTag[6] BalanceType[7] BalanceDirection[8] BalanceDirections[8] BalanceCategory[9] BalanceCategories[9] BalanceDestinationTag[10] BalanceDestinationTags[10] BalanceRatingSubject[11] BalanceSharedGroup[12] BalanceExpiryTime[13] BalanceTimingTags[14] BalanceWeight[15] BalanceDisabled[16] StatsMinQueuedItems[17] ActionsTag[18] Weight[19]
2 STANDARD_TRIGGERS *min_balance 2 false 0 *monetary *out LOG_BALANCE 10
3 STANDARD_TRIGGERS *max_balance 20 false 0 *monetary *out LOG_BALANCE 10
4 STANDARD_TRIGGERS *max_counter 15 false 0 *monetary *out FS_USERS LOG_BALANCE 10

2
data/tariffplans/prepaid1centpsec/Actions.csv
View File

@@ -1,4 +1,4 @@
#ActionsTag[0],Action[1],ActionExtraParameters[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]
#ActionsTag[0],Action[1],ActionExtraParameters[2],BalanceTag[3],BalanceType[4],Directions[5],Categories[6],DestinationIds[7],RatingSubject[8],SharedGroup[9],ExpiryTime[10],TimingTags[11],Units[12],BalanceWeight[13],BalanceDisabled[14],Weight[15]
PREPAID_10,*topup_reset,,,*monetary,*out,,*any,,,*unlimited,,10,10,false,10
BONUS_1,*topup,,,*monetary,*out,,*any,,,*unlimited,,1,10,false,10
LOG_BALANCE,*log,,,,,,,,,,,,,false,10
1 #ActionsTag[0] Action[1] ActionExtraParameters[2] BalanceTag[3] BalanceType[4] Direction[5] Directions[5] Category[6] Categories[6] DestinationTag[7] DestinationIds[7] RatingSubject[8] SharedGroup[9] ExpiryTime[10] TimingTags[11] Units[12] BalanceWeight[13] BalanceDisabled[14] Weight[15]
2 PREPAID_10 *topup_reset *monetary *out *out *any *any *unlimited 10 10 false 10
3 BONUS_1 *topup *monetary *out *out *any *any *unlimited 1 10 false 10
4 LOG_BALANCE *log false 10

12
data/tariffplans/tutorial/AccountActions.csv
View File

@@ -1,6 +1,6 @@
#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,,
cgrates.org,1004,*out,PACKAGE_10,STANDARD_TRIGGERS,,
cgrates.org,1007,*out,USE_SHARED_A,STANDARD_TRIGGERS,,
#Tenant,Account,ActionPlanId,ActionTriggersId,AllowNegative,Disabled
cgrates.org,1001,PACKAGE_1001,STANDARD_TRIGGERS,,
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,,
1 #Tenant Account Direction ActionPlanId ActionTriggersId AllowNegative Disabled
2 cgrates.org 1001 *out PACKAGE_1001 STANDARD_TRIGGERS
3 cgrates.org 1002 *out PACKAGE_10 STANDARD_TRIGGERS
4 cgrates.org 1003 *out PACKAGE_10 STANDARD_TRIGGERS
5 cgrates.org 1004 *out PACKAGE_10 STANDARD_TRIGGERS
6 cgrates.org 1007 *out USE_SHARED_A STANDARD_TRIGGERS

2
data/tariffplans/tutorial/ActionTriggers.csv
View File

@@ -1,4 +1,4 @@
#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],BalanceDisabled[16],StatsMinQueuedItems[17],ActionsId[18],Weight[19]
#Tag[0],UniqueId[1],ThresholdType[2],ThresholdValue[3],Recurrent[4],MinSleep[5],BalanceTag[6],BalanceType[7],BalanceDirections[8],BalanceCategories[9],BalanceDestinationIds[10],BalanceRatingSubject[11],BalanceSharedGroup[12],BalanceExpiryTime[13],BalanceTimingIds[14],BalanceWeight[15],BalanceDisabled[16],StatsMinQueuedItems[17],ActionsId[18],Weight[19]
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
1 #Tag[0] UniqueId[1] ThresholdType[2] ThresholdValue[3] Recurrent[4] MinSleep[5] BalanceTag[6] BalanceType[7] BalanceDirection[8] BalanceDirections[8] BalanceCategory[9] BalanceCategories[9] BalanceDestinationId[10] BalanceDestinationIds[10] BalanceRatingSubject[11] BalanceSharedGroup[12] BalanceExpiryTime[13] BalanceTimingIds[14] BalanceWeight[15] BalanceDisabled[16] StatsMinQueuedItems[17] ActionsId[18] Weight[19]
2 STANDARD_TRIGGERS *min_balance 2 false 0 *monetary *out LOG_WARNING 10
3 STANDARD_TRIGGERS *max_counter 5 false 0 *monetary *out FS_USERS LOG_WARNING 10
4 STANDARD_TRIGGERS *max_balance 20 false 0 *monetary *out LOG_WARNING 10

2
data/tariffplans/tutorial/Actions.csv
View File

@@ -1,4 +1,4 @@
#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]
#ActionsId[0],Action[1],ExtraParameters[2],BalanceId[3],BalanceType[4],Directions[5],Categories[6],DestinationIds[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
1 #ActionsId[0] Action[1] ExtraParameters[2] BalanceId[3] BalanceType[4] Direction[5] Directions[5] Category[6] Categories[6] DestinationId[7] DestinationIds[7] RatingSubject[8] SharedGroup[9] ExpiryTime[10] TimingIds[11] Units[12] BalanceWeight[13] BalanceDisabled[14] Weight[15]
2 TOPUP_RST_10 *topup_reset *monetary *out *any *unlimited 10 10 false 10
3 TOPUP_RST_5 *topup_reset *monetary *out *any *unlimited 5 20 false 10
4 TOPUP_RST_5 *topup_reset *voice *out DST_1002 SPECIAL_1002 *unlimited 90 20 false 10