From e7b47e760fac121e86b8d8578c240f4097388f43 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Thu, 21 May 2015 10:44:19 +0300 Subject: [PATCH] add docker starter script and fixes for rating plan validation --- engine/ratingplan.go | 2 +- engine/ratingplan_test.go | 10 +++++----- run_devel_docker.sh | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) create mode 100755 run_devel_docker.sh diff --git a/engine/ratingplan.go b/engine/ratingplan.go index 80350a789..615f070c4 100644 --- a/engine/ratingplan.go +++ b/engine/ratingplan.go @@ -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 { diff --git a/engine/ratingplan_test.go b/engine/ratingplan_test.go index cfc3691e8..a20393a9d 100644 --- a/engine/ratingplan_test.go +++ b/engine/ratingplan_test.go @@ -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() { diff --git a/run_devel_docker.sh b/run_devel_docker.sh new file mode 100755 index 000000000..81ff9396d --- /dev/null +++ b/run_devel_docker.sh @@ -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