uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Tenant before ID on TPResources and TPStats

Browse Source
This commit is contained in:
TeoV
2017-09-15 17:02:22 +03:00
parent 37f1c66d1f
commit 73399bef7a
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
data/tariffplans/testtp/Resources.csv
View File

@@ -1,6 +1,6 @@
#Id[0],Tenant[1],FilterType[2],FilterFieldName[3],FilterFieldValues[4],ActivationInterval[5],TTL[6],Limit[7],AllocationMessage[8],Blocker[9],Stored[10],Weight[11],Thresholds[12]
ResGroup1,cgrates.org,*string,Account,1001;1002,2014-07-29T15:00:00Z,1s,7,,true,true,20,
ResGroup1,cgrates.org,*string_prefix,Destination,10;20,,,,,,,,
ResGroup1,cgrates.org,*rsr_fields,,Subject(~^1.*1$);Destination(1002),,,,,,,,
ResGroup2,cgrates.org,*destinations,Destination,DST_FS,2014-07-29T15:00:00Z,3600s,8,SPECIAL_1002,true,true,10,
ResGroup3,cgrates.org,*cdr_stats,,CDRST1:*min_ASR:34;CDRST_1001:*min_ASR:20,,,,,,,,
#Tenant[0],Id[1],FilterType[2],FilterFieldName[3],FilterFieldValues[4],ActivationInterval[5],TTL[6],Limit[7],AllocationMessage[8],Blocker[9],Stored[10],Weight[11],Thresholds[12]
cgrates.org,ResGroup1,*string,Account,1001;1002,2014-07-29T15:00:00Z,1s,7,,true,true,20,
cgrates.org,ResGroup1,*string_prefix,Destination,10;20,,,,,,,,
cgrates.org,ResGroup1,*rsr_fields,,Subject(~^1.*1$);Destination(1002),,,,,,,,
cgrates.org,ResGroup2,*destinations,Destination,DST_FS,2014-07-29T15:00:00Z,3600s,8,SPECIAL_1002,true,true,10,
cgrates.org,ResGroup3,*cdr_stats,,CDRST1:*min_ASR:34;CDRST_1001:*min_ASR:20,,,,,,,,
1 #Id[0] #Tenant[0] Tenant[1] Id[1] FilterType[2] FilterFieldName[3] FilterFieldValues[4] ActivationInterval[5] TTL[6] Limit[7] AllocationMessage[8] Blocker[9] Stored[10] Weight[11] Thresholds[12]
2 ResGroup1 cgrates.org cgrates.org ResGroup1 *string Account 1001;1002 2014-07-29T15:00:00Z 1s 7 true true 20
3 ResGroup1 cgrates.org cgrates.org ResGroup1 *string_prefix Destination 10;20
4 ResGroup1 cgrates.org cgrates.org ResGroup1 *rsr_fields Subject(~^1.*1$);Destination(1002)
5 ResGroup2 cgrates.org cgrates.org ResGroup2 *destinations Destination DST_FS 2014-07-29T15:00:00Z 3600s 8 SPECIAL_1002 true true 10
6 ResGroup3 cgrates.org cgrates.org ResGroup3 *cdr_stats CDRST1:*min_ASR:34;CDRST_1001:*min_ASR:20

2
data/tariffplans/testtp/Stats.csv
View File

@@ -1,2 +1,2 @@
#Tenant[0],Id[1],FilterType[2],FilterFieldName[3],FilterFieldValues[4],ActivationInterval[5],QueueLength[6],TTL[7],Metrics[8],Blocker[9],Stored[10],Weight[11],Thresholds[12]
Tester,Stats1,*string,Account,1001;1002,2014-07-29T15:00:00Z,100,1s,*asr;*acd;*acc,true,true,20,THRESH1;THRESH2
cgrates.org,Stats1,*string,Account,1001;1002,2014-07-29T15:00:00Z,100,1s,*asr;*acd;*acc,true,true,20,THRESH1;THRESH2
1 #Tenant[0] Id[1] FilterType[2] FilterFieldName[3] FilterFieldValues[4] ActivationInterval[5] QueueLength[6] TTL[7] Metrics[8] Blocker[9] Stored[10] Weight[11] Thresholds[12]
2 Tester cgrates.org Stats1 *string Account 1001;1002 2014-07-29T15:00:00Z 100 1s *asr;*acd;*acc true true 20 THRESH1;THRESH2

4
engine/models.go
View File

@@ -454,8 +454,8 @@ func (t TBLSMCosts) TableName() string {
type TpResource struct {
PK uint `gorm:"primary_key"`
Tpid string
ID string `index:"0" re:""`
Tenant string `index:"1" re:""`
Tenant string `index:"0" re:""`
ID string `index:"1" re:""`
FilterType string `index:"2" re:"^\*[A-Za-z].*"`
FilterFieldName string `index:"3" re:""`
FilterFieldValues string `index:"4" re:""`