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

added *any timing tag

Browse Source
This commit is contained in:
Radu Ioan Fericean
2015-06-11 11:51:48 +03:00
parent ba9541aef0
commit 8bfa0997bd
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/loader_csv_test.go
View File

@@ -308,7 +308,7 @@ func TestLoadDestinations(t *testing.T) {
}
func TestLoadTimimgs(t *testing.T) {
if len(csvr.timings) != 6 {
if len(csvr.timings) != 7 {
t.Error("Failed to load timings: ", csvr.timings)
}
timing := csvr.timings["WORKDAYS_00"]

10
engine/models.go
View File

@@ -78,8 +78,8 @@ type TpRatingPlan struct {
Id int64
Tpid string
Tag string `index:"0" re:"\w+\s*,\s*"`
DestratesTag string `index:"1" re:"\w+\s*,\s*"`
TimingTag string `index:"2" re:"\w+\s*,\s*"`
DestratesTag string `index:"1" re:"\w+\s*,\s*|\*any"`
TimingTag string `index:"2" re:"\w+\s*,\s*|\*any"`
Weight float64 `index:"3" re:"\d+.?\d*"`
CreatedAt time.Time
}
@@ -164,7 +164,7 @@ type TpAction struct {
RatingSubject string `index:"8" re:"\w+\s*"`
SharedGroup string `index:"9" re:"[0-9A-Za-z_;]*"`
ExpiryTime string `index:"10" re:"\*\w+\s*|\+\d+[smh]\s*|\d+\s*"`
TimingTags string `index:"11" re:"[0-9A-Za-z_;]*"`
TimingTags string `index:"11" re:"[0-9A-Za-z_;]*|\*any"`
Units float64 `index:"12" re:"\d+\s*"`
BalanceWeight float64 `index:"13" re:"\d+\.?\d*\s*"`
Weight float64 `index:"14" re:"\d+\.?\d*\s*"`
@@ -176,7 +176,7 @@ type TpActionPlan struct {
Tpid string
Tag string `index:"0" re:"\w+\s*,\s*"`
ActionsTag string `index:"1" re:"\w+\s*,\s*"`
TimingTag string `index:"2" re:"\w+\s*,\s*"`
TimingTag string `index:"2" re:"\w+\s*,\s*"|\*any`
Weight float64 `index:"3" re:"\d+\.?\d*"`
CreatedAt time.Time
}
@@ -198,7 +198,7 @@ type TpActionTrigger struct {
BalanceRatingSubject string `index:"11" re:"\w+|\*any"`
BalanceSharedGroup string `index:"12" re:"\w+|\*any"`
BalanceExpiryTime string `index:"13" re:"\*\w+\s*|\+\d+[smh]\s*|\d+\s*"`
BalanceTimingTags string `index:"14" re:"[0-9A-Za-z_;]*"`
BalanceTimingTags string `index:"14" re:"[0-9A-Za-z_;]*|\*any"`
BalanceWeight float64 `index:"15" re:"\d+\.?\d*"`
MinQueuedItems int `index:"16" re:"\d+"`
ActionsTag string `index:"17" re:"\w+"`

10
engine/tp_reader.go
View File

@@ -87,6 +87,16 @@ func (tpr *TpReader) LoadTimings() (err error) {
}
tpr.timings, err = TpTimings(tps).GetTimings()
// add *any timing tag
tpr.timings[utils.ANY] = &utils.TPTiming{
TimingId: utils.ANY,
Years: utils.Years{},
Months: utils.Months{},
MonthDays: utils.MonthDays{},
WeekDays: utils.WeekDays{},
StartTime: "00:00:00",
EndTime: "",
}
return err
}