From 2250d9a2cc7b4b63975338e3eabe1ce99a435418 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Wed, 30 Jul 2014 19:18:59 +0300 Subject: [PATCH] regxsp++ --- engine/loader_helpers.go | 2 +- engine/loader_helpers_test.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/engine/loader_helpers.go b/engine/loader_helpers.go index 444458758..007375f6d 100644 --- a/engine/loader_helpers.go +++ b/engine/loader_helpers.go @@ -340,7 +340,7 @@ var FileValidators = map[string]*FileLineRegexValidator{ utils.ACTION_PLANS_CSV: &FileLineRegexValidator{utils.ACTION_PLANS_NRCOLS, regexp.MustCompile(`(?:\w+\s*,\s*){3}(?:\d+\.?\d*){1}`), "Tag([0-9A-Za-z_]),ActionsTag([0-9A-Za-z_]),TimingTag([0-9A-Za-z_]),Weight([0-9.])"}, - utils.ACTION_TRIGGERS_CSV: &FileLineRegexValidator{utils.ACTION_TRIGGERS_NRCOLS, regexp.MustCompile(`(?:\w+),(?:\*\w+),(?:\*out),(?:\*\w+),(?:\d+\.?\d*),(?:true|false)?,(?:\d+[smh]?),(?:\w+|\*any)?,(?:\d+\.?\d*)?,(?:\*\w+\s*|\+\d+[smh]\s*|\d+\s*)?,(?:\w+|\*any)?,(?:\w+|\*any)?,(?:\d+)?,(?:\w+),(?:\d+\.?\d*)$`), + utils.ACTION_TRIGGERS_CSV: &FileLineRegexValidator{utils.ACTION_TRIGGERS_NRCOLS, regexp.MustCompile(`(?:\w+),(?:\*\w+)?,(?:\*out)?,(?:\*\w+),(?:\d+\.?\d*),(?:true|false)?,(?:\d+[smh]?),(?:\w+|\*any)?,(?:\d+\.?\d*)?,(?:\*\w+\s*|\+\d+[smh]\s*|\d+\s*)?,(?:\w+|\*any)?,(?:\w+|\*any)?,(?:\d+)?,(?:\w+),(?:\d+\.?\d*)$`), "Tag([0-9A-Za-z_]),BalanceType(*[a-z_]),Direction(*out),ThresholdType(*[a-z_]),ThresholdValue([0-9]+),Recurrent(true|false),MinSleep([0-9]+)?,BalanceDestinationTag([0-9A-Za-z_]|*all),BalanceWeight(*[a-z_]),BalanceExpiryTime(*[a-z_]|+[0-9][smh]|[0-9]),BalanceRatingSubject(*[a-z_]),BalanceSharedGroup(*[a-z_]),StatsMinQueuedItems([0-9]+),ActionsTag([0-9A-Za-z_]),Weight([0-9]+)"}, utils.ACCOUNT_ACTIONS_CSV: &FileLineRegexValidator{utils.ACCOUNT_ACTIONS_NRCOLS, regexp.MustCompile(`(?:\w+\s*),(?:(\w+;?)+\s*),(?:\*out\s*),(?:\w+\s*),(?:\w+\s*)$`), diff --git a/engine/loader_helpers_test.go b/engine/loader_helpers_test.go index cd04e5dd2..b36a0311b 100644 --- a/engine/loader_helpers_test.go +++ b/engine/loader_helpers_test.go @@ -79,6 +79,7 @@ var actionTriggersSample = `#Tag,BalanceTag,Direction,ThresholdType,ThresholdVal STANDARD_TRIGGERS,*monetary,*out,*min_balance,2,false,0,,,,,,,LOG_WARNING,10 STANDARD_TRIGGERS,*monetary,*out,*max_balance,20,false,0,,,,,,,LOG_WARNING,10 STANDARD_TRIGGERS,*monetary,*out,*max_counter,15,false,0,FS_USERS,,,,,,LOG_WARNING,10 +CDRST1_WARN_ASR,,,*min_asr,45,true,1h,,,,,,3,CDRST_WARN_HTTP,10 DUMMY,INVALID;DATA ` @@ -311,11 +312,11 @@ func TestActionTriggersValidator(t *testing.T) { } valid := lnValidator.Rule.Match(ln) switch lineNr { - case 1, 5: + case 1, 6: if valid { t.Error("Validation passed for invalid line", string(ln)) } - case 2, 3, 4: + case 2, 3, 4, 5: if !valid { t.Error("Validation did not pass for valid line", string(ln)) }