add docker starter script and fixes for rating plan validation

This commit is contained in:
Radu Ioan Fericean
2015-05-21 10:44:19 +03:00
parent d46ade3403
commit e7b47e760f
3 changed files with 9 additions and 6 deletions

View File

@@ -131,7 +131,7 @@ func (rp *RatingPlan) IsValid() bool {
}
//check if all weekdays are covered
for _, wd := range tm.WeekDays {
weekdays[wd-1] = 1
weekdays[wd] = 1
}
allWeekdaysCovered := true
for _, wd := range weekdays {

View File

@@ -242,7 +242,7 @@ func TestRatingPlanIsValidGood(t *testing.T) {
Timings: map[string]*RITiming{
"first": &RITiming{WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "00:00:00"},
"second": &RITiming{WeekDays: utils.WeekDays{4, 5, 6}, StartTime: "00:00:00"},
"third": &RITiming{WeekDays: utils.WeekDays{7}, StartTime: "00:00:00"},
"third": &RITiming{WeekDays: utils.WeekDays{0}, StartTime: "00:00:00"},
},
}
if !rpl.IsValid() {
@@ -254,7 +254,7 @@ func TestRatingPlanIsValidBad(t *testing.T) {
rpl := &RatingPlan{
Timings: map[string]*RITiming{
"first": &RITiming{WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "00:00:00"},
"second": &RITiming{WeekDays: utils.WeekDays{4, 5, 7}, StartTime: "00:00:00"},
"second": &RITiming{WeekDays: utils.WeekDays{4, 5, 0}, StartTime: "00:00:00"},
},
}
if rpl.IsValid() {
@@ -268,7 +268,7 @@ func TestRatingPlanIsValidSpecial(t *testing.T) {
"special": &RITiming{Years: utils.Years{2015}, Months: utils.Months{5}, MonthDays: utils.MonthDays{1}, StartTime: "00:00:00"},
"first": &RITiming{WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "00:00:00"},
"second": &RITiming{WeekDays: utils.WeekDays{4, 5, 6}, StartTime: "00:00:00"},
"third": &RITiming{WeekDays: utils.WeekDays{7}, StartTime: "00:00:00"},
"third": &RITiming{WeekDays: utils.WeekDays{0}, StartTime: "00:00:00"},
},
}
if !rpl.IsValid() {
@@ -283,7 +283,7 @@ func TestRatingPlanIsValidMultiple(t *testing.T) {
"first": &RITiming{WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "00:00:00"},
"first_08": &RITiming{WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "08:00:00"},
"second": &RITiming{WeekDays: utils.WeekDays{4, 5, 6}, StartTime: "00:00:00"},
"third": &RITiming{WeekDays: utils.WeekDays{7}, StartTime: "00:00:00"},
"third": &RITiming{WeekDays: utils.WeekDays{0}, StartTime: "00:00:00"},
},
}
if !rpl.IsValid() {
@@ -297,7 +297,7 @@ func TestRatingPlanIsValidMissing(t *testing.T) {
"special": &RITiming{Years: utils.Years{2015}, Months: utils.Months{5}, MonthDays: utils.MonthDays{1}, StartTime: "00:00:00"},
"first_08": &RITiming{WeekDays: utils.WeekDays{1, 2, 3}, StartTime: "08:00:00"},
"second": &RITiming{WeekDays: utils.WeekDays{4, 5, 6}, StartTime: "00:00:00"},
"third": &RITiming{WeekDays: utils.WeekDays{7}, StartTime: "00:00:00"},
"third": &RITiming{WeekDays: utils.WeekDays{0}, StartTime: "00:00:00"},
},
}
if rpl.IsValid() {

3
run_devel_docker.sh Executable file
View File

@@ -0,0 +1,3 @@
#!/usr/bin/env sh
docker run --rm -p 3306:3306 -p 6379:6379 -p 2012:2012 -itv /home/rif/Documents/prog/go/src/github.com/cgrates/cgrates:/root/code/src/github.com/cgrates/cgrates --name cgr cgrates