diff --git a/actions/actions.go b/actions/actions.go index dff2ad11f..2bb382ace 100644 --- a/actions/actions.go +++ b/actions/actions.go @@ -123,7 +123,7 @@ func (aS *ActionS) scheduleActions(cgrEvs []*utils.CGREventWithOpts, aPrflIDs [] continue } for _, sActs := range schedActSet { - if sActs.schedule == utils.ASAP { + if sActs.schedule == utils.MetaASAP { go aS.asapExecuteActions(sActs) continue } diff --git a/agents/agentreq_test.go b/agents/agentreq_test.go index 1bf7b5208..06f26a1c3 100644 --- a/agents/agentreq_test.go +++ b/agents/agentreq_test.go @@ -66,45 +66,45 @@ func TestAgReqSetFields(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Tenant", Path: utils.MetaRep + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep)}, {Tag: "Account", Path: utils.MetaRep + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.InfieldSep)}, {Tag: "Destination", Path: utils.MetaRep + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgreq.Destination", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Destination", utils.InfieldSep)}, {Tag: "RequestedUsageVoice", Path: utils.MetaRep + utils.NestingSep + "RequestedUsage", Type: utils.MetaVariable, Filters: []string{"*string:~*cgreq.ToR:*voice"}, Value: config.NewRSRParsersMustCompile( - "~*cgreq.Usage{*duration_seconds}", utils.INFIELD_SEP)}, + "~*cgreq.Usage{*duration_seconds}", utils.InfieldSep)}, {Tag: "RequestedUsageData", Path: utils.MetaRep + utils.NestingSep + "RequestedUsage", Type: utils.MetaVariable, Filters: []string{"*string:~*cgreq.ToR:*data"}, Value: config.NewRSRParsersMustCompile( - "~*cgreq.Usage{*duration_nanoseconds}", utils.INFIELD_SEP)}, + "~*cgreq.Usage{*duration_nanoseconds}", utils.InfieldSep)}, {Tag: "RequestedUsageSMS", Path: utils.MetaRep + utils.NestingSep + "RequestedUsage", Type: utils.MetaVariable, Filters: []string{"*string:~*cgreq.ToR:*sms"}, Value: config.NewRSRParsersMustCompile( - "~*cgreq.Usage{*duration_nanoseconds}", utils.INFIELD_SEP)}, + "~*cgreq.Usage{*duration_nanoseconds}", utils.InfieldSep)}, {Tag: "AttrPaypalAccount", Path: utils.MetaRep + utils.NestingSep + "PaypalAccount", Type: utils.MetaVariable, Filters: []string{"*empty:~*cgrep.Error:"}, Value: config.NewRSRParsersMustCompile( - "~*cgrep.Attributes.PaypalAccount", utils.INFIELD_SEP)}, + "~*cgrep.Attributes.PaypalAccount", utils.InfieldSep)}, {Tag: "MaxUsage", Path: utils.MetaRep + utils.NestingSep + "MaxUsage", Type: utils.MetaVariable, Filters: []string{"*empty:~*cgrep.Error:"}, Value: config.NewRSRParsersMustCompile( - "~*cgrep.MaxUsage{*duration_seconds}", utils.INFIELD_SEP)}, + "~*cgrep.MaxUsage{*duration_seconds}", utils.InfieldSep)}, {Tag: "Error", Path: utils.MetaRep + utils.NestingSep + "Error", Type: utils.MetaVariable, Filters: []string{"*rsr:~*cgrep.Error:!^$"}, Value: config.NewRSRParsersMustCompile( - "~*cgrep.Error", utils.INFIELD_SEP)}, + "~*cgrep.Error", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() @@ -169,7 +169,7 @@ func TestAgentRequestSetFields(t *testing.T) { Path: fmt.Sprintf("%s.Account", utils.MetaVars), Tag: fmt.Sprintf("%s.Account", utils.MetaVars), Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Account", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Account", utils.InfieldSep), }, } input[0].ComputePath() @@ -192,7 +192,7 @@ func TestAgentRequestSetFields(t *testing.T) { Path: fmt.Sprintf("%s.Account", utils.MetaCgreq), Tag: fmt.Sprintf("%s.Account", utils.MetaCgreq), Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Account", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Account", utils.InfieldSep), }, } input[0].ComputePath() @@ -214,7 +214,7 @@ func TestAgentRequestSetFields(t *testing.T) { Path: fmt.Sprintf("%s.Account", utils.MetaCgrep), Tag: fmt.Sprintf("%s.Account", utils.MetaCgrep), Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Account", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Account", utils.InfieldSep), }, } input[0].ComputePath() @@ -236,7 +236,7 @@ func TestAgentRequestSetFields(t *testing.T) { Path: fmt.Sprintf("%s.Account", utils.MetaRep), Tag: fmt.Sprintf("%s.Account", utils.MetaRep), Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Account", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Account", utils.InfieldSep), }, } input[0].ComputePath() @@ -258,7 +258,7 @@ func TestAgentRequestSetFields(t *testing.T) { Path: fmt.Sprintf("%s.Account", utils.MetaDiamreq), Tag: fmt.Sprintf("%s.Account", utils.MetaDiamreq), Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Account", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Account", utils.InfieldSep), }, } input[0].ComputePath() @@ -280,19 +280,19 @@ func TestAgentRequestSetFields(t *testing.T) { Path: fmt.Sprintf("%s.AccountID", utils.MetaVars), Tag: fmt.Sprintf("%s.AccountID", utils.MetaVars), Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Tenant", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Tenant", utils.InfieldSep), }, { Path: fmt.Sprintf("%s.AccountID", utils.MetaVars), Tag: fmt.Sprintf("%s.AccountID", utils.MetaVars), Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile(":", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile(":", utils.InfieldSep), }, { Path: fmt.Sprintf("%s.AccountID", utils.MetaVars), Tag: fmt.Sprintf("%s.AccountID", utils.MetaVars), Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Account", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Account", utils.InfieldSep), }, } for _, v := range input { @@ -317,7 +317,7 @@ func TestAgentRequestSetFields(t *testing.T) { Path: fmt.Sprintf("%s.Account", utils.MetaVars), Tag: fmt.Sprintf("%s.Account", utils.MetaVars), Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("2020", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("2020", utils.InfieldSep), }, } input[0].ComputePath() @@ -340,7 +340,7 @@ func TestAgentRequestSetFields(t *testing.T) { Tag: fmt.Sprintf("%s.AccountID", utils.MetaVars), Filters: []string{utils.MetaString + ":~" + utils.MetaVars + ".Account:1003"}, Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("2021", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("2021", utils.InfieldSep), }, } input[0].ComputePath() @@ -362,7 +362,7 @@ func TestAgentRequestSetFields(t *testing.T) { Tag: fmt.Sprintf("%s.Account", utils.MetaVars), Filters: []string{"Not really a filter"}, Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("2021", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("2021", utils.InfieldSep), }, } input[0].ComputePath() @@ -376,14 +376,14 @@ func TestAgentRequestSetFields(t *testing.T) { Path: fmt.Sprintf("%s.Name", utils.MetaVars), Tag: fmt.Sprintf("%s.Name", utils.MetaVars), Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Account", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Account", utils.InfieldSep), Blocker: true, }, { Path: fmt.Sprintf("%s.Name", utils.MetaVars), Tag: fmt.Sprintf("%s.Name", utils.MetaVars), Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("1005", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1005", utils.InfieldSep), }, } for _, v := range input { @@ -407,7 +407,7 @@ func TestAgentRequestSetFields(t *testing.T) { Path: fmt.Sprintf("%s.Test", utils.MetaVars), Tag: fmt.Sprintf("%s.Test", utils.MetaVars), Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Test", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Test", utils.InfieldSep), }, } input[0].ComputePath() @@ -421,7 +421,7 @@ func TestAgentRequestSetFields(t *testing.T) { Path: fmt.Sprintf("%s.Test", utils.MetaVars), Tag: fmt.Sprintf("%s.Test", utils.MetaVars), Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Test", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Test", utils.InfieldSep), Mandatory: true, }, } @@ -436,7 +436,7 @@ func TestAgentRequestSetFields(t *testing.T) { Path: "wrong", Tag: "wrong", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.Account", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Account", utils.InfieldSep), Mandatory: true, }, } @@ -451,7 +451,7 @@ func TestAgentRequestSetFields(t *testing.T) { Path: fmt.Sprintf("%s.Account4", utils.MetaVars), Tag: fmt.Sprintf("%s.Account4", utils.MetaVars), Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~"+utils.MetaHdr+".Account", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~"+utils.MetaHdr+".Account", utils.InfieldSep), }, } input[0].ComputePath() @@ -472,7 +472,7 @@ func TestAgentRequestSetFields(t *testing.T) { Path: fmt.Sprintf("%s.Account5", utils.MetaVars), Tag: fmt.Sprintf("%s.Account5", utils.MetaVars), Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~"+utils.MetaTrl+".Account", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~"+utils.MetaTrl+".Account", utils.InfieldSep), }, } input[0].ComputePath() @@ -508,7 +508,7 @@ func TestAgReqMaxCost(t *testing.T) { Path: utils.MetaRep + utils.NestingSep + "MaxUsage", Type: utils.MetaVariable, Filters: []string{"*rsr:~*cgrep.MaxUsage:>0s"}, Value: config.NewRSRParsersMustCompile( - "~*cgrep.MaxUsage{*duration_seconds}", utils.INFIELD_SEP)}, + "~*cgrep.MaxUsage{*duration_seconds}", utils.InfieldSep)}, } tplFlds[0].ComputePath() eMp := utils.NewOrderedNavigableMap() @@ -546,15 +546,15 @@ func TestAgReqParseFieldDiameter(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "MandatoryFalse", Path: "MandatoryFalse", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.MandatoryFalse", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.MandatoryFalse", utils.InfieldSep), Mandatory: false}, {Tag: "MandatoryTrue", Path: "MandatoryTrue", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.MandatoryTrue", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.MandatoryTrue", utils.InfieldSep), Mandatory: true}, {Tag: "Session-Id", Filters: []string{}, Path: "Session-Id", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, } for _, v := range tplFlds { @@ -598,11 +598,11 @@ func TestAgReqParseFieldRadius(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "MandatoryFalse", Path: "MandatoryFalse", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.MandatoryFalse", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.MandatoryFalse", utils.InfieldSep), Mandatory: false}, {Tag: "MandatoryTrue", Path: "MandatoryTrue", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.MandatoryTrue", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.MandatoryTrue", utils.InfieldSep), Mandatory: true}, } for _, v := range tplFlds { @@ -641,11 +641,11 @@ Host: api.cgrates.org tplFlds := []*config.FCTemplate{ {Tag: "MandatoryFalse", Path: "MandatoryFalse", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.MandatoryFalse", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.MandatoryFalse", utils.InfieldSep), Mandatory: false}, {Tag: "MandatoryTrue", Path: "MandatoryTrue", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.MandatoryTrue", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.MandatoryTrue", utils.InfieldSep), Mandatory: true}, } expected := "" @@ -713,11 +713,11 @@ func TestAgReqParseFieldHttpXml(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "MandatoryFalse", Path: "MandatoryFalse", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.MandatoryFalse", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.MandatoryFalse", utils.InfieldSep), Mandatory: false}, {Tag: "MandatoryTrue", Path: "MandatoryTrue", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.MandatoryTrue", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.MandatoryTrue", utils.InfieldSep), Mandatory: true}, } expected := "" @@ -747,14 +747,14 @@ func TestAgReqEmptyFilter(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Tenant", Filters: []string{}, Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep)}, {Tag: "Account", Filters: []string{}, Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.InfieldSep)}, {Tag: "Destination", Filters: []string{}, Path: utils.MetaCgrep + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgreq.Destination", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Destination", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() @@ -789,7 +789,7 @@ func TestAgReqMetaExponent(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "TestExpo", Filters: []string{}, Path: utils.MetaCgrep + utils.NestingSep + "TestExpo", Type: utils.MetaValueExponent, - Value: config.NewRSRParsersMustCompile("~*cgreq.Value;~*cgreq.Exponent", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Value;~*cgreq.Exponent", utils.InfieldSep)}, } tplFlds[0].ComputePath() eMp := &utils.NavigableMap2{} @@ -818,14 +818,14 @@ func TestAgReqFieldAsNone(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Tenant", Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep)}, {Tag: "Account", Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.InfieldSep)}, {Type: utils.MetaNone, Blocker: true}, {Tag: "Destination", Path: utils.MetaCgrep + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgreq.Destination", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Destination", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() @@ -858,14 +858,14 @@ func TestAgReqFieldAsNone2(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Tenant", Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep)}, {Tag: "Account", Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.InfieldSep)}, {Type: utils.MetaNone}, {Tag: "Destination", Path: utils.MetaCgrep + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgreq.Destination", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Destination", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() @@ -906,19 +906,19 @@ func TestAgReqSetField2(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Tenant", Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep)}, {Tag: "Account", Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.InfieldSep)}, {Tag: "Destination", Path: utils.MetaCgrep + utils.NestingSep + utils.Destination, Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*cgreq.Destination", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Destination", utils.InfieldSep)}, {Tag: "Usage", Path: utils.MetaCgrep + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("30s", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("30s", utils.InfieldSep)}, {Tag: "CalculatedUsage", Path: utils.MetaCgrep + utils.NestingSep + "CalculatedUsage", - Type: "*difference", Value: config.NewRSRParsersMustCompile("~*cgreq.AnswerTime;~*cgrep.Usage", utils.INFIELD_SEP), + Type: "*difference", Value: config.NewRSRParsersMustCompile("~*cgreq.AnswerTime;~*cgrep.Usage", utils.InfieldSep), }, } for _, v := range tplFlds { @@ -1022,10 +1022,10 @@ func TestAgReqNewARWithCGRRplyAndRply(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Fld1", Path: utils.MetaCgreq + utils.NestingSep + "Fld1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*rep.FirstLevel.SecondLevel.Fld1", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*rep.FirstLevel.SecondLevel.Fld1", utils.InfieldSep)}, {Tag: "Fld2", Path: utils.MetaCgreq + utils.NestingSep + "Fld2", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.PaypalAccount", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.PaypalAccount", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() @@ -1067,10 +1067,10 @@ func TestAgReqSetCGRReplyWithError(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Fld1", Path: utils.MetaCgreq + utils.NestingSep + "Fld1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*rep.FirstLevel.SecondLevel.Fld1", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*rep.FirstLevel.SecondLevel.Fld1", utils.InfieldSep)}, {Tag: "Fld2", Path: utils.MetaCgreq + utils.NestingSep + "Fld2", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.PaypalAccount", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.PaypalAccount", utils.InfieldSep), Mandatory: true}, } for _, v := range tplFlds { @@ -1119,10 +1119,10 @@ func TestAgReqSetCGRReplyWithoutError(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Fld1", Path: utils.MetaCgreq + utils.NestingSep + "Fld1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*rep.FirstLevel.SecondLevel.Fld1", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*rep.FirstLevel.SecondLevel.Fld1", utils.InfieldSep)}, {Tag: "Fld2", Path: utils.MetaCgreq + utils.NestingSep + "Fld2", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.PaypalAccount", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.PaypalAccount", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() @@ -1164,7 +1164,7 @@ func TestAgReqParseFieldMetaCCUsage(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "CCUsage", Filters: []string{}, Path: "CCUsage", Type: utils.MetaCCUsage, - Value: config.NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, } tplFlds[0].ComputePath() @@ -1177,7 +1177,7 @@ func TestAgReqParseFieldMetaCCUsage(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "CCUsage", Filters: []string{}, Path: "CCUsage", Type: utils.MetaCCUsage, - Value: config.NewRSRParsersMustCompile("~*req.Session-Id;12s;12s", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Session-Id;12s;12s", utils.InfieldSep), Mandatory: true}, } tplFlds[0].ComputePath() @@ -1189,7 +1189,7 @@ func TestAgReqParseFieldMetaCCUsage(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "CCUsage", Filters: []string{}, Path: "CCUsage", Type: utils.MetaCCUsage, - Value: config.NewRSRParsersMustCompile("10;~*req.Session-Id;12s", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("10;~*req.Session-Id;12s", utils.InfieldSep), Mandatory: true}, } tplFlds[0].ComputePath() @@ -1201,7 +1201,7 @@ func TestAgReqParseFieldMetaCCUsage(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "CCUsage", Filters: []string{}, Path: "CCUsage", Type: utils.MetaCCUsage, - Value: config.NewRSRParsersMustCompile("10;12s;~*req.Session-Id", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("10;12s;~*req.Session-Id", utils.InfieldSep), Mandatory: true}, } tplFlds[0].ComputePath() @@ -1213,7 +1213,7 @@ func TestAgReqParseFieldMetaCCUsage(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "CCUsage", Filters: []string{}, Path: "CCUsage", Type: utils.MetaCCUsage, - Value: config.NewRSRParsersMustCompile("3;10s;5s", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("3;10s;5s", utils.InfieldSep), Mandatory: true}, } tplFlds[0].ComputePath() @@ -1248,7 +1248,7 @@ func TestAgReqParseFieldMetaUsageDifference(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Usage", Filters: []string{}, Path: "Usage", Type: utils.META_USAGE_DIFFERENCE, - Value: config.NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, } if _, err := agReq.ParseField(tplFlds[0]); err == nil || @@ -1259,7 +1259,7 @@ func TestAgReqParseFieldMetaUsageDifference(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "Usage", Filters: []string{}, Path: "Usage", Type: utils.META_USAGE_DIFFERENCE, - Value: config.NewRSRParsersMustCompile("1560325161;~*req.Session-Id", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1560325161;~*req.Session-Id", utils.InfieldSep), Mandatory: true}, } if _, err := agReq.ParseField(tplFlds[0]); err == nil || @@ -1270,7 +1270,7 @@ func TestAgReqParseFieldMetaUsageDifference(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "Usage", Filters: []string{}, Path: "Usage", Type: utils.META_USAGE_DIFFERENCE, - Value: config.NewRSRParsersMustCompile("~*req.Session-Id;1560325161", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Session-Id;1560325161", utils.InfieldSep), Mandatory: true}, } if _, err := agReq.ParseField(tplFlds[0]); err == nil || @@ -1281,7 +1281,7 @@ func TestAgReqParseFieldMetaUsageDifference(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "Usage", Filters: []string{}, Path: "Usage", Type: utils.META_USAGE_DIFFERENCE, - Value: config.NewRSRParsersMustCompile("1560325161;1560325151", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1560325161;1560325151", utils.InfieldSep), Mandatory: true}, } expected := "10s" @@ -1314,7 +1314,7 @@ func TestAgReqParseFieldMetaSum(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Sum", Filters: []string{}, Path: "Sum", Type: utils.MetaSum, - Value: config.NewRSRParsersMustCompile("15;~*req.Session-Id", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("15;~*req.Session-Id", utils.InfieldSep), Mandatory: true}, } if _, err := agReq.ParseField(tplFlds[0]); err == nil || @@ -1325,7 +1325,7 @@ func TestAgReqParseFieldMetaSum(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "Sum", Filters: []string{}, Path: "Sum", Type: utils.MetaSum, - Value: config.NewRSRParsersMustCompile("15;15", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("15;15", utils.InfieldSep), Mandatory: true}, } expected := int64(30) @@ -1358,7 +1358,7 @@ func TestAgReqParseFieldMetaDifference(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Diff", Filters: []string{}, Path: "Diff", Type: utils.MetaDifference, - Value: config.NewRSRParsersMustCompile("15;~*req.Session-Id", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("15;~*req.Session-Id", utils.InfieldSep), Mandatory: true}, } if _, err := agReq.ParseField(tplFlds[0]); err == nil || @@ -1369,7 +1369,7 @@ func TestAgReqParseFieldMetaDifference(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "Diff", Filters: []string{}, Path: "Diff", Type: utils.MetaDifference, - Value: config.NewRSRParsersMustCompile("15;12;2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("15;12;2", utils.InfieldSep), Mandatory: true}, } expected := int64(1) @@ -1402,7 +1402,7 @@ func TestAgReqParseFieldMetaMultiply(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Multiply", Filters: []string{}, Path: "Multiply", Type: utils.MetaMultiply, - Value: config.NewRSRParsersMustCompile("15;~*req.Session-Id", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("15;~*req.Session-Id", utils.InfieldSep), Mandatory: true}, } if _, err := agReq.ParseField(tplFlds[0]); err == nil || @@ -1413,7 +1413,7 @@ func TestAgReqParseFieldMetaMultiply(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "Multiply", Filters: []string{}, Path: "Multiply", Type: utils.MetaMultiply, - Value: config.NewRSRParsersMustCompile("15;15", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("15;15", utils.InfieldSep), Mandatory: true}, } expected := int64(225) @@ -1446,7 +1446,7 @@ func TestAgReqParseFieldMetaDivide(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Divide", Filters: []string{}, Path: "Divide", Type: utils.MetaDivide, - Value: config.NewRSRParsersMustCompile("15;~*req.Session-Id", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("15;~*req.Session-Id", utils.InfieldSep), Mandatory: true}, } if _, err := agReq.ParseField(tplFlds[0]); err == nil || @@ -1457,7 +1457,7 @@ func TestAgReqParseFieldMetaDivide(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "Divide", Filters: []string{}, Path: "Divide", Type: utils.MetaDivide, - Value: config.NewRSRParsersMustCompile("15;3", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("15;3", utils.InfieldSep), Mandatory: true}, } expected := int64(5) @@ -1490,7 +1490,7 @@ func TestAgReqParseFieldMetaValueExponent(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "ValExp", Filters: []string{}, Path: "ValExp", Type: utils.MetaValueExponent, - Value: config.NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, } if _, err := agReq.ParseField(tplFlds[0]); err == nil || @@ -1501,7 +1501,7 @@ func TestAgReqParseFieldMetaValueExponent(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "ValExp", Filters: []string{}, Path: "ValExp", Type: utils.MetaValueExponent, - Value: config.NewRSRParsersMustCompile("15;~*req.Session-Id", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("15;~*req.Session-Id", utils.InfieldSep), Mandatory: true}, } if _, err := agReq.ParseField(tplFlds[0]); err == nil || @@ -1512,7 +1512,7 @@ func TestAgReqParseFieldMetaValueExponent(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "ValExp", Filters: []string{}, Path: "ValExp", Type: utils.MetaValueExponent, - Value: config.NewRSRParsersMustCompile("~*req.Session-Id;15", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Session-Id;15", utils.InfieldSep), Mandatory: true}, } if _, err := agReq.ParseField(tplFlds[0]); err == nil || @@ -1522,7 +1522,7 @@ func TestAgReqParseFieldMetaValueExponent(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "ValExp", Filters: []string{}, Path: "ValExp", Type: utils.MetaValueExponent, - Value: config.NewRSRParsersMustCompile("2;3", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("2;3", utils.InfieldSep), Mandatory: true}, } expected := "2000" @@ -1552,19 +1552,19 @@ func TestAgReqOverwrite(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Account", Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep)}, {Tag: "Account", Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile(":", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile(":", utils.InfieldSep)}, {Tag: "Account", Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.InfieldSep)}, {Tag: "Account", Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("OverwrittenAccount", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("OverwrittenAccount", utils.InfieldSep)}, {Tag: "Account", Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("WithComposed", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("WithComposed", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() @@ -1604,10 +1604,10 @@ func TestAgReqGroupType(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Account", Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaGroup, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep)}, {Tag: "Account", Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaGroup, - Value: config.NewRSRParsersMustCompile("test", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("test", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() @@ -1640,10 +1640,10 @@ func TestAgReqSetFieldsInTmp(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Tenant", Path: utils.MetaTmp + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep)}, {Tag: "Account", Path: utils.MetaTmp + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() @@ -1674,7 +1674,7 @@ func TestAgReqSetFieldsIp2Hex(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "IP", Path: utils.MetaTmp + utils.NestingSep + "IP", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgreq.IP{*ip2hex}", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.IP{*ip2hex}", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() @@ -1702,7 +1702,7 @@ func TestAgReqSetFieldsString2Hex(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "CustomField", Path: utils.MetaTmp + utils.NestingSep + "CustomField", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgreq.CustomField{*string2hex}", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.CustomField{*string2hex}", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() @@ -1747,45 +1747,45 @@ func TestAgReqSetFieldsWithRemove(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Tenant", Path: utils.MetaRep + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep)}, {Tag: "Account", Path: utils.MetaRep + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.InfieldSep)}, {Tag: "Destination", Path: utils.MetaRep + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgreq.Destination", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Destination", utils.InfieldSep)}, {Tag: "RequestedUsageVoice", Path: utils.MetaRep + utils.NestingSep + "RequestedUsage", Type: utils.MetaVariable, Filters: []string{"*string:~*cgreq.ToR:*voice"}, Value: config.NewRSRParsersMustCompile( - "~*cgreq.Usage{*duration_seconds}", utils.INFIELD_SEP)}, + "~*cgreq.Usage{*duration_seconds}", utils.InfieldSep)}, {Tag: "RequestedUsageData", Path: utils.MetaRep + utils.NestingSep + "RequestedUsage", Type: utils.MetaVariable, Filters: []string{"*string:~*cgreq.ToR:*data"}, Value: config.NewRSRParsersMustCompile( - "~*cgreq.Usage{*duration_nanoseconds}", utils.INFIELD_SEP)}, + "~*cgreq.Usage{*duration_nanoseconds}", utils.InfieldSep)}, {Tag: "RequestedUsageSMS", Path: utils.MetaRep + utils.NestingSep + "RequestedUsage", Type: utils.MetaVariable, Filters: []string{"*string:~*cgreq.ToR:*sms"}, Value: config.NewRSRParsersMustCompile( - "~*cgreq.Usage{*duration_nanoseconds}", utils.INFIELD_SEP)}, + "~*cgreq.Usage{*duration_nanoseconds}", utils.InfieldSep)}, {Tag: "AttrPaypalAccount", Path: utils.MetaRep + utils.NestingSep + "PaypalAccount", Type: utils.MetaVariable, Filters: []string{"*empty:~*cgrep.Error:"}, Value: config.NewRSRParsersMustCompile( - "~*cgrep.Attributes.PaypalAccount", utils.INFIELD_SEP)}, + "~*cgrep.Attributes.PaypalAccount", utils.InfieldSep)}, {Tag: "MaxUsage", Path: utils.MetaRep + utils.NestingSep + "MaxUsage", Type: utils.MetaVariable, Filters: []string{"*empty:~*cgrep.Error:"}, Value: config.NewRSRParsersMustCompile( - "~*cgrep.MaxUsage{*duration_seconds}", utils.INFIELD_SEP)}, + "~*cgrep.MaxUsage{*duration_seconds}", utils.InfieldSep)}, {Tag: "Error", Path: utils.MetaRep + utils.NestingSep + "Error", Type: utils.MetaVariable, Filters: []string{"*rsr:~*cgrep.Error:!^$"}, Value: config.NewRSRParsersMustCompile( - "~*cgrep.Error", utils.INFIELD_SEP)}, + "~*cgrep.Error", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() @@ -1869,10 +1869,10 @@ func TestAgReqSetFieldsInCache(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Tenant", Path: utils.MetaUCH + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep)}, {Tag: "Account", Path: utils.MetaUCH + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() @@ -1912,10 +1912,10 @@ func TestAgReqSetFieldsInCacheWithTimeOut(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Tenant", Path: utils.MetaUCH + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep)}, {Tag: "Account", Path: utils.MetaUCH + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() @@ -2005,11 +2005,11 @@ func TestAgReqFiltersInsideField(t *testing.T) { {Tag: "Usage", Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, Type: utils.MetaCCUsage, Value: config.NewRSRParsersMustCompile("~*req.CC-Request-Number;~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/;5m", - utils.INFIELD_SEP)}, + utils.InfieldSep)}, {Tag: "AnswerTime", Path: utils.MetaCgreq + utils.NestingSep + utils.AnswerTime, Type: utils.MetaDifference, Filters: []string{"*gt:~*cgreq.Usage:0s"}, // populate answer time if usage is greater than zero - Value: config.NewRSRParsersMustCompile("~*req.Event-Timestamp;~*cgreq.Usage", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.Event-Timestamp;~*cgreq.Usage", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() @@ -2049,23 +2049,23 @@ func TestAgReqDynamicPath(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Tenant", Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep)}, {Tag: "Account", Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.InfieldSep)}, {Tag: "Destination", Path: utils.MetaCgrep + utils.NestingSep + utils.Destination, Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*cgreq.Destination", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Destination", utils.InfieldSep)}, {Tag: "Usage", Path: utils.MetaCgrep + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("30s", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("30s", utils.InfieldSep)}, {Tag: "Route", Path: utils.MetaCgrep + utils.NestingSep + "Route", Type: utils.MetaVariable, Value: val1, }, {Tag: "Route2", Path: utils.MetaCgrep + utils.NestingSep + "Route2.", - Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("~*cgreq.Routes[CGR_ROUTE2]", utils.INFIELD_SEP), + Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("~*cgreq.Routes[CGR_ROUTE2]", utils.InfieldSep), }, } for _, v := range tplFlds { @@ -2118,7 +2118,7 @@ func TestAgReqRoundingDecimals(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Cost", Path: utils.MetaCgrep + utils.NestingSep + utils.Cost, Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*cgreq.Cost{*round:3}", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Cost{*round:3}", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() @@ -2158,13 +2158,13 @@ func BenchmarkAgReqSetField(b *testing.B) { tplFlds := []*config.FCTemplate{ {Tag: "Tenant", Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep)}, {Tag: "Account", Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField + "[0].ID", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.InfieldSep)}, {Tag: "Account2", Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField + "[1].ID", Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("1003", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("1003", utils.InfieldSep)}, } for _, v := range tplFlds { v.ComputePath() diff --git a/agents/diamagent_test.go b/agents/diamagent_test.go index a04ee33ce..a8dc9de6b 100644 --- a/agents/diamagent_test.go +++ b/agents/diamagent_test.go @@ -69,37 +69,37 @@ func TestProcessRequest(t *testing.T) { } reqProcessor := &config.RequestProcessor{ ID: "Default", - Tenant: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Tenant: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Filters: []string{}, RequestFields: []*config.FCTemplate{ {Tag: utils.ToR, Type: utils.META_CONSTANT, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, - Value: config.NewRSRParsersMustCompile(utils.VOICE, utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile(utils.VOICE, utils.InfieldSep)}, {Tag: utils.OriginID, Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, - Value: config.NewRSRParsersMustCompile("~*req.SessionId", utils.INFIELD_SEP), Mandatory: true}, + Value: config.NewRSRParsersMustCompile("~*req.SessionId", utils.InfieldSep), Mandatory: true}, {Tag: utils.OriginHost, Type: utils.MetaRemoteHost, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginHost, Mandatory: true}, {Tag: utils.Category, Type: utils.META_CONSTANT, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, - Value: config.NewRSRParsersMustCompile(utils.CALL, utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile(utils.CALL, utils.InfieldSep)}, {Tag: utils.AccountField, Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, - Value: config.NewRSRParsersMustCompile("~*req.Account", utils.INFIELD_SEP), Mandatory: true}, + Value: config.NewRSRParsersMustCompile("~*req.Account", utils.InfieldSep), Mandatory: true}, {Tag: utils.Destination, Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, - Value: config.NewRSRParsersMustCompile("~*req.Destination", utils.INFIELD_SEP), Mandatory: true}, + Value: config.NewRSRParsersMustCompile("~*req.Destination", utils.InfieldSep), Mandatory: true}, {Tag: utils.Usage, Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, - Value: config.NewRSRParsersMustCompile("~*req.Usage", utils.INFIELD_SEP), Mandatory: true}, + Value: config.NewRSRParsersMustCompile("~*req.Usage", utils.InfieldSep), Mandatory: true}, }, ReplyFields: []*config.FCTemplate{ {Tag: "ResultCode", Type: utils.META_CONSTANT, Path: utils.MetaRep + utils.NestingSep + "ResultCode", - Value: config.NewRSRParsersMustCompile("2001", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("2001", utils.InfieldSep)}, {Tag: "GrantedUnits", Type: utils.MetaVariable, Path: utils.MetaRep + utils.NestingSep + "Granted-Service-Unit.CC-Time", - Value: config.NewRSRParsersMustCompile("~*cgrep.MaxUsage{*duration_seconds}", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*cgrep.MaxUsage{*duration_seconds}", utils.InfieldSep), Mandatory: true}, }, } @@ -516,7 +516,7 @@ func TestProcessRequest(t *testing.T) { reqProcessor.Flags = utils.FlagsWithParamsFromSlice([]string{utils.MetaTerminate, utils.MetaAccounts, utils.MetaAttributes, utils.MetaCDRs}) reqProcessor.ReplyFields = []*config.FCTemplate{{Tag: "ResultCode", Type: utils.META_CONSTANT, Path: utils.MetaRep + utils.NestingSep + "ResultCode", - Value: config.NewRSRParsersMustCompile("2001", utils.INFIELD_SEP)}} + Value: config.NewRSRParsersMustCompile("2001", utils.InfieldSep)}} for _, v := range reqProcessor.ReplyFields { v.ComputePath() } diff --git a/agents/librad_test.go b/agents/librad_test.go index 498e48dfe..61eaf138d 100644 --- a/agents/librad_test.go +++ b/agents/librad_test.go @@ -81,10 +81,10 @@ func TestRadReplyAppendAttributes(t *testing.T) { rplyFlds := []*config.FCTemplate{ {Tag: "ReplyCode", Path: utils.MetaRep + utils.NestingSep + MetaRadReplyCode, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.RadReply", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.RadReply", utils.InfieldSep)}, {Tag: "Acct-Session-Time", Path: utils.MetaRep + utils.NestingSep + "Acct-Session-Time", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgrep.MaxUsage{*duration_seconds}", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgrep.MaxUsage{*duration_seconds}", utils.InfieldSep)}, } for _, v := range rplyFlds { v.ComputePath() diff --git a/agents/libsip_test.go b/agents/libsip_test.go index f30dc98e4..aa1fe5c18 100644 --- a/agents/libsip_test.go +++ b/agents/libsip_test.go @@ -33,10 +33,10 @@ func TestUpdateSIPMsgFromNavMap(t *testing.T) { rplyFlds := []*config.FCTemplate{ {Tag: "Request", Path: utils.MetaRep + utils.NestingSep + "Request", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.Request", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.Request", utils.InfieldSep)}, {Tag: "Contact", Path: utils.MetaRep + utils.NestingSep + "Contact", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.Account", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.Account", utils.InfieldSep)}, } for _, v := range rplyFlds { v.ComputePath() diff --git a/apier/v1/actions_it_test.go b/apier/v1/actions_it_test.go index 5c89d768f..0e4c3374c 100644 --- a/apier/v1/actions_it_test.go +++ b/apier/v1/actions_it_test.go @@ -130,7 +130,7 @@ func testActionSGetActionProfile(t *testing.T) { ID: "ONE_TIME_ACT", FilterIDs: []string{}, Weight: 10, - Schedule: utils.ASAP, + Schedule: utils.MetaASAP, Targets: map[string]utils.StringSet{ utils.MetaAccounts: utils.StringSet{"1001": {}, "1002": {}}, }, diff --git a/apier/v1/apier.go b/apier/v1/apier.go index b116d56ba..0e76afea6 100644 --- a/apier/v1/apier.go +++ b/apier/v1/apier.go @@ -835,7 +835,7 @@ func (apierSv1 *APIerSv1) SetActionPlan(attrs *AttrSetActionPlan, reply *string) func verifyFormat(tStr string) bool { if tStr == utils.EmptyString || - tStr == utils.ASAP { + tStr == utils.MetaASAP { return true } @@ -1051,7 +1051,7 @@ func (apierSv1 *APIerSv1) LoadTariffPlanFromFolder(attrs *utils.AttrLoadTpFromFo // create the TpReader loader, err := engine.NewTpReader(apierSv1.DataManager.DataDB(), - engine.NewFileCSVStorage(utils.CSV_SEP, attrs.FolderPath), + engine.NewFileCSVStorage(utils.CSVSep, attrs.FolderPath), "", apierSv1.Config.GeneralCfg().DefaultTimezone, apierSv1.Config.ApierCfg().CachesConns, apierSv1.Config.ApierCfg().SchedulerConns, apierSv1.Config.DataDbCfg().DataDbType == utils.INTERNAL) @@ -1118,7 +1118,7 @@ func (apierSv1 *APIerSv1) RemoveTPFromFolder(attrs *utils.AttrLoadTpFromFolder, // create the TpReader loader, err := engine.NewTpReader(apierSv1.DataManager.DataDB(), - engine.NewFileCSVStorage(utils.CSV_SEP, attrs.FolderPath), "", apierSv1.Config.GeneralCfg().DefaultTimezone, + engine.NewFileCSVStorage(utils.CSVSep, attrs.FolderPath), "", apierSv1.Config.GeneralCfg().DefaultTimezone, apierSv1.Config.ApierCfg().CachesConns, apierSv1.Config.ApierCfg().SchedulerConns, apierSv1.Config.DataDbCfg().DataDbType == utils.INTERNAL) if err != nil { @@ -1558,7 +1558,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st defer f.Close() csvWriter := csv.NewWriter(f) - csvWriter.Comma = utils.CSV_SEP + csvWriter.Comma = utils.CSVSep //write the header of the file if err := csvWriter.Write(engine.AttributeMdls{}.CSVHeader()); err != nil { return err @@ -1596,7 +1596,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st defer f.Close() csvWriter := csv.NewWriter(f) - csvWriter.Comma = utils.CSV_SEP + csvWriter.Comma = utils.CSVSep //write the header of the file if err := csvWriter.Write(engine.ChargerMdls{}.CSVHeader()); err != nil { return err @@ -1634,7 +1634,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st defer f.Close() csvWriter := csv.NewWriter(f) - csvWriter.Comma = utils.CSV_SEP + csvWriter.Comma = utils.CSVSep //write the header of the file if err := csvWriter.Write(engine.DispatcherProfileMdls{}.CSVHeader()); err != nil { return err @@ -1672,7 +1672,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st defer f.Close() csvWriter := csv.NewWriter(f) - csvWriter.Comma = utils.CSV_SEP + csvWriter.Comma = utils.CSVSep //write the header of the file if err := csvWriter.Write(engine.DispatcherHostMdls{}.CSVHeader()); err != nil { return err @@ -1708,7 +1708,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st defer f.Close() csvWriter := csv.NewWriter(f) - csvWriter.Comma = utils.CSV_SEP + csvWriter.Comma = utils.CSVSep //write the header of the file if err := csvWriter.Write(engine.FilterMdls{}.CSVHeader()); err != nil { return err @@ -1746,7 +1746,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st defer f.Close() csvWriter := csv.NewWriter(f) - csvWriter.Comma = utils.CSV_SEP + csvWriter.Comma = utils.CSVSep //write the header of the file if err := csvWriter.Write(engine.ResourceMdls{}.CSVHeader()); err != nil { return err @@ -1784,7 +1784,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st defer f.Close() csvWriter := csv.NewWriter(f) - csvWriter.Comma = utils.CSV_SEP + csvWriter.Comma = utils.CSVSep //write the header of the file if err := csvWriter.Write(engine.StatMdls{}.CSVHeader()); err != nil { return err @@ -1822,7 +1822,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st defer f.Close() csvWriter := csv.NewWriter(f) - csvWriter.Comma = utils.CSV_SEP + csvWriter.Comma = utils.CSVSep //write the header of the file if err := csvWriter.Write(engine.RouteMdls{}.CSVHeader()); err != nil { return err @@ -1860,7 +1860,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st defer f.Close() csvWriter := csv.NewWriter(f) - csvWriter.Comma = utils.CSV_SEP + csvWriter.Comma = utils.CSVSep //write the header of the file if err := csvWriter.Write(engine.ThresholdMdls{}.CSVHeader()); err != nil { return err @@ -1898,7 +1898,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st defer f.Close() csvWriter := csv.NewWriter(f) - csvWriter.Comma = utils.CSV_SEP + csvWriter.Comma = utils.CSVSep //write the header of the file if err := csvWriter.Write(engine.RateProfileMdls{}.CSVHeader()); err != nil { return err @@ -1936,7 +1936,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st defer f.Close() csvWriter := csv.NewWriter(f) - csvWriter.Comma = utils.CSV_SEP + csvWriter.Comma = utils.CSVSep //write the header of the file if err := csvWriter.Write(engine.ActionProfileMdls{}.CSVHeader()); err != nil { return err diff --git a/apier/v1/apier2_it_test.go b/apier/v1/apier2_it_test.go index b280f2d22..8c189ce62 100644 --- a/apier/v1/apier2_it_test.go +++ b/apier/v1/apier2_it_test.go @@ -160,7 +160,7 @@ func testAPIerVerifyAttributesAfterLoad(t *testing.T) { FilterIDs: []string{}, Path: utils.MetaReq + utils.NestingSep + "Password", Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep), }, }, Weight: 20.0, diff --git a/apier/v1/attributes_it_test.go b/apier/v1/attributes_it_test.go index cee692c88..c237fd4d8 100644 --- a/apier/v1/attributes_it_test.go +++ b/apier/v1/attributes_it_test.go @@ -194,13 +194,13 @@ func testAttributeSGetAttributeForEvent(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), Type: utils.META_CONSTANT, FilterIDs: []string{}, }, { Path: utils.MetaReq + utils.NestingSep + utils.Subject, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), Type: utils.META_CONSTANT, FilterIDs: []string{}, }, @@ -261,7 +261,7 @@ func testAttributeSGetAttributeForEventNotFound(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, }, Weight: 10.0, @@ -315,7 +315,7 @@ func testAttributeSGetAttributeForEventWithMetaAnyContext(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, }, Weight: 10.0, @@ -480,11 +480,11 @@ func testAttributeSProcessEventWithNoneSubstitute(t *testing.T) { { FilterIDs: []string{"*string:~*req.Account:1008"}, Path: utils.MetaReq + utils.NestingSep + utils.AccountField, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + utils.Subject, - Value: config.NewRSRParsersMustCompile(utils.MetaRemove, utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile(utils.MetaRemove, utils.InfieldSep), }, }, Weight: 20, @@ -554,11 +554,11 @@ func testAttributeSProcessEventWithNoneSubstitute2(t *testing.T) { { FilterIDs: []string{"*string:~*req.Account:1008"}, Path: utils.MetaReq + utils.NestingSep + utils.AccountField, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + utils.Subject, - Value: config.NewRSRParsersMustCompile(utils.MetaRemove, utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile(utils.MetaRemove, utils.InfieldSep), }, }, Weight: 20, @@ -639,12 +639,12 @@ func testAttributeSProcessEventWithNoneSubstitute3(t *testing.T) { { FilterIDs: []string{"*string:~*req.Account:1008"}, Path: utils.MetaReq + utils.NestingSep + utils.AccountField, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, { FilterIDs: []string{"*string:~*req.Subject:1008"}, Path: utils.MetaReq + utils.NestingSep + utils.Subject, - Value: config.NewRSRParsersMustCompile(utils.MetaRemove, utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile(utils.MetaRemove, utils.InfieldSep), }, }, Weight: 20, @@ -694,7 +694,7 @@ func testAttributeSProcessEventWithHeader(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Value: config.NewRSRParsersMustCompile("~*req.Field1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Field1", utils.InfieldSep), }, }, Blocker: true, @@ -781,7 +781,7 @@ func testAttributeSSetAlsPrfBrokenReference(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "FL1", - Value: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, @@ -814,7 +814,7 @@ func testAttributeSSetAlsPrf(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "FL1", - Value: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, @@ -842,11 +842,11 @@ func testAttributeSUpdateAlsPrf(t *testing.T) { alsPrf.Attributes = []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "FL1", - Value: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "FL2", - Value: config.NewRSRParsersMustCompile("Al2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al2", utils.InfieldSep), }, } alsPrf.Compile() @@ -1021,7 +1021,7 @@ func testAttributeSProcessEventWithSearchAndReplace(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Category", - Value: config.NewRSRParsersMustCompile("~*req.Category:s/(.*)/${1}_suffix/", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Category:s/(.*)/${1}_suffix/", utils.InfieldSep), }, }, Blocker: true, @@ -1083,7 +1083,7 @@ func testAttributeSProcessWithMultipleRuns(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -1101,7 +1101,7 @@ func testAttributeSProcessWithMultipleRuns(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Value: config.NewRSRParsersMustCompile("Value2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value2", utils.InfieldSep), }, }, Weight: 20, @@ -1119,7 +1119,7 @@ func testAttributeSProcessWithMultipleRuns(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field3", - Value: config.NewRSRParsersMustCompile("Value3", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value3", utils.InfieldSep), }, }, Weight: 30, @@ -1199,7 +1199,7 @@ func testAttributeSProcessWithMultipleRuns2(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -1217,7 +1217,7 @@ func testAttributeSProcessWithMultipleRuns2(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Value: config.NewRSRParsersMustCompile("Value2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value2", utils.InfieldSep), }, }, Weight: 20, @@ -1235,7 +1235,7 @@ func testAttributeSProcessWithMultipleRuns2(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field3", - Value: config.NewRSRParsersMustCompile("Value3", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value3", utils.InfieldSep), }, }, Weight: 30, @@ -1444,7 +1444,7 @@ func testAttributeSCachingMetaNone(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -1503,7 +1503,7 @@ func testAttributeSCachingMetaLoad(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -1606,7 +1606,7 @@ func testAttributeSCachingMetaReload1(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -1665,7 +1665,7 @@ func testAttributeSCachingMetaReload2(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -1705,7 +1705,7 @@ func testAttributeSCachingMetaReload2(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -1744,7 +1744,7 @@ func testAttributeSCachingMetaRemove(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -1794,7 +1794,7 @@ func testAttributeSCachingMetaRemove(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -1842,7 +1842,7 @@ func testAttributeSSetAttributeWithEmptyPath(t *testing.T) { ActivationTime: time.Date(2014, 1, 14, 0, 0, 0, 0, time.UTC)}, Attributes: []*engine.Attribute{ { - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, }, Weight: 10.0, @@ -1867,7 +1867,7 @@ func testAttributeSCacheOpts(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -1900,7 +1900,7 @@ func testAttributeSSetAlsPrfWithoutTenant(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "FL1", - Value: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, diff --git a/apier/v1/filter_indexes_it_test.go b/apier/v1/filter_indexes_it_test.go index 5dd384106..63e4683fd 100644 --- a/apier/v1/filter_indexes_it_test.go +++ b/apier/v1/filter_indexes_it_test.go @@ -1173,7 +1173,7 @@ func testV1FIdxSetAttributeProfileIndexes(t *testing.T) { { FilterIDs: []string{"*string:~*req.FL1:In1"}, Path: "FL1", - Value: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, @@ -1281,7 +1281,7 @@ func testV1FIdxSetSecondAttributeProfileIndexes(t *testing.T) { Attributes: []*engine.Attribute{{ FilterIDs: []string{"*string:~*req.FL1:In1"}, Path: "FL1", - Value: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }}, Weight: 20, }, diff --git a/apier/v1/filterindexecache_it_test.go b/apier/v1/filterindexecache_it_test.go index e9cb161d2..b74a577ca 100644 --- a/apier/v1/filterindexecache_it_test.go +++ b/apier/v1/filterindexecache_it_test.go @@ -1047,11 +1047,11 @@ func testV1FIdxCaSetAttributeProfile(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + utils.Subject, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, }, Weight: 20, @@ -1144,11 +1144,11 @@ func testV1FIdxCaUpdateAttributeProfile(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + utils.Subject, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, }, Weight: 20, diff --git a/apier/v1/preload_it_test.go b/apier/v1/preload_it_test.go index cb5893ef9..f3b81bbd9 100644 --- a/apier/v1/preload_it_test.go +++ b/apier/v1/preload_it_test.go @@ -134,13 +134,13 @@ func testPreloadITVerifyAttributes(t *testing.T) { FilterIDs: []string{"*string:~*req.Field1:Initial"}, Path: "*req.Field1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("Sub1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Sub1", utils.InfieldSep), }, { FilterIDs: []string{}, Path: "*req.Field2", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("Sub2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Sub2", utils.InfieldSep), }, }, Blocker: true, diff --git a/apier/v1/remote_it_test.go b/apier/v1/remote_it_test.go index 86ed7bb81..4246a1d72 100644 --- a/apier/v1/remote_it_test.go +++ b/apier/v1/remote_it_test.go @@ -244,7 +244,7 @@ func testInternalRemoteITGetAttribute(t *testing.T) { Path: utils.MetaReq + utils.NestingSep + "Password", FilterIDs: []string{}, Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep), }, }, Weight: 20, diff --git a/apier/v1/replicate_it_test.go b/apier/v1/replicate_it_test.go index d293d790a..c0464f4cd 100644 --- a/apier/v1/replicate_it_test.go +++ b/apier/v1/replicate_it_test.go @@ -218,11 +218,11 @@ func testInternalReplicateITAttributeProfile(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.Subject, - Value: config.NewRSRParsersMustCompile("ATTR_SUBJECT", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("ATTR_SUBJECT", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + utils.Category, - Value: config.NewRSRParsersMustCompile("ATTR_CATEGORY", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("ATTR_CATEGORY", utils.InfieldSep), }, }, Weight: 20, @@ -914,7 +914,7 @@ func testInternalReplicateITActionPlan(t *testing.T) { ActionPlan: []*AttrActionPlan{ { ActionsId: "ACTS_1", - Time: utils.ASAP, + Time: utils.MetaASAP, Weight: 20.0}, }, } @@ -1470,11 +1470,11 @@ func testInternalReplicateITLoadIds(t *testing.T) { { FilterIDs: []string{"*string:~*req.Account:1008"}, Path: utils.MetaReq + utils.NestingSep + utils.AccountField, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + utils.Subject, - Value: config.NewRSRParsersMustCompile(utils.MetaRemove, utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile(utils.MetaRemove, utils.InfieldSep), }, }, Weight: 20, diff --git a/apier/v1/tp.go b/apier/v1/tp.go index 53dd03577..61bfeb057 100644 --- a/apier/v1/tp.go +++ b/apier/v1/tp.go @@ -80,7 +80,7 @@ func (apierSv1 *APIerSv1) ImportTPZipFile(attrs *AttrImportTPZipFile, reply *str TPid: attrs.TPid, StorDb: apierSv1.StorDb, DirPath: path, - Sep: utils.CSV_SEP, + Sep: utils.CSVSep, Verbose: false, ImportId: "", } diff --git a/apier/v1/tpactionprofiles_it_test.go b/apier/v1/tpactionprofiles_it_test.go index c35a60942..52ffe6ace 100644 --- a/apier/v1/tpactionprofiles_it_test.go +++ b/apier/v1/tpactionprofiles_it_test.go @@ -126,7 +126,7 @@ func testTPActPrfSetTPActPrf(t *testing.T) { Tenant: "cgrates.org", ID: "ONE_TIME_ACT", Weight: 10, - Schedule: utils.ASAP, + Schedule: utils.MetaASAP, Targets: []*utils.TPActionTarget{ &utils.TPActionTarget{ TargetType: utils.MetaAccounts, @@ -200,7 +200,7 @@ func testTPActPrfGetTPActPrfAfterUpdate(t *testing.T) { Tenant: "cgrates.org", ID: "ONE_TIME_ACT", Weight: 10, - Schedule: utils.ASAP, + Schedule: utils.MetaASAP, Targets: []*utils.TPActionTarget{ &utils.TPActionTarget{ TargetType: utils.MetaAccounts, diff --git a/apier/v1/triggers.go b/apier/v1/triggers.go index 4a85a8149..75af08da9 100644 --- a/apier/v1/triggers.go +++ b/apier/v1/triggers.go @@ -569,7 +569,7 @@ func (apierSv1 *APIerSv1) AddTriggeredAction(attr AttrAddActionTrigger, reply *s at.Balance.Type = utils.StringPointer(attr.BalanceType) } if attr.BalanceDestinationIds != "" { - dstIDsMp := utils.StringMapFromSlice(strings.Split(attr.BalanceDestinationIds, utils.INFIELD_SEP)) + dstIDsMp := utils.StringMapFromSlice(strings.Split(attr.BalanceDestinationIds, utils.InfieldSep)) at.Balance.DestinationIDs = &dstIDsMp } if attr.BalanceRatingSubject != "" { diff --git a/apier/v2/apier.go b/apier/v2/apier.go index 415dc2b29..1ef17d892 100644 --- a/apier/v2/apier.go +++ b/apier/v2/apier.go @@ -119,7 +119,7 @@ func (apiv2 *APIerSv2) LoadTariffPlanFromFolder(attrs *utils.AttrLoadTpFromFolde return utils.ErrInvalidPath } loader, err := engine.NewTpReader(apiv2.DataManager.DataDB(), - engine.NewFileCSVStorage(utils.CSV_SEP, attrs.FolderPath), "", apiv2.Config.GeneralCfg().DefaultTimezone, + engine.NewFileCSVStorage(utils.CSVSep, attrs.FolderPath), "", apiv2.Config.GeneralCfg().DefaultTimezone, apiv2.Config.ApierCfg().CachesConns, apiv2.Config.ApierCfg().SchedulerConns, apiv2.Config.DataDbCfg().DataDbType == utils.INTERNAL) if err != nil { diff --git a/apier/v2/attributes_it_test.go b/apier/v2/attributes_it_test.go index c40f6d3bb..0edab7c2e 100644 --- a/apier/v2/attributes_it_test.go +++ b/apier/v2/attributes_it_test.go @@ -153,7 +153,7 @@ func testAttributeSSetAlsPrf(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Account", - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, }, Weight: 20, @@ -215,11 +215,11 @@ func testAttributeSUpdateAlsPrf(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Account", - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "Subject", - Value: config.NewRSRParsersMustCompile("~*req.Account", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Account", utils.InfieldSep), }, }, Weight: 20, @@ -284,7 +284,7 @@ func testAttributeSSetAlsPrfWithoutTenant(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Account", - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, }, Weight: 20, diff --git a/cmd/cgr-loader/cgr-loader_it_test.go b/cmd/cgr-loader/cgr-loader_it_test.go index 84ebaf7ab..4335b89d6 100644 --- a/cmd/cgr-loader/cgr-loader_it_test.go +++ b/cmd/cgr-loader/cgr-loader_it_test.go @@ -285,7 +285,7 @@ func testLoadItCheckAttributes(t *testing.T) { FilterIDs: []string{}, Path: utils.MetaReq + utils.NestingSep + "Password", Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep), }, }, Weight: 20.0, diff --git a/config/config.go b/config/config.go index 405fad9ea..79f0a4e8e 100644 --- a/config/config.go +++ b/config/config.go @@ -1373,7 +1373,7 @@ func (cfg *CGRConfig) loadConfigFromFile(jsonFilePath string, loadFuncs []func(j } func (cfg *CGRConfig) loadConfigFromHTTP(urlPaths string, loadFuncs []func(jsnCfg *CgrJsonCfg) error) (err error) { - for _, urlPath := range strings.Split(urlPaths, utils.INFIELD_SEP) { + for _, urlPath := range strings.Split(urlPaths, utils.InfieldSep) { if _, err = url.ParseRequestURI(urlPath); err != nil { return } diff --git a/config/config_it_test.go b/config/config_it_test.go index d106fbf5c..a2bf7c9d3 100644 --- a/config/config_it_test.go +++ b/config/config_it_test.go @@ -508,17 +508,17 @@ func testCGRConfigReloadERs(t *testing.T) { flags := utils.FlagsWithParamsFromSlice([]string{"*dryrun"}) flagsDefault := utils.FlagsWithParamsFromSlice([]string{}) content := []*FCTemplate{ - {Tag: utils.ToR, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.OriginID, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.RequestType, Path: utils.MetaCgreq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.Tenant, Path: utils.MetaCgreq + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.Destination, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.SetupTime, Path: utils.MetaCgreq + utils.NestingSep + utils.SetupTime, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.AnswerTime, Path: utils.MetaCgreq + utils.NestingSep + utils.AnswerTime, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.Usage, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + {Tag: utils.ToR, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, + {Tag: utils.OriginID, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, + {Tag: utils.RequestType, Path: utils.MetaCgreq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, + {Tag: utils.Tenant, Path: utils.MetaCgreq + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, + {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, + {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, + {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, + {Tag: utils.Destination, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, + {Tag: utils.SetupTime, Path: utils.MetaCgreq + utils.NestingSep + utils.SetupTime, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, + {Tag: utils.AnswerTime, Path: utils.MetaCgreq + utils.NestingSep + utils.AnswerTime, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, + {Tag: utils.Usage, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.13", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, } for _, v := range content { v.ComputePath() diff --git a/config/config_test.go b/config/config_test.go index c5602ed5e..e3b39749d 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -302,7 +302,7 @@ func TestCgrCfgJSONDefaultsGeneral(t *testing.T) { t.Errorf("Expected: 6, received: %+v", cgrCfg.GeneralCfg().LogLevel) } if cgrCfg.GeneralCfg().DigestSeparator != "," { - t.Errorf("Expected: utils.CSV_SEP , received: %+v", cgrCfg.GeneralCfg().DigestSeparator) + t.Errorf("Expected: utils.CSVSep , received: %+v", cgrCfg.GeneralCfg().DigestSeparator) } if cgrCfg.GeneralCfg().DigestEqual != ":" { t.Errorf("Expected: ':' , received: %+v", cgrCfg.GeneralCfg().DigestEqual) @@ -910,21 +910,21 @@ func TestCgrCfgJSONDefaultsSureTax(t *testing.T) { ResponseGroup: "03", ResponseType: "D4", RegulatoryCode: "03", - ClientTracking: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), - CustomerNumber: NewRSRParsersMustCompile("~*req.Subject", utils.INFIELD_SEP), - OrigNumber: NewRSRParsersMustCompile("~*req.Subject", utils.INFIELD_SEP), - TermNumber: NewRSRParsersMustCompile("~*req.Destination", utils.INFIELD_SEP), - BillToNumber: NewRSRParsersMustCompile("", utils.INFIELD_SEP), - Zipcode: NewRSRParsersMustCompile("", utils.INFIELD_SEP), - P2PZipcode: NewRSRParsersMustCompile("", utils.INFIELD_SEP), - P2PPlus4: NewRSRParsersMustCompile("", utils.INFIELD_SEP), - Units: NewRSRParsersMustCompile("1", utils.INFIELD_SEP), - UnitType: NewRSRParsersMustCompile("00", utils.INFIELD_SEP), - TaxIncluded: NewRSRParsersMustCompile("0", utils.INFIELD_SEP), - TaxSitusRule: NewRSRParsersMustCompile("04", utils.INFIELD_SEP), - TransTypeCode: NewRSRParsersMustCompile("010101", utils.INFIELD_SEP), - SalesTypeCode: NewRSRParsersMustCompile("R", utils.INFIELD_SEP), - TaxExemptionCodeList: NewRSRParsersMustCompile("", utils.INFIELD_SEP), + ClientTracking: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), + CustomerNumber: NewRSRParsersMustCompile("~*req.Subject", utils.InfieldSep), + OrigNumber: NewRSRParsersMustCompile("~*req.Subject", utils.InfieldSep), + TermNumber: NewRSRParsersMustCompile("~*req.Destination", utils.InfieldSep), + BillToNumber: NewRSRParsersMustCompile("", utils.InfieldSep), + Zipcode: NewRSRParsersMustCompile("", utils.InfieldSep), + P2PZipcode: NewRSRParsersMustCompile("", utils.InfieldSep), + P2PPlus4: NewRSRParsersMustCompile("", utils.InfieldSep), + Units: NewRSRParsersMustCompile("1", utils.InfieldSep), + UnitType: NewRSRParsersMustCompile("00", utils.InfieldSep), + TaxIncluded: NewRSRParsersMustCompile("0", utils.InfieldSep), + TaxSitusRule: NewRSRParsersMustCompile("04", utils.InfieldSep), + TransTypeCode: NewRSRParsersMustCompile("010101", utils.InfieldSep), + SalesTypeCode: NewRSRParsersMustCompile("R", utils.InfieldSep), + TaxExemptionCodeList: NewRSRParsersMustCompile("", utils.InfieldSep), } if !reflect.DeepEqual(cgrCfg.sureTaxCfg, eSureTaxCfg) { @@ -1936,22 +1936,22 @@ func TestSuretaxConfig(t *testing.T) { ResponseGroup: "03", ResponseType: "D4", RegulatoryCode: "03", - ClientTracking: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), - CustomerNumber: NewRSRParsersMustCompile("~*req.Subject", utils.INFIELD_SEP), - OrigNumber: NewRSRParsersMustCompile("~*req.Subject", utils.INFIELD_SEP), - TermNumber: NewRSRParsersMustCompile("~*req.Destination", utils.INFIELD_SEP), - BillToNumber: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), - Zipcode: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), - Plus4: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), - P2PZipcode: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), - P2PPlus4: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), - Units: NewRSRParsersMustCompile("1", utils.INFIELD_SEP), - UnitType: NewRSRParsersMustCompile("00", utils.INFIELD_SEP), - TaxIncluded: NewRSRParsersMustCompile("0", utils.INFIELD_SEP), - TaxSitusRule: NewRSRParsersMustCompile("04", utils.INFIELD_SEP), - TransTypeCode: NewRSRParsersMustCompile("010101", utils.INFIELD_SEP), - SalesTypeCode: NewRSRParsersMustCompile("R", utils.INFIELD_SEP), - TaxExemptionCodeList: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), + ClientTracking: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), + CustomerNumber: NewRSRParsersMustCompile("~*req.Subject", utils.InfieldSep), + OrigNumber: NewRSRParsersMustCompile("~*req.Subject", utils.InfieldSep), + TermNumber: NewRSRParsersMustCompile("~*req.Destination", utils.InfieldSep), + BillToNumber: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), + Zipcode: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), + Plus4: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), + P2PZipcode: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), + P2PPlus4: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), + Units: NewRSRParsersMustCompile("1", utils.InfieldSep), + UnitType: NewRSRParsersMustCompile("00", utils.InfieldSep), + TaxIncluded: NewRSRParsersMustCompile("0", utils.InfieldSep), + TaxSitusRule: NewRSRParsersMustCompile("04", utils.InfieldSep), + TransTypeCode: NewRSRParsersMustCompile("010101", utils.InfieldSep), + SalesTypeCode: NewRSRParsersMustCompile("R", utils.InfieldSep), + TaxExemptionCodeList: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), } cgrConfig := NewDefaultCGRConfig() if err != nil { @@ -2285,7 +2285,7 @@ func TestFilterSConfig(t *testing.T) { } func TestLoaderConfig(t *testing.T) { - ten, err := NewRSRParsers("", utils.INFIELD_SEP) + ten, err := NewRSRParsers("", utils.InfieldSep) if err != nil { t.Error(err) } @@ -2552,7 +2552,7 @@ func TestTemplatesConfig(t *testing.T) { Type: "*variable", Path: "*rep.Session-Id", Layout: "2006-01-02T15:04:05Z07:00", - Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true, }, { @@ -2560,7 +2560,7 @@ func TestTemplatesConfig(t *testing.T) { Type: "*variable", Path: "*rep.Origin-Host", Layout: "2006-01-02T15:04:05Z07:00", - Value: NewRSRParsersMustCompile("~*vars.OriginHost", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*vars.OriginHost", utils.InfieldSep), Mandatory: true, }, { @@ -2568,7 +2568,7 @@ func TestTemplatesConfig(t *testing.T) { Type: "*variable", Path: "*rep.Origin-Realm", Layout: "2006-01-02T15:04:05Z07:00", - Value: NewRSRParsersMustCompile("~*vars.OriginRealm", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*vars.OriginRealm", utils.InfieldSep), Mandatory: true, }, }, @@ -2578,7 +2578,7 @@ func TestTemplatesConfig(t *testing.T) { Type: "*constant", Path: "*rep.Request", Layout: "2006-01-02T15:04:05Z07:00", - Value: NewRSRParsersMustCompile("SIP/2.0 500 Internal Server Error", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("SIP/2.0 500 Internal Server Error", utils.InfieldSep), Mandatory: true, }, }, @@ -2682,7 +2682,7 @@ func TestCgrLoaderCfgITDefaults(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }, @@ -2690,7 +2690,7 @@ func TestCgrLoaderCfgITDefaults(t *testing.T) { Tag: "ProfileID", Path: "ID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }, @@ -2698,57 +2698,57 @@ func TestCgrLoaderCfgITDefaults(t *testing.T) { Tag: "Contexts", Path: "Contexts", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Layout: time.RFC3339, }, { Tag: "FilterIDs", Path: "FilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Layout: time.RFC3339, }, { Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Layout: time.RFC3339}, { Tag: "AttributeFilterIDs", Path: "AttributeFilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.5", utils.InfieldSep), Layout: time.RFC3339}, { Tag: "Path", Path: "Path", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "Type", Path: "Type", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "Value", Path: "Value", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "Blocker", Path: "Blocker", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "Weight", Path: "Weight", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Layout: time.RFC3339, }, }, @@ -2760,34 +2760,34 @@ func TestCgrLoaderCfgITDefaults(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "ID", Path: "ID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "Type", Path: "Type", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Element", Path: "Element", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Values", Path: "Values", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.5", utils.InfieldSep), Layout: time.RFC3339}, }, }, @@ -2798,59 +2798,59 @@ func TestCgrLoaderCfgITDefaults(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "ID", Path: "ID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "TTL", Path: "UsageTTL", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Limit", Path: "Limit", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.5", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "AllocationMessage", Path: "AllocationMessage", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Blocker", Path: "Blocker", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Stored", Path: "Stored", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Weight", Path: "Weight", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ThresholdIDs", Path: "ThresholdIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Layout: time.RFC3339}, }, }, @@ -2861,70 +2861,70 @@ func TestCgrLoaderCfgITDefaults(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "ID", Path: "ID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "QueueLength", Path: "QueueLength", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "TTL", Path: "TTL", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.5", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "MinItems", Path: "MinItems", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "MetricIDs", Path: "MetricIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "MetricFilterIDs", Path: "MetricFilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Blocker", Path: "Blocker", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Stored", Path: "Stored", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Weight", Path: "Weight", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ThresholdIDs", Path: "ThresholdIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Layout: time.RFC3339}, }, }, @@ -2935,59 +2935,59 @@ func TestCgrLoaderCfgITDefaults(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "ID", Path: "ID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "MaxHits", Path: "MaxHits", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "MinHits", Path: "MinHits", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.5", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "MinSleep", Path: "MinSleep", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Blocker", Path: "Blocker", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Weight", Path: "Weight", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionIDs", Path: "ActionIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Async", Path: "Async", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Layout: time.RFC3339}, }, }, @@ -2998,84 +2998,84 @@ func TestCgrLoaderCfgITDefaults(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "ID", Path: "ID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Sorting", Path: "Sorting", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "SortingParameters", Path: "SortingParameters", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.5", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "RouteID", Path: "RouteID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "RouteFilterIDs", Path: "RouteFilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "RouteAccountIDs", Path: "RouteAccountIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "RouteRatingPlanIDs", Path: "RouteRatingPlanIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "RouteResourceIDs", Path: "RouteResourceIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "RouteStatIDs", Path: "RouteStatIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "RouteWeight", Path: "RouteWeight", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "RouteBlocker", Path: "RouteBlocker", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.13", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "RouteParameters", Path: "RouteParameters", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.14", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.14", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Weight", Path: "Weight", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.15", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.15", utils.InfieldSep), Layout: time.RFC3339}, }, }, @@ -3086,39 +3086,39 @@ func TestCgrLoaderCfgITDefaults(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "ID", Path: "ID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "RunID", Path: "RunID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "AttributeIDs", Path: "AttributeIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.5", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Weight", Path: "Weight", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Layout: time.RFC3339}, }, }, @@ -3129,79 +3129,79 @@ func TestCgrLoaderCfgITDefaults(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "ID", Path: "ID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "Contexts", Path: "Contexts", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "Strategy", Path: "Strategy", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.5", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "StrategyParameters", Path: "StrategyParameters", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "ConnID", Path: "ConnID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "ConnFilterIDs", Path: "ConnFilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "ConnWeight", Path: "ConnWeight", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "ConnBlocker", Path: "ConnBlocker", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "ConnParameters", Path: "ConnParameters", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "Weight", Path: "Weight", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Layout: time.RFC3339, }, }, @@ -3213,31 +3213,31 @@ func TestCgrLoaderCfgITDefaults(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "ID", Path: "ID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "Address", Path: "Address", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "Transport", Path: "Transport", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "TLS", Path: "TLS", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Layout: time.RFC3339, }, }, @@ -3249,121 +3249,121 @@ func TestCgrLoaderCfgITDefaults(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "ID", Path: "ID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "Weight", Path: "Weight", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "RoundingMethod", Path: "RoundingMethod", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.5", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "RoundingDecimals", Path: "RoundingDecimals", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "MinCost", Path: "MinCost", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "MaxCost", Path: "MaxCost", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "MaxCostStrategy", Path: "MaxCostStrategy", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "RateID", Path: "RateID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "RateFilterIDs", Path: "RateFilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "RateActivationTimes", Path: "RateActivationTimes", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "RateWeight", Path: "RateWeight", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.13", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "RateBlocker", Path: "RateBlocker", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.14", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.14", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "RateIntervalStart", Path: "RateIntervalStart", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.15", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.15", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "RateFixedFee", Path: "RateFixedFee", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.16", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.16", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "RateRecurrentFee", Path: "RateRecurrentFee", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.17", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.17", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "RateUnit", Path: "RateUnit", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.18", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.18", utils.InfieldSep), Layout: time.RFC3339, }, {Tag: "RateIncrement", Path: "RateIncrement", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.19", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.19", utils.InfieldSep), Layout: time.RFC3339, }, }, @@ -3375,84 +3375,84 @@ func TestCgrLoaderCfgITDefaults(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "ID", Path: "ID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Weight", Path: "Weight", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Schedule", Path: "Schedule", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.5", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "TargetType", Path: "TargetType", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "TargetIDs", Path: "TargetIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionID", Path: "ActionID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionFilterIDs", Path: "ActionFilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionBlocker", Path: "ActionBlocker", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionTTL", Path: "ActionTTL", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionType", Path: "ActionType", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionOpts", Path: "ActionOpts", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.13", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionPath", Path: "ActionPath", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.14", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.14", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionValue", Path: "ActionValue", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.15", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.15", utils.InfieldSep), Layout: time.RFC3339}, }, }, @@ -3463,84 +3463,84 @@ func TestCgrLoaderCfgITDefaults(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "ID", Path: "ID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Weight", Path: "Weight", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "BalanceID", Path: "BalanceID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.5", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "BalanceFilterIDs", Path: "BalanceFilterIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "BalanceWeight", Path: "BalanceWeight", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "BalanceBlocker", Path: "BalanceBlocker", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "BalanceType", Path: "BalanceType", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "BalanceOpts", Path: "BalanceOpts", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "BalanceCostIncrements", Path: "BalanceCostIncrements", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "BalanceCostAttributes", Path: "BalanceCostAttributes", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "BalanceUnitFactors", Path: "BalanceUnitFactors", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.13", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "BalanceUnits", Path: "BalanceUnits", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.14", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.14", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ThresholdIDs", Path: "ThresholdIDs", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.15", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.15", utils.InfieldSep), Layout: time.RFC3339}, }, }, @@ -3579,7 +3579,7 @@ func TestCgrLoaderCfgDefault(t *testing.T) { TpID: "", DataPath: "./", DisableReverse: false, - FieldSeparator: rune(utils.CSV_SEP), + FieldSeparator: rune(utils.CSVSep), CachesConns: []string{utils.MetaLocalHost}, SchedulerConns: []string{utils.MetaLocalHost}, GapiCredentials: json.RawMessage(`".gapi/credentials.json"`), @@ -5606,27 +5606,27 @@ func TestCgrCdfEventReader(t *testing.T) { Flags: utils.FlagsWithParams{}, Fields: []*FCTemplate{ {Tag: utils.ToR, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.OriginID, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.RequestType, Path: utils.MetaCgreq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Tenant, Path: utils.MetaCgreq + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Destination, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.SetupTime, Path: utils.MetaCgreq + utils.NestingSep + utils.SetupTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AnswerTime, Path: utils.MetaCgreq + utils.NestingSep + utils.AnswerTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Usage, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.13", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, }, CacheDumpFields: []*FCTemplate{}, Opts: make(map[string]interface{}), @@ -5696,27 +5696,27 @@ func TestCgrCfgEventReaderDefault(t *testing.T) { Flags: utils.FlagsWithParams{}, Fields: []*FCTemplate{ {Tag: utils.ToR, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.OriginID, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.RequestType, Path: utils.MetaCgreq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Tenant, Path: utils.MetaCgreq + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Destination, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.SetupTime, Path: utils.MetaCgreq + utils.NestingSep + utils.SetupTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AnswerTime, Path: utils.MetaCgreq + utils.NestingSep + utils.AnswerTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Usage, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.13", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, }, CacheDumpFields: make([]*FCTemplate, 0), Opts: make(map[string]interface{}), diff --git a/config/configsanity_test.go b/config/configsanity_test.go index 41beb86ea..cf8b2ff01 100644 --- a/config/configsanity_test.go +++ b/config/configsanity_test.go @@ -435,7 +435,7 @@ func TestConfigSanityDAgent(t *testing.T) { cfg.templates = FcTemplates{ utils.MetaEEs: { {Tag: "SessionId", Path: utils.EmptyString, Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), Mandatory: true}, + Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, }, } cfg.diameterAgentCfg = &DiameterAgentCfg{ @@ -446,11 +446,11 @@ func TestConfigSanityDAgent(t *testing.T) { Timezone: "Local", RequestFields: []*FCTemplate{ {Tag: "SessionId", Path: utils.EmptyString, Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), Mandatory: true}, + Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, }, ReplyFields: []*FCTemplate{ {Tag: "SessionId", Path: utils.EmptyString, Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), Mandatory: true}, + Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, }, }, }, @@ -501,11 +501,11 @@ func TestConfigSanityRadiusAgent(t *testing.T) { Timezone: "Local", RequestFields: []*FCTemplate{ {Tag: "SessionId", Path: utils.EmptyString, Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), Mandatory: true}, + Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, }, ReplyFields: []*FCTemplate{ {Tag: "SessionId", Path: utils.EmptyString, Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), Mandatory: true}, + Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, }, }, }, @@ -549,11 +549,11 @@ func TestConfigSanityDNSAgent(t *testing.T) { Timezone: "Local", RequestFields: []*FCTemplate{ {Tag: "SessionId", Path: utils.EmptyString, Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), Mandatory: true}, + Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, }, ReplyFields: []*FCTemplate{ {Tag: "SessionId", Path: utils.EmptyString, Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), Mandatory: true}, + Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, }, }, }, @@ -599,11 +599,11 @@ func TestConfigSanityHTTPAgent1(t *testing.T) { Timezone: "Local", RequestFields: []*FCTemplate{ {Tag: "SessionId", Path: utils.EmptyString, Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), Mandatory: true}, + Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, }, ReplyFields: []*FCTemplate{ {Tag: "SessionId", Path: utils.EmptyString, Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), Mandatory: true}, + Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, }, }, }, @@ -656,11 +656,11 @@ func TestConfigSanitySipAgent(t *testing.T) { Timezone: "Local", RequestFields: []*FCTemplate{ {Tag: "SessionId", Path: utils.EmptyString, Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), Mandatory: true}, + Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, }, ReplyFields: []*FCTemplate{ {Tag: "SessionId", Path: utils.EmptyString, Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), Mandatory: true}, + Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, }, }, }, @@ -943,11 +943,11 @@ func TestConfigSanityEventReader(t *testing.T) { Type: utils.MetaKafkajsonMap, CacheDumpFields: []*FCTemplate{ {Tag: "SessionId", Path: utils.EmptyString, Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), Mandatory: true}, + Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, }, Fields: []*FCTemplate{ {Tag: "SessionId", Path: utils.EmptyString, Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), Mandatory: true}, + Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, }, }, }, @@ -973,7 +973,7 @@ func TestConfigSanityEventExporter(t *testing.T) { { Fields: []*FCTemplate{ {Tag: "SessionId", Path: utils.EmptyString, Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.INFIELD_SEP), Mandatory: true}, + Value: NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, }, }, }, diff --git a/config/diametercfg_test.go b/config/diametercfg_test.go index 1311189b0..d53909795 100644 --- a/config/diametercfg_test.go +++ b/config/diametercfg_test.go @@ -191,7 +191,7 @@ func TestDiameterAgentCfgAsMapInterface(t *testing.T) { for _, v := range cgrCfg.diameterAgentCfg.RequestProcessors[0].RequestFields { v.ComputePath() } - rcv := cgrCfg.diameterAgentCfg.AsMapInterface(utils.INFIELD_SEP) + rcv := cgrCfg.diameterAgentCfg.AsMapInterface(utils.InfieldSep) if !reflect.DeepEqual(rcv, eMap) { fmt.Printf("%T \n", rcv[utils.RequestProcessorsCfg].([]map[string]interface{})[0][utils.FlagsCfg]) fmt.Printf("%T \n", eMap[utils.RequestProcessorsCfg].([]map[string]interface{})[0][utils.FlagsCfg]) diff --git a/config/dnsagentcfg_test.go b/config/dnsagentcfg_test.go index d8a1465b8..7fc2955b3 100644 --- a/config/dnsagentcfg_test.go +++ b/config/dnsagentcfg_test.go @@ -77,12 +77,12 @@ func TestDNSAgentCfgloadFromJsonCfg(t *testing.T) { func TestRequestProcessorloadFromJsonCfg(t *testing.T) { var dareq, expected RequestProcessor - if err := dareq.loadFromJSONCfg(nil, utils.INFIELD_SEP); err != nil { + if err := dareq.loadFromJSONCfg(nil, utils.InfieldSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(dareq, expected) { t.Errorf("Expected: %+v ,received: %+v", expected, dareq) } - if err := dareq.loadFromJSONCfg(new(ReqProcessorJsnCfg), utils.INFIELD_SEP); err != nil { + if err := dareq.loadFromJSONCfg(new(ReqProcessorJsnCfg), utils.InfieldSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(dareq, expected) { t.Errorf("Expected: %+v ,received: %+v", expected, dareq) @@ -95,11 +95,11 @@ func TestRequestProcessorloadFromJsonCfg(t *testing.T) { } expected = RequestProcessor{ ID: "cgrates", - Tenant: NewRSRParsersMustCompile("tenant", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("tenant", utils.InfieldSep), Filters: []string{"filter1", "filter2"}, Flags: utils.FlagsWithParams{"flag1": {}, "flag2": {}}, } - if err = dareq.loadFromJSONCfg(json, utils.INFIELD_SEP); err != nil { + if err = dareq.loadFromJSONCfg(json, utils.InfieldSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, dareq) { t.Errorf("Expected: %+v , received: %+v", utils.ToJSON(expected), utils.ToJSON(dareq)) @@ -276,7 +276,7 @@ func TestDNSAgentCfgAsMapInterface1(t *testing.T) { func TestRequestProcessorClone(t *testing.T) { rp := &RequestProcessor{ ID: "cgrates", - Tenant: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Filters: []string{"*string:~req.Account:1001"}, Flags: utils.FlagsWithParams{utils.MetaAttributes: {}}, Timezone: "UTC", diff --git a/config/eescfg_test.go b/config/eescfg_test.go index b79563d28..96dfe20ca 100644 --- a/config/eescfg_test.go +++ b/config/eescfg_test.go @@ -79,7 +79,7 @@ func TestEESClone(t *testing.T) { Type: utils.MetaNone, FieldSep: ",", Synchronous: false, - Tenant: NewRSRParsersMustCompile("", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("", utils.InfieldSep), ExportPath: "/var/spool/cgrates/ees", Attempts: 1, Timezone: utils.EmptyString, @@ -98,7 +98,7 @@ func TestEESClone(t *testing.T) { Type: utils.MetaNone, FieldSep: ",", Synchronous: false, - Tenant: NewRSRParsersMustCompile("~*req.Destination1", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("~*req.Destination1", utils.InfieldSep), ExportPath: "/var/spool/cgrates/ees", Attempts: 2, Timezone: "local", @@ -110,28 +110,28 @@ func TestEESClone(t *testing.T) { Tag: utils.CGRID, Path: "*exp.CGRID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), Layout: time.RFC3339, }, { Tag: utils.CGRID, Path: "*hdr.CGRID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), Layout: time.RFC3339, }, { Tag: utils.CGRID, Path: "*trl.CGRID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), Layout: time.RFC3339, }, { Tag: utils.CGRID, Path: "*uch.CGRID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), Layout: time.RFC3339, }, }, @@ -140,14 +140,14 @@ func TestEESClone(t *testing.T) { Tag: utils.CGRID, Path: "*exp.CGRID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), Layout: time.RFC3339, }, { Tag: utils.CGRID, Path: "*uch.CGRID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), Layout: time.RFC3339, }, }, @@ -156,7 +156,7 @@ func TestEESClone(t *testing.T) { Tag: utils.CGRID, Path: "*hdr.CGRID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), Layout: time.RFC3339, }, }, @@ -165,7 +165,7 @@ func TestEESClone(t *testing.T) { Tag: utils.CGRID, Path: "*trl.CGRID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), Layout: time.RFC3339, }, }, @@ -325,11 +325,11 @@ func TestEventExporterSameID(t *testing.T) { Flags: utils.FlagsWithParams{}, Fields: []*FCTemplate{ {Tag: "CustomTag2", Path: "*exp.CustomPath2", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("CustomValue2", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("CustomValue2", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, }, contentFields: []*FCTemplate{ {Tag: "CustomTag2", Path: "*exp.CustomPath2", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("CustomValue2", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("CustomValue2", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, }, headerFields: []*FCTemplate{}, trailerFields: []*FCTemplate{}, @@ -456,13 +456,13 @@ func TestEEsCfgloadFromJsonCfgCase1(t *testing.T) { Tag: utils.CGRID, Path: "*exp.CGRID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), Layout: time.RFC3339, }, }, Opts: make(map[string]interface{}), Fields: []*FCTemplate{ - {Tag: utils.CGRID, Path: "*exp.CGRID", Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), Layout: time.RFC3339}, + {Tag: utils.CGRID, Path: "*exp.CGRID", Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), Layout: time.RFC3339}, }, }, }, @@ -573,7 +573,7 @@ func TestEEsCfgloadFromJsonCfgCase2(t *testing.T) { Tag: utils.CGRID, Path: "*exp.CGRID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), Layout: time.RFC3339, }, }, @@ -583,14 +583,14 @@ func TestEEsCfgloadFromJsonCfgCase2(t *testing.T) { Tag: utils.CGRID, Path: "*exp.CGRID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), Layout: time.RFC3339, }, { Tag: "*req.CGRID", Path: "*req.CGRID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("1", utils.InfieldSep), Layout: time.RFC3339, }, }, @@ -603,7 +603,7 @@ func TestEEsCfgloadFromJsonCfgCase2(t *testing.T) { Tag: utils.CGRID, Path: "*exp.CGRID", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), Layout: time.RFC3339, }, }, diff --git a/config/erscfg_test.go b/config/erscfg_test.go index 95d012a10..3b13b03f7 100644 --- a/config/erscfg_test.go +++ b/config/erscfg_test.go @@ -80,27 +80,27 @@ func TestERSClone(t *testing.T) { Flags: utils.FlagsWithParams{}, Fields: []*FCTemplate{ {Tag: utils.ToR, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.OriginID, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.RequestType, Path: utils.MetaCgreq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Tenant, Path: utils.MetaCgreq + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Destination, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.SetupTime, Path: utils.MetaCgreq + utils.NestingSep + utils.SetupTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AnswerTime, Path: utils.MetaCgreq + utils.NestingSep + utils.AnswerTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Usage, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.13", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, }, CacheDumpFields: make([]*FCTemplate, 0), Opts: make(map[string]interface{}), @@ -115,7 +115,7 @@ func TestERSClone(t *testing.T) { SourcePath: "/tmp/ers/in", ProcessedPath: "/tmp/ers/out", XMLRootPath: utils.HierarchyPath{utils.EmptyString}, - Tenant: NewRSRParsersMustCompile("~*req.Destination1", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("~*req.Destination1", utils.InfieldSep), Timezone: utils.EmptyString, Filters: []string{"randomFiletrs"}, Flags: utils.FlagsWithParams{}, @@ -124,13 +124,13 @@ func TestERSClone(t *testing.T) { PartialCacheExpiryAction: "randomAction", Fields: []*FCTemplate{ {Tag: utils.ToR, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.OriginID, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, }, CacheDumpFields: []*FCTemplate{ {Tag: utils.ToR, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, }, Opts: map[string]interface{}{ utils.MetaDefault: "randomVal", @@ -231,27 +231,27 @@ func TestERSLoadFromjsonCfg(t *testing.T) { Flags: utils.FlagsWithParams{}, Fields: []*FCTemplate{ {Tag: utils.ToR, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.OriginID, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.RequestType, Path: utils.MetaCgreq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Tenant, Path: utils.MetaCgreq + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Destination, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.SetupTime, Path: utils.MetaCgreq + utils.NestingSep + utils.SetupTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AnswerTime, Path: utils.MetaCgreq + utils.NestingSep + utils.AnswerTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Usage, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.13", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, }, CacheDumpFields: make([]*FCTemplate, 0), Opts: make(map[string]interface{}), @@ -272,27 +272,27 @@ func TestERSLoadFromjsonCfg(t *testing.T) { Flags: utils.FlagsWithParams{}, Fields: []*FCTemplate{ {Tag: utils.ToR, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.OriginID, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.RequestType, Path: utils.MetaCgreq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Tenant, Path: utils.MetaCgreq + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Destination, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.SetupTime, Path: utils.MetaCgreq + utils.NestingSep + utils.SetupTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AnswerTime, Path: utils.MetaCgreq + utils.NestingSep + utils.AnswerTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Usage, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.13", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, }, CacheDumpFields: make([]*FCTemplate, 0), Opts: make(map[string]interface{}), @@ -452,27 +452,27 @@ func TestERSloadFromJsonCase3(t *testing.T) { Flags: utils.FlagsWithParams{}, Fields: []*FCTemplate{ {Tag: utils.ToR, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.OriginID, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.RequestType, Path: utils.MetaCgreq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Tenant, Path: utils.MetaCgreq + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Destination, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.SetupTime, Path: utils.MetaCgreq + utils.NestingSep + utils.SetupTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AnswerTime, Path: utils.MetaCgreq + utils.NestingSep + utils.AnswerTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Usage, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.13", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, }, CacheDumpFields: make([]*FCTemplate, 0), Opts: make(map[string]interface{}), @@ -583,27 +583,27 @@ func TestERSloadFromJsonCase4(t *testing.T) { Flags: utils.FlagsWithParams{}, Fields: []*FCTemplate{ {Tag: utils.ToR, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.OriginID, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.RequestType, Path: utils.MetaCgreq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Tenant, Path: utils.MetaCgreq + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Destination, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.SetupTime, Path: utils.MetaCgreq + utils.NestingSep + utils.SetupTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AnswerTime, Path: utils.MetaCgreq + utils.NestingSep + utils.AnswerTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Usage, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.13", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, }, CacheDumpFields: make([]*FCTemplate, 0), Opts: make(map[string]interface{}), @@ -631,7 +631,7 @@ func TestERSloadFromJsonCase4(t *testing.T) { Tag: "OrderID", Path: "*exp.OrderID", Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.OrderID", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.OrderID", utils.InfieldSep), }, }, Opts: make(map[string]interface{}), @@ -644,7 +644,7 @@ func TestERSloadFromJsonCase4(t *testing.T) { Tag: "OrderID", Path: "*exp.OrderID", Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.OrderID", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.OrderID", utils.InfieldSep), }, }, } @@ -702,27 +702,27 @@ func TestEventReaderSameID(t *testing.T) { Flags: utils.FlagsWithParams{}, Fields: []*FCTemplate{ {Tag: utils.ToR, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.OriginID, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.RequestType, Path: utils.MetaCgreq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Tenant, Path: utils.MetaCgreq + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Destination, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.SetupTime, Path: utils.MetaCgreq + utils.NestingSep + utils.SetupTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AnswerTime, Path: utils.MetaCgreq + utils.NestingSep + utils.AnswerTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Usage, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.13", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, }, CacheDumpFields: make([]*FCTemplate, 0), Opts: make(map[string]interface{}), @@ -744,7 +744,7 @@ func TestEventReaderSameID(t *testing.T) { Flags: utils.FlagsWithParams{}, Fields: []*FCTemplate{ {Tag: "CustomTag2", Path: "CustomPath2", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("CustomValue2", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("CustomValue2", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, }, CacheDumpFields: make([]*FCTemplate, 0), Opts: make(map[string]interface{}), @@ -890,7 +890,7 @@ func TestERsCfgAsMapInterfaceCase1(t *testing.T) { } if cfg, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr); err != nil { t.Error(err) - } else if rcv := cfg.ersCfg.AsMapInterface(utils.INFIELD_SEP); !reflect.DeepEqual(eMap, rcv) { + } else if rcv := cfg.ersCfg.AsMapInterface(utils.InfieldSep); !reflect.DeepEqual(eMap, rcv) { t.Errorf("Expected: %+v\nReceived: %+v", utils.ToJSON(eMap), utils.ToJSON(rcv)) } } @@ -996,7 +996,7 @@ func TestERSCfgAsMapInterfaceCase2(t *testing.T) { } if cfg, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr); err != nil { t.Error(err) - } else if rcv := cfg.ersCfg.AsMapInterface(utils.INFIELD_SEP); !reflect.DeepEqual(eMap, rcv) { + } else if rcv := cfg.ersCfg.AsMapInterface(utils.InfieldSep); !reflect.DeepEqual(eMap, rcv) { t.Errorf("Expected: %+v\nReceived: %+v", utils.ToJSON(eMap), utils.ToJSON(rcv)) } } @@ -1057,27 +1057,27 @@ func TestERsloadFromJsonCfg(t *testing.T) { Flags: utils.FlagsWithParams{}, Fields: []*FCTemplate{ {Tag: utils.ToR, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.OriginID, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.RequestType, Path: utils.MetaCgreq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Tenant, Path: utils.MetaCgreq + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Destination, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.SetupTime, Path: utils.MetaCgreq + utils.NestingSep + utils.SetupTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.AnswerTime, Path: utils.MetaCgreq + utils.NestingSep + utils.AnswerTime, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Usage, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("~*req.13", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, }, CacheDumpFields: make([]*FCTemplate, 0), Opts: make(map[string]interface{}), @@ -1107,7 +1107,7 @@ func TestERsloadFromJsonCfg(t *testing.T) { Layout: time.RFC3339, }, {Tag: "CustomTag2", Path: "CustomPath2", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("CustomValue2", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + Value: NewRSRParsersMustCompile("CustomValue2", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, }, CacheDumpFields: make([]*FCTemplate, 0), Opts: make(map[string]interface{}), diff --git a/config/fctemplate_test.go b/config/fctemplate_test.go index 2bb5b9932..3da4a579c 100644 --- a/config/fctemplate_test.go +++ b/config/fctemplate_test.go @@ -38,11 +38,11 @@ func TestNewFCTemplateFromFCTemplateJsonCfg(t *testing.T) { Type: "*composed", Path: "Tenant", Filters: []string{"Filter1", "Filter2"}, - Value: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Layout: time.RFC3339, } expected.ComputePath() - if rcv, err := NewFCTemplateFromFCTemplateJSONCfg(jsonCfg, utils.INFIELD_SEP); err != nil { + if rcv, err := NewFCTemplateFromFCTemplateJSONCfg(jsonCfg, utils.InfieldSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, rcv) { t.Errorf("expected: %s ,received: %s", utils.ToJSON(expected), utils.ToJSON(rcv)) @@ -53,7 +53,7 @@ func TestFCTemplateInflateTemplate(t *testing.T) { fcTemplate := []*FCTemplate{ { Type: utils.MetaTemplate, - Value: NewRSRParsersMustCompile("1sa{*duration}", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("1sa{*duration}", utils.InfieldSep), }, } expected := "time: unknown unit \"sa\" in duration \"1sa\"" @@ -114,7 +114,7 @@ func TestFCTemplatesFromFCTemplatesJsonCfg(t *testing.T) { Type: "*composed", Path: "Tenant", Filters: []string{"Filter1", "Filter2"}, - Value: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Layout: time.RFC3339, }, { @@ -122,14 +122,14 @@ func TestFCTemplatesFromFCTemplatesJsonCfg(t *testing.T) { Type: "*composed", Path: "RunID", Filters: []string{"Filter1_1", "Filter2_2"}, - Value: NewRSRParsersMustCompile("SampleValue", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("SampleValue", utils.InfieldSep), Layout: time.RFC3339, }, } for _, v := range expected { v.ComputePath() } - if rcv, err := FCTemplatesFromFCTemplatesJSONCfg(jsnCfgs, utils.INFIELD_SEP); err != nil { + if rcv, err := FCTemplatesFromFCTemplatesJSONCfg(jsnCfgs, utils.InfieldSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, rcv) { t.Errorf("expected: %s ,received: %s", utils.ToJSON(expected), utils.ToJSON(rcv)) @@ -143,20 +143,20 @@ func TestFCTemplateInflate1(t *testing.T) { Type: "*composed", Path: "Tenant", Filters: []string{"Filter1", "Filter2"}, - Value: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), }, { Tag: "RunID", Type: "*composed", Path: "RunID", Filters: []string{"Filter1_1", "Filter2_2"}, - Value: NewRSRParsersMustCompile("SampleValue", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("SampleValue", utils.InfieldSep), }, { Tag: "TmpMap", Type: "*template", Filters: []string{"Filter1_1", "Filter2_2"}, - Value: NewRSRParsersMustCompile("TmpMap", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("TmpMap", utils.InfieldSep), }, } fcTmpMp := map[string][]*FCTemplate{ @@ -166,14 +166,14 @@ func TestFCTemplateInflate1(t *testing.T) { Type: "*composed", Path: "Elem1", Filters: []string{"Filter1", "Filter2"}, - Value: NewRSRParsersMustCompile("Elem1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("Elem1", utils.InfieldSep), }, { Tag: "Elem2", Type: "*composed", Path: "Elem2", Filters: []string{"Filter1_1", "Filter2_2"}, - Value: NewRSRParsersMustCompile("Elem2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("Elem2", utils.InfieldSep), }, }, "TmpMap2": { @@ -182,14 +182,14 @@ func TestFCTemplateInflate1(t *testing.T) { Type: "*composed", Path: "Elem2.1", Filters: []string{"Filter1", "Filter2"}, - Value: NewRSRParsersMustCompile("Elem2.1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("Elem2.1", utils.InfieldSep), }, { Tag: "Elem2.2", Type: "*composed", Path: "Elem2.2", Filters: []string{"Filter1_1", "Filter2_2"}, - Value: NewRSRParsersMustCompile("Elem2.2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("Elem2.2", utils.InfieldSep), }, }, } @@ -199,28 +199,28 @@ func TestFCTemplateInflate1(t *testing.T) { Type: "*composed", Path: "Tenant", Filters: []string{"Filter1", "Filter2"}, - Value: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), }, { Tag: "RunID", Type: "*composed", Path: "RunID", Filters: []string{"Filter1_1", "Filter2_2"}, - Value: NewRSRParsersMustCompile("SampleValue", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("SampleValue", utils.InfieldSep), }, { Tag: "Elem1", Type: "*composed", Path: "Elem1", Filters: []string{"Filter1", "Filter2"}, - Value: NewRSRParsersMustCompile("Elem1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("Elem1", utils.InfieldSep), }, { Tag: "Elem2", Type: "*composed", Path: "Elem2", Filters: []string{"Filter1_1", "Filter2_2"}, - Value: NewRSRParsersMustCompile("Elem2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("Elem2", utils.InfieldSep), }, } if rcv, err := InflateTemplates(fcTmp1, fcTmpMp); err != nil { @@ -237,20 +237,20 @@ func TestFCTemplateInflate2(t *testing.T) { Type: "*composed", Path: "Tenant", Filters: []string{"Filter1", "Filter2"}, - Value: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), }, { Tag: "RunID", Type: "*composed", Path: "RunID", Filters: []string{"Filter1_1", "Filter2_2"}, - Value: NewRSRParsersMustCompile("SampleValue", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("SampleValue", utils.InfieldSep), }, { Tag: "TmpMap3", Type: "*template", Filters: []string{"Filter1_1", "Filter2_2"}, - Value: NewRSRParsersMustCompile("TmpMap3", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("TmpMap3", utils.InfieldSep), }, } fcTmpMp := map[string][]*FCTemplate{ @@ -260,14 +260,14 @@ func TestFCTemplateInflate2(t *testing.T) { Type: "*composed", Path: "Elem1", Filters: []string{"Filter1", "Filter2"}, - Value: NewRSRParsersMustCompile("Elem1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("Elem1", utils.InfieldSep), }, { Tag: "Elem2", Type: "*composed", Path: "Elem2", Filters: []string{"Filter1_1", "Filter2_2"}, - Value: NewRSRParsersMustCompile("Elem2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("Elem2", utils.InfieldSep), }, }, "TmpMap2": { @@ -276,14 +276,14 @@ func TestFCTemplateInflate2(t *testing.T) { Type: "*composed", Path: "Elem2.1", Filters: []string{"Filter1", "Filter2"}, - Value: NewRSRParsersMustCompile("Elem2.1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("Elem2.1", utils.InfieldSep), }, { Tag: "Elem2.2", Type: "*composed", Path: "Elem2.2", Filters: []string{"Filter1_1", "Filter2_2"}, - Value: NewRSRParsersMustCompile("Elem2.2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("Elem2.2", utils.InfieldSep), }, }, } @@ -299,20 +299,20 @@ func TestFCTemplateInflate3(t *testing.T) { Type: "*composed", Path: "Tenant", Filters: []string{"Filter1", "Filter2"}, - Value: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), }, { Tag: "RunID", Type: "*composed", Path: "RunID", Filters: []string{"Filter1_1", "Filter2_2"}, - Value: NewRSRParsersMustCompile("SampleValue", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("SampleValue", utils.InfieldSep), }, { Tag: "TmpMap", Type: "*template", Filters: []string{"Filter1_1", "Filter2_2"}, - Value: NewRSRParsersMustCompile("TmpMap", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("TmpMap", utils.InfieldSep), }, } fcTmpMp := map[string][]*FCTemplate{ @@ -323,14 +323,14 @@ func TestFCTemplateInflate3(t *testing.T) { Type: "*composed", Path: "Elem2.1", Filters: []string{"Filter1", "Filter2"}, - Value: NewRSRParsersMustCompile("Elem2.1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("Elem2.1", utils.InfieldSep), }, { Tag: "Elem2.2", Type: "*composed", Path: "Elem2.2", Filters: []string{"Filter1_1", "Filter2_2"}, - Value: NewRSRParsersMustCompile("Elem2.2", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("Elem2.2", utils.InfieldSep), }, }, } @@ -354,7 +354,7 @@ func TestFCTemplateClone(t *testing.T) { Type: "*composed", Path: "Tenant", Filters: []string{"Filter1", "Filter2"}, - Value: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), RoundingDecimals: utils.IntPointer(2), } smpl.ComputePath() @@ -367,12 +367,12 @@ func TestFCTemplateClone(t *testing.T) { Type: "*composed", Path: "Tenant", Filters: []string{"Filter1", "Filter2"}, - Value: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), RoundingDecimals: utils.IntPointer(2), } initialSmpl.ComputePath() smpl.Filters = []string{"SingleFilter"} - smpl.Value = NewRSRParsersMustCompile("cgrates.com", utils.INFIELD_SEP) + smpl.Value = NewRSRParsersMustCompile("cgrates.com", utils.InfieldSep) if !reflect.DeepEqual(cloned, initialSmpl) { t.Errorf("expected: %s ,received: %s", utils.ToJSON(initialSmpl), utils.ToJSON(cloned)) } @@ -506,7 +506,7 @@ func TestFCTemplatesClone(t *testing.T) { Type: "*composed", Path: "Tenant", Filters: []string{"Filter1", "Filter2"}, - Value: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), RoundingDecimals: utils.IntPointer(2), }}, } @@ -521,7 +521,7 @@ func TestFCTemplatesClone(t *testing.T) { Type: "*composed", Path: "Tenant", Filters: []string{"Filter1", "Filter2"}, - Value: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), RoundingDecimals: utils.IntPointer(2), }}, } diff --git a/config/httpagntcfg_test.go b/config/httpagntcfg_test.go index b4b489a55..366301c89 100644 --- a/config/httpagntcfg_test.go +++ b/config/httpagntcfg_test.go @@ -64,14 +64,14 @@ func TestHttpAgentCfgsloadFromJsonCfgCase1(t *testing.T) { RequestProcessors: []*RequestProcessor{{ ID: "OutboundAUTHDryRun", Filters: []string{"*string:*req.request_type:OutboundAUTH", "*string:*req.Msisdn:497700056231"}, - Tenant: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Flags: utils.FlagsWithParams{utils.MetaDryRun: {}}, RequestFields: []*FCTemplate{}, ReplyFields: []*FCTemplate{{ Tag: "Allow", Path: "response.Allow", Type: "*constant", - Value: NewRSRParsersMustCompile("1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }}, @@ -168,14 +168,14 @@ func TestHttpAgentCfgsloadFromJsonCfgCase2(t *testing.T) { { ID: "OutboundAUTHDryRun", Filters: []string{"*string:*req.request_type:OutboundAUTH", "*string:*req.Msisdn:497700056231"}, - Tenant: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Flags: utils.FlagsWithParams{utils.MetaDryRun: {}}, RequestFields: []*FCTemplate{}, ReplyFields: []*FCTemplate{{ Tag: "Allow", Path: "response.Allow", Type: utils.META_CONSTANT, - Value: NewRSRParsersMustCompile("1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }}, @@ -183,13 +183,13 @@ func TestHttpAgentCfgsloadFromJsonCfgCase2(t *testing.T) { { ID: "mtcall_cdr", Filters: []string{"*string:*req.request_type:MTCALL_CDR"}, - Tenant: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Flags: utils.FlagsWithParams{utils.MetaCDRs: {}}, RequestFields: []*FCTemplate{{ Tag: "RequestType", Path: "RequestType", Type: utils.META_CONSTANT, - Value: NewRSRParsersMustCompile("*pseudoprepaid", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("*pseudoprepaid", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }}, @@ -197,7 +197,7 @@ func TestHttpAgentCfgsloadFromJsonCfgCase2(t *testing.T) { Tag: "CDR_ID", Path: "CDR_RESPONSE.CDR_ID", Type: utils.META_COMPOSED, - Value: NewRSRParsersMustCompile("~*req.CDR_ID", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.CDR_ID", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }}, @@ -210,7 +210,7 @@ func TestHttpAgentCfgsloadFromJsonCfgCase2(t *testing.T) { ReplyPayload: utils.MetaXml, RequestProcessors: []*RequestProcessor{{ ID: "cdr_from_xml", - Tenant: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Flags: utils.FlagsWithParams{utils.MetaCDRs: {}}, RequestFields: []*FCTemplate{}, ReplyFields: []*FCTemplate{}, @@ -254,14 +254,14 @@ func TestHttpAgentCfgloadFromJsonCfgCase3(t *testing.T) { RequestProcessors: []*RequestProcessor{{ ID: "OutboundAUTHDryRun", Filters: []string{"*string:*req.request_type:OutboundAUTH", "*string:*req.Msisdn:497700056231"}, - Tenant: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Flags: utils.FlagsWithParams{"*dryrun": {}}, RequestFields: []*FCTemplate{}, ReplyFields: []*FCTemplate{}, }}, } var httpcfg HTTPAgentCfg - if err = httpcfg.loadFromJSONCfg(jsnhttpCfg, utils.INFIELD_SEP); err != nil { + if err = httpcfg.loadFromJSONCfg(jsnhttpCfg, utils.InfieldSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, httpcfg) { t.Errorf("Expected: %+v \n, received: %+v", utils.ToJSON(expected), utils.ToJSON(httpcfg)) @@ -404,14 +404,14 @@ func TestHttpAgentCfgappendHttpAgntProcCfgs(t *testing.T) { RequestProcessors: []*RequestProcessor{{ ID: "OutboundAUTHDryRun", Filters: []string{"*string:*req.request_type:OutboundAUTH", "*string:*req.Msisdn:497700056231"}, - Tenant: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Flags: utils.FlagsWithParams{"*dryrun": {}}, RequestFields: []*FCTemplate{}, ReplyFields: []*FCTemplate{{ Tag: "Allow", Path: "response.Allow", Type: "*constant", - Value: NewRSRParsersMustCompile("1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("1", utils.InfieldSep), Mandatory: true, }}, }}, @@ -454,28 +454,28 @@ func TestHttpAgentCfgappendHttpAgntProcCfgs(t *testing.T) { RequestProcessors: []*RequestProcessor{{ ID: "OutboundAUTHDryRun", Filters: []string{"*string:*req.request_type:OutboundAUTH", "*string:*req.Msisdn:497700056231"}, - Tenant: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Flags: utils.FlagsWithParams{"*dryrun": {}}, RequestFields: []*FCTemplate{}, ReplyFields: []*FCTemplate{{ Tag: "Allow", Path: "response.Allow", Type: "*constant", - Value: NewRSRParsersMustCompile("1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("1", utils.InfieldSep), Mandatory: false, Layout: time.RFC3339, }}, }, { ID: "OutboundAUTHDryRun1", Filters: []string{"*string:*req.request_type:OutboundAUTH", "*string:*req.Msisdn:497700056231"}, - Tenant: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Flags: utils.FlagsWithParams{"*dryrun": {}}, RequestFields: []*FCTemplate{}, ReplyFields: []*FCTemplate{{ Tag: "Allow", Path: "response.Allow", Type: "*constant", - Value: NewRSRParsersMustCompile("1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }}, @@ -483,7 +483,7 @@ func TestHttpAgentCfgappendHttpAgntProcCfgs(t *testing.T) { } expected.RequestProcessors[0].ReplyFields[0].ComputePath() expected.RequestProcessors[1].ReplyFields[0].ComputePath() - if err = initial.appendHTTPAgntProcCfgs(proceses, utils.INFIELD_SEP); err != nil { + if err = initial.appendHTTPAgntProcCfgs(proceses, utils.InfieldSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, initial) { t.Errorf("Expected: %+v , received: %+v", utils.ToJSON(expected), utils.ToJSON(initial)) @@ -568,14 +568,14 @@ func TestHTTPAgentCfgsClone(t *testing.T) { RequestProcessors: []*RequestProcessor{{ ID: "OutboundAUTHDryRun", Filters: []string{"*string:*req.request_type:OutboundAUTH", "*string:*req.Msisdn:497700056231"}, - Tenant: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Flags: utils.FlagsWithParams{utils.MetaDryRun: {}}, RequestFields: []*FCTemplate{}, ReplyFields: []*FCTemplate{{ Tag: "Allow", Path: "response.Allow", Type: "*constant", - Value: NewRSRParsersMustCompile("1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }}, diff --git a/config/loaderscfg_test.go b/config/loaderscfg_test.go index 22600356f..f4c7eaa6d 100644 --- a/config/loaderscfg_test.go +++ b/config/loaderscfg_test.go @@ -50,11 +50,11 @@ func TestLoaderSCfgloadFromJsonCfgCase1(t *testing.T) { }, ], }` - val, err := NewRSRParsers("~req.0", utils.INFIELD_SEP) + val, err := NewRSRParsers("~req.0", utils.InfieldSep) if err != nil { t.Error(err) } - ten, err := NewRSRParsers("cgrates.org", utils.INFIELD_SEP) + ten, err := NewRSRParsers("cgrates.org", utils.InfieldSep) if err != nil { t.Error(err) } @@ -176,7 +176,7 @@ func TestLoaderSCfgloadFromJsonCfgCase5(t *testing.T) { Tag: "TenantID", Path: "Tenant", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, }, }, @@ -190,7 +190,7 @@ func TestLoaderSCfgloadFromJsonCfgCase5(t *testing.T) { Tag: "TenantID", Path: "Tenant", Type: utils.MetaVariable, - Value: NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, }, }, @@ -407,7 +407,7 @@ func TestLoaderSCfgsClone(t *testing.T) { ban := LoaderSCfgs{{ Enabled: true, ID: utils.MetaDefault, - Tenant: NewRSRParsersMustCompile("cgrate.org", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("cgrate.org", utils.InfieldSep), LockFileName: ".cgr.lck", CacheSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches), "*conn1"}, FieldSeparator: ",", @@ -424,7 +424,7 @@ func TestLoaderSCfgsClone(t *testing.T) { pathSlice: []string{"Tenant"}, pathItems: utils.PathItems{{Field: "Tenant"}}, Type: utils.META_COMPOSED, - Value: NewRSRParsersMustCompile("cgrate.org", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("cgrate.org", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }, diff --git a/config/multifiles_it_test.go b/config/multifiles_it_test.go index eb6aee6eb..8a9916c9e 100644 --- a/config/multifiles_it_test.go +++ b/config/multifiles_it_test.go @@ -98,14 +98,14 @@ func TestMfHttpAgentMultipleFields(t *testing.T) { { ID: "OutboundAUTHDryRun", Filters: []string{}, - Tenant: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Flags: utils.FlagsWithParams{"*dryrun": {}}, RequestFields: []*FCTemplate{}, ReplyFields: []*FCTemplate{{ Tag: "Allow", Path: "response.Allow", Type: "*constant", - Value: NewRSRParsersMustCompile("1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }}, @@ -113,7 +113,7 @@ func TestMfHttpAgentMultipleFields(t *testing.T) { { ID: "OutboundAUTH", Filters: []string{"*string:~*req.request_type:OutboundAUTH"}, - Tenant: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Flags: utils.FlagsWithParams{"*accounts": {}, "*attributes": {}, "*authorize": {}}, RequestFields: []*FCTemplate{ @@ -121,7 +121,7 @@ func TestMfHttpAgentMultipleFields(t *testing.T) { Tag: "RequestType", Path: "RequestType", Type: "*constant", - Value: NewRSRParsersMustCompile("*pseudoprepaid", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("*pseudoprepaid", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }, @@ -131,7 +131,7 @@ func TestMfHttpAgentMultipleFields(t *testing.T) { Tag: "Allow", Path: "response.Allow", Type: "*constant", - Value: NewRSRParsersMustCompile("1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }, @@ -140,13 +140,13 @@ func TestMfHttpAgentMultipleFields(t *testing.T) { { ID: "mtcall_cdr", Filters: []string{"*string:~*req.request_type:MTCALL_CDR"}, - Tenant: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Flags: utils.FlagsWithParams{"*cdrs": {}}, RequestFields: []*FCTemplate{{ Tag: "RequestType", Path: "RequestType", Type: "*constant", - Value: NewRSRParsersMustCompile("*pseudoprepaid", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("*pseudoprepaid", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }}, @@ -154,7 +154,7 @@ func TestMfHttpAgentMultipleFields(t *testing.T) { Tag: "CDR_ID", Path: "CDR_RESPONSE.CDR_ID", Type: "*variable", - Value: NewRSRParsersMustCompile("~*req.CDR_ID", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("~*req.CDR_ID", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }}, @@ -169,14 +169,14 @@ func TestMfHttpAgentMultipleFields(t *testing.T) { ReplyPayload: "*xml", RequestProcessors: []*RequestProcessor{{ ID: "cdr_from_xml", - Tenant: NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Flags: utils.FlagsWithParams{"*cdrs": {}}, RequestFields: []*FCTemplate{ { Tag: "ToR", Path: "ToR", Type: "*constant", - Value: NewRSRParsersMustCompile("*data", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("*data", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }, diff --git a/config/radiuscfg_test.go b/config/radiuscfg_test.go index ca97816a9..f2259241d 100644 --- a/config/radiuscfg_test.go +++ b/config/radiuscfg_test.go @@ -69,14 +69,14 @@ func TestRadiusAgentCfgloadFromJsonCfgCase1(t *testing.T) { Filters: []string{"*string:~*req.request_type:OutboundAUTH", "*string:~*req.Msisdn:497700056231"}, Flags: utils.FlagsWithParams{utils.MetaDryRun: {}}, Timezone: utils.EmptyString, - Tenant: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), RequestFields: []*FCTemplate{}, ReplyFields: []*FCTemplate{ { Tag: "Allow", Path: "*rep.response.Allow", Type: utils.META_CONSTANT, - Value: NewRSRParsersMustCompile("1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }, @@ -242,14 +242,14 @@ func TestRadiusAgentCfgClone(t *testing.T) { Filters: []string{"*string:~*req.request_type:OutboundAUTH", "*string:~*req.Msisdn:497700056231"}, Flags: utils.FlagsWithParams{utils.MetaDryRun: {}}, Timezone: utils.EmptyString, - Tenant: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), + Tenant: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), RequestFields: []*FCTemplate{}, ReplyFields: []*FCTemplate{ { Tag: "Allow", Path: "*rep.response.Allow", Type: utils.META_CONSTANT, - Value: NewRSRParsersMustCompile("1", utils.INFIELD_SEP), + Value: NewRSRParsersMustCompile("1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, }, diff --git a/config/rjreader.go b/config/rjreader.go index cf501b377..d5e7e95f5 100644 --- a/config/rjreader.go +++ b/config/rjreader.go @@ -113,7 +113,7 @@ func (rjr *RjReader) ReadByte() (bit byte, err error) { if err != nil { return } - if bit == utils.CSV_SEP { + if bit == utils.CSVSep { var bit2 byte bit2, err = rjr.PeekByteWC() if err != nil { @@ -369,8 +369,8 @@ func (rjr *RjReader) getJSONOffsetLine(offset int64) (line, character int64) { line++ character = 0 } - if (b == ']' || b == '}') && lastChar == utils.CSV_SEP { - i-- //ignore utils.CSV_SEP if is followed by ] or } + if (b == ']' || b == '}') && lastChar == utils.CSVSep { + i-- //ignore utils.CSVSep if is followed by ] or } } if !isWhiteSpace(b) { i++ diff --git a/config/rsrparser.go b/config/rsrparser.go index 24a427175..3722352a9 100644 --- a/config/rsrparser.go +++ b/config/rsrparser.go @@ -41,11 +41,11 @@ func NewRSRParsers(parsersRules string, rsrSeparator string) (prsrs RSRParsers, } else if count != 0 { var splitedRule []string for idx := strings.IndexByte(parsersRules, utils.RSRConstChar); idx != -1; idx = strings.IndexByte(parsersRules, utils.RSRConstChar) { - insideARulePrefix := !strings.HasSuffix(parsersRules[:idx], utils.INFIELD_SEP) // if doesn't have ; we need to concatenate it with last rule + insideARulePrefix := !strings.HasSuffix(parsersRules[:idx], utils.InfieldSep) // if doesn't have ; we need to concatenate it with last rule if insideARulePrefix { - splitedRule = append(splitedRule, strings.Split(parsersRules[:idx], utils.INFIELD_SEP)...) + splitedRule = append(splitedRule, strings.Split(parsersRules[:idx], utils.InfieldSep)...) } else { - splitedRule = append(splitedRule, strings.Split(parsersRules[:idx-1], utils.INFIELD_SEP)...) + splitedRule = append(splitedRule, strings.Split(parsersRules[:idx-1], utils.InfieldSep)...) } parsersRules = parsersRules[idx+1:] idx = strings.IndexByte(parsersRules, utils.RSRConstChar) @@ -59,9 +59,9 @@ func NewRSRParsers(parsersRules string, rsrSeparator string) (prsrs RSRParsers, if len(parsersRules) == 0 { continue } - insideARuleSufix := !strings.HasPrefix(parsersRules, utils.INFIELD_SEP) // if doesn't have ; we need to concatenate it with last rule + insideARuleSufix := !strings.HasPrefix(parsersRules, utils.InfieldSep) // if doesn't have ; we need to concatenate it with last rule if insideARuleSufix { - idx = strings.IndexByte(parsersRules, utils.FALLBACK_SEP) // ';' + idx = strings.IndexByte(parsersRules, utils.FallbackSep) // ';' if idx == -1 { idx = len(parsersRules) splitedRule[len(splitedRule)-1] += parsersRules[:idx] @@ -76,7 +76,7 @@ func NewRSRParsers(parsersRules string, rsrSeparator string) (prsrs RSRParsers, break } if count == 0 { // no more ` so add the rest - splitedRule = append(splitedRule, strings.Split(parsersRules, utils.INFIELD_SEP)...) + splitedRule = append(splitedRule, strings.Split(parsersRules, utils.InfieldSep)...) break } } diff --git a/config/rsrparser_test.go b/config/rsrparser_test.go index 9d29440ec..cb1244219 100644 --- a/config/rsrparser_test.go +++ b/config/rsrparser_test.go @@ -47,7 +47,7 @@ func TestNewRSRParsers(t *testing.T) { utils.NewDataConverterMustCompile("*round:2")}, }, } - if rsrParsers, err := NewRSRParsers(ruleStr, utils.INFIELD_SEP); err != nil { + if rsrParsers, err := NewRSRParsers(ruleStr, utils.InfieldSep); err != nil { t.Error("Unexpected error: ", err.Error()) } else if !reflect.DeepEqual(eRSRParsers, rsrParsers) { t.Errorf("expecting: %+v, received: %+v", eRSRParsers, rsrParsers) @@ -84,7 +84,7 @@ func TestRSRParserCompile(t *testing.T) { func TestRSRParserConstant(t *testing.T) { rule := "cgrates.org" - rsrParsers, err := NewRSRParsers(rule, utils.INFIELD_SEP) + rsrParsers, err := NewRSRParsers(rule, utils.InfieldSep) if err != nil { t.Error("Unexpected error: ", err.Error()) } @@ -97,7 +97,7 @@ func TestRSRParserConstant(t *testing.T) { func TestRSRParserNotConstant(t *testing.T) { rule := "~Header1;~Header2" - rsrParsers, err := NewRSRParsers(rule, utils.INFIELD_SEP) + rsrParsers, err := NewRSRParsers(rule, utils.InfieldSep) if err != nil { t.Error("Unexpected error: ", err.Error()) } @@ -113,7 +113,7 @@ func TestNewRSRParsersConstant(t *testing.T) { eRSRParsers := RSRParsers{ &RSRParser{Rules: ">;q=0.7;expires=3600", path: ">;q=0.7;expires=3600"}, } - if rsrParsers, err := NewRSRParsers(ruleStr, utils.INFIELD_SEP); err != nil { + if rsrParsers, err := NewRSRParsers(ruleStr, utils.InfieldSep); err != nil { t.Error("Unexpected error: ", err.Error()) } else if !reflect.DeepEqual(eRSRParsers, rsrParsers) { t.Errorf("expecting: %+v, received: %+v", eRSRParsers, rsrParsers) @@ -126,7 +126,7 @@ func TestNewRSRParsersConstant(t *testing.T) { func TestNewRSRParsersConstant2(t *testing.T) { ruleStr := "constant;something`>;q=0.7;expires=3600`new;constant" - if rsrParsers, err := NewRSRParsers(ruleStr, utils.INFIELD_SEP); err != nil { + if rsrParsers, err := NewRSRParsers(ruleStr, utils.InfieldSep); err != nil { t.Error("Unexpected error: ", err.Error()) } else if out, err := rsrParsers.ParseDataProvider(utils.MapStorage{}); err != nil { t.Error(err) @@ -135,7 +135,7 @@ func TestNewRSRParsersConstant2(t *testing.T) { } ruleStr = "constant;`>;q=0.7;expires=3600`;constant" - if rsrParsers, err := NewRSRParsers(ruleStr, utils.INFIELD_SEP); err != nil { + if rsrParsers, err := NewRSRParsers(ruleStr, utils.InfieldSep); err != nil { t.Error("Unexpected error: ", err.Error()) } else if out, err := rsrParsers.ParseDataProvider(utils.MapStorage{}); err != nil { t.Error(err) @@ -144,7 +144,7 @@ func TestNewRSRParsersConstant2(t *testing.T) { } ruleStr = "constant;`>;q=0.7;expires=3600`constant" - if rsrParsers, err := NewRSRParsers(ruleStr, utils.INFIELD_SEP); err != nil { + if rsrParsers, err := NewRSRParsers(ruleStr, utils.InfieldSep); err != nil { t.Error("Unexpected error: ", err.Error()) } else if out, err := rsrParsers.ParseDataProvider(utils.MapStorage{}); err != nil { t.Error(err) @@ -153,7 +153,7 @@ func TestNewRSRParsersConstant2(t *testing.T) { } ruleStr = "constant;`>;q=0.7;expires=3600`;" - if rsrParsers, err := NewRSRParsers(ruleStr, utils.INFIELD_SEP); err != nil { + if rsrParsers, err := NewRSRParsers(ruleStr, utils.InfieldSep); err != nil { t.Error("Unexpected error: ", err.Error()) } else if out, err := rsrParsers.ParseDataProvider(utils.MapStorage{}); err != nil { t.Error(err) @@ -162,12 +162,12 @@ func TestNewRSRParsersConstant2(t *testing.T) { } ruleStr = "constant;`>;q=0.7;expires=3600constant" - if _, err := NewRSRParsers(ruleStr, utils.INFIELD_SEP); err == nil { + if _, err := NewRSRParsers(ruleStr, utils.InfieldSep); err == nil { t.Error("Unexpected error: ", err.Error()) } ruleStr = "constant;`>;q=0.7;expires=3600`;~*req.Account" - if rsrParsers, err := NewRSRParsers(ruleStr, utils.INFIELD_SEP); err != nil { + if rsrParsers, err := NewRSRParsers(ruleStr, utils.InfieldSep); err != nil { t.Error("Unexpected error: ", err.Error()) } else if _, err := rsrParsers.ParseDataProvider(utils.MapStorage{}); err != utils.ErrNotFound { t.Error(err) @@ -193,7 +193,7 @@ func TestRSRParserCompileConstant(t *testing.T) { func TestNewRSRParsersParseDataProviderWithInterfaces(t *testing.T) { ruleStr := "~;*accounts.;~*req.Account" - if rsrParsers, err := NewRSRParsers(ruleStr, utils.INFIELD_SEP); err != nil { + if rsrParsers, err := NewRSRParsers(ruleStr, utils.InfieldSep); err != nil { t.Error("Unexpected error: ", err.Error()) } else if out, err := rsrParsers.ParseDataProviderWithInterfaces( utils.MapStorage{ @@ -205,7 +205,7 @@ func TestNewRSRParsersParseDataProviderWithInterfaces(t *testing.T) { } ruleStr = "constant;`>;q=0.7;expires=3600`;~*req.Account" - if rsrParsers, err := NewRSRParsers(ruleStr, utils.INFIELD_SEP); err != nil { + if rsrParsers, err := NewRSRParsers(ruleStr, utils.InfieldSep); err != nil { t.Error("Unexpected error: ", err.Error()) } else if _, err := rsrParsers.ParseDataProviderWithInterfaces(utils.MapStorage{}); err != utils.ErrNotFound { t.Error(err) @@ -233,9 +233,9 @@ func TestNewRSRParsersMustCompile(t *testing.T) { func TestRSRParserGetRule(t *testing.T) { ruleStr := "constant;~*req.Account" - if rsrParsers, err := NewRSRParsers(ruleStr, utils.INFIELD_SEP); err != nil { + if rsrParsers, err := NewRSRParsers(ruleStr, utils.InfieldSep); err != nil { t.Error("Unexpected error: ", err.Error()) - } else if rule := rsrParsers.GetRule(utils.INFIELD_SEP); rule != ruleStr { + } else if rule := rsrParsers.GetRule(utils.InfieldSep); rule != ruleStr { t.Errorf("Expected: %q received: %q", ruleStr, rule) } } @@ -263,7 +263,7 @@ func TestRSRParsersCompile(t *testing.T) { } func TestRSRParsersParseValue(t *testing.T) { - rsrParsers, err := NewRSRParsers("~*req.Account{*round}", utils.INFIELD_SEP) + rsrParsers, err := NewRSRParsers("~*req.Account{*round}", utils.InfieldSep) if err != nil { t.Error("Unexpected error: ", err.Error()) } @@ -555,12 +555,12 @@ func TestRSRParsersGetIfaceFromValues(t *testing.T) { }, } exp := []interface{}{"*rated", "call"} - if rply, err := NewRSRParsersMustCompile("*rated;~*req.Category", utils.INFIELD_SEP).GetIfaceFromValues(dp); err != nil { + if rply, err := NewRSRParsersMustCompile("*rated;~*req.Category", utils.InfieldSep).GetIfaceFromValues(dp); err != nil { t.Error(err) } else if !reflect.DeepEqual(exp, rply) { t.Errorf("Expecting %q, received: %q", exp, rply) } - if _, err := NewRSRParsersMustCompile("*rated;~req.Category", utils.INFIELD_SEP).GetIfaceFromValues(utils.MapStorage{}); err != utils.ErrNotFound { + if _, err := NewRSRParsersMustCompile("*rated;~req.Category", utils.InfieldSep).GetIfaceFromValues(utils.MapStorage{}); err != utils.ErrNotFound { t.Error(err) } } @@ -755,7 +755,7 @@ func TestNewRSRParsers2(t *testing.T) { t.Fatal(err) } eRSRFields := RSRParsers{rsrFld1, rsrFld2, rsrFld4} - if rsrFlds, err := NewRSRParsers(fieldsStr1, utils.INFIELD_SEP); err != nil { + if rsrFlds, err := NewRSRParsers(fieldsStr1, utils.InfieldSep); err != nil { t.Error("Unexpected error: ", err) } else if !reflect.DeepEqual(eRSRFields, rsrFlds) { t.Errorf("Expecting: %v, received: %v", eRSRFields, rsrFlds) @@ -864,7 +864,7 @@ func TestRSRFldParse(t *testing.T) { } func TestRSRParsersClone(t *testing.T) { - rsrs, err := NewRSRParsers(`~subject:s/^0\d{9}$//{*duration}`, utils.INFIELD_SEP) + rsrs, err := NewRSRParsers(`~subject:s/^0\d{9}$//{*duration}`, utils.InfieldSep) if err != nil { t.Fatal(err) } diff --git a/config/sessionscfg_test.go b/config/sessionscfg_test.go index 11dc627ab..698ebca46 100644 --- a/config/sessionscfg_test.go +++ b/config/sessionscfg_test.go @@ -790,7 +790,7 @@ func TestFsAgentCfgClone(t *testing.T) { SubscribePark: true, EmptyBalanceAnnFile: "file", EmptyBalanceContext: "context", - ExtraFields: NewRSRParsersMustCompile("tenant", utils.INFIELD_SEP), + ExtraFields: NewRSRParsersMustCompile("tenant", utils.InfieldSep), LowBalanceAnnFile: "file2", MaxWaitConnection: time.Second, SessionSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaSessionS), "*conn1"}, diff --git a/config/suretaxcfg.go b/config/suretaxcfg.go index 31381f999..fbefaaff5 100644 --- a/config/suretaxcfg.go +++ b/config/suretaxcfg.go @@ -92,82 +92,82 @@ func (st *SureTaxCfg) loadFromJSONCfg(jsnCfg *SureTaxJsonCfg) (err error) { st.RegulatoryCode = *jsnCfg.Regulatory_code } if jsnCfg.Client_tracking != nil { - if st.ClientTracking, err = NewRSRParsers(*jsnCfg.Client_tracking, utils.INFIELD_SEP); err != nil { + if st.ClientTracking, err = NewRSRParsers(*jsnCfg.Client_tracking, utils.InfieldSep); err != nil { return err } } if jsnCfg.Customer_number != nil { - if st.CustomerNumber, err = NewRSRParsers(*jsnCfg.Customer_number, utils.INFIELD_SEP); err != nil { + if st.CustomerNumber, err = NewRSRParsers(*jsnCfg.Customer_number, utils.InfieldSep); err != nil { return err } } if jsnCfg.Orig_number != nil { - if st.OrigNumber, err = NewRSRParsers(*jsnCfg.Orig_number, utils.INFIELD_SEP); err != nil { + if st.OrigNumber, err = NewRSRParsers(*jsnCfg.Orig_number, utils.InfieldSep); err != nil { return err } } if jsnCfg.Term_number != nil { - if st.TermNumber, err = NewRSRParsers(*jsnCfg.Term_number, utils.INFIELD_SEP); err != nil { + if st.TermNumber, err = NewRSRParsers(*jsnCfg.Term_number, utils.InfieldSep); err != nil { return err } } if jsnCfg.Bill_to_number != nil { - if st.BillToNumber, err = NewRSRParsers(*jsnCfg.Bill_to_number, utils.INFIELD_SEP); err != nil { + if st.BillToNumber, err = NewRSRParsers(*jsnCfg.Bill_to_number, utils.InfieldSep); err != nil { return err } } if jsnCfg.Zipcode != nil { - if st.Zipcode, err = NewRSRParsers(*jsnCfg.Zipcode, utils.INFIELD_SEP); err != nil { + if st.Zipcode, err = NewRSRParsers(*jsnCfg.Zipcode, utils.InfieldSep); err != nil { return err } } if jsnCfg.Plus4 != nil { - if st.Plus4, err = NewRSRParsers(*jsnCfg.Plus4, utils.INFIELD_SEP); err != nil { + if st.Plus4, err = NewRSRParsers(*jsnCfg.Plus4, utils.InfieldSep); err != nil { return err } } if jsnCfg.P2PZipcode != nil { - if st.P2PZipcode, err = NewRSRParsers(*jsnCfg.P2PZipcode, utils.INFIELD_SEP); err != nil { + if st.P2PZipcode, err = NewRSRParsers(*jsnCfg.P2PZipcode, utils.InfieldSep); err != nil { return err } } if jsnCfg.P2PPlus4 != nil { - if st.P2PPlus4, err = NewRSRParsers(*jsnCfg.P2PPlus4, utils.INFIELD_SEP); err != nil { + if st.P2PPlus4, err = NewRSRParsers(*jsnCfg.P2PPlus4, utils.InfieldSep); err != nil { return err } } if jsnCfg.Units != nil { - if st.Units, err = NewRSRParsers(*jsnCfg.Units, utils.INFIELD_SEP); err != nil { + if st.Units, err = NewRSRParsers(*jsnCfg.Units, utils.InfieldSep); err != nil { return err } } if jsnCfg.Unit_type != nil { - if st.UnitType, err = NewRSRParsers(*jsnCfg.Unit_type, utils.INFIELD_SEP); err != nil { + if st.UnitType, err = NewRSRParsers(*jsnCfg.Unit_type, utils.InfieldSep); err != nil { return err } } if jsnCfg.Tax_included != nil { - if st.TaxIncluded, err = NewRSRParsers(*jsnCfg.Tax_included, utils.INFIELD_SEP); err != nil { + if st.TaxIncluded, err = NewRSRParsers(*jsnCfg.Tax_included, utils.InfieldSep); err != nil { return err } } if jsnCfg.Tax_situs_rule != nil { - if st.TaxSitusRule, err = NewRSRParsers(*jsnCfg.Tax_situs_rule, utils.INFIELD_SEP); err != nil { + if st.TaxSitusRule, err = NewRSRParsers(*jsnCfg.Tax_situs_rule, utils.InfieldSep); err != nil { return err } } if jsnCfg.Trans_type_code != nil { - if st.TransTypeCode, err = NewRSRParsers(*jsnCfg.Trans_type_code, utils.INFIELD_SEP); err != nil { + if st.TransTypeCode, err = NewRSRParsers(*jsnCfg.Trans_type_code, utils.InfieldSep); err != nil { return err } } if jsnCfg.Sales_type_code != nil { - if st.SalesTypeCode, err = NewRSRParsers(*jsnCfg.Sales_type_code, utils.INFIELD_SEP); err != nil { + if st.SalesTypeCode, err = NewRSRParsers(*jsnCfg.Sales_type_code, utils.InfieldSep); err != nil { return err } } if jsnCfg.Tax_exemption_code_list != nil { - if st.TaxExemptionCodeList, err = NewRSRParsers(*jsnCfg.Tax_exemption_code_list, utils.INFIELD_SEP); err != nil { + if st.TaxExemptionCodeList, err = NewRSRParsers(*jsnCfg.Tax_exemption_code_list, utils.InfieldSep); err != nil { return err } } diff --git a/config/suretaxcfg_test.go b/config/suretaxcfg_test.go index 6325b4fd5..8c7bda440 100644 --- a/config/suretaxcfg_test.go +++ b/config/suretaxcfg_test.go @@ -70,22 +70,22 @@ func TestSureTaxCfgloadFromJsonCfgCase1(t *testing.T) { ResponseGroup: "06", ResponseType: "A3", RegulatoryCode: "06", - ClientTracking: NewRSRParsersMustCompile("~*req.Destination1", utils.INFIELD_SEP), - CustomerNumber: NewRSRParsersMustCompile("~*req.Destination1", utils.INFIELD_SEP), - OrigNumber: NewRSRParsersMustCompile("~*req.Destination1", utils.INFIELD_SEP), - TermNumber: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), - BillToNumber: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), - Zipcode: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), - Plus4: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), - P2PZipcode: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), - P2PPlus4: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), - Units: NewRSRParsersMustCompile("1", utils.INFIELD_SEP), - UnitType: NewRSRParsersMustCompile("00", utils.INFIELD_SEP), - TaxIncluded: NewRSRParsersMustCompile("0", utils.INFIELD_SEP), - TaxSitusRule: NewRSRParsersMustCompile("04", utils.INFIELD_SEP), - TransTypeCode: NewRSRParsersMustCompile("010101", utils.INFIELD_SEP), - SalesTypeCode: NewRSRParsersMustCompile("R", utils.INFIELD_SEP), - TaxExemptionCodeList: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), + ClientTracking: NewRSRParsersMustCompile("~*req.Destination1", utils.InfieldSep), + CustomerNumber: NewRSRParsersMustCompile("~*req.Destination1", utils.InfieldSep), + OrigNumber: NewRSRParsersMustCompile("~*req.Destination1", utils.InfieldSep), + TermNumber: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), + BillToNumber: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), + Zipcode: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), + Plus4: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), + P2PZipcode: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), + P2PPlus4: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), + Units: NewRSRParsersMustCompile("1", utils.InfieldSep), + UnitType: NewRSRParsersMustCompile("00", utils.InfieldSep), + TaxIncluded: NewRSRParsersMustCompile("0", utils.InfieldSep), + TaxSitusRule: NewRSRParsersMustCompile("04", utils.InfieldSep), + TransTypeCode: NewRSRParsersMustCompile("010101", utils.InfieldSep), + SalesTypeCode: NewRSRParsersMustCompile("R", utils.InfieldSep), + TaxExemptionCodeList: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), } jsonCfg := NewDefaultCGRConfig() if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err != nil { @@ -356,22 +356,22 @@ func TestSureTaxCfgClone(t *testing.T) { ResponseGroup: "06", ResponseType: "A3", RegulatoryCode: "06", - ClientTracking: NewRSRParsersMustCompile("~*req.Destination1", utils.INFIELD_SEP), - CustomerNumber: NewRSRParsersMustCompile("~*req.Destination1", utils.INFIELD_SEP), - OrigNumber: NewRSRParsersMustCompile("~*req.Destination1", utils.INFIELD_SEP), - TermNumber: NewRSRParsersMustCompile("~*req.CGRID", utils.INFIELD_SEP), - BillToNumber: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), - Zipcode: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), - Plus4: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), - P2PZipcode: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), - P2PPlus4: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), - Units: NewRSRParsersMustCompile("1", utils.INFIELD_SEP), - UnitType: NewRSRParsersMustCompile("00", utils.INFIELD_SEP), - TaxIncluded: NewRSRParsersMustCompile("0", utils.INFIELD_SEP), - TaxSitusRule: NewRSRParsersMustCompile("04", utils.INFIELD_SEP), - TransTypeCode: NewRSRParsersMustCompile("010101", utils.INFIELD_SEP), - SalesTypeCode: NewRSRParsersMustCompile("R", utils.INFIELD_SEP), - TaxExemptionCodeList: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), + ClientTracking: NewRSRParsersMustCompile("~*req.Destination1", utils.InfieldSep), + CustomerNumber: NewRSRParsersMustCompile("~*req.Destination1", utils.InfieldSep), + OrigNumber: NewRSRParsersMustCompile("~*req.Destination1", utils.InfieldSep), + TermNumber: NewRSRParsersMustCompile("~*req.CGRID", utils.InfieldSep), + BillToNumber: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), + Zipcode: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), + Plus4: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), + P2PZipcode: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), + P2PPlus4: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), + Units: NewRSRParsersMustCompile("1", utils.InfieldSep), + UnitType: NewRSRParsersMustCompile("00", utils.InfieldSep), + TaxIncluded: NewRSRParsersMustCompile("0", utils.InfieldSep), + TaxSitusRule: NewRSRParsersMustCompile("04", utils.InfieldSep), + TransTypeCode: NewRSRParsersMustCompile("010101", utils.InfieldSep), + SalesTypeCode: NewRSRParsersMustCompile("R", utils.InfieldSep), + TaxExemptionCodeList: NewRSRParsersMustCompile(utils.EmptyString, utils.InfieldSep), } rcv := ban.Clone() if !reflect.DeepEqual(ban, rcv) { diff --git a/dispatchers/attributes_it_test.go b/dispatchers/attributes_it_test.go index ee9ee62b1..8032347fa 100755 --- a/dispatchers/attributes_it_test.go +++ b/dispatchers/attributes_it_test.go @@ -241,7 +241,7 @@ func testDspAttrGetAttrFailover(t *testing.T) { FilterIDs: []string{}, Path: utils.MetaReq + utils.NestingSep + "Password", Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep), }, }, Weight: 20.0, @@ -445,7 +445,7 @@ func testDspAttrTestAuthKey2(t *testing.T) { FilterIDs: []string{}, Path: utils.MetaReq + utils.NestingSep + "Password", Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep), }, }, Weight: 20.0, @@ -545,7 +545,7 @@ func testDspAttrGetAttrRoundRobin(t *testing.T) { FilterIDs: []string{}, Path: utils.MetaReq + utils.NestingSep + "Password", Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep), }, }, Weight: 20.0, diff --git a/dispatchers/utils.go b/dispatchers/utils.go index 4159ccf27..ed5487342 100755 --- a/dispatchers/utils.go +++ b/dispatchers/utils.go @@ -58,7 +58,7 @@ type ArgStartServiceWithOpts struct { } func ParseStringMap(s string) utils.StringMap { - if s == utils.ZERO { + if s == utils.MetaZero { return make(utils.StringMap) } return utils.StringMapFromSlice(strings.Split(s, utils.ANDSep)) diff --git a/ees/elastic.go b/ees/elastic.go index 2aedc3e43..4bc63fe51 100644 --- a/ees/elastic.go +++ b/ees/elastic.go @@ -58,7 +58,7 @@ func (eEe *ElasticEe) init() (err error) { // create the client if eEe.eClnt, err = elasticsearch.NewClient( elasticsearch.Config{ - Addresses: strings.Split(eEe.cgrCfg.EEsCfg().Exporters[eEe.cfgIdx].ExportPath, utils.INFIELD_SEP), + Addresses: strings.Split(eEe.cgrCfg.EEsCfg().Exporters[eEe.cfgIdx].ExportPath, utils.InfieldSep), }); err != nil { return } diff --git a/ees/filecsv.go b/ees/filecsv.go index 67990bbcf..5172c67ab 100644 --- a/ees/filecsv.go +++ b/ees/filecsv.go @@ -63,7 +63,7 @@ func (fCsv *FileCSVee) init() (err error) { return } fCsv.csvWriter = csv.NewWriter(fCsv.file) - fCsv.csvWriter.Comma = utils.CSV_SEP + fCsv.csvWriter.Comma = utils.CSVSep if len(fCsv.cgrCfg.EEsCfg().Exporters[fCsv.cfgIdx].FieldSep) > 0 { fCsv.csvWriter.Comma = rune(fCsv.cgrCfg.EEsCfg().Exporters[fCsv.cfgIdx].FieldSep[0]) } diff --git a/engine/action.go b/engine/action.go index 109544156..1adbe5390 100644 --- a/engine/action.go +++ b/engine/action.go @@ -129,13 +129,13 @@ func cdrLogAction(acc *Account, a *Action, acs Actions, extraData interface{}) ( return fmt.Errorf("No connection with CDR Server") } defaultTemplate := map[string]config.RSRParsers{ - utils.ToR: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAcnt+utils.NestingSep+utils.BalanceType, utils.INFIELD_SEP), - utils.OriginHost: config.NewRSRParsersMustCompile("127.0.0.1", utils.INFIELD_SEP), - utils.RequestType: config.NewRSRParsersMustCompile(utils.MetaNone, utils.INFIELD_SEP), - utils.Tenant: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAcnt+utils.NestingSep+utils.Tenant, utils.INFIELD_SEP), - utils.AccountField: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAcnt+utils.NestingSep+utils.AccountField, utils.INFIELD_SEP), - utils.Subject: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAcnt+utils.NestingSep+utils.AccountField, utils.INFIELD_SEP), - utils.COST: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAct+utils.NestingSep+utils.ActionValue, utils.INFIELD_SEP), + utils.ToR: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAcnt+utils.NestingSep+utils.BalanceType, utils.InfieldSep), + utils.OriginHost: config.NewRSRParsersMustCompile("127.0.0.1", utils.InfieldSep), + utils.RequestType: config.NewRSRParsersMustCompile(utils.MetaNone, utils.InfieldSep), + utils.Tenant: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAcnt+utils.NestingSep+utils.Tenant, utils.InfieldSep), + utils.AccountField: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAcnt+utils.NestingSep+utils.AccountField, utils.InfieldSep), + utils.Subject: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAcnt+utils.NestingSep+utils.AccountField, utils.InfieldSep), + utils.COST: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAct+utils.NestingSep+utils.ActionValue, utils.InfieldSep), } template := make(map[string]string) // overwrite default template @@ -425,11 +425,11 @@ func callURLAsync(ub *Account, a *Action, acs Actions, extraData interface{}) er // Mails the balance hitting the threshold towards predefined list of addresses func mailAsync(ub *Account, a *Action, acs Actions, extraData interface{}) error { cgrCfg := config.CgrConfig() - params := strings.Split(a.ExtraParameters, string(utils.CSV_SEP)) + params := strings.Split(a.ExtraParameters, string(utils.CSVSep)) if len(params) == 0 { return errors.New("Unconfigured parameters for mail action") } - toAddrs := strings.Split(params[0], string(utils.FALLBACK_SEP)) + toAddrs := strings.Split(params[0], string(utils.FallbackSep)) toAddrStr := "" for idx, addr := range toAddrs { if idx != 0 { @@ -482,7 +482,7 @@ func setddestinations(ub *Account, a *Action, acs Actions, extraData interface{} } if ddcDestID != "" { destinations := utils.NewStringSet(nil) - for _, statID := range strings.Split(a.ExtraParameters, utils.INFIELD_SEP) { + for _, statID := range strings.Split(a.ExtraParameters, utils.InfieldSep) { if statID == utils.EmptyString { continue } @@ -900,7 +900,7 @@ func (cdrP *cdrLogProvider) RemoteHost() net.Addr { func removeSessionCosts(_ *Account, action *Action, _ Actions, _ interface{}) error { // FiltersID;inlineFilter tenant := config.CgrConfig().GeneralCfg().DefaultTenant smcFilter := new(utils.SMCostFilter) - for _, fltrID := range strings.Split(action.ExtraParameters, utils.INFIELD_SEP) { + for _, fltrID := range strings.Split(action.ExtraParameters, utils.InfieldSep) { if len(fltrID) == 0 { continue } @@ -977,7 +977,7 @@ func resetAccountCDR(ub *Account, action *Action, acts Actions, _ interface{}) e filter := &utils.CDRsFilter{ Accounts: []string{account}, NotCosts: []float64{-1}, - OrderBy: fmt.Sprintf("%s%sdesc", utils.OrderID, utils.INFIELD_SEP), + OrderBy: fmt.Sprintf("%s%sdesc", utils.OrderID, utils.InfieldSep), Paginator: utils.Paginator{Limit: utils.IntPointer(1)}, } cdrs, _, err := cdrStorage.GetCDRs(filter, false) @@ -1045,7 +1045,7 @@ func export(ub *Account, a *Action, acs Actions, extraData interface{}) (err err return // nothing to post } args := &utils.CGREventWithEeIDs{ - EeIDs: strings.Split(a.ExtraParameters, utils.INFIELD_SEP), + EeIDs: strings.Split(a.ExtraParameters, utils.InfieldSep), CGREventWithOpts: cgrEv, } var rply map[string]map[string]interface{} diff --git a/engine/action_plan.go b/engine/action_plan.go index 0ffcdf951..57587aa4b 100644 --- a/engine/action_plan.go +++ b/engine/action_plan.go @@ -322,7 +322,7 @@ func (at *ActionTiming) IsASAP() bool { if at.Timing == nil { return false } - return at.Timing.Timing.StartTime == utils.ASAP + return at.Timing.Timing.StartTime == utils.MetaASAP } // Structure to store actions according to execution time and weight diff --git a/engine/actions_test.go b/engine/actions_test.go index d4e6131e5..6d4c6c19e 100644 --- a/engine/actions_test.go +++ b/engine/actions_test.go @@ -413,7 +413,7 @@ func TestActionPlanFirstMonthOfTheYearSecondDay(t *testing.T) { } func TestActionPlanCheckForASAP(t *testing.T) { - at := &ActionTiming{Timing: &RateInterval{Timing: &RITiming{StartTime: utils.ASAP}}} + at := &ActionTiming{Timing: &RateInterval{Timing: &RITiming{StartTime: utils.MetaASAP}}} if !at.IsASAP() { t.Errorf("%v should be asap!", at) } @@ -540,7 +540,7 @@ func TestActionPlansRemoveMember(t *testing.T) { Months: utils.Months{}, MonthDays: utils.MonthDays{}, WeekDays: utils.WeekDays{}, - StartTime: utils.ASAP, + StartTime: utils.MetaASAP, }, }, Weight: 10, @@ -561,7 +561,7 @@ func TestActionPlansRemoveMember(t *testing.T) { Months: utils.Months{}, MonthDays: utils.MonthDays{}, WeekDays: utils.WeekDays{}, - StartTime: utils.ASAP, + StartTime: utils.MetaASAP, }, }, Weight: 10, diff --git a/engine/cdr_test.go b/engine/cdr_test.go index 8cf17a22a..fdcf78a79 100644 --- a/engine/cdr_test.go +++ b/engine/cdr_test.go @@ -226,7 +226,7 @@ func TestFieldsAsString(t *testing.T) { } eVal := "call_from_1001" if val := cdr.FieldsAsString( - config.NewRSRParsersMustCompile("~*req.Category;_from_;~*req.Account", utils.INFIELD_SEP)); val != eVal { + config.NewRSRParsersMustCompile("~*req.Category;_from_;~*req.Account", utils.InfieldSep)); val != eVal { t.Errorf("Expecting : %s, received: %q", eVal, val) } } @@ -633,7 +633,7 @@ func TestCDRAsExportRecord(t *testing.T) { CostDetails: eventCost, } - prsr := config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+utils.Destination, utils.INFIELD_SEP) + prsr := config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+utils.Destination, utils.InfieldSep) cfgCdrFld := &config.FCTemplate{ Tag: "destination", Path: "*exp.Destination", @@ -696,7 +696,7 @@ func TestCDRAsExportRecord(t *testing.T) { } // Test MetaDateTime - prsr = config.NewRSRParsersMustCompile("~*req.stop_time", utils.INFIELD_SEP) + prsr = config.NewRSRParsersMustCompile("~*req.stop_time", utils.InfieldSep) layout := "2006-01-02 15:04:05" cfgCdrFld = &config.FCTemplate{ Tag: "stop_time", @@ -728,7 +728,7 @@ func TestCDRAsExportRecord(t *testing.T) { t.Error("failed using filter") } - prsr = config.NewRSRParsersMustCompile("~*req.fieldextr2", utils.INFIELD_SEP) + prsr = config.NewRSRParsersMustCompile("~*req.fieldextr2", utils.InfieldSep) cfgCdrFld = &config.FCTemplate{ Tag: "stop_time", Type: utils.MetaDateTime, @@ -741,7 +741,7 @@ func TestCDRAsExportRecord(t *testing.T) { t.Error("Should give error here, got none.") } - prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.CGRID", utils.INFIELD_SEP) + prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.CGRID", utils.InfieldSep) cfgCdrFld = &config.FCTemplate{ Tag: "CGRIDFromCostDetails", Type: utils.META_COMPOSED, @@ -753,7 +753,7 @@ func TestCDRAsExportRecord(t *testing.T) { } else if expRecord[0] != cdr.CostDetails.CGRID { t.Errorf("Expecting:\n%s\nReceived:\n%s", cdr.CostDetails.CGRID, expRecord) } - prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.AccountSummary.ID", utils.INFIELD_SEP) + prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.AccountSummary.ID", utils.InfieldSep) cfgCdrFld = &config.FCTemplate{ Tag: "AccountID", Type: utils.META_COMPOSED, @@ -767,7 +767,7 @@ func TestCDRAsExportRecord(t *testing.T) { } expected := `{"3d99c91":{"DestinationID":"CustomDestination","DestinationPrefix":"26377","RatingPlanID":"RP_ZW_v1"}}` - prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.RatingFilters", utils.INFIELD_SEP) + prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.RatingFilters", utils.InfieldSep) cfgCdrFld = &config.FCTemplate{ Tag: "DestinationID", Type: utils.META_COMPOSED, @@ -781,7 +781,7 @@ func TestCDRAsExportRecord(t *testing.T) { } expected = "RP_ZW_v1" - prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.RatingFilters:s/RatingPlanID\"\\s?\\:\\s?\"([^\"]*)\".*/$1/", utils.INFIELD_SEP) + prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.RatingFilters:s/RatingPlanID\"\\s?\\:\\s?\"([^\"]*)\".*/$1/", utils.InfieldSep) cfgCdrFld = &config.FCTemplate{ Tag: "DestinationID", Type: utils.META_COMPOSED, @@ -795,7 +795,7 @@ func TestCDRAsExportRecord(t *testing.T) { } expected = "CustomDestination" - prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.RatingFilters:s/DestinationID\"\\s?\\:\\s?\"([^\"]*)\".*/$1/", utils.INFIELD_SEP) + prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.RatingFilters:s/DestinationID\"\\s?\\:\\s?\"([^\"]*)\".*/$1/", utils.InfieldSep) cfgCdrFld = &config.FCTemplate{ Tag: "DestinationID", Type: utils.META_COMPOSED, @@ -809,7 +809,7 @@ func TestCDRAsExportRecord(t *testing.T) { } expected = "26377" - prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.RatingFilters:s/DestinationPrefix\"\\s?\\:\\s?\"([^\"]*)\".*/$1/", utils.INFIELD_SEP) + prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.RatingFilters:s/DestinationPrefix\"\\s?\\:\\s?\"([^\"]*)\".*/$1/", utils.InfieldSep) cfgCdrFld = &config.FCTemplate{ Tag: "DestinationID", Type: utils.META_COMPOSED, @@ -1036,7 +1036,7 @@ func TestCDRexportFieldValue(t *testing.T) { } cfgCdrFld := &config.FCTemplate{Path: "*exp.SetupTime", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~SetupTime", utils.INFIELD_SEP), Layout: time.RFC3339} + Value: config.NewRSRParsersMustCompile("~SetupTime", utils.InfieldSep), Layout: time.RFC3339} eVal := "2013-11-07T08:42:20Z" if val, err := cdr.exportFieldValue(cfgCdrFld, nil); err != nil { @@ -1072,7 +1072,7 @@ func TestCDReRoundingDecimals(t *testing.T) { cfgCdrFld := &config.FCTemplate{ Path: "*exp.Cost", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~SetupTime", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~SetupTime", utils.InfieldSep), } //5 is the default value for rounding decimals @@ -1240,7 +1240,7 @@ func TestCDRcombimedCdrFieldVal(t *testing.T) { Tag: "TestCombiMed", Type: utils.META_COMBIMED, Filters: []string{"*string:~*req.RunID:testRun1"}, - Value: config.NewRSRParsersMustCompile("~*req.Cost", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Cost", utils.InfieldSep), } cfg := config.NewDefaultCGRConfig() diff --git a/engine/filters.go b/engine/filters.go index e62356c3e..7fdd8255d 100644 --- a/engine/filters.go +++ b/engine/filters.go @@ -151,10 +151,10 @@ func splitDynFltrValues(val string) (vals []string) { startIdx := strings.IndexByte(val, utils.RSRDynStartChar) endIdx := strings.IndexByte(val, utils.RSRDynEndChar) if startIdx == -1 || endIdx == -1 { - return strings.Split(val, utils.INFIELD_SEP) + return strings.Split(val, utils.InfieldSep) } - vals = strings.Split(val[:startIdx], utils.INFIELD_SEP) + vals = strings.Split(val[:startIdx], utils.InfieldSep) vals[len(vals)-1] += val[startIdx : endIdx+1] val = val[endIdx+1:] if len(val) == 0 { diff --git a/engine/fscdr_test.go b/engine/fscdr_test.go index 5cb65da8e..58f26e719 100644 --- a/engine/fscdr_test.go +++ b/engine/fscdr_test.go @@ -479,7 +479,7 @@ func TestFsCdrSearchExtraFieldInSlice(t *testing.T) { } func TestFsCdrSearchReplaceInExtraFields(t *testing.T) { - fsCdrCfg.CdrsCfg().ExtraFields = config.NewRSRParsersMustCompile(`~*req.read_codec;~*req.sip_user_agent:s/([A-Za-z]*).+/$1/;~*req.write_codec`, utils.INFIELD_SEP) + fsCdrCfg.CdrsCfg().ExtraFields = config.NewRSRParsersMustCompile(`~*req.read_codec;~*req.sip_user_agent:s/([A-Za-z]*).+/$1/;~*req.write_codec`, utils.InfieldSep) newReader := bytes.NewReader(body) fsCdr, err := NewFSCdr(newReader, fsCdrCfg) if err != nil { @@ -529,7 +529,7 @@ func TestFsCdrDDazRSRExtraFields(t *testing.T) { }`) var err error fsCdrCfg, err = config.NewCGRConfigFromJSONStringWithDefaults(eFieldsCfg) - expCdrExtra := config.NewRSRParsersMustCompile(`~*req.effective_caller_id_number:s/(\d+)/+$1/`, utils.INFIELD_SEP) + expCdrExtra := config.NewRSRParsersMustCompile(`~*req.effective_caller_id_number:s/(\d+)/+$1/`, utils.InfieldSep) if err != nil { t.Error("Could not parse the config", err.Error()) } else if !reflect.DeepEqual(expCdrExtra[0], fsCdrCfg.CdrsCfg().ExtraFields[0]) { // Kinda deepEqual bug since without index does not match diff --git a/engine/libattributes.go b/engine/libattributes.go index c35edc11d..a5eb24593 100644 --- a/engine/libattributes.go +++ b/engine/libattributes.go @@ -115,7 +115,7 @@ func (ext *ExternalAttributeProfile) AsAttributeProfile() (attr *AttributeProfil return nil, utils.NewErrMandatoryIeMissing("Value") } attr.Attributes[i] = new(Attribute) - if attr.Attributes[i].Value, err = config.NewRSRParsers(extAttr.Value, utils.INFIELD_SEP); err != nil { + if attr.Attributes[i].Value, err = config.NewRSRParsers(extAttr.Value, utils.InfieldSep); err != nil { return nil, err } attr.Attributes[i].Type = extAttr.Type @@ -139,7 +139,7 @@ func NewAttributeFromInline(tenant, inlnRule string) (attr *AttributeProfile, er ID: inlnRule, Contexts: []string{utils.MetaAny}, } - for _, rule := range strings.Split(inlnRule, utils.INFIELD_SEP) { + for _, rule := range strings.Split(inlnRule, utils.InfieldSep) { ruleSplt := strings.SplitN(rule, utils.InInFieldSep, 3) if len(ruleSplt) < 3 { return nil, fmt.Errorf("inline parse error for string: <%s>", rule) diff --git a/engine/libattributes_test.go b/engine/libattributes_test.go index 13c578c25..8e7add285 100644 --- a/engine/libattributes_test.go +++ b/engine/libattributes_test.go @@ -59,7 +59,7 @@ func TestConvertExternalToProfile(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Account", - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, }, Weight: 20, @@ -131,7 +131,7 @@ func TestNewAttributeFromInline(t *testing.T) { Attributes: []*Attribute{{ Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaSum, - Value: config.NewRSRParsersMustCompile("10;~*req.NumField;20", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("10;~*req.NumField;20", utils.InfieldSep), }}, } attr, err := NewAttributeFromInline(config.CgrConfig().GeneralCfg().DefaultTenant, attrID) @@ -151,12 +151,12 @@ func TestNewAttributeFromInlineWithMultipleRuns(t *testing.T) { Attributes: []*Attribute{{ Path: utils.MetaReq + utils.NestingSep + "RequestType", Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("*rated", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("*rated", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "Category", Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("call", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("call", utils.InfieldSep), }, }, } diff --git a/engine/libtest.go b/engine/libtest.go index 31745a89f..d30615fb1 100644 --- a/engine/libtest.go +++ b/engine/libtest.go @@ -417,7 +417,7 @@ func StopStartEngine(cfgPath string, waitEngine int) (*exec.Cmd, error) { func LoadTariffPlanFromFolder(tpPath, timezone string, dm *DataManager, disable_reverse bool, cacheConns, schedConns []string) error { - loader, err := NewTpReader(dm.dataDB, NewFileCSVStorage(utils.CSV_SEP, tpPath), "", + loader, err := NewTpReader(dm.dataDB, NewFileCSVStorage(utils.CSVSep, tpPath), "", timezone, cacheConns, schedConns, false) if err != nil { return utils.NewErrServerError(err) diff --git a/engine/loader_csv_test.go b/engine/loader_csv_test.go index 442cf9c10..1b946a566 100644 --- a/engine/loader_csv_test.go +++ b/engine/loader_csv_test.go @@ -36,7 +36,7 @@ var csvr *TpReader func init() { var err error - csvr, err = NewTpReader(dm.dataDB, NewStringCSVStorage(utils.CSV_SEP, + csvr, err = NewTpReader(dm.dataDB, NewStringCSVStorage(utils.CSVSep, DestinationsCSVContent, TimingsCSVContent, RatesCSVContent, DestinationRatesCSVContent, RatingPlansCSVContent, RatingProfilesCSVContent, SharedGroupsCSVContent, ActionsCSVContent, ActionPlansCSVContent, ActionTriggersCSVContent, AccountActionsCSVContent, @@ -816,7 +816,7 @@ func TestLoadActionTimings(t *testing.T) { Months: utils.Months{}, MonthDays: utils.MonthDays{}, WeekDays: utils.WeekDays{}, - StartTime: utils.ASAP, + StartTime: utils.MetaASAP, }, }, Weight: 10, @@ -831,7 +831,7 @@ func TestLoadActionTimings(t *testing.T) { Months: utils.Months{}, MonthDays: utils.MonthDays{}, WeekDays: utils.WeekDays{}, - StartTime: utils.ASAP, + StartTime: utils.MetaASAP, }, }, Weight: 10, @@ -1487,7 +1487,7 @@ func TestLoadActionProfiles(t *testing.T) { ID: "ONE_TIME_ACT", FilterIDs: nil, Weight: 10, - Schedule: utils.ASAP, + Schedule: utils.MetaASAP, Targets: []*utils.TPActionTarget{ &utils.TPActionTarget{ TargetType: utils.MetaAccounts, diff --git a/engine/model_helpers.go b/engine/model_helpers.go index 2a6368274..471460819 100644 --- a/engine/model_helpers.go +++ b/engine/model_helpers.go @@ -1082,7 +1082,7 @@ func (tps ResourceMdls) AsTPResources() (result []*utils.TPResourceProfile) { rl.Stored = tp.Stored if len(tp.ActivationInterval) != 0 { rl.ActivationInterval = new(utils.TPActivationInterval) - aiSplt := strings.Split(tp.ActivationInterval, utils.INFIELD_SEP) + aiSplt := strings.Split(tp.ActivationInterval, utils.InfieldSep) if len(aiSplt) == 2 { rl.ActivationInterval.ActivationTime = aiSplt[0] rl.ActivationInterval.ExpiryTime = aiSplt[1] @@ -1094,7 +1094,7 @@ func (tps ResourceMdls) AsTPResources() (result []*utils.TPResourceProfile) { if _, has := thresholdMap[tenID]; !has { thresholdMap[tenID] = make(utils.StringMap) } - trshSplt := strings.Split(tp.ThresholdIDs, utils.INFIELD_SEP) + trshSplt := strings.Split(tp.ThresholdIDs, utils.InfieldSep) for _, trsh := range trshSplt { thresholdMap[tenID][trsh] = true } @@ -1103,7 +1103,7 @@ func (tps ResourceMdls) AsTPResources() (result []*utils.TPResourceProfile) { if _, has := filterMap[tenID]; !has { filterMap[tenID] = make(utils.StringMap) } - filterSplit := strings.Split(tp.FilterIDs, utils.INFIELD_SEP) + filterSplit := strings.Split(tp.FilterIDs, utils.InfieldSep) for _, filter := range filterSplit { filterMap[tenID][filter] = true } @@ -1147,12 +1147,12 @@ func APItoModelResource(rl *utils.TPResourceProfile) (mdls ResourceMdls) { mdl.ActivationInterval = rl.ActivationInterval.ActivationTime } if rl.ActivationInterval.ExpiryTime != utils.EmptyString { - mdl.ActivationInterval += utils.INFIELD_SEP + rl.ActivationInterval.ExpiryTime + mdl.ActivationInterval += utils.InfieldSep + rl.ActivationInterval.ExpiryTime } } for i, val := range rl.ThresholdIDs { if i != 0 { - mdl.ThresholdIDs += utils.INFIELD_SEP + mdl.ThresholdIDs += utils.InfieldSep } mdl.ThresholdIDs += val } @@ -1176,12 +1176,12 @@ func APItoModelResource(rl *utils.TPResourceProfile) (mdls ResourceMdls) { mdl.ActivationInterval = rl.ActivationInterval.ActivationTime } if rl.ActivationInterval.ExpiryTime != utils.EmptyString { - mdl.ActivationInterval += utils.INFIELD_SEP + rl.ActivationInterval.ExpiryTime + mdl.ActivationInterval += utils.InfieldSep + rl.ActivationInterval.ExpiryTime } } for i, val := range rl.ThresholdIDs { if i != 0 { - mdl.ThresholdIDs += utils.INFIELD_SEP + mdl.ThresholdIDs += utils.InfieldSep } mdl.ThresholdIDs += val } @@ -1313,14 +1313,14 @@ func (models StatMdls) AsTPStats() (result []*utils.TPStatProfile) { if _, has := thresholdMap[key.TenantID()]; !has { thresholdMap[key.TenantID()] = make(utils.StringMap) } - trshSplt := strings.Split(model.ThresholdIDs, utils.INFIELD_SEP) + trshSplt := strings.Split(model.ThresholdIDs, utils.InfieldSep) for _, trsh := range trshSplt { thresholdMap[key.TenantID()][trsh] = true } } if len(model.ActivationInterval) != 0 { st.ActivationInterval = new(utils.TPActivationInterval) - aiSplt := strings.Split(model.ActivationInterval, utils.INFIELD_SEP) + aiSplt := strings.Split(model.ActivationInterval, utils.InfieldSep) if len(aiSplt) == 2 { st.ActivationInterval.ActivationTime = aiSplt[0] st.ActivationInterval.ExpiryTime = aiSplt[1] @@ -1332,7 +1332,7 @@ func (models StatMdls) AsTPStats() (result []*utils.TPStatProfile) { if _, has := filterMap[key.TenantID()]; !has { filterMap[key.TenantID()] = make(utils.StringMap) } - filterSplit := strings.Split(model.FilterIDs, utils.INFIELD_SEP) + filterSplit := strings.Split(model.FilterIDs, utils.InfieldSep) for _, filter := range filterSplit { filterMap[key.TenantID()][filter] = true } @@ -1341,7 +1341,7 @@ func (models StatMdls) AsTPStats() (result []*utils.TPStatProfile) { if _, has := statMetricsMap[key.TenantID()]; !has { statMetricsMap[key.TenantID()] = make(map[string]*utils.MetricWithFilters) } - metricIDsSplit := strings.Split(model.MetricIDs, utils.INFIELD_SEP) + metricIDsSplit := strings.Split(model.MetricIDs, utils.InfieldSep) for _, metricID := range metricIDsSplit { stsMetric, found := statMetricsMap[key.TenantID()][metricID] if !found { @@ -1350,7 +1350,7 @@ func (models StatMdls) AsTPStats() (result []*utils.TPStatProfile) { } } if model.MetricFilterIDs != utils.EmptyString { - filterIDs := strings.Split(model.MetricFilterIDs, utils.INFIELD_SEP) + filterIDs := strings.Split(model.MetricFilterIDs, utils.InfieldSep) stsMetric.FilterIDs = append(stsMetric.FilterIDs, filterIDs...) } statMetricsMap[key.TenantID()][metricID] = stsMetric @@ -1387,7 +1387,7 @@ func APItoModelStats(st *utils.TPStatProfile) (mdls StatMdls) { if i == 0 { for i, val := range st.FilterIDs { if i != 0 { - mdl.FilterIDs += utils.INFIELD_SEP + mdl.FilterIDs += utils.InfieldSep } mdl.FilterIDs += val } @@ -1396,7 +1396,7 @@ func APItoModelStats(st *utils.TPStatProfile) (mdls StatMdls) { mdl.ActivationInterval = st.ActivationInterval.ActivationTime } if st.ActivationInterval.ExpiryTime != utils.EmptyString { - mdl.ActivationInterval += utils.INFIELD_SEP + st.ActivationInterval.ExpiryTime + mdl.ActivationInterval += utils.InfieldSep + st.ActivationInterval.ExpiryTime } } mdl.QueueLength = st.QueueLength @@ -1407,14 +1407,14 @@ func APItoModelStats(st *utils.TPStatProfile) (mdls StatMdls) { mdl.Weight = st.Weight for i, val := range st.ThresholdIDs { if i != 0 { - mdl.ThresholdIDs += utils.INFIELD_SEP + mdl.ThresholdIDs += utils.InfieldSep } mdl.ThresholdIDs += val } } for i, val := range metric.FilterIDs { if i != 0 { - mdl.MetricFilterIDs += utils.INFIELD_SEP + mdl.MetricFilterIDs += utils.InfieldSep } mdl.MetricFilterIDs += val } @@ -1542,7 +1542,7 @@ func (tps ThresholdMdls) AsTPThreshold() (result []*utils.TPThresholdProfile) { if _, has := actionMap[tenID]; !has { actionMap[tenID] = make(utils.StringMap) } - actionSplit := strings.Split(tp.ActionIDs, utils.INFIELD_SEP) + actionSplit := strings.Split(tp.ActionIDs, utils.InfieldSep) for _, action := range actionSplit { actionMap[tenID][action] = true } @@ -1552,7 +1552,7 @@ func (tps ThresholdMdls) AsTPThreshold() (result []*utils.TPThresholdProfile) { } if len(tp.ActivationInterval) != 0 { th.ActivationInterval = new(utils.TPActivationInterval) - aiSplt := strings.Split(tp.ActivationInterval, utils.INFIELD_SEP) + aiSplt := strings.Split(tp.ActivationInterval, utils.InfieldSep) if len(aiSplt) == 2 { th.ActivationInterval.ActivationTime = aiSplt[0] th.ActivationInterval.ExpiryTime = aiSplt[1] @@ -1564,7 +1564,7 @@ func (tps ThresholdMdls) AsTPThreshold() (result []*utils.TPThresholdProfile) { if _, has := filterMap[tenID]; !has { filterMap[tenID] = make(utils.StringMap) } - filterSplit := strings.Split(tp.FilterIDs, utils.INFIELD_SEP) + filterSplit := strings.Split(tp.FilterIDs, utils.InfieldSep) for _, filter := range filterSplit { filterMap[tenID][filter] = true } @@ -1614,7 +1614,7 @@ func APItoModelTPThreshold(th *utils.TPThresholdProfile) (mdls ThresholdMdls) { mdl.ActivationInterval = th.ActivationInterval.ActivationTime } if th.ActivationInterval.ExpiryTime != utils.EmptyString { - mdl.ActivationInterval += utils.INFIELD_SEP + th.ActivationInterval.ExpiryTime + mdl.ActivationInterval += utils.InfieldSep + th.ActivationInterval.ExpiryTime } } } @@ -1653,7 +1653,7 @@ func APItoModelTPThreshold(th *utils.TPThresholdProfile) (mdls ThresholdMdls) { mdl.ActivationInterval = th.ActivationInterval.ActivationTime } if th.ActivationInterval.ExpiryTime != utils.EmptyString { - mdl.ActivationInterval += utils.INFIELD_SEP + th.ActivationInterval.ExpiryTime + mdl.ActivationInterval += utils.InfieldSep + th.ActivationInterval.ExpiryTime } } } @@ -1753,7 +1753,7 @@ func (tps FilterMdls) AsTPFilter() (result []*utils.TPFilterProfile) { } if len(tp.ActivationInterval) != 0 { th.ActivationInterval = new(utils.TPActivationInterval) - aiSplt := strings.Split(tp.ActivationInterval, utils.INFIELD_SEP) + aiSplt := strings.Split(tp.ActivationInterval, utils.InfieldSep) if len(aiSplt) == 2 { th.ActivationInterval.ActivationTime = aiSplt[0] th.ActivationInterval.ExpiryTime = aiSplt[1] @@ -1800,12 +1800,12 @@ func APItoModelTPFilter(th *utils.TPFilterProfile) (mdls FilterMdls) { mdl.ActivationInterval = th.ActivationInterval.ActivationTime } if th.ActivationInterval.ExpiryTime != utils.EmptyString { - mdl.ActivationInterval += utils.INFIELD_SEP + th.ActivationInterval.ExpiryTime + mdl.ActivationInterval += utils.InfieldSep + th.ActivationInterval.ExpiryTime } } for i, val := range fltr.Values { if i != 0 { - mdl.Values += utils.INFIELD_SEP + mdl.Values += utils.InfieldSep } mdl.Values += val } @@ -1896,7 +1896,7 @@ func (tps RouteMdls) AsTPRouteProfile() (result []*utils.TPRouteProfile) { routeID := tp.RouteID if tp.RouteFilterIDs != utils.EmptyString { routeID = utils.ConcatenatedKey(routeID, - utils.NewStringSet(strings.Split(tp.RouteFilterIDs, utils.INFIELD_SEP)).Sha1()) + utils.NewStringSet(strings.Split(tp.RouteFilterIDs, utils.InfieldSep)).Sha1()) } sup, found := routeMap[tenID][routeID] if !found { @@ -1908,27 +1908,27 @@ func (tps RouteMdls) AsTPRouteProfile() (result []*utils.TPRouteProfile) { } } if tp.RouteFilterIDs != utils.EmptyString { - supFilterSplit := strings.Split(tp.RouteFilterIDs, utils.INFIELD_SEP) + supFilterSplit := strings.Split(tp.RouteFilterIDs, utils.InfieldSep) sup.FilterIDs = append(sup.FilterIDs, supFilterSplit...) } if tp.RouteRatingplanIDs != utils.EmptyString { - ratingPlanSplit := strings.Split(tp.RouteRatingplanIDs, utils.INFIELD_SEP) + ratingPlanSplit := strings.Split(tp.RouteRatingplanIDs, utils.InfieldSep) sup.RatingPlanIDs = append(sup.RatingPlanIDs, ratingPlanSplit...) } if tp.RouteRateProfileIDs != utils.EmptyString { - rateProfileSplit := strings.Split(tp.RouteRateProfileIDs, utils.INFIELD_SEP) + rateProfileSplit := strings.Split(tp.RouteRateProfileIDs, utils.InfieldSep) sup.RateProfileIDs = append(sup.RateProfileIDs, rateProfileSplit...) } if tp.RouteResourceIDs != utils.EmptyString { - resSplit := strings.Split(tp.RouteResourceIDs, utils.INFIELD_SEP) + resSplit := strings.Split(tp.RouteResourceIDs, utils.InfieldSep) sup.ResourceIDs = append(sup.ResourceIDs, resSplit...) } if tp.RouteStatIDs != utils.EmptyString { - statSplit := strings.Split(tp.RouteStatIDs, utils.INFIELD_SEP) + statSplit := strings.Split(tp.RouteStatIDs, utils.InfieldSep) sup.StatIDs = append(sup.StatIDs, statSplit...) } if tp.RouteAccountIDs != utils.EmptyString { - accSplit := strings.Split(tp.RouteAccountIDs, utils.INFIELD_SEP) + accSplit := strings.Split(tp.RouteAccountIDs, utils.InfieldSep) sup.AccountIDs = append(sup.AccountIDs, accSplit...) } routeMap[tenID][routeID] = sup @@ -1940,7 +1940,7 @@ func (tps RouteMdls) AsTPRouteProfile() (result []*utils.TPRouteProfile) { if _, has := sortingParameterMap[tenID]; !has { sortingParameterMap[tenID] = make(utils.StringMap) } - sortingParamSplit := strings.Split(tp.SortingParameters, utils.INFIELD_SEP) + sortingParamSplit := strings.Split(tp.SortingParameters, utils.InfieldSep) for _, sortingParam := range sortingParamSplit { sortingParameterMap[tenID][sortingParam] = true } @@ -1950,7 +1950,7 @@ func (tps RouteMdls) AsTPRouteProfile() (result []*utils.TPRouteProfile) { } if tp.ActivationInterval != utils.EmptyString { th.ActivationInterval = new(utils.TPActivationInterval) - aiSplt := strings.Split(tp.ActivationInterval, utils.INFIELD_SEP) + aiSplt := strings.Split(tp.ActivationInterval, utils.InfieldSep) if len(aiSplt) == 2 { th.ActivationInterval.ActivationTime = aiSplt[0] th.ActivationInterval.ExpiryTime = aiSplt[1] @@ -1962,7 +1962,7 @@ func (tps RouteMdls) AsTPRouteProfile() (result []*utils.TPRouteProfile) { if _, has := filterMap[tenID]; !has { filterMap[tenID] = make(utils.StringMap) } - filterSplit := strings.Split(tp.FilterIDs, utils.INFIELD_SEP) + filterSplit := strings.Split(tp.FilterIDs, utils.InfieldSep) for _, filter := range filterSplit { filterMap[tenID][filter] = true } @@ -2002,13 +2002,13 @@ func APItoModelTPRoutes(st *utils.TPRouteProfile) (mdls RouteMdls) { mdl.Weight = st.Weight for i, val := range st.FilterIDs { if i != 0 { - mdl.FilterIDs += utils.INFIELD_SEP + mdl.FilterIDs += utils.InfieldSep } mdl.FilterIDs += val } for i, val := range st.SortingParameters { if i != 0 { - mdl.SortingParameters += utils.INFIELD_SEP + mdl.SortingParameters += utils.InfieldSep } mdl.SortingParameters += val } @@ -2017,44 +2017,44 @@ func APItoModelTPRoutes(st *utils.TPRouteProfile) (mdls RouteMdls) { mdl.ActivationInterval = st.ActivationInterval.ActivationTime } if st.ActivationInterval.ExpiryTime != utils.EmptyString { - mdl.ActivationInterval += utils.INFIELD_SEP + st.ActivationInterval.ExpiryTime + mdl.ActivationInterval += utils.InfieldSep + st.ActivationInterval.ExpiryTime } } } mdl.RouteID = supl.ID for i, val := range supl.AccountIDs { if i != 0 { - mdl.RouteAccountIDs += utils.INFIELD_SEP + mdl.RouteAccountIDs += utils.InfieldSep } mdl.RouteAccountIDs += val } for i, val := range supl.RatingPlanIDs { if i != 0 { - mdl.RouteRatingplanIDs += utils.INFIELD_SEP + mdl.RouteRatingplanIDs += utils.InfieldSep } mdl.RouteRatingplanIDs += val } for i, val := range supl.RateProfileIDs { if i != 0 { - mdl.RouteRateProfileIDs += utils.INFIELD_SEP + mdl.RouteRateProfileIDs += utils.InfieldSep } mdl.RouteRateProfileIDs += val } for i, val := range supl.FilterIDs { if i != 0 { - mdl.RouteFilterIDs += utils.INFIELD_SEP + mdl.RouteFilterIDs += utils.InfieldSep } mdl.RouteFilterIDs += val } for i, val := range supl.ResourceIDs { if i != 0 { - mdl.RouteResourceIDs += utils.INFIELD_SEP + mdl.RouteResourceIDs += utils.InfieldSep } mdl.RouteResourceIDs += val } for i, val := range supl.StatIDs { if i != 0 { - mdl.RouteStatIDs += utils.INFIELD_SEP + mdl.RouteStatIDs += utils.InfieldSep } mdl.RouteStatIDs += val } @@ -2176,7 +2176,7 @@ func (tps AttributeMdls) AsTPAttributes() (result []*utils.TPAttributeProfile) { } if len(tp.ActivationInterval) != 0 { th.ActivationInterval = new(utils.TPActivationInterval) - aiSplt := strings.Split(tp.ActivationInterval, utils.INFIELD_SEP) + aiSplt := strings.Split(tp.ActivationInterval, utils.InfieldSep) if len(aiSplt) == 2 { th.ActivationInterval.ActivationTime = aiSplt[0] th.ActivationInterval.ExpiryTime = aiSplt[1] @@ -2188,7 +2188,7 @@ func (tps AttributeMdls) AsTPAttributes() (result []*utils.TPAttributeProfile) { if _, has := filterMap[key.TenantID()]; !has { filterMap[key.TenantID()] = make(utils.StringMap) } - filterSplit := strings.Split(tp.FilterIDs, utils.INFIELD_SEP) + filterSplit := strings.Split(tp.FilterIDs, utils.InfieldSep) for _, filter := range filterSplit { filterMap[key.TenantID()][filter] = true } @@ -2197,7 +2197,7 @@ func (tps AttributeMdls) AsTPAttributes() (result []*utils.TPAttributeProfile) { if _, has := contextMap[tenID]; !has { contextMap[key.TenantID()] = make(utils.StringMap) } - contextSplit := strings.Split(tp.Contexts, utils.INFIELD_SEP) + contextSplit := strings.Split(tp.Contexts, utils.InfieldSep) for _, context := range contextSplit { contextMap[key.TenantID()][context] = true } @@ -2205,7 +2205,7 @@ func (tps AttributeMdls) AsTPAttributes() (result []*utils.TPAttributeProfile) { if tp.Path != utils.EmptyString { filterIDs := make([]string, 0) if tp.AttributeFilterIDs != utils.EmptyString { - filterAttrSplit := strings.Split(tp.AttributeFilterIDs, utils.INFIELD_SEP) + filterAttrSplit := strings.Split(tp.AttributeFilterIDs, utils.InfieldSep) for _, filterAttr := range filterAttrSplit { filterIDs = append(filterIDs, filterAttr) } @@ -2251,18 +2251,18 @@ func APItoModelTPAttribute(th *utils.TPAttributeProfile) (mdls AttributeMdls) { mdl.ActivationInterval = th.ActivationInterval.ActivationTime } if th.ActivationInterval.ExpiryTime != utils.EmptyString { - mdl.ActivationInterval += utils.INFIELD_SEP + th.ActivationInterval.ExpiryTime + mdl.ActivationInterval += utils.InfieldSep + th.ActivationInterval.ExpiryTime } } for i, val := range th.Contexts { if i != 0 { - mdl.Contexts += utils.INFIELD_SEP + mdl.Contexts += utils.InfieldSep } mdl.Contexts += val } for i, val := range th.FilterIDs { if i != 0 { - mdl.FilterIDs += utils.INFIELD_SEP + mdl.FilterIDs += utils.InfieldSep } mdl.FilterIDs += val } @@ -2271,7 +2271,7 @@ func APItoModelTPAttribute(th *utils.TPAttributeProfile) (mdls AttributeMdls) { } for i, val := range reqAttribute.FilterIDs { if i != 0 { - mdl.AttributeFilterIDs += utils.INFIELD_SEP + mdl.AttributeFilterIDs += utils.InfieldSep } mdl.AttributeFilterIDs += val } @@ -2346,7 +2346,7 @@ func AttributeProfileToAPI(attrPrf *AttributeProfile) (tpAttr *utils.TPAttribute FilterIDs: attr.FilterIDs, Path: attr.Path, Type: attr.Type, - Value: attr.Value.GetRule(utils.INFIELD_SEP), + Value: attr.Value.GetRule(utils.InfieldSep), } } if attrPrf.ActivationInterval != nil { @@ -2387,7 +2387,7 @@ func (tps ChargerMdls) AsTPChargers() (result []*utils.TPChargerProfile) { } if len(tp.ActivationInterval) != 0 { tpCPP.ActivationInterval = new(utils.TPActivationInterval) - aiSplt := strings.Split(tp.ActivationInterval, utils.INFIELD_SEP) + aiSplt := strings.Split(tp.ActivationInterval, utils.InfieldSep) if len(aiSplt) == 2 { tpCPP.ActivationInterval.ActivationTime = aiSplt[0] tpCPP.ActivationInterval.ExpiryTime = aiSplt[1] @@ -2399,7 +2399,7 @@ func (tps ChargerMdls) AsTPChargers() (result []*utils.TPChargerProfile) { if _, has := filterMap[tntID]; !has { filterMap[tntID] = make(utils.StringMap) } - filterSplit := strings.Split(tp.FilterIDs, utils.INFIELD_SEP) + filterSplit := strings.Split(tp.FilterIDs, utils.InfieldSep) for _, filter := range filterSplit { filterMap[tntID][filter] = true } @@ -2408,7 +2408,7 @@ func (tps ChargerMdls) AsTPChargers() (result []*utils.TPChargerProfile) { tpCPP.RunID = tp.RunID } if tp.AttributeIDs != utils.EmptyString { - attributeSplit := strings.Split(tp.AttributeIDs, utils.INFIELD_SEP) + attributeSplit := strings.Split(tp.AttributeIDs, utils.InfieldSep) var inlineAttribute string for _, attribute := range attributeSplit { if !strings.HasPrefix(attribute, utils.Meta) { @@ -2419,7 +2419,7 @@ func (tps ChargerMdls) AsTPChargers() (result []*utils.TPChargerProfile) { attributeMap[tntID] = append(attributeMap[tntID], attribute) continue } - inlineAttribute += utils.INFIELD_SEP + attribute + inlineAttribute += utils.InfieldSep + attribute } if inlineAttribute != utils.EmptyString { attributeMap[tntID] = append(attributeMap[tntID], inlineAttribute[1:]) @@ -2466,7 +2466,7 @@ func APItoModelTPCharger(tpCPP *utils.TPChargerProfile) (mdls ChargerMdls) { mdl.ActivationInterval = tpCPP.ActivationInterval.ActivationTime } if tpCPP.ActivationInterval.ExpiryTime != utils.EmptyString { - mdl.ActivationInterval += utils.INFIELD_SEP + tpCPP.ActivationInterval.ExpiryTime + mdl.ActivationInterval += utils.InfieldSep + tpCPP.ActivationInterval.ExpiryTime } } if isFilter && len(tpCPP.AttributeIDs) > 0 { @@ -2491,7 +2491,7 @@ func APItoModelTPCharger(tpCPP *utils.TPChargerProfile) (mdls ChargerMdls) { mdl.ActivationInterval = tpCPP.ActivationInterval.ActivationTime } if tpCPP.ActivationInterval.ExpiryTime != utils.EmptyString { - mdl.ActivationInterval += utils.INFIELD_SEP + tpCPP.ActivationInterval.ExpiryTime + mdl.ActivationInterval += utils.InfieldSep + tpCPP.ActivationInterval.ExpiryTime } } } @@ -2606,7 +2606,7 @@ func (tps DispatcherProfileMdls) AsTPDispatcherProfiles() (result []*utils.TPDis if _, has := contextMap[tenantID]; !has { contextMap[tenantID] = make(utils.StringMap) } - contextSplit := strings.Split(tp.Subsystems, utils.INFIELD_SEP) + contextSplit := strings.Split(tp.Subsystems, utils.InfieldSep) for _, context := range contextSplit { contextMap[tenantID][context] = true } @@ -2615,14 +2615,14 @@ func (tps DispatcherProfileMdls) AsTPDispatcherProfiles() (result []*utils.TPDis if _, has := filterMap[tenantID]; !has { filterMap[tenantID] = make(utils.StringMap) } - filterSplit := strings.Split(tp.FilterIDs, utils.INFIELD_SEP) + filterSplit := strings.Split(tp.FilterIDs, utils.InfieldSep) for _, filter := range filterSplit { filterMap[tenantID][filter] = true } } if len(tp.ActivationInterval) != 0 { tpDPP.ActivationInterval = new(utils.TPActivationInterval) - aiSplt := strings.Split(tp.ActivationInterval, utils.INFIELD_SEP) + aiSplt := strings.Split(tp.ActivationInterval, utils.InfieldSep) if len(aiSplt) == 2 { tpDPP.ActivationInterval.ActivationTime = aiSplt[0] tpDPP.ActivationInterval.ExpiryTime = aiSplt[1] @@ -2634,7 +2634,7 @@ func (tps DispatcherProfileMdls) AsTPDispatcherProfiles() (result []*utils.TPDis tpDPP.Strategy = tp.Strategy } if tp.StrategyParameters != utils.EmptyString { - for _, param := range strings.Split(tp.StrategyParameters, utils.INFIELD_SEP) { + for _, param := range strings.Split(tp.StrategyParameters, utils.InfieldSep) { tpDPP.StrategyParams = append(tpDPP.StrategyParams, param) } } @@ -2650,7 +2650,7 @@ func (tps DispatcherProfileMdls) AsTPDispatcherProfiles() (result []*utils.TPDis Blocker: tp.ConnBlocker, } } - for _, param := range strings.Split(tp.ConnParameters, utils.INFIELD_SEP) { + for _, param := range strings.Split(tp.ConnParameters, utils.InfieldSep) { conn.Params = append(conn.Params, param) } connsMap[tenantID][tp.ConnID] = conn @@ -2662,7 +2662,7 @@ func (tps DispatcherProfileMdls) AsTPDispatcherProfiles() (result []*utils.TPDis connsFilterMap[tenantID][tp.ConnID] = make(utils.StringMap) } - for _, filter := range strings.Split(tp.ConnFilterIDs, utils.INFIELD_SEP) { + for _, filter := range strings.Split(tp.ConnFilterIDs, utils.InfieldSep) { connsFilterMap[tenantID][tp.ConnID][filter] = true } @@ -2710,7 +2710,7 @@ func paramsToString(sp []interface{}) (strategy string) { if len(sp) != 0 { strategy = sp[0].(string) for i := 1; i < len(sp); i++ { - strategy += utils.INFIELD_SEP + sp[i].(string) + strategy += utils.InfieldSep + sp[i].(string) } } return @@ -2721,8 +2721,8 @@ func APItoModelTPDispatcherProfile(tpDPP *utils.TPDispatcherProfile) (mdls Dispa return } - filters := strings.Join(tpDPP.FilterIDs, utils.INFIELD_SEP) - subsystems := strings.Join(tpDPP.Subsystems, utils.INFIELD_SEP) + filters := strings.Join(tpDPP.FilterIDs, utils.InfieldSep) + subsystems := strings.Join(tpDPP.Subsystems, utils.InfieldSep) interval := utils.EmptyString if tpDPP.ActivationInterval != nil { @@ -2730,7 +2730,7 @@ func APItoModelTPDispatcherProfile(tpDPP *utils.TPDispatcherProfile) (mdls Dispa interval = tpDPP.ActivationInterval.ActivationTime } if tpDPP.ActivationInterval.ExpiryTime != utils.EmptyString { - interval += utils.INFIELD_SEP + tpDPP.ActivationInterval.ExpiryTime + interval += utils.InfieldSep + tpDPP.ActivationInterval.ExpiryTime } } @@ -2750,7 +2750,7 @@ func APItoModelTPDispatcherProfile(tpDPP *utils.TPDispatcherProfile) (mdls Dispa }) } - conFilter := strings.Join(tpDPP.Hosts[0].FilterIDs, utils.INFIELD_SEP) + conFilter := strings.Join(tpDPP.Hosts[0].FilterIDs, utils.InfieldSep) conParam := paramsToString(tpDPP.Hosts[0].Params) mdls = append(mdls, &DispatcherProfileMdl{ @@ -2771,7 +2771,7 @@ func APItoModelTPDispatcherProfile(tpDPP *utils.TPDispatcherProfile) (mdls Dispa ConnParameters: conParam, }) for i := 1; i < len(tpDPP.Hosts); i++ { - conFilter = strings.Join(tpDPP.Hosts[i].FilterIDs, utils.INFIELD_SEP) + conFilter = strings.Join(tpDPP.Hosts[i].FilterIDs, utils.InfieldSep) conParam = paramsToString(tpDPP.Hosts[i].Params) mdls = append(mdls, &DispatcherProfileMdl{ Tpid: tpDPP.TPid, @@ -3016,7 +3016,7 @@ func (tps RateProfileMdls) AsTPRateProfile() (result []*utils.TPRateProfile) { } } if tp.RateFilterIDs != utils.EmptyString { - rateFilterSplit := strings.Split(tp.RateFilterIDs, utils.INFIELD_SEP) + rateFilterSplit := strings.Split(tp.RateFilterIDs, utils.InfieldSep) rate.FilterIDs = append(rate.FilterIDs, rateFilterSplit...) } if tp.RateActivationTimes != utils.EmptyString { @@ -3066,7 +3066,7 @@ func (tps RateProfileMdls) AsTPRateProfile() (result []*utils.TPRateProfile) { } if tp.ActivationInterval != utils.EmptyString { rPrf.ActivationInterval = new(utils.TPActivationInterval) - aiSplt := strings.Split(tp.ActivationInterval, utils.INFIELD_SEP) + aiSplt := strings.Split(tp.ActivationInterval, utils.InfieldSep) if len(aiSplt) == 2 { rPrf.ActivationInterval.ActivationTime = aiSplt[0] rPrf.ActivationInterval.ExpiryTime = aiSplt[1] @@ -3078,7 +3078,7 @@ func (tps RateProfileMdls) AsTPRateProfile() (result []*utils.TPRateProfile) { if _, has := filterMap[tenID]; !has { filterMap[tenID] = make(utils.StringMap) } - filterSplit := strings.Split(tp.FilterIDs, utils.INFIELD_SEP) + filterSplit := strings.Split(tp.FilterIDs, utils.InfieldSep) for _, filter := range filterSplit { filterMap[tenID][filter] = true } @@ -3113,7 +3113,7 @@ func APItoModelTPRateProfile(tPrf *utils.TPRateProfile) (mdls RateProfileMdls) { if i == 0 { for i, val := range tPrf.FilterIDs { if i != 0 { - mdl.FilterIDs += utils.INFIELD_SEP + mdl.FilterIDs += utils.InfieldSep } mdl.FilterIDs += val } @@ -3123,7 +3123,7 @@ func APItoModelTPRateProfile(tPrf *utils.TPRateProfile) (mdls RateProfileMdls) { mdl.ActivationInterval = tPrf.ActivationInterval.ActivationTime } if tPrf.ActivationInterval.ExpiryTime != utils.EmptyString { - mdl.ActivationInterval += utils.INFIELD_SEP + tPrf.ActivationInterval.ExpiryTime + mdl.ActivationInterval += utils.InfieldSep + tPrf.ActivationInterval.ExpiryTime } } mdl.Weight = tPrf.Weight @@ -3137,7 +3137,7 @@ func APItoModelTPRateProfile(tPrf *utils.TPRateProfile) (mdls RateProfileMdls) { if j == 0 { for i, val := range rate.FilterIDs { if i != 0 { - mdl.RateFilterIDs += utils.INFIELD_SEP + mdl.RateFilterIDs += utils.InfieldSep } mdl.RateFilterIDs += val } @@ -3284,14 +3284,14 @@ func (tps ActionProfileMdls) AsTPActionProfile() (result []*utils.TPActionProfil if _, has := filterIDsMap[tenID]; !has { filterIDsMap[tenID] = make(utils.StringMap) } - filterSplit := strings.Split(tp.FilterIDs, utils.INFIELD_SEP) + filterSplit := strings.Split(tp.FilterIDs, utils.InfieldSep) for _, filter := range filterSplit { filterIDsMap[tenID][filter] = true } } if tp.ActivationInterval != utils.EmptyString { aPrf.ActivationInterval = new(utils.TPActivationInterval) - aiSplt := strings.Split(tp.ActivationInterval, utils.INFIELD_SEP) + aiSplt := strings.Split(tp.ActivationInterval, utils.InfieldSep) if len(aiSplt) == 2 { aPrf.ActivationInterval.ActivationTime = aiSplt[0] aPrf.ActivationInterval.ExpiryTime = aiSplt[1] @@ -3309,13 +3309,13 @@ func (tps ActionProfileMdls) AsTPActionProfile() (result []*utils.TPActionProfil if _, has := targetIDsMap[tenID]; !has { targetIDsMap[tenID] = make(map[string]utils.StringSet) } - targetIDsMap[tenID][tp.TargetType] = utils.NewStringSet(strings.Split(tp.TargetIDs, utils.INFIELD_SEP)) + targetIDsMap[tenID][tp.TargetType] = utils.NewStringSet(strings.Split(tp.TargetIDs, utils.InfieldSep)) } if tp.ActionID != utils.EmptyString { filterIDs := make([]string, 0) if tp.ActionFilterIDs != utils.EmptyString { - filterAttrSplit := strings.Split(tp.ActionFilterIDs, utils.INFIELD_SEP) + filterAttrSplit := strings.Split(tp.ActionFilterIDs, utils.InfieldSep) for _, filterAttr := range filterAttrSplit { filterIDs = append(filterIDs, filterAttr) } @@ -3362,7 +3362,7 @@ func APItoModelTPActionProfile(tPrf *utils.TPActionProfile) (mdls ActionProfileM if i == 0 { for i, val := range tPrf.FilterIDs { if i != 0 { - mdl.FilterIDs += utils.INFIELD_SEP + mdl.FilterIDs += utils.InfieldSep } mdl.FilterIDs += val } @@ -3372,20 +3372,20 @@ func APItoModelTPActionProfile(tPrf *utils.TPActionProfile) (mdls ActionProfileM mdl.ActivationInterval = tPrf.ActivationInterval.ActivationTime } if tPrf.ActivationInterval.ExpiryTime != utils.EmptyString { - mdl.ActivationInterval += utils.INFIELD_SEP + tPrf.ActivationInterval.ExpiryTime + mdl.ActivationInterval += utils.InfieldSep + tPrf.ActivationInterval.ExpiryTime } } mdl.Weight = tPrf.Weight mdl.Schedule = tPrf.Schedule for _, target := range tPrf.Targets { mdl.TargetType = target.TargetType - mdl.TargetIDs = strings.Join(target.TargetIDs, utils.INFIELD_SEP) + mdl.TargetIDs = strings.Join(target.TargetIDs, utils.InfieldSep) } } mdl.ActionID = action.ID for i, val := range action.FilterIDs { if i != 0 { - mdl.ActionFilterIDs += utils.INFIELD_SEP + mdl.ActionFilterIDs += utils.InfieldSep } mdl.ActionFilterIDs += val } @@ -3439,7 +3439,7 @@ func APItoActionProfile(tpAp *utils.TPActionProfile, timezone string) (ap *Actio } if act.Opts != utils.EmptyString { ap.Actions[i].Opts = make(map[string]interface{}) - for _, opt := range strings.Split(act.Opts, utils.INFIELD_SEP) { // example of opts: key1:val1;key2:val2;key3:val3 + for _, opt := range strings.Split(act.Opts, utils.InfieldSep) { // example of opts: key1:val1;key2:val2;key3:val3 keyValSls := utils.SplitConcatenatedKey(opt) if len(keyValSls) != 2 { err = fmt.Errorf("malformed option for ActionProfile <%s> for action <%s>", ap.TenantID(), act.ID) @@ -3495,7 +3495,7 @@ func ActionProfileToAPI(ap *ActionProfile) (tpAp *utils.TPActionProfile) { for k, v := range act.Opts { elems = append(elems, utils.ConcatenatedKey(k, utils.IfaceAsString(v))) } - tpAp.Actions[i].Opts = strings.Join(elems, utils.INFIELD_SEP) + tpAp.Actions[i].Opts = strings.Join(elems, utils.InfieldSep) } return } @@ -3530,7 +3530,7 @@ func (tps AccountProfileMdls) AsTPAccountProfile() (result []*utils.TPAccountPro if _, has := filterIDsMap[tenID]; !has { filterIDsMap[tenID] = make(utils.StringMap) } - filterSplit := strings.Split(tp.FilterIDs, utils.INFIELD_SEP) + filterSplit := strings.Split(tp.FilterIDs, utils.InfieldSep) for _, filter := range filterSplit { filterIDsMap[tenID][filter] = true } @@ -3539,14 +3539,14 @@ func (tps AccountProfileMdls) AsTPAccountProfile() (result []*utils.TPAccountPro if _, has := thresholdIDsMap[tenID]; !has { thresholdIDsMap[tenID] = make(utils.StringMap) } - thresholdSplit := strings.Split(tp.ThresholdIDs, utils.INFIELD_SEP) + thresholdSplit := strings.Split(tp.ThresholdIDs, utils.InfieldSep) for _, thresholdID := range thresholdSplit { thresholdIDsMap[tenID][thresholdID] = true } } if tp.ActivationInterval != utils.EmptyString { aPrf.ActivationInterval = new(utils.TPActivationInterval) - aiSplt := strings.Split(tp.ActivationInterval, utils.INFIELD_SEP) + aiSplt := strings.Split(tp.ActivationInterval, utils.InfieldSep) if len(aiSplt) == 2 { aPrf.ActivationInterval.ActivationTime = aiSplt[0] aPrf.ActivationInterval.ExpiryTime = aiSplt[1] @@ -3561,14 +3561,14 @@ func (tps AccountProfileMdls) AsTPAccountProfile() (result []*utils.TPAccountPro if tp.BalanceID != utils.EmptyString { filterIDs := make([]string, 0) if tp.BalanceFilterIDs != utils.EmptyString { - filterAttrSplit := strings.Split(tp.BalanceFilterIDs, utils.INFIELD_SEP) + filterAttrSplit := strings.Split(tp.BalanceFilterIDs, utils.InfieldSep) for _, filterAttr := range filterAttrSplit { filterIDs = append(filterIDs, filterAttr) } } costIncrements := make([]*utils.TPBalanceCostIncrement, 0) if tp.BalanceCostIncrements != utils.EmptyString { - sls := strings.Split(tp.BalanceCostIncrements, utils.INFIELD_SEP) + sls := strings.Split(tp.BalanceCostIncrements, utils.InfieldSep) if len(sls)%4 != 0 { return nil, fmt.Errorf("invlid key: <%s> for BalanceCostIncrements", tp.BalanceCostIncrements) } @@ -3582,14 +3582,14 @@ func (tps AccountProfileMdls) AsTPAccountProfile() (result []*utils.TPAccountPro } costAttributes := make([]string, 0) if tp.BalanceCostAttributes != utils.EmptyString { - costAttributeSplit := strings.Split(tp.BalanceCostAttributes, utils.INFIELD_SEP) + costAttributeSplit := strings.Split(tp.BalanceCostAttributes, utils.InfieldSep) for _, costAttribute := range costAttributeSplit { costAttributes = append(costAttributes, costAttribute) } } unitFactors := make([]*utils.TPBalanceUnitFactor, 0) if tp.BalanceUnitFactors != utils.EmptyString { - sls := strings.Split(tp.BalanceUnitFactors, utils.INFIELD_SEP) + sls := strings.Split(tp.BalanceUnitFactors, utils.InfieldSep) if len(sls)%2 != 0 { return nil, fmt.Errorf("invlid key: <%s> for BalanceUnitFactors", tp.BalanceUnitFactors) } @@ -3646,13 +3646,13 @@ func APItoModelTPAccountProfile(tPrf *utils.TPAccountProfile) (mdls AccountProfi if i == 0 { for i, val := range tPrf.FilterIDs { if i != 0 { - mdl.FilterIDs += utils.INFIELD_SEP + mdl.FilterIDs += utils.InfieldSep } mdl.FilterIDs += val } for i, val := range tPrf.ThresholdIDs { if i != 0 { - mdl.ThresholdIDs += utils.INFIELD_SEP + mdl.ThresholdIDs += utils.InfieldSep } mdl.ThresholdIDs += val } @@ -3661,7 +3661,7 @@ func APItoModelTPAccountProfile(tPrf *utils.TPAccountProfile) (mdls AccountProfi mdl.ActivationInterval = tPrf.ActivationInterval.ActivationTime } if tPrf.ActivationInterval.ExpiryTime != utils.EmptyString { - mdl.ActivationInterval += utils.INFIELD_SEP + tPrf.ActivationInterval.ExpiryTime + mdl.ActivationInterval += utils.InfieldSep + tPrf.ActivationInterval.ExpiryTime } } mdl.Weight = tPrf.Weight @@ -3669,7 +3669,7 @@ func APItoModelTPAccountProfile(tPrf *utils.TPAccountProfile) (mdls AccountProfi mdl.BalanceID = balance.ID for i, val := range balance.FilterIDs { if i != 0 { - mdl.BalanceFilterIDs += utils.INFIELD_SEP + mdl.BalanceFilterIDs += utils.InfieldSep } mdl.BalanceFilterIDs += val } @@ -3679,19 +3679,19 @@ func APItoModelTPAccountProfile(tPrf *utils.TPAccountProfile) (mdls AccountProfi mdl.BalanceOpts = balance.Opts for i, costIncr := range balance.CostIncrement { if i != 0 { - mdl.BalanceCostIncrements += utils.INFIELD_SEP + mdl.BalanceCostIncrements += utils.InfieldSep } mdl.BalanceCostIncrements += costIncr.AsString() } for i, costAttr := range balance.CostAttributes { if i != 0 { - mdl.BalanceCostAttributes += utils.INFIELD_SEP + mdl.BalanceCostAttributes += utils.InfieldSep } mdl.BalanceCostAttributes += costAttr } for i, unitFactor := range balance.UnitFactors { if i != 0 { - mdl.BalanceUnitFactors += utils.INFIELD_SEP + mdl.BalanceUnitFactors += utils.InfieldSep } mdl.BalanceUnitFactors += unitFactor.AsString() } @@ -3733,7 +3733,7 @@ func APItoAccountProfile(tpAp *utils.TPAccountProfile, timezone string) (ap *uti } if bal.Opts != utils.EmptyString { ap.Balances[id].Opts = make(map[string]interface{}) - for _, opt := range strings.Split(bal.Opts, utils.INFIELD_SEP) { // example of opts: key1:val1;key2:val2;key3:val3 + for _, opt := range strings.Split(bal.Opts, utils.InfieldSep) { // example of opts: key1:val1;key2:val2;key3:val3 keyValSls := utils.SplitConcatenatedKey(opt) if len(keyValSls) != 2 { err = fmt.Errorf("malformed option for ActionProfile <%s> for action <%s>", ap.TenantID(), bal.ID) @@ -3824,7 +3824,7 @@ func AccountProfileToAPI(ap *utils.AccountProfile) (tpAp *utils.TPAccountProfile for k, v := range bal.Opts { elems = append(elems, utils.ConcatenatedKey(k, utils.IfaceAsString(v))) } - tpAp.Balances[i].Opts = strings.Join(elems, utils.INFIELD_SEP) + tpAp.Balances[i].Opts = strings.Join(elems, utils.InfieldSep) } for i, fli := range ap.ThresholdIDs { tpAp.ThresholdIDs[i] = fli diff --git a/engine/model_helpers_test.go b/engine/model_helpers_test.go index 2031a53ca..bee210f9f 100644 --- a/engine/model_helpers_test.go +++ b/engine/model_helpers_test.go @@ -2870,7 +2870,7 @@ func TestAPItoAttributeProfile(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "FL1", - Value: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, @@ -2913,7 +2913,7 @@ func TestAttributeProfileToAPI(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "FL1", - Value: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, @@ -2957,11 +2957,11 @@ func TestAttributeProfileToAPI2(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "FL1", - Value: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "Test", - Value: config.NewRSRParsersMustCompile("~*req.Account", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Account", utils.InfieldSep), }, }, Weight: 20, diff --git a/engine/storage_csv.go b/engine/storage_csv.go index e59d16e5f..61f6f377d 100644 --- a/engine/storage_csv.go +++ b/engine/storage_csv.go @@ -258,7 +258,7 @@ func NewURLCSVStorage(sep rune, dataPath string) *CSVStorage { var actionProfilesPaths []string var accountProfilesPaths []string - for _, baseURL := range strings.Split(dataPath, utils.INFIELD_SEP) { + for _, baseURL := range strings.Split(dataPath, utils.InfieldSep) { if !strings.HasSuffix(baseURL, utils.CSVSuffix) { destinationsPaths = append(destinationsPaths, joinURL(baseURL, utils.DestinationsCsv)) timingsPaths = append(timingsPaths, joinURL(baseURL, utils.TimingsCsv)) @@ -741,7 +741,7 @@ func (c *csvFile) Open(fn string, sep rune, nrFields int) (err error) { } c.csvReader = csv.NewReader(c.fp) c.csvReader.Comma = sep - c.csvReader.Comment = utils.COMMENT_CHAR + c.csvReader.Comment = utils.CommentChar c.csvReader.FieldsPerRecord = nrFields c.csvReader.TrailingComma = true return @@ -768,7 +768,7 @@ type csvString struct { func (c *csvString) Open(data string, sep rune, nrFields int) (err error) { c.csvReader = csv.NewReader(strings.NewReader(data)) c.csvReader.Comma = sep - c.csvReader.Comment = utils.COMMENT_CHAR + c.csvReader.Comment = utils.CommentChar c.csvReader.FieldsPerRecord = nrFields c.csvReader.TrailingComma = true return @@ -969,7 +969,7 @@ func (c *csvURL) Open(fn string, sep rune, nrFields int) (err error) { c.csvReader = csv.NewReader(c.page) c.csvReader.Comma = sep - c.csvReader.Comment = utils.COMMENT_CHAR + c.csvReader.Comment = utils.CommentChar c.csvReader.FieldsPerRecord = nrFields c.csvReader.TrailingComma = true return diff --git a/engine/storage_internal_stordb.go b/engine/storage_internal_stordb.go index 0b7afafcd..8148e0cb4 100644 --- a/engine/storage_internal_stordb.go +++ b/engine/storage_internal_stordb.go @@ -1423,7 +1423,7 @@ func (iDB *InternalDB) GetCDRs(filter *utils.CDRsFilter, remove bool) (cdrs []*C } if filter.OrderBy != utils.EmptyString { - separateVals := strings.Split(filter.OrderBy, utils.INFIELD_SEP) + separateVals := strings.Split(filter.OrderBy, utils.InfieldSep) ascendent := !(len(separateVals) == 2 && separateVals[1] == "desc") switch separateVals[0] { case utils.OrderID: diff --git a/engine/storage_mongo_stordb.go b/engine/storage_mongo_stordb.go index 2ca3583e9..e6fb2e2f4 100644 --- a/engine/storage_mongo_stordb.go +++ b/engine/storage_mongo_stordb.go @@ -1118,7 +1118,7 @@ func (ms *MongoStorage) GetCDRs(qryFltr *utils.CDRsFilter, remove bool) ([]*CDR, if qryFltr.OrderBy != "" { var orderVal string - separateVals := strings.Split(qryFltr.OrderBy, utils.INFIELD_SEP) + separateVals := strings.Split(qryFltr.OrderBy, utils.InfieldSep) ordVal := 1 if len(separateVals) == 2 && separateVals[1] == "desc" { ordVal = -1 diff --git a/engine/storage_sql.go b/engine/storage_sql.go index decb254ba..82ca7c6dc 100644 --- a/engine/storage_sql.go +++ b/engine/storage_sql.go @@ -1131,7 +1131,7 @@ func (self *SQLStorage) GetCDRs(qryFltr *utils.CDRsFilter, remove bool) ([]*CDR, } if qryFltr.OrderBy != "" { var orderVal string - separateVals := strings.Split(qryFltr.OrderBy, utils.INFIELD_SEP) + separateVals := strings.Split(qryFltr.OrderBy, utils.InfieldSep) switch separateVals[0] { case utils.OrderID: orderVal = "id" diff --git a/engine/tpreader.go b/engine/tpreader.go index a1243a1d7..15384df17 100644 --- a/engine/tpreader.go +++ b/engine/tpreader.go @@ -518,7 +518,7 @@ func (tpr *TpReader) LoadActions() (err error) { // load action timings from tags if tpact.TimingTags != "" { - timingIds := strings.Split(tpact.TimingTags, utils.INFIELD_SEP) + timingIds := strings.Split(tpact.TimingTags, utils.InfieldSep) for _, timingID := range timingIds { timing, found := tpr.timings[timingID] if !found { @@ -730,7 +730,7 @@ func (tpr *TpReader) LoadAccountActionsFiltered(qriedAA *utils.TPAccountActions) return fmt.Errorf("no action with id <%s>", at.ActionsId) } var t *utils.TPTiming - if at.TimingId != utils.ASAP { + if at.TimingId != utils.MetaASAP { tptm, err := tpr.lr.GetTPTimings(tpr.tpid, at.TimingId) if err != nil { return errors.New(err.Error() + " (Timing): " + at.TimingId) @@ -992,7 +992,7 @@ func (tpr *TpReader) LoadAccountActionsFiltered(qriedAA *utils.TPAccountActions) } // load action timings from tags if tpact.TimingTags != "" { - timingIds := strings.Split(tpact.TimingTags, utils.INFIELD_SEP) + timingIds := strings.Split(tpact.TimingTags, utils.InfieldSep) for _, timingID := range timingIds { if timing, found := tpr.timings[timingID]; found { acts[idx].Balance.Timings = append(acts[idx].Balance.Timings, &RITiming{ @@ -2745,13 +2745,13 @@ func (tpr *TpReader) addDefaultTimings() { StartTime: "00:00:00", EndTime: "", } - tpr.timings[utils.ASAP] = &utils.TPTiming{ - ID: utils.ASAP, + tpr.timings[utils.MetaASAP] = &utils.TPTiming{ + ID: utils.MetaASAP, Years: utils.Years{}, Months: utils.Months{}, MonthDays: utils.MonthDays{}, WeekDays: utils.WeekDays{}, - StartTime: utils.ASAP, + StartTime: utils.MetaASAP, EndTime: "", } tpr.timings[utils.MetaEveryMinute] = &utils.TPTiming{ diff --git a/engine/z_actions2_it_test.go b/engine/z_actions2_it_test.go index 7ead7a302..64aaba4c1 100644 --- a/engine/z_actions2_it_test.go +++ b/engine/z_actions2_it_test.go @@ -182,7 +182,7 @@ func testActionsExecuteRemoveSMCos1(t *testing.T) { Actions: []*utils.TPAction{ { Identifier: utils.MetaRemoveSessionCosts, - TimingTags: utils.ASAP, + TimingTags: utils.MetaASAP, ExtraParameters: "*string:~*sc.OriginID:13;*notstring:~*sc.OriginID:12", Weight: 20, }, @@ -215,7 +215,7 @@ func testActionsExecuteRemoveSMCos2(t *testing.T) { Actions: []*utils.TPAction{ { Identifier: utils.MetaRemoveSessionCosts, - TimingTags: utils.ASAP, + TimingTags: utils.MetaASAP, ExtraParameters: "", Weight: 20, }, diff --git a/engine/z_attributes_test.go b/engine/z_attributes_test.go index dfb3c2155..2261bacb7 100644 --- a/engine/z_attributes_test.go +++ b/engine/z_attributes_test.go @@ -97,7 +97,7 @@ var ( Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, - Value: config.NewRSRParsersMustCompile("1010", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1010", utils.InfieldSep), }, }, Weight: 20, @@ -114,7 +114,7 @@ var ( Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, - Value: config.NewRSRParsersMustCompile("1010", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1010", utils.InfieldSep), }, }, Weight: 20, @@ -131,7 +131,7 @@ var ( Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, - Value: config.NewRSRParsersMustCompile("1010", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1010", utils.InfieldSep), }, }, Weight: 20, @@ -148,7 +148,7 @@ var ( Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, - Value: config.NewRSRParsersMustCompile("1010", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1010", utils.InfieldSep), }, }, Weight: 20, @@ -465,7 +465,7 @@ func TestAttributeIndexer(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, - Value: config.NewRSRParsersMustCompile("1010", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1010", utils.InfieldSep), }, }, Weight: 20, @@ -529,7 +529,7 @@ func TestAttributeProcessWithMultipleRuns1(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -545,7 +545,7 @@ func TestAttributeProcessWithMultipleRuns1(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Value: config.NewRSRParsersMustCompile("Value2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value2", utils.InfieldSep), }, }, Weight: 20, @@ -561,7 +561,7 @@ func TestAttributeProcessWithMultipleRuns1(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field3", - Value: config.NewRSRParsersMustCompile("Value3", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value3", utils.InfieldSep), }, }, Weight: 30, @@ -646,7 +646,7 @@ func TestAttributeProcessWithMultipleRuns2(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -662,7 +662,7 @@ func TestAttributeProcessWithMultipleRuns2(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Value: config.NewRSRParsersMustCompile("Value2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value2", utils.InfieldSep), }, }, Weight: 20, @@ -678,7 +678,7 @@ func TestAttributeProcessWithMultipleRuns2(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field3", - Value: config.NewRSRParsersMustCompile("Value3", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value3", utils.InfieldSep), }, }, Weight: 30, @@ -759,7 +759,7 @@ func TestAttributeProcessWithMultipleRuns3(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -775,7 +775,7 @@ func TestAttributeProcessWithMultipleRuns3(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Value: config.NewRSRParsersMustCompile("Value2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value2", utils.InfieldSep), }, }, Weight: 20, @@ -791,7 +791,7 @@ func TestAttributeProcessWithMultipleRuns3(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field3", - Value: config.NewRSRParsersMustCompile("Value3", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value3", utils.InfieldSep), }, }, Weight: 30, @@ -872,7 +872,7 @@ func TestAttributeProcessWithMultipleRuns4(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -888,7 +888,7 @@ func TestAttributeProcessWithMultipleRuns4(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Value: config.NewRSRParsersMustCompile("Value2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value2", utils.InfieldSep), }, }, Weight: 20, @@ -968,7 +968,7 @@ func TestAttributeMultipleProcessWithBlocker(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -984,7 +984,7 @@ func TestAttributeMultipleProcessWithBlocker(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Value: config.NewRSRParsersMustCompile("Value2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value2", utils.InfieldSep), }, }, Blocker: true, @@ -1001,7 +1001,7 @@ func TestAttributeMultipleProcessWithBlocker(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field3", - Value: config.NewRSRParsersMustCompile("Value3", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value3", utils.InfieldSep), }, }, Weight: 30, @@ -1083,7 +1083,7 @@ func TestAttributeMultipleProcessWithBlocker2(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Blocker: true, @@ -1100,7 +1100,7 @@ func TestAttributeMultipleProcessWithBlocker2(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Value: config.NewRSRParsersMustCompile("Value2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value2", utils.InfieldSep), }, }, Weight: 20, @@ -1116,7 +1116,7 @@ func TestAttributeMultipleProcessWithBlocker2(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field3", - Value: config.NewRSRParsersMustCompile("Value3", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value3", utils.InfieldSep), }, }, Weight: 30, @@ -1195,7 +1195,7 @@ func TestAttributeProcessValue(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Value: config.NewRSRParsersMustCompile("~*req.Field1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Field1", utils.InfieldSep), }, }, Blocker: true, @@ -1269,17 +1269,17 @@ func TestAttributeAttributeFilterIDs(t *testing.T) { { FilterIDs: []string{"*string:~*req.PassField:Test"}, Path: utils.MetaReq + utils.NestingSep + "PassField", - Value: config.NewRSRParsersMustCompile("Pass", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Pass", utils.InfieldSep), }, { FilterIDs: []string{"*string:~*req.PassField:RandomValue"}, Path: utils.MetaReq + utils.NestingSep + "NotPassField", - Value: config.NewRSRParsersMustCompile("NotPass", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("NotPass", utils.InfieldSep), }, { FilterIDs: []string{"*notexists:~*req.RandomField:"}, Path: utils.MetaReq + utils.NestingSep + "RandomField", - Value: config.NewRSRParsersMustCompile("RandomValue", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("RandomValue", utils.InfieldSep), }, }, Weight: 10, @@ -1355,7 +1355,7 @@ func TestAttributeProcessEventConstant(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("ConstVal", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("ConstVal", utils.InfieldSep), }, }, Blocker: true, @@ -1430,12 +1430,12 @@ func TestAttributeProcessEventVariable(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.Field1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Field1", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.TheField", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.TheField", utils.InfieldSep), }, }, Blocker: true, @@ -1512,17 +1512,17 @@ func TestAttributeProcessEventComposed(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.Field1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Field1", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("_", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("_", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.TheField", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.TheField", utils.InfieldSep), }, }, Blocker: true, @@ -1599,7 +1599,7 @@ func TestAttributeProcessEventSum(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaSum, - Value: config.NewRSRParsersMustCompile("10;~*req.NumField;20", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("10;~*req.NumField;20", utils.InfieldSep), }, }, Blocker: true, @@ -1678,7 +1678,7 @@ func TestAttributeProcessEventUsageDifference(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.META_USAGE_DIFFERENCE, - Value: config.NewRSRParsersMustCompile("~*req.UnixTimeStamp;~*req.UnixTimeStamp2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.UnixTimeStamp;~*req.UnixTimeStamp2", utils.InfieldSep), }, }, Blocker: true, @@ -1759,7 +1759,7 @@ func TestAttributeProcessEventValueExponent(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaValueExponent, - Value: config.NewRSRParsersMustCompile("~*req.Multiplier;~*req.Pow", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Multiplier;~*req.Pow", utils.InfieldSep), }, }, Blocker: true, @@ -1848,7 +1848,7 @@ func BenchmarkAttributeProcessEventConstant(b *testing.B) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("ConstVal", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("ConstVal", utils.InfieldSep), }, }, Blocker: true, @@ -1911,7 +1911,7 @@ func BenchmarkAttributeProcessEventVariable(b *testing.B) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.Field1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Field1", utils.InfieldSep), }, }, Blocker: true, @@ -1962,7 +1962,7 @@ func TestGetAttributeProfileFromInline(t *testing.T) { Attributes: []*Attribute{{ Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaSum, - Value: config.NewRSRParsersMustCompile("10;~*req.NumField;20", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("10;~*req.NumField;20", utils.InfieldSep), }}, } attr, err := dm.GetAttributeProfile(config.CgrConfig().GeneralCfg().DefaultTenant, attrID, false, false, "") @@ -1988,7 +1988,7 @@ func TestProcessAttributeConstant(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("Val2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Val2", utils.InfieldSep), }, }, Weight: 10, @@ -2050,7 +2050,7 @@ func TestProcessAttributeVariable(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.RandomField", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.RandomField", utils.InfieldSep), }, }, Weight: 10, @@ -2114,12 +2114,12 @@ func TestProcessAttributeComposed(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.RandomField", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.RandomField", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.RandomField2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.RandomField2", utils.InfieldSep), }, }, Weight: 10, @@ -2184,7 +2184,7 @@ func TestProcessAttributeUsageDifference(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.META_USAGE_DIFFERENCE, - Value: config.NewRSRParsersMustCompile("~*req.RandomField;~*req.RandomField2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.RandomField;~*req.RandomField2", utils.InfieldSep), }, }, Weight: 10, @@ -2249,7 +2249,7 @@ func TestProcessAttributeSum(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaSum, - Value: config.NewRSRParsersMustCompile("~*req.RandomField;~*req.RandomField2;10", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.RandomField;~*req.RandomField2;10", utils.InfieldSep), }, }, Weight: 10, @@ -2314,7 +2314,7 @@ func TestProcessAttributeDiff(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaDifference, - Value: config.NewRSRParsersMustCompile("55;~*req.RandomField;~*req.RandomField2;10", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("55;~*req.RandomField;~*req.RandomField2;10", utils.InfieldSep), }, }, Weight: 10, @@ -2379,7 +2379,7 @@ func TestProcessAttributeMultiply(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaMultiply, - Value: config.NewRSRParsersMustCompile("55;~*req.RandomField;~*req.RandomField2;10", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("55;~*req.RandomField;~*req.RandomField2;10", utils.InfieldSep), }, }, Weight: 10, @@ -2444,7 +2444,7 @@ func TestProcessAttributeDivide(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaDivide, - Value: config.NewRSRParsersMustCompile("55.0;~*req.RandomField;~*req.RandomField2;4", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("55.0;~*req.RandomField;~*req.RandomField2;4", utils.InfieldSep), }, }, Weight: 10, @@ -2509,7 +2509,7 @@ func TestProcessAttributeValueExponent(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaValueExponent, - Value: config.NewRSRParsersMustCompile("~*req.RandomField2;4", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.RandomField2;4", utils.InfieldSep), }, }, Weight: 10, @@ -2574,7 +2574,7 @@ func TestProcessAttributeUnixTimeStamp(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaUnixTimestamp, - Value: config.NewRSRParsersMustCompile("~*req.RandomField2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.RandomField2", utils.InfieldSep), }, }, Weight: 10, @@ -2639,7 +2639,7 @@ func TestProcessAttributePrefix(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaPrefix, - Value: config.NewRSRParsersMustCompile("abc_", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("abc_", utils.InfieldSep), }, }, Weight: 10, @@ -2703,7 +2703,7 @@ func TestProcessAttributeSuffix(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaSuffix, - Value: config.NewRSRParsersMustCompile("_abc", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("_abc", utils.InfieldSep), }, }, Weight: 10, @@ -2786,7 +2786,7 @@ func TestAttributeIndexSelectsFalse(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, - Value: config.NewRSRParsersMustCompile("1010", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1010", utils.InfieldSep), }, }, Weight: 20, @@ -2832,7 +2832,7 @@ func TestProcessAttributeWithSameWeight(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.RandomField", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.RandomField", utils.InfieldSep), }, }, Weight: 10, @@ -2846,7 +2846,7 @@ func TestProcessAttributeWithSameWeight(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Field3", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.RandomField", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.RandomField", utils.InfieldSep), }, }, Weight: 10, @@ -2912,7 +2912,7 @@ func TestAttributeMultipleProcessWithFiltersExists(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -2928,7 +2928,7 @@ func TestAttributeMultipleProcessWithFiltersExists(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Value: config.NewRSRParsersMustCompile("Value2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value2", utils.InfieldSep), }, }, Weight: 20, @@ -3010,7 +3010,7 @@ func TestAttributeMultipleProcessWithFiltersNotEmpty(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field1", - Value: config.NewRSRParsersMustCompile("Value1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value1", utils.InfieldSep), }, }, Weight: 10, @@ -3026,7 +3026,7 @@ func TestAttributeMultipleProcessWithFiltersNotEmpty(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Value: config.NewRSRParsersMustCompile("Value2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Value2", utils.InfieldSep), }, }, Weight: 20, diff --git a/engine/z_filterindexer_it_test.go b/engine/z_filterindexer_it_test.go index 18ff35641..e0399d91a 100644 --- a/engine/z_filterindexer_it_test.go +++ b/engine/z_filterindexer_it_test.go @@ -499,7 +499,7 @@ func testITTestAttributeProfileFilterIndexes(t *testing.T) { Attributes: []*Attribute{ { Path: "FN1", - Value: config.NewRSRParsersMustCompile("Val1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Val1", utils.InfieldSep), }, }, Weight: 20, @@ -538,7 +538,7 @@ func testITTestAttributeProfileFilterIndexes(t *testing.T) { Attributes: []*Attribute{ { Path: "FN1", - Value: config.NewRSRParsersMustCompile("Val1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Val1", utils.InfieldSep), }, }, Weight: 20, @@ -664,7 +664,7 @@ func testITTestAttributeProfileFilterIndexes2(t *testing.T) { Attributes: []*Attribute{ { Path: "FN1", - Value: config.NewRSRParsersMustCompile("Val1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Val1", utils.InfieldSep), }, }, Weight: 20, @@ -703,7 +703,7 @@ func testITTestAttributeProfileFilterIndexes2(t *testing.T) { Attributes: []*Attribute{ { Path: "FN1", - Value: config.NewRSRParsersMustCompile("Val1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Val1", utils.InfieldSep), }, }, Weight: 20, diff --git a/engine/z_loader_it_test.go b/engine/z_loader_it_test.go index c23865753..2298936a6 100644 --- a/engine/z_loader_it_test.go +++ b/engine/z_loader_it_test.go @@ -142,7 +142,7 @@ func testLoaderITRemoveLoad(t *testing.T) { t.Error("Failed validating data: ", err.Error()) } }*/ - loader, err = NewTpReader(dataDbCsv.DataDB(), NewFileCSVStorage(utils.CSV_SEP, + loader, err = NewTpReader(dataDbCsv.DataDB(), NewFileCSVStorage(utils.CSVSep, path.Join(*dataDir, "tariffplans", *tpCsvScenario)), "", "", []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)}, nil, false) if err != nil { @@ -221,7 +221,7 @@ func testLoaderITLoadFromCSV(t *testing.T) { t.Error("Failed validating data: ", err.Error()) } }*/ - loader, err = NewTpReader(dataDbCsv.DataDB(), NewFileCSVStorage(utils.CSV_SEP, + loader, err = NewTpReader(dataDbCsv.DataDB(), NewFileCSVStorage(utils.CSVSep, path.Join(*dataDir, "tariffplans", *tpCsvScenario)), "", "", []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)}, nil, false) if err != nil { @@ -511,7 +511,7 @@ func testLoaderITImportToStorDb(t *testing.T) { TPid: utils.TEST_SQL, StorDb: storDb, DirPath: path.Join(*dataDir, "tariffplans", *tpCsvScenario), - Sep: utils.CSV_SEP, + Sep: utils.CSVSep, Verbose: false, ImportId: utils.TEST_SQL} if err := csvImporter.Run(); err != nil { diff --git a/engine/z_onstor_it_test.go b/engine/z_onstor_it_test.go index 11e66b001..e7b951222 100644 --- a/engine/z_onstor_it_test.go +++ b/engine/z_onstor_it_test.go @@ -213,7 +213,7 @@ func testOnStorITCacheActionPlan(t *testing.T) { Months: utils.Months{}, MonthDays: utils.MonthDays{}, WeekDays: utils.WeekDays{}, - StartTime: utils.ASAP, + StartTime: utils.MetaASAP, }, }, Weight: 10, @@ -227,7 +227,7 @@ func testOnStorITCacheActionPlan(t *testing.T) { Months: utils.Months{}, MonthDays: utils.MonthDays{}, WeekDays: utils.WeekDays{}, - StartTime: utils.ASAP, + StartTime: utils.MetaASAP, }, }, Weight: 10, @@ -709,7 +709,7 @@ func testOnStorITActions(t *testing.T) { Months: utils.Months{time.January, time.February, time.March}, MonthDays: utils.MonthDays{1, 2, 3, 4}, WeekDays: utils.WeekDays{1, 2, 3}, - StartTime: utils.ASAP, + StartTime: utils.MetaASAP, }, }, Blocker: utils.BoolPointer(false), @@ -735,7 +735,7 @@ func testOnStorITActions(t *testing.T) { Months: utils.Months{time.January, time.February, time.March}, MonthDays: utils.MonthDays{1, 2, 3, 4}, WeekDays: utils.WeekDays{1, 2, 3}, - StartTime: utils.ASAP, + StartTime: utils.MetaASAP, }, }, Blocker: utils.BoolPointer(false), @@ -797,7 +797,7 @@ func testOnStorITActions(t *testing.T) { Months: utils.Months{time.January, time.February, time.March}, MonthDays: utils.MonthDays{1, 2, 3, 4}, WeekDays: utils.WeekDays{1, 2, 3}, - StartTime: utils.ASAP, + StartTime: utils.MetaASAP, }, }, Blocker: utils.BoolPointer(false), @@ -823,7 +823,7 @@ func testOnStorITActions(t *testing.T) { Months: utils.Months{time.January, time.February, time.March}, MonthDays: utils.MonthDays{1, 2, 3, 4}, WeekDays: utils.WeekDays{1, 2, 3}, - StartTime: utils.ASAP, + StartTime: utils.MetaASAP, }, }, Blocker: utils.BoolPointer(false), @@ -849,7 +849,7 @@ func testOnStorITActions(t *testing.T) { Months: utils.Months{time.January, time.February, time.March}, MonthDays: utils.MonthDays{1, 2, 3, 4}, WeekDays: utils.WeekDays{1, 2, 3}, - StartTime: utils.ASAP, + StartTime: utils.MetaASAP, }, }, Blocker: utils.BoolPointer(false), @@ -1034,7 +1034,7 @@ func testOnStorITCRUDActionPlan(t *testing.T) { Months: utils.Months{}, MonthDays: utils.MonthDays{}, WeekDays: utils.WeekDays{}, - StartTime: utils.ASAP, + StartTime: utils.MetaASAP, }, }, Weight: 10, @@ -1048,7 +1048,7 @@ func testOnStorITCRUDActionPlan(t *testing.T) { Months: utils.Months{}, MonthDays: utils.MonthDays{}, WeekDays: utils.WeekDays{}, - StartTime: utils.ASAP, + StartTime: utils.MetaASAP, }, }, Weight: 10, @@ -1912,7 +1912,7 @@ func testOnStorITAttributeProfile(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "FN1", - Value: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, @@ -1992,7 +1992,7 @@ func testOnStorITTestAttributeSubstituteIface(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "FN1", - Value: config.NewRSRParsersMustCompile("Val1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Val1", utils.InfieldSep), }, }, Weight: 20, @@ -2014,7 +2014,7 @@ func testOnStorITTestAttributeSubstituteIface(t *testing.T) { attrProfile.Attributes = []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "FN1", - Value: config.NewRSRParsersMustCompile("123.123", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("123.123", utils.InfieldSep), }, } if err := onStor.SetAttributeProfile(attrProfile, false); err != nil { @@ -2030,7 +2030,7 @@ func testOnStorITTestAttributeSubstituteIface(t *testing.T) { attrProfile.Attributes = []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "FN1", - Value: config.NewRSRParsersMustCompile("true", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("true", utils.InfieldSep), }, } if err := onStor.SetAttributeProfile(attrProfile, false); err != nil { @@ -2250,7 +2250,7 @@ func testOnStorITActionProfile(t *testing.T) { ID: "TEST_ID1", FilterIDs: []string{"*string:~*req.Account:1001"}, Weight: 20, - Schedule: utils.ASAP, + Schedule: utils.MetaASAP, Targets: map[string]utils.StringSet{ utils.MetaAccounts: utils.NewStringSet([]string{"acc1", "acc2", "acc3"}), }, diff --git a/engine/z_stordb_it_test.go b/engine/z_stordb_it_test.go index 583c11bf4..a69167dd8 100644 --- a/engine/z_stordb_it_test.go +++ b/engine/z_stordb_it_test.go @@ -233,7 +233,7 @@ func testStorDBitCRUDTPActionProfiles(t *testing.T) { ID: "sub_id1", FilterIDs: []string{"*string:~*req.Account:1001"}, Weight: 20, - Schedule: utils.ASAP, + Schedule: utils.MetaASAP, Actions: []*utils.TPAPAction{ { ID: "TOPUP", @@ -249,7 +249,7 @@ func testStorDBitCRUDTPActionProfiles(t *testing.T) { ID: "sub_id2", FilterIDs: []string{"*string:~*req.Destination:10"}, Weight: 10, - Schedule: utils.ASAP, + Schedule: utils.MetaASAP, Actions: []*utils.TPAPAction{ { ID: "TOPUP", diff --git a/ers/filecsv.go b/ers/filecsv.go index ae0a721f6..9a9c85e63 100644 --- a/ers/filecsv.go +++ b/ers/filecsv.go @@ -133,8 +133,8 @@ func (rdr *CSVFileER) processFile(fPath, fName string) (err error) { defer file.Close() csvReader := csv.NewReader(bufio.NewReader(file)) csvReader.FieldsPerRecord = rdr.cgrCfg.ERsCfg().Readers[rdr.cfgIdx].RowLength - csvReader.Comment = utils.COMMENT_CHAR - csvReader.Comma = utils.CSV_SEP + csvReader.Comment = utils.CommentChar + csvReader.Comma = utils.CSVSep if len(rdr.Config().FieldSep) > 0 { csvReader.Comma = rune(rdr.Config().FieldSep[0]) } diff --git a/ers/flatstore.go b/ers/flatstore.go index 047e08824..62160babc 100644 --- a/ers/flatstore.go +++ b/ers/flatstore.go @@ -187,7 +187,7 @@ func (rdr *FlatstoreER) processFile(fPath, fName string) (err error) { // build Usage from Fields based on record lenght for i, cntFld := range rdr.Config().Fields { if cntFld.Path == utils.MetaCgreq+utils.NestingSep+utils.Usage { - rdr.Config().Fields[i].Value = config.NewRSRParsersMustCompile("~*req."+strconv.Itoa(len(record)-1), utils.INFIELD_SEP) // in case of flatstore, last element will be the duration computed by us + rdr.Config().Fields[i].Value = config.NewRSRParsersMustCompile("~*req."+strconv.Itoa(len(record)-1), utils.InfieldSep) // in case of flatstore, last element will be the duration computed by us } } rowNr++ // increment the rowNr after checking if it's not the end of file diff --git a/general_tests/acntacts_test.go b/general_tests/acntacts_test.go index 526cc1e9a..73152e772 100644 --- a/general_tests/acntacts_test.go +++ b/general_tests/acntacts_test.go @@ -55,7 +55,7 @@ ENABLE_ACNT,*enable_account,,,,,,,,,,,,,false,false,10` suppliers := `` attrProfiles := `` chargerProfiles := `` - csvr, err := engine.NewTpReader(dbAcntActs.DataDB(), engine.NewStringCSVStorage(utils.CSV_SEP, destinations, timings, + csvr, err := engine.NewTpReader(dbAcntActs.DataDB(), engine.NewStringCSVStorage(utils.CSVSep, destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles, sharedGroups, actions, actionPlans, actionTriggers, accountActions, resLimits, stats, thresholds, filters, suppliers, attrProfiles, chargerProfiles, ``, "", utils.EmptyString, utils.EmptyString, utils.EmptyString), "", "", nil, nil, false) diff --git a/general_tests/auth_test.go b/general_tests/auth_test.go index d1fccade5..505290401 100644 --- a/general_tests/auth_test.go +++ b/general_tests/auth_test.go @@ -58,7 +58,7 @@ func TestAuthLoadCsvError(t *testing.T) { suppliers := `` attrProfiles := `cgrates.org,ATTR_1,*any,*string~*req.RunID:route1,,,*req.Info,*constant,1001,false,10` chargerProfiles := `` - csvr, err := engine.NewTpReader(dbAuth.DataDB(), engine.NewStringCSVStorage(utils.CSV_SEP, destinations, timings, rates, destinationRates, + csvr, err := engine.NewTpReader(dbAuth.DataDB(), engine.NewStringCSVStorage(utils.CSVSep, destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles, sharedGroups, actions, actionPlans, actionTriggers, accountActions, resLimits, stats, thresholds, filters, suppliers, attrProfiles, chargerProfiles, ``, "", utils.EmptyString, utils.EmptyString, utils.EmptyString), "", "", nil, nil, false) if err != nil { @@ -92,7 +92,7 @@ cgrates.org,call,*any,2013-01-06T00:00:00Z,RP_ANY,` suppliers := `` attrProfiles := `` chargerProfiles := `` - csvr, err := engine.NewTpReader(dbAuth.DataDB(), engine.NewStringCSVStorage(utils.CSV_SEP, destinations, timings, rates, destinationRates, + csvr, err := engine.NewTpReader(dbAuth.DataDB(), engine.NewStringCSVStorage(utils.CSVSep, destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles, sharedGroups, actions, actionPlans, actionTriggers, accountActions, resLimits, stats, thresholds, filters, suppliers, attrProfiles, chargerProfiles, ``, "", utils.EmptyString, utils.EmptyString, utils.EmptyString), "", "", nil, nil, false) if err != nil { diff --git a/general_tests/cdrs_processevent_it_test.go b/general_tests/cdrs_processevent_it_test.go index d695a3a1b..701780273 100644 --- a/general_tests/cdrs_processevent_it_test.go +++ b/general_tests/cdrs_processevent_it_test.go @@ -183,7 +183,7 @@ func testV1CDRsProcessEventAttrS(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.Subject, - Value: config.NewRSRParsersMustCompile("1011", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1011", utils.InfieldSep), }, }, Weight: 20, diff --git a/general_tests/costs1_test.go b/general_tests/costs1_test.go index 9dd100b0b..e5822f742 100644 --- a/general_tests/costs1_test.go +++ b/general_tests/costs1_test.go @@ -53,7 +53,7 @@ RP_SMS1,DR_SMS_1,ALWAYS,10` ratingProfiles := `cgrates.org,call,*any,2012-01-01T00:00:00Z,RP_RETAIL, cgrates.org,data,*any,2012-01-01T00:00:00Z,RP_DATA1, cgrates.org,sms,*any,2012-01-01T00:00:00Z,RP_SMS1,` - csvr, err := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(utils.CSV_SEP, dests, timings, + csvr, err := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(utils.CSVSep, dests, timings, rates, destinationRates, ratingPlans, ratingProfiles, utils.EmptyString, utils.EmptyString, utils.EmptyString, utils.EmptyString, utils.EmptyString, utils.EmptyString, diff --git a/general_tests/datachrg1_test.go b/general_tests/datachrg1_test.go index f88e24de0..b73396f1b 100644 --- a/general_tests/datachrg1_test.go +++ b/general_tests/datachrg1_test.go @@ -43,7 +43,7 @@ DR_DATA_2,*any,RT_DATA_1c,*up,4,0,` ratingPlans := `RP_DATA1,DR_DATA_1,TM1,10 RP_DATA1,DR_DATA_2,TM2,10` ratingProfiles := `cgrates.org,data,*any,2012-01-01T00:00:00Z,RP_DATA1,` - csvr, err := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(utils.CSV_SEP, + csvr, err := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(utils.CSVSep, utils.EmptyString, timings, rates, destinationRates, ratingPlans, ratingProfiles, utils.EmptyString, utils.EmptyString, utils.EmptyString, utils.EmptyString, utils.EmptyString, utils.EmptyString, utils.EmptyString, utils.EmptyString, utils.EmptyString, utils.EmptyString, diff --git a/general_tests/ddazmbl1_test.go b/general_tests/ddazmbl1_test.go index 69d01b896..957e0010c 100644 --- a/general_tests/ddazmbl1_test.go +++ b/general_tests/ddazmbl1_test.go @@ -64,7 +64,7 @@ TOPUP10_AT,TOPUP10_AC1,ASAP,10` attrProfiles := `` chargerProfiles := `` csvr, err := engine.NewTpReader(dataDB.DataDB(), - engine.NewStringCSVStorage(utils.CSV_SEP, destinations, timings, rates, + engine.NewStringCSVStorage(utils.CSVSep, destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles, sharedGroups, actions, actionPlans, actionTriggers, accountActions, resLimits, stats, thresholds, filters, suppliers, diff --git a/general_tests/ddazmbl2_test.go b/general_tests/ddazmbl2_test.go index eec6f246d..9e632d523 100644 --- a/general_tests/ddazmbl2_test.go +++ b/general_tests/ddazmbl2_test.go @@ -63,7 +63,7 @@ TOPUP10_AT,TOPUP10_AC1,ASAP,10` suppliers := `` attrProfiles := `` chargerProfiles := `` - csvr, err := engine.NewTpReader(dataDB2.DataDB(), engine.NewStringCSVStorage(utils.CSV_SEP, destinations, timings, + csvr, err := engine.NewTpReader(dataDB2.DataDB(), engine.NewStringCSVStorage(utils.CSVSep, destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles, sharedGroups, actions, actionPlans, actionTriggers, accountActions, resLimits, stats, thresholds, filters, suppliers, attrProfiles, chargerProfiles, ``, "", utils.EmptyString, utils.EmptyString, utils.EmptyString), "", "", nil, nil, false) diff --git a/general_tests/ddazmbl3_test.go b/general_tests/ddazmbl3_test.go index 0b8412f8b..05fa78fa4 100644 --- a/general_tests/ddazmbl3_test.go +++ b/general_tests/ddazmbl3_test.go @@ -61,7 +61,7 @@ cgrates.org,call,discounted_minutes,2013-01-06T00:00:00Z,RP_UK_Mobile_BIG5_PKG,` suppliers := `` attrProfiles := `` chargerProfiles := `` - csvr, err := engine.NewTpReader(dataDB3.DataDB(), engine.NewStringCSVStorage(utils.CSV_SEP, destinations, timings, rates, + csvr, err := engine.NewTpReader(dataDB3.DataDB(), engine.NewStringCSVStorage(utils.CSVSep, destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles, sharedGroups, actions, actionPlans, actionTriggers, accountActions, resLimits, stats, thresholds, filters, suppliers, attrProfiles, chargerProfiles, ``, "", utils.EmptyString, utils.EmptyString, utils.EmptyString), "", "", nil, nil, false) diff --git a/general_tests/doubleremove_it_test.go b/general_tests/doubleremove_it_test.go index 2c8b1cf46..5fba207f8 100644 --- a/general_tests/doubleremove_it_test.go +++ b/general_tests/doubleremove_it_test.go @@ -283,7 +283,7 @@ func testdoubleRemoveActionPlan(t *testing.T) { ActionPlan: []*v1.AttrActionPlan{ { ActionsId: "ACTS_2", - Time: utils.ASAP, + Time: utils.MetaASAP, Weight: 20.0}, }, } diff --git a/general_tests/export_it_test.go b/general_tests/export_it_test.go index 23a35f6f5..64149f8eb 100644 --- a/general_tests/export_it_test.go +++ b/general_tests/export_it_test.go @@ -161,7 +161,7 @@ func testExpVerifyAttributes(t *testing.T) { Path: utils.MetaReq + utils.NestingSep + "OfficeGroup", FilterIDs: []string{}, Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("Marketing", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Marketing", utils.InfieldSep), }, }, Blocker: false, @@ -415,7 +415,7 @@ func testExpVerifyActionProfiles(t *testing.T) { ID: "ONE_TIME_ACT", FilterIDs: []string{}, Weight: 10, - Schedule: utils.ASAP, + Schedule: utils.MetaASAP, Targets: map[string]utils.StringSet{ utils.MetaAccounts: utils.StringSet{"1001": {}, "1002": {}}, }, @@ -425,7 +425,7 @@ func testExpVerifyActionProfiles(t *testing.T) { FilterIDs: []string{}, Type: utils.TOPUP, Path: utils.DynamicDataPrefix + utils.COUNTER_BALANCE + utils.NestingSep + "TestBalance" + utils.NestingSep + utils.Value, - Value: config.NewRSRParsersMustCompile("10", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("10", utils.InfieldSep), }, { @@ -433,28 +433,28 @@ func testExpVerifyActionProfiles(t *testing.T) { FilterIDs: []string{}, Type: utils.SET_BALANCE, Path: utils.DynamicDataPrefix + utils.COUNTER_BALANCE + utils.NestingSep + "TestDataBalance" + utils.NestingSep + utils.Type, - Value: config.NewRSRParsersMustCompile(utils.DATA, utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile(utils.DATA, utils.InfieldSep), }, { ID: "TOPUP_TEST_DATA", FilterIDs: []string{}, Type: utils.TOPUP, Path: utils.DynamicDataPrefix + utils.COUNTER_BALANCE + utils.NestingSep + "TestDataBalance" + utils.NestingSep + utils.Value, - Value: config.NewRSRParsersMustCompile("1024", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1024", utils.InfieldSep), }, { ID: "SET_BALANCE_TEST_VOICE", FilterIDs: []string{}, Type: utils.SET_BALANCE, Path: utils.DynamicDataPrefix + utils.COUNTER_BALANCE + utils.NestingSep + "TestVoiceBalance" + utils.NestingSep + utils.Type, - Value: config.NewRSRParsersMustCompile(utils.VOICE, utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile(utils.VOICE, utils.InfieldSep), }, { ID: "TOPUP_TEST_VOICE", FilterIDs: []string{}, Type: utils.TOPUP, Path: utils.DynamicDataPrefix + utils.COUNTER_BALANCE + utils.NestingSep + "TestVoiceBalance" + utils.NestingSep + utils.Value, - Value: config.NewRSRParsersMustCompile("15m15s", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("15m15s", utils.InfieldSep), }, }, } diff --git a/general_tests/filters_it_test.go b/general_tests/filters_it_test.go index 0cb60923f..cf740ca06 100644 --- a/general_tests/filters_it_test.go +++ b/general_tests/filters_it_test.go @@ -874,7 +874,7 @@ func testV1FltrAttributesPrefix(t *testing.T) { FilterIDs: []string{}, Path: utils.MetaReq + utils.NestingSep + "CustomField", Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("2007", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("2007", utils.InfieldSep), }, }, Weight: 20.0, diff --git a/general_tests/redis_cluster_it_test.go b/general_tests/redis_cluster_it_test.go index 435332074..b74ebff69 100644 --- a/general_tests/redis_cluster_it_test.go +++ b/general_tests/redis_cluster_it_test.go @@ -195,7 +195,7 @@ func testClsrSetGetAttribute(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.Subject, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, }, Weight: 20, @@ -235,7 +235,7 @@ func testClsrSetGetAttribute2(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.Subject, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, }, Weight: 20, @@ -280,7 +280,7 @@ func testClsrGetAttribute(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.Subject, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, }, Weight: 20, diff --git a/general_tests/sentinel_it_test.go b/general_tests/sentinel_it_test.go index dd86e6a63..228748fd0 100755 --- a/general_tests/sentinel_it_test.go +++ b/general_tests/sentinel_it_test.go @@ -146,7 +146,7 @@ func testRedisSentinelSetGetAttribute(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.Subject, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, }, Weight: 20, @@ -179,7 +179,7 @@ func testRedisSentinelInsertion(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.Subject, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, }, Weight: 20, @@ -272,7 +272,7 @@ func testRedisSentinelGetAttrAfterFailover(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.Subject, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }, }, Weight: 20, diff --git a/general_tests/smschrg1_test.go b/general_tests/smschrg1_test.go index be8b6f567..16e957175 100644 --- a/general_tests/smschrg1_test.go +++ b/general_tests/smschrg1_test.go @@ -42,7 +42,7 @@ func TestSMSLoadCsvTpSmsChrg1(t *testing.T) { destinationRates := `DR_SMS_1,*any,RT_SMS_5c,*up,4,0,` ratingPlans := `RP_SMS1,DR_SMS_1,ALWAYS,10` ratingProfiles := `cgrates.org,sms,*any,2012-01-01T00:00:00Z,RP_SMS1,` - csvr, err := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(utils.CSV_SEP, + csvr, err := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(utils.CSVSep, utils.EmptyString, timings, rates, destinationRates, ratingPlans, ratingProfiles, utils.EmptyString, utils.EmptyString, utils.EmptyString, utils.EmptyString, utils.EmptyString, utils.EmptyString, utils.EmptyString, utils.EmptyString, diff --git a/loaders/lib_test.go b/loaders/lib_test.go index 1111d1ac4..0cbb82d76 100644 --- a/loaders/lib_test.go +++ b/loaders/lib_test.go @@ -109,17 +109,17 @@ func TestProcessContentCallsLoadCache(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "Weight", Path: "Weight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, }, } ratePrfCsv := ` @@ -207,17 +207,17 @@ func TestProcessContentCallsReloadCache(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "Weight", Path: "Weight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, }, } ratePrfCsv := ` @@ -305,12 +305,12 @@ func TestProcessContentCallsRemoveItems(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -409,12 +409,12 @@ func TestProcessContentCallsClear(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -520,12 +520,12 @@ func TestRemoveContentCallsReload(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -626,12 +626,12 @@ func TestRemoveContentCallsLoad(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -732,12 +732,12 @@ func TestRemoveContentCallsRemove(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -849,12 +849,12 @@ func TestRemoveContentCallsClear(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } diff --git a/loaders/libloader.go b/loaders/libloader.go index 4d8c3ee78..72c389a7c 100644 --- a/loaders/libloader.go +++ b/loaders/libloader.go @@ -41,7 +41,7 @@ func (ld LoaderData) GetRateIDs() ([]string, error) { return nil, fmt.Errorf("cannot find RateIDs in <%+v>", ld) } if rateIDs := ld[utils.RateIDs].(string); len(rateIDs) != 0 { - return strings.Split(rateIDs, utils.INFIELD_SEP), nil + return strings.Split(rateIDs, utils.InfieldSep), nil } return []string{}, nil } diff --git a/loaders/libloader_test.go b/loaders/libloader_test.go index 7935f48ee..cf685b09c 100644 --- a/loaders/libloader_test.go +++ b/loaders/libloader_test.go @@ -33,45 +33,45 @@ func TestDataUpdateFromCSVOneFile(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "Contexts", Path: "Contexts", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "Path", Path: "Path", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "Initial", Path: "Initial", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "Substitute", Path: "Substitute", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "Append", Path: "Append", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, } rows := [][]string{ @@ -80,7 +80,7 @@ func TestDataUpdateFromCSVOneFile(t *testing.T) { } lData := make(LoaderData) if err := lData.UpdateFromCSV("Attributes.csv", rows[0], attrSFlds, - config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), nil); err != nil { + config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), nil); err != nil { t.Error(err) } eLData := LoaderData{"Tenant": "cgrates.org", @@ -99,7 +99,7 @@ func TestDataUpdateFromCSVOneFile(t *testing.T) { } lData = make(LoaderData) if err := lData.UpdateFromCSV("Attributes.csv", rows[1], attrSFlds, - config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), nil); err != nil { + config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), nil); err != nil { t.Error(err) } eLData = LoaderData{"Tenant": "cgrates.org", @@ -123,45 +123,45 @@ func TestDataUpdateFromCSVOneFile2(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "Contexts", Path: "Contexts", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "Path", Path: "Path", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "Initial", Path: "Initial", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "Substitute", Path: "Substitute", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "Append", Path: "Append", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, } rows := [][]string{ @@ -170,7 +170,7 @@ func TestDataUpdateFromCSVOneFile2(t *testing.T) { } lData := make(LoaderData) if err := lData.UpdateFromCSV("Attributes.csv", rows[0], attrSFlds, - config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), nil); err != nil { + config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), nil); err != nil { t.Error(err) } eLData := LoaderData{"Tenant": "cgrates.org", @@ -189,7 +189,7 @@ func TestDataUpdateFromCSVOneFile2(t *testing.T) { } lData = make(LoaderData) if err := lData.UpdateFromCSV("Attributes.csv", rows[1], attrSFlds, - config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), nil); err != nil { + config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), nil); err != nil { t.Error(err) } eLData = LoaderData{"Tenant": "cgrates.org", @@ -213,37 +213,37 @@ func TestDataUpdateFromCSVMultiFiles(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.MetaString, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*file(File2.csv).1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*file(File2.csv).1", utils.InfieldSep), Mandatory: true}, {Tag: "Contexts", Path: "Contexts", Type: utils.MetaString, - Value: config.NewRSRParsersMustCompile("*any", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("*any", utils.InfieldSep)}, {Tag: "Path", Path: "Path", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*file(File1.csv).5", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*file(File1.csv).5", utils.InfieldSep)}, {Tag: "Initial", Path: "Initial", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*file(File1.csv).6", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*file(File1.csv).6", utils.InfieldSep)}, {Tag: "Substitute", Path: "Substitute", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*file(File1.csv).7", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*file(File1.csv).7", utils.InfieldSep)}, {Tag: "Append", Path: "Append", Type: utils.MetaString, - Value: config.NewRSRParsersMustCompile("true", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("true", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", Type: utils.MetaString, - Value: config.NewRSRParsersMustCompile("10", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("10", utils.InfieldSep)}, } loadRun1 := map[string][]string{ @@ -253,7 +253,7 @@ func TestDataUpdateFromCSVMultiFiles(t *testing.T) { lData := make(LoaderData) for fName, record := range loadRun1 { if err := lData.UpdateFromCSV(fName, record, attrSFlds, - config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), nil); err != nil { + config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), nil); err != nil { t.Error(err) } } @@ -298,7 +298,7 @@ func TestUpdateFromCsvParseValueError(t *testing.T) { ldrData := LoaderData{ "File1.csv": []string{"Subject", "*any", "1001"}, } - tnt := config.NewRSRParsersMustCompile("asd{*duration_seconds}", utils.INFIELD_SEP) + tnt := config.NewRSRParsersMustCompile("asd{*duration_seconds}", utils.InfieldSep) expected := "time: invalid duration \"asd\"" if err := ldrData.UpdateFromCSV("File1.csv", nil, nil, tnt, nil); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) @@ -310,13 +310,13 @@ func TestUpdateFromCsvWithFiltersError(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.MetaString, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Filters: []string{"*string:~*req.Account:10"}, Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*file(File2.csv).1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*file(File2.csv).1", utils.InfieldSep), Filters: []string{"*string:~*req.Account:10"}, Mandatory: true}, } @@ -333,7 +333,7 @@ func TestUpdateFromCsvWithFiltersError(t *testing.T) { for fName, record := range loadRunStr { expected := "Ignoring record: [\"cgrates.org\" \"TEST_1\"] with error : strconv.Atoi: parsing \"Account\": invalid syntax" if err := lData.UpdateFromCSV(fName, record, attrSFlds, - config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), filterS); err == nil || err.Error() != expected { + config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), filterS); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -344,13 +344,13 @@ func TestUpdateFromCsvWithFiltersContinue(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.MetaString, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Filters: []string{`*string:~*req.2:10`}, Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*file(File2.csv).1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*file(File2.csv).1", utils.InfieldSep), Filters: []string{`*string:~*req.2:10`}, Mandatory: true}, } @@ -366,7 +366,7 @@ func TestUpdateFromCsvWithFiltersContinue(t *testing.T) { for fName, record := range loadRunStr { if err := lData.UpdateFromCSV(fName, record, attrSFlds, - config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), filterS); err != nil { + config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), filterS); err != nil { t.Error(err) } } diff --git a/loaders/loader_it_test.go b/loaders/loader_it_test.go index 7f170447c..3754a8a83 100644 --- a/loaders/loader_it_test.go +++ b/loaders/loader_it_test.go @@ -200,13 +200,13 @@ func testLoaderCheckAttributes(t *testing.T) { FilterIDs: []string{"*string:~*req.Field1:Initial"}, Path: utils.MetaReq + utils.NestingSep + "Field1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("Sub1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Sub1", utils.InfieldSep), }, { FilterIDs: []string{}, Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("Sub2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Sub2", utils.InfieldSep), }}, Blocker: true, Weight: 20, @@ -385,7 +385,7 @@ func testLoaderCheckForCustomSep(t *testing.T) { FilterIDs: []string{}, Path: "*req.Destination", Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("12018209998", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("12018209998", utils.InfieldSep), }, }, } @@ -450,12 +450,12 @@ cgrates.org,SET_ACTPROFILE_3 {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -576,12 +576,12 @@ cgrates.org,SET_ACTPROFILE_3 {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -767,12 +767,12 @@ cgrates.org,NewRes1 {Tag: "Tenant", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -929,12 +929,12 @@ func testProcessFileRenameError(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } diff --git a/loaders/loader_test.go b/loaders/loader_test.go index 4dfffe5c2..a25a48680 100644 --- a/loaders/loader_test.go +++ b/loaders/loader_test.go @@ -46,49 +46,49 @@ func TestLoaderProcessContentSingleFile(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "Contexts", Path: "Contexts", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "AttributeFilterIDs", Path: "AttributeFilterIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "Path", Path: "Path", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "Type", Path: "Type", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "Value", Path: "Value", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "Blocker", Path: "Blocker", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep)}, }, } rdr := ioutil.NopCloser(strings.NewReader(engine.AttributesCSVContent)) @@ -132,13 +132,13 @@ func TestLoaderProcessContentSingleFile(t *testing.T) { FilterIDs: []string{"*string:~*req.Field1:Initial"}, Path: utils.MetaReq + utils.NestingSep + "Field1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("Sub1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Sub1", utils.InfieldSep), }, { FilterIDs: []string{}, Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("Sub2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Sub2", utils.InfieldSep), }}, Blocker: true, Weight: 20, @@ -186,29 +186,29 @@ func TestLoaderProcessContentMultiFiles(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.MetaString, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*file(File2.csv).1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*file(File2.csv).1", utils.InfieldSep), Mandatory: true}, {Tag: "Contexts", Path: "Contexts", Type: utils.MetaString, - Value: config.NewRSRParsersMustCompile("*any", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("*any", utils.InfieldSep)}, {Tag: "Path", Path: "Path", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*file(File1.csv).6", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*file(File1.csv).6", utils.InfieldSep)}, {Tag: "Value", Path: "Value", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*file(File1.csv).7", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*file(File1.csv).7", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", Type: utils.MetaString, - Value: config.NewRSRParsersMustCompile("10", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("10", utils.InfieldSep)}, }, } rdr1 := ioutil.NopCloser(strings.NewReader(file1CSV)) @@ -236,7 +236,7 @@ func TestLoaderProcessContentMultiFiles(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Subject", FilterIDs: []string{}, - Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), }}, Weight: 10.0, } @@ -265,49 +265,49 @@ func TestLoaderProcessResource(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "TTL", Path: "UsageTTL", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "Limit", Path: "Limit", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "AllocationMessage", Path: "AllocationMessage", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "Blocker", Path: "Blocker", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "Stored", Path: "Stored", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, {Tag: "Thresholds", Path: "Thresholds", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep)}, }, } rdr := ioutil.NopCloser(strings.NewReader(engine.ResourcesCSVContent)) @@ -383,29 +383,29 @@ func TestLoaderProcessFilters(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "Type", Path: "Type", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "Element", Path: "Element", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "Values", Path: "Values", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, }, } rdr := ioutil.NopCloser(strings.NewReader(engine.FiltersCSVContent)) @@ -526,49 +526,49 @@ func TestLoaderProcessThresholds(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "MaxHits", Path: "MaxHits", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "MinHits", Path: "MinHits", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "MinSleep", Path: "MinSleep", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "Blocker", Path: "Blocker", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "ActionIDs", Path: "ActionIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, {Tag: "Async", Path: "Async", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep)}, }, } rdr := ioutil.NopCloser(strings.NewReader(engine.ThresholdsCSVContent)) @@ -638,58 +638,58 @@ func TestLoaderProcessStats(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "QueueLength", Path: "QueueLength", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "TTL", Path: "TTL", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "MinItems", Path: "MinItems", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "MetricIDs", Path: "MetricIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "MetricFilterIDs", Path: "MetricFilterIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "Blocker", Path: "Blocker", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, {Tag: "Stored", Path: "Stored", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.11", utils.InfieldSep)}, {Tag: "ThresholdIDs", Path: "ThresholdIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.12", utils.InfieldSep)}, }, } rdr := ioutil.NopCloser(strings.NewReader(engine.StatsCSVContent)) @@ -774,11 +774,11 @@ func TestLoaderProcessStatsWrongMetrics(t *testing.T) { {Tag: "MetricIDs", Path: "MetricIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, {Tag: "Stored", Path: "Stored", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep)}, }, } statsCsv := ` @@ -835,73 +835,73 @@ func TestLoaderProcessRoutes(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "Sorting", Path: "Sorting", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "SortingParameters", Path: "SortingParameters", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "RouteID", Path: "RouteID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "RouteFilterIDs", Path: "RouteFilterIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "RouteAccountIDs", Path: "RouteAccountIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "RouteRatingPlanIDs", Path: "RouteRatingplanIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, {Tag: "RouteRateProfileIDs", Path: "RouteRateProfileIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep)}, {Tag: "RouteResourceIDs", Path: "RouteResourceIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.11", utils.InfieldSep)}, {Tag: "RouteStatIDs", Path: "RouteStatIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.12", utils.InfieldSep)}, {Tag: "RouteWeight", Path: "RouteWeight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.13", utils.InfieldSep)}, {Tag: "RouteBlocker", Path: "RouteBlocker", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.14", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.14", utils.InfieldSep)}, {Tag: "RouteParameters", Path: "RouteParameters", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.15", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.15", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.16", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.16", utils.InfieldSep)}, }, } rdr := ioutil.NopCloser(strings.NewReader(engine.RoutesCSVContent)) @@ -1011,12 +1011,12 @@ func TestLoaderProcessAccountProfiles(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -1070,33 +1070,33 @@ func TestLoaderProcessChargers(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "RunID", Path: "RunID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "AttributeIDs", Path: "AttributeIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, }, } rdr := ioutil.NopCloser(strings.NewReader(engine.ChargersCSVContent)) @@ -1162,81 +1162,81 @@ func TestLoaderProcessDispatches(t *testing.T) { Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, }, { Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, }, { Tag: "Subsystems", Path: "Subsystems", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), }, { Tag: "FilterIDs", Path: "FilterIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), }, { Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), }, { Tag: "Strategy", Path: "Strategy", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep), }, { Tag: "StrategyParameters", Path: "StrategyParameters", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), }, { Tag: "ConnID", Path: "ConnID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), }, { Tag: "ConnFilterIDs", Path: "ConnFilterIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), }, { Tag: "ConnWeight", Path: "ConnWeight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), }, { Tag: "ConnBlocker", Path: "ConnBlocker", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), }, { Tag: "ConnParameters", Path: "ConnParameters", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), }, { Tag: "Weight", Path: "Weight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), }, }, } @@ -1331,33 +1331,33 @@ func TestLoaderProcessDispatcheHosts(t *testing.T) { Tag: "Tenant", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, }, { Tag: "ID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, }, { Tag: "Address", Path: "Address", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), }, { Tag: "Transport", Path: "Transport", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), }, { Tag: "TLS", Path: "TLS", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), }, }, } @@ -1430,12 +1430,12 @@ func TestLoaderRemoveContentSingleFile(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -1460,13 +1460,13 @@ func TestLoaderRemoveContentSingleFile(t *testing.T) { FilterIDs: []string{"*string:~*req.Field1:Initial"}, Path: utils.MetaReq + utils.NestingSep + "Field1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("Sub1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Sub1", utils.InfieldSep), }, { FilterIDs: []string{}, Path: utils.MetaReq + utils.NestingSep + "Field2", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("Sub2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Sub2", utils.InfieldSep), }}, Blocker: true, Weight: 20, @@ -1533,85 +1533,85 @@ func TestLoaderProcessRateProfile(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "RoundingMethod", Path: "RoundingMethod", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "RoundingDecimals", Path: "RoundingDecimals", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "MinCost", Path: "MinCost", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "MaxCost", Path: "MaxCost", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "MaxCostStrategy", Path: "MaxCostStrategy", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, {Tag: "RateID", Path: "RateID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep)}, {Tag: "RateFilterIDs", Path: "RateFilterIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.11", utils.InfieldSep)}, {Tag: "RateActivationTimes", Path: "RateActivationTimes", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.12", utils.InfieldSep)}, {Tag: "RateWeight", Path: "RateWeight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.13", utils.InfieldSep)}, {Tag: "RateBlocker", Path: "RateBlocker", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.14", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.14", utils.InfieldSep)}, {Tag: "RateIntervalStart", Path: "RateIntervalStart", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.15", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.15", utils.InfieldSep)}, {Tag: "RateFixedFee", Path: "RateFixedFee", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.16", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.16", utils.InfieldSep)}, {Tag: "RateRecurrentFee", Path: "RateRecurrentFee", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.17", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.17", utils.InfieldSep)}, {Tag: "RateUnit", Path: "RateUnit", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.18", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.18", utils.InfieldSep)}, {Tag: "RateIncrement", Path: "RateIncrement", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.19", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.19", utils.InfieldSep)}, }, } rdr := ioutil.NopCloser(strings.NewReader(engine.RateProfileCSVContent)) @@ -1731,85 +1731,85 @@ func TestLoaderProcessRateProfileRates(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "RoundingMethod", Path: "RoundingMethod", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "RoundingDecimals", Path: "RoundingDecimals", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "MinCost", Path: "MinCost", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "MaxCost", Path: "MaxCost", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "MaxCostStrategy", Path: "MaxCostStrategy", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, {Tag: "RateID", Path: "RateID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep)}, {Tag: "RateFilterIDs", Path: "RateFilterIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.11", utils.InfieldSep)}, {Tag: "RateActivationTimes", Path: "RateActivationTimes", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.12", utils.InfieldSep)}, {Tag: "RateWeight", Path: "RateWeight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.13", utils.InfieldSep)}, {Tag: "RateBlocker", Path: "RateBlocker", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.14", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.14", utils.InfieldSep)}, {Tag: "RateIntervalStart", Path: "RateIntervalStart", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.15", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.15", utils.InfieldSep)}, {Tag: "RateFixedFee", Path: "RateFixedFee", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.16", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.16", utils.InfieldSep)}, {Tag: "RateRecurrentFee", Path: "RateRecurrentFee", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.17", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.17", utils.InfieldSep)}, {Tag: "RateUnit", Path: "RateUnit", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.18", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.18", utils.InfieldSep)}, {Tag: "RateIncrement", Path: "RateIncrement", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.19", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.19", utils.InfieldSep)}, }, } ratePrfCnt1 := ` @@ -1981,17 +1981,17 @@ func TestLoaderRemoveRateProfileRates(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "RateIDs", Path: "RateIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, }, } @@ -2296,12 +2296,12 @@ func TestRemoveRateProfileFlagsError(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -2340,29 +2340,29 @@ func TestNewLoaderWithMultiFiles(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.MetaString, - Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*file(File2.csv).1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*file(File2.csv).1", utils.InfieldSep), Mandatory: true}, {Tag: "Contexts", Path: "Contexts", Type: utils.MetaString, - Value: config.NewRSRParsersMustCompile("*any", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("*any", utils.InfieldSep)}, {Tag: "Path", Path: "Path", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*file(File1.csv).6", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*file(File1.csv).6", utils.InfieldSep)}, {Tag: "Value", Path: "Value", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*file(File1.csv).7", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*file(File1.csv).7", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", Type: utils.MetaString, - Value: config.NewRSRParsersMustCompile("10", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("10", utils.InfieldSep)}, } ldr := NewLoader(engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil), ldrCfg, "", nil, nil, nil) @@ -2406,84 +2406,84 @@ func TestLoaderActionProfile(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "ID", Path: "ID", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Weight", Path: "Weight", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Schedule", Path: "Schedule", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "TargetType", Path: "TargetType", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "TargetIDs", Path: "TargetIDs", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionID", Path: "ActionID", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionFilterIDs", Path: "ActionFilterIDs", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionBlocker", Path: "ActionBlocker", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionTTL", Path: "ActionTTL", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionType", Path: "ActionType", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionOpts", Path: "ActionOpts", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.13", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionPath", Path: "ActionPath", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.14", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.14", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionValue", Path: "ActionValue", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.15", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.15", utils.InfieldSep), Layout: time.RFC3339}, }, } @@ -2507,7 +2507,7 @@ func TestLoaderActionProfile(t *testing.T) { ID: "ONE_TIME_ACT", FilterIDs: []string{}, Weight: 10, - Schedule: utils.ASAP, + Schedule: utils.MetaASAP, Targets: map[string]utils.StringSet{ utils.MetaAccounts: utils.NewStringSet([]string{"1001", "1002"}), }, @@ -2517,35 +2517,35 @@ func TestLoaderActionProfile(t *testing.T) { FilterIDs: []string{}, Type: "*topup", Path: "~*balance.TestBalance.Value", - Value: config.NewRSRParsersMustCompile("10", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("10", utils.InfieldSep), }, &engine.APAction{ ID: "SET_BALANCE_TEST_DATA", FilterIDs: []string{}, Type: "*set_balance", Path: "~*balance.TestDataBalance.Type", - Value: config.NewRSRParsersMustCompile("*data", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("*data", utils.InfieldSep), }, &engine.APAction{ ID: "TOPUP_TEST_DATA", FilterIDs: []string{}, Type: "*topup", Path: "~*balance.TestDataBalance.Value", - Value: config.NewRSRParsersMustCompile("1024", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1024", utils.InfieldSep), }, &engine.APAction{ ID: "SET_BALANCE_TEST_VOICE", FilterIDs: []string{}, Type: "*set_balance", Path: "~*balance.TestVoiceBalance.Type", - Value: config.NewRSRParsersMustCompile("*voice", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("*voice", utils.InfieldSep), }, &engine.APAction{ ID: "TOPUP_TEST_VOICE", FilterIDs: []string{}, Type: "*topup", Path: "~*balance.TestVoiceBalance.Value", - Value: config.NewRSRParsersMustCompile("15m15s", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("15m15s", utils.InfieldSep), }, }, } @@ -2588,79 +2588,79 @@ func TestLoaderWrongCsv(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "ID", Path: "ID", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "FilterIDs", Path: "FilterIDs", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Weight", Path: "Weight", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "Schedule", Path: "Schedule", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.5", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "AccountIDs", Path: "AccountIDs", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionID", Path: "ActionID", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionFilterIDs", Path: "ActionFilterIDs", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionBlocker", Path: "ActionBlocker", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionTTL", Path: "ActionTTL", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionType", Path: "ActionType", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionOpts", Path: "ActionOpts", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.12", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionPath", Path: "ActionPath", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.13", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.13", utils.InfieldSep), Layout: time.RFC3339}, {Tag: "ActionValue", Path: "ActionValue", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.14", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.14", utils.InfieldSep), Layout: time.RFC3339}, }, } @@ -2730,19 +2730,19 @@ func TestLoaderActionProfileAsStructErrType(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "ID", Path: "ID", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, {Tag: "ActionBlocker", Path: "ActionBlocker", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), Layout: time.RFC3339}, }, } @@ -2777,7 +2777,7 @@ func TestLoaderActionProfileAsStructErrTConversion(t *testing.T) { {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339}, }, @@ -2813,7 +2813,7 @@ func TestLoaderAttributesAsStructErrType(t *testing.T) { {Tag: "Weight", Path: "Weight", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } attributeCsv := ` @@ -2847,7 +2847,7 @@ func TestLoaderAttributesAsStructErrConversion(t *testing.T) { {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } attributeCsv := ` @@ -2881,7 +2881,7 @@ func TestLoadResourcesAsStructErrType(t *testing.T) { {Tag: "Blocker", Path: "Blocker", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } resourcesCsv := ` @@ -2915,7 +2915,7 @@ func TestLoadResourcesAsStructErrConversion(t *testing.T) { {Tag: "UsageTTL", Path: "UsageTTL", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } resourcesCsv := ` @@ -2949,7 +2949,7 @@ func TestLoadFiltersAsStructErrType(t *testing.T) { {Tag: "PK", Path: "PK", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } filtersCsv := ` @@ -2987,7 +2987,7 @@ func TestLoadFiltersAsStructErrConversion(t *testing.T) { {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } filtersCsv := ` @@ -3025,7 +3025,7 @@ func TestLoadStatsAsStructErrType(t *testing.T) { {Tag: "PK", Path: "PK", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } statsCsv := ` @@ -3063,7 +3063,7 @@ func TestLoadStatsAsStructErrConversion(t *testing.T) { {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } statsCsv := ` @@ -3101,7 +3101,7 @@ func TestLoadThresholdsAsStructErrType(t *testing.T) { {Tag: "PK", Path: "PK", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } thresholdsCsv := ` @@ -3139,7 +3139,7 @@ func TestLoadThresholdsAsStructErrConversion(t *testing.T) { {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } thresholdsCsv := ` @@ -3177,7 +3177,7 @@ func TestLoadRoutesAsStructErrType(t *testing.T) { {Tag: "PK", Path: "PK", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } thresholdsCsv := ` @@ -3215,7 +3215,7 @@ func TestLoadRoutesAsStructErrConversion(t *testing.T) { {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } thresholdsCsv := ` @@ -3253,7 +3253,7 @@ func TestLoadChargersAsStructErrType(t *testing.T) { {Tag: "PK", Path: "PK", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } thresholdsCsv := ` @@ -3291,7 +3291,7 @@ func TestLoadChargersAsStructErrConversion(t *testing.T) { {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } thresholdsCsv := ` @@ -3329,7 +3329,7 @@ func TestLoadDispatchersAsStructErrType(t *testing.T) { {Tag: "PK", Path: "PK", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } thresholdsCsv := ` @@ -3367,7 +3367,7 @@ func TestLoadDispatcherAsStructErrConversion(t *testing.T) { {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } thresholdsCsv := ` @@ -3405,7 +3405,7 @@ func TestLoadDispatcherHostsAsStructErrType(t *testing.T) { {Tag: "PK", Path: "PK", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } thresholdsCsv := ` @@ -3443,7 +3443,7 @@ func TestLoadRateProfilesAsStructErrType(t *testing.T) { {Tag: "PK", Path: "PK", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } thresholdsCsv := ` @@ -3481,7 +3481,7 @@ func TestLoadRateProfilesAsStructErrConversion(t *testing.T) { {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } thresholdsCsv := ` @@ -3519,7 +3519,7 @@ func TestLoadAccountProfilesAsStructErrConversion(t *testing.T) { {Tag: "ActivationInterval", Path: "ActivationInterval", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } actPrfCsv := ` @@ -3557,19 +3557,19 @@ func TestProcessContentAccountProfileAsTPError(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, {Tag: "ID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep)}, {Tag: "BalanceID", Path: "BalanceID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "BalanceUnitFactors", Path: "BalanceUnitFactors", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, }, } @@ -3608,7 +3608,7 @@ func TestLoadAccountProfilesAsStructErrType(t *testing.T) { {Tag: "PK", Path: "PK", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } actPrfCsv := ` @@ -3647,12 +3647,12 @@ func TestLoadAndRemoveResources(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -3780,12 +3780,12 @@ func TestRemoveFilterContent(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -3873,12 +3873,12 @@ func TestRemoveStatsContent(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -3966,12 +3966,12 @@ func TestRemoveThresholdsContent(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -4059,12 +4059,12 @@ func TestRemoveRoutesContent(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -4152,12 +4152,12 @@ func TestRemoveChargersContent(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -4245,12 +4245,12 @@ func TestRemoveDispatchersContent(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -4337,12 +4337,12 @@ func TestRemoveDispatcherHostsContent(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -4409,33 +4409,33 @@ func TestProcessContentEmptyDataBase(t *testing.T) { Tag: "Tenant", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, }, { Tag: "ID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, }, { Tag: "Address", Path: "Address", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), }, { Tag: "Transport", Path: "Transport", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.3", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), }, { Tag: "TLS", Path: "TLS", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), }, }, } @@ -4470,12 +4470,12 @@ func TestRemoveRateProfileContent(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -4563,12 +4563,12 @@ func TestRemoveActionProfileContent(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -4644,12 +4644,12 @@ func TestRemoveAccountProfileContent(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -4724,12 +4724,12 @@ func TestRemoveContentError1(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -4776,12 +4776,12 @@ func TestRemoveContentError2(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -4851,17 +4851,17 @@ func TestRemoveRateProfileRatesError(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "RateIDs", Path: "RateIDs", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.2", utils.INFIELD_SEP)}, + Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, }, } rtPrfCsv := ` @@ -4935,12 +4935,12 @@ func TestRemoveThresholdsMockError(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -4994,12 +4994,12 @@ func TestRemoveStatQueueMockError(t *testing.T) { {Tag: "TenantID", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -5052,12 +5052,12 @@ func TestRemoveResourcesMockError(t *testing.T) { {Tag: "Tenant", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } diff --git a/loaders/loaders_it_test.go b/loaders/loaders_it_test.go index 2411387d6..277d2e6c5 100644 --- a/loaders/loaders_it_test.go +++ b/loaders/loaders_it_test.go @@ -90,12 +90,12 @@ cgrates.org,NewRes1 {Tag: "Tenant", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -331,7 +331,7 @@ cgrates.org,NewRes1 {Tag: "Tenant", Path: "Tenant", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", diff --git a/migrator/action_plan.go b/migrator/action_plan.go index 7e3991952..6df1ac763 100644 --- a/migrator/action_plan.go +++ b/migrator/action_plan.go @@ -44,7 +44,7 @@ func (at *v1ActionPlan) IsASAP() bool { if at.Timing == nil { return false } - return at.Timing.Timing.StartTime == utils.ASAP + return at.Timing.Timing.StartTime == utils.MetaASAP } func (m *Migrator) migrateCurrentActionPlans() (err error) { diff --git a/migrator/actionprofiles_it_test.go b/migrator/actionprofiles_it_test.go index ad2f49415..3eb5b3ba1 100644 --- a/migrator/actionprofiles_it_test.go +++ b/migrator/actionprofiles_it_test.go @@ -187,7 +187,7 @@ func testActPrfMigrateAndMove(t *testing.T) { ID: "TEST_ID1", FilterIDs: []string{"*string:~*req.Account:1001"}, Weight: 20, - Schedule: utils.ASAP, + Schedule: utils.MetaASAP, Targets: map[string]utils.StringSet{ utils.MetaAccounts: utils.NewStringSet([]string{"acc1", "acc2"}), }, diff --git a/migrator/alias.go b/migrator/alias.go index ed7ea96e8..c3cf3678b 100644 --- a/migrator/alias.go +++ b/migrator/alias.go @@ -117,7 +117,7 @@ func alias2AtttributeProfile(alias *v1Alias, defaultTenant string) *engine.Attri attr := &engine.Attribute{ Path: fld, Type: utils.MetaVariable, //default type for Attribute - Value: config.NewRSRParsersMustCompile(substitute, utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile(substitute, utils.InfieldSep), } out.Attributes = append(out.Attributes, attr) // Add attribute filters if needed diff --git a/migrator/alias_it_test.go b/migrator/alias_it_test.go index 54096e15c..6ce6512cd 100644 --- a/migrator/alias_it_test.go +++ b/migrator/alias_it_test.go @@ -155,13 +155,13 @@ func testAlsITMigrateAndMove(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Account", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("1002", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1002", utils.InfieldSep), }, { FilterIDs: []string{"*string:~*req.Category:call_1001"}, Path: utils.MetaReq + utils.NestingSep + "Category", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("call_1002", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("call_1002", utils.InfieldSep), }, }, Blocker: false, diff --git a/migrator/alias_test.go b/migrator/alias_test.go index d64b6c02d..0f68bc406 100644 --- a/migrator/alias_test.go +++ b/migrator/alias_test.go @@ -183,7 +183,7 @@ func TestAlias2AtttributeProfile(t *testing.T) { FilterIDs: []string{"*string:~*req.Account:1001"}, Path: utils.MetaReq + utils.NestingSep + "Account", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("1002", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1002", utils.InfieldSep), }, }, Blocker: false, @@ -200,13 +200,13 @@ func TestAlias2AtttributeProfile(t *testing.T) { FilterIDs: []string{"*string:~*req.Account:1001"}, Path: utils.MetaReq + utils.NestingSep + "Account", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("1002", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1002", utils.InfieldSep), }, { FilterIDs: []string{"*string:~*req.Account:1003"}, Path: utils.MetaReq + utils.NestingSep + "Account", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("1004", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1004", utils.InfieldSep), }, }, Blocker: false, @@ -223,13 +223,13 @@ func TestAlias2AtttributeProfile(t *testing.T) { FilterIDs: []string{"*string:~*req.Account:1001"}, Path: utils.MetaReq + utils.NestingSep + "Account", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("1002", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1002", utils.InfieldSep), }, { FilterIDs: []string{"*string:~*req.Account:1003"}, Path: utils.MetaReq + utils.NestingSep + "Account", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("1004", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1004", utils.InfieldSep), }, }, Blocker: false, @@ -249,12 +249,12 @@ func TestAlias2AtttributeProfile(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Account", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("1002", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1002", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "Subject", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("call_1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("call_1001", utils.InfieldSep), }, }, Blocker: false, @@ -274,13 +274,13 @@ func TestAlias2AtttributeProfile(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Account", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("1002", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1002", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "Category", Type: utils.MetaVariable, FilterIDs: []string{"*string:~*req.Category:call_1001"}, - Value: config.NewRSRParsersMustCompile("call_1002", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("call_1002", utils.InfieldSep), }, }, Blocker: false, @@ -297,7 +297,7 @@ func TestAlias2AtttributeProfile(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("somecateg_roam_fromz4", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("somecateg_roam_fromz4", utils.InfieldSep), }, }, Weight: 20, diff --git a/migrator/attributes.go b/migrator/attributes.go index 57b982fae..81d72d10b 100644 --- a/migrator/attributes.go +++ b/migrator/attributes.go @@ -394,7 +394,7 @@ func (v4AttrPrf v4AttributeProfile) AsAttributeProfile() (attrPrf *engine.Attrib ActivationInterval: v4AttrPrf.ActivationInterval, } for _, attr := range v4AttrPrf.Attributes { // ToDo:redo this - val := attr.Value.GetRule(utils.INFIELD_SEP) + val := attr.Value.GetRule(utils.InfieldSep) rsrVal := attr.Value if strings.HasPrefix(val, utils.DynamicDataPrefix) { val = val[1:] // remove the DynamicDataPrefix diff --git a/migrator/attributes_it_test.go b/migrator/attributes_it_test.go index 52dd8747c..93787ab9d 100755 --- a/migrator/attributes_it_test.go +++ b/migrator/attributes_it_test.go @@ -316,7 +316,7 @@ func testAttrITMigrateAndMove(t *testing.T) { FilterIDs: []string{"*string:FL1:In1"}, Path: utils.MetaReq + utils.NestingSep + "FL1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, @@ -335,7 +335,7 @@ func testAttrITMigrateAndMove(t *testing.T) { FilterIDs: []string{"*string:FL1:In1"}, Path: utils.MetaReq + utils.NestingSep + "FL1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, @@ -460,7 +460,7 @@ func testAttrITMigrateV2(t *testing.T) { { FieldName: "FL1", Initial: "In1", - Substitute: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), Append: true, }, }, @@ -481,7 +481,7 @@ func testAttrITMigrateV2(t *testing.T) { FilterIDs: []string{"*string:FL1:In1"}, Path: utils.MetaReq + utils.NestingSep + "FL1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, @@ -543,7 +543,7 @@ func testAttrITMigrateV3(t *testing.T) { { FilterIDs: []string{"*string:FL1:In1"}, FieldName: "FL1", - Substitute: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, @@ -563,7 +563,7 @@ func testAttrITMigrateV3(t *testing.T) { FilterIDs: []string{"*string:FL1:In1"}, Path: utils.MetaReq + utils.NestingSep + "FL1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, @@ -628,7 +628,7 @@ func testAttrITMigrateV4(t *testing.T) { { FilterIDs: []string{"*string:~*req.FL1:In1"}, FieldName: "FL1", - Value: config.NewRSRParsersMustCompile("~Category:s/(.*)/${1}_UK_Mobile_Vodafone_GBRVF/", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~Category:s/(.*)/${1}_UK_Mobile_Vodafone_GBRVF/", utils.InfieldSep), Type: utils.MetaVariable, }, }, @@ -649,7 +649,7 @@ func testAttrITMigrateV4(t *testing.T) { FilterIDs: []string{"*string:~*req.FL1:In1"}, Path: utils.MetaReq + utils.NestingSep + "FL1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.Category:s/(.*)/${1}_UK_Mobile_Vodafone_GBRVF/", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Category:s/(.*)/${1}_UK_Mobile_Vodafone_GBRVF/", utils.InfieldSep), }, }, Weight: 20, diff --git a/migrator/attributes_test.go b/migrator/attributes_test.go index f92d7787b..82bf2b6fd 100644 --- a/migrator/attributes_test.go +++ b/migrator/attributes_test.go @@ -62,7 +62,7 @@ func TestV1AttributeProfileAsAttributeProfile(t *testing.T) { &v2Attribute{ FieldName: "FL1", Initial: "In1", - Substitute: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), Append: true, }, }, @@ -90,7 +90,7 @@ func TestV2AttributeProfileAsAttributeProfile(t *testing.T) { &v2Attribute{ FieldName: "FL1", Initial: "In1", - Substitute: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), Append: true, }, }, @@ -109,7 +109,7 @@ func TestV2AttributeProfileAsAttributeProfile(t *testing.T) { &v3Attribute{ FilterIDs: []string{"*string:FL1:In1"}, FieldName: "FL1", - Substitute: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, @@ -136,7 +136,7 @@ func TestV2AttributeProfileAsAttributeProfile2(t *testing.T) { &v2Attribute{ FieldName: "FL1", Initial: nil, - Substitute: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), Append: true, }, }, @@ -155,7 +155,7 @@ func TestV2AttributeProfileAsAttributeProfile2(t *testing.T) { &v3Attribute{ FilterIDs: []string{"*string:FL1:"}, FieldName: "FL1", - Substitute: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, @@ -182,7 +182,7 @@ func TestV3AttributeProfileAsAttributeProfile(t *testing.T) { &v3Attribute{ FilterIDs: []string{"*string:FL1:In1"}, FieldName: "FL1", - Substitute: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, @@ -201,7 +201,7 @@ func TestV3AttributeProfileAsAttributeProfile(t *testing.T) { FilterIDs: []string{"*string:FL1:In1"}, FieldName: "FL1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, @@ -228,7 +228,7 @@ func TestV4AttributeProfileAsAttributeProfile(t *testing.T) { &v4Attribute{ FieldName: "FL1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~Category:s/(.*)/${1}_UK_Mobile_Vodafone_GBRVF/", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~Category:s/(.*)/${1}_UK_Mobile_Vodafone_GBRVF/", utils.InfieldSep), }, }, Weight: 20, @@ -246,7 +246,7 @@ func TestV4AttributeProfileAsAttributeProfile(t *testing.T) { &engine.Attribute{ Path: utils.MetaReq + utils.NestingSep + "FL1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.Category:s/(.*)/${1}_UK_Mobile_Vodafone_GBRVF/", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Category:s/(.*)/${1}_UK_Mobile_Vodafone_GBRVF/", utils.InfieldSep), }, }, Weight: 20, @@ -326,7 +326,7 @@ func TestAsAttributeProfileV3(t *testing.T) { &v2Attribute{ FieldName: "FL1", Initial: "In1", - Substitute: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), Append: true, }, }, @@ -345,7 +345,7 @@ func TestAsAttributeProfileV3(t *testing.T) { &v3Attribute{ FilterIDs: []string{"*string:FL1:In1"}, //here FieldName: "FL1", - Substitute: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }}, Weight: 20, } @@ -370,7 +370,7 @@ func TestAsAttributeProfileV4(t *testing.T) { &v3Attribute{ FilterIDs: []string{"*string:FL1:In1"}, FieldName: "FL1", - Substitute: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }, }, Weight: 20, @@ -389,7 +389,7 @@ func TestAsAttributeProfileV4(t *testing.T) { FilterIDs: []string{"*string:FL1:In1"}, FieldName: "FL1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep), }}, Blocker: false, @@ -418,7 +418,7 @@ func TestAsAttributeProfileV5(t *testing.T) { FilterIDs: []string{"*string:FL1:In1"}, FieldName: "FL1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~Al1", utils.InfieldSep), }, }, Weight: 20, @@ -438,7 +438,7 @@ func TestAsAttributeProfileV5(t *testing.T) { FilterIDs: []string{"*string:FL1:In1"}, Path: utils.MetaReq + utils.NestingSep + "FL1", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.Al1", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.Al1", utils.InfieldSep), }, }, Weight: 20, diff --git a/migrator/derived_chargers.go b/migrator/derived_chargers.go index dca1dee59..9dd51388d 100644 --- a/migrator/derived_chargers.go +++ b/migrator/derived_chargers.go @@ -78,7 +78,7 @@ func fieldinfo2Attribute(attr []*engine.Attribute, fieldName, fieldInfo string) fieldInfo = fieldInfo[1:] } var err error - if rp, err = config.NewRSRParsers(fieldInfo, utils.INFIELD_SEP); err != nil { + if rp, err = config.NewRSRParsers(fieldInfo, utils.InfieldSep); err != nil { utils.Logger.Err(fmt.Sprintf("On Migrating rule: <%s>, error: %s", fieldInfo, err.Error())) return attr } @@ -158,7 +158,7 @@ func (m *Migrator) derivedChargers2Chargers(dck *v1DerivedChargersWithKey) (err if len(dck.Value.DestinationIDs) != 0 { destination = fmt.Sprintf("%s:~%s:", utils.MetaDestinations, utils.MetaReq+utils.NestingSep+utils.Destination) keys := dcGetMapKeys(dck.Value.DestinationIDs) - destination += strings.Join(keys, utils.INFIELD_SEP) + destination += strings.Join(keys, utils.InfieldSep) } filter := make([]string, 0) diff --git a/migrator/derived_chargers_it_test.go b/migrator/derived_chargers_it_test.go index edcb9a0a3..2529a1662 100644 --- a/migrator/derived_chargers_it_test.go +++ b/migrator/derived_chargers_it_test.go @@ -158,12 +158,12 @@ func testDCITMigrateAndMove(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("1004", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1004", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("call_1003", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("call_1003", utils.InfieldSep), }, }, Blocker: false, diff --git a/migrator/derived_chargers_test.go b/migrator/derived_chargers_test.go index da6c7b40b..2cd21be8c 100644 --- a/migrator/derived_chargers_test.go +++ b/migrator/derived_chargers_test.go @@ -55,7 +55,7 @@ func TestFieldinfo2Attribute(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("1003", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1003", utils.InfieldSep), }, }, }, @@ -67,7 +67,7 @@ func TestFieldinfo2Attribute(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile(`~effective_caller_id_number:s/(\d+)/+$1/`, utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile(`~effective_caller_id_number:s/(\d+)/+$1/`, utils.InfieldSep), }, }, }, @@ -78,19 +78,19 @@ func TestFieldinfo2Attribute(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("1003", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1003", utils.InfieldSep), }, }, Expected: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("1003", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1003", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("call_1003", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("call_1003", utils.InfieldSep), }, }, }, @@ -130,12 +130,12 @@ func TestDerivedChargers2AttributeProfile(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("*voice", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("*voice", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("1003", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1003", utils.InfieldSep), }, }, Blocker: false, @@ -163,22 +163,22 @@ func TestDerivedChargers2AttributeProfile(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("*voice", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("*voice", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("1003", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1003", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("call_1003_to_1004", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("call_1003_to_1004", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("1004", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1004", utils.InfieldSep), }, }, Blocker: false, diff --git a/migrator/filters.go b/migrator/filters.go index e9734812a..9358a5d47 100644 --- a/migrator/filters.go +++ b/migrator/filters.go @@ -896,7 +896,7 @@ func migrateInlineFilterV4(v4fltIDs []string) (fltrIDs []string, err error) { } else { fltrIDs = append(fltrIDs, v4flt) } - for _, val := range strings.Split(v4flt, utils.INFIELD_SEP) { + for _, val := range strings.Split(v4flt, utils.InfieldSep) { el, vals, err := migrateRSRFilterV4(val) if err != nil { return nil, err @@ -906,7 +906,7 @@ func migrateInlineFilterV4(v4fltIDs []string) (fltrIDs []string, err error) { } fltrIDs = append(fltrIDs, fltr+el+utils.InInFieldSep+ - strings.Join(vals, utils.INFIELD_SEP)) + strings.Join(vals, utils.InfieldSep)) } } return diff --git a/migrator/filters_it_test.go b/migrator/filters_it_test.go index fa5d1cdb4..e8ece716d 100644 --- a/migrator/filters_it_test.go +++ b/migrator/filters_it_test.go @@ -169,7 +169,7 @@ func testFltrITMigrateAndMove(t *testing.T) { { FilterIDs: []string{"*string:Account:1001"}, Path: utils.MetaReq + utils.NestingSep + "Account", - Value: config.NewRSRParsersMustCompile("1002", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1002", utils.InfieldSep), }, }, Weight: 10, @@ -184,7 +184,7 @@ func testFltrITMigrateAndMove(t *testing.T) { { FilterIDs: []string{"*string:~*req.Account:1001"}, Path: utils.MetaReq + utils.NestingSep + "Account", - Value: config.NewRSRParsersMustCompile("1002", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1002", utils.InfieldSep), }, }, Weight: 10, @@ -365,7 +365,7 @@ func testFltrITMigratev2(t *testing.T) { { FilterIDs: []string{"*string:~Account:1001"}, Path: utils.MetaReq + utils.NestingSep + "Account", - Value: config.NewRSRParsersMustCompile("1002", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1002", utils.InfieldSep), }, }, Weight: 10, @@ -380,7 +380,7 @@ func testFltrITMigratev2(t *testing.T) { { FilterIDs: []string{"*string:~*req.Account:1001"}, Path: utils.MetaReq + utils.NestingSep + "Account", - Value: config.NewRSRParsersMustCompile("1002", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("1002", utils.InfieldSep), }, }, Weight: 10, diff --git a/migrator/tp_action_profile_it_test.go b/migrator/tp_action_profile_it_test.go index badb2917e..e81eb4e0f 100644 --- a/migrator/tp_action_profile_it_test.go +++ b/migrator/tp_action_profile_it_test.go @@ -111,7 +111,7 @@ func testTpACtPrfPopulate(t *testing.T) { ID: "sub_id1", FilterIDs: []string{"*string:~*req.Account:1001"}, Weight: 20, - Schedule: utils.ASAP, + Schedule: utils.MetaASAP, Actions: []*utils.TPAPAction{ { ID: "TOPUP", diff --git a/migrator/user.go b/migrator/user.go index 65de039be..29dbbf46b 100644 --- a/migrator/user.go +++ b/migrator/user.go @@ -64,7 +64,7 @@ func userProfile2attributeProfile(user *v1UserProfile) (attr *engine.AttributePr if user.Tenant != attr.Tenant { attr.Attributes = append(attr.Attributes, &engine.Attribute{ Path: utils.MetaTenant, - Value: config.NewRSRParsersMustCompile(user.Tenant, utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile(user.Tenant, utils.InfieldSep), Type: utils.META_CONSTANT, }) } @@ -84,7 +84,7 @@ func userProfile2attributeProfile(user *v1UserProfile) (attr *engine.AttributePr } attr.Attributes = append(attr.Attributes, &engine.Attribute{ Path: path, - Value: config.NewRSRParsersMustCompile(substitute, utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile(substitute, utils.InfieldSep), Type: utils.MetaVariable, }) } diff --git a/migrator/user_it_test.go b/migrator/user_it_test.go index 7b305582c..32eaf2034 100644 --- a/migrator/user_it_test.go +++ b/migrator/user_it_test.go @@ -132,17 +132,17 @@ func testUsrITMigrateAndMove(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("*prepaid", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("*prepaid", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "msisdn", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("123423534646752", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("123423534646752", utils.InfieldSep), }, { Path: utils.MetaTenant, Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile("cgrates.com", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("cgrates.com", utils.InfieldSep), }, }, Blocker: false, diff --git a/migrator/user_test.go b/migrator/user_test.go index 6573f34f1..58318dc85 100644 --- a/migrator/user_test.go +++ b/migrator/user_test.go @@ -106,12 +106,12 @@ func TestUserProfile2attributeProfile(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Subject", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("call_1001", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("call_1001", utils.InfieldSep), }, { Path: utils.MetaTenant, Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile(usrTenant, utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile(usrTenant, utils.InfieldSep), }, }, Blocker: false, @@ -129,12 +129,12 @@ func TestUserProfile2attributeProfile(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("*prepaid", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("*prepaid", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "msisdn", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("123423534646752", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("123423534646752", utils.InfieldSep), }, }, Blocker: false, @@ -150,12 +150,12 @@ func TestUserProfile2attributeProfile(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("*prepaid", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("*prepaid", utils.InfieldSep), }, { Path: utils.MetaTenant, Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile(usrTenant, utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile(usrTenant, utils.InfieldSep), }, }, Blocker: false, @@ -173,27 +173,27 @@ func TestUserProfile2attributeProfile(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("*prepaid", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("*prepaid", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("acnt63", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("acnt63", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "imsi", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("12345", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("12345", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "msisdn", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("12345", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("12345", utils.InfieldSep), }, { Path: utils.MetaTenant, Type: utils.META_CONSTANT, - Value: config.NewRSRParsersMustCompile(usrTenant, utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile(usrTenant, utils.InfieldSep), }, }, Blocker: false, diff --git a/services/ees_it_test.go b/services/ees_it_test.go index 3c24457cc..74d3a5ae5 100644 --- a/services/ees_it_test.go +++ b/services/ees_it_test.go @@ -77,7 +77,7 @@ func TestEventExporterSReload(t *testing.T) { fcTmp := &config.FCTemplate{Tag: "TenantID", Path: "Tenant", Type: utils.MetaVariable, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP), + Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, } diff --git a/sessions/libsessions.go b/sessions/libsessions.go index 06ab57f2c..f3dcd0a6e 100644 --- a/sessions/libsessions.go +++ b/sessions/libsessions.go @@ -67,7 +67,7 @@ func getFlagIDs(flag string) []string { if len(flagWithIDs) <= 1 { return nil } - return strings.Split(flagWithIDs[1], utils.INFIELD_SEP) + return strings.Split(flagWithIDs[1], utils.InfieldSep) } // ProcessedStirIdentity the structure that keeps all the header information @@ -82,7 +82,7 @@ type ProcessedStirIdentity struct { // NewProcessedIdentity creates a proccessed header func NewProcessedIdentity(identity string) (pi *ProcessedStirIdentity, err error) { pi = new(ProcessedStirIdentity) - hdrtoken := strings.Split(utils.RemoveWhiteSpaces(identity), utils.INFIELD_SEP) + hdrtoken := strings.Split(utils.RemoveWhiteSpaces(identity), utils.InfieldSep) if len(hdrtoken) == 1 { err = errors.New("missing parts of the message header") diff --git a/sessions/sessions.go b/sessions/sessions.go index 002ed7499..5c1bd6e9b 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -3227,7 +3227,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, opts := engine.MapEvent(cgrEv.Opts) attest := sS.cgrCfg.SessionSCfg().STIRCfg.AllowedAttest if uattest := opts.GetStringIgnoreErrors(utils.OptsStirATest); uattest != utils.EmptyString { - attest = utils.NewStringSet(strings.Split(uattest, utils.INFIELD_SEP)) + attest = utils.NewStringSet(strings.Split(uattest, utils.InfieldSep)) } var stirMaxDur time.Duration if stirMaxDur, err = opts.GetDuration(utils.OptsStirPayloadMaxDuration); err != nil { @@ -3255,7 +3255,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, destURI := opts.GetStringIgnoreErrors(utils.OptsStirDestinationTn) destTn := utils.FirstNonEmpty(opts.GetStringIgnoreErrors(utils.OptsStirDestinationTn), ev.GetStringIgnoreErrors(utils.Destination)) - dest := utils.NewPASSporTDestinationsIdentity(strings.Split(destTn, utils.INFIELD_SEP), strings.Split(destURI, utils.INFIELD_SEP)) + dest := utils.NewPASSporTDestinationsIdentity(strings.Split(destTn, utils.InfieldSep), strings.Split(destURI, utils.InfieldSep)) var orig *utils.PASSporTOriginsIdentity if origURI := opts.GetStringIgnoreErrors(utils.OptsStirOriginatorURI); origURI != utils.EmptyString { diff --git a/utils/apitpdata.go b/utils/apitpdata.go index ab821b170..56fbeea49 100755 --- a/utils/apitpdata.go +++ b/utils/apitpdata.go @@ -206,11 +206,11 @@ type TPTimingWithOpts struct { func NewTiming(ID, years, mounths, mounthdays, weekdays, time string) (rt *TPTiming) { rt = &TPTiming{} rt.ID = ID - rt.Years.Parse(years, INFIELD_SEP) - rt.Months.Parse(mounths, INFIELD_SEP) - rt.MonthDays.Parse(mounthdays, INFIELD_SEP) - rt.WeekDays.Parse(weekdays, INFIELD_SEP) - times := strings.Split(time, INFIELD_SEP) + rt.Years.Parse(years, InfieldSep) + rt.Months.Parse(mounths, InfieldSep) + rt.MonthDays.Parse(mounthdays, InfieldSep) + rt.WeekDays.Parse(weekdays, InfieldSep) + times := strings.Split(time, InfieldSep) rt.StartTime = times[0] if len(times) > 1 { rt.EndTime = times[1] @@ -299,7 +299,7 @@ type TPRatingActivation struct { func FallbackSubjKeys(tenant, tor, fallbackSubjects string) []string { var sslice sort.StringSlice if len(fallbackSubjects) != 0 { - for _, fbs := range strings.Split(fallbackSubjects, string(FALLBACK_SEP)) { + for _, fbs := range strings.Split(fallbackSubjects, string(FallbackSep)) { newKey := ConcatenatedKey(META_OUT, tenant, tor, fbs) i := sslice.Search(newKey) if i < len(sslice) && sslice[i] != newKey { @@ -1606,15 +1606,15 @@ func (costIncr *TPBalanceCostIncrement) AsString() (s string) { if len(costIncr.FilterIDs) != 0 { s = s + strings.Join(costIncr.FilterIDs, ANDSep) } - s = s + INFIELD_SEP + s = s + InfieldSep if costIncr.Increment != nil { s = s + strconv.FormatFloat(*costIncr.Increment, 'f', -1, 64) } - s = s + INFIELD_SEP + s = s + InfieldSep if costIncr.FixedFee != nil { s = s + strconv.FormatFloat(*costIncr.FixedFee, 'f', -1, 64) } - s = s + INFIELD_SEP + s = s + InfieldSep if costIncr.RecurrentFee != nil { s = s + strconv.FormatFloat(*costIncr.RecurrentFee, 'f', -1, 64) } @@ -1640,7 +1640,7 @@ func (unitFactor *TPBalanceUnitFactor) AsString() (s string) { if len(unitFactor.FilterIDs) != 0 { s = s + strings.Join(unitFactor.FilterIDs, ANDSep) } - s = s + INFIELD_SEP + strconv.FormatFloat(unitFactor.Factor, 'f', -1, 64) + s = s + InfieldSep + strconv.FormatFloat(unitFactor.Factor, 'f', -1, 64) return } diff --git a/utils/consts.go b/utils/consts.go index 83e1e3077..f47f953a4 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -283,12 +283,12 @@ const ( MetaAny = "*any" MetaAll = "*all" MetaSingle = "*single" - ZERO = "*zero" - ASAP = "*asap" - COMMENT_CHAR = '#' - CSV_SEP = ',' - FALLBACK_SEP = ';' - INFIELD_SEP = ";" + MetaZero = "*zero" + MetaASAP = "*asap" + CommentChar = '#' + CSVSep = ',' + FallbackSep = ';' + InfieldSep = ";" MetaPipe = "*|" FIELDS_SEP = "," InInFieldSep = ":" diff --git a/utils/coreutils.go b/utils/coreutils.go index efd3c22eb..6729a5703 100644 --- a/utils/coreutils.go +++ b/utils/coreutils.go @@ -400,11 +400,11 @@ func SplitConcatenatedKey(key string) []string { } func InfieldJoin(vals ...string) string { - return strings.Join(vals, INFIELD_SEP) + return strings.Join(vals, InfieldSep) } func InfieldSplit(val string) []string { - return strings.Split(val, INFIELD_SEP) + return strings.Split(val, InfieldSep) } //Splited Unzip in small functions to have better coverage @@ -468,7 +468,7 @@ func Fib() func() int { // Utilities to provide pointers where we need to define ad-hoc func StringPointer(str string) *string { - if str == ZERO { + if str == MetaZero { str = EmptyString return &str } diff --git a/utils/dateseries_test.go b/utils/dateseries_test.go index ef2386676..c3c3ae9a1 100644 --- a/utils/dateseries_test.go +++ b/utils/dateseries_test.go @@ -101,17 +101,17 @@ func TestYearsParse(t *testing.T) { func TestYearsSerialize(t *testing.T) { ys := &Years{} eOut := MetaAny - if yString := ys.Serialize(INFIELD_SEP); eOut != yString { + if yString := ys.Serialize(InfieldSep); eOut != yString { t.Errorf("Expected: %s, received: %s", eOut, yString) } ys = &Years{2012} eOut = "2012" - if yString := ys.Serialize(INFIELD_SEP); eOut != yString { + if yString := ys.Serialize(InfieldSep); eOut != yString { t.Errorf("Expected: %s, received: %s", eOut, yString) } ys = &Years{2013, 2014, 2015} eOut = "2013;2014;2015" - if yString := ys.Serialize(INFIELD_SEP); eOut != yString { + if yString := ys.Serialize(InfieldSep); eOut != yString { t.Errorf("Expected: %s, received: %s", eOut, yString) } } @@ -194,15 +194,15 @@ func TestMonthsParse(t *testing.T) { func TestMonthsSerialize(t *testing.T) { mths := &Months{} - if rcv := mths.Serialize(INFIELD_SEP); !reflect.DeepEqual(MetaAny, rcv) { + if rcv := mths.Serialize(InfieldSep); !reflect.DeepEqual(MetaAny, rcv) { t.Errorf("Expected: %s, received: %s", MetaAny, rcv) } mths = &Months{time.January} - if rcv := mths.Serialize(INFIELD_SEP); !reflect.DeepEqual("1", rcv) { + if rcv := mths.Serialize(InfieldSep); !reflect.DeepEqual("1", rcv) { t.Errorf("Expected: '1', received: %s", rcv) } mths = &Months{time.January, time.December} - if rcv := mths.Serialize(INFIELD_SEP); !reflect.DeepEqual("1;12", rcv) { + if rcv := mths.Serialize(InfieldSep); !reflect.DeepEqual("1;12", rcv) { t.Errorf("Expected: '1;12', received: %s", rcv) } } @@ -299,17 +299,17 @@ func TestMonthDaysParse(t *testing.T) { func TestMonthDaysSerialize(t *testing.T) { md := &MonthDays{} - if rcv := md.Serialize(INFIELD_SEP); !reflect.DeepEqual(MetaAny, rcv) { + if rcv := md.Serialize(InfieldSep); !reflect.DeepEqual(MetaAny, rcv) { t.Errorf("Expected: %s, received: %s", MetaAny, rcv) } md = &MonthDays{1} - if rcv := md.Serialize(INFIELD_SEP); !reflect.DeepEqual("1", rcv) { + if rcv := md.Serialize(InfieldSep); !reflect.DeepEqual("1", rcv) { t.Errorf("Expected: '1', received: %s", rcv) } md = &MonthDays{1, 2, 3, 4, 5} - if rcv := md.Serialize(INFIELD_SEP); !reflect.DeepEqual("1;2;3;4;5", rcv) { + if rcv := md.Serialize(InfieldSep); !reflect.DeepEqual("1;2;3;4;5", rcv) { t.Errorf("Expected: '1;2;3;4;5', received: %s", rcv) } } @@ -393,17 +393,17 @@ func TestWeekDaysParse(t *testing.T) { func TestWeekDaysSerialize(t *testing.T) { wd := &WeekDays{} - if rcv := wd.Serialize(INFIELD_SEP); !reflect.DeepEqual(MetaAny, rcv) { + if rcv := wd.Serialize(InfieldSep); !reflect.DeepEqual(MetaAny, rcv) { t.Errorf("Expected: %s, received: %s", MetaAny, rcv) } wd = &WeekDays{time.Monday} - if rcv := wd.Serialize(INFIELD_SEP); !reflect.DeepEqual("1", rcv) { + if rcv := wd.Serialize(InfieldSep); !reflect.DeepEqual("1", rcv) { t.Errorf("Expected: '1', received: %s", rcv) } wd = &WeekDays{time.Monday, time.Saturday, time.Sunday} - if rcv := wd.Serialize(INFIELD_SEP); !reflect.DeepEqual("1;6;0", rcv) { + if rcv := wd.Serialize(InfieldSep); !reflect.DeepEqual("1;6;0", rcv) { t.Errorf("Expected: '1;6;0', received: %s", rcv) } } diff --git a/utils/dynamicfieldpath.go b/utils/dynamicfieldpath.go index 5274beea3..96a29a90e 100644 --- a/utils/dynamicfieldpath.go +++ b/utils/dynamicfieldpath.go @@ -49,7 +49,7 @@ func processFieldPath(fldPath string, dP DataProvider) (newPath string, err erro return } newPath = fldPath[:startIdx] - for _, path := range strings.Split(fldPath[startIdx+1:endIdx], INFIELD_SEP) { // proccess the found path + for _, path := range strings.Split(fldPath[startIdx+1:endIdx], InfieldSep) { // proccess the found path var val string if val, err = DPDynamicString(path, dP); err != nil { newPath = EmptyString diff --git a/utils/map.go b/utils/map.go index 75d86e957..e8601e7fa 100644 --- a/utils/map.go +++ b/utils/map.go @@ -41,10 +41,10 @@ func NewStringMap(s ...string) StringMap { } func ParseStringMap(s string) StringMap { - if s == ZERO { + if s == MetaZero { return make(StringMap) } - return StringMapFromSlice(strings.Split(s, INFIELD_SEP)) + return StringMapFromSlice(strings.Split(s, InfieldSep)) } func (sm StringMap) Equal(om StringMap) bool { @@ -118,7 +118,7 @@ func (sm StringMap) Clone() StringMap { } func (sm StringMap) String() string { - return strings.Join(sm.Slice(), INFIELD_SEP) + return strings.Join(sm.Slice(), InfieldSep) } func (sm StringMap) GetOne() string { @@ -193,7 +193,7 @@ func (fWp FlagParams) SliceFlags() (sls []string) { sls = append(sls, key) continue } - sls = append(sls, ConcatenatedKey(key, strings.Join(sub, INFIELD_SEP))) + sls = append(sls, ConcatenatedKey(key, strings.Join(sub, InfieldSep))) } return } @@ -246,7 +246,7 @@ func (fWp FlagsWithParams) SliceFlags() (sls []string) { sls = append(sls, ConcatenatedKey(key, opt)) continue } - sls = append(sls, ConcatenatedKey(key, opt, strings.Join(values, INFIELD_SEP))) + sls = append(sls, ConcatenatedKey(key, opt, strings.Join(values, InfieldSep))) } } return diff --git a/utils/map_test.go b/utils/map_test.go index 5f3c60fd0..c53faacf4 100644 --- a/utils/map_test.go +++ b/utils/map_test.go @@ -27,7 +27,7 @@ func TestMapKeysStringMapParse(t *testing.T) { if sm := ParseStringMap(EmptyString); len(sm) != 0 { t.Errorf("Expecting %+v, received %+v", 0, len(sm)) } - if sm := ParseStringMap(ZERO); len(sm) != 0 { + if sm := ParseStringMap(MetaZero); len(sm) != 0 { t.Errorf("Expecting %+v, received %+v", 0, len(sm)) } if sm := ParseStringMap("1;2;3;4"); len(sm) != 4 { @@ -49,7 +49,7 @@ func TestMapKeysStringMapParse(t *testing.T) { t.Error("Error detecting missing: ", sm) } eOut := make(StringMap) - if rcv := ParseStringMap(ZERO); !reflect.DeepEqual(eOut, rcv) { + if rcv := ParseStringMap(MetaZero); !reflect.DeepEqual(eOut, rcv) { t.Errorf("Expecting: %+v, received: %+v", eOut, rcv) } } diff --git a/utils/rsrfilters_test.go b/utils/rsrfilters_test.go index b1fbbf9cd..09d9278d0 100644 --- a/utils/rsrfilters_test.go +++ b/utils/rsrfilters_test.go @@ -335,7 +335,7 @@ func TestRSRFilterPass(t *testing.T) { func TestRSRFiltersPass(t *testing.T) { rlStr := "~^C.+S$;CGRateS;ateS$" - fltrs, err := ParseRSRFilters(rlStr, INFIELD_SEP) + fltrs, err := ParseRSRFilters(rlStr, InfieldSep) if err != nil { t.Error(err) }