diff --git a/actions/libactions.go b/actions/libactions.go index 3effc71b4..6cbdd34f3 100644 --- a/actions/libactions.go +++ b/actions/libactions.go @@ -97,7 +97,7 @@ func newActionersFromActions(cfg *config.CGRConfig, fltrS *engine.FilterS, dm *e func newActioner(cfg *config.CGRConfig, fltrS *engine.FilterS, dm *engine.DataManager, aCfg *engine.APAction) (act actioner, err error) { switch aCfg.Type { - case utils.LOG: + case utils.MetaLog: return &actLog{aCfg}, nil default: return nil, fmt.Errorf("unsupported action type: <%s>", aCfg.Type) diff --git a/agents/agentreq.go b/agents/agentreq.go index 4354898b6..4669b816d 100644 --- a/agents/agentreq.go +++ b/agents/agentreq.go @@ -68,7 +68,7 @@ func NewAgentRequest(req utils.DataProvider, } if tntTpl != nil { if tntIf, err := ar.ParseField( - &config.FCTemplate{Type: utils.META_COMPOSED, + &config.FCTemplate{Type: utils.MetaComposed, Value: tntTpl}); err == nil && tntIf.(string) != "" { ar.Tenant = tntIf.(string) } @@ -230,7 +230,7 @@ func (ar *AgentRequest) SetFields(tplFlds []*config.FCTemplate) (err error) { nMItm := &config.NMItem{Data: out, Path: itmPath, Config: tplFld} switch tplFld.Type { - case utils.META_COMPOSED: + case utils.MetaComposed: err = utils.ComposeNavMapVal(ar, fullPath, nMItm) case utils.MetaGroup: // in case of *group type simply append to valSet err = utils.AppendNavMapVal(ar, fullPath, nMItm) @@ -355,23 +355,23 @@ func (ar *AgentRequest) ParseField( return utils.EmptyString, fmt.Errorf("unsupported type: <%s>", cfgFld.Type) case utils.MetaNone: return - case utils.META_FILLER: + case utils.MetaFiller: out, err = cfgFld.Value.ParseValue(utils.EmptyString) cfgFld.Padding = utils.MetaRight isString = true - case utils.META_CONSTANT: + case utils.MetaConstant: out, err = cfgFld.Value.ParseValue(utils.EmptyString) isString = true case utils.MetaRemoteHost: out = ar.RemoteHost().String() isString = true - case utils.MetaVariable, utils.META_COMPOSED, utils.MetaGroup: + case utils.MetaVariable, utils.MetaComposed, utils.MetaGroup: out, err = cfgFld.Value.ParseDataProvider(ar) isString = true - case utils.META_USAGE_DIFFERENCE: + case utils.MetaUsageDifference: if len(cfgFld.Value) != 2 { return nil, fmt.Errorf("invalid arguments <%s> to %s", - utils.ToJSON(cfgFld.Value), utils.META_USAGE_DIFFERENCE) + utils.ToJSON(cfgFld.Value), utils.MetaUsageDifference) } var strVal1 string if strVal1, err = cfgFld.Value[0].ParseDataProvider(ar); err != nil { diff --git a/agents/agentreq_test.go b/agents/agentreq_test.go index 06f26a1c3..46d25ede5 100644 --- a/agents/agentreq_test.go +++ b/agents/agentreq_test.go @@ -46,7 +46,7 @@ func TestAgReqSetFields(t *testing.T) { // populate request, emulating the way will be done in HTTPAgent agReq.CGRRequest.Set(&utils.FullPath{Path: utils.CGRID, PathItems: utils.PathItems{{Field: utils.CGRID}}}, utils.NewNMData( utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()))) - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.VOICE)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.MetaVoice)) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AccountField, PathItems: utils.PathItems{{Field: utils.AccountField}}}, utils.NewNMData("1001")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AnswerTime, PathItems: utils.PathItems{{Field: utils.AnswerTime}}}, utils.NewNMData( @@ -274,24 +274,24 @@ func TestAgentRequestSetFields(t *testing.T) { t.Error("Expecting 1009, received: ", (*nm)[0].Interface()) } - //META_COMPOSED + //MetaComposed input = []*config.FCTemplate{ { Path: fmt.Sprintf("%s.AccountID", utils.MetaVars), Tag: fmt.Sprintf("%s.AccountID", utils.MetaVars), - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, 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, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile(":", utils.InfieldSep), }, { Path: fmt.Sprintf("%s.AccountID", utils.MetaVars), Tag: fmt.Sprintf("%s.AccountID", utils.MetaVars), - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~"+utils.MetaReq+".Account", utils.InfieldSep), }, } @@ -311,12 +311,12 @@ func TestAgentRequestSetFields(t *testing.T) { t.Error("Expecting 'cgrates.org:1009', received: ", (*nm)[0].Interface()) } - // META_CONSTANT + // MetaConstant input = []*config.FCTemplate{ { Path: fmt.Sprintf("%s.Account", utils.MetaVars), Tag: fmt.Sprintf("%s.Account", utils.MetaVars), - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("2020", utils.InfieldSep), }, } @@ -339,7 +339,7 @@ func TestAgentRequestSetFields(t *testing.T) { Path: fmt.Sprintf("%s.AccountID", utils.MetaVars), Tag: fmt.Sprintf("%s.AccountID", utils.MetaVars), Filters: []string{utils.MetaString + ":~" + utils.MetaVars + ".Account:1003"}, - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("2021", utils.InfieldSep), }, } @@ -361,7 +361,7 @@ func TestAgentRequestSetFields(t *testing.T) { Path: fmt.Sprintf("%s.Account", utils.MetaVars), Tag: fmt.Sprintf("%s.Account", utils.MetaVars), Filters: []string{"Not really a filter"}, - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("2021", utils.InfieldSep), }, } @@ -545,15 +545,15 @@ func TestAgReqParseFieldDiameter(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "MandatoryFalse", - Path: "MandatoryFalse", Type: utils.META_COMPOSED, + Path: "MandatoryFalse", Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.MandatoryFalse", utils.InfieldSep), Mandatory: false}, {Tag: "MandatoryTrue", - Path: "MandatoryTrue", Type: utils.META_COMPOSED, + Path: "MandatoryTrue", Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.MandatoryTrue", utils.InfieldSep), Mandatory: true}, {Tag: "Session-Id", Filters: []string{}, - Path: "Session-Id", Type: utils.META_COMPOSED, + Path: "Session-Id", Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, } @@ -597,11 +597,11 @@ func TestAgReqParseFieldRadius(t *testing.T) { agReq := NewAgentRequest(dP, nil, nil, nil, nil, nil, "cgrates.org", "", filterS, nil, nil) tplFlds := []*config.FCTemplate{ {Tag: "MandatoryFalse", - Path: "MandatoryFalse", Type: utils.META_COMPOSED, + Path: "MandatoryFalse", Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.MandatoryFalse", utils.InfieldSep), Mandatory: false}, {Tag: "MandatoryTrue", - Path: "MandatoryTrue", Type: utils.META_COMPOSED, + Path: "MandatoryTrue", Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.MandatoryTrue", utils.InfieldSep), Mandatory: true}, } @@ -640,11 +640,11 @@ Host: api.cgrates.org agReq := NewAgentRequest(dP, nil, nil, nil, nil, nil, "cgrates.org", "", filterS, nil, nil) tplFlds := []*config.FCTemplate{ {Tag: "MandatoryFalse", - Path: "MandatoryFalse", Type: utils.META_COMPOSED, + Path: "MandatoryFalse", Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.MandatoryFalse", utils.InfieldSep), Mandatory: false}, {Tag: "MandatoryTrue", - Path: "MandatoryTrue", Type: utils.META_COMPOSED, + Path: "MandatoryTrue", Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.MandatoryTrue", utils.InfieldSep), Mandatory: true}, } @@ -712,11 +712,11 @@ func TestAgReqParseFieldHttpXml(t *testing.T) { agReq := NewAgentRequest(dP, nil, nil, nil, nil, nil, "cgrates.org", "", filterS, nil, nil) tplFlds := []*config.FCTemplate{ {Tag: "MandatoryFalse", - Path: "MandatoryFalse", Type: utils.META_COMPOSED, + Path: "MandatoryFalse", Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.MandatoryFalse", utils.InfieldSep), Mandatory: false}, {Tag: "MandatoryTrue", - Path: "MandatoryTrue", Type: utils.META_COMPOSED, + Path: "MandatoryTrue", Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.MandatoryTrue", utils.InfieldSep), Mandatory: true}, } @@ -811,7 +811,7 @@ func TestAgReqFieldAsNone(t *testing.T) { filterS := engine.NewFilterS(cfg, nil, dm) agReq := NewAgentRequest(nil, nil, nil, nil, nil, nil, "cgrates.org", "", filterS, nil, nil) // populate request, emulating the way will be done in HTTPAgent - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.VOICE)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.MetaVoice)) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AccountField, PathItems: utils.PathItems{{Field: utils.AccountField}}}, utils.NewNMData("1001")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) @@ -851,7 +851,7 @@ func TestAgReqFieldAsNone2(t *testing.T) { filterS := engine.NewFilterS(cfg, nil, dm) agReq := NewAgentRequest(nil, nil, nil, nil, nil, nil, "cgrates.org", "", filterS, nil, nil) // populate request, emulating the way will be done in HTTPAgent - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.VOICE)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.MetaVoice)) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AccountField, PathItems: utils.PathItems{{Field: utils.AccountField}}}, utils.NewNMData("1001")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) @@ -894,7 +894,7 @@ func TestAgReqSetField2(t *testing.T) { filterS := engine.NewFilterS(cfg, nil, dm) agReq := NewAgentRequest(nil, nil, nil, nil, nil, nil, "cgrates.org", "", filterS, nil, nil) // populate request, emulating the way will be done in HTTPAgent - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.VOICE)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.MetaVoice)) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AccountField, PathItems: utils.PathItems{{Field: utils.AccountField}}}, utils.NewNMData("1001")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AnswerTime, PathItems: utils.PathItems{{Field: utils.AnswerTime}}}, utils.NewNMData( @@ -905,13 +905,13 @@ func TestAgReqSetField2(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Tenant", - Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep)}, {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.InfieldSep)}, {Tag: "Destination", - Path: utils.MetaCgrep + utils.NestingSep + utils.Destination, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.Destination, Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*cgreq.Destination", utils.InfieldSep)}, {Tag: "Usage", Path: utils.MetaCgrep + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, @@ -957,7 +957,7 @@ func TestAgReqFieldAsInterface(t *testing.T) { // populate request, emulating the way will be done in HTTPAgent agReq.CGRRequest = utils.NewOrderedNavigableMap() agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Usage, PathItems: utils.PathItems{{Field: utils.Usage}}}, &utils.NMSlice{&config.NMItem{Data: 3 * time.Minute}}) - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, &utils.NMSlice{&config.NMItem{Data: utils.VOICE}}) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, &utils.NMSlice{&config.NMItem{Data: utils.MetaVoice}}) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AccountField, PathItems: utils.PathItems{{Field: utils.AccountField}}}, utils.NewNMData("1001")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) @@ -971,7 +971,7 @@ func TestAgReqFieldAsInterface(t *testing.T) { } path = []string{utils.MetaCgreq, utils.ToR} - expVal = utils.VOICE + expVal = utils.MetaVoice if rply, err := agReq.FieldAsInterface(path); err != nil { t.Error(err) } else if !reflect.DeepEqual(rply, expVal) { @@ -1247,7 +1247,7 @@ func TestAgReqParseFieldMetaUsageDifference(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Usage", Filters: []string{}, - Path: "Usage", Type: utils.META_USAGE_DIFFERENCE, + Path: "Usage", Type: utils.MetaUsageDifference, Value: config.NewRSRParsersMustCompile("~*req.Session-Id", utils.InfieldSep), Mandatory: true}, } @@ -1258,7 +1258,7 @@ func TestAgReqParseFieldMetaUsageDifference(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "Usage", Filters: []string{}, - Path: "Usage", Type: utils.META_USAGE_DIFFERENCE, + Path: "Usage", Type: utils.MetaUsageDifference, Value: config.NewRSRParsersMustCompile("1560325161;~*req.Session-Id", utils.InfieldSep), Mandatory: true}, } @@ -1269,7 +1269,7 @@ func TestAgReqParseFieldMetaUsageDifference(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "Usage", Filters: []string{}, - Path: "Usage", Type: utils.META_USAGE_DIFFERENCE, + Path: "Usage", Type: utils.MetaUsageDifference, Value: config.NewRSRParsersMustCompile("~*req.Session-Id;1560325161", utils.InfieldSep), Mandatory: true}, } @@ -1280,7 +1280,7 @@ func TestAgReqParseFieldMetaUsageDifference(t *testing.T) { tplFlds = []*config.FCTemplate{ {Tag: "Usage", Filters: []string{}, - Path: "Usage", Type: utils.META_USAGE_DIFFERENCE, + Path: "Usage", Type: utils.MetaUsageDifference, Value: config.NewRSRParsersMustCompile("1560325161;1560325151", utils.InfieldSep), Mandatory: true}, } @@ -1540,7 +1540,7 @@ func TestAgReqOverwrite(t *testing.T) { filterS := engine.NewFilterS(cfg, nil, dm) agReq := NewAgentRequest(nil, nil, nil, nil, nil, nil, "cgrates.org", "", filterS, nil, nil) // populate request, emulating the way will be done in HTTPAgent - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.VOICE)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.MetaVoice)) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AccountField, PathItems: utils.PathItems{{Field: utils.AccountField}}}, utils.NewNMData("1001")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AnswerTime, PathItems: utils.PathItems{{Field: utils.AnswerTime}}}, utils.NewNMData( @@ -1551,19 +1551,19 @@ func TestAgReqOverwrite(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep)}, {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile(":", utils.InfieldSep)}, {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.InfieldSep)}, {Tag: "Account", Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("OverwrittenAccount", utils.InfieldSep)}, {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("WithComposed", utils.InfieldSep)}, } for _, v := range tplFlds { @@ -1592,7 +1592,7 @@ func TestAgReqGroupType(t *testing.T) { filterS := engine.NewFilterS(cfg, nil, dm) agReq := NewAgentRequest(nil, nil, nil, nil, nil, nil, "cgrates.org", "", filterS, nil, nil) // populate request, emulating the way will be done in HTTPAgent - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.VOICE)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.MetaVoice)) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AccountField, PathItems: utils.PathItems{{Field: utils.AccountField}}}, utils.NewNMData("1001")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AnswerTime, PathItems: utils.PathItems{{Field: utils.AnswerTime}}}, utils.NewNMData( @@ -1728,7 +1728,7 @@ func TestAgReqSetFieldsWithRemove(t *testing.T) { // populate request, emulating the way will be done in HTTPAgent agReq.CGRRequest.Set(&utils.FullPath{Path: utils.CGRID, PathItems: utils.PathItems{{Field: utils.CGRID}}}, utils.NewNMData( utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()))) - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.VOICE)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.MetaVoice)) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AccountField, PathItems: utils.PathItems{{Field: utils.AccountField}}}, utils.NewNMData("1001")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AnswerTime, PathItems: utils.PathItems{{Field: utils.AnswerTime}}}, utils.NewNMData( @@ -2031,7 +2031,7 @@ func TestAgReqDynamicPath(t *testing.T) { filterS := engine.NewFilterS(cfg, nil, dm) agReq := NewAgentRequest(nil, nil, nil, nil, nil, nil, "cgrates.org", "", filterS, nil, nil) // populate request, emulating the way will be done in HTTPAgent - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.VOICE)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.MetaVoice)) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AccountField, PathItems: utils.PathItems{{Field: utils.AccountField}}}, utils.NewNMData("1001")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AnswerTime, PathItems: utils.PathItems{{Field: utils.AnswerTime}}}, utils.NewNMData( @@ -2048,13 +2048,13 @@ func TestAgReqDynamicPath(t *testing.T) { } tplFlds := []*config.FCTemplate{ {Tag: "Tenant", - Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep)}, {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.InfieldSep)}, {Tag: "Destination", - Path: utils.MetaCgrep + utils.NestingSep + utils.Destination, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.Destination, Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*cgreq.Destination", utils.InfieldSep)}, {Tag: "Usage", Path: utils.MetaCgrep + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, @@ -2105,7 +2105,7 @@ func TestAgReqRoundingDecimals(t *testing.T) { filterS := engine.NewFilterS(cfg, nil, dm) agReq := NewAgentRequest(nil, nil, nil, nil, nil, nil, "cgrates.org", "", filterS, nil, nil) // populate request, emulating the way will be done in HTTPAgent - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.VOICE)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.MetaVoice)) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AccountField, PathItems: utils.PathItems{{Field: utils.AccountField}}}, utils.NewNMData("1001")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AnswerTime, PathItems: utils.PathItems{{Field: utils.AnswerTime}}}, utils.NewNMData( @@ -2117,7 +2117,7 @@ func TestAgReqRoundingDecimals(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Cost", - Path: utils.MetaCgrep + utils.NestingSep + utils.Cost, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.Cost, Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*cgreq.Cost{*round:3}", utils.InfieldSep)}, } for _, v := range tplFlds { @@ -2157,13 +2157,13 @@ func BenchmarkAgReqSetField(b *testing.B) { filterS := engine.NewFilterS(cfg, nil, dm) tplFlds := []*config.FCTemplate{ {Tag: "Tenant", - Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.MetaComposed, 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.InfieldSep)}, {Tag: "Account2", - Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField + "[1].ID", Type: utils.META_CONSTANT, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField + "[1].ID", Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("1003", utils.InfieldSep)}, } for _, v := range tplFlds { @@ -2184,7 +2184,7 @@ func BenchmarkAgReqSetField(b *testing.B) { for i := 0; i < b.N; i++ { agReq := NewAgentRequest(nil, nil, nil, nil, nil, nil, "cgrates.org", "", filterS, nil, nil) // populate request, emulating the way will be done in HTTPAgent - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.VOICE)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathItems: utils.PathItems{{Field: utils.ToR}}}, utils.NewNMData(utils.MetaVoice)) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AccountField, PathItems: utils.PathItems{{Field: utils.AccountField}}}, utils.NewNMData("1001")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AnswerTime, PathItems: utils.PathItems{{Field: utils.AnswerTime}}}, utils.NewNMData( diff --git a/agents/asterisk_event.go b/agents/asterisk_event.go index 4e63f1456..9799092bd 100644 --- a/agents/asterisk_event.go +++ b/agents/asterisk_event.go @@ -205,11 +205,11 @@ func (smaEv *SMAsteriskEvent) UpdateCGREvent(cgrEv *utils.CGREventWithOpts) erro resCGREv := *cgrEv switch smaEv.EventType() { case ARIChannelStateChange: - resCGREv.Event[utils.EVENT_NAME] = SMASessionStart + resCGREv.Event[utils.EventName] = SMASessionStart resCGREv.Event[utils.AnswerTime] = smaEv.Timestamp() case ARIChannelDestroyed: - resCGREv.Event[utils.EVENT_NAME] = SMASessionTerminate - resCGREv.Event[utils.DISCONNECT_CAUSE] = smaEv.DisconnectCause() + resCGREv.Event[utils.EventName] = SMASessionTerminate + resCGREv.Event[utils.DisconnectCause] = smaEv.DisconnectCause() if _, hasIt := resCGREv.Event[utils.AnswerTime]; !hasIt { resCGREv.Event[utils.Usage] = "0s" } else if aTime, err := utils.IfaceAsTime(resCGREv.Event[utils.AnswerTime], @@ -236,11 +236,11 @@ func (smaEv *SMAsteriskEvent) AsMapStringInterface() (mp map[string]interface{}) mp = make(map[string]interface{}) switch smaEv.EventType() { case ARIStasisStart: - mp[utils.EVENT_NAME] = SMAAuthorization + mp[utils.EventName] = SMAAuthorization case ARIChannelStateChange: - mp[utils.EVENT_NAME] = SMASessionStart + mp[utils.EventName] = SMASessionStart case ARIChannelDestroyed: - mp[utils.EVENT_NAME] = SMASessionTerminate + mp[utils.EventName] = SMASessionTerminate } mp[utils.OriginID] = smaEv.ChannelID() if smaEv.RequestType() != "" { @@ -260,7 +260,7 @@ func (smaEv *SMAsteriskEvent) AsMapStringInterface() (mp map[string]interface{}) mp[utils.Destination] = smaEv.Destination() mp[utils.SetupTime] = smaEv.SetupTime() if smaEv.Route() != "" { - mp[utils.ROUTE] = smaEv.Route() + mp[utils.Route] = smaEv.Route() } for extraKey, extraVal := range smaEv.ExtraParameters() { // Append extraParameters mp[extraKey] = extraVal diff --git a/agents/diam_it_test.go b/agents/diam_it_test.go index 579de0148..4e35686a5 100644 --- a/agents/diam_it_test.go +++ b/agents/diam_it_test.go @@ -977,7 +977,7 @@ func testDiamItCCRSMS(t *testing.T) { diamClnt.ReceivedMessage(rplyTimeout) var cdrs []*engine.CDR - args := &utils.RPCCDRsFilterWithOpts{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, ToRs: []string{utils.SMS}}} + args := &utils.RPCCDRsFilterWithOpts{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, ToRs: []string{utils.MetaSMS}}} if err := apierRpc.Call(utils.CDRsV1GetCDRs, args, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { @@ -1056,7 +1056,7 @@ func testDiamItCCRMMS(t *testing.T) { diamClnt.ReceivedMessage(rplyTimeout) var cdrs []*engine.CDR - args := &utils.RPCCDRsFilterWithOpts{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, ToRs: []string{utils.MMS}}} + args := &utils.RPCCDRsFilterWithOpts{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, ToRs: []string{utils.MetaMMS}}} if err := apierRpc.Call(utils.CDRsV1GetCDRs, args, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { @@ -1069,7 +1069,7 @@ func testDiamItCCRMMS(t *testing.T) { func testDiamInitWithSessionDisconnect(t *testing.T) { attrSetBalance := utils.AttrSetBalance{Tenant: "cgrates.org", Account: "testDiamInitWithSessionDisconnect", - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: float64(time.Second), Balance: map[string]interface{}{ utils.ID: "testDiamInitWithSessionDisconnect", @@ -1470,7 +1470,7 @@ func testDiamItEmulateTerminate(t *testing.T) { Tenant: "cgrates.com", Account: "testDiamItEmulateTerminate", Value: float64(1) * float64(time.Hour), - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Balance: map[string]interface{}{ utils.ID: "testDiamItEmulateTerminate", utils.Categories: "custom_charger", @@ -1486,8 +1486,8 @@ func testDiamItEmulateTerminate(t *testing.T) { attrs := &utils.AttrGetAccount{Tenant: "cgrates.com", Account: "testDiamItEmulateTerminate"} if err := apierRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != float64(time.Hour) { - t.Errorf("Expected: %f, received: %f", float64(time.Hour), acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != float64(time.Hour) { + t.Errorf("Expected: %f, received: %f", float64(time.Hour), acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } m := diam.NewRequest(diam.CreditControl, 4, nil) @@ -1578,7 +1578,7 @@ func testDiamItEmulateTerminate(t *testing.T) { if err := apierRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != float64(time.Hour) { - t.Errorf("Expected: %f, received: %f", float64(time.Hour), acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != float64(time.Hour) { + t.Errorf("Expected: %f, received: %f", float64(time.Hour), acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } } diff --git a/agents/diamagent.go b/agents/diamagent.go index 03b3aa905..c43c24c6b 100644 --- a/agents/diamagent.go +++ b/agents/diamagent.go @@ -144,7 +144,7 @@ func (da *DiameterAgent) handlers() diam.Handler { continue } for _, iAddr := range addrs { - hosts = append(hosts, net.ParseIP(strings.Split(iAddr.String(), utils.HDR_VAL_SEP)[0])) // address came in form x.y.z.t/24 + hosts = append(hosts, net.ParseIP(strings.Split(iAddr.String(), utils.HDRValSep)[0])) // address came in form x.y.z.t/24 } } } @@ -657,7 +657,7 @@ func (da *DiameterAgent) handleRAA(c diam.Conn, m *diam.Message) { func (da *DiameterAgent) handleConns(peers <-chan diam.Conn) { for c := range peers { meta, _ := smpeer.FromContext(c.Context()) - key := string(meta.OriginHost + utils.CONCATENATED_KEY_SEP + meta.OriginRealm) + key := string(meta.OriginHost + utils.ConcatenatedKeySep + meta.OriginRealm) da.peersLck.Lock() da.peers[key] = c // store in peers table da.peersLck.Unlock() @@ -674,7 +674,7 @@ func (da *DiameterAgent) handleConns(peers <-chan diam.Conn) { // handleDPA is used to handle all DisconnectPeer Answers that are received func (da *DiameterAgent) handleDPA(c diam.Conn, m *diam.Message) { meta, _ := smpeer.FromContext(c.Context()) - key := string(meta.OriginHost + utils.CONCATENATED_KEY_SEP + meta.OriginRealm) + key := string(meta.OriginHost + utils.ConcatenatedKeySep + meta.OriginRealm) da.dpaLck.Lock() ch, has := da.dpa[key] @@ -704,7 +704,7 @@ func (da *DiameterAgent) V1DisconnectPeer(args *utils.DPRArgs, reply *string) (e m.NewAVP(avp.OriginRealm, avp.Mbit, 0, datatype.DiameterIdentity(args.OriginRealm)) m.NewAVP(avp.DisconnectCause, avp.Mbit, 0, datatype.Enumerated(args.DisconnectCause)) - key := args.OriginHost + utils.CONCATENATED_KEY_SEP + args.OriginRealm + key := args.OriginHost + utils.ConcatenatedKeySep + args.OriginRealm dpaCh := make(chan *diam.Message, 1) da.dpaLck.Lock() diff --git a/agents/diamagent_test.go b/agents/diamagent_test.go index a8dc9de6b..2f8d743d7 100644 --- a/agents/diamagent_test.go +++ b/agents/diamagent_test.go @@ -73,29 +73,29 @@ func TestProcessRequest(t *testing.T) { 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.InfieldSep)}, + Type: utils.MetaConstant, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, + Value: config.NewRSRParsersMustCompile(utils.MetaVoice, utils.InfieldSep)}, {Tag: utils.OriginID, - Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, + Type: utils.MetaComposed, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, 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.InfieldSep)}, + Type: utils.MetaConstant, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, + Value: config.NewRSRParsersMustCompile(utils.Call, utils.InfieldSep)}, {Tag: utils.AccountField, - Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, + Type: utils.MetaComposed, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("~*req.Account", utils.InfieldSep), Mandatory: true}, {Tag: utils.Destination, - Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, + Type: utils.MetaComposed, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, Value: config.NewRSRParsersMustCompile("~*req.Destination", utils.InfieldSep), Mandatory: true}, {Tag: utils.Usage, - Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, + Type: utils.MetaComposed, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, Value: config.NewRSRParsersMustCompile("~*req.Usage", utils.InfieldSep), Mandatory: true}, }, ReplyFields: []*config.FCTemplate{ {Tag: "ResultCode", - Type: utils.META_CONSTANT, Path: utils.MetaRep + utils.NestingSep + "ResultCode", + Type: utils.MetaConstant, Path: utils.MetaRep + utils.NestingSep + "ResultCode", Value: config.NewRSRParsersMustCompile("2001", utils.InfieldSep)}, {Tag: "GrantedUnits", Type: utils.MetaVariable, Path: utils.MetaRep + utils.NestingSep + "Granted-Service-Unit.CC-Time", @@ -515,7 +515,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", + Type: utils.MetaConstant, Path: utils.MetaRep + utils.NestingSep + "ResultCode", Value: config.NewRSRParsersMustCompile("2001", utils.InfieldSep)}} for _, v := range reqProcessor.ReplyFields { v.ComputePath() diff --git a/agents/diamclient.go b/agents/diamclient.go index 9f2cf4580..ac5e495c0 100644 --- a/agents/diamclient.go +++ b/agents/diamclient.go @@ -56,7 +56,7 @@ func NewDiameterClient(addr, originHost, originRealm string, vendorId int, produ } for _, iAddr := range addrs { cfg.HostIPAddresses = append(cfg.HostIPAddresses, datatype.Address( - net.ParseIP(strings.Split(iAddr.String(), utils.HDR_VAL_SEP)[0]))) // address came in form x.y.z.t/24 + net.ParseIP(strings.Split(iAddr.String(), utils.HDRValSep)[0]))) // address came in form x.y.z.t/24 } } dSM := sm.New(cfg) diff --git a/agents/fsevent.go b/agents/fsevent.go index fb2c18b81..0aaa309cc 100644 --- a/agents/fsevent.go +++ b/agents/fsevent.go @@ -72,7 +72,7 @@ const ( VAR_CGR_CMPUTELCR = varPrefix + utils.CGR_COMPUTELCR FsConnID = "FsConnID" // used to share connID info in event for remote disconnects VarAnswerEpoch = "variable_answer_epoch" - VarCGRACD = varPrefix + utils.CGR_ACD + VarCGRACD = varPrefix + utils.CgrAcd VarCGROriginHost = varPrefix + utils.CGROriginHost ) @@ -302,7 +302,7 @@ func (fsev FSEvent) GetExtraFields() map[string]string { func (fsev FSEvent) ParseEventValue(rsrFld *config.RSRParser, timezone string) (parsed string, err error) { switch rsrFld.AttrName() { case utils.ToR: - return rsrFld.ParseValue(utils.VOICE) + return rsrFld.ParseValue(utils.MetaVoice) case utils.OriginID: return rsrFld.ParseValue(fsev.GetUUID()) case utils.OriginHost: @@ -333,9 +333,9 @@ func (fsev FSEvent) ParseEventValue(rsrFld *config.RSRParser, timezone string) ( case utils.PDD: PDD, _ := fsev.GetPdd(utils.MetaDefault) return rsrFld.ParseValue(strconv.FormatFloat(PDD.Seconds(), 'f', -1, 64)) - case utils.ROUTE: + case utils.Route: return rsrFld.ParseValue(fsev.GetRoute("")) - case utils.DISCONNECT_CAUSE: + case utils.DisconnectCause: return rsrFld.ParseValue(fsev.GetDisconnectCause("")) case utils.RunID: return rsrFld.ParseValue(utils.MetaDefault) @@ -370,7 +370,7 @@ func (fsev FSEvent) AsMapStringInterface(timezone string) map[string]interface{} for fld, val := range fsev.GetExtraFields() { mp[fld] = val } - mp[utils.ToR] = utils.VOICE + mp[utils.ToR] = utils.MetaVoice mp[utils.OriginID] = fsev.GetUUID() mp[utils.OriginHost] = fsev.GetOriginHost() mp[utils.Source] = "FS_" + fsev.GetName() @@ -385,9 +385,9 @@ func (fsev FSEvent) AsMapStringInterface(timezone string) map[string]interface{} mp[utils.Usage], _ = fsev.GetDuration(utils.MetaDefault) mp[utils.PDD], _ = fsev.GetPdd(utils.MetaDefault) mp[utils.ACD], _ = fsev.GetADC(utils.MetaDefault) - mp[utils.COST] = -1.0 - mp[utils.ROUTE] = fsev.GetRoute(utils.MetaDefault) - mp[utils.DISCONNECT_CAUSE] = fsev.GetDisconnectCause(utils.MetaDefault) + mp[utils.Cost] = -1.0 + mp[utils.Route] = fsev.GetRoute(utils.MetaDefault) + mp[utils.DisconnectCause] = fsev.GetDisconnectCause(utils.MetaDefault) return mp } @@ -474,7 +474,7 @@ func (fsev FSEvent) GetOptions() (mp map[string]interface{}) { if !has { return } - for _, opt := range strings.Split(opts, utils.FIELDS_SEP) { + for _, opt := range strings.Split(opts, utils.FieldsSep) { spltOpt := strings.SplitN(opt, utils.InInFieldSep, 2) if len(spltOpt) != 2 { continue diff --git a/agents/fsevent_test.go b/agents/fsevent_test.go index 4a264c5f7..4eb689f56 100644 --- a/agents/fsevent_test.go +++ b/agents/fsevent_test.go @@ -492,7 +492,7 @@ func TestParseEventValue(t *testing.T) { cfg := config.NewDefaultCGRConfig() config.SetCgrConfig(cfg) ev := NewFSEvent(hangupEv) - if tor, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.ToR), ""); tor != utils.VOICE { + if tor, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.ToR), ""); tor != utils.MetaVoice { t.Errorf("Unexpected tor parsed %q", tor) } if accid, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.OriginID), ""); accid != "e3133bf7-dcde-4daf-9663-9a79ffcef5ad" { @@ -536,13 +536,13 @@ func TestParseEventValue(t *testing.T) { if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.PDD), ""); parsed != "0.028" { t.Error("Unexpected result parsed", parsed) } - if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.ROUTE), ""); parsed != "supplier1" { + if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.Route), ""); parsed != "supplier1" { t.Error("Unexpected result parsed", parsed) } if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.RunID), ""); parsed != utils.MetaDefault { t.Error("Unexpected result parsed", parsed) } - if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.COST), ""); parsed != "-1" { + if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.Cost), ""); parsed != "-1" { t.Error("Unexpected result parsed", parsed) } if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+"Hangup-Cause"), ""); parsed != "NORMAL_CLEARING" { @@ -581,7 +581,7 @@ func TestFsEvAsMapStringInterface(t *testing.T) { setupTime, _ := utils.ParseTimeDetectLayout("1436280728", "") aTime, _ := utils.ParseTimeDetectLayout("1436280728", "") expectedMap := make(map[string]interface{}) - expectedMap[utils.ToR] = utils.VOICE + expectedMap[utils.ToR] = utils.MetaVoice expectedMap[utils.OriginID] = "e3133bf7-dcde-4daf-9663-9a79ffcef5ad" expectedMap[utils.OriginHost] = "10.0.3.15" expectedMap[utils.Source] = "FS_CHANNEL_HANGUP_COMPLETE" @@ -597,8 +597,8 @@ func TestFsEvAsMapStringInterface(t *testing.T) { expectedMap[utils.Cost] = -1.0 expectedMap[utils.PDD] = 28 * time.Millisecond expectedMap[utils.ACD] = 30 * time.Second - expectedMap[utils.DISCONNECT_CAUSE] = "NORMAL_CLEARING" - expectedMap[utils.ROUTE] = "supplier1" + expectedMap[utils.DisconnectCause] = "NORMAL_CLEARING" + expectedMap[utils.Route] = "supplier1" if storedMap := ev.AsMapStringInterface(""); !reflect.DeepEqual(expectedMap, storedMap) { t.Errorf("Expecting: %s, received: %s", utils.ToJSON(expectedMap), utils.ToJSON(storedMap)) } diff --git a/agents/httpagent_it_test.go b/agents/httpagent_it_test.go index d46e00c97..6aa0e5daf 100644 --- a/agents/httpagent_it_test.go +++ b/agents/httpagent_it_test.go @@ -222,7 +222,7 @@ func testHAitAuth1001(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: acnt, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: float64(maxDuration) * float64(time.Second), Balance: map[string]interface{}{ utils.ID: "TestDynamicDebitBalance", diff --git a/agents/kamevent.go b/agents/kamevent.go index 2ae93a81b..644d8d976 100644 --- a/agents/kamevent.go +++ b/agents/kamevent.go @@ -248,10 +248,10 @@ func (kev KamEvent) AsKamAuthReply(authArgs *sessions.V1AuthorizeArgs, } if authArgs.ProcessThresholds && authReply.ThresholdIDs != nil { - kar.Thresholds = strings.Join(*authReply.ThresholdIDs, utils.FIELDS_SEP) + kar.Thresholds = strings.Join(*authReply.ThresholdIDs, utils.FieldsSep) } if authArgs.ProcessStats && authReply.StatQueueIDs != nil { - kar.StatQueues = strings.Join(*authReply.StatQueueIDs, utils.FIELDS_SEP) + kar.StatQueues = strings.Join(*authReply.StatQueueIDs, utils.FieldsSep) } return } @@ -339,10 +339,10 @@ func (kev KamEvent) AsKamProcessMessageReply(procEvArgs *sessions.V1ProcessMessa } if procEvArgs.ProcessThresholds { - kar.Thresholds = strings.Join(*procEvReply.ThresholdIDs, utils.FIELDS_SEP) + kar.Thresholds = strings.Join(*procEvReply.ThresholdIDs, utils.FieldsSep) } if procEvArgs.ProcessStats { - kar.StatQueues = strings.Join(*procEvReply.StatQueueIDs, utils.FIELDS_SEP) + kar.StatQueues = strings.Join(*procEvReply.StatQueueIDs, utils.FieldsSep) } return } diff --git a/agents/libdiam.go b/agents/libdiam.go index 1d5d5dea8..fb1711815 100644 --- a/agents/libdiam.go +++ b/agents/libdiam.go @@ -490,7 +490,7 @@ func disectDiamListen(addrs string) (ipAddrs []net.IP) { if ipPort[0] == "" { return } - ips := strings.Split(ipPort[0], utils.HDR_VAL_SEP) + ips := strings.Split(ipPort[0], utils.HDRValSep) ipAddrs = make([]net.IP, len(ips)) for i, ip := range ips { ipAddrs[i] = net.ParseIP(ip) diff --git a/apier/v1/accountprofiles.go b/apier/v1/accountprofiles.go index 30fb23e4f..b6070a100 100644 --- a/apier/v1/accountprofiles.go +++ b/apier/v1/accountprofiles.go @@ -52,7 +52,7 @@ func (apierSv1 *APIerSv1) GetAccountProfileIDs(args *utils.PaginatorWithTenant, if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - prfx := utils.AccountProfilePrefix + tnt + utils.CONCATENATED_KEY_SEP + prfx := utils.AccountProfilePrefix + tnt + utils.ConcatenatedKeySep keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx) if err != nil { return err @@ -76,7 +76,7 @@ func (apierSv1 *APIerSv1) GetAccountProfileIDsCount(args *utils.TenantWithOpts, tnt = apierSv1.Config.GeneralCfg().DefaultTenant } var keys []string - prfx := utils.AccountProfilePrefix + tnt + utils.CONCATENATED_KEY_SEP + prfx := utils.AccountProfilePrefix + tnt + utils.ConcatenatedKeySep if keys, err = apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx); err != nil { return err } diff --git a/apier/v1/accountprofiles_it_test.go b/apier/v1/accountprofiles_it_test.go index 556a74109..6fa72c32b 100644 --- a/apier/v1/accountprofiles_it_test.go +++ b/apier/v1/accountprofiles_it_test.go @@ -138,7 +138,7 @@ func testAccountSGetAccountProfile(t *testing.T) { ID: "MonetaryBalance", FilterIDs: []string{}, Weight: 10, - Type: utils.MONETARY, + Type: utils.MetaMonetary, CostIncrements: []*utils.CostIncrement{ &utils.CostIncrement{ FilterIDs: []string{"fltr1", "fltr2"}, @@ -164,7 +164,7 @@ func testAccountSGetAccountProfile(t *testing.T) { ID: "VoiceBalance", FilterIDs: []string{}, Weight: 10, - Type: utils.VOICE, + Type: utils.MetaVoice, CostIncrements: []*utils.CostIncrement{}, CostAttributes: []string{}, UnitFactors: []*utils.UnitFactor{}, @@ -209,7 +209,7 @@ func testAccountSSettAccountProfile(t *testing.T) { ID: "MonetaryBalance", FilterIDs: []string{}, Weight: 10, - Type: utils.MONETARY, + Type: utils.MetaMonetary, CostIncrements: []*utils.APICostIncrement{ &utils.APICostIncrement{ FilterIDs: []string{"fltr1", "fltr2"}, @@ -235,7 +235,7 @@ func testAccountSSettAccountProfile(t *testing.T) { ID: "VoiceBalance", FilterIDs: []string{}, Weight: 10, - Type: utils.VOICE, + Type: utils.MetaVoice, Units: 3600000000000, }, }, diff --git a/apier/v1/accounts.go b/apier/v1/accounts.go index 22a8eb773..e14af67f6 100644 --- a/apier/v1/accounts.go +++ b/apier/v1/accounts.go @@ -72,7 +72,7 @@ func (apierSv1 *APIerSv1) GetAccountActionPlan(attrs *utils.TenantAccount, reply } } return accountATs, nil - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACTION_PLAN_PREFIX) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ActionPlanPrefix) if err != nil { return err } @@ -163,7 +163,7 @@ func (apierSv1 *APIerSv1) RemoveActionTiming(attrs *AttrRemoveActionTiming, repl } } return 0, nil - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACTION_PLAN_PREFIX) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ActionPlanPrefix) if err != nil { *reply = err.Error() return utils.NewErrServerError(err) @@ -264,7 +264,7 @@ func (apierSv1 *APIerSv1) SetAccount(attr *utils.AttrSetAccount, reply *string) return 0, err } return 0, nil - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACTION_PLAN_PREFIX) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ActionPlanPrefix) if err != nil { return 0, err } @@ -290,7 +290,7 @@ func (apierSv1 *APIerSv1) SetAccount(attr *utils.AttrSetAccount, reply *string) return 0, err } return 0, nil - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACCOUNT_PREFIX+accID) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.AccountPrefix+accID) if err != nil { return utils.NewErrServerError(err) } @@ -341,7 +341,7 @@ func (apierSv1 *APIerSv1) RemoveAccount(attr *utils.AttrRemoveAccount, reply *st } } return 0, nil - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACTION_PLAN_PREFIX) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ActionPlanPrefix) if err != nil { return 0, err } @@ -349,7 +349,7 @@ func (apierSv1 *APIerSv1) RemoveAccount(attr *utils.AttrRemoveAccount, reply *st return 0, err } return 0, nil - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACCOUNT_PREFIX+accID) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.AccountPrefix+accID) if err != nil { return utils.NewErrServerError(err) } @@ -375,7 +375,7 @@ func (apierSv1 *APIerSv1) GetAccounts(attr *utils.AttrGetAccounts, reply *[]inte var accountKeys []string var err error if len(attr.AccountIDs) == 0 { - if accountKeys, err = apierSv1.DataManager.DataDB().GetKeysForPrefix(utils.ACCOUNT_PREFIX + tnt); err != nil { + if accountKeys, err = apierSv1.DataManager.DataDB().GetKeysForPrefix(utils.AccountPrefix + tnt); err != nil { return err } } else { @@ -383,7 +383,7 @@ func (apierSv1 *APIerSv1) GetAccounts(attr *utils.AttrGetAccounts, reply *[]inte if len(acntID) == 0 { // Source of error returned from redis (key not found) continue } - accountKeys = append(accountKeys, utils.ACCOUNT_PREFIX+utils.ConcatenatedKey(tnt, acntID)) + accountKeys = append(accountKeys, utils.AccountPrefix+utils.ConcatenatedKey(tnt, acntID)) } } if len(accountKeys) == 0 { @@ -398,7 +398,7 @@ func (apierSv1 *APIerSv1) GetAccounts(attr *utils.AttrGetAccounts, reply *[]inte } retAccounts := make([]interface{}, 0) for _, acntKey := range limitedAccounts { - if acnt, err := apierSv1.DataManager.GetAccount(acntKey[len(utils.ACCOUNT_PREFIX):]); err != nil && err != utils.ErrNotFound { // Not found is not an error here + if acnt, err := apierSv1.DataManager.GetAccount(acntKey[len(utils.AccountPrefix):]); err != nil && err != utils.ErrNotFound { // Not found is not an error here return err } else if acnt != nil { if alNeg, has := attr.Filter[utils.AllowNegative]; has && alNeg != acnt.AllowNegative { @@ -730,7 +730,7 @@ func (apierSv1 *APIerSv1) GetAccountsCount(attr *utils.TenantWithOpts, reply *in tnt = apierSv1.Config.GeneralCfg().DefaultTenant } var accountKeys []string - if accountKeys, err = apierSv1.DataManager.DataDB().GetKeysForPrefix(utils.ACCOUNT_PREFIX + tnt); err != nil { + if accountKeys, err = apierSv1.DataManager.DataDB().GetKeysForPrefix(utils.AccountPrefix + tnt); err != nil { return } *reply = len(accountKeys) diff --git a/apier/v1/accounts_it_test.go b/apier/v1/accounts_it_test.go index 723b4ff19..5f1f61105 100644 --- a/apier/v1/accounts_it_test.go +++ b/apier/v1/accounts_it_test.go @@ -191,7 +191,7 @@ func testAccITAddVoiceBalance(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: accTenant, Account: accAcount, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 2 * float64(time.Second), Balance: map[string]interface{}{ utils.ID: accBallID, @@ -205,7 +205,9 @@ func testAccITAddVoiceBalance(t *testing.T) { } else if reply != utils.OK { t.Errorf("Received: %s", reply) } - t.Run("TestAddVoiceBalance", func(t *testing.T) { testAccountBalance(t, accAcount, accTenant, utils.VOICE, 2*float64(time.Second)) }) + t.Run("TestAddVoiceBalance", func(t *testing.T) { + testAccountBalance(t, accAcount, accTenant, utils.MetaVoice, 2*float64(time.Second)) + }) } func testAccITSetBalanceTimingIds(t *testing.T) { @@ -235,7 +237,7 @@ func testAccITSetBalanceTimingIds(t *testing.T) { args := &utils.AttrSetBalance{ Tenant: accTenant, Account: accAcount, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Balance: map[string]interface{}{ utils.ID: "testBalanceID", utils.TimingIDs: "Timing", @@ -268,7 +270,7 @@ func testAccITSetBalanceTimingIds(t *testing.T) { t.Fatal(err) } - for _, value := range acnt.BalanceMap[utils.VOICE] { + for _, value := range acnt.BalanceMap[utils.MetaVoice] { // check only where balance ID is testBalanceID (SetBalance function call was made with this Balance ID) if value.ID == "testBalanceID" { if !reflect.DeepEqual(eOut, value.Timings) { @@ -285,42 +287,42 @@ func testAccITDebitBalance(t *testing.T) { if err := accRPC.Call(utils.APIerSv1DebitBalance, &AttrAddBalance{ Tenant: accTenant, Account: accAcount, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 0, }, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) } - if has := testBalanceIfExists(t, accAcount, accTenant, utils.VOICE, accBallID); accExist != has { + if has := testBalanceIfExists(t, accAcount, accTenant, utils.MetaVoice, accBallID); accExist != has { var exstr string if !accExist { exstr = "not " } t.Fatalf("Balance with ID %s should %s exist", accBallID, exstr) } - t.Run("TestAddVoiceBalance", func(t *testing.T) { testAccountBalance(t, accAcount, accTenant, utils.VOICE, 0) }) + t.Run("TestAddVoiceBalance", func(t *testing.T) { testAccountBalance(t, accAcount, accTenant, utils.MetaVoice, 0) }) } func testAccITDebitBalanceWithoutTenant(t *testing.T) { var reply string if err := accRPC.Call(utils.APIerSv1DebitBalance, &AttrAddBalance{ Account: accAcount, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 0, }, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) } - if has := testBalanceIfExists(t, accAcount, accTenant, utils.VOICE, accBallID); accExist != has { + if has := testBalanceIfExists(t, accAcount, accTenant, utils.MetaVoice, accBallID); accExist != has { var exstr string if !accExist { exstr = "not " } t.Fatalf("Balance with ID %s should %s exist", accBallID, exstr) } - t.Run("TestAddVoiceBalance", func(t *testing.T) { testAccountBalance(t, accAcount, accTenant, utils.VOICE, 0) }) + t.Run("TestAddVoiceBalance", func(t *testing.T) { testAccountBalance(t, accAcount, accTenant, utils.MetaVoice, 0) }) } func testAccITAddBalance(t *testing.T) { @@ -328,7 +330,7 @@ func testAccITAddBalance(t *testing.T) { attrs := &AttrAddBalance{ Tenant: "cgrates.org", Account: "testAccAddBalance", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 1.5, Cdrlog: true, } @@ -352,7 +354,7 @@ func testAccITAddBalanceWithoutTenant(t *testing.T) { var reply string attrs := &AttrAddBalance{ Account: "testAccAddBalance", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 1.5, Cdrlog: true, } @@ -437,7 +439,7 @@ func testAccITSetBalanceWithExtraData(t *testing.T) { attrs := &utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "testAccITSetBalanceWithExtraData", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 1.5, Balance: map[string]interface{}{ utils.ID: "testAccITSetBalanceWithExtraData", @@ -472,7 +474,7 @@ func testAccITSetBalanceWithExtraData2(t *testing.T) { attrs := &utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "testAccITSetBalanceWithExtraData2", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 1.5, Balance: map[string]interface{}{ utils.ID: "testAccITSetBalanceWithExtraData2", @@ -516,7 +518,7 @@ func testAccITAddBalanceWithNegative(t *testing.T) { attrs := &AttrAddBalance{ Tenant: "cgrates.org", Account: "AddBalanceWithNegative", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: -3.5, } if err := accRPC.Call(utils.APIerSv1AddBalance, attrs, &reply); err != nil { @@ -533,14 +535,14 @@ func testAccITAddBalanceWithNegative(t *testing.T) { } if err := accRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != 3.5 { - t.Errorf("Unexpected balance received : %+v", acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != 3.5 { + t.Errorf("Unexpected balance received : %+v", acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } if err := accRPC.Call(utils.APIerSv1DebitBalance, &AttrAddBalance{ Tenant: "cgrates.org", Account: "AddBalanceWithNegative", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 2, }, &reply); err != nil { t.Error(err) @@ -550,14 +552,14 @@ func testAccITAddBalanceWithNegative(t *testing.T) { if err := accRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != 1.5 { - t.Errorf("Unexpected balance received : %+v", acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != 1.5 { + t.Errorf("Unexpected balance received : %+v", acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } if err := accRPC.Call(utils.APIerSv1DebitBalance, &AttrAddBalance{ Tenant: "cgrates.org", Account: "AddBalanceWithNegative", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: -1, }, &reply); err != nil { t.Error(err) @@ -567,8 +569,8 @@ func testAccITAddBalanceWithNegative(t *testing.T) { if err := accRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != 0.5 { - t.Errorf("Unexpected balance received : %+v", acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != 0.5 { + t.Errorf("Unexpected balance received : %+v", acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } @@ -705,7 +707,7 @@ func testAccITSetBalanceWithVaslue0(t *testing.T) { t.Fatal(err) } - for _, value := range acnt.BalanceMap[utils.MONETARY] { + for _, value := range acnt.BalanceMap[utils.MetaMonetary] { // check only where balance ID is testBalanceID (SetBalance function call was made with this Balance ID) if value.ID == "testAccSetBalance" { if value.GetValue() != 1.5 { @@ -746,7 +748,7 @@ func testAccITSetBalanceWithVaslueInMap(t *testing.T) { t.Fatal(err) } - for _, value := range acnt.BalanceMap[utils.MONETARY] { + for _, value := range acnt.BalanceMap[utils.MetaMonetary] { // check only where balance ID is testBalanceID (SetBalance function call was made with this Balance ID) if value.ID == "testAccSetBalance" { if value.GetValue() != 2 { @@ -765,7 +767,7 @@ func testAccITAddBalanceWithValue0(t *testing.T) { attrs := &AttrAddBalance{ Tenant: "cgrates.org", Account: "testAccAddBalance", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, } if err := accRPC.Call(utils.APIerSv1AddBalance, attrs, &reply); err != nil { t.Error("Got error on APIerSv1.AddBalance: ", err.Error()) @@ -782,7 +784,7 @@ func testAccITAddBalanceWithValue0(t *testing.T) { t.Fatal(err) } - for _, value := range acnt.BalanceMap[utils.MONETARY] { + for _, value := range acnt.BalanceMap[utils.MetaMonetary] { // check only where balance ID is testBalanceID (SetBalance function call was made with this Balance ID) if value.ID == "testAccSetBalance" { if value.GetValue() != 1.5 { @@ -798,7 +800,7 @@ func testAccITAddBalanceWithValueInMap(t *testing.T) { attrs := &AttrAddBalance{ Tenant: "cgrates.org", Account: "testAccAddBalance", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Balance: map[string]interface{}{ utils.Value: 1.5, }, @@ -818,7 +820,7 @@ func testAccITAddBalanceWithValueInMap(t *testing.T) { t.Fatal(err) } - for _, value := range acnt.BalanceMap[utils.MONETARY] { + for _, value := range acnt.BalanceMap[utils.MetaMonetary] { // check only where balance ID is testBalanceID (SetBalance function call was made with this Balance ID) if value.ID == "testAccSetBalance" { if value.GetValue() != 3 { @@ -846,7 +848,7 @@ func testAccITAddBalanceWithDestinations(t *testing.T) { args := &utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "testAccITAddBalanceWithDestinations", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Balance: map[string]interface{}{ utils.ID: "testAccITAddBalanceWithDestinations", utils.DestinationIDs: "DST_1002;!DST_1001;!DST_1003", @@ -869,7 +871,7 @@ func testAccITAddBalanceWithDestinations(t *testing.T) { t.Fatal(err) } - for _, value := range acnt.BalanceMap[utils.MONETARY] { + for _, value := range acnt.BalanceMap[utils.MetaMonetary] { // check only where balance ID is testBalanceID (SetBalance function call was made with this Balance ID) if value.ID == "testAccITAddBalanceWithDestinations" { if value.GetValue() != 2 { @@ -934,7 +936,7 @@ func testAccITAccountWithTriggers(t *testing.T) { args := &utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "testAccITAccountWithTriggers", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Balance: map[string]interface{}{ utils.ID: "testAccITAccountWithTriggers", utils.Weight: 10, @@ -950,7 +952,7 @@ func testAccITAccountWithTriggers(t *testing.T) { // add an action that contains topup and reset_triggers topupAction := &utils.AttrSetActions{ActionsId: "TOPUP_WITH_RESET_TRIGGER", Actions: []*utils.TPAction{ {Identifier: utils.TOPUP_RESET, BalanceId: "testAccITAccountWithTriggers", - BalanceType: utils.MONETARY, Units: "5", Weight: 10.0}, + BalanceType: utils.MetaMonetary, Units: "5", Weight: 10.0}, {Identifier: utils.RESET_TRIGGERS}, }} @@ -963,7 +965,7 @@ func testAccITAccountWithTriggers(t *testing.T) { // add an action to be executed when the trigger is triggered actTrigger := &utils.AttrSetActions{ActionsId: "ACT_TRIGGER", Actions: []*utils.TPAction{ {Identifier: utils.TOPUP, BalanceId: "CustomBanalce", - BalanceType: utils.MONETARY, Units: "5", Weight: 10.0}, + BalanceType: utils.MetaMonetary, Units: "5", Weight: 10.0}, }} if err := accRPC.Call(utils.APIerSv2SetActions, actTrigger, &reply); err != nil { @@ -972,7 +974,7 @@ func testAccITAccountWithTriggers(t *testing.T) { t.Errorf("Calling APIerSv2.SetActions received: %s", reply) } - attrsAddTrigger := &AttrAddActionTrigger{Tenant: "cgrates.org", Account: "testAccITAccountWithTriggers", BalanceType: utils.MONETARY, + attrsAddTrigger := &AttrAddActionTrigger{Tenant: "cgrates.org", Account: "testAccITAccountWithTriggers", BalanceType: utils.MetaMonetary, ThresholdType: "*min_balance", ThresholdValue: 2, Weight: 10, ActionsId: "ACT_TRIGGER"} if err := accRPC.Call(utils.APIerSv1AddTriggeredAction, attrsAddTrigger, &reply); err != nil { t.Error("Got error on APIerSv1.AddTriggeredAction: ", err.Error()) @@ -989,7 +991,7 @@ func testAccITAccountWithTriggers(t *testing.T) { if err := accRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Fatal(err) } else { - for _, value := range acnt.BalanceMap[utils.MONETARY] { + for _, value := range acnt.BalanceMap[utils.MetaMonetary] { if value.ID == "testAccITAccountWithTriggers" { if value.GetValue() != 5 { t.Errorf("Expecting %+v, received: %+v", 5, value.GetValue()) @@ -1013,7 +1015,7 @@ func testAccITAccountWithTriggers(t *testing.T) { if err := accRPC.Call(utils.APIerSv1DebitBalance, &AttrAddBalance{ Tenant: "cgrates.org", Account: "testAccITAccountWithTriggers", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 3, }, &reply); err != nil { t.Error(err) @@ -1024,7 +1026,7 @@ func testAccITAccountWithTriggers(t *testing.T) { if err := accRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Fatal(err) } else { - for _, value := range acnt.BalanceMap[utils.MONETARY] { + for _, value := range acnt.BalanceMap[utils.MetaMonetary] { if value.ID == "testAccITAccountWithTriggers" { if value.GetValue() != 2 { t.Errorf("Expecting %+v, received: %+v", 2, value.GetValue()) @@ -1057,7 +1059,7 @@ func testAccITAccountWithTriggers(t *testing.T) { if err := accRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Fatal(err) } else { - for _, value := range acnt.BalanceMap[utils.MONETARY] { + for _, value := range acnt.BalanceMap[utils.MetaMonetary] { if value.ID == "testAccITAccountWithTriggers" { if value.GetValue() != 5 { t.Errorf("Expecting %+v, received: %+v", 5, value.GetValue()) @@ -1084,7 +1086,7 @@ func testAccITAccountMonthlyEstimated(t *testing.T) { // add an action that contains topup topupAction := &utils.AttrSetActions{ActionsId: "TOPUP_ACTION", Actions: []*utils.TPAction{ {Identifier: utils.TOPUP_RESET, BalanceId: "testAccITAccountMonthlyEstimated", - BalanceType: utils.MONETARY, Units: "5", Weight: 10.0}, + BalanceType: utils.MetaMonetary, Units: "5", Weight: 10.0}, }} if err := accRPC.Call(utils.APIerSv2SetActions, topupAction, &reply); err != nil { @@ -1151,7 +1153,7 @@ func testAccITMultipleBalance(t *testing.T) { Account: "testAccITMultipleBalance", Balances: []*utils.AttrBalance{ { - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 2 * float64(time.Second), Balance: map[string]interface{}{ utils.ID: "Balance1", @@ -1159,7 +1161,7 @@ func testAccITMultipleBalance(t *testing.T) { }, }, { - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 10 * float64(time.Second), Balance: map[string]interface{}{ utils.ID: "Balance2", @@ -1167,7 +1169,7 @@ func testAccITMultipleBalance(t *testing.T) { }, }, { - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 10, Balance: map[string]interface{}{ utils.ID: "MonBalance", @@ -1189,14 +1191,14 @@ func testAccITMultipleBalance(t *testing.T) { } if err := accRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap[utils.VOICE]) != 2 { - t.Errorf("Expected %+v, received: %+v", 2, len(acnt.BalanceMap[utils.VOICE])) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != float64(12*time.Second) { - t.Errorf("Expected %+v, received: %+v", float64(12*time.Second), acnt.BalanceMap[utils.VOICE].GetTotalValue()) - } else if len(acnt.BalanceMap[utils.MONETARY]) != 1 { - t.Errorf("Expected %+v, received: %+v", 1, len(acnt.BalanceMap[utils.MONETARY])) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != 10.0 { - t.Errorf("Expected %+v, received: %+v", 10.0, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if len(acnt.BalanceMap[utils.MetaVoice]) != 2 { + t.Errorf("Expected %+v, received: %+v", 2, len(acnt.BalanceMap[utils.MetaVoice])) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != float64(12*time.Second) { + t.Errorf("Expected %+v, received: %+v", float64(12*time.Second), acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) + } else if len(acnt.BalanceMap[utils.MetaMonetary]) != 1 { + t.Errorf("Expected %+v, received: %+v", 1, len(acnt.BalanceMap[utils.MetaMonetary])) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != 10.0 { + t.Errorf("Expected %+v, received: %+v", 10.0, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } @@ -1206,7 +1208,7 @@ func testAccITMultipleBalanceWithoutTenant(t *testing.T) { Account: "testAccITMultipleBalance", Balances: []*utils.AttrBalance{ { - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 2 * float64(time.Second), Balance: map[string]interface{}{ utils.ID: "Balance1", @@ -1214,7 +1216,7 @@ func testAccITMultipleBalanceWithoutTenant(t *testing.T) { }, }, { - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 10 * float64(time.Second), Balance: map[string]interface{}{ utils.ID: "Balance2", @@ -1222,7 +1224,7 @@ func testAccITMultipleBalanceWithoutTenant(t *testing.T) { }, }, { - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 10, Balance: map[string]interface{}{ utils.ID: "MonBalance", @@ -1243,21 +1245,21 @@ func testAccITMultipleBalanceWithoutTenant(t *testing.T) { } if err := accRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap[utils.VOICE]) != 2 { - t.Errorf("Expected %+v, received: %+v", 2, len(acnt.BalanceMap[utils.VOICE])) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != float64(12*time.Second) { - t.Errorf("Expected %+v, received: %+v", float64(12*time.Second), acnt.BalanceMap[utils.VOICE].GetTotalValue()) - } else if len(acnt.BalanceMap[utils.MONETARY]) != 1 { - t.Errorf("Expected %+v, received: %+v", 1, len(acnt.BalanceMap[utils.MONETARY])) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != 10.0 { - t.Errorf("Expected %+v, received: %+v", 10.0, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if len(acnt.BalanceMap[utils.MetaVoice]) != 2 { + t.Errorf("Expected %+v, received: %+v", 2, len(acnt.BalanceMap[utils.MetaVoice])) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != float64(12*time.Second) { + t.Errorf("Expected %+v, received: %+v", float64(12*time.Second), acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) + } else if len(acnt.BalanceMap[utils.MetaMonetary]) != 1 { + t.Errorf("Expected %+v, received: %+v", 1, len(acnt.BalanceMap[utils.MetaMonetary])) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != 10.0 { + t.Errorf("Expected %+v, received: %+v", 10.0, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } func testAccITRemoveBalances(t *testing.T) { var reply string if err := accRPC.Call(utils.APIerSv1RemoveBalances, - &utils.AttrSetBalance{Account: "testAccITMultipleBalance", BalanceType: utils.VOICE}, + &utils.AttrSetBalance{Account: "testAccITMultipleBalance", BalanceType: utils.MetaVoice}, &reply); err != nil { t.Error(err) } else if reply != utils.OK { @@ -1265,7 +1267,7 @@ func testAccITRemoveBalances(t *testing.T) { } attrs := &AttrAddBalance{ Account: "testAccITMultipleBalance", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 1.5, Cdrlog: true, } @@ -1281,7 +1283,7 @@ func testAccITAddVoiceBalanceWithDestinations(t *testing.T) { args := &utils.AttrSetBalance{ Tenant: "cgrates.com", Account: "testAccITAddVoiceBalanceWithDestinations", - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Balance: map[string]interface{}{ utils.ID: "testAccITAddVoiceBalanceWithDestinations", utils.DestinationIDs: "DST_1002", @@ -1305,7 +1307,7 @@ func testAccITAddVoiceBalanceWithDestinations(t *testing.T) { t.Fatal(err) } - for _, value := range acnt.BalanceMap[utils.VOICE] { + for _, value := range acnt.BalanceMap[utils.MetaVoice] { // check only where balance ID is testBalanceID (SetBalance function call was made with this Balance ID) if value.ID == "testAccITAddVoiceBalanceWithDestinations" { if value.GetValue() != 3.6e+12 { diff --git a/apier/v1/accounts_test.go b/apier/v1/accounts_test.go index b25a762f4..5fdc2d553 100644 --- a/apier/v1/accounts_test.go +++ b/apier/v1/accounts_test.go @@ -45,21 +45,21 @@ func TestSetAccounts(t *testing.T) { iscTenant := "itsyscom.com" b10 := &engine.Balance{Value: 10, Weight: 10} cgrAcnt1 := &engine.Account{ID: utils.ConcatenatedKey(cgrTenant, "account1"), - BalanceMap: map[string]engine.Balances{utils.MONETARY + utils.META_OUT: {b10}}} + BalanceMap: map[string]engine.Balances{utils.MetaMonetary + utils.MetaOut: {b10}}} cgrAcnt2 := &engine.Account{ID: utils.ConcatenatedKey(cgrTenant, "account2"), - BalanceMap: map[string]engine.Balances{utils.MONETARY + utils.META_OUT: {b10}}} + BalanceMap: map[string]engine.Balances{utils.MetaMonetary + utils.MetaOut: {b10}}} cgrAcnt3 := &engine.Account{ID: utils.ConcatenatedKey(cgrTenant, "account3"), - BalanceMap: map[string]engine.Balances{utils.MONETARY + utils.META_OUT: {b10}}} + BalanceMap: map[string]engine.Balances{utils.MetaMonetary + utils.MetaOut: {b10}}} iscAcnt1 := &engine.Account{ID: utils.ConcatenatedKey(iscTenant, "account1"), - BalanceMap: map[string]engine.Balances{utils.MONETARY + utils.META_OUT: {b10}}} + BalanceMap: map[string]engine.Balances{utils.MetaMonetary + utils.MetaOut: {b10}}} iscAcnt2 := &engine.Account{ID: utils.ConcatenatedKey(iscTenant, "account2"), - BalanceMap: map[string]engine.Balances{utils.MONETARY + utils.META_OUT: {b10}}} + BalanceMap: map[string]engine.Balances{utils.MetaMonetary + utils.MetaOut: {b10}}} for _, account := range []*engine.Account{cgrAcnt1, cgrAcnt2, cgrAcnt3, iscAcnt1, iscAcnt2} { if err := apierAcntsAcntStorage.SetAccountDrv(account); err != nil { t.Error(err) } } - //apierAcntsAcntStorage.CacheRatingPrefixes(utils.ACTION_PREFIX) + //apierAcntsAcntStorage.CacheRatingPrefixes(utils.ActionPrefix) } /* This was a comment diff --git a/apier/v1/actions.go b/apier/v1/actions.go index a8a3d1c72..7bb875755 100644 --- a/apier/v1/actions.go +++ b/apier/v1/actions.go @@ -53,7 +53,7 @@ func (apierSv1 *APIerSv1) GetActionProfileIDs(args *utils.PaginatorWithTenant, a if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - prfx := utils.ActionProfilePrefix + tnt + utils.CONCATENATED_KEY_SEP + prfx := utils.ActionProfilePrefix + tnt + utils.ConcatenatedKeySep keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx) if err != nil { return err @@ -77,7 +77,7 @@ func (apierSv1 *APIerSv1) GetActionProfileIDsCount(args *utils.TenantWithOpts, r tnt = apierSv1.Config.GeneralCfg().DefaultTenant } var keys []string - prfx := utils.ActionProfilePrefix + tnt + utils.CONCATENATED_KEY_SEP + prfx := utils.ActionProfilePrefix + tnt + utils.ConcatenatedKeySep if keys, err = apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx); err != nil { return err } diff --git a/apier/v1/apier.go b/apier/v1/apier.go index 0e76afea6..3a61e9810 100644 --- a/apier/v1/apier.go +++ b/apier/v1/apier.go @@ -139,7 +139,7 @@ func (apierSv1 *APIerSv1) GetReverseDestination(prefix *string, reply *[]string) // ComputeReverseDestinations will rebuild complete reverse destinations data func (apierSv1 *APIerSv1) ComputeReverseDestinations(ignr *string, reply *string) (err error) { - if err = apierSv1.DataManager.RebuildReverseForPrefix(utils.REVERSE_DESTINATION_PREFIX); err != nil { + if err = apierSv1.DataManager.RebuildReverseForPrefix(utils.ReverseDestinationPrefix); err != nil { return } *reply = utils.OK @@ -461,7 +461,7 @@ func (apierSv1 *APIerSv1) SetRatingProfile(attrs *utils.AttrSetRatingProfile, re if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - keyID := utils.ConcatenatedKey(utils.META_OUT, + keyID := utils.ConcatenatedKey(utils.MetaOut, tnt, attrs.Category, attrs.Subject) var rpfl *engine.RatingProfile if !attrs.Overwrite { @@ -478,7 +478,7 @@ func (apierSv1 *APIerSv1) SetRatingProfile(attrs *utils.AttrSetRatingProfile, re if err != nil { return fmt.Errorf(fmt.Sprintf("%s:Cannot parse activation time from %v", utils.ErrServerError.Error(), ra.ActivationTime)) } - if exists, err := apierSv1.DataManager.HasData(utils.RATING_PLAN_PREFIX, + if exists, err := apierSv1.DataManager.HasData(utils.RatingPlanPrefix, ra.RatingPlanId, ""); err != nil { return utils.NewErrServerError(err) } else if !exists { @@ -515,7 +515,7 @@ func (apierSv1 *APIerSv1) GetRatingProfileIDs(args *utils.PaginatorWithTenant, r if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - prfx := utils.RATING_PROFILE_PREFIX + "*out:" + tnt + utils.CONCATENATED_KEY_SEP + prfx := utils.RatingProfilePrefix + "*out:" + tnt + utils.ConcatenatedKeySep keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx) if err != nil { return err @@ -593,7 +593,7 @@ func (apierSv1 *APIerSv1) SetActions(attrs *V1AttrSetActions, reply *string) (er } } if !attrs.Overwrite { - if exists, err := apierSv1.DataManager.HasData(utils.ACTION_PREFIX, attrs.ActionsId, ""); err != nil { + if exists, err := apierSv1.DataManager.HasData(utils.ActionPrefix, attrs.ActionsId, ""); err != nil { return utils.NewErrServerError(err) } else if exists { return utils.ErrExists @@ -774,7 +774,7 @@ func (apierSv1 *APIerSv1) SetActionPlan(attrs *AttrSetActionPlan, reply *string) Id: attrs.Id, } for _, apiAtm := range attrs.ActionPlan { - if exists, err := apierSv1.DataManager.HasData(utils.ACTION_PREFIX, apiAtm.ActionsId, ""); err != nil { + if exists, err := apierSv1.DataManager.HasData(utils.ActionPrefix, apiAtm.ActionsId, ""); err != nil { return 0, utils.NewErrServerError(err) } else if !exists { return 0, fmt.Errorf("%s:%s", utils.ErrBrokenReference.Error(), apiAtm.ActionsId) @@ -814,7 +814,7 @@ func (apierSv1 *APIerSv1) SetActionPlan(attrs *AttrSetActionPlan, reply *string) } } return 0, nil - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACTION_PLAN_PREFIX) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ActionPlanPrefix) if err != nil { return err } @@ -1000,7 +1000,7 @@ func (apierSv1 *APIerSv1) RemoveActionPlan(attr *AttrGetActionPlan, reply *strin } } return 0, nil - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACTION_PLAN_PREFIX); err != nil { + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ActionPlanPrefix); err != nil { return err } *reply = utils.OK @@ -1224,15 +1224,15 @@ type AttrRemoveRatingProfile struct { } func (arrp *AttrRemoveRatingProfile) GetId() (result string) { - result = utils.META_OUT + utils.CONCATENATED_KEY_SEP + result = utils.MetaOut + utils.ConcatenatedKeySep if arrp.Tenant != "" && arrp.Tenant != utils.MetaAny { - result += arrp.Tenant + utils.CONCATENATED_KEY_SEP + result += arrp.Tenant + utils.ConcatenatedKeySep } else { return } if arrp.Category != "" && arrp.Category != utils.MetaAny { - result += arrp.Category + utils.CONCATENATED_KEY_SEP + result += arrp.Category + utils.ConcatenatedKeySep } else { return } @@ -1312,13 +1312,13 @@ func (apierSv1 *APIerSv1) RemoveActions(attr *AttrRemoveActions, reply *string) // The check could lead to very long execution time. So we decided to leave it at the user's risck.' /* stringMap := utils.NewStringMap(attr.ActionIDs...) - keys, err := apiv1.DataManager.DataDB().GetKeysForPrefix(utils.ACTION_TRIGGER_PREFIX, true) + keys, err := apiv1.DataManager.DataDB().GetKeysForPrefix(utils.ActionTriggerPrefix, true) if err != nil { *reply = err.Error() return err } for _, key := range keys { - getAttrs, err := apiv1.DataManager.DataDB().GetActionTriggers(key[len(utils.ACTION_TRIGGER_PREFIX):]) + getAttrs, err := apiv1.DataManager.DataDB().GetActionTriggers(key[len(utils.ActionTriggerPrefix):]) if err != nil { *reply = err.Error() return err @@ -1472,8 +1472,8 @@ func (apierSv1 *APIerSv1) ComputeActionPlanIndexes(_ string, reply *string) (err // GetActionPlanIDs returns list of ActionPlan IDs registered for a tenant func (apierSv1 *APIerSv1) GetActionPlanIDs(args *utils.PaginatorWithTenant, attrPrfIDs *[]string) error { - prfx := utils.ACTION_PLAN_PREFIX - keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(utils.ACTION_PLAN_PREFIX) + prfx := utils.ActionPlanPrefix + keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(utils.ActionPlanPrefix) if err != nil { return err } @@ -1490,8 +1490,8 @@ func (apierSv1 *APIerSv1) GetActionPlanIDs(args *utils.PaginatorWithTenant, attr // GetRatingPlanIDs returns list of RatingPlan IDs registered for a tenant func (apierSv1 *APIerSv1) GetRatingPlanIDs(args *utils.PaginatorWithTenant, attrPrfIDs *[]string) error { - prfx := utils.RATING_PLAN_PREFIX - keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(utils.RATING_PLAN_PREFIX) + prfx := utils.RatingPlanPrefix + keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(utils.RatingPlanPrefix) if err != nil { return err } diff --git a/apier/v1/apier2_it_test.go b/apier/v1/apier2_it_test.go index 8c189ce62..2c5602329 100644 --- a/apier/v1/apier2_it_test.go +++ b/apier/v1/apier2_it_test.go @@ -159,7 +159,7 @@ func testAPIerVerifyAttributesAfterLoad(t *testing.T) { { FilterIDs: []string{}, Path: utils.MetaReq + utils.NestingSep + "Password", - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep), }, }, @@ -656,7 +656,7 @@ func testAPIerLoadFromFolderAccountAction(t *testing.T) { } if err := apierRPC.Call(utils.APIerSv2GetAccount, attrAcnt, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); rply != 10.0 { + } else if rply := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); rply != 10.0 { t.Errorf("Expecting: %v, received: %v", 10.0, rply) } diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index e1781590d..f8080c88b 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -220,7 +220,7 @@ func testApierRpcConn(t *testing.T) { // Test here TPTiming APIs func testApierTPTiming(t *testing.T) { // ALWAYS,*any,*any,*any,*any,00:00:00 - tmAlways := &utils.ApierTPTiming{TPid: utils.TEST_SQL, + tmAlways := &utils.ApierTPTiming{TPid: utils.TestSQL, ID: "ALWAYS", Years: utils.MetaAny, Months: utils.MetaAny, @@ -232,7 +232,7 @@ func testApierTPTiming(t *testing.T) { *tmAlways2 = *tmAlways tmAlways2.ID = "ALWAYS2" tmAsap := &utils.ApierTPTiming{ - TPid: utils.TEST_SQL, + TPid: utils.TestSQL, ID: "ASAP", Years: utils.MetaAny, Months: utils.MetaAny, @@ -289,9 +289,9 @@ func testApierTPTiming(t *testing.T) { // Test here TPTiming APIs func testApierTPDestination(t *testing.T) { var reply string - dstDe := &utils.TPDestination{TPid: utils.TEST_SQL, ID: "GERMANY", Prefixes: []string{"+49"}} - dstDeMobile := &utils.TPDestination{TPid: utils.TEST_SQL, ID: "GERMANY_MOBILE", Prefixes: []string{"+4915", "+4916", "+4917"}} - dstFs := &utils.TPDestination{TPid: utils.TEST_SQL, ID: "FS_USERS", Prefixes: []string{"10"}} + dstDe := &utils.TPDestination{TPid: utils.TestSQL, ID: "GERMANY", Prefixes: []string{"+49"}} + dstDeMobile := &utils.TPDestination{TPid: utils.TestSQL, ID: "GERMANY_MOBILE", Prefixes: []string{"+4915", "+4916", "+4917"}} + dstFs := &utils.TPDestination{TPid: utils.TestSQL, ID: "FS_USERS", Prefixes: []string{"10"}} dstDe2 := new(utils.TPDestination) *dstDe2 = *dstDe // Data which we use for remove, still keeping the sample data to check proper loading dstDe2.ID = "GERMANY2" @@ -343,7 +343,7 @@ func testApierTPDestination(t *testing.T) { // Test here TPRateRALs APIs func testApierTPRate(t *testing.T) { var reply string - rt := &utils.TPRateRALs{TPid: utils.TEST_SQL, ID: "RT_FS_USERS", RateSlots: []*utils.RateSlot{ + rt := &utils.TPRateRALs{TPid: utils.TestSQL, ID: "RT_FS_USERS", RateSlots: []*utils.RateSlot{ {ConnectFee: 0, Rate: 0, RateUnit: "60s", RateIncrement: "60s", GroupIntervalStart: "0s"}, }} rt2 := new(utils.TPRateRALs) @@ -394,15 +394,15 @@ func testApierTPRate(t *testing.T) { // Test here TPDestinationRate APIs func testApierTPDestinationRate(t *testing.T) { var reply string - dr := &utils.TPDestinationRate{TPid: utils.TEST_SQL, ID: "DR_FREESWITCH_USERS", DestinationRates: []*utils.DestinationRate{ + dr := &utils.TPDestinationRate{TPid: utils.TestSQL, ID: "DR_FREESWITCH_USERS", DestinationRates: []*utils.DestinationRate{ {DestinationId: "FS_USERS", RateId: "RT_FS_USERS", RoundingMethod: "*up", RoundingDecimals: 2}, }} - drDe := &utils.TPDestinationRate{TPid: utils.TEST_SQL, ID: "DR_FREESWITCH_USERS", DestinationRates: []*utils.DestinationRate{ + drDe := &utils.TPDestinationRate{TPid: utils.TestSQL, ID: "DR_FREESWITCH_USERS", DestinationRates: []*utils.DestinationRate{ {DestinationId: "GERMANY_MOBILE", RateId: "RT_FS_USERS", RoundingMethod: "*up", RoundingDecimals: 2}, }} dr2 := new(utils.TPDestinationRate) *dr2 = *dr - dr2.ID = utils.TEST_SQL + dr2.ID = utils.TestSQL for _, d := range []*utils.TPDestinationRate{dr, dr2, drDe} { if err := rater.Call(utils.APIerSv1SetTPDestinationRate, d, &reply); err != nil { t.Error("Got error on APIerSv1.SetTPDestinationRate: ", err.Error()) @@ -448,12 +448,12 @@ func testApierTPDestinationRate(t *testing.T) { // Test here TPRatingPlan APIs func testApierTPRatingPlan(t *testing.T) { var reply string - rp := &utils.TPRatingPlan{TPid: utils.TEST_SQL, ID: "RETAIL1", RatingPlanBindings: []*utils.TPRatingPlanBinding{ + rp := &utils.TPRatingPlan{TPid: utils.TestSQL, ID: "RETAIL1", RatingPlanBindings: []*utils.TPRatingPlanBinding{ {DestinationRatesId: "DR_FREESWITCH_USERS", TimingId: "ALWAYS", Weight: 10}, }} rpTst := new(utils.TPRatingPlan) *rpTst = *rp - rpTst.ID = utils.TEST_SQL + rpTst.ID = utils.TestSQL for _, rpl := range []*utils.TPRatingPlan{rp, rpTst} { if err := rater.Call(utils.APIerSv1SetTPRatingPlan, rpl, &reply); err != nil { t.Error("Got error on APIerSv1.SetTPRatingPlan: ", err.Error()) @@ -500,8 +500,8 @@ func testApierTPRatingPlan(t *testing.T) { func testApierTPRatingProfile(t *testing.T) { var reply string rpf := &utils.TPRatingProfile{ - TPid: utils.TEST_SQL, - LoadId: utils.TEST_SQL, + TPid: utils.TestSQL, + LoadId: utils.TestSQL, Tenant: "cgrates.org", Category: "call", Subject: utils.MetaAny, @@ -513,7 +513,7 @@ func testApierTPRatingProfile(t *testing.T) { } rpfTst := new(utils.TPRatingProfile) *rpfTst = *rpf - rpfTst.Subject = utils.TEST_SQL + rpfTst.Subject = utils.TestSQL for _, rp := range []*utils.TPRatingProfile{rpf, rpfTst} { if err := rater.Call(utils.APIerSv1SetTPRatingProfile, rp, &reply); err != nil { t.Error("Got error on APIerSv1.SetTPRatingProfile: ", err.Error()) @@ -548,7 +548,7 @@ func testApierTPRatingProfile(t *testing.T) { } // Test getLoadIds var rplyRpIds []string - expectedRpIds := []string{utils.TEST_SQL} + expectedRpIds := []string{utils.TestSQL} if err := rater.Call(utils.APIerSv1GetTPRatingProfileLoadIds, &utils.AttrTPRatingProfileIds{TPid: rpf.TPid}, &rplyRpIds); err != nil { t.Error("Calling APIerSv1.GetTPRatingProfileLoadIds, got error: ", err.Error()) } else if !reflect.DeepEqual(expectedRpIds, rplyRpIds) { @@ -558,21 +558,21 @@ func testApierTPRatingProfile(t *testing.T) { func testApierTPActions(t *testing.T) { var reply string - act := &utils.TPActions{TPid: utils.TEST_SQL, + act := &utils.TPActions{TPid: utils.TestSQL, ID: "PREPAID_10", Actions: []*utils.TPAction{ - {Identifier: "*topup_reset", BalanceType: utils.MONETARY, + {Identifier: "*topup_reset", BalanceType: utils.MetaMonetary, Units: "10", ExpiryTime: "*unlimited", DestinationIds: utils.MetaAny, BalanceWeight: "10", Weight: 10}, }} - actWarn := &utils.TPActions{TPid: utils.TEST_SQL, ID: "WARN_VIA_HTTP", Actions: []*utils.TPAction{ + actWarn := &utils.TPActions{TPid: utils.TestSQL, ID: "WARN_VIA_HTTP", Actions: []*utils.TPAction{ {Identifier: "*http_post", ExtraParameters: "http://localhost:8000", Weight: 10}, }} - actLog := &utils.TPActions{TPid: utils.TEST_SQL, ID: "LOG_BALANCE", Actions: []*utils.TPAction{ + actLog := &utils.TPActions{TPid: utils.TestSQL, ID: "LOG_BALANCE", Actions: []*utils.TPAction{ {Identifier: "*log", Weight: 10}, }} actTst := new(utils.TPActions) *actTst = *act - actTst.ID = utils.TEST_SQL + actTst.ID = utils.TestSQL for _, ac := range []*utils.TPActions{act, actWarn, actTst, actLog} { if err := rater.Call(utils.APIerSv1SetTPActions, ac, &reply); err != nil { t.Error("Got error on APIerSv1.SetTPActions: ", err.Error()) @@ -620,12 +620,12 @@ func testApierTPActions(t *testing.T) { func testApierTPActionPlan(t *testing.T) { var reply string - at := &utils.TPActionPlan{TPid: utils.TEST_SQL, ID: "PREPAID_10", ActionPlan: []*utils.TPActionTiming{ + at := &utils.TPActionPlan{TPid: utils.TestSQL, ID: "PREPAID_10", ActionPlan: []*utils.TPActionTiming{ {ActionsId: "PREPAID_10", TimingId: "ASAP", Weight: 10}, }} atTst := new(utils.TPActionPlan) *atTst = *at - atTst.ID = utils.TEST_SQL + atTst.ID = utils.TestSQL for _, act := range []*utils.TPActionPlan{at, atTst} { if err := rater.Call(utils.APIerSv1SetTPActionPlan, act, &reply); err != nil { t.Error("Got error on APIerSv1.SetTPActionPlan: ", err.Error()) @@ -671,12 +671,12 @@ func testApierTPActionPlan(t *testing.T) { func testApierTPActionTriggers(t *testing.T) { var reply string at := &utils.TPActionTriggers{ - TPid: utils.TEST_SQL, + TPid: utils.TestSQL, ID: "STANDARD_TRIGGERS", ActionTriggers: []*utils.TPActionTrigger{{ Id: "STANDARD_TRIGGERS", UniqueID: "MYFIRSTTRIGGER", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, ThresholdType: "*min_balance", ThresholdValue: 2, ActionsId: "LOG_BALANCE", @@ -685,8 +685,8 @@ func testApierTPActionTriggers(t *testing.T) { } atTst := new(utils.TPActionTriggers) *atTst = *at - atTst.ID = utils.TEST_SQL - atTst.ActionTriggers[0].Id = utils.TEST_SQL + atTst.ID = utils.TestSQL + atTst.ActionTriggers[0].Id = utils.TestSQL for _, act := range []*utils.TPActionTriggers{at, atTst} { if err := rater.Call(utils.APIerSv1SetTPActionTriggers, act, &reply); err != nil { t.Error("Got error on APIerSv1.SetTPActionTriggers: ", err.Error()) @@ -732,19 +732,19 @@ func testApierTPActionTriggers(t *testing.T) { // Test here TPAccountActions APIs func testApierTPAccountActions(t *testing.T) { var reply string - aa1 := &utils.TPAccountActions{TPid: utils.TEST_SQL, LoadId: utils.TEST_SQL, Tenant: "cgrates.org", + aa1 := &utils.TPAccountActions{TPid: utils.TestSQL, LoadId: utils.TestSQL, Tenant: "cgrates.org", Account: "1001", ActionPlanId: "PREPAID_10", ActionTriggersId: "STANDARD_TRIGGERS"} - aa2 := &utils.TPAccountActions{TPid: utils.TEST_SQL, LoadId: utils.TEST_SQL, Tenant: "cgrates.org", + aa2 := &utils.TPAccountActions{TPid: utils.TestSQL, LoadId: utils.TestSQL, Tenant: "cgrates.org", Account: "1002", ActionPlanId: "PREPAID_10", ActionTriggersId: "STANDARD_TRIGGERS"} - aa3 := &utils.TPAccountActions{TPid: utils.TEST_SQL, LoadId: utils.TEST_SQL, Tenant: "cgrates.org", + aa3 := &utils.TPAccountActions{TPid: utils.TestSQL, LoadId: utils.TestSQL, Tenant: "cgrates.org", Account: "1003", ActionPlanId: "PREPAID_10", ActionTriggersId: "STANDARD_TRIGGERS"} - aa4 := &utils.TPAccountActions{TPid: utils.TEST_SQL, LoadId: utils.TEST_SQL, Tenant: "cgrates.org", + aa4 := &utils.TPAccountActions{TPid: utils.TestSQL, LoadId: utils.TestSQL, Tenant: "cgrates.org", Account: "1004", ActionPlanId: "PREPAID_10", ActionTriggersId: "STANDARD_TRIGGERS"} - aa5 := &utils.TPAccountActions{TPid: utils.TEST_SQL, LoadId: utils.TEST_SQL, Tenant: "cgrates.org", + aa5 := &utils.TPAccountActions{TPid: utils.TestSQL, LoadId: utils.TestSQL, Tenant: "cgrates.org", Account: "1005", ActionPlanId: "PREPAID_10", ActionTriggersId: "STANDARD_TRIGGERS"} aaTst := new(utils.TPAccountActions) *aaTst = *aa1 - aaTst.Account = utils.TEST_SQL + aaTst.Account = utils.TestSQL for _, aact := range []*utils.TPAccountActions{aa1, aa2, aa3, aa4, aa5, aaTst} { if err := rater.Call(utils.APIerSv1SetTPAccountActions, aact, &reply); err != nil { t.Error("Got error on APIerSv1.SetTPAccountActions: ", err.Error()) @@ -779,7 +779,7 @@ func testApierTPAccountActions(t *testing.T) { } // Test getLoadIds var rplyRpIds []string - expectedRpIds := []string{utils.TEST_SQL} + expectedRpIds := []string{utils.TestSQL} if err := rater.Call(utils.APIerSv1GetTPAccountActionLoadIds, &AttrGetTPAccountActionIds{TPid: aaTst.TPid}, &rplyRpIds); err != nil { t.Error("Calling APIerSv1.GetTPAccountActionLoadIds, got error: ", err.Error()) } else if !reflect.DeepEqual(expectedRpIds, rplyRpIds) { @@ -790,7 +790,7 @@ func testApierTPAccountActions(t *testing.T) { // Test here LoadRatingPlan func testApierLoadRatingPlan(t *testing.T) { var reply string - if err := rater.Call(utils.APIerSv1LoadRatingPlan, &AttrLoadRatingPlan{TPid: utils.TEST_SQL, RatingPlanId: "RETAIL1"}, &reply); err != nil { + if err := rater.Call(utils.APIerSv1LoadRatingPlan, &AttrLoadRatingPlan{TPid: utils.TestSQL, RatingPlanId: "RETAIL1"}, &reply); err != nil { t.Error("Got error on APIerSv1.LoadRatingPlan: ", err.Error()) } else if reply != utils.OK { t.Error("Calling APIerSv1.LoadRatingPlan got reply: ", reply) @@ -801,7 +801,7 @@ func testApierLoadRatingPlan(t *testing.T) { func testApierLoadRatingProfile(t *testing.T) { var reply string rpf := &utils.TPRatingProfile{ - TPid: utils.TEST_SQL, LoadId: utils.TEST_SQL, + TPid: utils.TestSQL, LoadId: utils.TestSQL, Tenant: "cgrates.org", Category: "call", Subject: "*any"} if err := rater.Call(utils.APIerSv1LoadRatingProfile, &rpf, &reply); err != nil { t.Error("Got error on APIerSv1.LoadRatingProfile: ", err.Error()) @@ -813,7 +813,7 @@ func testApierLoadRatingProfile(t *testing.T) { func testApierLoadRatingProfileWithoutTenant(t *testing.T) { var reply string rpf := &utils.TPRatingProfile{ - TPid: utils.TEST_SQL, LoadId: utils.TEST_SQL, + TPid: utils.TestSQL, LoadId: utils.TestSQL, Category: "call", Subject: "*any"} if err := rater.Call(utils.APIerSv1LoadRatingProfile, &rpf, &reply); err != nil { t.Error("Got error on APIerSv1.LoadRatingProfile: ", err.Error()) @@ -833,7 +833,7 @@ func testApierLoadAccountActions(t *testing.T) { t.Errorf("Calling CacheSv1.GetCacheStats expected: %+v,\n received: %+v", utils.ToJSON(expectedStats), utils.ToJSON(rcvStats)) } var reply string - aa1 := &utils.TPAccountActions{TPid: utils.TEST_SQL, LoadId: utils.TEST_SQL, Tenant: "cgrates.org", Account: "1001"} + aa1 := &utils.TPAccountActions{TPid: utils.TestSQL, LoadId: utils.TestSQL, Tenant: "cgrates.org", Account: "1001"} if err := rater.Call(utils.APIerSv1LoadAccountActions, aa1, &reply); err != nil { t.Error("Got error on APIerSv1.LoadAccountActions: ", err.Error()) } else if reply != utils.OK { @@ -1149,43 +1149,43 @@ func testApierRemoveRatingPlan(t *testing.T) { // Test here AddBalance func testApierAddBalance(t *testing.T) { var reply string - attrs := &AttrAddBalance{Tenant: "cgrates.org", Account: "1001", BalanceType: utils.MONETARY, Value: 1.5} + attrs := &AttrAddBalance{Tenant: "cgrates.org", Account: "1001", BalanceType: utils.MetaMonetary, Value: 1.5} if err := rater.Call(utils.APIerSv1AddBalance, attrs, &reply); err != nil { t.Error("Got error on APIerSv1.AddBalance: ", err.Error()) } else if reply != utils.OK { t.Errorf("Calling APIerSv1.AddBalance received: %s", reply) } - attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan", BalanceType: utils.MONETARY, Value: 1.5} + attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan", BalanceType: utils.MetaMonetary, Value: 1.5} if err := rater.Call(utils.APIerSv1AddBalance, attrs, &reply); err != nil { t.Error("Got error on APIerSv1.AddBalance: ", err.Error()) } else if reply != utils.OK { t.Errorf("Calling APIerSv1.AddBalance received: %s", reply) } - attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan2", BalanceType: utils.MONETARY, Value: 1.5} + attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan2", BalanceType: utils.MetaMonetary, Value: 1.5} if err := rater.Call(utils.APIerSv1AddBalance, attrs, &reply); err != nil { t.Error("Got error on APIerSv1.AddBalance: ", err.Error()) } else if reply != utils.OK { t.Errorf("Calling APIerSv1.AddBalance received: %s", reply) } - attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan3", BalanceType: utils.MONETARY, Value: 1.5} + attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan3", BalanceType: utils.MetaMonetary, Value: 1.5} if err := rater.Call(utils.APIerSv1AddBalance, attrs, &reply); err != nil { t.Error("Got error on APIerSv1.AddBalance: ", err.Error()) } else if reply != utils.OK { t.Errorf("Calling APIerSv1.AddBalance received: %s", reply) } - attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan3", BalanceType: utils.MONETARY, Value: 2.1} + attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan3", BalanceType: utils.MetaMonetary, Value: 2.1} if err := rater.Call(utils.APIerSv1AddBalance, attrs, &reply); err != nil { t.Error("Got error on APIerSv1.AddBalance: ", err.Error()) } else if reply != utils.OK { t.Errorf("Calling APIerSv1.AddBalance received: %s", reply) } - attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan6", BalanceType: utils.MONETARY, Value: 2.1} + attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan6", BalanceType: utils.MetaMonetary, Value: 2.1} if err := rater.Call(utils.APIerSv1AddBalance, attrs, &reply); err != nil { t.Error("Got error on APIerSv1.AddBalance: ", err.Error()) } else if reply != utils.OK { t.Errorf("Calling APIerSv1.AddBalance received: %s", reply) } - attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan6", BalanceType: utils.MONETARY, Value: 1, Overwrite: true} + attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan6", BalanceType: utils.MetaMonetary, Value: 1, Overwrite: true} if err := rater.Call(utils.APIerSv1AddBalance, attrs, &reply); err != nil { t.Error("Got error on APIerSv1.AddBalance: ", err.Error()) } else if reply != utils.OK { @@ -1230,7 +1230,7 @@ func testApierExecuteActionWithoutTenant(t *testing.T) { } func testApierSetActions(t *testing.T) { - act1 := &V1TPAction{Identifier: utils.TOPUP_RESET, BalanceType: utils.MONETARY, Units: 75.0, ExpiryTime: utils.UNLIMITED, Weight: 20.0} + act1 := &V1TPAction{Identifier: utils.TOPUP_RESET, BalanceType: utils.MetaMonetary, Units: 75.0, ExpiryTime: utils.UNLIMITED, Weight: 20.0} attrs1 := &V1AttrSetActions{ActionsId: "ACTS_1", Actions: []*V1TPAction{act1}} reply1 := utils.EmptyString if err := rater.Call(utils.APIerSv1SetActions, &attrs1, &reply1); err != nil { @@ -1246,7 +1246,7 @@ func testApierSetActions(t *testing.T) { func testApierGetActions(t *testing.T) { expectActs := []*utils.TPAction{ - {Identifier: utils.TOPUP_RESET, BalanceType: utils.MONETARY, + {Identifier: utils.TOPUP_RESET, BalanceType: utils.MetaMonetary, Units: "75", BalanceWeight: "0", BalanceBlocker: "false", BalanceDisabled: "false", ExpiryTime: utils.UNLIMITED, Weight: 20.0}} @@ -1276,14 +1276,14 @@ func testApierSetActionPlan(t *testing.T) { // Test here AddTriggeredAction func testApierAddTriggeredAction(t *testing.T) { var reply string - attrs := &AttrAddBalance{Tenant: "cgrates.org", Account: "dan32", BalanceType: utils.MONETARY, Value: 1.5} + attrs := &AttrAddBalance{Tenant: "cgrates.org", Account: "dan32", BalanceType: utils.MetaMonetary, Value: 1.5} if err := rater.Call(utils.APIerSv1AddBalance, attrs, &reply); err != nil { t.Error("Got error on APIerSv1.AddBalance: ", err.Error()) } else if reply != utils.OK { t.Errorf("Calling APIerSv1.AddBalance received: %s", reply) } // Add balance to a previously known account - attrsAddTrigger := &AttrAddActionTrigger{Tenant: "cgrates.org", Account: "dan32", BalanceType: utils.MONETARY, + attrsAddTrigger := &AttrAddActionTrigger{Tenant: "cgrates.org", Account: "dan32", BalanceType: utils.MetaMonetary, ThresholdType: "*min_balance", ThresholdValue: 2, BalanceDestinationIds: utils.MetaAny, Weight: 10, ActionsId: "WARN_VIA_HTTP"} if err := rater.Call(utils.APIerSv1AddTriggeredAction, attrsAddTrigger, &reply); err != nil { t.Error("Got error on APIerSv1.AddTriggeredAction: ", err.Error()) @@ -1516,33 +1516,33 @@ func testApierGetAccount(t *testing.T) { attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001"} if err := rater.Call(utils.APIerSv2GetAccount, attrs, &reply); err != nil { t.Error("Got error on APIerSv1.GetAccount: ", err.Error()) - } else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 11.5 { // We expect 11.5 since we have added in the previous test 1.5 - t.Errorf("Calling APIerSv1.GetBalance expected: 11.5, received: %f", reply.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if reply.BalanceMap[utils.MetaMonetary].GetTotalValue() != 11.5 { // We expect 11.5 since we have added in the previous test 1.5 + t.Errorf("Calling APIerSv1.GetBalance expected: 11.5, received: %f", reply.BalanceMap[utils.MetaMonetary].GetTotalValue()) } attrs = &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "dan"} if err := rater.Call(utils.APIerSv2GetAccount, attrs, &reply); err != nil { t.Error("Got error on APIerSv1.GetAccount: ", err.Error()) - } else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 1.5 { - t.Errorf("Calling APIerSv1.GetAccount expected: 1.5, received: %f", reply.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if reply.BalanceMap[utils.MetaMonetary].GetTotalValue() != 1.5 { + t.Errorf("Calling APIerSv1.GetAccount expected: 1.5, received: %f", reply.BalanceMap[utils.MetaMonetary].GetTotalValue()) } // The one we have topped up though executeAction attrs = &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "dan2"} if err := rater.Call(utils.APIerSv2GetAccount, attrs, &reply); err != nil { t.Error("Got error on APIerSv1.GetAccount: ", err.Error()) - } else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 11.5 { - t.Errorf("Calling APIerSv1.GetAccount expected: 10, received: %f", reply.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if reply.BalanceMap[utils.MetaMonetary].GetTotalValue() != 11.5 { + t.Errorf("Calling APIerSv1.GetAccount expected: 10, received: %f", reply.BalanceMap[utils.MetaMonetary].GetTotalValue()) } attrs = &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "dan3"} if err := rater.Call(utils.APIerSv2GetAccount, attrs, &reply); err != nil { t.Error("Got error on APIerSv1.GetAccount: ", err.Error()) - } else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 3.6 { - t.Errorf("Calling APIerSv1.GetAccount expected: 3.6, received: %f", reply.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if reply.BalanceMap[utils.MetaMonetary].GetTotalValue() != 3.6 { + t.Errorf("Calling APIerSv1.GetAccount expected: 3.6, received: %f", reply.BalanceMap[utils.MetaMonetary].GetTotalValue()) } attrs = &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "dan6"} if err := rater.Call(utils.APIerSv2GetAccount, attrs, &reply); err != nil { t.Error("Got error on APIerSv1.GetAccount: ", err.Error()) - } else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 1 { - t.Errorf("Calling APIerSv1.GetAccount expected: 1, received: %f", reply.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if reply.BalanceMap[utils.MetaMonetary].GetTotalValue() != 1 { + t.Errorf("Calling APIerSv1.GetAccount expected: 1, received: %f", reply.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } @@ -1555,7 +1555,7 @@ func testApierTriggersExecute(t *testing.T) { } else if reply != utils.OK { t.Errorf("Calling APIerSv1.SetAccount received: %s", reply) } - attrAddBlnc := &AttrAddBalance{Tenant: "cgrates.org", Account: "1008", BalanceType: utils.MONETARY, Value: 2} + attrAddBlnc := &AttrAddBalance{Tenant: "cgrates.org", Account: "1008", BalanceType: utils.MetaMonetary, Value: 2} if err := rater.Call(utils.APIerSv1AddBalance, attrAddBlnc, &reply); err != nil { t.Error("Got error on APIerSv1.AddBalance: ", err.Error()) } else if reply != utils.OK { @@ -1705,8 +1705,8 @@ func testApierGetAccountAfterLoad(t *testing.T) { attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001"} if err := rater.Call(utils.APIerSv2GetAccount, attrs, &reply); err != nil { t.Error("Got error on APIerSv1.GetAccount: ", err.Error()) - } else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 13 { - t.Errorf("Calling APIerSv1.GetBalance expected: 13, received: %v \n\n for:%s", reply.BalanceMap[utils.MONETARY].GetTotalValue(), utils.ToJSON(reply)) + } else if reply.BalanceMap[utils.MetaMonetary].GetTotalValue() != 13 { + t.Errorf("Calling APIerSv1.GetBalance expected: 13, received: %v \n\n for:%s", reply.BalanceMap[utils.MetaMonetary].GetTotalValue(), utils.ToJSON(reply)) } } @@ -1767,7 +1767,7 @@ func testApierCdrServer(t *testing.T) { utils.SetupTime: []string{"2013-11-07T08:42:23Z"}, utils.AnswerTime: []string{"2013-11-07T08:42:26Z"}, utils.Usage: []string{"10"}, "field_extr1": []string{"val_extr1"}, "fieldextr2": []string{"valextr2"}} for _, cdrForm := range []url.Values{cdrForm1, cdrForm2} { - cdrForm.Set(utils.Source, utils.TEST_SQL) + cdrForm.Set(utils.Source, utils.TestSQL) if _, err := httpClient.PostForm(fmt.Sprintf("http://%s/cdr_http", "127.0.0.1:2080"), cdrForm); err != nil { t.Error(err.Error()) } @@ -1788,7 +1788,7 @@ func testApierITGetCdrs(t *testing.T) { func testApierITProcessCdr(t *testing.T) { var reply string cdr := &engine.CDRWithOpts{ - CDR: &engine.CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", + CDR: &engine.CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: "test", RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), RunID: utils.MetaDefault, @@ -1827,7 +1827,7 @@ func testApierGetCallCostLog(t *testing.T) { CDR: &engine.CDR{ CGRID: "Cdr1", OrderID: 123, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "OriginCDR1", OriginHost: "192.168.1.1", Source: "test", @@ -2069,16 +2069,16 @@ func testApierStartStopServiceStatus(t *testing.T) { func testApierSetRatingProfileWithoutTenant(t *testing.T) { var reply string rpa := &utils.TPRatingActivation{ActivationTime: "2012-01-01T00:00:00Z", RatingPlanId: "RETAIL1", FallbackSubjects: "dan4"} - rpf := &utils.AttrSetRatingProfile{Category: utils.CALL, Subject: "dan3", RatingPlanActivations: []*utils.TPRatingActivation{rpa}} + rpf := &utils.AttrSetRatingProfile{Category: utils.Call, Subject: "dan3", RatingPlanActivations: []*utils.TPRatingActivation{rpa}} if err := rater.Call(utils.APIerSv1SetRatingProfile, &rpf, &reply); err != nil { t.Error("Got error on APIerSv1.SetRatingProfile: ", err.Error()) } else if reply != utils.OK { t.Error("Calling APIerSv1.SetRatingProfile got reply: ", reply) } - expectedID := utils.ConcatenatedKey(utils.META_OUT, "cgrates.org", utils.CALL, "dan3") + expectedID := utils.ConcatenatedKey(utils.MetaOut, "cgrates.org", utils.Call, "dan3") var result *engine.RatingProfile if err := rater.Call(utils.APIerSv1GetRatingProfile, - &utils.AttrGetRatingProfile{Category: utils.CALL, Subject: "dan3"}, + &utils.AttrGetRatingProfile{Category: utils.Call, Subject: "dan3"}, &result); err != nil { t.Error(err) } else if !reflect.DeepEqual(expectedID, result.Id) { @@ -2089,7 +2089,7 @@ func testApierSetRatingProfileWithoutTenant(t *testing.T) { func testApierRemoveRatingProfilesWithoutTenant(t *testing.T) { var reply string if err := rater.Call(utils.APIerSv1RemoveRatingProfile, &AttrRemoveRatingProfile{ - Category: utils.CALL, + Category: utils.Call, Subject: "dan3", }, &reply); err != nil { t.Error(err) @@ -2098,7 +2098,7 @@ func testApierRemoveRatingProfilesWithoutTenant(t *testing.T) { } var result *engine.RatingProfile if err := rater.Call(utils.APIerSv1GetRatingProfile, - &utils.AttrGetRatingProfile{Category: utils.CALL, Subject: "dan3"}, + &utils.AttrGetRatingProfile{Category: utils.Call, Subject: "dan3"}, &result); err == nil || err.Error() != utils.ErrNotFound.Error() { t.Error(err) } diff --git a/apier/v1/attributes.go b/apier/v1/attributes.go index 85f0e8bbb..e817a3c43 100644 --- a/apier/v1/attributes.go +++ b/apier/v1/attributes.go @@ -51,7 +51,7 @@ func (apierSv1 *APIerSv1) GetAttributeProfileIDs(args *utils.PaginatorWithTenant if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - prfx := utils.AttributeProfilePrefix + tnt + utils.CONCATENATED_KEY_SEP + prfx := utils.AttributeProfilePrefix + tnt + utils.ConcatenatedKeySep keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx) if err != nil { return err @@ -75,7 +75,7 @@ func (apierSv1 *APIerSv1) GetAttributeProfileIDsCount(args *utils.TenantWithOpts tnt = apierSv1.Config.GeneralCfg().DefaultTenant } var keys []string - prfx := utils.AttributeProfilePrefix + tnt + utils.CONCATENATED_KEY_SEP + prfx := utils.AttributeProfilePrefix + tnt + utils.ConcatenatedKeySep if keys, err = apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx); err != nil { return err } diff --git a/apier/v1/attributes_it_test.go b/apier/v1/attributes_it_test.go index c237fd4d8..e7a8fa5cc 100644 --- a/apier/v1/attributes_it_test.go +++ b/apier/v1/attributes_it_test.go @@ -195,13 +195,13 @@ func testAttributeSGetAttributeForEvent(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, FilterIDs: []string{}, }, { Path: utils.MetaReq + utils.NestingSep + utils.Subject, Value: config.NewRSRParsersMustCompile("1001", utils.InfieldSep), - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, FilterIDs: []string{}, }, }, diff --git a/apier/v1/auth.go b/apier/v1/auth.go index 9f15c108a..7d0c2f3c2 100644 --- a/apier/v1/auth.go +++ b/apier/v1/auth.go @@ -32,7 +32,7 @@ func (apierSv1 *APIerSv1) GetMaxUsage(usageRecord *engine.UsageRecordWithOpts, m return utils.NewErrNotConnected(utils.RALService) } if usageRecord.ToR == utils.EmptyString { - usageRecord.ToR = utils.VOICE + usageRecord.ToR = utils.MetaVoice } if usageRecord.RequestType == utils.EmptyString { usageRecord.RequestType = apierSv1.Config.GeneralCfg().DefaultReqType diff --git a/apier/v1/cdrs_it_test.go b/apier/v1/cdrs_it_test.go index 519243ce1..06c68b7aa 100644 --- a/apier/v1/cdrs_it_test.go +++ b/apier/v1/cdrs_it_test.go @@ -132,7 +132,7 @@ func testV1CDRsProcessEventWithRefund(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: acntAttrs.Tenant, Account: acntAttrs.Account, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 120000000000, Balance: map[string]interface{}{ utils.ID: "BALANCE1", @@ -148,7 +148,7 @@ func testV1CDRsProcessEventWithRefund(t *testing.T) { attrSetBalance = utils.AttrSetBalance{ Tenant: acntAttrs.Tenant, Account: acntAttrs.Account, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 180000000000, Balance: map[string]interface{}{ utils.ID: "BALANCE2", @@ -163,7 +163,7 @@ func testV1CDRsProcessEventWithRefund(t *testing.T) { expectedVoice := 300000000000.0 if err := cdrsRpc.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.VOICE].GetTotalValue(); rply != expectedVoice { + } else if rply := acnt.BalanceMap[utils.MetaVoice].GetTotalValue(); rply != expectedVoice { t.Errorf("Expecting: %v, received: %v", expectedVoice, rply) } argsEv := &engine.ArgV1ProcessEvent{ @@ -200,9 +200,9 @@ func testV1CDRsProcessEventWithRefund(t *testing.T) { } if err := cdrsRpc.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if blc1 := acnt.GetBalanceWithID(utils.VOICE, "BALANCE1"); blc1.Value != 0 { + } else if blc1 := acnt.GetBalanceWithID(utils.MetaVoice, "BALANCE1"); blc1.Value != 0 { t.Errorf("Balance1 is: %s", utils.ToIJSON(blc1)) - } else if blc2 := acnt.GetBalanceWithID(utils.VOICE, "BALANCE2"); blc2.Value != 120000000000 { + } else if blc2 := acnt.GetBalanceWithID(utils.MetaVoice, "BALANCE2"); blc2.Value != 120000000000 { t.Errorf("Balance2 is: %s", utils.ToIJSON(blc2)) } // without re-rate we should be denied @@ -211,9 +211,9 @@ func testV1CDRsProcessEventWithRefund(t *testing.T) { } if err := cdrsRpc.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if blc1 := acnt.GetBalanceWithID(utils.VOICE, "BALANCE1"); blc1.Value != 0 { + } else if blc1 := acnt.GetBalanceWithID(utils.MetaVoice, "BALANCE1"); blc1.Value != 0 { t.Errorf("Balance1 is: %s", utils.ToIJSON(blc1)) - } else if blc2 := acnt.GetBalanceWithID(utils.VOICE, "BALANCE2"); blc2.Value != 120000000000 { + } else if blc2 := acnt.GetBalanceWithID(utils.MetaVoice, "BALANCE2"); blc2.Value != 120000000000 { t.Errorf("Balance2 is: %s", utils.ToIJSON(blc2)) } argsEv = &engine.ArgV1ProcessEvent{ @@ -240,9 +240,9 @@ func testV1CDRsProcessEventWithRefund(t *testing.T) { } if err := cdrsRpc.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if blc1 := acnt.GetBalanceWithID(utils.VOICE, "BALANCE1"); blc1.Value != 120000000000 { // refund is done after debit + } else if blc1 := acnt.GetBalanceWithID(utils.MetaVoice, "BALANCE1"); blc1.Value != 120000000000 { // refund is done after debit t.Errorf("Balance1 is: %s", utils.ToIJSON(blc1)) - } else if blc2 := acnt.GetBalanceWithID(utils.VOICE, "BALANCE2"); blc2.Value != 120000000000 { + } else if blc2 := acnt.GetBalanceWithID(utils.MetaVoice, "BALANCE2"); blc2.Value != 120000000000 { t.Errorf("Balance2 is: %s", utils.ToIJSON(blc2)) } return @@ -257,7 +257,7 @@ func testV1CDRsRefundOutOfSessionCost(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: acntAttrs.Tenant, Account: acntAttrs.Account, - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 123, Balance: map[string]interface{}{ utils.ID: utils.MetaDefault, @@ -274,10 +274,10 @@ func testV1CDRsRefundOutOfSessionCost(t *testing.T) { exp := 123.0 if err := cdrsRpc.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); rply != exp { + } else if rply := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); rply != exp { t.Errorf("Expecting: %v, received: %v", exp, rply) } - balanceUuid := acnt.BalanceMap[utils.MONETARY][0].Uuid + balanceUuid := acnt.BalanceMap[utils.MetaMonetary][0].Uuid attr := &engine.AttrCDRSStoreSMCost{ Cost: &engine.SMCost{ @@ -318,7 +318,7 @@ func testV1CDRsRefundOutOfSessionCost(t *testing.T) { BalanceSummaries: []*engine.BalanceSummary{ { UUID: balanceUuid, - Type: utils.MONETARY, + Type: utils.MetaMonetary, Value: 50, }, }, @@ -394,7 +394,7 @@ func testV1CDRsRefundOutOfSessionCost(t *testing.T) { exp = 124.0454 if err := cdrsRpc.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); rply != exp { + } else if rply := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); rply != exp { t.Errorf("Expecting: %v, received: %v", exp, rply) } } @@ -408,7 +408,7 @@ func testV1CDRsRefundCDR(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: acntAttrs.Tenant, Account: acntAttrs.Account, - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 123, Balance: map[string]interface{}{ utils.ID: utils.MetaDefault, @@ -425,11 +425,11 @@ func testV1CDRsRefundCDR(t *testing.T) { exp := 123.0 if err := cdrsRpc.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); rply != exp { + } else if rply := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); rply != exp { t.Errorf("Expecting: %v, received: %v", exp, rply) } - balanceUuid := acnt.BalanceMap[utils.MONETARY][0].Uuid + balanceUuid := acnt.BalanceMap[utils.MetaMonetary][0].Uuid argsEv := &engine.ArgV1ProcessEvent{ Flags: []string{utils.MetaRefund}, @@ -476,7 +476,7 @@ func testV1CDRsRefundCDR(t *testing.T) { BalanceSummaries: []*engine.BalanceSummary{ { UUID: balanceUuid, - Type: utils.MONETARY, + Type: utils.MetaMonetary, Value: 50, }, }, @@ -529,7 +529,7 @@ func testV1CDRsRefundCDR(t *testing.T) { exp = 125.3 if err := cdrsRpc.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); rply != exp { + } else if rply := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); rply != exp { t.Errorf("Expecting: %v, received: %v", exp, rply) } } @@ -549,7 +549,7 @@ func testV1CDRsAddBalanceForSMS(t *testing.T) { attrs := &AttrAddBalance{ Tenant: "cgrates.org", Account: "testV1CDRsAddBalanceForSMS", - BalanceType: utils.SMS, + BalanceType: utils.MetaSMS, Value: 1000, } if err := cdrsRpc.Call(utils.APIerSv1AddBalance, attrs, &reply); err != nil { @@ -561,7 +561,7 @@ func testV1CDRsAddBalanceForSMS(t *testing.T) { attrs = &AttrAddBalance{ Tenant: "cgrates.org", Account: "testV1CDRsAddBalanceForSMS", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 10, } if err := cdrsRpc.Call(utils.APIerSv1AddBalance, attrs, &reply); err != nil { @@ -578,14 +578,14 @@ func testV1CDRsAddBalanceForSMS(t *testing.T) { if err := cdrsRpc.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap[utils.SMS]) != 1 { - t.Errorf("Expecting: %v, received: %v", 1, len(acnt.BalanceMap[utils.SMS])) - } else if acnt.BalanceMap[utils.SMS].GetTotalValue() != 1000 { - t.Errorf("Expecting: %v, received: %v", 1000, acnt.BalanceMap[utils.SMS].GetTotalValue()) - } else if len(acnt.BalanceMap[utils.MONETARY]) != 1 { - t.Errorf("Expecting: %v, received: %v", 1, len(acnt.BalanceMap[utils.MONETARY])) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != 10 { - t.Errorf("Expecting: %v, received: %v", 10, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if len(acnt.BalanceMap[utils.MetaSMS]) != 1 { + t.Errorf("Expecting: %v, received: %v", 1, len(acnt.BalanceMap[utils.MetaSMS])) + } else if acnt.BalanceMap[utils.MetaSMS].GetTotalValue() != 1000 { + t.Errorf("Expecting: %v, received: %v", 1000, acnt.BalanceMap[utils.MetaSMS].GetTotalValue()) + } else if len(acnt.BalanceMap[utils.MetaMonetary]) != 1 { + t.Errorf("Expecting: %v, received: %v", 1, len(acnt.BalanceMap[utils.MetaMonetary])) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != 10 { + t.Errorf("Expecting: %v, received: %v", 10, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } argsEv := &engine.ArgV1ProcessEvent{ @@ -595,7 +595,7 @@ func testV1CDRsAddBalanceForSMS(t *testing.T) { Tenant: "cgrates.org", Event: map[string]interface{}{ utils.CGRID: "asdfas", - utils.ToR: utils.SMS, + utils.ToR: utils.MetaSMS, utils.Category: "sms", utils.RunID: utils.MetaDefault, utils.OriginID: "testV1CDRsAddBalanceForSMS", @@ -616,14 +616,14 @@ func testV1CDRsAddBalanceForSMS(t *testing.T) { if err := cdrsRpc.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap[utils.SMS]) != 1 { - t.Errorf("Expecting: %v, received: %v", 1, len(acnt.BalanceMap[utils.SMS])) - } else if acnt.BalanceMap[utils.SMS].GetTotalValue() != 999 { - t.Errorf("Expecting: %v, received: %v", 999, acnt.BalanceMap[utils.SMS].GetTotalValue()) - } else if len(acnt.BalanceMap[utils.MONETARY]) != 1 { - t.Errorf("Expecting: %v, received: %v", 1, len(acnt.BalanceMap[utils.MONETARY])) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != 10 { - t.Errorf("Expecting: %v, received: %v", 10, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if len(acnt.BalanceMap[utils.MetaSMS]) != 1 { + t.Errorf("Expecting: %v, received: %v", 1, len(acnt.BalanceMap[utils.MetaSMS])) + } else if acnt.BalanceMap[utils.MetaSMS].GetTotalValue() != 999 { + t.Errorf("Expecting: %v, received: %v", 999, acnt.BalanceMap[utils.MetaSMS].GetTotalValue()) + } else if len(acnt.BalanceMap[utils.MetaMonetary]) != 1 { + t.Errorf("Expecting: %v, received: %v", 1, len(acnt.BalanceMap[utils.MetaMonetary])) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != 10 { + t.Errorf("Expecting: %v, received: %v", 10, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } diff --git a/apier/v1/chargers.go b/apier/v1/chargers.go index 98215c651..60ef6cc1f 100644 --- a/apier/v1/chargers.go +++ b/apier/v1/chargers.go @@ -48,7 +48,7 @@ func (apierSv1 *APIerSv1) GetChargerProfileIDs(args *utils.PaginatorWithTenant, if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - prfx := utils.ChargerProfilePrefix + tnt + utils.CONCATENATED_KEY_SEP + prfx := utils.ChargerProfilePrefix + tnt + utils.ConcatenatedKeySep keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx) if err != nil { return err diff --git a/apier/v1/costs.go b/apier/v1/costs.go index 74c5a3460..2bcf2309f 100644 --- a/apier/v1/costs.go +++ b/apier/v1/costs.go @@ -96,7 +96,7 @@ func (apierSv1 *APIerSv1) GetDataCost(attrs *AttrGetDataCost, reply *engine.Data TimeStart: aTime, TimeEnd: aTime.Add(attrs.Usage), DurationIndex: attrs.Usage, - ToR: utils.DATA, + ToR: utils.MetaData, } var cc engine.CallCost if err := apierSv1.Responder.GetCost(&engine.CallDescriptorWithOpts{ diff --git a/apier/v1/debit.go b/apier/v1/debit.go index 8e8584ca5..307e7c86b 100644 --- a/apier/v1/debit.go +++ b/apier/v1/debit.go @@ -51,7 +51,7 @@ func (apierSv1 *APIerSv1) DebitUsageWithOptions(args *AttrDebitUsageWithOptions, // Set values for optional parameters if usageRecord.ToR == "" { - usageRecord.ToR = utils.VOICE + usageRecord.ToR = utils.MetaVoice } if usageRecord.RequestType == "" { usageRecord.RequestType = apierSv1.Config.GeneralCfg().DefaultReqType diff --git a/apier/v1/debit_test.go b/apier/v1/debit_test.go index 97c0d90bf..fb1f81207 100644 --- a/apier/v1/debit_test.go +++ b/apier/v1/debit_test.go @@ -69,7 +69,7 @@ func TestDebitUsageWithOptions(t *testing.T) { cgrAcnt1 := &engine.Account{ ID: utils.ConcatenatedKey(cgrTenant, "account1"), BalanceMap: map[string]engine.Balances{ - utils.MONETARY: {b10}, + utils.MetaMonetary: {b10}, }, } if err := apierDebitStorage.SetAccountDrv(cgrAcnt1); err != nil { @@ -139,7 +139,7 @@ func TestDebitUsageWithOptions(t *testing.T) { Account: "account1", Destination: "*any", Usage: "1", - ToR: utils.MONETARY, + ToR: utils.MetaMonetary, Category: "call", SetupTime: time.Date(2013, 11, 7, 7, 42, 20, 0, time.UTC).String(), AnswerTime: time.Date(2013, 11, 7, 7, 42, 20, 0, time.UTC).String(), @@ -158,8 +158,8 @@ func TestDebitUsageWithOptions(t *testing.T) { t.Error(err) } eAcntVal := 9.0 - if resolvedAccount.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { + if resolvedAccount.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, - resolvedAccount.BalanceMap[utils.MONETARY].GetTotalValue()) + resolvedAccount.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } diff --git a/apier/v1/dispatcher.go b/apier/v1/dispatcher.go index d85ddd221..5b819b633 100755 --- a/apier/v1/dispatcher.go +++ b/apier/v1/dispatcher.go @@ -52,7 +52,7 @@ func (apierSv1 *APIerSv1) GetDispatcherProfileIDs(tenantArg *utils.PaginatorWith if tenant == utils.EmptyString { tenant = apierSv1.Config.GeneralCfg().DefaultTenant } - prfx := utils.DispatcherProfilePrefix + tenant + utils.CONCATENATED_KEY_SEP + prfx := utils.DispatcherProfilePrefix + tenant + utils.ConcatenatedKeySep keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx) if err != nil { return err @@ -147,7 +147,7 @@ func (apierSv1 *APIerSv1) GetDispatcherHostIDs(tenantArg *utils.PaginatorWithTen if tenant == utils.EmptyString { tenant = apierSv1.Config.GeneralCfg().DefaultTenant } - prfx := utils.DispatcherHostPrefix + tenant + utils.CONCATENATED_KEY_SEP + prfx := utils.DispatcherHostPrefix + tenant + utils.ConcatenatedKeySep keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx) if err != nil { return err diff --git a/apier/v1/dispatchersv1_it_test.go b/apier/v1/dispatchersv1_it_test.go index 71eb30138..62a9fcdd0 100644 --- a/apier/v1/dispatchersv1_it_test.go +++ b/apier/v1/dispatchersv1_it_test.go @@ -137,7 +137,7 @@ func testDspDspv1GetProfileForEvent(t *testing.T) { Tenant: "cgrates.org", ID: "testDspv1", Event: map[string]interface{}{ - utils.EVENT_NAME: "Event1", + utils.EventName: "Event1", }, }, Opts: map[string]interface{}{ @@ -185,7 +185,7 @@ func testDspDspv1GetProfileForEvent(t *testing.T) { CGREvent: &utils.CGREvent{ ID: "testDspvWithoutTenant", Event: map[string]interface{}{ - utils.EVENT_NAME: "Event1", + utils.EventName: "Event1", }, }, Opts: map[string]interface{}{ diff --git a/apier/v1/ees_it_test.go b/apier/v1/ees_it_test.go index b313dc61c..109f9609b 100644 --- a/apier/v1/ees_it_test.go +++ b/apier/v1/ees_it_test.go @@ -142,28 +142,28 @@ func testEEsAddCDRs(t *testing.T) { } storedCdrs := []*engine.CDR{ {CGRID: "Cdr1", - OrderID: 1, ToR: utils.VOICE, OriginID: "OriginCDR1", OriginHost: "192.168.1.1", Source: "test", + OrderID: 1, ToR: utils.MetaVoice, OriginID: "OriginCDR1", OriginHost: "192.168.1.1", Source: "test", RequestType: utils.MetaNone, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "+4986517174963", SetupTime: time.Date(2018, 10, 4, 15, 3, 10, 0, time.UTC), AnswerTime: time.Date(2018, 10, 4, 15, 3, 10, 0, time.UTC), RunID: utils.MetaDefault, Usage: 10 * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, }, {CGRID: "Cdr2", - OrderID: 2, ToR: utils.VOICE, OriginID: "OriginCDR2", OriginHost: "192.168.1.1", Source: "test2", + OrderID: 2, ToR: utils.MetaVoice, OriginID: "OriginCDR2", OriginHost: "192.168.1.1", Source: "test2", RequestType: utils.MetaNone, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "+4986517174963", SetupTime: time.Date(2018, 10, 4, 15, 3, 10, 0, time.UTC), AnswerTime: time.Date(2018, 10, 4, 15, 3, 10, 0, time.UTC), RunID: utils.MetaDefault, Usage: 5 * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, }, {CGRID: "Cdr3", - OrderID: 3, ToR: utils.VOICE, OriginID: "OriginCDR3", OriginHost: "192.168.1.1", Source: "test2", + OrderID: 3, ToR: utils.MetaVoice, OriginID: "OriginCDR3", OriginHost: "192.168.1.1", Source: "test2", RequestType: utils.MetaNone, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "+4986517174963", SetupTime: time.Date(2018, 10, 4, 15, 3, 10, 0, time.UTC), AnswerTime: time.Date(2018, 10, 4, 15, 3, 10, 0, time.UTC), RunID: utils.MetaDefault, Usage: 30 * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, }, {CGRID: "Cdr4", - OrderID: 4, ToR: utils.VOICE, OriginID: "OriginCDR4", OriginHost: "192.168.1.1", Source: "test3", + OrderID: 4, ToR: utils.MetaVoice, OriginID: "OriginCDR4", OriginHost: "192.168.1.1", Source: "test3", RequestType: utils.MetaNone, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "+4986517174963", SetupTime: time.Date(2018, 10, 4, 15, 3, 10, 0, time.UTC), AnswerTime: time.Date(2018, 10, 4, 15, 3, 10, 0, time.UTC), RunID: utils.MetaDefault, Usage: 0, diff --git a/apier/v1/filters.go b/apier/v1/filters.go index cc6a4817e..e869fb412 100644 --- a/apier/v1/filters.go +++ b/apier/v1/filters.go @@ -78,7 +78,7 @@ func (apierSv1 *APIerSv1) GetFilterIDs(args *utils.PaginatorWithTenant, fltrIDs if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - prfx := utils.FilterPrefix + tnt + utils.CONCATENATED_KEY_SEP + prfx := utils.FilterPrefix + tnt + utils.ConcatenatedKeySep keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx) if err != nil { return err diff --git a/apier/v1/rals.go b/apier/v1/rals.go index e1786972c..0e4aa0bfb 100644 --- a/apier/v1/rals.go +++ b/apier/v1/rals.go @@ -68,7 +68,7 @@ func (rsv1 *RALsV1) GetRatingPlansCost(arg *utils.RatingPlanCostArg, reply *disp } for _, rp := range arg.RatingPlanIDs { // loop through RatingPlans until we find one without errors rPrfl := &engine.RatingProfile{ - Id: utils.ConcatenatedKey(utils.META_OUT, + Id: utils.ConcatenatedKey(utils.MetaOut, tenant, category, subject), RatingPlanActivations: engine.RatingPlanActivations{ &engine.RatingPlanActivation{ diff --git a/apier/v1/rateprofiles.go b/apier/v1/rateprofiles.go index 3f1f099a1..5de397770 100644 --- a/apier/v1/rateprofiles.go +++ b/apier/v1/rateprofiles.go @@ -53,7 +53,7 @@ func (apierSv1 *APIerSv1) GetRateProfileIDs(args *utils.PaginatorWithTenant, att if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - prfx := utils.RateProfilePrefix + tnt + utils.CONCATENATED_KEY_SEP + prfx := utils.RateProfilePrefix + tnt + utils.ConcatenatedKeySep keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx) if err != nil { return err @@ -77,7 +77,7 @@ func (apierSv1 *APIerSv1) GetRateProfileIDsCount(args *utils.TenantWithOpts, rep tnt = apierSv1.Config.GeneralCfg().DefaultTenant } var keys []string - prfx := utils.RateProfilePrefix + tnt + utils.CONCATENATED_KEY_SEP + prfx := utils.RateProfilePrefix + tnt + utils.ConcatenatedKeySep if keys, err = apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx); err != nil { return err } diff --git a/apier/v1/remote_it_test.go b/apier/v1/remote_it_test.go index 4246a1d72..57c2cfae3 100644 --- a/apier/v1/remote_it_test.go +++ b/apier/v1/remote_it_test.go @@ -191,7 +191,7 @@ func testInternalRemoteITGetAccount(t *testing.T) { expAcc := &engine.Account{ ID: "cgrates.org:1001", BalanceMap: map[string]engine.Balances{ - utils.MONETARY: []*engine.Balance{ + utils.MetaMonetary: []*engine.Balance{ { ID: "testAccount", Value: 10, @@ -243,7 +243,7 @@ func testInternalRemoteITGetAttribute(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "Password", FilterIDs: []string{}, - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep), }, }, @@ -525,7 +525,7 @@ func testInternalRemoteITGetRatingProfile(t *testing.T) { func testInternalRemoteITGetAction(t *testing.T) { expectActs := []*utils.TPAction{ - {Identifier: utils.TOPUP_RESET, BalanceId: "test", BalanceType: utils.MONETARY, + {Identifier: utils.TOPUP_RESET, BalanceId: "test", BalanceType: utils.MetaMonetary, Units: "10", BalanceWeight: "10", BalanceBlocker: "false", BalanceDisabled: "false", ExpiryTime: utils.UNLIMITED, Weight: 10.0}} @@ -948,7 +948,7 @@ func testInternalAccountBalanceOperations(t *testing.T) { attrs := &utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "testAccount1", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 17.4, Balance: map[string]interface{}{ utils.ID: "testAccSetBalance", @@ -966,10 +966,10 @@ func testInternalAccountBalanceOperations(t *testing.T) { // verify account on engineOne if err := engineOneRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap[utils.MONETARY]) != 1 { + } else if len(acnt.BalanceMap[utils.MetaMonetary]) != 1 { t.Errorf("Expecting: %+v, received: %+v", - 1, len(acnt.BalanceMap[utils.MONETARY])) - } else if val := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); val != 17.4 { + 1, len(acnt.BalanceMap[utils.MetaMonetary])) + } else if val := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); val != 17.4 { t.Errorf("Expecting: %+v, received: %+v", 17.4, val) } @@ -977,10 +977,10 @@ func testInternalAccountBalanceOperations(t *testing.T) { // verify account on engineTwo if err := engineTwoRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap[utils.MONETARY]) != 1 { + } else if len(acnt.BalanceMap[utils.MetaMonetary]) != 1 { t.Errorf("Expecting: %+v, received: %+v", - 1, len(acnt.BalanceMap[utils.MONETARY])) - } else if val := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); val != 17.4 { + 1, len(acnt.BalanceMap[utils.MetaMonetary])) + } else if val := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); val != 17.4 { t.Errorf("Expecting: %+v, received: %+v", 17.4, val) } @@ -989,7 +989,7 @@ func testInternalAccountBalanceOperations(t *testing.T) { if err := internalRPC.Call(utils.APIerSv1DebitBalance, &AttrAddBalance{ Tenant: "cgrates.org", Account: "testAccount1", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 3.62, }, &reply); err != nil { t.Error(err) @@ -1000,10 +1000,10 @@ func testInternalAccountBalanceOperations(t *testing.T) { // verify debited account on engineOne if err := engineOneRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap[utils.MONETARY]) != 1 { + } else if len(acnt.BalanceMap[utils.MetaMonetary]) != 1 { t.Errorf("Expecting: %+v, received: %+v", - 1, len(acnt.BalanceMap[utils.MONETARY])) - } else if val := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); val != 13.78 { + 1, len(acnt.BalanceMap[utils.MetaMonetary])) + } else if val := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); val != 13.78 { t.Errorf("Expecting: %+v, received: %+v", 13.78, val) } @@ -1011,10 +1011,10 @@ func testInternalAccountBalanceOperations(t *testing.T) { // verify debited account on engineTwo if err := engineTwoRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap[utils.MONETARY]) != 1 { + } else if len(acnt.BalanceMap[utils.MetaMonetary]) != 1 { t.Errorf("Expecting: %+v, received: %+v", - 1, len(acnt.BalanceMap[utils.MONETARY])) - } else if val := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); val != 13.78 { + 1, len(acnt.BalanceMap[utils.MetaMonetary])) + } else if val := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); val != 13.78 { t.Errorf("Expecting: %+v, received: %+v", 13.78, val) } @@ -1022,7 +1022,7 @@ func testInternalAccountBalanceOperations(t *testing.T) { addBal := &AttrAddBalance{ Tenant: "cgrates.org", Account: "testAccount1", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 12.765, } // add balance for the account on internal and this should be replicated to other engines @@ -1033,10 +1033,10 @@ func testInternalAccountBalanceOperations(t *testing.T) { // verify account on engineOne if err := engineOneRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap[utils.MONETARY]) != 1 { + } else if len(acnt.BalanceMap[utils.MetaMonetary]) != 1 { t.Errorf("Expecting: %+v, received: %+v", - 1, len(acnt.BalanceMap[utils.MONETARY])) - } else if val := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); val != 26.545 { + 1, len(acnt.BalanceMap[utils.MetaMonetary])) + } else if val := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); val != 26.545 { t.Errorf("Expecting: %+v, received: %+v", 26.545, val) } @@ -1044,10 +1044,10 @@ func testInternalAccountBalanceOperations(t *testing.T) { // verify account on engineTwo if err := engineTwoRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap[utils.MONETARY]) != 1 { + } else if len(acnt.BalanceMap[utils.MetaMonetary]) != 1 { t.Errorf("Expecting: %+v, received: %+v", - 1, len(acnt.BalanceMap[utils.MONETARY])) - } else if val := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); val != 26.545 { + 1, len(acnt.BalanceMap[utils.MetaMonetary])) + } else if val := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); val != 26.545 { t.Errorf("Expecting: %+v, received: %+v", 26.545, val) } @@ -1077,10 +1077,10 @@ func testInternalSetAccount(t *testing.T) { // verify account on engineOne if err := engineOneRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap[utils.MONETARY]) != 1 { + } else if len(acnt.BalanceMap[utils.MetaMonetary]) != 1 { t.Errorf("Expecting: %+v, received: %+v", - 1, len(acnt.BalanceMap[utils.MONETARY])) - } else if val := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); val != 10 { + 1, len(acnt.BalanceMap[utils.MetaMonetary])) + } else if val := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); val != 10 { t.Errorf("Expecting: %+v, received: %+v", 10, val) } @@ -1088,10 +1088,10 @@ func testInternalSetAccount(t *testing.T) { // verify account on engineTwo if err := engineTwoRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap[utils.MONETARY]) != 1 { + } else if len(acnt.BalanceMap[utils.MetaMonetary]) != 1 { t.Errorf("Expecting: %+v, received: %+v", - 1, len(acnt.BalanceMap[utils.MONETARY])) - } else if val := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); val != 10 { + 1, len(acnt.BalanceMap[utils.MetaMonetary])) + } else if val := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); val != 10 { t.Errorf("Expecting: %+v, received: %+v", 10, val) } diff --git a/apier/v1/replicate_it_test.go b/apier/v1/replicate_it_test.go index c0464f4cd..ed93383c4 100644 --- a/apier/v1/replicate_it_test.go +++ b/apier/v1/replicate_it_test.go @@ -831,7 +831,7 @@ func testInternalReplicateITActions(t *testing.T) { ActionsId: "ACTS_1", Actions: []*V1TPAction{{ Identifier: utils.TOPUP_RESET, - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Units: 75.0, ExpiryTime: utils.UNLIMITED, Weight: 20.0}}} @@ -847,7 +847,7 @@ func testInternalReplicateITActions(t *testing.T) { // check eOut := []*utils.TPAction{{ Identifier: utils.TOPUP_RESET, - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Units: "75", BalanceWeight: "0", BalanceBlocker: "false", @@ -892,7 +892,7 @@ func testInternalReplicateITActionPlan(t *testing.T) { var reply string if err := internalRPC.Call(utils.APIerSv2SetActions, &utils.AttrSetActions{ ActionsId: "ACTS_1", - Actions: []*utils.TPAction{{Identifier: utils.LOG}}, + Actions: []*utils.TPAction{{Identifier: utils.MetaLog}}, }, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error(err) } else if reply != utils.OK { @@ -1227,7 +1227,7 @@ func testInternalReplicateITThreshold(t *testing.T) { var reply string if err := internalRPC.Call(utils.APIerSv2SetActions, &utils.AttrSetActions{ ActionsId: "ACT_LOG", - Actions: []*utils.TPAction{{Identifier: utils.LOG}}, + Actions: []*utils.TPAction{{Identifier: utils.MetaLog}}, }, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error(err) } else if reply != utils.OK { @@ -1275,7 +1275,7 @@ func testInternalReplicateITThreshold(t *testing.T) { attrs := &utils.AttrSetBalance{ Tenant: tenant, Account: "1005", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 1, Balance: map[string]interface{}{ utils.ID: utils.MetaDefault, diff --git a/apier/v1/resourcesv1.go b/apier/v1/resourcesv1.go index 2b3fd7970..c3eae231f 100644 --- a/apier/v1/resourcesv1.go +++ b/apier/v1/resourcesv1.go @@ -87,7 +87,7 @@ func (apierSv1 *APIerSv1) GetResourceProfileIDs(args utils.PaginatorWithTenant, if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - prfx := utils.ResourceProfilesPrefix + tnt + utils.CONCATENATED_KEY_SEP + prfx := utils.ResourceProfilesPrefix + tnt + utils.ConcatenatedKeySep keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx) if err != nil { return err diff --git a/apier/v1/routes.go b/apier/v1/routes.go index aa4161123..0265a1c38 100644 --- a/apier/v1/routes.go +++ b/apier/v1/routes.go @@ -48,7 +48,7 @@ func (apierSv1 *APIerSv1) GetRouteProfileIDs(args *utils.PaginatorWithTenant, sp if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - prfx := utils.RouteProfilePrefix + tnt + utils.CONCATENATED_KEY_SEP + prfx := utils.RouteProfilePrefix + tnt + utils.ConcatenatedKeySep keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx) if err != nil { return err diff --git a/apier/v1/routes_it_test.go b/apier/v1/routes_it_test.go index dffa41c7b..ed2c455bb 100644 --- a/apier/v1/routes_it_test.go +++ b/apier/v1/routes_it_test.go @@ -535,7 +535,7 @@ func testV1RoutePolulateStatsForQOS(t *testing.T) { utils.AccountField: "1001", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 11 * time.Second, - utils.COST: 10.0, + utils.Cost: 10.0, }, }, }, @@ -556,7 +556,7 @@ func testV1RoutePolulateStatsForQOS(t *testing.T) { utils.AccountField: "1001", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 11 * time.Second, - utils.COST: 10.5, + utils.Cost: 10.5, }, }, }, @@ -577,7 +577,7 @@ func testV1RoutePolulateStatsForQOS(t *testing.T) { utils.AccountField: "1002", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 5 * time.Second, - utils.COST: 12.5, + utils.Cost: 12.5, }, }, }, @@ -598,7 +598,7 @@ func testV1RoutePolulateStatsForQOS(t *testing.T) { utils.AccountField: "1002", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 6 * time.Second, - utils.COST: 17.5, + utils.Cost: 17.5, }, }, }, @@ -619,7 +619,7 @@ func testV1RoutePolulateStatsForQOS(t *testing.T) { utils.AccountField: "1003", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 11 * time.Second, - utils.COST: 12.5, + utils.Cost: 12.5, }, }, }, @@ -640,7 +640,7 @@ func testV1RoutePolulateStatsForQOS(t *testing.T) { "Stat": "Stat1_1", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 11 * time.Second, - utils.COST: 12.5, + utils.Cost: 12.5, utils.PDD: 12 * time.Second, }, }, @@ -662,7 +662,7 @@ func testV1RoutePolulateStatsForQOS(t *testing.T) { "Stat": "Stat1_1", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 15 * time.Second, - utils.COST: 15.5, + utils.Cost: 15.5, utils.PDD: 15 * time.Second, }, }, @@ -1366,7 +1366,7 @@ func testV1RouteAccountWithRatingPlan(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "AccWithVoice", - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 30 * float64(time.Second), Balance: map[string]interface{}{ utils.ID: "VoiceBalance", @@ -1385,8 +1385,8 @@ func testV1RouteAccountWithRatingPlan(t *testing.T) { } if err := routeSv1Rpc.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != 30*float64(time.Second) { - t.Errorf("Unexpected balance received : %+v", acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != 30*float64(time.Second) { + t.Errorf("Unexpected balance received : %+v", acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } // test for 30 seconds usage diff --git a/apier/v1/routes_with_rates_it_test.go b/apier/v1/routes_with_rates_it_test.go index bddb85b42..da0999c08 100644 --- a/apier/v1/routes_with_rates_it_test.go +++ b/apier/v1/routes_with_rates_it_test.go @@ -200,7 +200,7 @@ func testV1RouteSWithRateSAccountWithRateProfile(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "AccWithVoice", - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 30 * float64(time.Second), Balance: map[string]interface{}{ utils.ID: "VoiceBalance", @@ -219,8 +219,8 @@ func testV1RouteSWithRateSAccountWithRateProfile(t *testing.T) { } if err := routeSv1Rpc.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != 30*float64(time.Second) { - t.Errorf("Unexpected balance received : %+v", acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != 30*float64(time.Second) { + t.Errorf("Unexpected balance received : %+v", acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } // test for 30 seconds usage diff --git a/apier/v1/schedulers_it_test.go b/apier/v1/schedulers_it_test.go index 675fa011b..8582efbe0 100644 --- a/apier/v1/schedulers_it_test.go +++ b/apier/v1/schedulers_it_test.go @@ -166,7 +166,7 @@ func testSchedVeifyAllAccounts(t *testing.T) { } if err := schedRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); rply != 10 { + } else if rply := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); rply != 10 { t.Errorf("Expecting: %v, received: %v", 10, rply) } @@ -176,7 +176,7 @@ func testSchedVeifyAllAccounts(t *testing.T) { } if err := schedRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); rply != 10 { + } else if rply := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); rply != 10 { t.Errorf("Expecting: %v, received: %v", 10, rply) } @@ -186,7 +186,7 @@ func testSchedVeifyAllAccounts(t *testing.T) { } if err := schedRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); rply != 10 { + } else if rply := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); rply != 10 { t.Errorf("Expecting: %v, received: %v", 10, rply) } @@ -203,7 +203,7 @@ func testSchedVeifyAccount1001(t *testing.T) { } if err := schedRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); rply != 10 { + } else if rply := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); rply != 10 { t.Errorf("Expecting: %v, received: %v", 10, rply) } @@ -215,7 +215,7 @@ func testSchedVeifyAccount1001(t *testing.T) { } if err := schedRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if lenBal := len(acnt.BalanceMap[utils.MONETARY]); lenBal != 0 { + } else if lenBal := len(acnt.BalanceMap[utils.MetaMonetary]); lenBal != 0 { t.Errorf("Expecting: %v, received: %v", 0, lenBal) } @@ -226,7 +226,7 @@ func testSchedVeifyAccount1001(t *testing.T) { } if err := schedRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if lenBal := len(acnt.BalanceMap[utils.MONETARY]); lenBal != 0 { + } else if lenBal := len(acnt.BalanceMap[utils.MetaMonetary]); lenBal != 0 { t.Errorf("Expecting: %v, received: %v", 0, lenBal) } @@ -244,7 +244,7 @@ func testSchedVeifyAccount1002and1003(t *testing.T) { } if err := schedRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if lenBal := len(acnt.BalanceMap[utils.MONETARY]); lenBal != 0 { + } else if lenBal := len(acnt.BalanceMap[utils.MetaMonetary]); lenBal != 0 { t.Errorf("Expecting: %v, received: %v", 0, lenBal) } @@ -255,7 +255,7 @@ func testSchedVeifyAccount1002and1003(t *testing.T) { } if err := schedRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); rply != 10 { + } else if rply := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); rply != 10 { t.Errorf("Expecting: %v, received: %v", 10, rply) } @@ -266,7 +266,7 @@ func testSchedVeifyAccount1002and1003(t *testing.T) { } if err := schedRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); rply != 10 { + } else if rply := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); rply != 10 { t.Errorf("Expecting: %v, received: %v", 10, rply) } @@ -308,7 +308,7 @@ func testSchedExecuteAction(t *testing.T) { expected := 0.0 if err := schedRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); rply != expected { + } else if rply := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); rply != expected { t.Errorf("Expecting: %v, received: %v", expected, rply) } @@ -319,7 +319,7 @@ func testSchedExecuteAction(t *testing.T) { expected = 10.0 if err := schedRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); rply != expected { + } else if rply := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); rply != expected { t.Errorf("Expecting: %v, received: %v", expected, rply) } diff --git a/apier/v1/sessions_process_event_it_test.go b/apier/v1/sessions_process_event_it_test.go index c57501fbd..793aa6f4b 100644 --- a/apier/v1/sessions_process_event_it_test.go +++ b/apier/v1/sessions_process_event_it_test.go @@ -169,7 +169,7 @@ func testSSv1ItProcessEventAuth(t *testing.T) { ID: "testSSv1ItProcessEventAuth", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testSSv1ItProcessEvent", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -230,7 +230,7 @@ func testSSv1ItProcessEventAuth(t *testing.T) { Event: map[string]interface{}{ utils.CGRID: "4be779c004d9f784e836db9ffd41b50319d71fe8", utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", @@ -263,7 +263,7 @@ func testSSv1ItProcessEventInitiateSession(t *testing.T) { ID: "testSSv1ItProcessEventInitiateSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testSSv1ItProcessEvent", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -307,7 +307,7 @@ func testSSv1ItProcessEventInitiateSession(t *testing.T) { Event: map[string]interface{}{ utils.CGRID: "4be779c004d9f784e836db9ffd41b50319d71fe8", utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", @@ -345,7 +345,7 @@ func testSSv1ItProcessEventUpdateSession(t *testing.T) { ID: "testSSv1ItProcessEventUpdateSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testSSv1ItProcessEvent", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -374,7 +374,7 @@ func testSSv1ItProcessEventUpdateSession(t *testing.T) { Event: map[string]interface{}{ utils.CGRID: "4be779c004d9f784e836db9ffd41b50319d71fe8", utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", @@ -422,7 +422,7 @@ func testSSv1ItProcessEventTerminateSession(t *testing.T) { ID: "testSSv1ItProcessEventTerminateSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testSSv1ItProcessEvent", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -453,7 +453,7 @@ func testSSv1ItProcessCDRForSessionFromProcessEvent(t *testing.T) { ID: "testSSv1ItProcessCDRForSessionFromProcessEvent", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testSSv1ItProcessEvent", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -528,7 +528,7 @@ func testSSv1ItProcessEventWithGetCost(t *testing.T) { ID: "testSSv1ItProcessEventWithGetCost", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.MONETARY, + utils.ToR: utils.MetaMonetary, utils.OriginID: "testSSv1ItProcessEventWithGetCost", utils.RequestType: sSV1RequestType, utils.Subject: "*attributes", @@ -569,7 +569,7 @@ func testSSv1ItProcessEventWithGetCost2(t *testing.T) { ID: "testSSv1ItProcessEventWithGetCost2", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.MONETARY, + utils.ToR: utils.MetaMonetary, utils.OriginID: "testSSv1ItProcessEventWithGetCost2", utils.RequestType: sSV1RequestType, utils.Subject: "*attributes", @@ -612,7 +612,7 @@ func testSSv1ItProcessEventWithGetCost3(t *testing.T) { ID: "testSSv1ItProcessEventWithGetCost3", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.MONETARY, + utils.ToR: utils.MetaMonetary, utils.OriginID: "testSSv1ItProcessEventWithGetCost3", utils.RequestType: sSV1RequestType, utils.Subject: "*attributes", @@ -652,7 +652,7 @@ func testSSv1ItProcessEventWithGetCost4(t *testing.T) { ID: "testSSv1ItProcessEventWithGetCost4", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.MONETARY, + utils.ToR: utils.MetaMonetary, utils.OriginID: "testSSv1ItProcessEventWithGetCost4", utils.RequestType: sSV1RequestType, utils.Subject: "*attributes", @@ -682,7 +682,7 @@ func testSSv1ItGetCost(t *testing.T) { ID: "testSSv1ItGetCost", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.MONETARY, + utils.ToR: utils.MetaMonetary, utils.OriginID: "testSSv1ItProcessEventWithGetCost", utils.RequestType: sSV1RequestType, utils.Subject: "*attributes", @@ -724,7 +724,7 @@ func testSSv1ItProcessEventWithCDR(t *testing.T) { ID: "testSSv1ItProcessEventWithCDR", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testSSv1ItProcessEventWithCDR", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -803,7 +803,7 @@ func testSSv1ItProcessEventWithCDRResourceError(t *testing.T) { ID: "testSSv1ItProcessEventWithCDRResourceError", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testSSv1ItProcessEventWithCDRResourceError", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -883,7 +883,7 @@ func testSSv1ItProcessEventWithCDRResourceErrorBlockError(t *testing.T) { ID: "testSSv1ItProcessEventWithCDRResourceErrorBlockError", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testSSv1ItProcessEventWithCDRResourceErrorBlockError", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", diff --git a/apier/v1/sessions_thresholds_it_test.go b/apier/v1/sessions_thresholds_it_test.go index 457adcd9d..f71ac3dad 100755 --- a/apier/v1/sessions_thresholds_it_test.go +++ b/apier/v1/sessions_thresholds_it_test.go @@ -175,7 +175,7 @@ func testSessionSv1ItGetThreshold(t *testing.T) { expectedAccount := &engine.Account{ ID: "cgrates.org:1001", BalanceMap: map[string]engine.Balances{ - utils.MONETARY: []*engine.Balance{ + utils.MetaMonetary: []*engine.Balance{ { Value: 10, Weight: 10, @@ -194,11 +194,11 @@ func testSessionSv1ItGetThreshold(t *testing.T) { t.Errorf("Expecting: %s, received: %s", expectedAccount.ID, reply2.ID) } else if !reflect.DeepEqual( - expectedAccount.BalanceMap[utils.MONETARY][0].Value, - reply2.BalanceMap[utils.MONETARY][0].Value) { + expectedAccount.BalanceMap[utils.MetaMonetary][0].Value, + reply2.BalanceMap[utils.MetaMonetary][0].Value) { t.Errorf("Expecting: %f, received: %f", - expectedAccount.BalanceMap[utils.MONETARY][0].Value, - reply2.BalanceMap[utils.MONETARY][0].Value) + expectedAccount.BalanceMap[utils.MetaMonetary][0].Value, + reply2.BalanceMap[utils.MetaMonetary][0].Value) } } @@ -236,7 +236,7 @@ func testSessionSv1ItAuth(t *testing.T) { expectedAccount := &engine.Account{ ID: "cgrates.org:1001", BalanceMap: map[string]engine.Balances{ - utils.MONETARY: []*engine.Balance{ + utils.MetaMonetary: []*engine.Balance{ { Value: 20, Weight: 10, @@ -255,11 +255,11 @@ func testSessionSv1ItAuth(t *testing.T) { t.Errorf("Expecting: %s, received: %s", expectedAccount.ID, reply.ID) } else if !reflect.DeepEqual( - expectedAccount.BalanceMap[utils.MONETARY][0].Value, - reply.BalanceMap[utils.MONETARY][0].Value) { + expectedAccount.BalanceMap[utils.MetaMonetary][0].Value, + reply.BalanceMap[utils.MetaMonetary][0].Value) { t.Errorf("Expecting: %f, received: %f", - expectedAccount.BalanceMap[utils.MONETARY][0].Value, - reply.BalanceMap[utils.MONETARY][0].Value) + expectedAccount.BalanceMap[utils.MetaMonetary][0].Value, + reply.BalanceMap[utils.MetaMonetary][0].Value) } } @@ -276,7 +276,7 @@ func testSessionSv1ItInitiateSession(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -301,7 +301,7 @@ func testSessionSv1ItInitiateSession(t *testing.T) { expectedAccount := &engine.Account{ ID: "cgrates.org:1001", BalanceMap: map[string]engine.Balances{ - utils.MONETARY: []*engine.Balance{ + utils.MetaMonetary: []*engine.Balance{ { Value: 29.898000, Weight: 10, @@ -320,11 +320,11 @@ func testSessionSv1ItInitiateSession(t *testing.T) { t.Errorf("Expecting: %s, received: %s", expectedAccount.ID, reply.ID) } else if !reflect.DeepEqual( - expectedAccount.BalanceMap[utils.MONETARY][0].Value, - reply.BalanceMap[utils.MONETARY][0].Value) { + expectedAccount.BalanceMap[utils.MetaMonetary][0].Value, + reply.BalanceMap[utils.MetaMonetary][0].Value) { t.Errorf("Expecting: %f, received: %f", - expectedAccount.BalanceMap[utils.MONETARY][0].Value, - reply.BalanceMap[utils.MONETARY][0].Value) + expectedAccount.BalanceMap[utils.MetaMonetary][0].Value, + reply.BalanceMap[utils.MetaMonetary][0].Value) } } @@ -360,7 +360,7 @@ func testSessionSv1ItTerminateSession(t *testing.T) { expectedAccount := &engine.Account{ ID: "cgrates.org:1001", BalanceMap: map[string]engine.Balances{ - utils.MONETARY: []*engine.Balance{ + utils.MetaMonetary: []*engine.Balance{ { Value: 39.796000, Weight: 10, @@ -379,11 +379,11 @@ func testSessionSv1ItTerminateSession(t *testing.T) { t.Errorf("Expecting: %s, received: %s", expectedAccount.ID, reply2.ID) } else if !reflect.DeepEqual( - expectedAccount.BalanceMap[utils.MONETARY][0].Value, - reply2.BalanceMap[utils.MONETARY][0].Value) { + expectedAccount.BalanceMap[utils.MetaMonetary][0].Value, + reply2.BalanceMap[utils.MetaMonetary][0].Value) { t.Errorf("Expecting: %f, received: %f", - expectedAccount.BalanceMap[utils.MONETARY][0].Value, - reply2.BalanceMap[utils.MONETARY][0].Value) + expectedAccount.BalanceMap[utils.MetaMonetary][0].Value, + reply2.BalanceMap[utils.MetaMonetary][0].Value) } } @@ -434,7 +434,7 @@ func testSessionSv1ItInitNotFoundThreshold(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.DATA, + utils.ToR: utils.MetaData, utils.OriginID: "TestSessionSv1ItInitNotFoundThreshold", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1002", @@ -487,7 +487,7 @@ func testSessionSv1ItTerminateNotFoundThreshold(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.DATA, + utils.ToR: utils.MetaData, utils.OriginID: "TestSessionSv1ItInitNotFoundThreshold", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1002", @@ -573,7 +573,7 @@ func testSessionSv1ItInitNotFoundThresholdAndStats(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.DATA, + utils.ToR: utils.MetaData, utils.OriginID: "TestSessionSv1ItInitNotFoundThreshold", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1002", @@ -627,7 +627,7 @@ func testSessionSv1ItTerminateNotFoundThresholdAndStats(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.DATA, + utils.ToR: utils.MetaData, utils.OriginID: "TestSessionSv1ItInitNotFoundThreshold", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1002", diff --git a/apier/v1/sessionsv1_it_test.go b/apier/v1/sessionsv1_it_test.go index f0be318a4..3be195846 100644 --- a/apier/v1/sessionsv1_it_test.go +++ b/apier/v1/sessionsv1_it_test.go @@ -212,7 +212,7 @@ func testSSv1ItAuth(t *testing.T) { ID: "TestSSv1ItAuth", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -267,7 +267,7 @@ func testSSv1ItAuth(t *testing.T) { Event: map[string]interface{}{ utils.CGRID: "5668666d6b8e44eb949042f25ce0796ec3592ff9", utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", @@ -299,7 +299,7 @@ func testSSv1ItAuthWithDigest(t *testing.T) { ID: "TestSSv1ItAuth", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -345,7 +345,7 @@ func testSSv1ItInitiateSession(t *testing.T) { ID: "TestSSv1ItInitiateSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -383,7 +383,7 @@ func testSSv1ItInitiateSession(t *testing.T) { Event: map[string]interface{}{ utils.CGRID: "5668666d6b8e44eb949042f25ce0796ec3592ff9", utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", @@ -421,7 +421,7 @@ func testSSv1ItInitiateSessionWithDigest(t *testing.T) { ID: "TestSSv1ItInitiateSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It2", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -472,7 +472,7 @@ func testSSv1ItUpdateSession(t *testing.T) { ID: "TestSSv1ItUpdateSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -501,7 +501,7 @@ func testSSv1ItUpdateSession(t *testing.T) { Event: map[string]interface{}{ utils.CGRID: "5668666d6b8e44eb949042f25ce0796ec3592ff9", utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", @@ -543,7 +543,7 @@ func testSSv1ItTerminateSession(t *testing.T) { ID: "TestSSv1ItUpdateSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -578,7 +578,7 @@ func testSSv1ItProcessCDR(t *testing.T) { ID: "TestSSv1ItProcessCDR", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -613,7 +613,7 @@ func testSSv1ItProcessEvent(t *testing.T) { ID: "TestSSv1ItProcessEvent", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It2", utils.OriginHost: "TestSSv1It3", utils.RequestType: sSV1RequestType, @@ -652,7 +652,7 @@ func testSSv1ItProcessEvent(t *testing.T) { Event: map[string]interface{}{ utils.CGRID: "f7f5cf1029905f9b98be1a608e4bd975b8e51413", utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", @@ -791,8 +791,8 @@ func testSSv1ItForceUpdateSession(t *testing.T) { eAcntVal := 9.55 if err := sSApierRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } reqUsage := 5 * time.Minute @@ -806,7 +806,7 @@ func testSSv1ItForceUpdateSession(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -836,7 +836,7 @@ func testSSv1ItForceUpdateSession(t *testing.T) { utils.CGRID: "70876773b294f0e1476065f8d18bb9ec6bcb3d5f", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", @@ -867,8 +867,8 @@ func testSSv1ItForceUpdateSession(t *testing.T) { eAcntVal = 9.4 if err := sSApierRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } rplyt := "" if err := sSv1BiRpc.Call(utils.SessionSv1ForceDisconnect, @@ -884,8 +884,8 @@ func testSSv1ItForceUpdateSession(t *testing.T) { } if err := sSApierRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { // no monetary change bacause the sessin was terminated - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { // no monetary change bacause the sessin was terminated + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } var cdrs []*engine.CDR argsCDR := &utils.RPCCDRsFilterWithOpts{ @@ -928,7 +928,7 @@ func testSSv1ItDynamicDebit(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "TestDynamicDebit", - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 2 * float64(time.Second), Balance: map[string]interface{}{ utils.ID: "TestDynamicDebitBalance", @@ -949,9 +949,9 @@ func testSSv1ItDynamicDebit(t *testing.T) { eAcntVal := 2 * float64(time.Second) if err := sSApierRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { t.Errorf("Expecting: %v, received: %v", - time.Duration(eAcntVal), time.Duration(acnt.BalanceMap[utils.VOICE].GetTotalValue())) + time.Duration(eAcntVal), time.Duration(acnt.BalanceMap[utils.MetaVoice].GetTotalValue())) } args1 := &sessions.V1InitSessionArgs{ @@ -967,7 +967,7 @@ func testSSv1ItDynamicDebit(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestDynamicTDebit", utils.RequestType: sSV1RequestType, utils.AccountField: "TestDynamicDebit", @@ -999,25 +999,25 @@ func testSSv1ItDynamicDebit(t *testing.T) { eAcntVal -= float64(time.Millisecond) * 30 * 2 // 2 session if err := sSApierRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { t.Errorf("Expecting: %v, received: %v", - time.Duration(eAcntVal), time.Duration(acnt.BalanceMap[utils.VOICE].GetTotalValue())) + time.Duration(eAcntVal), time.Duration(acnt.BalanceMap[utils.MetaVoice].GetTotalValue())) } time.Sleep(10 * time.Millisecond) if err := sSApierRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { t.Errorf("Expecting: %v, received: %v", - time.Duration(eAcntVal), time.Duration(acnt.BalanceMap[utils.VOICE].GetTotalValue())) + time.Duration(eAcntVal), time.Duration(acnt.BalanceMap[utils.MetaVoice].GetTotalValue())) } time.Sleep(20 * time.Millisecond) eAcntVal -= float64(time.Millisecond) * 30 * 2 // 2 session if err := sSApierRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { t.Errorf("Expecting: %v, received: %v", - time.Duration(eAcntVal), time.Duration(acnt.BalanceMap[utils.VOICE].GetTotalValue())) + time.Duration(eAcntVal), time.Duration(acnt.BalanceMap[utils.MetaVoice].GetTotalValue())) } if err := sSv1BiRpc.Call(utils.SessionSv1GetActiveSessions, nil, &aSessions); err != nil { @@ -1062,7 +1062,7 @@ func testSSv1ItDeactivateSessions(t *testing.T) { ID: "TestSSv1ItInitiateSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -1114,7 +1114,7 @@ func testSSv1ItAuthNotFoundCharger(t *testing.T) { ID: "testSSv1ItAuthNotFoundCharger", Event: map[string]interface{}{ utils.Tenant: "Unexist", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testSSv1ItAuthNotFoundCharger", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", @@ -1143,7 +1143,7 @@ func testSSv1ItInitiateSessionNotFoundCharger(t *testing.T) { ID: "testSSv1ItInitiateSessionNotFoundCharger", Event: map[string]interface{}{ utils.Tenant: "Unexist", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testSSv1ItInitiateSessionNotFoundCharger", utils.RequestType: sSV1RequestType, utils.AccountField: "1001", diff --git a/apier/v1/stats.go b/apier/v1/stats.go index 95245b3a7..5a9be59e8 100644 --- a/apier/v1/stats.go +++ b/apier/v1/stats.go @@ -49,7 +49,7 @@ func (apierSv1 *APIerSv1) GetStatQueueProfileIDs(args *utils.PaginatorWithTenant if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - prfx := utils.StatQueueProfilePrefix + tnt + utils.CONCATENATED_KEY_SEP + prfx := utils.StatQueueProfilePrefix + tnt + utils.ConcatenatedKeySep keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx) if err != nil { return err diff --git a/apier/v1/stats_it_test.go b/apier/v1/stats_it_test.go index 2e20425d2..466aa0a1a 100644 --- a/apier/v1/stats_it_test.go +++ b/apier/v1/stats_it_test.go @@ -48,7 +48,7 @@ var ( utils.AccountField: "1001", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 135 * time.Second, - utils.COST: 123.0}}, + utils.Cost: 123.0}}, { Tenant: "cgrates.org", ID: "event2", @@ -169,14 +169,14 @@ func testV1STSGetStats(t *testing.T) { } var metrics map[string]string expectedMetrics := map[string]string{ - utils.MetaASR: utils.NOT_AVAILABLE, - utils.MetaACD: utils.NOT_AVAILABLE, - utils.MetaTCC: utils.NOT_AVAILABLE, - utils.MetaTCD: utils.NOT_AVAILABLE, - utils.MetaACC: utils.NOT_AVAILABLE, - utils.MetaPDD: utils.NOT_AVAILABLE, - utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: utils.NOT_AVAILABLE, - utils.MetaAverage + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: utils.NOT_AVAILABLE, + utils.MetaASR: utils.NotAvailable, + utils.MetaACD: utils.NotAvailable, + utils.MetaTCC: utils.NotAvailable, + utils.MetaTCD: utils.NotAvailable, + utils.MetaACC: utils.NotAvailable, + utils.MetaPDD: utils.NotAvailable, + utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: utils.NotAvailable, + utils.MetaAverage + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: utils.NotAvailable, } if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics, &utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}}, @@ -230,9 +230,9 @@ func testV1STSV1StatSv1ResetAction(t *testing.T) { } var metrics map[string]string expectedMetrics := map[string]string{ - utils.MetaACD: utils.NOT_AVAILABLE, - utils.MetaTCD: utils.NOT_AVAILABLE, - utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.CustomValue: utils.NOT_AVAILABLE, + utils.MetaACD: utils.NotAvailable, + utils.MetaTCD: utils.NotAvailable, + utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.CustomValue: utils.NotAvailable, } if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics, &utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "CustomStatProfile"}}, &metrics); err != nil { @@ -254,7 +254,7 @@ func testV1STSProcessEvent(t *testing.T) { utils.AccountField: "1001", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 135 * time.Second, - utils.COST: 123.0, + utils.Cost: 123.0, utils.PDD: 12 * time.Second, }, }, @@ -267,14 +267,14 @@ func testV1STSProcessEvent(t *testing.T) { } //process with one event (should be N/A becaus MinItems is 2) expectedMetrics := map[string]string{ - utils.MetaASR: utils.NOT_AVAILABLE, - utils.MetaACD: utils.NOT_AVAILABLE, - utils.MetaTCC: utils.NOT_AVAILABLE, - utils.MetaTCD: utils.NOT_AVAILABLE, - utils.MetaACC: utils.NOT_AVAILABLE, - utils.MetaPDD: utils.NOT_AVAILABLE, - utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: utils.NOT_AVAILABLE, - utils.MetaAverage + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: utils.NOT_AVAILABLE, + utils.MetaASR: utils.NotAvailable, + utils.MetaACD: utils.NotAvailable, + utils.MetaTCC: utils.NotAvailable, + utils.MetaTCD: utils.NotAvailable, + utils.MetaACC: utils.NotAvailable, + utils.MetaPDD: utils.NotAvailable, + utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: utils.NotAvailable, + utils.MetaAverage + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: utils.NotAvailable, } var metrics map[string]string if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics, @@ -347,7 +347,7 @@ func testV1STSProcessEvent(t *testing.T) { utils.MetaACC: "45.03333", utils.MetaTCD: "3m0s", utils.MetaTCC: "135.1", - utils.MetaPDD: utils.NOT_AVAILABLE, + utils.MetaPDD: utils.NotAvailable, utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: "180000000000", utils.MetaAverage + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: "60000000000", } @@ -408,7 +408,7 @@ func testV1STSGetStatsAfterRestart(t *testing.T) { utils.MetaACC: "45.03333", utils.MetaTCD: "3m0s", utils.MetaTCC: "135.1", - utils.MetaPDD: utils.NOT_AVAILABLE, + utils.MetaPDD: utils.NotAvailable, utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: "180000000000", utils.MetaAverage + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: "60000000000", } @@ -626,9 +626,9 @@ func testV1STSProcessMetricsWithFilter(t *testing.T) { expectedIDs := []string{"CustomStatProfile"} var metrics map[string]string expectedMetrics := map[string]string{ - utils.MetaACD: utils.NOT_AVAILABLE, - utils.MetaTCD: utils.NOT_AVAILABLE, - utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + "CustomValue": utils.NOT_AVAILABLE, + utils.MetaACD: utils.NotAvailable, + utils.MetaTCD: utils.NotAvailable, + utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + "CustomValue": utils.NotAvailable, } if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics, &utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}}, &metrics); err != nil { @@ -659,9 +659,9 @@ func testV1STSProcessMetricsWithFilter(t *testing.T) { } //verify metrics after first process expectedMetrics = map[string]string{ - utils.MetaACD: utils.NOT_AVAILABLE, + utils.MetaACD: utils.NotAvailable, utils.MetaTCD: "6s", - utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + "CustomValue": utils.NOT_AVAILABLE, + utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + "CustomValue": utils.NotAvailable, } if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics, &utils.TenantIDWithOpts{ @@ -748,8 +748,8 @@ func testV1STSProcessStaticMetrics(t *testing.T) { expectedIDs := []string{"StaticStatQueue"} var metrics map[string]string expectedMetrics := map[string]string{ - utils.MetaSum + utils.HashtagSep + "1": utils.NOT_AVAILABLE, - utils.MetaAverage + utils.HashtagSep + "2": utils.NOT_AVAILABLE, + utils.MetaSum + utils.HashtagSep + "1": utils.NotAvailable, + utils.MetaAverage + utils.HashtagSep + "2": utils.NotAvailable, } //process event var reply2 []string @@ -808,8 +808,8 @@ func testV1STSProcessStaticMetrics(t *testing.T) { t.Errorf("expecting: %+v, received reply: %s", utils.OK, result) } expectedMetrics = map[string]string{ - utils.MetaSum + utils.HashtagSep + "1": utils.NOT_AVAILABLE, - utils.MetaAverage + utils.HashtagSep + "2": utils.NOT_AVAILABLE, + utils.MetaSum + utils.HashtagSep + "1": utils.NotAvailable, + utils.MetaAverage + utils.HashtagSep + "2": utils.NotAvailable, } if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics, &utils.TenantIDWithOpts{ @@ -952,7 +952,7 @@ func testV1STSProcessCDRStat(t *testing.T) { //verify metrics var metrics map[string]string expectedMetrics := map[string]string{ - utils.MetaSum + utils.HashtagSep + "1": utils.NOT_AVAILABLE, + utils.MetaSum + utils.HashtagSep + "1": utils.NotAvailable, } //process event cc := &engine.CallCost{ @@ -970,13 +970,13 @@ func testV1STSProcessCDRStat(t *testing.T) { { UUID: "f9be602747f4", ID: "monetary", - Type: utils.MONETARY, + Type: utils.MetaMonetary, Value: 0.5, }, { UUID: "2e02510ab90a", ID: "voice", - Type: utils.VOICE, + Type: utils.MetaVoice, Value: 10, }, }, @@ -986,10 +986,10 @@ func testV1STSProcessCDRStat(t *testing.T) { cdr := &engine.CDR{ CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", @@ -1089,7 +1089,7 @@ func testV1STSOverWriteStats(t *testing.T) { var metrics map[string]string expectedMetrics := map[string]string{ - utils.MetaSum + utils.HashtagSep + "1": utils.NOT_AVAILABLE, + utils.MetaSum + utils.HashtagSep + "1": utils.NotAvailable, } if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics, &utils.TenantIDWithOpts{ @@ -1129,7 +1129,7 @@ func testV1STSOverWriteStats(t *testing.T) { var metrics2 map[string]string expectedMetrics2 := map[string]string{ - utils.MetaSum + utils.HashtagSep + "~*req.Test": utils.NOT_AVAILABLE, + utils.MetaSum + utils.HashtagSep + "~*req.Test": utils.NotAvailable, } if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics, &utils.TenantIDWithOpts{ @@ -1363,7 +1363,7 @@ func testV1STSV1GetStatQueuesForEventWithoutTenant(t *testing.T) { utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 45 * time.Second, utils.RunID: utils.MetaDefault, - utils.COST: 10.0, + utils.Cost: 10.0, utils.Destination: "1001", }, }, @@ -1422,7 +1422,7 @@ func testV1STSSimulateAccountUpdate(t *testing.T) { //verify metrics var metrics map[string]string expectedMetrics := map[string]string{ - utils.MetaSum + utils.HashtagSep + "~*asm.BalanceSummaries.HolidayBalance.Value": utils.NOT_AVAILABLE, + utils.MetaSum + utils.HashtagSep + "~*asm.BalanceSummaries.HolidayBalance.Value": utils.NotAvailable, } var reply2 []string @@ -1532,7 +1532,7 @@ func testV1STSGetStatQueueWithoutExpired(t *testing.T) { var metrics map[string]string expectedMetrics := map[string]string{ - utils.MetaTCD: utils.NOT_AVAILABLE, + utils.MetaTCD: utils.NotAvailable, } //process event var reply2 []string diff --git a/apier/v1/thresholds.go b/apier/v1/thresholds.go index a6a3c97a0..a064e83f5 100644 --- a/apier/v1/thresholds.go +++ b/apier/v1/thresholds.go @@ -88,7 +88,7 @@ func (apierSv1 *APIerSv1) GetThresholdProfileIDs(args *utils.PaginatorWithTenant if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - prfx := utils.ThresholdProfilePrefix + tnt + utils.CONCATENATED_KEY_SEP + prfx := utils.ThresholdProfilePrefix + tnt + utils.ConcatenatedKeySep keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx) if err != nil { return err @@ -112,7 +112,7 @@ func (apierSv1 *APIerSv1) GetThresholdProfileIDsCount(args *utils.TenantWithOpts tnt = apierSv1.Config.GeneralCfg().DefaultTenant } var keys []string - prfx := utils.ThresholdProfilePrefix + tnt + utils.CONCATENATED_KEY_SEP + prfx := utils.ThresholdProfilePrefix + tnt + utils.ConcatenatedKeySep if keys, err = apierSv1.DataManager.DataDB().GetKeysForPrefix(prfx); err != nil { return err } diff --git a/apier/v1/thresholds_it_test.go b/apier/v1/thresholds_it_test.go index 374461f9c..d2140c8f3 100644 --- a/apier/v1/thresholds_it_test.go +++ b/apier/v1/thresholds_it_test.go @@ -197,9 +197,9 @@ var ( utils.RunID: utils.MetaRaw, utils.OrderID: 123, utils.OriginHost: "192.168.1.1", - utils.Source: utils.UNIT_TEST, + utils.Source: utils.UnitTest, utils.OriginID: "dsafdsaf", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", @@ -210,8 +210,8 @@ var ( utils.PDD: 0 * time.Second, utils.AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), utils.Usage: 10 * time.Second, - utils.ROUTE: "SUPPL1", - utils.COST: -1.0, + utils.Route: "SUPPL1", + utils.Cost: -1.0, }, }, Opts: map[string]interface{}{ diff --git a/apier/v1/tpaccountprofiles_it_test.go b/apier/v1/tpaccountprofiles_it_test.go index e8f478717..b20f37db1 100644 --- a/apier/v1/tpaccountprofiles_it_test.go +++ b/apier/v1/tpaccountprofiles_it_test.go @@ -130,7 +130,7 @@ func testTPAcctPrfSetTPAcctPrf(t *testing.T) { ID: "MonetaryBalance", FilterIDs: []string{}, Weight: 10, - Type: utils.MONETARY, + Type: utils.MetaMonetary, CostIncrement: []*utils.TPBalanceCostIncrement{}, CostAttributes: []string{}, UnitFactors: []*utils.TPBalanceUnitFactor{}, @@ -177,7 +177,7 @@ func testTPAcctPrfUpdateTPAcctBal(t *testing.T) { ID: "MonetaryBalance2", FilterIDs: []string{}, Weight: 12, - Type: utils.MONETARY, + Type: utils.MetaMonetary, CostIncrement: []*utils.TPBalanceCostIncrement{}, CostAttributes: []string{}, UnitFactors: []*utils.TPBalanceUnitFactor{}, @@ -204,7 +204,7 @@ func testTPAcctPrfGetTPAcctBalAfterUpdate(t *testing.T) { ID: "MonetaryBalance2", FilterIDs: []string{}, Weight: 12, - Type: utils.MONETARY, + Type: utils.MetaMonetary, CostIncrement: []*utils.TPBalanceCostIncrement{}, CostAttributes: []string{}, UnitFactors: []*utils.TPBalanceUnitFactor{}, diff --git a/apier/v1/triggers.go b/apier/v1/triggers.go index 75af08da9..88da1093d 100644 --- a/apier/v1/triggers.go +++ b/apier/v1/triggers.go @@ -103,7 +103,7 @@ func (apierSv1 *APIerSv1) AddAccountActionTriggers(attr *AttrAddAccountActionTri } account.InitCounters() return 0, apierSv1.DataManager.SetAccount(account) - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACCOUNT_PREFIX+accID) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.AccountPrefix+accID) if err != nil { return } @@ -192,7 +192,7 @@ func (apierSv1 *APIerSv1) ResetAccountActionTriggers(attr AttrResetAccountAction account.ExecuteActionTriggers(nil) } return 0, apierSv1.DataManager.SetAccount(account) - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACCOUNT_PREFIX+accID) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.AccountPrefix+accID) if err != nil { *reply = err.Error() return err @@ -388,7 +388,7 @@ func (apierSv1 *APIerSv1) SetAccountActionTriggers(attr AttrSetAccountActionTrig } account.ExecuteActionTriggers(nil) return 0, apierSv1.DataManager.SetAccount(account) - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACCOUNT_PREFIX+accID) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.AccountPrefix+accID) if err != nil { *reply = err.Error() return err @@ -509,7 +509,7 @@ func (apierSv1 *APIerSv1) GetActionTriggers(attr *AttrGetActionTriggers, atrs *e } } else { - keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(utils.ACTION_TRIGGER_PREFIX) + keys, err := apierSv1.DataManager.DataDB().GetKeysForPrefix(utils.ActionTriggerPrefix) if err != nil { return err } @@ -517,7 +517,7 @@ func (apierSv1 *APIerSv1) GetActionTriggers(attr *AttrGetActionTriggers, atrs *e return utils.ErrNotFound } for _, key := range keys { - getAttrs, err := apierSv1.DataManager.GetActionTriggers(key[len(utils.ACTION_TRIGGER_PREFIX):], false, utils.NonTransactional) + getAttrs, err := apierSv1.DataManager.GetActionTriggers(key[len(utils.ActionTriggerPrefix):], false, utils.NonTransactional) if err != nil { return err } @@ -596,7 +596,7 @@ func (apierSv1 *APIerSv1) AddTriggeredAction(attr AttrAddActionTrigger, reply *s acnt.ActionTriggers = append(acnt.ActionTriggers, at) return 0, apierSv1.DataManager.SetAccount(acnt) - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACCOUNT_PREFIX+acntID) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.AccountPrefix+acntID) if err != nil { return err } diff --git a/apier/v1/triggers_test.go b/apier/v1/triggers_test.go index b6fc1a33a..b5103fbb9 100644 --- a/apier/v1/triggers_test.go +++ b/apier/v1/triggers_test.go @@ -61,7 +61,7 @@ func TestAttrSetActionTriggerUpdateActionTrigger(t *testing.T) { utils.BalanceExpirationDate: tNow, utils.BalanceTimingTags: []string{"*asap"}, utils.BalanceRatingSubject: "*zero", - utils.BalanceCategories: []string{utils.CALL}, + utils.BalanceCategories: []string{utils.Call}, utils.BalanceSharedGroups: []string{"SHRGroup"}, utils.BalanceBlocker: true, utils.BalanceDisabled: false, @@ -85,7 +85,7 @@ func TestAttrSetActionTriggerUpdateActionTrigger(t *testing.T) { Weight: utils.Float64Pointer(10), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("DST1", "DST2")), RatingSubject: utils.StringPointer("*zero"), - Categories: utils.StringMapPointer(utils.NewStringMap(utils.CALL)), + Categories: utils.StringMapPointer(utils.NewStringMap(utils.Call)), SharedGroups: utils.StringMapPointer(utils.NewStringMap("SHRGroup")), TimingIDs: utils.StringMapPointer(utils.NewStringMap("*asap")), Disabled: utils.BoolPointer(false), diff --git a/apier/v2/accounts.go b/apier/v2/accounts.go index d1922b2c3..fca08b897 100644 --- a/apier/v2/accounts.go +++ b/apier/v2/accounts.go @@ -36,7 +36,7 @@ func (apiv2 *APIerSv2) GetAccounts(attr *utils.AttrGetAccounts, reply *[]*engine var accountKeys []string var err error if len(attr.AccountIDs) == 0 { - if accountKeys, err = apiv2.DataManager.DataDB().GetKeysForPrefix(utils.ACCOUNT_PREFIX + tnt); err != nil { + if accountKeys, err = apiv2.DataManager.DataDB().GetKeysForPrefix(utils.AccountPrefix + tnt); err != nil { return err } } else { @@ -44,7 +44,7 @@ func (apiv2 *APIerSv2) GetAccounts(attr *utils.AttrGetAccounts, reply *[]*engine if len(acntID) == 0 { // Source of error returned from redis (key not found) continue } - accountKeys = append(accountKeys, utils.ACCOUNT_PREFIX+utils.ConcatenatedKey(tnt, acntID)) + accountKeys = append(accountKeys, utils.AccountPrefix+utils.ConcatenatedKey(tnt, acntID)) } } if len(accountKeys) == 0 { @@ -65,7 +65,7 @@ func (apiv2 *APIerSv2) GetAccounts(attr *utils.AttrGetAccounts, reply *[]*engine } retAccounts := make([]*engine.Account, 0) for _, acntKey := range limitedAccounts { - if acnt, err := apiv2.DataManager.GetAccount(acntKey[len(utils.ACCOUNT_PREFIX):]); err != nil && err != utils.ErrNotFound { // Not found is not an error here + if acnt, err := apiv2.DataManager.GetAccount(acntKey[len(utils.AccountPrefix):]); err != nil && err != utils.ErrNotFound { // Not found is not an error here return err } else if acnt != nil { if alNeg, has := attr.Filter[utils.AllowNegative]; has && alNeg != acnt.AllowNegative { @@ -89,7 +89,7 @@ func (apiv2 *APIerSv2) GetAccountsCount(attr *utils.AttrGetAccountsCount, reply tnt = apiv2.Config.GeneralCfg().DefaultTenant } var accountKeys []string - if accountKeys, err = apiv2.DataManager.DataDB().GetKeysForPrefix(utils.ACCOUNT_PREFIX + tnt); err != nil { + if accountKeys, err = apiv2.DataManager.DataDB().GetKeysForPrefix(utils.AccountPrefix + tnt); err != nil { return err } if len(accountKeys) == 0 { @@ -221,7 +221,7 @@ func (apiv2 *APIerSv2) SetAccount(attr *AttrSetAccount, reply *string) error { utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithOpts{ ArgsCache: map[string][]string{utils.AccountActionPlanIDs: {accID}, utils.ActionPlanIDs: apIDs}, }, reply) - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACTION_PLAN_PREFIX) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ActionPlanPrefix) if err != nil { return 0, err } @@ -257,7 +257,7 @@ func (apiv2 *APIerSv2) SetAccount(attr *AttrSetAccount, reply *string) error { } // All prepared, save account return 0, apiv2.DataManager.SetAccount(ub) - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACCOUNT_PREFIX+accID) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.AccountPrefix+accID) if err != nil { return utils.NewErrServerError(err) } diff --git a/apier/v2/apier.go b/apier/v2/apier.go index 1ef17d892..42112a8e9 100644 --- a/apier/v2/apier.go +++ b/apier/v2/apier.go @@ -181,7 +181,7 @@ func (apiv2 *APIerSv2) GetActions(attr *AttrGetActions, reply *map[string]engine var actionKeys []string var err error if len(attr.ActionIDs) == 0 { - if actionKeys, err = apiv2.DataManager.DataDB().GetKeysForPrefix(utils.ACTION_PREFIX); err != nil { + if actionKeys, err = apiv2.DataManager.DataDB().GetKeysForPrefix(utils.ActionPrefix); err != nil { return err } } else { @@ -189,7 +189,7 @@ func (apiv2 *APIerSv2) GetActions(attr *AttrGetActions, reply *map[string]engine if len(accID) == 0 { // Source of error returned from redis (key not found) continue } - actionKeys = append(actionKeys, utils.ACCOUNT_PREFIX+accID) + actionKeys = append(actionKeys, utils.AccountPrefix+accID) } } if len(actionKeys) == 0 { @@ -210,7 +210,7 @@ func (apiv2 *APIerSv2) GetActions(attr *AttrGetActions, reply *map[string]engine } retActions := make(map[string]engine.Actions) for _, accKey := range limitedActions { - key := accKey[len(utils.ACTION_PREFIX):] + key := accKey[len(utils.ActionPrefix):] acts, err := apiv2.DataManager.GetActions(key, false, utils.NonTransactional) if err != nil { return utils.NewErrServerError(err) @@ -231,7 +231,7 @@ type AttrGetActionsCount struct{} // returns ErrNotFound in case of 0 actions func (apiv2 *APIerSv2) GetActionsCount(attr *AttrGetActionsCount, reply *int) (err error) { var actionKeys []string - if actionKeys, err = apiv2.DataManager.DataDB().GetKeysForPrefix(utils.ACTION_PREFIX); err != nil { + if actionKeys, err = apiv2.DataManager.DataDB().GetKeysForPrefix(utils.ActionPrefix); err != nil { return err } *reply = len(actionKeys) @@ -280,7 +280,7 @@ func (apiv2 *APIerSv2) SetActions(attrs *utils.AttrSetActions, reply *string) er } } if !attrs.Overwrite { - if exists, err := apiv2.DataManager.HasData(utils.ACTION_PREFIX, attrs.ActionsId, ""); err != nil { + if exists, err := apiv2.DataManager.HasData(utils.ActionPrefix, attrs.ActionsId, ""); err != nil { return utils.NewErrServerError(err) } else if exists { return utils.ErrExists diff --git a/apier/v2/apierv2_it_test.go b/apier/v2/apierv2_it_test.go index cdff5e60a..8f67012f6 100644 --- a/apier/v2/apierv2_it_test.go +++ b/apier/v2/apierv2_it_test.go @@ -133,7 +133,7 @@ func testAPIerSv2itAddBalance(t *testing.T) { attrs := &utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "dan", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 5.0, Balance: map[string]interface{}{ utils.ID: utils.MetaDefault, @@ -147,8 +147,8 @@ func testAPIerSv2itAddBalance(t *testing.T) { var acnt engine.Account if err := apierRPC.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "dan"}, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY][0].Value != 5.0 { - t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MONETARY][0]) + } else if acnt.BalanceMap[utils.MetaMonetary][0].Value != 5.0 { + t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MetaMonetary][0]) } } @@ -175,9 +175,9 @@ func testAPIerSv2itSetAccountActionTriggers(t *testing.T) { AttrSetActionTrigger: v1.AttrSetActionTrigger{ GroupID: "MONITOR_MAX_BALANCE", ActionTrigger: map[string]interface{}{ - utils.ThresholdType: utils.TRIGGER_MAX_BALANCE, + utils.ThresholdType: utils.TriggerMaxBalance, utils.ThresholdValue: 50, - utils.BalanceType: utils.MONETARY, + utils.BalanceType: utils.MetaMonetary, utils.ActionsID: "DISABLE_ACCOUNT", }, }, @@ -207,7 +207,7 @@ func testAPIerSv2itFraudMitigation(t *testing.T) { attrs := &utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "dan", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 60.0, Balance: map[string]interface{}{ utils.ID: utils.MetaDefault, @@ -221,8 +221,8 @@ func testAPIerSv2itFraudMitigation(t *testing.T) { var acnt engine.Account if err := apierRPC.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "dan"}, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MONETARY][0].Value != 60.0 { - t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MONETARY][0]) + } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MetaMonetary][0].Value != 60.0 { + t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MetaMonetary][0]) } else if !acnt.Disabled { t.Fatalf("Received account: %+v", acnt) } @@ -239,8 +239,8 @@ func testAPIerSv2itFraudMitigation(t *testing.T) { acnt = engine.Account{} // gob doesn't update the fields with default values if err := apierRPC.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "dan"}, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MONETARY][0].Value != 60.0 { - t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MONETARY][0]) + } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MetaMonetary][0].Value != 60.0 { + t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MetaMonetary][0]) } else if acnt.Disabled { t.Fatalf("Received account: %+v", acnt) } @@ -250,7 +250,7 @@ func testAPIerSv2itSetAccountWithAP(t *testing.T) { argActs1 := utils.AttrSetActions{ActionsId: "TestAPIerSv2itSetAccountWithAP_ACT_1", Actions: []*utils.TPAction{ {Identifier: utils.TOPUP_RESET, - BalanceType: utils.MONETARY, Units: "5.0", Weight: 20.0}, + BalanceType: utils.MetaMonetary, Units: "5.0", Weight: 20.0}, }} var reply string if err := apierRPC.Call(utils.APIerSv2SetActions, &argActs1, &reply); err != nil { @@ -370,7 +370,7 @@ func testAPIerSv2itSetActionWithCategory(t *testing.T) { argActs1 := utils.AttrSetActions{ActionsId: "TestAPIerSv2itSetActionWithCategory_ACT", Actions: []*utils.TPAction{ {Identifier: utils.TOPUP_RESET, - BalanceType: utils.MONETARY, Categories: "test", Units: "5.0", Weight: 20.0}, + BalanceType: utils.MetaMonetary, Categories: "test", Units: "5.0", Weight: 20.0}, }} if err := apierRPC.Call(utils.APIerSv2SetActions, &argActs1, &reply); err != nil { @@ -388,10 +388,10 @@ func testAPIerSv2itSetActionWithCategory(t *testing.T) { if err := apierRPC.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "TestAPIerSv2itSetActionWithCategory"}, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MONETARY][0].Value != 5.0 { - t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MONETARY][0]) - } else if len(acnt.BalanceMap[utils.MONETARY][0].Categories) != 1 && - acnt.BalanceMap[utils.MONETARY][0].Categories["test"] != true { + } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MetaMonetary][0].Value != 5.0 { + t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MetaMonetary][0]) + } else if len(acnt.BalanceMap[utils.MetaMonetary][0].Categories) != 1 && + acnt.BalanceMap[utils.MetaMonetary][0].Categories["test"] != true { t.Fatalf("Unexpected category received: %+v", utils.ToJSON(acnt)) } } diff --git a/apier/v2/cdrs_it_test.go b/apier/v2/cdrs_it_test.go index 7356a3c91..81161b234 100644 --- a/apier/v2/cdrs_it_test.go +++ b/apier/v2/cdrs_it_test.go @@ -426,7 +426,7 @@ func testV2CDRsDifferentTenants(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaTenant, - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.RSRParsers{ &config.RSRParser{ Rules: "CustomTenant", @@ -435,7 +435,7 @@ func testV2CDRsDifferentTenants(t *testing.T) { }, { Path: utils.MetaReq + utils.NestingSep + utils.Tenant, - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.RSRParsers{ &config.RSRParser{ Rules: "CustomTenant", @@ -534,7 +534,7 @@ func testV2CDRsRemoveRatingProfiles(t *testing.T) { var reply string if err := cdrsRpc.Call(utils.APIerSv1RemoveRatingProfile, &v1.AttrRemoveRatingProfile{ Tenant: "cgrates.org", - Category: utils.CALL, + Category: utils.Call, Subject: utils.MetaAny, }, &reply); err != nil { t.Error(err) @@ -543,7 +543,7 @@ func testV2CDRsRemoveRatingProfiles(t *testing.T) { } if err := cdrsRpc.Call(utils.APIerSv1RemoveRatingProfile, &v1.AttrRemoveRatingProfile{ Tenant: "cgrates.org", - Category: utils.CALL, + Category: utils.Call, Subject: "SUPPLIER1", }, &reply); err != nil { t.Error(err) @@ -728,7 +728,7 @@ func testV2CDRsSetThreshold(t *testing.T) { var reply string if err := cdrsRpc.Call(utils.APIerSv2SetActions, &utils.AttrSetActions{ ActionsId: "ACT_LOG", - Actions: []*utils.TPAction{{Identifier: utils.LOG}}, + Actions: []*utils.TPAction{{Identifier: utils.MetaLog}}, }, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error(err) } else if reply != utils.OK { @@ -765,7 +765,7 @@ func testV2CDRsSetThreshold(t *testing.T) { attrs := &utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "1005", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 1, Balance: map[string]interface{}{ utils.ID: utils.MetaDefault, @@ -826,7 +826,7 @@ func testv2CDRsGetCDRsDest(t *testing.T) { Tenant: "cgrates.org", Event: map[string]interface{}{ utils.CGRID: "9b3cd5e698af94f8916220866c831a982ed16318", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.RunID: "raw", utils.OriginID: "25160047719:0", utils.OriginHost: "192.168.1.1", @@ -897,7 +897,7 @@ func testV2CDRsRerate(t *testing.T) { attrs := &utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "voiceAccount", - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 600000000000, Balance: map[string]interface{}{ utils.ID: utils.MetaDefault, @@ -913,8 +913,8 @@ func testV2CDRsRerate(t *testing.T) { if err := cdrsRpc.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "voiceAccount"}, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.VOICE][0].Value != 600000000000 { - t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.VOICE][0]) + } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MetaVoice][0].Value != 600000000000 { + t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MetaVoice][0]) } args := &engine.ArgV1ProcessEvent{ @@ -947,8 +947,8 @@ func testV2CDRsRerate(t *testing.T) { if err := cdrsRpc.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "voiceAccount"}, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.VOICE][0].Value != 480000000000 { - t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.VOICE][0]) + } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MetaVoice][0].Value != 480000000000 { + t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MetaVoice][0]) } args2 := &engine.ArgV1ProcessEvent{ @@ -980,8 +980,8 @@ func testV2CDRsRerate(t *testing.T) { if err := cdrsRpc.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "voiceAccount"}, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.VOICE][0].Value != 540000000000 { - t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.VOICE][0]) + } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MetaVoice][0].Value != 540000000000 { + t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MetaVoice][0]) } } @@ -1023,8 +1023,8 @@ func testv2CDRsDynaPrepaid(t *testing.T) { if err := cdrsRpc.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "CreatedAccount"}, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY][0].Value != 9.9694 { - t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MONETARY][0]) + } else if acnt.BalanceMap[utils.MetaMonetary][0].Value != 9.9694 { + t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MetaMonetary][0]) } } @@ -1067,7 +1067,7 @@ func testV2CDRsDuplicateCDRs(t *testing.T) { attrs := &utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "testV2CDRsDuplicateCDRs", - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 600000000000, Balance: map[string]interface{}{ utils.ID: utils.MetaDefault, @@ -1083,8 +1083,8 @@ func testV2CDRsDuplicateCDRs(t *testing.T) { if err := cdrsRpc.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "testV2CDRsDuplicateCDRs"}, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.VOICE][0].Value != 600000000000 { - t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.VOICE][0]) + } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MetaVoice][0].Value != 600000000000 { + t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MetaVoice][0]) } args := &engine.ArgV1ProcessEvent{ @@ -1117,8 +1117,8 @@ func testV2CDRsDuplicateCDRs(t *testing.T) { if err := cdrsRpc.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "testV2CDRsDuplicateCDRs"}, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.VOICE][0].Value != 480000000000 { - t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.VOICE][0]) + } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MetaVoice][0].Value != 480000000000 { + t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MetaVoice][0]) } var wg sync.WaitGroup @@ -1158,8 +1158,8 @@ func testV2CDRsDuplicateCDRs(t *testing.T) { if err := cdrsRpc.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "testV2CDRsDuplicateCDRs"}, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.VOICE][0].Value != 540000000000 { - t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.VOICE][0]) + } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MetaVoice][0].Value != 540000000000 { + t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MetaVoice][0]) } } diff --git a/apier/v2/cdrs_offline_it_test.go b/apier/v2/cdrs_offline_it_test.go index e7a45f2c8..f2bb3f15a 100644 --- a/apier/v2/cdrs_offline_it_test.go +++ b/apier/v2/cdrs_offline_it_test.go @@ -123,7 +123,7 @@ func testV2CDRsOfflineBalanceUpdate(t *testing.T) { attrs := &utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "test", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 10.0, Balance: map[string]interface{}{ utils.ID: utils.MetaDefault, @@ -137,8 +137,8 @@ func testV2CDRsOfflineBalanceUpdate(t *testing.T) { var acnt *engine.Account if err := cdrsOfflineRpc.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "test"}, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MONETARY][0].Value != 10.0 { - t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MONETARY][0]) + } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MetaMonetary][0].Value != 10.0 { + t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MetaMonetary][0]) } var thReply *engine.ThresholdProfile @@ -146,7 +146,7 @@ func testV2CDRsOfflineBalanceUpdate(t *testing.T) { //create a log action attrsAA := &utils.AttrSetActions{ActionsId: "ACT_LOG", Actions: []*utils.TPAction{ - {Identifier: utils.LOG}, + {Identifier: utils.MetaLog}, }} if err := cdrsOfflineRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) @@ -216,11 +216,11 @@ func testV2CDRsOfflineBalanceUpdate(t *testing.T) { func testV2CDRsOfflineExpiryBalance(t *testing.T) { var reply string acc := &utils.AttrSetActions{ActionsId: "ACT_TOPUP_TEST2", Actions: []*utils.TPAction{ - {Identifier: utils.TOPUP, BalanceType: utils.MONETARY, BalanceId: "BalanceExpired1", Units: "5", + {Identifier: utils.TOPUP, BalanceType: utils.MetaMonetary, BalanceId: "BalanceExpired1", Units: "5", ExpiryTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC).String(), BalanceWeight: "10", Weight: 20.0}, - {Identifier: utils.TOPUP, BalanceType: utils.MONETARY, BalanceId: "BalanceExpired2", Units: "10", + {Identifier: utils.TOPUP, BalanceType: utils.MetaMonetary, BalanceId: "BalanceExpired2", Units: "10", ExpiryTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC).String(), BalanceWeight: "10", Weight: 20.0}, - {Identifier: utils.TOPUP, BalanceType: utils.MONETARY, BalanceId: "NewBalance", Units: "10", + {Identifier: utils.TOPUP, BalanceType: utils.MetaMonetary, BalanceId: "NewBalance", Units: "10", ExpiryTime: utils.UNLIMITED, BalanceWeight: "10", Weight: 20.0}, }} if err := cdrsOfflineRpc.Call(utils.APIerSv2SetActions, acc, &reply); err != nil && err.Error() != utils.ErrExists.Error() { @@ -251,7 +251,7 @@ func testV2CDRsOfflineExpiryBalance(t *testing.T) { if err := cdrsOfflineRpc.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "test2"}, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].Len() != 1 { + } else if acnt.BalanceMap[utils.MetaMonetary].Len() != 1 { t.Errorf("Unexpected balance received: %+v", utils.ToIJSON(acnt)) } @@ -260,7 +260,7 @@ func testV2CDRsOfflineExpiryBalance(t *testing.T) { //create a log action attrsA := &utils.AttrSetActions{ActionsId: "ACT_LOG", Actions: []*utils.TPAction{ - {Identifier: utils.LOG}, + {Identifier: utils.MetaLog}, }} if err := cdrsOfflineRpc.Call(utils.APIerSv2SetActions, attrsA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) @@ -335,7 +335,7 @@ func testV2CDRsBalancesWithSameWeight(t *testing.T) { attrs := &utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "specialTest", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 10.0, Balance: map[string]interface{}{ utils.ID: "SpecialBalance1", @@ -354,8 +354,8 @@ func testV2CDRsBalancesWithSameWeight(t *testing.T) { if err := cdrsOfflineRpc.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "specialTest"}, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap) != 1 || len(acnt.BalanceMap[utils.MONETARY]) != 2 { - t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MONETARY]) + } else if len(acnt.BalanceMap) != 1 || len(acnt.BalanceMap[utils.MetaMonetary]) != 2 { + t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MetaMonetary]) } cgrEv := &utils.CGREvent{ diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index 13b4acbb7..452a6fa82 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -49,7 +49,7 @@ import ( var ( cgrEngineFlags = flag.NewFlagSet(utils.CgrEngine, flag.ContinueOnError) - cfgPath = cgrEngineFlags.String(utils.CfgPathCgr, utils.CONFIG_PATH, "Configuration directory path.") + cfgPath = cgrEngineFlags.String(utils.CfgPathCgr, utils.ConfigPath, "Configuration directory path.") version = cgrEngineFlags.Bool(utils.ElsVersionLow, false, "Prints the application version.") checkConfig = cgrEngineFlags.Bool(utils.CheckCfgCgr, false, "Verify the config without starting the engine") pidFile = cgrEngineFlags.String(utils.PidCgr, utils.EmptyString, "Write pid file") @@ -362,7 +362,7 @@ func runPreload(loader *services.LoaderService, internalLoaderSChan chan rpcclie internalLoaderSChan <- ldrs var reply string - for _, loaderID := range strings.Split(*preload, utils.FIELDS_SEP) { + for _, loaderID := range strings.Split(*preload, utils.FieldsSep) { if err := loader.GetLoaderS().V1Load(&loaders.ArgsProcessFolder{ ForceLock: true, // force lock will unlock the file in case is locked and return error LoaderID: loaderID, diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index 87aa2b9f5..84db64f90 100755 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -297,7 +297,7 @@ func getLoader(cfg *config.CGRConfig) (loader engine.LoadReader, err error) { loader = storDB return } - if gprefix := utils.MetaGoogleAPI + utils.CONCATENATED_KEY_SEP; strings.HasPrefix(*dataPath, gprefix) { // Default load from csv files to dataDb + if gprefix := utils.MetaGoogleAPI + utils.ConcatenatedKeySep; strings.HasPrefix(*dataPath, gprefix) { // Default load from csv files to dataDb return engine.NewGoogleCSVStorage(cfg.LoaderCgrCfg().FieldSeparator, strings.TrimPrefix(*dataPath, gprefix)) } if !utils.IsURL(*dataPath) { diff --git a/cmd/cgr-loader/cgr-loader_it_test.go b/cmd/cgr-loader/cgr-loader_it_test.go index 4335b89d6..4f2f2627c 100644 --- a/cmd/cgr-loader/cgr-loader_it_test.go +++ b/cmd/cgr-loader/cgr-loader_it_test.go @@ -284,7 +284,7 @@ func testLoadItCheckAttributes(t *testing.T) { { FilterIDs: []string{}, Path: utils.MetaReq + utils.NestingSep + "Password", - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep), }, }, diff --git a/cmd/cgr-migrator/cgr-migrator.go b/cmd/cgr-migrator/cgr-migrator.go index 9c1e7b26b..cd1d6512a 100755 --- a/cmd/cgr-migrator/cgr-migrator.go +++ b/cmd/cgr-migrator/cgr-migrator.go @@ -149,7 +149,7 @@ func main() { // inDataDB if *inDataDBType != dfltCfg.DataDbCfg().DataDbType { - mgrCfg.DataDbCfg().DataDbType = strings.TrimPrefix(*inDataDBType, utils.MASK_CHAR) + mgrCfg.DataDbCfg().DataDbType = strings.TrimPrefix(*inDataDBType, utils.MaskChar) } if *inDataDBHost != dfltCfg.DataDbCfg().DataDbHost { mgrCfg.DataDbCfg().DataDbHost = *inDataDBHost @@ -206,7 +206,7 @@ func main() { mgrCfg.MigratorCgrCfg().OutDataDBType = mgrCfg.DataDbCfg().DataDbType } } else { - mgrCfg.MigratorCgrCfg().OutDataDBType = strings.TrimPrefix(*outDataDBType, utils.MASK_CHAR) + mgrCfg.MigratorCgrCfg().OutDataDBType = strings.TrimPrefix(*outDataDBType, utils.MaskChar) } if *outDataDBHost == utils.MetaDataDB { @@ -285,7 +285,7 @@ func main() { // inStorDB if *inStorDBType != dfltCfg.StorDbCfg().Type { - mgrCfg.StorDbCfg().Type = strings.TrimPrefix(*inStorDBType, utils.MASK_CHAR) + mgrCfg.StorDbCfg().Type = strings.TrimPrefix(*inStorDBType, utils.MaskChar) } if *inStorDBHost != dfltCfg.StorDbCfg().Host { mgrCfg.StorDbCfg().Host = *inStorDBHost @@ -309,7 +309,7 @@ func main() { mgrCfg.MigratorCgrCfg().OutStorDBType = mgrCfg.StorDbCfg().Type } } else { - mgrCfg.MigratorCgrCfg().OutStorDBType = strings.TrimPrefix(*outStorDBType, utils.MASK_CHAR) + mgrCfg.MigratorCgrCfg().OutStorDBType = strings.TrimPrefix(*outStorDBType, utils.MaskChar) } if *outStorDBHost == utils.MetaStorDB { if dfltCfg.MigratorCgrCfg().OutStorDBHost == mgrCfg.MigratorCgrCfg().OutStorDBHost { @@ -387,7 +387,7 @@ func main() { config.SetCgrConfig(mgrCfg) if exec != nil && *exec != utils.EmptyString { // Run migrator migrstats := make(map[string]int) - mig := strings.Split(*exec, utils.FIELDS_SEP) + mig := strings.Split(*exec, utils.FieldsSep) err, migrstats = m.Migrate(mig) if err != nil { log.Fatal(err) diff --git a/cmd/cgr-tester/cdr_repl/process_cdr.go b/cmd/cgr-tester/cdr_repl/process_cdr.go index 1994abecb..44bc25cf1 100644 --- a/cmd/cgr-tester/cdr_repl/process_cdr.go +++ b/cmd/cgr-tester/cdr_repl/process_cdr.go @@ -51,7 +51,7 @@ func main() { cdrs := make([]*engine.CDR, 0) for i := 0; i < 10000; i++ { cdr := &engine.CDR{OriginID: fmt.Sprintf("httpjsonrpc_%d", i), - ToR: utils.VOICE, OriginHost: "192.168.1.1", Source: "UNKNOWN", RequestType: utils.MetaPseudoPrepaid, + ToR: utils.MetaVoice, OriginHost: "192.168.1.1", Source: "UNKNOWN", RequestType: utils.MetaPseudoPrepaid, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC), AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}} diff --git a/cmd/cgr-tester/cgr-tester.go b/cmd/cgr-tester/cgr-tester.go index 4f53b1ce1..0a2753e50 100644 --- a/cmd/cgr-tester/cgr-tester.go +++ b/cmd/cgr-tester/cgr-tester.go @@ -64,7 +64,7 @@ var ( dbQueryTimeout = cgrTesterFlags.String("query_timeout", utils.IfaceAsString(cgrConfig.DataDbCfg().Opts[utils.QueryTimeoutCfg]), "The timeout for queries") raterAddress = cgrTesterFlags.String("rater_address", "", "Rater address for remote tests. Empty for internal rater.") - tor = cgrTesterFlags.String("tor", utils.VOICE, "The type of record to use in queries.") + tor = cgrTesterFlags.String("tor", utils.MetaVoice, "The type of record to use in queries.") category = cgrTesterFlags.String("category", "call", "The Record category to test.") tenant = cgrTesterFlags.String("tenant", "cgrates.org", "The type of record to use in queries.") subject = cgrTesterFlags.String("subject", "1001", "The rating subject to use in queries.") diff --git a/config/config.go b/config/config.go index 79f0a4e8e..fefd22714 100644 --- a/config/config.go +++ b/config/config.go @@ -1317,7 +1317,7 @@ func (cfg *CGRConfig) loadConfigFromPath(path string, loadFuncs []func(jsnCfg *C return utils.ErrPathNotReachable(path) } return - } else if !fi.IsDir() && path != utils.CONFIG_PATH { // If config dir defined, needs to exist, not checking for default + } else if !fi.IsDir() && path != utils.ConfigPath { // If config dir defined, needs to exist, not checking for default return fmt.Errorf("path: %s not a directory", path) } diff --git a/config/config_json_test.go b/config/config_json_test.go index c0898ebdc..db77393b3 100644 --- a/config/config_json_test.go +++ b/config/config_json_test.go @@ -652,16 +652,16 @@ func TestDfRalsJsonCfg(t *testing.T) { Rp_subject_prefix_matching: utils.BoolPointer(false), Remove_expired: utils.BoolPointer(true), Max_computed_usage: &map[string]string{ - utils.MetaAny: "189h", - utils.VOICE: "72h", - utils.DATA: "107374182400", - utils.SMS: "10000", - utils.MMS: "10000", + utils.MetaAny: "189h", + utils.MetaVoice: "72h", + utils.MetaData: "107374182400", + utils.MetaSMS: "10000", + utils.MetaMMS: "10000", }, Max_increments: utils.IntPointer(1000000), Balance_rating_subject: &map[string]string{ - utils.MetaAny: "*zero1ns", - utils.VOICE: "*zero1s", + utils.MetaAny: "*zero1ns", + utils.MetaVoice: "*zero1s", }, Dynaprepaid_actionplans: &[]string{}, } @@ -2165,7 +2165,7 @@ func TestDfTemplateSJsonCfg(t *testing.T) { { Tag: utils.StringPointer("Request"), Path: utils.StringPointer(fmt.Sprintf("%s.Request", utils.MetaRep)), - Type: utils.StringPointer(utils.META_CONSTANT), + Type: utils.StringPointer(utils.MetaConstant), Value: utils.StringPointer("SIP/2.0 500 Internal Server Error"), Mandatory: utils.BoolPointer(true)}, }, @@ -2199,7 +2199,7 @@ func TestDfTemplateSJsonCfg(t *testing.T) { { Tag: utils.StringPointer("ResultCode"), Path: utils.StringPointer(fmt.Sprintf("%s.Result-Code", utils.MetaRep)), - Type: utils.StringPointer(utils.META_CONSTANT), + Type: utils.StringPointer(utils.MetaConstant), Value: utils.StringPointer("2001")}, { Tag: utils.StringPointer("OriginHost"), @@ -2310,7 +2310,7 @@ func TestDfTemplateSJsonCfg(t *testing.T) { { Tag: utils.StringPointer("ReAuthRequestType"), Path: utils.StringPointer(fmt.Sprintf("%s.Re-Auth-Request-Type", utils.MetaDiamreq)), - Type: utils.StringPointer(utils.META_CONSTANT), + Type: utils.StringPointer(utils.MetaConstant), Value: utils.StringPointer("0")}, }, } diff --git a/config/config_test.go b/config/config_test.go index e3b39749d..8dff772f8 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -403,11 +403,11 @@ func TestCgrCfgJSONDefaultsRALs(t *testing.T) { t.Errorf("Expecting: false , received: %+v", cgrCfg.RalsCfg().RpSubjectPrefixMatching) } eMaxCU := map[string]time.Duration{ - utils.MetaAny: 189 * time.Hour, - utils.VOICE: 72 * time.Hour, - utils.DATA: 107374182400, - utils.SMS: 10000, - utils.MMS: 10000, + utils.MetaAny: 189 * time.Hour, + utils.MetaVoice: 72 * time.Hour, + utils.MetaData: 107374182400, + utils.MetaSMS: 10000, + utils.MetaMMS: 10000, } if !reflect.DeepEqual(eMaxCU, cgrCfg.RalsCfg().MaxComputedUsage) { t.Errorf("Expecting: %+v , received: %+v", eMaxCU, cgrCfg.RalsCfg().MaxComputedUsage) @@ -416,8 +416,8 @@ func TestCgrCfgJSONDefaultsRALs(t *testing.T) { t.Errorf("Expecting: 1000000 , received: %+v", cgrCfg.RalsCfg().MaxIncrements) } eBalRatingSbj := map[string]string{ - utils.MetaAny: "*zero1ns", - utils.VOICE: "*zero1s", + utils.MetaAny: "*zero1ns", + utils.MetaVoice: "*zero1s", } if !reflect.DeepEqual(eBalRatingSbj, cgrCfg.RalsCfg().BalanceRatingSubject) { t.Errorf("Expecting: %+v , received: %+v", eBalRatingSbj, cgrCfg.RalsCfg().BalanceRatingSubject) diff --git a/config/configsanity.go b/config/configsanity.go index 28985440b..caa2be5d0 100644 --- a/config/configsanity.go +++ b/config/configsanity.go @@ -134,7 +134,7 @@ func (cfg *CGRConfig) checkConfigSanity() error { } for _, field := range data.Fields { - if field.Type != utils.META_COMPOSED && field.Type != utils.MetaString && field.Type != utils.MetaVariable { + if field.Type != utils.MetaComposed && field.Type != utils.MetaString && field.Type != utils.MetaVariable { return fmt.Errorf("<%s> invalid field type %s for %s at %s", utils.LoaderS, field.Type, data.Type, field.Tag) } if field.Path == utils.EmptyString { diff --git a/config/configsanity_test.go b/config/configsanity_test.go index cf8b2ff01..e7f5e485f 100644 --- a/config/configsanity_test.go +++ b/config/configsanity_test.go @@ -211,7 +211,7 @@ func TestConfigSanityLoaders(t *testing.T) { Data: []*LoaderDataType{{ Type: utils.MetaStats, Fields: []*FCTemplate{{ - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Tag: "test1", Path: utils.EmptyString, }}, diff --git a/config/generalcfg_test.go b/config/generalcfg_test.go index f5973cef8..b4aa8a86d 100644 --- a/config/generalcfg_test.go +++ b/config/generalcfg_test.go @@ -36,7 +36,7 @@ func TestGeneralCfgloadFromJsonCfg(t *testing.T) { Min_call_duration: utils.StringPointer("0s"), Max_call_duration: utils.StringPointer("3h0m0s"), Default_request_type: utils.StringPointer(utils.MetaRated), - Default_category: utils.StringPointer(utils.CALL), + Default_category: utils.StringPointer(utils.Call), Default_tenant: utils.StringPointer("cgrates.org"), Default_timezone: utils.StringPointer("Local"), Connect_attempts: utils.IntPointer(3), @@ -58,7 +58,7 @@ func TestGeneralCfgloadFromJsonCfg(t *testing.T) { PosterAttempts: 3, FailedPostsDir: "/var/spool/cgrates/failed_posts", DefaultReqType: utils.MetaRated, - DefaultCategory: utils.CALL, + DefaultCategory: utils.Call, DefaultTenant: "cgrates.org", DefaultTimezone: "Local", ConnectAttempts: 3, @@ -253,7 +253,7 @@ func TestGeneralCfgClone(t *testing.T) { PosterAttempts: 3, FailedPostsDir: "/var/spool/cgrates/failed_posts", DefaultReqType: utils.MetaRated, - DefaultCategory: utils.CALL, + DefaultCategory: utils.Call, DefaultTenant: "cgrates.org", DefaultTimezone: "Local", ConnectAttempts: 3, diff --git a/config/httpagntcfg_test.go b/config/httpagntcfg_test.go index 366301c89..f08001c17 100644 --- a/config/httpagntcfg_test.go +++ b/config/httpagntcfg_test.go @@ -44,7 +44,7 @@ func TestHttpAgentCfgsloadFromJsonCfgCase1(t *testing.T) { { Tag: utils.StringPointer("Allow"), Path: utils.StringPointer("response.Allow"), - Type: utils.StringPointer(utils.META_CONSTANT), + Type: utils.StringPointer(utils.MetaConstant), Value: utils.StringPointer("1"), Mandatory: utils.BoolPointer(true), Layout: utils.StringPointer("2006-01-02T15:04:05Z07:00"), @@ -106,7 +106,7 @@ func TestHttpAgentCfgsloadFromJsonCfgCase2(t *testing.T) { { Tag: utils.StringPointer("Allow"), Path: utils.StringPointer("response.Allow"), - Type: utils.StringPointer(utils.META_CONSTANT), + Type: utils.StringPointer(utils.MetaConstant), Value: utils.StringPointer("1"), Mandatory: utils.BoolPointer(true), Layout: utils.StringPointer("2006-01-02T15:04:05Z07:00"), @@ -122,7 +122,7 @@ func TestHttpAgentCfgsloadFromJsonCfgCase2(t *testing.T) { { Tag: utils.StringPointer("RequestType"), Path: utils.StringPointer("RequestType"), - Type: utils.StringPointer(utils.META_CONSTANT), + Type: utils.StringPointer(utils.MetaConstant), Value: utils.StringPointer("*pseudoprepaid"), Mandatory: utils.BoolPointer(true), Layout: utils.StringPointer("2006-01-02T15:04:05Z07:00"), @@ -132,7 +132,7 @@ func TestHttpAgentCfgsloadFromJsonCfgCase2(t *testing.T) { { Tag: utils.StringPointer("CDR_ID"), Path: utils.StringPointer("CDR_RESPONSE.CDR_ID"), - Type: utils.StringPointer(utils.META_COMPOSED), + Type: utils.StringPointer(utils.MetaComposed), Value: utils.StringPointer("~*req.CDR_ID"), Mandatory: utils.BoolPointer(true), Layout: utils.StringPointer("2006-01-02T15:04:05Z07:00"), @@ -174,7 +174,7 @@ func TestHttpAgentCfgsloadFromJsonCfgCase2(t *testing.T) { ReplyFields: []*FCTemplate{{ Tag: "Allow", Path: "response.Allow", - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: NewRSRParsersMustCompile("1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, @@ -188,7 +188,7 @@ func TestHttpAgentCfgsloadFromJsonCfgCase2(t *testing.T) { RequestFields: []*FCTemplate{{ Tag: "RequestType", Path: "RequestType", - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: NewRSRParsersMustCompile("*pseudoprepaid", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, @@ -196,7 +196,7 @@ func TestHttpAgentCfgsloadFromJsonCfgCase2(t *testing.T) { ReplyFields: []*FCTemplate{{ Tag: "CDR_ID", Path: "CDR_RESPONSE.CDR_ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: NewRSRParsersMustCompile("~*req.CDR_ID", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, @@ -287,7 +287,7 @@ func TestHttpAgentCfgloadFromJsonCfgCase4(t *testing.T) { { Tag: utils.StringPointer("Allow"), Path: utils.StringPointer("response.Allow"), - Type: utils.StringPointer(utils.META_CONSTANT), + Type: utils.StringPointer(utils.MetaConstant), Value: utils.StringPointer("1"), Mandatory: utils.BoolPointer(true), Layout: utils.StringPointer("2006-01-02T15:04:05Z07:00"), @@ -303,7 +303,7 @@ func TestHttpAgentCfgloadFromJsonCfgCase4(t *testing.T) { { Tag: utils.StringPointer("RequestType"), Path: utils.StringPointer("RequestType"), - Type: utils.StringPointer(utils.META_CONSTANT), + Type: utils.StringPointer(utils.MetaConstant), Value: utils.StringPointer("*pseudoprepaid"), Mandatory: utils.BoolPointer(true), Layout: utils.StringPointer("2006-01-02T15:04:05Z07:00"), @@ -313,7 +313,7 @@ func TestHttpAgentCfgloadFromJsonCfgCase4(t *testing.T) { { Tag: utils.StringPointer("CDR_ID"), Path: utils.StringPointer("CDR_RESPONSE.CDR_ID"), - Type: utils.StringPointer(utils.META_COMPOSED), + Type: utils.StringPointer(utils.MetaComposed), Value: utils.StringPointer("~*req.CDR_ID"), Mandatory: utils.BoolPointer(true), Layout: utils.StringPointer("2006-01-02T15:04:05Z07:00"), diff --git a/config/loaderscfg_test.go b/config/loaderscfg_test.go index f4c7eaa6d..52e55bd23 100644 --- a/config/loaderscfg_test.go +++ b/config/loaderscfg_test.go @@ -79,7 +79,7 @@ func TestLoaderSCfgloadFromJsonCfgCase1(t *testing.T) { Path: "Tenant", pathSlice: []string{"Tenant"}, pathItems: utils.PathItems{{Field: "Tenant"}}, - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: val, Mandatory: true, Layout: time.RFC3339, @@ -423,7 +423,7 @@ func TestLoaderSCfgsClone(t *testing.T) { Path: "Tenant", pathSlice: []string{"Tenant"}, pathItems: utils.PathItems{{Field: "Tenant"}}, - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: NewRSRParsersMustCompile("cgrate.org", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, diff --git a/config/migratorcfg_test.go b/config/migratorcfg_test.go index aac58a7cd..c55d650e0 100644 --- a/config/migratorcfg_test.go +++ b/config/migratorcfg_test.go @@ -32,7 +32,7 @@ func TestMigratorCgrCfgloadFromJsonCfg(t *testing.T) { Out_dataDB_name: utils.StringPointer("10"), Out_dataDB_user: utils.StringPointer(utils.CGRateSLwr), Out_dataDB_password: utils.StringPointer(utils.EmptyString), - Out_dataDB_encoding: utils.StringPointer(utils.MSGPACK), + Out_dataDB_encoding: utils.StringPointer(utils.MsgPack), Out_storDB_type: utils.StringPointer(utils.MySQL), Out_storDB_host: utils.StringPointer("127.0.0.1"), Out_storDB_port: utils.StringPointer("3306"), @@ -54,7 +54,7 @@ func TestMigratorCgrCfgloadFromJsonCfg(t *testing.T) { OutDataDBName: "10", OutDataDBUser: utils.CGRateSLwr, OutDataDBPassword: utils.EmptyString, - OutDataDBEncoding: utils.MSGPACK, + OutDataDBEncoding: utils.MsgPack, OutStorDBType: utils.MySQL, OutStorDBHost: "127.0.0.1", OutStorDBPort: "3306", @@ -223,7 +223,7 @@ func TestMigratorCgrCfgClone(t *testing.T) { OutDataDBName: "10", OutDataDBUser: utils.CGRateSLwr, OutDataDBPassword: utils.EmptyString, - OutDataDBEncoding: utils.MSGPACK, + OutDataDBEncoding: utils.MsgPack, OutStorDBType: utils.MySQL, OutStorDBHost: "127.0.0.1", OutStorDBPort: "3306", diff --git a/config/radiuscfg_test.go b/config/radiuscfg_test.go index f2259241d..ed6895846 100644 --- a/config/radiuscfg_test.go +++ b/config/radiuscfg_test.go @@ -46,7 +46,7 @@ func TestRadiusAgentCfgloadFromJsonCfgCase1(t *testing.T) { { Tag: utils.StringPointer("Allow"), Path: utils.StringPointer("*rep.response.Allow"), - Type: utils.StringPointer(utils.META_CONSTANT), + Type: utils.StringPointer(utils.MetaConstant), Value: utils.StringPointer("1"), Mandatory: utils.BoolPointer(true), Layout: utils.StringPointer(string(time.RFC3339)), @@ -75,7 +75,7 @@ func TestRadiusAgentCfgloadFromJsonCfgCase1(t *testing.T) { { Tag: "Allow", Path: "*rep.response.Allow", - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: NewRSRParsersMustCompile("1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, @@ -248,7 +248,7 @@ func TestRadiusAgentCfgClone(t *testing.T) { { Tag: "Allow", Path: "*rep.response.Allow", - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: NewRSRParsersMustCompile("1", utils.InfieldSep), Mandatory: true, Layout: time.RFC3339, diff --git a/config/ralscfg.go b/config/ralscfg.go index de61c9c4e..9f4c8c4f0 100644 --- a/config/ralscfg.go +++ b/config/ralscfg.go @@ -150,7 +150,7 @@ func (ralsCfg *RalsCfg) AsMapInterface() (initialMP map[string]interface{}) { } maxComputed := make(map[string]interface{}) for key, item := range ralsCfg.MaxComputedUsage { - if key == utils.MetaAny || key == utils.VOICE { + if key == utils.MetaAny || key == utils.MetaVoice { maxComputed[key] = item.String() } else { maxComputed[key] = strconv.Itoa(int(item)) diff --git a/config/ralscfg_test.go b/config/ralscfg_test.go index 27130ce1b..90171264b 100644 --- a/config/ralscfg_test.go +++ b/config/ralscfg_test.go @@ -34,16 +34,16 @@ func TestRalsCfgFromJsonCfgCase1(t *testing.T) { Rp_subject_prefix_matching: utils.BoolPointer(true), Remove_expired: utils.BoolPointer(true), Max_computed_usage: &map[string]string{ - utils.MetaAny: "189h0m0s", - utils.VOICE: "72h0m0s", - utils.DATA: "107374182400", - utils.SMS: "5000", - utils.MMS: "10000", + utils.MetaAny: "189h0m0s", + utils.MetaVoice: "72h0m0s", + utils.MetaData: "107374182400", + utils.MetaSMS: "5000", + utils.MetaMMS: "10000", }, Max_increments: utils.IntPointer(1000000), Balance_rating_subject: &map[string]string{ - utils.MetaAny: "*zero1ns", - utils.META_VOICE: "*zero1s", + utils.MetaAny: "*zero1ns", + utils.MetaVoice: "*zero1s", }, Dynaprepaid_actionplans: &[]string{"randomPlans"}, } @@ -55,16 +55,16 @@ func TestRalsCfgFromJsonCfgCase1(t *testing.T) { RpSubjectPrefixMatching: true, RemoveExpired: true, MaxComputedUsage: map[string]time.Duration{ - utils.MetaAny: 189 * time.Hour, - utils.VOICE: 72 * time.Hour, - utils.DATA: 107374182400, - utils.SMS: 5000, - utils.MMS: 10000, + utils.MetaAny: 189 * time.Hour, + utils.MetaVoice: 72 * time.Hour, + utils.MetaData: 107374182400, + utils.MetaSMS: 5000, + utils.MetaMMS: 10000, }, MaxIncrements: 1000000, BalanceRatingSubject: map[string]string{ - utils.MetaAny: "*zero1ns", - utils.META_VOICE: "*zero1s", + utils.MetaAny: "*zero1ns", + utils.MetaVoice: "*zero1s", }, DynaprepaidActionPlans: []string{"randomPlans"}, } @@ -175,16 +175,16 @@ func TestRalsCfgClone(t *testing.T) { RpSubjectPrefixMatching: true, RemoveExpired: true, MaxComputedUsage: map[string]time.Duration{ - utils.MetaAny: 189 * time.Hour, - utils.VOICE: 72 * time.Hour, - utils.DATA: 107374182400, - utils.SMS: 5000, - utils.MMS: 10000, + utils.MetaAny: 189 * time.Hour, + utils.MetaVoice: 72 * time.Hour, + utils.MetaData: 107374182400, + utils.MetaSMS: 5000, + utils.MetaMMS: 10000, }, MaxIncrements: 1000000, BalanceRatingSubject: map[string]string{ - utils.MetaAny: "*zero1ns", - utils.META_VOICE: "*zero1s", + utils.MetaAny: "*zero1ns", + utils.MetaVoice: "*zero1s", }, DynaprepaidActionPlans: []string{"randomPlans"}, } diff --git a/config/rsrparser_test.go b/config/rsrparser_test.go index cb1244219..cac2b92d4 100644 --- a/config/rsrparser_test.go +++ b/config/rsrparser_test.go @@ -779,7 +779,7 @@ func TestNewRSRParsers2(t *testing.T) { Rules: "destination", }, } - if parsedFields, err := NewRSRParsers(fields, utils.FIELDS_SEP); err != nil { + if parsedFields, err := NewRSRParsers(fields, utils.FieldsSep); err != nil { t.Error("Unexpected error: ", err.Error()) } else if !reflect.DeepEqual(parsedFields, expectParsedFields) { t.Errorf("Expected: %s ,received: %s ", utils.ToJSON(expectParsedFields), utils.ToJSON(parsedFields)) diff --git a/console/balance_add.go b/console/balance_add.go index 141b795d4..73659957a 100644 --- a/console/balance_add.go +++ b/console/balance_add.go @@ -19,7 +19,7 @@ along with this program. If not, see package console import ( - "github.com/cgrates/cgrates/apier/v1" + v1 "github.com/cgrates/cgrates/apier/v1" "github.com/cgrates/cgrates/utils" ) @@ -50,7 +50,7 @@ func (self *CmdAddBalance) RpcMethod() string { func (self *CmdAddBalance) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &v1.AttrAddBalance{BalanceType: utils.MONETARY, Overwrite: false} + self.rpcParams = &v1.AttrAddBalance{BalanceType: utils.MetaMonetary, Overwrite: false} } return self.rpcParams } diff --git a/console/balance_remove.go b/console/balance_remove.go index df02a5367..477181168 100644 --- a/console/balance_remove.go +++ b/console/balance_remove.go @@ -50,7 +50,7 @@ func (self *CmdRemoveBalance) RpcMethod() string { func (self *CmdRemoveBalance) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &v1.AttrAddBalance{BalanceType: utils.MONETARY, Overwrite: false} + self.rpcParams = &v1.AttrAddBalance{BalanceType: utils.MetaMonetary, Overwrite: false} } return self.rpcParams } diff --git a/console/balance_set.go b/console/balance_set.go index fa2d5e1e6..67576bb8e 100644 --- a/console/balance_set.go +++ b/console/balance_set.go @@ -49,7 +49,7 @@ func (self *CmdSetBalance) RpcMethod() string { func (self *CmdSetBalance) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.AttrSetBalance{BalanceType: utils.MONETARY} + self.rpcParams = &utils.AttrSetBalance{BalanceType: utils.MetaMonetary} } return self.rpcParams } diff --git a/console/command_executer.go b/console/command_executer.go index 5fc7e039e..a085c2b6e 100644 --- a/console/command_executer.go +++ b/console/command_executer.go @@ -117,7 +117,7 @@ func ToJSON(line string) (jsn []byte) { jsn = append(jsn, []byte(fmt.Sprintf("\"%s\":%s,", group[1], group[2]))...) } } - jsn = bytes.TrimRight(jsn, utils.FIELDS_SEP) + jsn = bytes.TrimRight(jsn, utils.FieldsSep) jsn = append(jsn, '}') return } @@ -159,7 +159,7 @@ func getSliceAsString(mp []interface{}, defaultDurationFields utils.StringSet) ( for _, v := range mp { out += fmt.Sprintf(`%s,`, getStringValue(v, defaultDurationFields)) } - return strings.TrimSuffix(out, utils.FIELDS_SEP) + utils.IdxEnd + return strings.TrimSuffix(out, utils.FieldsSep) + utils.IdxEnd } func getMapAsString(mp map[string]interface{}, defaultDurationFields utils.StringSet) (out string) { @@ -175,7 +175,7 @@ func getMapAsString(mp map[string]interface{}, defaultDurationFields utils.Strin keylist = append(keylist, fmt.Sprintf(`"%s":%s`, k, getStringValue(v, defaultDurationFields))) } sort.Strings(keylist) - return fmt.Sprintf(`{%s}`, strings.Join(keylist, utils.FIELDS_SEP)) + return fmt.Sprintf(`{%s}`, strings.Join(keylist, utils.FieldsSep)) } func GetFormatedResult(result interface{}, defaultDurationFields utils.StringSet) string { diff --git a/dispatchers/attributes_it_test.go b/dispatchers/attributes_it_test.go index 8032347fa..7fb84bde4 100755 --- a/dispatchers/attributes_it_test.go +++ b/dispatchers/attributes_it_test.go @@ -223,7 +223,7 @@ func testDspAttrGetAttrFailover(t *testing.T) { ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ utils.AccountField: "1002", - utils.EVENT_NAME: "Event1", + utils.EventName: "Event1", }, }, Opts: map[string]interface{}{ @@ -240,7 +240,7 @@ func testDspAttrGetAttrFailover(t *testing.T) { { FilterIDs: []string{}, Path: utils.MetaReq + utils.NestingSep + "Password", - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep), }, }, @@ -260,7 +260,7 @@ func testDspAttrGetAttrFailover(t *testing.T) { ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ utils.AccountField: "1002", - utils.EVENT_NAME: "Event1", + utils.EventName: "Event1", "Password": "CGRateS.org", }, }, @@ -444,7 +444,7 @@ func testDspAttrTestAuthKey2(t *testing.T) { { FilterIDs: []string{}, Path: utils.MetaReq + utils.NestingSep + "Password", - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep), }, }, @@ -503,7 +503,7 @@ func testDspAttrTestAuthKey3(t *testing.T) { ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ utils.AccountField: "1001", - utils.EVENT_NAME: "Event1", + utils.EventName: "Event1", }, }, Opts: map[string]interface{}{ @@ -527,7 +527,7 @@ func testDspAttrGetAttrRoundRobin(t *testing.T) { ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ utils.AccountField: "1002", - utils.EVENT_NAME: "RoundRobin", + utils.EventName: "RoundRobin", }, }, Opts: map[string]interface{}{ @@ -544,7 +544,7 @@ func testDspAttrGetAttrRoundRobin(t *testing.T) { { FilterIDs: []string{}, Path: utils.MetaReq + utils.NestingSep + "Password", - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep), }, }, @@ -564,7 +564,7 @@ func testDspAttrGetAttrRoundRobin(t *testing.T) { ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ utils.AccountField: "1002", - utils.EVENT_NAME: "RoundRobin", + utils.EventName: "RoundRobin", "Password": "CGRateS.org", }, }, @@ -621,7 +621,7 @@ func testDspAttrGetAttrInternal(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ - utils.EVENT_NAME: "Internal", + utils.EventName: "Internal", utils.AccountField: "1003", }, }, @@ -643,7 +643,7 @@ func testDspAttrGetAttrInternal(t *testing.T) { ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ utils.AccountField: "1003", - utils.EVENT_NAME: "Internal", + utils.EventName: "Internal", "Password": "CGRateS.com", }, }, diff --git a/dispatchers/cdrs_it_test.go b/dispatchers/cdrs_it_test.go index 60b395721..312b8f8a6 100644 --- a/dispatchers/cdrs_it_test.go +++ b/dispatchers/cdrs_it_test.go @@ -266,10 +266,10 @@ func testDspCDRsProcessExternalCDR(t *testing.T) { var reply string args := &engine.ExternalCDRWithOpts{ ExternalCDR: &engine.ExternalCDR{ - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "testDspCDRsProcessExternalCDR", OriginHost: "127.0.0.1", - Source: utils.UNIT_TEST, + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", @@ -539,10 +539,10 @@ func testDspCDRsProcessExternalCDRNoAuth(t *testing.T) { var reply string args := &engine.ExternalCDRWithOpts{ ExternalCDR: &engine.ExternalCDR{ - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "testDspCDRsProcessExternalCDR", OriginHost: "127.0.0.1", - Source: utils.UNIT_TEST, + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", diff --git a/dispatchers/chargers_it_test.go b/dispatchers/chargers_it_test.go index 89a589cd7..acf1c2b9f 100755 --- a/dispatchers/chargers_it_test.go +++ b/dispatchers/chargers_it_test.go @@ -107,7 +107,7 @@ func testDspCppGetChtgFailover(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EVENT_NAME: "Event1", + utils.EventName: "Event1", utils.AccountField: "1001", }, }, @@ -259,7 +259,7 @@ func testDspCppGetChtgRoundRobin(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EVENT_NAME: "RoundRobin", + utils.EventName: "RoundRobin", utils.AccountField: "1001", }, }, diff --git a/dispatchers/replicator_it_test.go b/dispatchers/replicator_it_test.go index 377742bcf..7b2d3bf9d 100644 --- a/dispatchers/replicator_it_test.go +++ b/dispatchers/replicator_it_test.go @@ -1077,7 +1077,7 @@ func testDspRplActions(t *testing.T) { Acs: engine.Actions{ &engine.Action{ Id: "Action1", - ActionType: utils.LOG, + ActionType: utils.MetaLog, }, }, Key: "KeyActions", diff --git a/dispatchers/responder_it_test.go b/dispatchers/responder_it_test.go index 5a84ea9b5..9e96a705f 100644 --- a/dispatchers/responder_it_test.go +++ b/dispatchers/responder_it_test.go @@ -98,7 +98,7 @@ func getNodeWithRoute(route string, t *testing.T) string { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.EVENT_NAME: "Random", + utils.EventName: "Random", }, }, Opts: map[string]interface{}{ @@ -172,7 +172,7 @@ func testDspResponderBroadcast(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.EVENT_NAME: "Broadcast", + utils.EventName: "Broadcast", }, }, Opts: map[string]interface{}{ @@ -209,7 +209,7 @@ func testDspResponderInternal(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.EVENT_NAME: "Internal", + utils.EventName: "Internal", }, }, Opts: map[string]interface{}{ diff --git a/dispatchers/routes_it_test.go b/dispatchers/routes_it_test.go index f3116e86a..cc4f72fe9 100755 --- a/dispatchers/routes_it_test.go +++ b/dispatchers/routes_it_test.go @@ -174,7 +174,7 @@ func testDspSupGetSupFailover(t *testing.T) { ID: utils.UUIDSha1Prefix(), Time: &nowTime, Event: map[string]interface{}{ - utils.EVENT_NAME: "Event1", + utils.EventName: "Event1", utils.AccountField: "1002", utils.Subject: "1002", utils.Destination: "1001", @@ -331,7 +331,7 @@ func testDspSupGetSupRoundRobin(t *testing.T) { ID: utils.UUIDSha1Prefix(), Time: &nowTime, Event: map[string]interface{}{ - utils.EVENT_NAME: "RoundRobin", + utils.EventName: "RoundRobin", utils.AccountField: "1002", utils.Subject: "1002", utils.Destination: "1001", diff --git a/dispatchers/sessions_it_test.go b/dispatchers/sessions_it_test.go index 5767e69a6..bfbc7ec5c 100755 --- a/dispatchers/sessions_it_test.go +++ b/dispatchers/sessions_it_test.go @@ -93,7 +93,7 @@ func testDspSessionAddBalacne(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "1001", - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: float64(initUsage), Balance: map[string]interface{}{ utils.ID: "SessionBalance", @@ -114,9 +114,9 @@ func testDspSessionAddBalacne(t *testing.T) { eAcntVal := float64(initUsage) if err := allEngine.RPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { t.Errorf("Expecting: %v, received: %v", - time.Duration(eAcntVal), time.Duration(acnt.BalanceMap[utils.VOICE].GetTotalValue())) + time.Duration(eAcntVal), time.Duration(acnt.BalanceMap[utils.MetaVoice].GetTotalValue())) } if err := allEngine2.RPC.Call(utils.APIerSv2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) @@ -125,9 +125,9 @@ func testDspSessionAddBalacne(t *testing.T) { } if err := allEngine2.RPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { t.Errorf("Expecting: %v, received: %v", - time.Duration(eAcntVal), time.Duration(acnt.BalanceMap[utils.VOICE].GetTotalValue())) + time.Duration(eAcntVal), time.Duration(acnt.BalanceMap[utils.MetaVoice].GetTotalValue())) } } @@ -200,7 +200,7 @@ func testDspSessionTestAuthKey(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -236,7 +236,7 @@ func testDspSessionAuthorize(t *testing.T) { utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -289,7 +289,7 @@ func testDspSessionInit(t *testing.T) { utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -366,7 +366,7 @@ func testDspSessionUpdate(t *testing.T) { utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -400,7 +400,7 @@ func testDspSessionUpdate(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.AccountField: "1001", utils.Destination: "1002", "OfficeGroup": "Marketing", @@ -441,7 +441,7 @@ func testDspSessionUpdate2(t *testing.T) { utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -476,7 +476,7 @@ func testDspSessionUpdate2(t *testing.T) { utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.AccountField: "1001", utils.Destination: "1002", "LCRProfile": "premium_cli", @@ -521,7 +521,7 @@ func testDspSessionTerminate(t *testing.T) { utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -554,7 +554,7 @@ func testDspSessionProcessCDR(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: utils.MetaPostpaid, utils.AccountField: "1001", @@ -593,7 +593,7 @@ func testDspSessionProcessEvent(t *testing.T) { utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebac", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginHost: "disp", utils.OriginID: "TestSSv1It2", utils.RequestType: utils.MetaPrepaid, @@ -635,7 +635,7 @@ func testDspSessionProcessEvent(t *testing.T) { utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebac", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.AccountField: "1001", utils.Destination: "1002", "OfficeGroup": "Marketing", @@ -674,7 +674,7 @@ func testDspSessionProcessEvent2(t *testing.T) { utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It2", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -682,7 +682,7 @@ func testDspSessionProcessEvent2(t *testing.T) { utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 10, 0, time.UTC), utils.Usage: initUsage, - utils.EVENT_NAME: "Internal", + utils.EventName: "Internal", }, }, Opts: map[string]interface{}{ @@ -716,7 +716,7 @@ func testDspSessionProcessEvent2(t *testing.T) { utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.AccountField: "1001", utils.Destination: "1002", "Password": "CGRateS.org", @@ -826,7 +826,7 @@ func testDspSessionPassive(t *testing.T) { utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -842,7 +842,7 @@ func testDspSessionPassive(t *testing.T) { utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -949,7 +949,7 @@ func testDspSessionProcessEvent3(t *testing.T) { ID: "testSSv1ItProcessEventTerminateSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It2", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -995,7 +995,7 @@ func testDspSessionGetCost(t *testing.T) { ID: "testSSv1ItGetCost", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.MONETARY, + utils.ToR: utils.MetaMonetary, utils.OriginID: "testSSv1ItProcessEventWithGetCost", utils.RequestType: utils.MetaPrepaid, utils.Subject: "ANY2CNT", diff --git a/dispatchers/stats_it_test.go b/dispatchers/stats_it_test.go index 26db4ac28..5c9b2ea74 100755 --- a/dispatchers/stats_it_test.go +++ b/dispatchers/stats_it_test.go @@ -111,11 +111,11 @@ func testDspStsGetStatFailover(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EVENT_NAME: "Event1", + utils.EventName: "Event1", utils.AccountField: "1001", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 135 * time.Second, - utils.COST: 123.0, + utils.Cost: 123.0, utils.RunID: utils.MetaDefault, utils.Destination: "1002"}, }, @@ -187,7 +187,7 @@ func testDspStsTestAuthKey(t *testing.T) { utils.AccountField: "1001", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 135 * time.Second, - utils.COST: 123.0, + utils.Cost: 123.0, utils.PDD: 12 * time.Second}, }, Opts: map[string]interface{}{ @@ -230,7 +230,7 @@ func testDspStsTestAuthKey2(t *testing.T) { utils.AccountField: "1001", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 135 * time.Second, - utils.COST: 123.0, + utils.Cost: 123.0, utils.RunID: utils.MetaDefault, utils.Destination: "1002"}, }, @@ -276,7 +276,7 @@ func testDspStsTestAuthKey2(t *testing.T) { utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 45 * time.Second, utils.RunID: utils.MetaDefault, - utils.COST: 10.0, + utils.Cost: 10.0, utils.Destination: "1001", }, }, @@ -356,7 +356,7 @@ func testDspStsTestAuthKey3(t *testing.T) { utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 45 * time.Second, utils.RunID: utils.MetaDefault, - utils.COST: 10.0, + utils.Cost: 10.0, utils.Destination: "1001", }, }, diff --git a/dispatchers/thresholds_it_test.go b/dispatchers/thresholds_it_test.go index bfac59287..1d3f8b09e 100755 --- a/dispatchers/thresholds_it_test.go +++ b/dispatchers/thresholds_it_test.go @@ -112,7 +112,7 @@ func testDspThProcessEventFailover(t *testing.T) { ID: utils.UUIDSha1Prefix(), Time: &nowTime, Event: map[string]interface{}{ - utils.EVENT_NAME: "Event1", + utils.EventName: "Event1", utils.AccountField: "1001"}, }, Opts: map[string]interface{}{ diff --git a/ees/eereq.go b/ees/eereq.go index 54b5c366b..0fa7db9fb 100644 --- a/ees/eereq.go +++ b/ees/eereq.go @@ -48,7 +48,7 @@ func NewEventExporterRequest(req utils.DataProvider, dc, opts utils.MapStorage, } if tntTpl != nil { if tntIf, err := eeR.ParseField( - &config.FCTemplate{Type: utils.META_COMPOSED, + &config.FCTemplate{Type: utils.MetaComposed, Value: tntTpl}); err == nil && tntIf.(string) != "" { eeR.tnt = tntIf.(string) } @@ -170,7 +170,7 @@ func (eeR *EventExporterRequest) SetFields(tplFlds []*config.FCTemplate) (err er } nMItm := &config.NMItem{Data: out, Path: itmPath, Config: tplFld} switch tplFld.Type { - case utils.META_COMPOSED: + case utils.MetaComposed: err = utils.ComposeNavMapVal(eeR, fullPath, nMItm) case utils.MetaGroup: // in case of *group type simply append to valSet err = utils.AppendNavMapVal(eeR, fullPath, nMItm) @@ -224,23 +224,23 @@ func (eeR *EventExporterRequest) ParseField( return utils.EmptyString, fmt.Errorf("unsupported type: <%s>", cfgFld.Type) case utils.MetaNone: return - case utils.META_FILLER: + case utils.MetaFiller: out, err = cfgFld.Value.ParseValue(utils.EmptyString) cfgFld.Padding = utils.MetaRight isString = true - case utils.META_CONSTANT: + case utils.MetaConstant: out, err = cfgFld.Value.ParseValue(utils.EmptyString) isString = true case utils.MetaRemoteHost: out = eeR.RemoteHost().String() isString = true - case utils.MetaVariable, utils.META_COMPOSED, utils.MetaGroup: + case utils.MetaVariable, utils.MetaComposed, utils.MetaGroup: out, err = cfgFld.Value.ParseDataProvider(eeR) isString = true - case utils.META_USAGE_DIFFERENCE: + case utils.MetaUsageDifference: if len(cfgFld.Value) != 2 { return nil, fmt.Errorf("invalid arguments <%s> to %s", - utils.ToJSON(cfgFld.Value), utils.META_USAGE_DIFFERENCE) + utils.ToJSON(cfgFld.Value), utils.MetaUsageDifference) } var strVal1 string if strVal1, err = cfgFld.Value[0].ParseDataProvider(eeR); err != nil { diff --git a/ees/ees.go b/ees/ees.go index f5f2a5a72..ac043f048 100644 --- a/ees/ees.go +++ b/ees/ees.go @@ -324,27 +324,27 @@ func updateEEMetrics(dc utils.MapStorage, ev engine.MapEvent, timezone string) { if tor, err := ev.GetString(utils.ToR); err == nil { if usage, err := ev.GetDuration(utils.Usage); err == nil { switch tor { - case utils.VOICE: + case utils.MetaVoice: if _, has := dc[utils.TotalDuration]; !has { dc[utils.TotalDuration] = time.Duration(0) } dc[utils.TotalDuration] = dc[utils.TotalDuration].(time.Duration) + usage - case utils.SMS: + case utils.MetaSMS: if _, has := dc[utils.TotalSMSUsage]; !has { dc[utils.TotalSMSUsage] = time.Duration(0) } dc[utils.TotalSMSUsage] = dc[utils.TotalSMSUsage].(time.Duration) + usage - case utils.MMS: + case utils.MetaMMS: if _, has := dc[utils.TotalMMSUsage]; !has { dc[utils.TotalMMSUsage] = time.Duration(0) } dc[utils.TotalMMSUsage] = dc[utils.TotalMMSUsage].(time.Duration) + usage - case utils.GENERIC: + case utils.MetaGeneric: if _, has := dc[utils.TotalGenericUsage]; !has { dc[utils.TotalGenericUsage] = time.Duration(0) } dc[utils.TotalGenericUsage] = dc[utils.TotalGenericUsage].(time.Duration) + usage - case utils.DATA: + case utils.MetaData: if _, has := dc[utils.TotalDataUsage]; !has { dc[utils.TotalDataUsage] = time.Duration(0) } diff --git a/ees/ees_test.go b/ees/ees_test.go index 737e902e0..0124c1439 100644 --- a/ees/ees_test.go +++ b/ees/ees_test.go @@ -34,7 +34,7 @@ func TestUpdateEEMetrics(t *testing.T) { utils.AnswerTime: tnow, utils.OrderID: 1, utils.Cost: 5.5, - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.Usage: time.Second, } exp, _ := newEEMetrics(utils.EmptyString) @@ -54,7 +54,7 @@ func TestUpdateEEMetrics(t *testing.T) { utils.AnswerTime: tnow, utils.OrderID: 2, utils.Cost: 5.5, - utils.ToR: utils.SMS, + utils.ToR: utils.MetaSMS, utils.Usage: time.Second, } exp[utils.LastEventATime] = tnow @@ -70,7 +70,7 @@ func TestUpdateEEMetrics(t *testing.T) { utils.AnswerTime: tnow, utils.OrderID: 3, utils.Cost: 5.5, - utils.ToR: utils.MMS, + utils.ToR: utils.MetaMMS, utils.Usage: time.Second, } exp[utils.LastEventATime] = tnow @@ -86,7 +86,7 @@ func TestUpdateEEMetrics(t *testing.T) { utils.AnswerTime: tnow, utils.OrderID: 4, utils.Cost: 5.5, - utils.ToR: utils.GENERIC, + utils.ToR: utils.MetaGeneric, utils.Usage: time.Second, } exp[utils.LastEventATime] = tnow @@ -102,7 +102,7 @@ func TestUpdateEEMetrics(t *testing.T) { utils.AnswerTime: tnow, utils.OrderID: 5, utils.Cost: 5.5, - utils.ToR: utils.DATA, + utils.ToR: utils.MetaData, utils.Usage: time.Second, } exp[utils.LastEventATime] = tnow diff --git a/ees/elastic_it_test.go b/ees/elastic_it_test.go index 209e59e9e..f1c1f6d7a 100644 --- a/ees/elastic_it_test.go +++ b/ees/elastic_it_test.go @@ -127,7 +127,7 @@ func testElasticExportEvents(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -157,7 +157,7 @@ func testElasticExportEvents(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.DATA, + utils.ToR: utils.MetaData, utils.OriginID: "abcdef", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -187,7 +187,7 @@ func testElasticExportEvents(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.SMS, + utils.ToR: utils.MetaSMS, utils.OriginID: "sdfwer", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -217,7 +217,7 @@ func testElasticExportEvents(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("sms2", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.SMS, + utils.ToR: utils.MetaSMS, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", @@ -333,7 +333,7 @@ func testElasticVerifyExports(t *testing.T) { case utils.Sha1("sms2", time.Unix(1383813745, 0).UTC().String()) + ":*default": eMp := map[string]interface{}{ utils.CGRID: utils.Sha1("sms2", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.SMS, + utils.ToR: utils.MetaSMS, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", diff --git a/ees/filecsv_it_test.go b/ees/filecsv_it_test.go index f3de26414..513c93ed7 100644 --- a/ees/filecsv_it_test.go +++ b/ees/filecsv_it_test.go @@ -115,7 +115,7 @@ func testCsvExportEvent(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -143,7 +143,7 @@ func testCsvExportEvent(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.DATA, + utils.ToR: utils.MetaData, utils.OriginID: "abcdef", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -171,7 +171,7 @@ func testCsvExportEvent(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.SMS, + utils.ToR: utils.MetaSMS, utils.OriginID: "sdfwer", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -240,7 +240,7 @@ func testCsvExportComposedEvent(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, "ComposedOriginID1": "dsaf", "ComposedOriginID2": "dsaf", utils.OriginHost: "192.168.1.1", @@ -271,7 +271,7 @@ func testCsvExportComposedEvent(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.SMS, + utils.ToR: utils.MetaSMS, "ComposedOriginID1": "sdf", "ComposedOriginID2": "wer", utils.OriginHost: "192.168.1.1", @@ -346,7 +346,7 @@ func testCsvExportMaskedDestination(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -403,7 +403,7 @@ func testCsvExportEventWithInflateTemplate(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -433,7 +433,7 @@ func testCsvExportEventWithInflateTemplate(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.DATA, + utils.ToR: utils.MetaData, utils.OriginID: "abcdef", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -463,7 +463,7 @@ func testCsvExportEventWithInflateTemplate(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.SMS, + utils.ToR: utils.MetaSMS, utils.OriginID: "sdfwer", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -533,7 +533,7 @@ func testCsvExportNotFoundExporter(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, diff --git a/ees/filefwv_it_test.go b/ees/filefwv_it_test.go index dd2d05c8f..653a4d7c3 100644 --- a/ees/filefwv_it_test.go +++ b/ees/filefwv_it_test.go @@ -107,7 +107,7 @@ func testFwvExportEvent(t *testing.T) { Event: map[string]interface{}{ utils.OrderID: 1, utils.CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, diff --git a/ees/httppost_it_test.go b/ees/httppost_it_test.go index 83c7647c0..9d6e6a405 100644 --- a/ees/httppost_it_test.go +++ b/ees/httppost_it_test.go @@ -123,7 +123,7 @@ func testHTTPExportEvent(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -153,7 +153,7 @@ func testHTTPExportEvent(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.DATA, + utils.ToR: utils.MetaData, utils.OriginID: "abcdef", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -183,7 +183,7 @@ func testHTTPExportEvent(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.SMS, + utils.ToR: utils.MetaSMS, utils.OriginID: "sdfwer", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -213,7 +213,7 @@ func testHTTPExportEvent(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("sms2", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.SMS, + utils.ToR: utils.MetaSMS, utils.OriginID: "sms2", utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", diff --git a/ees/posterjsonmap_it_test.go b/ees/posterjsonmap_it_test.go index f29689fa2..a99ae53d9 100644 --- a/ees/posterjsonmap_it_test.go +++ b/ees/posterjsonmap_it_test.go @@ -120,7 +120,7 @@ func testHTTPJsonMapExportEvent(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -153,7 +153,7 @@ func testHTTPJsonMapExportEvent(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.DATA, + utils.ToR: utils.MetaData, utils.OriginID: "abcdef", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -186,7 +186,7 @@ func testHTTPJsonMapExportEvent(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.SMS, + utils.ToR: utils.MetaSMS, utils.OriginID: "sdfwer", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -220,7 +220,7 @@ func testHTTPJsonMapExportEvent(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("sms2", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.SMS, + utils.ToR: utils.MetaSMS, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", diff --git a/ees/sql_it_test.go b/ees/sql_it_test.go index fa39e2c0c..031917981 100644 --- a/ees/sql_it_test.go +++ b/ees/sql_it_test.go @@ -149,7 +149,7 @@ func testSqlEeExportEventFull(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -187,7 +187,7 @@ func testSqlEeExportEventPartial(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("asd", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, diff --git a/ees/virtual_ee_it_test.go b/ees/virtual_ee_it_test.go index 2e36a2be1..3960c4809 100644 --- a/ees/virtual_ee_it_test.go +++ b/ees/virtual_ee_it_test.go @@ -108,7 +108,7 @@ func testVirtExportSupplierEvent(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, @@ -144,7 +144,7 @@ func testVirtExportEvents(t *testing.T) { Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{ utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", utils.RequestType: utils.MetaRated, diff --git a/engine/account.go b/engine/account.go index 5661529da..42adbd9cb 100644 --- a/engine/account.go +++ b/engine/account.go @@ -52,7 +52,7 @@ type AccountWithOpts struct { // User's available minutes for the specified destination func (acc *Account) getCreditForPrefix(cd *CallDescriptor) (duration time.Duration, credit float64, balances Balances) { - creditBalances := acc.getBalancesForPrefix(cd.Destination, cd.Category, utils.MONETARY, "", cd.TimeStart) + creditBalances := acc.getBalancesForPrefix(cd.Destination, cd.Category, utils.MetaMonetary, "", cd.TimeStart) unitBalances := acc.getBalancesForPrefix(cd.Destination, cd.Category, cd.ToR, "", cd.TimeStart) // gather all balances from shared groups @@ -61,7 +61,7 @@ func (acc *Account) getCreditForPrefix(cd *CallDescriptor) (duration time.Durati if len(cb.SharedGroups) > 0 { for sg := range cb.SharedGroups { if sharedGroup, _ := dm.GetSharedGroup(sg, false, utils.NonTransactional); sharedGroup != nil { - sgb := sharedGroup.GetBalances(cd.Destination, cd.Category, utils.MONETARY, acc, cd.TimeStart) + sgb := sharedGroup.GetBalances(cd.Destination, cd.Category, utils.MetaMonetary, acc, cd.TimeStart) sgb = sharedGroup.SortBalancesByStrategy(cb, sgb) extendedCreditBalances = append(extendedCreditBalances, sgb...) } @@ -268,7 +268,7 @@ func (acc *Account) debitBalanceAction(a *Action, reset, resetIfNegative bool) e } i++ } - dm.CacheDataFromDB(utils.SHARED_GROUP_PREFIX, sgs, true) + dm.CacheDataFromDB(utils.SharedGroupPrefix, sgs, true) return 0, nil }, config.CgrConfig().GeneralCfg().LockingTimeout, bClone.SharedGroups.Slice()...) if err != nil { @@ -284,8 +284,8 @@ func (acc *Account) getBalancesForPrefix(prefix, category, tor, sharedGroup string, aTime time.Time) Balances { var balances Balances balances = append(balances, acc.BalanceMap[tor]...) - if tor != utils.MONETARY && tor != utils.GENERIC { - balances = append(balances, acc.BalanceMap[utils.GENERIC]...) + if tor != utils.MetaMonetary && tor != utils.MetaGeneric { + balances = append(balances, acc.BalanceMap[utils.MetaGeneric]...) } var usefulBalances Balances @@ -376,7 +376,7 @@ func (acc *Account) getAlldBalancesForPrefix(destination, category, func (acc *Account) debitCreditBalance(cd *CallDescriptor, count bool, dryRun bool, goNegative bool) (cc *CallCost, err error) { usefulUnitBalances := acc.getAlldBalancesForPrefix(cd.Destination, cd.Category, cd.ToR, cd.TimeStart) - usefulMoneyBalances := acc.getAlldBalancesForPrefix(cd.Destination, cd.Category, utils.MONETARY, cd.TimeStart) + usefulMoneyBalances := acc.getAlldBalancesForPrefix(cd.Destination, cd.Category, utils.MetaMonetary, cd.TimeStart) var leftCC *CallCost cc = cd.CreateCallCost() var hadBalanceSubj bool @@ -396,7 +396,7 @@ func (acc *Account) debitCreditBalance(cd *CallDescriptor, count bool, dryRun bo return nil, debitErr } if balance.RatingSubject != "" && - !strings.HasPrefix(balance.RatingSubject, utils.ZERO_RATING_SUBJECT_PREFIX) { + !strings.HasPrefix(balance.RatingSubject, utils.MetaRatingSubjectPrefix) { hadBalanceSubj = true } if partCC != nil { @@ -535,7 +535,7 @@ func (acc *Account) debitCreditBalance(cd *CallDescriptor, count bool, dryRun bo if count { acc.countUnits( cost, - utils.MONETARY, + utils.MetaMonetary, leftCC, &Balance{ Value: cost, @@ -590,7 +590,7 @@ COMMIT: // GetDefaultMoneyBalance returns the defaultmoney balance func (acc *Account) GetDefaultMoneyBalance() *Balance { - for _, balance := range acc.BalanceMap[utils.MONETARY] { + for _, balance := range acc.BalanceMap[utils.MetaMonetary] { if balance.IsDefault() { return balance } @@ -603,7 +603,7 @@ func (acc *Account) GetDefaultMoneyBalance() *Balance { if acc.BalanceMap == nil { acc.BalanceMap = make(map[string]Balances) } - acc.BalanceMap[utils.MONETARY] = append(acc.BalanceMap[utils.MONETARY], defaultBalance) + acc.BalanceMap[utils.MetaMonetary] = append(acc.BalanceMap[utils.MetaMonetary], defaultBalance) return defaultBalance } @@ -661,19 +661,19 @@ func (acc *Account) ExecuteActionTriggers(a *Action) { } } else { // BALANCE for _, b := range acc.BalanceMap[at.Balance.GetType()] { - if !b.dirty && at.ThresholdType != utils.TRIGGER_BALANCE_EXPIRED { // do not check clean balances + if !b.dirty && at.ThresholdType != utils.TriggerBalanceExpired { // do not check clean balances continue } switch at.ThresholdType { - case utils.TRIGGER_MAX_BALANCE: + case utils.TriggerMaxBalance: if b.MatchActionTrigger(at) && b.GetValue() >= at.ThresholdValue { at.Execute(acc) } - case utils.TRIGGER_MIN_BALANCE: + case utils.TriggerMinBalance: if b.MatchActionTrigger(at) && b.GetValue() <= at.ThresholdValue { at.Execute(acc) } - case utils.TRIGGER_BALANCE_EXPIRED: + case utils.TriggerBalanceExpired: if b.MatchActionTrigger(at) && b.IsExpiredAt(time.Now()) { at.Execute(acc) } @@ -722,9 +722,9 @@ func (acc *Account) InitCounters() { if !strings.Contains(at.ThresholdType, "counter") { continue } - ct := utils.COUNTER_EVENT //default + ct := utils.MetaCounterEvent //default if strings.Contains(at.ThresholdType, "balance") { - ct = utils.COUNTER_BALANCE + ct = utils.MetaCounterBalance } uc, exists := ucTempMap[at.Balance.GetType()+ct] //log.Print("CT: ", at.Balance.GetType()+ct) @@ -812,7 +812,7 @@ func (acc *Account) GetSharedGroups() (groups []string) { // GetUniqueSharedGroupMembers returns the acounts from the group func (acc *Account) GetUniqueSharedGroupMembers(cd *CallDescriptor) (utils.StringMap, error) { // ToDo: make sure we return accountIDs var balances []*Balance - balances = append(balances, acc.getBalancesForPrefix(cd.Destination, cd.Category, utils.MONETARY, "", cd.TimeStart)...) + balances = append(balances, acc.getBalancesForPrefix(cd.Destination, cd.Category, utils.MetaMonetary, "", cd.TimeStart)...) balances = append(balances, acc.getBalancesForPrefix(cd.Destination, cd.Category, cd.ToR, "", cd.TimeStart)...) // gather all shared group ids var sharedGroupIds []string @@ -871,7 +871,7 @@ func (acc *Account) DebitConnectionFee(cc *CallCost, usefulMoneyBalances Balance b.SubstractValue(connectFee) // the conect fee is not refundable! if count { - acc.countUnits(connectFee, utils.MONETARY, cc, b) + acc.countUnits(connectFee, utils.MetaMonetary, cc, b) } connectFeePaid = true debitedBalance = *b @@ -890,7 +890,7 @@ func (acc *Account) DebitConnectionFee(cc *CallCost, usefulMoneyBalances Balance debitedBalance = *b // the conect fee is not refundable! if count { - acc.countUnits(connectFee, utils.MONETARY, cc, b) + acc.countUnits(connectFee, utils.MetaMonetary, cc, b) } } } @@ -924,7 +924,7 @@ func (acc *Account) matchActionFilter(condition string) (bool, error) { // GetID returns the account ID func (acc *Account) GetID() string { - split := strings.Split(acc.ID, utils.CONCATENATED_KEY_SEP) + split := strings.Split(acc.ID, utils.ConcatenatedKeySep) if len(split) != 2 { return "" } @@ -988,7 +988,7 @@ func (acc *Account) AsOldStructure() interface{} { } result := &Account{ - Id: utils.META_OUT + utils.CONCATENATED_KEY_SEP + acc.ID, + Id: utils.MetaOut + utils.ConcatenatedKeySep + acc.ID, BalanceMap: make(map[string]Balances, len(acc.BalanceMap)), UnitCounters: make([]*UnitsCounter, len(acc.UnitCounters)), ActionTriggers: make(ActionTriggers, len(acc.ActionTriggers)), @@ -1050,7 +1050,7 @@ func (acc *Account) AsOldStructure() interface{} { } for key, values := range acc.BalanceMap { if len(values) > 0 { - key += utils.META_OUT + key += utils.MetaOut result.BalanceMap[key] = make(Balances, len(values)) for i, b := range values { result.BalanceMap[key][i] = &Balance{ @@ -1075,7 +1075,7 @@ func (acc *Account) AsOldStructure() interface{} { // AsAccountSummary converts the account into AccountSummary func (acc *Account) AsAccountSummary() *AccountSummary { - idSplt := strings.Split(acc.ID, utils.CONCATENATED_KEY_SEP) + idSplt := strings.Split(acc.ID, utils.ConcatenatedKeySep) ad := &AccountSummary{AllowNegative: acc.AllowNegative, Disabled: acc.Disabled} if len(idSplt) == 1 { ad.ID = idSplt[0] @@ -1084,7 +1084,7 @@ func (acc *Account) AsAccountSummary() *AccountSummary { ad.ID = idSplt[1] } - for _, balanceType := range []string{utils.DATA, utils.SMS, utils.MMS, utils.VOICE, utils.GENERIC, utils.MONETARY} { + for _, balanceType := range []string{utils.MetaData, utils.MetaSMS, utils.MetaMMS, utils.MetaVoice, utils.MetaGeneric, utils.MetaMonetary} { balances, has := acc.BalanceMap[balanceType] if !has { continue diff --git a/engine/account_test.go b/engine/account_test.go index 7b5ad4657..ec68b4e78 100644 --- a/engine/account_test.go +++ b/engine/account_test.go @@ -93,12 +93,12 @@ func TestAccountStorageStoreRestore(t *testing.T) { DestinationIDs: utils.StringMap{"RET": true}} rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.VOICE: {b1, b2}, - utils.MONETARY: {&Balance{Value: 21}}}} + utils.MetaVoice: {b1, b2}, + utils.MetaMonetary: {&Balance{Value: 21}}}} dm.SetAccount(rifsBalance) ub1, err := dm.GetAccount("other") if err != nil || - !ub1.BalanceMap[utils.MONETARY].Equal(rifsBalance.BalanceMap[utils.MONETARY]) { + !ub1.BalanceMap[utils.MetaMonetary].Equal(rifsBalance.BalanceMap[utils.MetaMonetary]) { t.Log("UB: ", ub1) t.Errorf("Expected %v was %v", rifsBalance, ub1) } @@ -111,8 +111,8 @@ func TestGetSecondsForPrefix(t *testing.T) { DestinationIDs: utils.StringMap{"RET": true}} ub1 := &Account{ID: "CUSTOMER_1:rif", BalanceMap: map[string]Balances{ - utils.VOICE: {b1, b2}, - utils.MONETARY: {&Balance{Value: 200}}}} + utils.MetaVoice: {b1, b2}, + utils.MetaMonetary: {&Balance{Value: 200}}}} cd := &CallDescriptor{ Category: "0", Tenant: "vdf", @@ -121,7 +121,7 @@ func TestGetSecondsForPrefix(t *testing.T) { LoopIndex: 0, DurationIndex: 10 * time.Second, Destination: "0723", - ToR: utils.VOICE, + ToR: utils.MetaVoice, } seconds, credit, bucketList := ub1.getCreditForPrefix(cd) expected := 110 * time.Second @@ -140,8 +140,8 @@ func TestGetSpecialPricedSeconds(t *testing.T) { ub1 := &Account{ ID: "OUT:CUSTOMER_1:rif", BalanceMap: map[string]Balances{ - utils.VOICE: {b1, b2}, - utils.MONETARY: {&Balance{Value: 21}}, + utils.MetaVoice: {b1, b2}, + utils.MetaMonetary: {&Balance{Value: 21}}, }, } cd := &CallDescriptor{ @@ -151,7 +151,7 @@ func TestGetSpecialPricedSeconds(t *testing.T) { TimeEnd: time.Date(2013, 10, 4, 15, 46, 60, 0, time.UTC), LoopIndex: 0, Destination: "0723", - ToR: utils.VOICE, + ToR: utils.MetaVoice, } seconds, credit, bucketList := ub1.getCreditForPrefix(cd) expected := 20 * time.Second @@ -167,16 +167,16 @@ func TestAccountStorageStore(t *testing.T) { b2 := &Balance{Value: 100, Weight: 20, DestinationIDs: utils.StringMap{"RET": true}} rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.VOICE: {b1, b2}, - utils.MONETARY: {&Balance{Value: 21}}}} + utils.MetaVoice: {b1, b2}, + utils.MetaMonetary: {&Balance{Value: 21}}}} dm.SetAccount(rifsBalance) result, err := dm.GetAccount(rifsBalance.ID) if err != nil || rifsBalance.ID != result.ID || - len(rifsBalance.BalanceMap[utils.VOICE]) < 2 || - len(result.BalanceMap[utils.VOICE]) < 2 || - !(rifsBalance.BalanceMap[utils.VOICE][0].Equal(result.BalanceMap[utils.VOICE][0])) || - !(rifsBalance.BalanceMap[utils.VOICE][1].Equal(result.BalanceMap[utils.VOICE][1])) || - !rifsBalance.BalanceMap[utils.MONETARY].Equal(result.BalanceMap[utils.MONETARY]) { + len(rifsBalance.BalanceMap[utils.MetaVoice]) < 2 || + len(result.BalanceMap[utils.MetaVoice]) < 2 || + !(rifsBalance.BalanceMap[utils.MetaVoice][0].Equal(result.BalanceMap[utils.MetaVoice][0])) || + !(rifsBalance.BalanceMap[utils.MetaVoice][1].Equal(result.BalanceMap[utils.MetaVoice][1])) || + !rifsBalance.BalanceMap[utils.MetaMonetary].Equal(result.BalanceMap[utils.MetaMonetary]) { t.Errorf("Expected %s was %s", utils.ToIJSON(rifsBalance), utils.ToIJSON(result)) } } @@ -199,20 +199,20 @@ func TestDebitCreditZeroSecond(t *testing.T) { RateUnit: time.Second}}}}, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, } cd := &CallDescriptor{ TimeStart: time.Date(2013, 9, 24, 10, 48, 0, 0, time.UTC), TimeEnd: time.Date(2013, 9, 24, 10, 48, 10, 0, time.UTC), Destination: "0723045326", Category: "0", - ToR: utils.VOICE, + ToR: utils.MetaVoice, testCallcost: cc, } rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.VOICE: {b1}, - utils.MONETARY: {&Balance{ + utils.MetaVoice: {b1}, + utils.MetaMonetary: {&Balance{ Categories: utils.NewStringMap("0"), Value: 21}}}} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, false, true) @@ -223,9 +223,9 @@ func TestDebitCreditZeroSecond(t *testing.T) { t.Logf("%+v", cc.Timespans[0]) t.Error("Error setting balance id to increment: ", cc.Timespans[0].Increments[0]) } - if rifsBalance.BalanceMap[utils.VOICE][0].GetValue() != 0 || - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue() != 21 { - t.Error("Error extracting minutes from balance: ", rifsBalance.BalanceMap[utils.VOICE][0]) + if rifsBalance.BalanceMap[utils.MetaVoice][0].GetValue() != 0 || + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 21 { + t.Error("Error extracting minutes from balance: ", rifsBalance.BalanceMap[utils.MetaVoice][0]) } } @@ -249,18 +249,18 @@ func TestDebitCreditBlocker(t *testing.T) { }, }, deductConnectFee: true, - ToR: utils.VOICE, + ToR: utils.MetaVoice, } cd := &CallDescriptor{ TimeStart: time.Date(2013, 9, 24, 10, 48, 0, 0, time.UTC), TimeEnd: time.Date(2013, 9, 24, 10, 48, 10, 0, time.UTC), Destination: "0723045326", Category: "0", - ToR: utils.VOICE, + ToR: utils.MetaVoice, testCallcost: cc, } rifsBalance := &Account{ID: "other", - BalanceMap: map[string]Balances{utils.MONETARY: {b1, b2}}} + BalanceMap: map[string]Balances{utils.MetaMonetary: {b1, b2}}} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, true, true) if err != nil { @@ -269,10 +269,10 @@ func TestDebitCreditBlocker(t *testing.T) { if len(cc.Timespans) != 0 { t.Error("Wrong call cost: ", utils.ToIJSON(cc)) } - if rifsBalance.BalanceMap[utils.MONETARY][0].GetValue() != 0.1152 || - rifsBalance.BalanceMap[utils.MONETARY][1].GetValue() != 1.5 { + if rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 0.1152 || + rifsBalance.BalanceMap[utils.MetaMonetary][1].GetValue() != 1.5 { t.Error("should not have touched the balances: ", - utils.ToIJSON(rifsBalance.BalanceMap[utils.MONETARY])) + utils.ToIJSON(rifsBalance.BalanceMap[utils.MetaMonetary])) } } @@ -292,7 +292,7 @@ func TestDebitFreeEmpty(t *testing.T) { }, }, deductConnectFee: true, - ToR: utils.VOICE, + ToR: utils.MetaVoice, } cd := &CallDescriptor{ TimeStart: time.Date(2013, 9, 24, 10, 48, 0, 0, time.UTC), @@ -301,12 +301,12 @@ func TestDebitFreeEmpty(t *testing.T) { Subject: "rif:from:tm", Destination: "112", Category: "0", - ToR: utils.VOICE, + ToR: utils.MetaVoice, testCallcost: cc, } // empty account rifsBalance := &Account{ID: "other", - BalanceMap: map[string]Balances{utils.MONETARY: {}}} + BalanceMap: map[string]Balances{utils.MetaMonetary: {}}} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, true, true) if err != nil { @@ -315,9 +315,9 @@ func TestDebitFreeEmpty(t *testing.T) { if len(cc.Timespans) == 0 || cc.Cost != 0 { t.Error("Wrong call cost: ", utils.ToIJSON(cc)) } - if len(rifsBalance.BalanceMap[utils.MONETARY]) != 0 { + if len(rifsBalance.BalanceMap[utils.MetaMonetary]) != 0 { t.Error("should not have touched the balances: ", - utils.ToIJSON(rifsBalance.BalanceMap[utils.MONETARY])) + utils.ToIJSON(rifsBalance.BalanceMap[utils.MetaMonetary])) } } @@ -339,21 +339,21 @@ func TestDebitCreditZeroMinute(t *testing.T) { RateUnit: time.Second}}}}, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, } cd := &CallDescriptor{ TimeStart: time.Date(2013, 9, 24, 10, 48, 0, 0, time.UTC), TimeEnd: time.Date(2013, 9, 24, 10, 48, 10, 0, time.UTC), Destination: "0723045326", Category: "0", - ToR: utils.VOICE, + ToR: utils.MetaVoice, testCallcost: cc, } rifsBalance := &Account{ ID: "other", BalanceMap: map[string]Balances{ - utils.VOICE: {b1}, - utils.MONETARY: {&Balance{Value: 21}}, + utils.MetaVoice: {b1}, + utils.MetaMonetary: {&Balance{Value: 21}}, }} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, false, true) @@ -366,10 +366,10 @@ func TestDebitCreditZeroMinute(t *testing.T) { t.Errorf("Error setting balance id to increment: %s", utils.ToJSON(cc)) } - if rifsBalance.BalanceMap[utils.VOICE][0].GetValue() != 10*float64(time.Second) || - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue() != 21 { + if rifsBalance.BalanceMap[utils.MetaVoice][0].GetValue() != 10*float64(time.Second) || + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 21 { t.Errorf("Error extracting minutes from balance: %s", - utils.ToJSON(rifsBalance.BalanceMap[utils.VOICE][0])) + utils.ToJSON(rifsBalance.BalanceMap[utils.MetaVoice][0])) } } @@ -395,7 +395,7 @@ func TestDebitCreditZeroMixedMinute(t *testing.T) { RateUnit: time.Second}}}}, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, } cd := &CallDescriptor{ TimeStart: cc.Timespans[0].TimeStart, @@ -407,8 +407,8 @@ func TestDebitCreditZeroMixedMinute(t *testing.T) { } rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.VOICE: {b1, b2}, - utils.MONETARY: {&Balance{Value: 21}}, + utils.MetaVoice: {b1, b2}, + utils.MetaMonetary: {&Balance{Value: 21}}, }} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, false, true) @@ -419,12 +419,12 @@ func TestDebitCreditZeroMixedMinute(t *testing.T) { cc.Timespans[1].Increments[0].BalanceInfo.Unit.UUID != "testm" { t.Error("Error setting balance id to increment: ", cc.Timespans) } - if rifsBalance.BalanceMap[utils.VOICE][1].GetValue() != 0 || - rifsBalance.BalanceMap[utils.VOICE][0].GetValue() != 10*float64(time.Second) || - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue() != 21 { + if rifsBalance.BalanceMap[utils.MetaVoice][1].GetValue() != 0 || + rifsBalance.BalanceMap[utils.MetaVoice][0].GetValue() != 10*float64(time.Second) || + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 21 { t.Logf("TS0: %+v", cc.Timespans[0]) t.Logf("TS1: %+v", cc.Timespans[1]) - t.Errorf("Error extracting minutes from balance: %+v", rifsBalance.BalanceMap[utils.VOICE][1]) + t.Errorf("Error extracting minutes from balance: %+v", rifsBalance.BalanceMap[utils.MetaVoice][1]) } } @@ -458,7 +458,7 @@ func TestDebitCreditNoCredit(t *testing.T) { RateUnit: time.Second}}}}, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, } cd := &CallDescriptor{ TimeStart: cc.Timespans[0].TimeStart, @@ -470,7 +470,7 @@ func TestDebitCreditNoCredit(t *testing.T) { } rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.VOICE: {b1}, + utils.MetaVoice: {b1}, }} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, false, true) @@ -482,9 +482,9 @@ func TestDebitCreditNoCredit(t *testing.T) { t.Error("Error setting balance id to increment: ", cc.Timespans[0].Increments[0]) } - if rifsBalance.BalanceMap[utils.VOICE][0].GetValue() != 10*float64(time.Second) { + if rifsBalance.BalanceMap[utils.MetaVoice][0].GetValue() != 10*float64(time.Second) { t.Error("Error extracting minutes from balance: ", - rifsBalance.BalanceMap[utils.VOICE][0]) + rifsBalance.BalanceMap[utils.MetaVoice][0]) } if len(cc.Timespans) != 1 || cc.Timespans[0].GetDuration() != time.Minute { @@ -521,7 +521,7 @@ func TestDebitCreditHasCredit(t *testing.T) { RateUnit: time.Second}}}}, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, } cd := &CallDescriptor{ TimeStart: cc.Timespans[0].TimeStart, @@ -532,8 +532,8 @@ func TestDebitCreditHasCredit(t *testing.T) { testCallcost: cc, } rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.VOICE: {b1}, - utils.MONETARY: {&Balance{Uuid: "moneya", Value: 110}}, + utils.MetaVoice: {b1}, + utils.MetaMonetary: {&Balance{Uuid: "moneya", Value: 110}}, }} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, false, true) @@ -544,11 +544,11 @@ func TestDebitCreditHasCredit(t *testing.T) { cc.Timespans[0].Increments[0].Duration != time.Minute { t.Error("Error setting balance id to increment: ", cc.Timespans[0].Increments[0]) } - if rifsBalance.BalanceMap[utils.VOICE][0].GetValue() != 10*float64(time.Second) || - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue() != 30 { + if rifsBalance.BalanceMap[utils.MetaVoice][0].GetValue() != 10*float64(time.Second) || + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 30 { t.Errorf("Error extracting minutes from balance: %+v, %+v", - rifsBalance.BalanceMap[utils.VOICE][0].GetValue(), - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue()) + rifsBalance.BalanceMap[utils.MetaVoice][0].GetValue(), + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue()) } if len(cc.Timespans) != 3 || cc.Timespans[0].GetDuration() != time.Minute { t.Error("Error truncating extra timespans: ", cc.Timespans) @@ -576,7 +576,7 @@ func TestDebitCreditSplitMinutesMoney(t *testing.T) { RateUnit: time.Second}}}}, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, } cd := &CallDescriptor{ TimeStart: cc.Timespans[0].TimeStart, @@ -588,8 +588,8 @@ func TestDebitCreditSplitMinutesMoney(t *testing.T) { } rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.VOICE: {b1}, - utils.MONETARY: {&Balance{Uuid: "moneya", Value: 50}}, + utils.MetaVoice: {b1}, + utils.MetaMonetary: {&Balance{Uuid: "moneya", Value: 50}}, }} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, false, true) @@ -601,11 +601,11 @@ func TestDebitCreditSplitMinutesMoney(t *testing.T) { t.Error("Error setting balance id to increment: ", cc.Timespans[0].Increments[0].Duration) } - if rifsBalance.BalanceMap[utils.VOICE][0].GetValue() != 0 || - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue() != 30 { + if rifsBalance.BalanceMap[utils.MetaVoice][0].GetValue() != 0 || + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 30 { t.Errorf("Error extracting minutes from balance: %+v, %+v", - rifsBalance.BalanceMap[utils.VOICE][0].GetValue(), - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue()) + rifsBalance.BalanceMap[utils.MetaVoice][0].GetValue(), + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue()) } if len(cc.Timespans) != 2 || cc.Timespans[0].GetDuration() != 10*time.Second || @@ -645,7 +645,7 @@ func TestDebitCreditMoreTimespans(t *testing.T) { RateUnit: time.Second}}}}, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, } cd := &CallDescriptor{ TimeStart: cc.Timespans[0].TimeStart, @@ -657,7 +657,7 @@ func TestDebitCreditMoreTimespans(t *testing.T) { } rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.VOICE: {b1}, + utils.MetaVoice: {b1}, }} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, false, true) @@ -669,9 +669,9 @@ func TestDebitCreditMoreTimespans(t *testing.T) { t.Error("Error setting balance id to increment: ", cc.Timespans[0].Increments[0]) } - if rifsBalance.BalanceMap[utils.VOICE][0].GetValue() != 30*float64(time.Second) { + if rifsBalance.BalanceMap[utils.MetaVoice][0].GetValue() != 30*float64(time.Second) { t.Error("Error extracting minutes from balance: ", - rifsBalance.BalanceMap[utils.VOICE][0]) + rifsBalance.BalanceMap[utils.MetaVoice][0]) } } @@ -709,7 +709,7 @@ func TestDebitCreditMoreTimespansMixed(t *testing.T) { RateUnit: time.Second}}}}, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, } cd := &CallDescriptor{ TimeStart: cc.Timespans[0].TimeStart, @@ -722,7 +722,7 @@ func TestDebitCreditMoreTimespansMixed(t *testing.T) { rifsBalance := &Account{ ID: "other", BalanceMap: map[string]Balances{ - utils.VOICE: {b1, b2}, + utils.MetaVoice: {b1, b2}, }} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, false, true) @@ -734,10 +734,10 @@ func TestDebitCreditMoreTimespansMixed(t *testing.T) { t.Error("Error setting balance id to increment: ", cc.Timespans[0].Increments[0]) } - if rifsBalance.BalanceMap[utils.VOICE][0].GetValue() != 10*float64(time.Second) || - rifsBalance.BalanceMap[utils.VOICE][1].GetValue() != 130*float64(time.Second) { + if rifsBalance.BalanceMap[utils.MetaVoice][0].GetValue() != 10*float64(time.Second) || + rifsBalance.BalanceMap[utils.MetaVoice][1].GetValue() != 130*float64(time.Second) { t.Error("Error extracting minutes from balance: ", - rifsBalance.BalanceMap[utils.VOICE][1], cc.Timespans[1]) + rifsBalance.BalanceMap[utils.MetaVoice][1], cc.Timespans[1]) } } @@ -773,7 +773,7 @@ func TestDebitCreditNoConectFeeCredit(t *testing.T) { RateUnit: time.Second}}}}, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, deductConnectFee: true, } cd := &CallDescriptor{ @@ -786,7 +786,7 @@ func TestDebitCreditNoConectFeeCredit(t *testing.T) { } rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.VOICE: {b1}, + utils.MetaVoice: {b1}, }} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, false, true) @@ -794,9 +794,9 @@ func TestDebitCreditNoConectFeeCredit(t *testing.T) { t.Error("Error showing debiting balance error: ", err) } if len(cc.Timespans) != 1 || - rifsBalance.BalanceMap[utils.MONETARY].GetTotalValue() != 0 { + rifsBalance.BalanceMap[utils.MetaMonetary].GetTotalValue() != 0 { t.Error("Error cutting at no connect fee: ", - rifsBalance.BalanceMap[utils.MONETARY]) + rifsBalance.BalanceMap[utils.MetaMonetary]) } } @@ -830,7 +830,7 @@ func TestDebitCreditMoneyOnly(t *testing.T) { RateUnit: time.Second}}}}, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, } cd := &CallDescriptor{ TimeStart: cc.Timespans[0].TimeStart, @@ -842,7 +842,7 @@ func TestDebitCreditMoneyOnly(t *testing.T) { } rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Uuid: "money", Value: 50}}, + utils.MetaMonetary: {&Balance{Uuid: "money", Value: 50}}, }} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, false, true) @@ -855,9 +855,9 @@ func TestDebitCreditMoneyOnly(t *testing.T) { t.Error("Error setting balance id to increment: ", cc.Timespans[0].Increments[0].BalanceInfo) } - if rifsBalance.BalanceMap[utils.MONETARY][0].GetValue() != 0 { + if rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 0 { t.Error("Error extracting minutes from balance: ", - rifsBalance.BalanceMap[utils.MONETARY][0]) + rifsBalance.BalanceMap[utils.MetaMonetary][0]) } if len(cc.Timespans) != 2 || cc.Timespans[0].GetDuration() != 10*time.Second || @@ -890,7 +890,7 @@ func TestDebitCreditSubjectMinutes(t *testing.T) { RateUnit: time.Second}}}}, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, deductConnectFee: true, } cd := &CallDescriptor{ @@ -905,8 +905,8 @@ func TestDebitCreditSubjectMinutes(t *testing.T) { } rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.VOICE: {b1}, - utils.MONETARY: {&Balance{Uuid: "moneya", Value: 350}}, + utils.MetaVoice: {b1}, + utils.MetaMonetary: {&Balance{Uuid: "moneya", Value: 350}}, }} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, false, true) @@ -919,11 +919,11 @@ func TestDebitCreditSubjectMinutes(t *testing.T) { t.Errorf("Error setting balance id to increment: %+v", cc.Timespans[0].Increments[0]) } - if rifsBalance.BalanceMap[utils.VOICE][0].GetValue() != 180*float64(time.Second) || - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue() != 280 { + if rifsBalance.BalanceMap[utils.MetaVoice][0].GetValue() != 180*float64(time.Second) || + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 280 { t.Errorf("Error extracting minutes from balance: %+v, %+v", - rifsBalance.BalanceMap[utils.VOICE][0].GetValue(), - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue()) + rifsBalance.BalanceMap[utils.MetaVoice][0].GetValue(), + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue()) } if len(cc.Timespans) != 1 || cc.Timespans[0].GetDuration() != 70*time.Second { @@ -953,7 +953,7 @@ func TestDebitCreditSubjectMoney(t *testing.T) { RateUnit: time.Second}}}}, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, deductConnectFee: true, } cd := &CallDescriptor{ @@ -968,7 +968,7 @@ func TestDebitCreditSubjectMoney(t *testing.T) { } rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Uuid: "moneya", Value: 75, DestinationIDs: utils.StringMap{"NAT": true}, RatingSubject: "minu"}}, @@ -983,9 +983,9 @@ func TestDebitCreditSubjectMoney(t *testing.T) { t.Error("Error setting balance id to increment: ", cc.Timespans[0].Increments[0]) } - if rifsBalance.BalanceMap[utils.MONETARY][0].GetValue() != 5 { + if rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 5 { t.Errorf("Error extracting minutes from balance: %+v", - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue()) + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue()) } if len(cc.Timespans) != 1 || cc.Timespans[0].GetDuration() != 70*time.Second { @@ -998,25 +998,25 @@ func TestAccountdebitBalance(t *testing.T) { ID: "rif", AllowNegative: true, BalanceMap: map[string]Balances{ - utils.SMS: {&Balance{Value: 14}}, - utils.DATA: {&Balance{Value: 1204}}, - utils.VOICE: { + utils.MetaSMS: {&Balance{Value: 14}}, + utils.MetaData: {&Balance{Value: 1204}}, + utils.MetaVoice: { &Balance{Weight: 20, DestinationIDs: utils.StringMap{"NAT": true}}, &Balance{Weight: 10, DestinationIDs: utils.StringMap{"RET": true}}}}, } newMb := &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Weight: utils.Float64Pointer(20), DestinationIDs: utils.StringMapPointer(utils.StringMap{"NEW": true}), } a := &Action{Balance: newMb} ub.debitBalanceAction(a, false, false) - if len(ub.BalanceMap[utils.VOICE]) != 3 || - !ub.BalanceMap[utils.VOICE][2].DestinationIDs.Equal(*newMb.DestinationIDs) { + if len(ub.BalanceMap[utils.MetaVoice]) != 3 || + !ub.BalanceMap[utils.MetaVoice][2].DestinationIDs.Equal(*newMb.DestinationIDs) { t.Errorf("Error adding minute bucket! %d %+v %+v", - len(ub.BalanceMap[utils.VOICE]), ub.BalanceMap[utils.VOICE][2], newMb) + len(ub.BalanceMap[utils.MetaVoice]), ub.BalanceMap[utils.MetaVoice][2], newMb) } } @@ -1025,9 +1025,9 @@ func TestAccountdebitBalanceExists(t *testing.T) { ID: "rif", AllowNegative: true, BalanceMap: map[string]Balances{ - utils.SMS: {&Balance{Value: 14}}, - utils.DATA: {&Balance{Value: 1024}}, - utils.VOICE: { + utils.MetaSMS: {&Balance{Value: 14}}, + utils.MetaData: {&Balance{Value: 1024}}, + utils.MetaVoice: { &Balance{ Value: 15, Weight: 20, DestinationIDs: utils.StringMap{"NAT": true}}, @@ -1036,14 +1036,14 @@ func TestAccountdebitBalanceExists(t *testing.T) { } newMb := &BalanceFilter{ Value: &utils.ValueFormula{Static: -10}, - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Weight: utils.Float64Pointer(20), DestinationIDs: utils.StringMapPointer(utils.StringMap{"NAT": true}), } a := &Action{Balance: newMb} ub.debitBalanceAction(a, false, false) - if len(ub.BalanceMap[utils.VOICE]) != 2 || - ub.BalanceMap[utils.VOICE][0].GetValue() != 25 { + if len(ub.BalanceMap[utils.MetaVoice]) != 2 || + ub.BalanceMap[utils.MetaVoice][0].GetValue() != 25 { t.Error("Error adding minute bucket!") } } @@ -1053,14 +1053,14 @@ func TestAccountAddMinuteNil(t *testing.T) { ID: "rif", AllowNegative: true, BalanceMap: map[string]Balances{ - utils.SMS: {&Balance{Value: 14}}, - utils.DATA: {&Balance{Value: 1024}}, - utils.VOICE: { + utils.MetaSMS: {&Balance{Value: 14}}, + utils.MetaData: {&Balance{Value: 1024}}, + utils.MetaVoice: { &Balance{Weight: 20, DestinationIDs: utils.StringMap{"NAT": true}}, &Balance{Weight: 10, DestinationIDs: utils.StringMap{"RET": true}}}}, } ub.debitBalanceAction(nil, false, false) - if len(ub.BalanceMap[utils.VOICE]) != 2 { + if len(ub.BalanceMap[utils.MetaVoice]) != 2 { t.Error("Error adding minute bucket!") } } @@ -1068,34 +1068,34 @@ func TestAccountAddMinuteNil(t *testing.T) { func TestAccountAddMinutBucketEmpty(t *testing.T) { mb1 := &BalanceFilter{ Value: &utils.ValueFormula{Static: -10}, - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), DestinationIDs: utils.StringMapPointer(utils.StringMap{"NAT": true}), } mb2 := &BalanceFilter{ Value: &utils.ValueFormula{Static: -10}, - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), DestinationIDs: utils.StringMapPointer(utils.StringMap{"NAT": true}), } mb3 := &BalanceFilter{ Value: &utils.ValueFormula{Static: -10}, - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), DestinationIDs: utils.StringMapPointer(utils.StringMap{"OTHER": true}), } ub := &Account{} a := &Action{Balance: mb1} ub.debitBalanceAction(a, false, false) - if len(ub.BalanceMap[utils.VOICE]) != 1 { - t.Error("Error adding minute bucket: ", ub.BalanceMap[utils.VOICE]) + if len(ub.BalanceMap[utils.MetaVoice]) != 1 { + t.Error("Error adding minute bucket: ", ub.BalanceMap[utils.MetaVoice]) } a = &Action{Balance: mb2} ub.debitBalanceAction(a, false, false) - if len(ub.BalanceMap[utils.VOICE]) != 1 || ub.BalanceMap[utils.VOICE][0].GetValue() != 20 { - t.Error("Error adding minute bucket: ", ub.BalanceMap[utils.VOICE]) + if len(ub.BalanceMap[utils.MetaVoice]) != 1 || ub.BalanceMap[utils.MetaVoice][0].GetValue() != 20 { + t.Error("Error adding minute bucket: ", ub.BalanceMap[utils.MetaVoice]) } a = &Action{Balance: mb3} ub.debitBalanceAction(a, false, false) - if len(ub.BalanceMap[utils.VOICE]) != 2 { - t.Error("Error adding minute bucket: ", ub.BalanceMap[utils.VOICE]) + if len(ub.BalanceMap[utils.MetaVoice]) != 2 { + t.Error("Error adding minute bucket: ", ub.BalanceMap[utils.MetaVoice]) } } @@ -1103,49 +1103,49 @@ func TestAccountExecuteTriggeredActions(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 100}}, - utils.VOICE: { + utils.MetaVoice: { &Balance{Value: 10 * float64(time.Second), Weight: 20, DestinationIDs: utils.StringMap{"NAT": true}}, &Balance{Weight: 10, DestinationIDs: utils.StringMap{"RET": true}}}}, UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{ + utils.MetaMonetary: []*UnitCounter{ {Counters: CounterFilters{ &CounterFilter{Value: 1, Filter: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY)}}}}}}, + Type: utils.StringPointer(utils.MetaMonetary)}}}}}}, ActionTriggers: ActionTriggers{ &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY)}, - ThresholdValue: 2, ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + Type: utils.StringPointer(utils.MetaMonetary)}, + ThresholdValue: 2, ThresholdType: utils.TriggerMaxEventCounter, ActionsID: "TEST_ACTIONS"}}, } - ub.countUnits(1, utils.MONETARY, new(CallCost), nil) - if ub.BalanceMap[utils.MONETARY][0].GetValue() != 110 || - ub.BalanceMap[utils.VOICE][0].GetValue() != 20*float64(time.Second) { + ub.countUnits(1, utils.MetaMonetary, new(CallCost), nil) + if ub.BalanceMap[utils.MetaMonetary][0].GetValue() != 110 || + ub.BalanceMap[utils.MetaVoice][0].GetValue() != 20*float64(time.Second) { t.Error("Error executing triggered actions", - ub.BalanceMap[utils.MONETARY][0].GetValue(), - ub.BalanceMap[utils.VOICE][0].GetValue()) + ub.BalanceMap[utils.MetaMonetary][0].GetValue(), + ub.BalanceMap[utils.MetaVoice][0].GetValue()) } // are set to executed - ub.countUnits(1, utils.MONETARY, nil, nil) - if ub.BalanceMap[utils.MONETARY][0].GetValue() != 110 || - ub.BalanceMap[utils.VOICE][0].GetValue() != 20*float64(time.Second) { + ub.countUnits(1, utils.MetaMonetary, nil, nil) + if ub.BalanceMap[utils.MetaMonetary][0].GetValue() != 110 || + ub.BalanceMap[utils.MetaVoice][0].GetValue() != 20*float64(time.Second) { t.Error("Error executing triggered actions", - ub.BalanceMap[utils.MONETARY][0].GetValue(), ub.BalanceMap[utils.VOICE][0].GetValue()) + ub.BalanceMap[utils.MetaMonetary][0].GetValue(), ub.BalanceMap[utils.MetaVoice][0].GetValue()) } // we can reset them ub.ResetActionTriggers(nil) - ub.countUnits(10, utils.MONETARY, nil, nil) - if ub.BalanceMap[utils.MONETARY][0].GetValue() != 120 || - ub.BalanceMap[utils.VOICE][0].GetValue() != 30*float64(time.Second) { + ub.countUnits(10, utils.MetaMonetary, nil, nil) + if ub.BalanceMap[utils.MetaMonetary][0].GetValue() != 120 || + ub.BalanceMap[utils.MetaVoice][0].GetValue() != 30*float64(time.Second) { t.Error("Error executing triggered actions", - ub.BalanceMap[utils.MONETARY][0].GetValue(), - ub.BalanceMap[utils.VOICE][0].GetValue()) + ub.BalanceMap[utils.MetaMonetary][0].GetValue(), + ub.BalanceMap[utils.MetaVoice][0].GetValue()) } } @@ -1153,10 +1153,10 @@ func TestAccountExecuteTriggeredActionsBalance(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ Value: 100}}, - utils.VOICE: { + utils.MetaVoice: { &Balance{ Value: 10 * float64(time.Second), Weight: 20, @@ -1165,26 +1165,26 @@ func TestAccountExecuteTriggeredActionsBalance(t *testing.T) { Weight: 10, DestinationIDs: utils.StringMap{"RET": true}}}}, UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{ + utils.MetaMonetary: []*UnitCounter{ {Counters: CounterFilters{ &CounterFilter{Filter: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY)}, + Type: utils.StringPointer(utils.MetaMonetary)}, Value: 1.0}}}}}, ActionTriggers: ActionTriggers{ &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY)}, + Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 100, - ThresholdType: utils.TRIGGER_MIN_EVENT_COUNTER, + ThresholdType: utils.TriggerMinEventCounter, ActionsID: "TEST_ACTIONS"}}, } - ub.countUnits(1, utils.MONETARY, nil, nil) - if ub.BalanceMap[utils.MONETARY][0].GetValue() != 110 || - ub.BalanceMap[utils.VOICE][0].GetValue() != 20*float64(time.Second) { + ub.countUnits(1, utils.MetaMonetary, nil, nil) + if ub.BalanceMap[utils.MetaMonetary][0].GetValue() != 110 || + ub.BalanceMap[utils.MetaVoice][0].GetValue() != 20*float64(time.Second) { t.Error("Error executing triggered actions", - ub.BalanceMap[utils.MONETARY][0].GetValue(), - ub.BalanceMap[utils.VOICE][0].GetValue(), - len(ub.BalanceMap[utils.MONETARY])) + ub.BalanceMap[utils.MetaMonetary][0].GetValue(), + ub.BalanceMap[utils.MetaVoice][0].GetValue(), + len(ub.BalanceMap[utils.MetaMonetary])) } } @@ -1192,28 +1192,28 @@ func TestAccountExecuteTriggeredActionsOrder(t *testing.T) { ub := &Account{ ID: "TEST_UB_OREDER", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 100}}}, UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{ + utils.MetaMonetary: []*UnitCounter{ {Counters: CounterFilters{ &CounterFilter{Value: 1, Filter: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY)}}}}}}, + Type: utils.StringPointer(utils.MetaMonetary)}}}}}}, ActionTriggers: ActionTriggers{ &ActionTrigger{Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY)}, + Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, ActionsID: "TEST_ACTIONS_ORDER"}}, } - ub.countUnits(1, utils.MONETARY, new(CallCost), nil) - if len(ub.BalanceMap[utils.MONETARY]) != 1 || - ub.BalanceMap[utils.MONETARY][0].GetValue() != 10 { + ub.countUnits(1, utils.MetaMonetary, new(CallCost), nil) + if len(ub.BalanceMap[utils.MetaMonetary]) != 1 || + ub.BalanceMap[utils.MetaMonetary][0].GetValue() != 10 { t.Errorf("Error executing triggered actions in order %v", - ub.BalanceMap[utils.MONETARY][0].GetValue()) + ub.BalanceMap[utils.MetaMonetary][0].GetValue()) } } @@ -1221,44 +1221,44 @@ func TestAccountExecuteTriggeredDayWeek(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 100}}, - utils.VOICE: { + utils.MetaVoice: { &Balance{Value: 10, Weight: 20, DestinationIDs: utils.StringMap{"NAT": true}}, &Balance{Weight: 10, DestinationIDs: utils.StringMap{"RET": true}}}}, ActionTriggers: ActionTriggers{ &ActionTrigger{UniqueID: "day_trigger", - Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, - ThresholdValue: 10, ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, + ThresholdValue: 10, ThresholdType: utils.TriggerMaxEventCounter, ActionsID: "TEST_ACTIONS"}, &ActionTrigger{UniqueID: "week_trigger", - Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, - ThresholdValue: 100, ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, + ThresholdValue: 100, ThresholdType: utils.TriggerMaxEventCounter, ActionsID: "TEST_ACTIONS"}, }, } ub.InitCounters() - if len(ub.UnitCounters) != 1 || len(ub.UnitCounters[utils.MONETARY][0].Counters) != 2 { - t.Error("Error initializing counters: ", ub.UnitCounters[utils.MONETARY][0].Counters[0]) + if len(ub.UnitCounters) != 1 || len(ub.UnitCounters[utils.MetaMonetary][0].Counters) != 2 { + t.Error("Error initializing counters: ", ub.UnitCounters[utils.MetaMonetary][0].Counters[0]) } - ub.countUnits(1, utils.MONETARY, new(CallCost), nil) - if ub.UnitCounters[utils.MONETARY][0].Counters[0].Value != 1 || - ub.UnitCounters[utils.MONETARY][0].Counters[1].Value != 1 { + ub.countUnits(1, utils.MetaMonetary, new(CallCost), nil) + if ub.UnitCounters[utils.MetaMonetary][0].Counters[0].Value != 1 || + ub.UnitCounters[utils.MetaMonetary][0].Counters[1].Value != 1 { t.Error("Error incrementing both counters", - ub.UnitCounters[utils.MONETARY][0].Counters[0].Value, - ub.UnitCounters[utils.MONETARY][0].Counters[1].Value) + ub.UnitCounters[utils.MetaMonetary][0].Counters[0].Value, + ub.UnitCounters[utils.MetaMonetary][0].Counters[1].Value) } // we can reset them resetCountersAction(ub, &Action{ - Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY), + Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary), ID: utils.StringPointer("day_trigger")}}, nil, nil) - if ub.UnitCounters[utils.MONETARY][0].Counters[0].Value != 0 || - ub.UnitCounters[utils.MONETARY][0].Counters[1].Value != 1 { + if ub.UnitCounters[utils.MetaMonetary][0].Counters[0].Value != 0 || + ub.UnitCounters[utils.MetaMonetary][0].Counters[1].Value != 1 { t.Error("Error reseting both counters", - ub.UnitCounters[utils.MONETARY][0].Counters[0].Value, - ub.UnitCounters[utils.MONETARY][0].Counters[1].Value) + ub.UnitCounters[utils.MetaMonetary][0].Counters[0].Value, + ub.UnitCounters[utils.MetaMonetary][0].Counters[1].Value) } } @@ -1266,31 +1266,31 @@ func TestAccountExpActionTrigger(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 100, ExpirationDate: time.Date(2015, time.November, 9, 9, 48, 0, 0, time.UTC)}}, - utils.VOICE: { + utils.MetaVoice: { &Balance{Value: 10 * float64(time.Second), Weight: 20, DestinationIDs: utils.StringMap{"NAT": true}}, &Balance{Weight: 10 * float64(time.Second), DestinationIDs: utils.StringMap{"RET": true}}}}, ActionTriggers: ActionTriggers{ &ActionTrigger{ID: "check expired balances", Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY)}, - ThresholdValue: 10, ThresholdType: utils.TRIGGER_BALANCE_EXPIRED, + Type: utils.StringPointer(utils.MetaMonetary)}, + ThresholdValue: 10, ThresholdType: utils.TriggerBalanceExpired, ActionsID: "TEST_ACTIONS"}, }, } ub.ExecuteActionTriggers(nil) - if ub.BalanceMap[utils.MONETARY][0].IsExpiredAt(time.Now()) || - ub.BalanceMap[utils.MONETARY][0].GetValue() != 10 || // expired was cleaned - ub.BalanceMap[utils.VOICE][0].GetValue() != 20*float64(time.Second) || + if ub.BalanceMap[utils.MetaMonetary][0].IsExpiredAt(time.Now()) || + ub.BalanceMap[utils.MetaMonetary][0].GetValue() != 10 || // expired was cleaned + ub.BalanceMap[utils.MetaVoice][0].GetValue() != 20*float64(time.Second) || ub.ActionTriggers[0].Executed != true { - t.Log(ub.BalanceMap[utils.MONETARY][0].IsExpiredAt(time.Now())) + t.Log(ub.BalanceMap[utils.MetaMonetary][0].IsExpiredAt(time.Now())) t.Error("Error executing triggered actions", - ub.BalanceMap[utils.MONETARY][0].GetValue(), - ub.BalanceMap[utils.VOICE][0].GetValue(), - len(ub.BalanceMap[utils.MONETARY])) + ub.BalanceMap[utils.MetaMonetary][0].GetValue(), + ub.BalanceMap[utils.MetaVoice][0].GetValue(), + len(ub.BalanceMap[utils.MetaMonetary])) } } @@ -1298,8 +1298,8 @@ func TestAccountExpActionTriggerNotActivated(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Value: 100}}, - utils.VOICE: { + utils.MetaMonetary: {&Balance{Value: 100}}, + utils.MetaVoice: { &Balance{Value: 10, Weight: 20, DestinationIDs: utils.StringMap{"NAT": true}}, &Balance{Weight: 10, @@ -1307,18 +1307,18 @@ func TestAccountExpActionTriggerNotActivated(t *testing.T) { ActionTriggers: ActionTriggers{ &ActionTrigger{ID: "check expired balances", ActivationDate: time.Date(2116, 2, 5, 18, 0, 0, 0, time.UTC), - Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, - ThresholdValue: 10, ThresholdType: utils.TRIGGER_BALANCE_EXPIRED, + Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, + ThresholdValue: 10, ThresholdType: utils.TriggerBalanceExpired, ActionsID: "TEST_ACTIONS"}, }, } ub.ExecuteActionTriggers(nil) - if ub.BalanceMap[utils.MONETARY][0].IsExpiredAt(time.Now()) || - ub.BalanceMap[utils.MONETARY][0].GetValue() != 100 || - ub.BalanceMap[utils.VOICE][0].GetValue() != 10 || + if ub.BalanceMap[utils.MetaMonetary][0].IsExpiredAt(time.Now()) || + ub.BalanceMap[utils.MetaMonetary][0].GetValue() != 100 || + ub.BalanceMap[utils.MetaVoice][0].GetValue() != 10 || ub.ActionTriggers[0].Executed != false { - t.Log(ub.BalanceMap[utils.MONETARY][0].IsExpiredAt(time.Now())) - t.Error("Error executing triggered actions", ub.BalanceMap[utils.MONETARY][0].GetValue(), ub.BalanceMap[utils.VOICE][0].GetValue(), len(ub.BalanceMap[utils.MONETARY])) + t.Log(ub.BalanceMap[utils.MetaMonetary][0].IsExpiredAt(time.Now())) + t.Error("Error executing triggered actions", ub.BalanceMap[utils.MetaMonetary][0].GetValue(), ub.BalanceMap[utils.MetaVoice][0].GetValue(), len(ub.BalanceMap[utils.MetaMonetary])) } } @@ -1326,38 +1326,38 @@ func TestAccountExpActionTriggerExpired(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Value: 100}}, - utils.VOICE: {&Balance{Value: 10, Weight: 20, + utils.MetaMonetary: {&Balance{Value: 100}}, + utils.MetaVoice: {&Balance{Value: 10, Weight: 20, DestinationIDs: utils.StringMap{"NAT": true}}, &Balance{Weight: 10, DestinationIDs: utils.StringMap{"RET": true}}}}, ActionTriggers: ActionTriggers{ &ActionTrigger{ID: "check expired balances", ExpirationDate: time.Date(2016, 2, 4, 18, 0, 0, 0, time.UTC), - Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, - ThresholdValue: 10, ThresholdType: utils.TRIGGER_BALANCE_EXPIRED, + Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, + ThresholdValue: 10, ThresholdType: utils.TriggerBalanceExpired, ActionsID: "TEST_ACTIONS"}, }, } ub.ExecuteActionTriggers(nil) - if ub.BalanceMap[utils.MONETARY][0].IsExpiredAt(time.Now()) || - ub.BalanceMap[utils.MONETARY][0].GetValue() != 100 || - ub.BalanceMap[utils.VOICE][0].GetValue() != 10 || + if ub.BalanceMap[utils.MetaMonetary][0].IsExpiredAt(time.Now()) || + ub.BalanceMap[utils.MetaMonetary][0].GetValue() != 100 || + ub.BalanceMap[utils.MetaVoice][0].GetValue() != 10 || len(ub.ActionTriggers) != 0 { - t.Log(ub.BalanceMap[utils.MONETARY][0].IsExpiredAt(time.Now())) + t.Log(ub.BalanceMap[utils.MetaMonetary][0].IsExpiredAt(time.Now())) t.Error("Error executing triggered actions", - ub.BalanceMap[utils.MONETARY][0].GetValue(), - ub.BalanceMap[utils.VOICE][0].GetValue(), - len(ub.BalanceMap[utils.MONETARY])) + ub.BalanceMap[utils.MetaMonetary][0].GetValue(), + ub.BalanceMap[utils.MetaVoice][0].GetValue(), + len(ub.BalanceMap[utils.MetaMonetary])) } } func TestCleanExpired(t *testing.T) { ub := &Account{ ID: "TEST_UB_OREDER", - BalanceMap: map[string]Balances{utils.MONETARY: { + BalanceMap: map[string]Balances{utils.MetaMonetary: { &Balance{ExpirationDate: time.Now().Add(10 * time.Second)}, &Balance{ExpirationDate: time.Date(2013, 7, 18, 14, 33, 0, 0, time.UTC)}, - &Balance{ExpirationDate: time.Now().Add(10 * time.Second)}}, utils.VOICE: { + &Balance{ExpirationDate: time.Now().Add(10 * time.Second)}}, utils.MetaVoice: { &Balance{ExpirationDate: time.Date(2013, 7, 18, 14, 33, 0, 0, time.UTC)}, &Balance{ExpirationDate: time.Now().Add(10 * time.Second)}, }}, @@ -1371,10 +1371,10 @@ func TestCleanExpired(t *testing.T) { }, } ub.CleanExpiredStuff() - if len(ub.BalanceMap[utils.MONETARY]) != 2 { + if len(ub.BalanceMap[utils.MetaMonetary]) != 2 { t.Error("Error cleaning expired balances!") } - if len(ub.BalanceMap[utils.VOICE]) != 1 { + if len(ub.BalanceMap[utils.MetaVoice]) != 1 { t.Error("Error cleaning expired minute buckets!") } if len(ub.ActionTriggers) != 1 { @@ -1384,53 +1384,53 @@ func TestCleanExpired(t *testing.T) { func TestAccountUnitCounting(t *testing.T) { ub := &Account{UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{{ + utils.MetaMonetary: []*UnitCounter{{ Counters: CounterFilters{&CounterFilter{Value: 0}}}}}} - ub.countUnits(10, utils.MONETARY, &CallCost{}, nil) - if len(ub.UnitCounters[utils.MONETARY]) != 1 || - ub.UnitCounters[utils.MONETARY][0].Counters[0].Value != 10 { + ub.countUnits(10, utils.MetaMonetary, &CallCost{}, nil) + if len(ub.UnitCounters[utils.MetaMonetary]) != 1 || + ub.UnitCounters[utils.MetaMonetary][0].Counters[0].Value != 10 { t.Error("Error counting units") } - ub.countUnits(10, utils.MONETARY, &CallCost{}, nil) - if len(ub.UnitCounters[utils.MONETARY]) != 1 || - ub.UnitCounters[utils.MONETARY][0].Counters[0].Value != 20 { + ub.countUnits(10, utils.MetaMonetary, &CallCost{}, nil) + if len(ub.UnitCounters[utils.MetaMonetary]) != 1 || + ub.UnitCounters[utils.MetaMonetary][0].Counters[0].Value != 20 { t.Error("Error counting units") } } func TestAccountUnitCountingOutbound(t *testing.T) { - ub := &Account{UnitCounters: UnitCounters{utils.MONETARY: []*UnitCounter{ + ub := &Account{UnitCounters: UnitCounters{utils.MetaMonetary: []*UnitCounter{ {Counters: CounterFilters{&CounterFilter{Value: 0}}}}}} - ub.countUnits(10, utils.MONETARY, new(CallCost), nil) - if len(ub.UnitCounters[utils.MONETARY]) != 1 || - ub.UnitCounters[utils.MONETARY][0].Counters[0].Value != 10 { + ub.countUnits(10, utils.MetaMonetary, new(CallCost), nil) + if len(ub.UnitCounters[utils.MetaMonetary]) != 1 || + ub.UnitCounters[utils.MetaMonetary][0].Counters[0].Value != 10 { t.Error("Error counting units") } - ub.countUnits(10, utils.MONETARY, new(CallCost), nil) - if len(ub.UnitCounters[utils.MONETARY]) != 1 || - ub.UnitCounters[utils.MONETARY][0].Counters[0].Value != 20 { + ub.countUnits(10, utils.MetaMonetary, new(CallCost), nil) + if len(ub.UnitCounters[utils.MetaMonetary]) != 1 || + ub.UnitCounters[utils.MetaMonetary][0].Counters[0].Value != 20 { t.Error("Error counting units") } - ub.countUnits(10, utils.MONETARY, new(CallCost), nil) - if len(ub.UnitCounters[utils.MONETARY]) != 1 || - ub.UnitCounters[utils.MONETARY][0].Counters[0].Value != 30 { + ub.countUnits(10, utils.MetaMonetary, new(CallCost), nil) + if len(ub.UnitCounters[utils.MetaMonetary]) != 1 || + ub.UnitCounters[utils.MetaMonetary][0].Counters[0].Value != 30 { t.Error("Error counting units") } } func TestAccountUnitCountingOutboundInbound(t *testing.T) { ub := &Account{UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{ + utils.MetaMonetary: []*UnitCounter{ {Counters: CounterFilters{&CounterFilter{Value: 0}}}}}} - ub.countUnits(10, utils.MONETARY, new(CallCost), nil) - if len(ub.UnitCounters[utils.MONETARY]) != 1 || - ub.UnitCounters[utils.MONETARY][0].Counters[0].Value != 10 { + ub.countUnits(10, utils.MetaMonetary, new(CallCost), nil) + if len(ub.UnitCounters[utils.MetaMonetary]) != 1 || + ub.UnitCounters[utils.MetaMonetary][0].Counters[0].Value != 10 { t.Errorf("Error counting units: %+v", - ub.UnitCounters[utils.MONETARY][0].Counters[0]) + ub.UnitCounters[utils.MetaMonetary][0].Counters[0]) } - ub.countUnits(10, utils.MONETARY, new(CallCost), nil) - if len(ub.UnitCounters[utils.MONETARY]) != 1 || - ub.UnitCounters[utils.MONETARY][0].Counters[0].Value != 20 { + ub.countUnits(10, utils.MetaMonetary, new(CallCost), nil) + if len(ub.UnitCounters[utils.MetaMonetary]) != 1 || + ub.UnitCounters[utils.MetaMonetary][0].Counters[0].Value != 20 { t.Error("Error counting units") } } @@ -1465,10 +1465,10 @@ func TestDebitShared(t *testing.T) { testCallcost: cc, } rif := &Account{ID: "rif", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Uuid: "moneya", Value: 0, SharedGroups: utils.NewStringMap("SG_TEST")}}, + utils.MetaMonetary: {&Balance{Uuid: "moneya", Value: 0, SharedGroups: utils.NewStringMap("SG_TEST")}}, }} groupie := &Account{ID: "groupie", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Uuid: "moneyc", Value: 130, SharedGroups: utils.NewStringMap("SG_TEST")}}, + utils.MetaMonetary: {&Balance{Uuid: "moneyc", Value: 130, SharedGroups: utils.NewStringMap("SG_TEST")}}, }} sg := &SharedGroup{Id: "SG_TEST", MemberIds: utils.NewStringMap(rif.ID, groupie.ID), AccountParameters: map[string]*SharingParameters{"*any": {Strategy: STRATEGY_MINE_RANDOM}}} @@ -1479,12 +1479,12 @@ func TestDebitShared(t *testing.T) { if err != nil { t.Error("Error debiting balance: ", err) } - if rif.BalanceMap[utils.MONETARY][0].GetValue() != 0 { - t.Errorf("Error debiting from shared group: %+v", rif.BalanceMap[utils.MONETARY][0]) + if rif.BalanceMap[utils.MetaMonetary][0].GetValue() != 0 { + t.Errorf("Error debiting from shared group: %+v", rif.BalanceMap[utils.MetaMonetary][0]) } groupie, _ = dm.GetAccount("groupie") - if groupie.BalanceMap[utils.MONETARY][0].GetValue() != 10 { - t.Errorf("Error debiting from shared group: %+v", groupie.BalanceMap[utils.MONETARY][0]) + if groupie.BalanceMap[utils.MetaMonetary][0].GetValue() != 10 { + t.Errorf("Error debiting from shared group: %+v", groupie.BalanceMap[utils.MetaMonetary][0]) } if len(cc.Timespans) != 1 { @@ -1536,10 +1536,10 @@ func TestMaxDurationShared(t *testing.T) { testCallcost: cc, } rif := &Account{ID: "rif", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Uuid: "moneya", Value: 0, SharedGroups: utils.NewStringMap("SG_TEST")}}, + utils.MetaMonetary: {&Balance{Uuid: "moneya", Value: 0, SharedGroups: utils.NewStringMap("SG_TEST")}}, }} groupie := &Account{ID: "groupie", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Uuid: "moneyc", Value: 130, SharedGroups: utils.NewStringMap("SG_TEST")}}, + utils.MetaMonetary: {&Balance{Uuid: "moneyc", Value: 130, SharedGroups: utils.NewStringMap("SG_TEST")}}, }} sg := &SharedGroup{Id: "SG_TEST", MemberIds: utils.NewStringMap(rif.ID, groupie.ID), AccountParameters: map[string]*SharingParameters{"*any": {Strategy: STRATEGY_MINE_RANDOM}}} @@ -1565,11 +1565,11 @@ func TestMaxDurationConnectFeeOnly(t *testing.T) { Destination: "4444", Subject: "dy", Account: "dy", - ToR: utils.VOICE, + ToR: utils.MetaVoice, DurationIndex: 600, } rif := &Account{ID: "rif", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Uuid: "moneya", Value: 0.2}}, + utils.MetaMonetary: {&Balance{Uuid: "moneya", Value: 0.2}}, }} duration, err := cd.getMaxSessionDuration(rif) @@ -1600,7 +1600,7 @@ func TestDebitSMS(t *testing.T) { RateUnit: time.Nanosecond}}}}, }, }, - ToR: utils.SMS, + ToR: utils.MetaSMS, } cd := &CallDescriptor{ TimeStart: cc.Timespans[0].TimeStart, @@ -1612,11 +1612,11 @@ func TestDebitSMS(t *testing.T) { } rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.SMS: { + utils.MetaSMS: { &Balance{Uuid: "testm", Value: 100, Weight: 5, DestinationIDs: utils.StringMap{"NAT": true}}}, - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 21}}, }} var err error @@ -1627,12 +1627,12 @@ func TestDebitSMS(t *testing.T) { if cc.Timespans[0].Increments[0].BalanceInfo.Unit.UUID != "testm" { t.Error("Error setting balance id to increment: ", cc.Timespans[0].Increments[0]) } - if rifsBalance.BalanceMap[utils.SMS][0].GetValue() != 99 || - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue() != 21 { + if rifsBalance.BalanceMap[utils.MetaSMS][0].GetValue() != 99 || + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 21 { t.Log(cc.Timespans[0].Increments) t.Error("Error extracting minutes from balance: ", - rifsBalance.BalanceMap[utils.SMS][0].GetValue(), - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue()) + rifsBalance.BalanceMap[utils.MetaSMS][0].GetValue(), + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue()) } } @@ -1659,7 +1659,7 @@ func TestDebitGeneric(t *testing.T) { }, }, }, - ToR: utils.GENERIC, + ToR: utils.MetaGeneric, } cd := &CallDescriptor{ TimeStart: cc.Timespans[0].TimeStart, @@ -1671,10 +1671,10 @@ func TestDebitGeneric(t *testing.T) { } rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.GENERIC: { + utils.MetaGeneric: { &Balance{Uuid: "testm", Value: 100, Weight: 5, DestinationIDs: utils.StringMap{"NAT": true}}}, - utils.MONETARY: {&Balance{Value: 21}}, + utils.MetaMonetary: {&Balance{Value: 21}}, }} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, false, true) @@ -1685,12 +1685,12 @@ func TestDebitGeneric(t *testing.T) { t.Error("Error setting balance id to increment: ", cc.Timespans[0].Increments[0]) } - if rifsBalance.BalanceMap[utils.GENERIC][0].GetValue() != 99 || - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue() != 21 { + if rifsBalance.BalanceMap[utils.MetaGeneric][0].GetValue() != 99 || + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 21 { t.Log(cc.Timespans[0].Increments) t.Error("Error extracting minutes from balance: ", - rifsBalance.BalanceMap[utils.GENERIC][0].GetValue(), - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue()) + rifsBalance.BalanceMap[utils.MetaGeneric][0].GetValue(), + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue()) } } @@ -1712,7 +1712,7 @@ func TestDebitGenericBalance(t *testing.T) { RateUnit: time.Second}}}}, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, } cd := &CallDescriptor{ TimeStart: cc.Timespans[0].TimeStart, @@ -1724,11 +1724,11 @@ func TestDebitGenericBalance(t *testing.T) { } rifsBalance := &Account{ ID: "other", BalanceMap: map[string]Balances{ - utils.GENERIC: { + utils.MetaGeneric: { &Balance{Uuid: "testm", Value: 100, Weight: 5, DestinationIDs: utils.StringMap{"NAT": true}, - Factor: ValueFactor{utils.VOICE: 60 * float64(time.Second)}}}, - utils.MONETARY: {&Balance{Value: 21}}, + Factor: ValueFactor{utils.MetaVoice: 60 * float64(time.Second)}}}, + utils.MetaMonetary: {&Balance{Value: 21}}, }} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, false, true) @@ -1738,12 +1738,12 @@ func TestDebitGenericBalance(t *testing.T) { if cc.Timespans[0].Increments[0].BalanceInfo.Unit.UUID != "testm" { t.Error("Error setting balance id to increment: ", cc.Timespans[0].Increments[0]) } - if rifsBalance.BalanceMap[utils.GENERIC][0].GetValue() != 99.49999 || - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue() != 21 { + if rifsBalance.BalanceMap[utils.MetaGeneric][0].GetValue() != 99.49999 || + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 21 { t.Logf("%+v", cc.Timespans[0].Increments[0]) t.Error("Error extracting minutes from balance: ", - rifsBalance.BalanceMap[utils.GENERIC][0].GetValue(), - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue()) + rifsBalance.BalanceMap[utils.MetaGeneric][0].GetValue(), + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue()) } } @@ -1764,7 +1764,7 @@ func TestDebitGenericBalanceWithRatingSubject(t *testing.T) { RateUnit: time.Second}}}}, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, } cd := &CallDescriptor{ TimeStart: cc.Timespans[0].TimeStart, @@ -1776,12 +1776,12 @@ func TestDebitGenericBalanceWithRatingSubject(t *testing.T) { } rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.GENERIC: { + utils.MetaGeneric: { &Balance{Uuid: "testm", Value: 100, Weight: 5, DestinationIDs: utils.StringMap{"NAT": true}, - Factor: ValueFactor{utils.VOICE: 60 * float64(time.Second)}, + Factor: ValueFactor{utils.MetaVoice: 60 * float64(time.Second)}, RatingSubject: "free"}}, - utils.MONETARY: {&Balance{Value: 21}}, + utils.MetaMonetary: {&Balance{Value: 21}}, }} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, false, true) @@ -1791,12 +1791,12 @@ func TestDebitGenericBalanceWithRatingSubject(t *testing.T) { if cc.Timespans[0].Increments[0].BalanceInfo.Unit.UUID != "testm" { t.Error("Error setting balance id to increment: ", cc.Timespans[0]) } - if rifsBalance.BalanceMap[utils.GENERIC][0].GetValue() != 99.49999 || - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue() != 21 { + if rifsBalance.BalanceMap[utils.MetaGeneric][0].GetValue() != 99.49999 || + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 21 { t.Logf("%+v", cc.Timespans[0].Increments[0]) t.Error("Error extracting minutes from balance: ", - rifsBalance.BalanceMap[utils.GENERIC][0].GetValue(), - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue()) + rifsBalance.BalanceMap[utils.MetaGeneric][0].GetValue(), + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue()) } } @@ -1824,7 +1824,7 @@ func TestDebitDataUnits(t *testing.T) { }, }, }, - ToR: utils.DATA, + ToR: utils.MetaData, } cd := &CallDescriptor{ TimeStart: cc.Timespans[0].TimeStart, @@ -1836,11 +1836,11 @@ func TestDebitDataUnits(t *testing.T) { } rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.DATA: { + utils.MetaData: { &Balance{Uuid: "testm", Value: 100, Weight: 5, DestinationIDs: utils.StringMap{"NAT": true}}}, - utils.MONETARY: {&Balance{Value: 21}}, + utils.MetaMonetary: {&Balance{Value: 21}}, }} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, false, true) @@ -1856,12 +1856,12 @@ func TestDebitDataUnits(t *testing.T) { if ts.Increments[0].BalanceInfo.Unit.UUID != "testm" { t.Error("Error setting balance id to increment: ", ts.Increments[0]) } - if rifsBalance.BalanceMap[utils.DATA][0].GetValue() != 20 || - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue() != 21 { + if rifsBalance.BalanceMap[utils.MetaData][0].GetValue() != 20 || + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 21 { t.Log(ts.Increments) t.Error("Error extracting minutes from balance: ", - rifsBalance.BalanceMap[utils.DATA][0].GetValue(), - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue()) + rifsBalance.BalanceMap[utils.MetaData][0].GetValue(), + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue()) } } @@ -1883,7 +1883,7 @@ func TestDebitDataMoney(t *testing.T) { }, }, }, - ToR: utils.DATA, + ToR: utils.MetaData, } cd := &CallDescriptor{ TimeStart: cc.Timespans[0].TimeStart, @@ -1894,17 +1894,17 @@ func TestDebitDataMoney(t *testing.T) { testCallcost: cc, } rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{ - utils.DATA: {&Balance{Uuid: "testm", Value: 0, Weight: 5, DestinationIDs: utils.StringMap{"NAT": true}}}, - utils.MONETARY: {&Balance{Value: 160}}, + utils.MetaData: {&Balance{Uuid: "testm", Value: 0, Weight: 5, DestinationIDs: utils.StringMap{"NAT": true}}}, + utils.MetaMonetary: {&Balance{Value: 160}}, }} var err error cc, err = rifsBalance.debitCreditBalance(cd, false, false, true) if err != nil { t.Error("Error debiting balance: ", err) } - if rifsBalance.BalanceMap[utils.DATA][0].GetValue() != 0 || - rifsBalance.BalanceMap[utils.MONETARY][0].GetValue() != 0 { - t.Error("Error extracting minutes from balance: ", rifsBalance.BalanceMap[utils.DATA][0].GetValue(), rifsBalance.BalanceMap[utils.MONETARY][0].GetValue()) + if rifsBalance.BalanceMap[utils.MetaData][0].GetValue() != 0 || + rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 0 { + t.Error("Error extracting minutes from balance: ", rifsBalance.BalanceMap[utils.MetaData][0].GetValue(), rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue()) } } @@ -1919,7 +1919,7 @@ func TestAccountGetDefaultMoneyBalanceEmpty(t *testing.T) { func TestAccountGetDefaultMoneyBalance(t *testing.T) { acc := &Account{} acc.BalanceMap = make(map[string]Balances) - tag := utils.MONETARY + tag := utils.MetaMonetary acc.BalanceMap[tag] = append(acc.BalanceMap[tag], &Balance{Weight: 10}) defBal := acc.GetDefaultMoneyBalance() if defBal == nil || len(acc.BalanceMap[tag]) != 2 || !defBal.IsDefault() { @@ -1932,49 +1932,49 @@ func TestAccountInitCounters(t *testing.T) { ActionTriggers: ActionTriggers{ &ActionTrigger{ UniqueID: "TestTR1", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR11", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR2", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR3", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR4", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.SMS), + Type: utils.StringPointer(utils.MetaSMS), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR5", - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.SMS), + Type: utils.StringPointer(utils.MetaSMS), Weight: utils.Float64Pointer(10), }, }, @@ -1982,10 +1982,10 @@ func TestAccountInitCounters(t *testing.T) { } a.InitCounters() if len(a.UnitCounters) != 3 || - len(a.UnitCounters[utils.MONETARY][0].Counters) != 2 || - len(a.UnitCounters[utils.VOICE][0].Counters) != 1 || - len(a.UnitCounters[utils.VOICE][1].Counters) != 1 || - len(a.UnitCounters[utils.SMS][0].Counters) != 1 { + len(a.UnitCounters[utils.MetaMonetary][0].Counters) != 2 || + len(a.UnitCounters[utils.MetaVoice][0].Counters) != 1 || + len(a.UnitCounters[utils.MetaVoice][1].Counters) != 1 || + len(a.UnitCounters[utils.MetaSMS][0].Counters) != 1 { for key, counters := range a.UnitCounters { t.Log(key) for _, uc := range counters { @@ -2004,49 +2004,49 @@ func TestAccountDoubleInitCounters(t *testing.T) { ActionTriggers: ActionTriggers{ &ActionTrigger{ UniqueID: "TestTR1", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR11", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR2", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR3", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR4", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.SMS), + Type: utils.StringPointer(utils.MetaSMS), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR5", - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.SMS), + Type: utils.StringPointer(utils.MetaSMS), Weight: utils.Float64Pointer(10), }, }, @@ -2055,10 +2055,10 @@ func TestAccountDoubleInitCounters(t *testing.T) { a.InitCounters() a.InitCounters() if len(a.UnitCounters) != 3 || - len(a.UnitCounters[utils.MONETARY][0].Counters) != 2 || - len(a.UnitCounters[utils.VOICE][0].Counters) != 1 || - len(a.UnitCounters[utils.VOICE][1].Counters) != 1 || - len(a.UnitCounters[utils.SMS][0].Counters) != 1 { + len(a.UnitCounters[utils.MetaMonetary][0].Counters) != 2 || + len(a.UnitCounters[utils.MetaVoice][0].Counters) != 1 || + len(a.UnitCounters[utils.MetaVoice][1].Counters) != 1 || + len(a.UnitCounters[utils.MetaSMS][0].Counters) != 1 { for key, counters := range a.UnitCounters { t.Log(key) for _, uc := range counters { @@ -2075,7 +2075,7 @@ func TestAccountDoubleInitCounters(t *testing.T) { func TestAccountGetBalancesForPrefixMixed(t *testing.T) { acc := &Account{ BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ Value: 10, DestinationIDs: utils.StringMap{"NAT": true, "RET": false}, @@ -2083,7 +2083,7 @@ func TestAccountGetBalancesForPrefixMixed(t *testing.T) { }, }, } - bcs := acc.getBalancesForPrefix("999123", "", utils.MONETARY, "", time.Now()) + bcs := acc.getBalancesForPrefix("999123", "", utils.MetaMonetary, "", time.Now()) if len(bcs) != 0 { t.Error("error excluding on mixed balances") } @@ -2092,7 +2092,7 @@ func TestAccountGetBalancesForPrefixMixed(t *testing.T) { func TestAccountGetBalancesForPrefixAllExcl(t *testing.T) { acc := &Account{ BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ Value: 10, DestinationIDs: utils.StringMap{"NAT": false, "RET": false}, @@ -2100,7 +2100,7 @@ func TestAccountGetBalancesForPrefixAllExcl(t *testing.T) { }, }, } - bcs := acc.getBalancesForPrefix("999123", "", utils.MONETARY, "", time.Now()) + bcs := acc.getBalancesForPrefix("999123", "", utils.MetaMonetary, "", time.Now()) if len(bcs) == 0 { t.Error("error finding balance on all excluded") } @@ -2109,7 +2109,7 @@ func TestAccountGetBalancesForPrefixAllExcl(t *testing.T) { func TestAccountGetBalancesForPrefixMixedGood(t *testing.T) { acc := &Account{ BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ Value: 10, DestinationIDs: utils.StringMap{"NAT": true, "RET": false, "EXOTIC": true}, @@ -2118,7 +2118,7 @@ func TestAccountGetBalancesForPrefixMixedGood(t *testing.T) { }, } - bcs := acc.getBalancesForPrefix("999123", "", utils.MONETARY, "", time.Now()) + bcs := acc.getBalancesForPrefix("999123", "", utils.MetaMonetary, "", time.Now()) if len(bcs) == 0 { t.Error("error finding on mixed balances good") } @@ -2127,7 +2127,7 @@ func TestAccountGetBalancesForPrefixMixedGood(t *testing.T) { func TestAccountGetBalancesForPrefixMixedBad(t *testing.T) { acc := &Account{ BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ Value: 10, DestinationIDs: utils.StringMap{"NAT": true, "RET": false, "EXOTIC": false}, @@ -2135,7 +2135,7 @@ func TestAccountGetBalancesForPrefixMixedBad(t *testing.T) { }, }, } - bcs := acc.getBalancesForPrefix("999123", "", utils.MONETARY, "", time.Now()) + bcs := acc.getBalancesForPrefix("999123", "", utils.MetaMonetary, "", time.Now()) if len(bcs) != 0 { t.Error("error excluding on mixed balances bad") } @@ -2154,10 +2154,10 @@ func TestAccountAsAccountDigest(t *testing.T) { ID: "cgrates.org:account1", AllowNegative: true, BalanceMap: map[string]Balances{ - utils.SMS: {&Balance{ID: "sms1", Value: 14}}, - utils.MMS: {&Balance{ID: "mms1", Value: 140}}, - utils.DATA: {&Balance{ID: "data1", Value: 1204}}, - utils.VOICE: { + utils.MetaSMS: {&Balance{ID: "sms1", Value: 14}}, + utils.MetaMMS: {&Balance{ID: "mms1", Value: 140}}, + utils.MetaData: {&Balance{ID: "data1", Value: 1204}}, + utils.MetaVoice: { &Balance{ID: "voice1", Weight: 20, DestinationIDs: utils.StringMap{"NAT": true}, Value: 3600}, &Balance{ID: "voice2", Weight: 10, DestinationIDs: utils.StringMap{"RET": true}, Value: 1200}, }, @@ -2167,11 +2167,11 @@ func TestAccountAsAccountDigest(t *testing.T) { Tenant: "cgrates.org", ID: "account1", BalanceSummaries: []*BalanceSummary{ - {ID: "data1", Type: utils.DATA, Value: 1204, Disabled: false}, - {ID: "sms1", Type: utils.SMS, Value: 14, Disabled: false}, - {ID: "mms1", Type: utils.MMS, Value: 140, Disabled: false}, - {ID: "voice1", Type: utils.VOICE, Value: 3600, Disabled: false}, - {ID: "voice2", Type: utils.VOICE, Value: 1200, Disabled: false}, + {ID: "data1", Type: utils.MetaData, Value: 1204, Disabled: false}, + {ID: "sms1", Type: utils.MetaSMS, Value: 14, Disabled: false}, + {ID: "mms1", Type: utils.MetaMMS, Value: 140, Disabled: false}, + {ID: "voice1", Type: utils.MetaVoice, Value: 3600, Disabled: false}, + {ID: "voice2", Type: utils.MetaVoice, Value: 1200, Disabled: false}, }, AllowNegative: true, Disabled: false, @@ -2186,7 +2186,7 @@ func TestAccountAsAccountDigest(t *testing.T) { func TestAccountGetBalancesGetBalanceWithSameWeight(t *testing.T) { acc := &Account{ BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ ID: "SpecialBalance1", Value: 10, @@ -2200,7 +2200,7 @@ func TestAccountGetBalancesGetBalanceWithSameWeight(t *testing.T) { }, }, } - bcs := acc.getBalancesForPrefix("", "", utils.MONETARY, "", time.Now()) + bcs := acc.getBalancesForPrefix("", "", utils.MetaMonetary, "", time.Now()) if len(bcs) != 2 && bcs[0].ID != "SpecialBalance1" && bcs[1].ID != "SpecialBalance2" { t.Errorf("Unexpected order balances : %+v", utils.ToJSON(bcs)) } @@ -2209,7 +2209,7 @@ func TestAccountGetBalancesGetBalanceWithSameWeight(t *testing.T) { func TestAccountGetBalancesForPrefix2(t *testing.T) { acc := &Account{ BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ ID: "SpecialBalance1", Value: 10, @@ -2223,7 +2223,7 @@ func TestAccountGetBalancesForPrefix2(t *testing.T) { }, }, } - bcs := acc.getBalancesForPrefix("", "", utils.MONETARY, "", time.Now()) + bcs := acc.getBalancesForPrefix("", "", utils.MetaMonetary, "", time.Now()) if len(bcs) != 2 && bcs[0].ID != "SpecialBalance2" && bcs[0].Weight != 20.0 { t.Errorf("Unexpected order balances : %+v", utils.ToJSON(bcs)) } @@ -2232,7 +2232,7 @@ func TestAccountGetBalancesForPrefix2(t *testing.T) { func TestAccountGetMultipleBalancesForPrefixWithSameWeight(t *testing.T) { acc := &Account{ BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ ID: "SpecialBalance1", Value: 10, @@ -2261,7 +2261,7 @@ func TestAccountGetMultipleBalancesForPrefixWithSameWeight(t *testing.T) { }, }, } - bcs := acc.getBalancesForPrefix("", "", utils.MONETARY, "", time.Now()) + bcs := acc.getBalancesForPrefix("", "", utils.MetaMonetary, "", time.Now()) if len(bcs) != 5 && bcs[0].ID != "SpecialBalance1" && bcs[1].ID != "SpecialBalance2" && bcs[2].ID != "SpecialBalance3" && bcs[3].ID != "SpecialBalance4" && @@ -2279,7 +2279,7 @@ func TestAccountClone(t *testing.T) { account = &Account{ ID: "testID", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Value: 10, Weight: 10}}}, + utils.MetaMonetary: {&Balance{Value: 10, Weight: 10}}}, ActionTriggers: []*ActionTrigger{ { ID: "ActionTriggerID1", @@ -2294,7 +2294,7 @@ func TestAccountClone(t *testing.T) { eOut = &Account{ ID: "testID", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Value: 10, Weight: 10}}}, + utils.MetaMonetary: {&Balance{Value: 10, Weight: 10}}}, ActionTriggers: []*ActionTrigger{ { ID: "ActionTriggerID1", @@ -2338,7 +2338,7 @@ func BenchmarkGetSecondForPrefix(b *testing.B) { b1 := &Balance{Value: 10, Weight: 10, DestinationIDs: utils.StringMap{"NAT": true}} b2 := &Balance{Value: 100, Weight: 20, DestinationIDs: utils.StringMap{"RET": true}} - ub1 := &Account{ID: "other", BalanceMap: map[string]Balances{utils.VOICE: {b1, b2}, utils.MONETARY: {&Balance{Value: 21}}}} + ub1 := &Account{ID: "other", BalanceMap: map[string]Balances{utils.MetaVoice: {b1, b2}, utils.MetaMonetary: {&Balance{Value: 21}}}} cd := &CallDescriptor{ Destination: "0723", } @@ -2351,7 +2351,7 @@ func BenchmarkGetSecondForPrefix(b *testing.B) { func BenchmarkAccountStorageStoreRestore(b *testing.B) { b1 := &Balance{Value: 10, Weight: 10, DestinationIDs: utils.StringMap{"NAT": true}} b2 := &Balance{Value: 100, Weight: 20, DestinationIDs: utils.StringMap{"RET": true}} - rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{utils.VOICE: {b1, b2}, utils.MONETARY: {&Balance{Value: 21}}}} + rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{utils.MetaVoice: {b1, b2}, utils.MetaMonetary: {&Balance{Value: 21}}}} for i := 0; i < b.N; i++ { dm.SetAccount(rifsBalance) dm.GetAccount(rifsBalance.ID) @@ -2361,7 +2361,7 @@ func BenchmarkAccountStorageStoreRestore(b *testing.B) { func BenchmarkGetSecondsForPrefix(b *testing.B) { b1 := &Balance{Value: 10, Weight: 10, DestinationIDs: utils.StringMap{"NAT": true}} b2 := &Balance{Value: 100, Weight: 20, DestinationIDs: utils.StringMap{"RET": true}} - ub1 := &Account{ID: "OUT:CUSTOMER_1:rif", BalanceMap: map[string]Balances{utils.VOICE: {b1, b2}, utils.MONETARY: {&Balance{Value: 21}}}} + ub1 := &Account{ID: "OUT:CUSTOMER_1:rif", BalanceMap: map[string]Balances{utils.MetaVoice: {b1, b2}, utils.MetaMonetary: {&Balance{Value: 21}}}} cd := &CallDescriptor{ Destination: "0723", } diff --git a/engine/action.go b/engine/action.go index 1adbe5390..5c0c5d68a 100644 --- a/engine/action.go +++ b/engine/action.go @@ -72,7 +72,7 @@ type actionTypeFunc func(*Account, *Action, Actions, interface{}) error func getActionFunc(typ string) (actionTypeFunc, bool) { actionFuncMap := map[string]actionTypeFunc{ - utils.LOG: logAction, + utils.MetaLog: logAction, utils.RESET_TRIGGERS: resetTriggersAction, utils.CDRLOG: cdrLogAction, utils.SET_RECURRENT: setRecurrentAction, @@ -135,7 +135,7 @@ func cdrLogAction(acc *Account, a *Action, acs Actions, extraData interface{}) ( 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), + utils.Cost: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAct+utils.NestingSep+utils.ActionValue, utils.InfieldSep), } template := make(map[string]string) // overwrite default template @@ -396,7 +396,7 @@ func callURL(ub *Account, a *Action, acs Actions, extraData interface{}) error { } err = pstr.PostValues(body, make(http.Header)) if err != nil && config.CgrConfig().GeneralCfg().FailedPostsDir != utils.MetaNone { - AddFailedPost(a.ExtraParameters, utils.MetaHTTPjson, utils.ActionsPoster+utils.HIERARCHY_SEP+a.ActionType, body, make(map[string]interface{})) + AddFailedPost(a.ExtraParameters, utils.MetaHTTPjson, utils.ActionsPoster+utils.HierarchySep+a.ActionType, body, make(map[string]interface{})) err = nil } return err @@ -416,7 +416,7 @@ func callURLAsync(ub *Account, a *Action, acs Actions, extraData interface{}) er go func() { err := pstr.PostValues(body, make(http.Header)) if err != nil && config.CgrConfig().GeneralCfg().FailedPostsDir != utils.MetaNone { - AddFailedPost(a.ExtraParameters, utils.MetaHTTPjson, utils.ActionsPoster+utils.HIERARCHY_SEP+a.ActionType, body, make(map[string]interface{})) + AddFailedPost(a.ExtraParameters, utils.MetaHTTPjson, utils.ActionsPoster+utils.HierarchySep+a.ActionType, body, make(map[string]interface{})) } }() return nil @@ -576,7 +576,7 @@ func removeAccountAction(ub *Account, a *Action, acs Actions, extraData interfac return 0, err } } - if err = dm.CacheDataFromDB(utils.ACTION_PLAN_PREFIX, acntAPids, true); err != nil { + if err = dm.CacheDataFromDB(utils.ActionPlanPrefix, acntAPids, true); err != nil { return 0, err } if err = dm.RemAccountActionPlans(accID, nil); err != nil { @@ -587,7 +587,7 @@ func removeAccountAction(ub *Account, a *Action, acs Actions, extraData interfac } return 0, nil - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACTION_PLAN_PREFIX) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ActionPlanPrefix) if err != nil { return err } @@ -631,11 +631,11 @@ func transferMonetaryDefaultAction(ub *Account, a *Action, acs Actions, extraDat utils.Logger.Err("*transfer_monetary_default called without account") return utils.ErrAccountNotFound } - if _, exists := ub.BalanceMap[utils.MONETARY]; !exists { + if _, exists := ub.BalanceMap[utils.MetaMonetary]; !exists { return utils.ErrNotFound } defaultBalance := ub.GetDefaultMoneyBalance() - bChain := ub.BalanceMap[utils.MONETARY] + bChain := ub.BalanceMap[utils.MetaMonetary] for _, balance := range bChain { if balance.Uuid != defaultBalance.Uuid && balance.ID != defaultBalance.ID && // extra caution @@ -959,7 +959,7 @@ func postEvent(ub *Account, a *Action, acs Actions, extraData interface{}) error } err = pstr.PostValues(body, make(http.Header)) if err != nil && config.CgrConfig().GeneralCfg().FailedPostsDir != utils.MetaNone { - AddFailedPost(a.ExtraParameters, utils.MetaHTTPjson, utils.ActionsPoster+utils.HIERARCHY_SEP+a.ActionType, body, make(map[string]interface{})) + AddFailedPost(a.ExtraParameters, utils.MetaHTTPjson, utils.ActionsPoster+utils.HierarchySep+a.ActionType, body, make(map[string]interface{})) err = nil } return err diff --git a/engine/action_plan.go b/engine/action_plan.go index 57587aa4b..4c7c4573f 100644 --- a/engine/action_plan.go +++ b/engine/action_plan.go @@ -271,7 +271,7 @@ func (at *ActionTiming) Execute(successActions, failedActions chan *Action) (err dm.SetAccount(acc) } return 0, nil - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACCOUNT_PREFIX+accID) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.AccountPrefix+accID) } //reset the error in case that the account is not found err = nil diff --git a/engine/actions_test.go b/engine/actions_test.go index 6d4c6c19e..2482da4c4 100644 --- a/engine/actions_test.go +++ b/engine/actions_test.go @@ -578,7 +578,7 @@ func TestActionPlansRemoveMember(t *testing.T) { utils.NonTransactional); err != nil { t.Error(err) } - if err = dm.CacheDataFromDB(utils.ACTION_PLAN_PREFIX, + if err = dm.CacheDataFromDB(utils.ActionPlanPrefix, []string{ap1.Id, ap2.Id}, true); err != nil { t.Error(err) } @@ -634,9 +634,9 @@ func TestActionPlansRemoveMember(t *testing.T) { func TestActionTriggerMatchNil(t *testing.T) { at := &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, ThresholdValue: 2, } var a *Action @@ -648,9 +648,9 @@ func TestActionTriggerMatchNil(t *testing.T) { func TestActionTriggerMatchAllBlank(t *testing.T) { at := &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, ThresholdValue: 2, } a := &Action{} @@ -662,12 +662,12 @@ func TestActionTriggerMatchAllBlank(t *testing.T) { func TestActionTriggerMatchMinuteBucketBlank(t *testing.T) { at := &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, ThresholdValue: 2, } - a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ExtraParameters: `{"BalanceDirections":"*out"}`} if !at.Match(a) { t.Errorf("Action trigger [%v] does not match action [%v]", at, a) @@ -677,13 +677,13 @@ func TestActionTriggerMatchMinuteBucketBlank(t *testing.T) { func TestActionTriggerMatchMinuteBucketFull(t *testing.T) { at := &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, ThresholdValue: 2, } a := &Action{ExtraParameters: fmt.Sprintf(`{"ThresholdType":"%v", "ThresholdValue": %v}`, - utils.TRIGGER_MAX_BALANCE, 2)} + utils.TriggerMaxBalance, 2)} if !at.Match(a) { t.Errorf("Action trigger [%v] does not match action [%v]", at, a) } @@ -692,14 +692,14 @@ func TestActionTriggerMatchMinuteBucketFull(t *testing.T) { func TestActionTriggerMatchAllFull(t *testing.T) { at := &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, ThresholdValue: 2, } - a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ExtraParameters: fmt.Sprintf(`{"ThresholdType":"%v", "ThresholdValue": %v}`, - utils.TRIGGER_MAX_BALANCE, 2)} + utils.TriggerMaxBalance, 2)} if !at.Match(a) { t.Errorf("Action trigger [%v] does not match action [%v]", at, a) } @@ -708,14 +708,14 @@ func TestActionTriggerMatchAllFull(t *testing.T) { func TestActionTriggerMatchSomeFalse(t *testing.T) { at := &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, ThresholdValue: 2, } - a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ExtraParameters: fmt.Sprintf(`{"ThresholdType":"%s"}`, - utils.TRIGGER_MAX_BALANCE_COUNTER)} + utils.TriggerMaxBalanceCounter)} if at.Match(a) { t.Errorf("Action trigger [%v] does not match action [%v]", at, a) } @@ -724,13 +724,13 @@ func TestActionTriggerMatchSomeFalse(t *testing.T) { func TestActionTriggerMatcBalanceFalse(t *testing.T) { at := &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, ThresholdValue: 2, } - a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, - ExtraParameters: fmt.Sprintf(`{"GroupID":"%s", "ThresholdType":"%s"}`, "TEST", utils.TRIGGER_MAX_BALANCE)} + a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, + ExtraParameters: fmt.Sprintf(`{"GroupID":"%s", "ThresholdType":"%s"}`, "TEST", utils.TriggerMaxBalance)} if at.Match(a) { t.Errorf("Action trigger [%v] does not match action [%v]", at, a) } @@ -739,14 +739,14 @@ func TestActionTriggerMatcBalanceFalse(t *testing.T) { func TestActionTriggerMatcAllFalse(t *testing.T) { at := &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, ThresholdValue: 2, } - a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ExtraParameters: fmt.Sprintf(`{"UniqueID":"ZIP", "GroupID":"%s", "ThresholdType":"%s"}`, "TEST", - utils.TRIGGER_MAX_BALANCE)} + utils.TriggerMaxBalance)} if at.Match(a) { t.Errorf("Action trigger [%v] does not match action [%v]", at, a) } @@ -758,7 +758,7 @@ func TestActionTriggerMatchAll(t *testing.T) { UniqueID: "ZIP", ThresholdType: "TT", Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), RatingSubject: utils.StringPointer("test1"), Value: &utils.ValueFormula{Static: 2}, Weight: utils.Float64Pointer(1.0), @@ -767,7 +767,7 @@ func TestActionTriggerMatchAll(t *testing.T) { }, } a := &Action{Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), RatingSubject: utils.StringPointer("test1"), Value: &utils.ValueFormula{Static: 2}, Weight: utils.Float64Pointer(1.0), @@ -795,16 +795,16 @@ func TestActionResetTriggres(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 10}, }, - utils.VOICE: { + utils.MetaVoice: { &Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}, }, }, UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{ + utils.MetaMonetary: []*UnitCounter{ { Counters: CounterFilters{ &CounterFilter{Value: 1}, @@ -815,14 +815,14 @@ func TestActionResetTriggres(t *testing.T) { ActionTriggers: ActionTriggers{ &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY)}, + Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true, }, &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY)}, + Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true, @@ -839,19 +839,19 @@ func TestActionResetTriggresExecutesThem(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 10}, }, }, UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{ + utils.MetaMonetary: []*UnitCounter{ {Counters: CounterFilters{&CounterFilter{Value: 1}}}, }, }, ActionTriggers: ActionTriggers{ &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY)}, + Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true, @@ -859,7 +859,7 @@ func TestActionResetTriggresExecutesThem(t *testing.T) { }, } resetTriggersAction(ub, nil, nil, nil) - if ub.ActionTriggers[0].Executed == true || ub.BalanceMap[utils.MONETARY][0].GetValue() == 12 { + if ub.ActionTriggers[0].Executed == true || ub.BalanceMap[utils.MetaMonetary][0].GetValue() == 12 { t.Error("Reset triggers action failed!") } } @@ -868,36 +868,36 @@ func TestActionResetTriggresActionFilter(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 10}, }, - utils.VOICE: { + utils.MetaVoice: { &Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}, }, }, UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{ + utils.MetaMonetary: []*UnitCounter{ {Counters: CounterFilters{&CounterFilter{Value: 1}}}, }, }, ActionTriggers: ActionTriggers{ &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}, &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}}, } - resetTriggersAction(ub, &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.SMS)}}, nil, nil) + resetTriggersAction(ub, &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaSMS)}}, nil, nil) if ub.ActionTriggers[0].Executed == false || ub.ActionTriggers[1].Executed == false { t.Error("Reset triggers action failed!") } @@ -907,30 +907,30 @@ func TestActionResetTriggresActionFilter2(t *testing.T) { ub := &Account{ ID: "TestActionResetTriggresActionFilter2", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 10}, }, - utils.VOICE: { + utils.MetaVoice: { &Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}, }, }, UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{ + utils.MetaMonetary: []*UnitCounter{ {Counters: CounterFilters{&CounterFilter{Value: 1}}}, }, }, ActionTriggers: ActionTriggers{ &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}, &ActionTrigger{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", @@ -946,16 +946,16 @@ func TestActionSetPostpaid(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Value: 100}}, - utils.VOICE: { + utils.MetaMonetary: {&Balance{Value: 100}}, + utils.MetaVoice: { &Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}}}, - UnitCounters: UnitCounters{utils.MONETARY: []*UnitCounter{ + UnitCounters: UnitCounters{utils.MetaMonetary: []*UnitCounter{ {Counters: CounterFilters{&CounterFilter{Value: 1}}}}}, ActionTriggers: ActionTriggers{ - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}, - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}}, } allowNegativeAction(ub, nil, nil, nil) @@ -969,16 +969,16 @@ func TestActionSetPrepaid(t *testing.T) { ID: "TEST_UB", AllowNegative: true, BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Value: 100}}, - utils.VOICE: { + utils.MetaMonetary: {&Balance{Value: 100}}, + utils.MetaVoice: { &Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}}}, - UnitCounters: UnitCounters{utils.MONETARY: []*UnitCounter{ + UnitCounters: UnitCounters{utils.MetaMonetary: []*UnitCounter{ {Counters: CounterFilters{&CounterFilter{Value: 1}}}}}, ActionTriggers: ActionTriggers{ - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}, - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}}, } denyNegativeAction(ub, nil, nil, nil) @@ -992,23 +992,23 @@ func TestActionResetPrepaid(t *testing.T) { ID: "TEST_UB", AllowNegative: true, BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Value: 100}}, - utils.VOICE: { + utils.MetaMonetary: {&Balance{Value: 100}}, + utils.MetaVoice: { &Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}}}, UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{{Counters: CounterFilters{&CounterFilter{Value: 1}}}}}, + utils.MetaMonetary: []*UnitCounter{{Counters: CounterFilters{&CounterFilter{Value: 1}}}}}, ActionTriggers: ActionTriggers{ - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.SMS)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaSMS)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}, - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.SMS)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaSMS)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}}, } resetAccountAction(ub, nil, nil, nil) if !ub.AllowNegative || - ub.BalanceMap[utils.MONETARY].GetTotalValue() != 0 || + ub.BalanceMap[utils.MetaMonetary].GetTotalValue() != 0 || len(ub.UnitCounters) != 0 || - ub.BalanceMap[utils.VOICE][0].GetValue() != 0 || + ub.BalanceMap[utils.MetaVoice][0].GetValue() != 0 || ub.ActionTriggers[0].Executed == true || ub.ActionTriggers[1].Executed == true { t.Log(ub.BalanceMap) t.Error("Reset account action failed!") @@ -1019,22 +1019,22 @@ func TestActionResetPostpaid(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Value: 100}}, - utils.VOICE: { + utils.MetaMonetary: {&Balance{Value: 100}}, + utils.MetaVoice: { &Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}}}, UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{{Counters: CounterFilters{&CounterFilter{Value: 1}}}}}, + utils.MetaMonetary: []*UnitCounter{{Counters: CounterFilters{&CounterFilter{Value: 1}}}}}, ActionTriggers: ActionTriggers{ - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.SMS)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaSMS)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}, - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.SMS)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaSMS)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}}, } resetAccountAction(ub, nil, nil, nil) - if ub.BalanceMap[utils.MONETARY].GetTotalValue() != 0 || + if ub.BalanceMap[utils.MetaMonetary].GetTotalValue() != 0 || len(ub.UnitCounters) != 0 || - ub.BalanceMap[utils.VOICE][0].GetValue() != 0 || + ub.BalanceMap[utils.MetaVoice][0].GetValue() != 0 || ub.ActionTriggers[0].Executed == true || ub.ActionTriggers[1].Executed == true { t.Error("Reset account action failed!") } @@ -1044,27 +1044,27 @@ func TestActionTopupResetCredit(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 100}}, - utils.VOICE: { + utils.MetaVoice: { &Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}}}, UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{ + utils.MetaMonetary: []*UnitCounter{ {Counters: CounterFilters{&CounterFilter{Value: 1}}}}}, ActionTriggers: ActionTriggers{ - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}, - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}}, } - a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY), + a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary), Value: &utils.ValueFormula{Static: 10}}} topupResetAction(ub, a, nil, nil) if ub.AllowNegative || - ub.BalanceMap[utils.MONETARY].GetTotalValue() != 10 || + ub.BalanceMap[utils.MetaMonetary].GetTotalValue() != 10 || len(ub.UnitCounters) != 0 || // InitCounters finds no counters - len(ub.BalanceMap[utils.VOICE]) != 2 || + len(ub.BalanceMap[utils.MetaVoice]) != 2 || ub.ActionTriggers[0].Executed != true || ub.ActionTriggers[1].Executed != true { t.Errorf("Topup reset action failed: %+s", utils.ToIJSON(ub)) } @@ -1077,16 +1077,16 @@ func TestActionTopupValueFactor(t *testing.T) { } a := &Action{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Value: &utils.ValueFormula{Static: 10}, }, ExtraParameters: `{"*monetary":2.0}`, } topupResetAction(ub, a, nil, nil) if len(ub.BalanceMap) != 1 || - ub.BalanceMap[utils.MONETARY][0].Factor[utils.MONETARY] != 2.0 { + ub.BalanceMap[utils.MetaMonetary][0].Factor[utils.MetaMonetary] != 2.0 { t.Errorf("Topup reset action failed to set Factor: %+v", - ub.BalanceMap[utils.MONETARY][0].Factor) + ub.BalanceMap[utils.MetaMonetary][0].Factor) } } @@ -1094,22 +1094,22 @@ func TestActionTopupResetCreditId(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 100}, &Balance{ID: "TEST_B", Value: 15}, }, }, } a := &Action{Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), ID: utils.StringPointer("TEST_B"), Value: &utils.ValueFormula{Static: 10}}} topupResetAction(ub, a, nil, nil) if ub.AllowNegative || - ub.BalanceMap[utils.MONETARY].GetTotalValue() != 110 || - len(ub.BalanceMap[utils.MONETARY]) != 2 { + ub.BalanceMap[utils.MetaMonetary].GetTotalValue() != 110 || + len(ub.BalanceMap[utils.MetaMonetary]) != 2 { t.Errorf("Topup reset action failed: %+v", - ub.BalanceMap[utils.MONETARY][0]) + ub.BalanceMap[utils.MetaMonetary][0]) } } @@ -1117,20 +1117,20 @@ func TestActionTopupResetCreditNoId(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 100}, &Balance{ID: "TEST_B", Value: 15}, }, }, } a := &Action{Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Value: &utils.ValueFormula{Static: 10}}} topupResetAction(ub, a, nil, nil) if ub.AllowNegative || - ub.BalanceMap[utils.MONETARY].GetTotalValue() != 20 || - len(ub.BalanceMap[utils.MONETARY]) != 2 { - t.Errorf("Topup reset action failed: %+v", ub.BalanceMap[utils.MONETARY][1]) + ub.BalanceMap[utils.MetaMonetary].GetTotalValue() != 20 || + len(ub.BalanceMap[utils.MetaMonetary]) != 2 { + t.Errorf("Topup reset action failed: %+v", ub.BalanceMap[utils.MetaMonetary][1]) } } @@ -1138,34 +1138,34 @@ func TestActionTopupResetMinutes(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Value: 100}}, - utils.VOICE: {&Balance{Value: 10, Weight: 20, + utils.MetaMonetary: {&Balance{Value: 100}}, + utils.MetaVoice: {&Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}}}, - UnitCounters: UnitCounters{utils.MONETARY: []*UnitCounter{ + UnitCounters: UnitCounters{utils.MetaMonetary: []*UnitCounter{ {Counters: CounterFilters{&CounterFilter{Value: 1}}}}}, ActionTriggers: ActionTriggers{ &ActionTrigger{ - Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}, &ActionTrigger{ - Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}}, } a := &Action{ - Balance: &BalanceFilter{Type: utils.StringPointer(utils.VOICE), + Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaVoice), Value: &utils.ValueFormula{Static: 5}, Weight: utils.Float64Pointer(20), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("NAT"))}} topupResetAction(ub, a, nil, nil) if ub.AllowNegative || - ub.BalanceMap[utils.VOICE].GetTotalValue() != 5 || - ub.BalanceMap[utils.MONETARY].GetTotalValue() != 100 || + ub.BalanceMap[utils.MetaVoice].GetTotalValue() != 5 || + ub.BalanceMap[utils.MetaMonetary].GetTotalValue() != 100 || len(ub.UnitCounters) != 0 || - len(ub.BalanceMap[utils.VOICE]) != 2 || + len(ub.BalanceMap[utils.MetaVoice]) != 2 || ub.ActionTriggers[0].Executed != true || ub.ActionTriggers[1].Executed != true { t.Errorf("Topup reset minutes action failed: %+v", - ub.BalanceMap[utils.VOICE][0]) + ub.BalanceMap[utils.MetaVoice][0]) } } @@ -1173,33 +1173,33 @@ func TestActionTopupCredit(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Value: 100}}, - utils.VOICE: { + utils.MetaMonetary: {&Balance{Value: 100}}, + utils.MetaVoice: { &Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}}}, UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{ + utils.MetaMonetary: []*UnitCounter{ {Counters: CounterFilters{&CounterFilter{Value: 1}}}}}, ActionTriggers: ActionTriggers{ - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}, - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}}, } a := &Action{Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Value: &utils.ValueFormula{Static: 10}}} topupAction(ub, a, nil, nil) if ub.AllowNegative || - ub.BalanceMap[utils.MONETARY].GetTotalValue() != 110 || + ub.BalanceMap[utils.MetaMonetary].GetTotalValue() != 110 || len(ub.UnitCounters) != 0 || - len(ub.BalanceMap[utils.VOICE]) != 2 || + len(ub.BalanceMap[utils.MetaVoice]) != 2 || ub.ActionTriggers[0].Executed != true || ub.ActionTriggers[1].Executed != true { t.Error("Topup action failed!", - ub.BalanceMap[utils.MONETARY].GetTotalValue()) + ub.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } @@ -1207,31 +1207,31 @@ func TestActionTopupMinutes(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 100}}, - utils.VOICE: {&Balance{Value: 10, Weight: 20, + utils.MetaVoice: {&Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}}}, UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{ + utils.MetaMonetary: []*UnitCounter{ {Counters: CounterFilters{&CounterFilter{Value: 1}}}}}, ActionTriggers: ActionTriggers{ - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}, - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}}, } - a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.VOICE), + a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaVoice), Value: &utils.ValueFormula{Static: 5}, Weight: utils.Float64Pointer(20), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("NAT"))}} topupAction(ub, a, nil, nil) if ub.AllowNegative || - ub.BalanceMap[utils.VOICE].GetTotalValue() != 15 || - ub.BalanceMap[utils.MONETARY].GetTotalValue() != 100 || + ub.BalanceMap[utils.MetaVoice].GetTotalValue() != 15 || + ub.BalanceMap[utils.MetaMonetary].GetTotalValue() != 100 || len(ub.UnitCounters) != 0 || - len(ub.BalanceMap[utils.VOICE]) != 2 || + len(ub.BalanceMap[utils.MetaVoice]) != 2 || ub.ActionTriggers[0].Executed != true || ub.ActionTriggers[1].Executed != true { - t.Error("Topup minutes action failed!", ub.BalanceMap[utils.VOICE]) + t.Error("Topup minutes action failed!", ub.BalanceMap[utils.MetaVoice]) } } @@ -1239,27 +1239,27 @@ func TestActionDebitCredit(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Value: 100}}, - utils.VOICE: { + utils.MetaMonetary: {&Balance{Value: 100}}, + utils.MetaVoice: { &Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}}}, UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{ + utils.MetaMonetary: []*UnitCounter{ {Counters: CounterFilters{&CounterFilter{Value: 1}}}}}, ActionTriggers: ActionTriggers{ - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}, - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}}, } a := &Action{Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Value: &utils.ValueFormula{Static: 10}}} debitAction(ub, a, nil, nil) if ub.AllowNegative || - ub.BalanceMap[utils.MONETARY].GetTotalValue() != 90 || + ub.BalanceMap[utils.MetaMonetary].GetTotalValue() != 90 || len(ub.UnitCounters) != 0 || - len(ub.BalanceMap[utils.VOICE]) != 2 || + len(ub.BalanceMap[utils.MetaVoice]) != 2 || ub.ActionTriggers[0].Executed != true || ub.ActionTriggers[1].Executed != true { t.Error("Debit action failed!", utils.ToIJSON(ub)) @@ -1270,32 +1270,32 @@ func TestActionDebitMinutes(t *testing.T) { ub := &Account{ ID: "TEST_UB", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Value: 100}}, - utils.VOICE: { + utils.MetaMonetary: {&Balance{Value: 100}}, + utils.MetaVoice: { &Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}}}, UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{{Counters: CounterFilters{&CounterFilter{Value: 1}}}}}, + utils.MetaMonetary: []*UnitCounter{{Counters: CounterFilters{&CounterFilter{Value: 1}}}}}, ActionTriggers: ActionTriggers{ - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}, - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}}, } a := &Action{Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Value: &utils.ValueFormula{Static: 5}, Weight: utils.Float64Pointer(20), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("NAT"))}} debitAction(ub, a, nil, nil) if ub.AllowNegative || - ub.BalanceMap[utils.VOICE][0].GetValue() != 5 || - ub.BalanceMap[utils.MONETARY].GetTotalValue() != 100 || + ub.BalanceMap[utils.MetaVoice][0].GetValue() != 5 || + ub.BalanceMap[utils.MetaMonetary].GetTotalValue() != 100 || len(ub.UnitCounters) != 0 || - len(ub.BalanceMap[utils.VOICE]) != 2 || + len(ub.BalanceMap[utils.MetaVoice]) != 2 || ub.ActionTriggers[0].Executed != true || ub.ActionTriggers[1].Executed != true { - t.Error("Debit minutes action failed!", ub.BalanceMap[utils.VOICE][0]) + t.Error("Debit minutes action failed!", ub.BalanceMap[utils.MetaVoice][0]) } } @@ -1304,14 +1304,14 @@ func TestActionResetAllCounters(t *testing.T) { ID: "TEST_UB", AllowNegative: true, BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Value: 100}}, - utils.VOICE: { + utils.MetaMonetary: {&Balance{Value: 100}}, + utils.MetaVoice: { &Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}}}, ActionTriggers: ActionTriggers{ - &ActionTrigger{ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, ThresholdValue: 2, - Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY), + &ActionTrigger{ThresholdType: utils.TriggerMaxEventCounter, ThresholdValue: 2, + Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("NAT")), Weight: utils.Float64Pointer(20)}, ActionsID: "TEST_ACTIONS", Executed: true}}, @@ -1319,18 +1319,18 @@ func TestActionResetAllCounters(t *testing.T) { ub.InitCounters() resetCountersAction(ub, nil, nil, nil) if !ub.AllowNegative || - ub.BalanceMap[utils.MONETARY].GetTotalValue() != 100 || + ub.BalanceMap[utils.MetaMonetary].GetTotalValue() != 100 || len(ub.UnitCounters) != 1 || - len(ub.UnitCounters[utils.MONETARY][0].Counters) != 1 || - len(ub.BalanceMap[utils.MONETARY]) != 1 || + len(ub.UnitCounters[utils.MetaMonetary][0].Counters) != 1 || + len(ub.BalanceMap[utils.MetaMonetary]) != 1 || ub.ActionTriggers[0].Executed != true { t.Errorf("Reset counters action failed: %+v %+v %+v", ub.UnitCounters, - ub.UnitCounters[utils.MONETARY][0], ub.UnitCounters[utils.MONETARY][0].Counters[0]) + ub.UnitCounters[utils.MetaMonetary][0], ub.UnitCounters[utils.MetaMonetary][0].Counters[0]) } if len(ub.UnitCounters) < 1 { t.FailNow() } - c := ub.UnitCounters[utils.MONETARY][0].Counters[0] + c := ub.UnitCounters[utils.MetaMonetary][0].Counters[0] if c.Filter.GetWeight() != 20 || c.Value != 0 || c.Filter.GetDestinationIDs()["NAT"] == false { t.Errorf("Balance cloned incorrectly: %+v", c) @@ -1342,33 +1342,33 @@ func TestActionResetCounterOnlyDefault(t *testing.T) { ID: "TEST_UB", AllowNegative: true, BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Value: 100}}, - utils.VOICE: {&Balance{Value: 10, Weight: 20, + utils.MetaMonetary: {&Balance{Value: 100}}, + utils.MetaVoice: {&Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}}}, ActionTriggers: ActionTriggers{ - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, ThresholdValue: 2, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, + ThresholdType: utils.TriggerMaxEventCounter, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}}, } - a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}} + a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}} ub.InitCounters() resetCountersAction(ub, a, nil, nil) if !ub.AllowNegative || - ub.BalanceMap[utils.MONETARY].GetTotalValue() != 100 || + ub.BalanceMap[utils.MetaMonetary].GetTotalValue() != 100 || len(ub.UnitCounters) != 1 || - len(ub.UnitCounters[utils.MONETARY][0].Counters) != 1 || - len(ub.BalanceMap[utils.VOICE]) != 2 || + len(ub.UnitCounters[utils.MetaMonetary][0].Counters) != 1 || + len(ub.BalanceMap[utils.MetaVoice]) != 2 || ub.ActionTriggers[0].Executed != true { - for _, b := range ub.UnitCounters[utils.MONETARY][0].Counters { + for _, b := range ub.UnitCounters[utils.MetaMonetary][0].Counters { t.Logf("B: %+v", b) } t.Errorf("Reset counters action failed: %+v", ub.UnitCounters) } - if len(ub.UnitCounters) < 1 || len(ub.UnitCounters[utils.MONETARY][0].Counters) < 1 { + if len(ub.UnitCounters) < 1 || len(ub.UnitCounters[utils.MetaMonetary][0].Counters) < 1 { t.FailNow() } - c := ub.UnitCounters[utils.MONETARY][0].Counters[0] + c := ub.UnitCounters[utils.MetaMonetary][0].Counters[0] if c.Filter.GetWeight() != 0 || c.Value != 0 || len(c.Filter.GetDestinationIDs()) != 0 { t.Errorf("Balance cloned incorrectly: %+v!", c) } @@ -1379,26 +1379,26 @@ func TestActionResetCounterCredit(t *testing.T) { ID: "TEST_UB", AllowNegative: true, BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Value: 100}}, - utils.VOICE: {&Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, + utils.MetaMonetary: {&Balance{Value: 100}}, + utils.MetaVoice: {&Balance{Value: 10, Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}}}, UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{ + utils.MetaMonetary: []*UnitCounter{ {Counters: CounterFilters{ &CounterFilter{Value: 1, Filter: new(BalanceFilter)}}}}, - utils.SMS: []*UnitCounter{ + utils.MetaSMS: []*UnitCounter{ {Counters: CounterFilters{ &CounterFilter{Value: 1, Filter: new(BalanceFilter)}}}}}, ActionTriggers: ActionTriggers{ - &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}, + &ActionTrigger{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true}}, } - a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY)}} + a := &Action{Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary)}} resetCountersAction(ub, a, nil, nil) if !ub.AllowNegative || - ub.BalanceMap[utils.MONETARY].GetTotalValue() != 100 || + ub.BalanceMap[utils.MetaMonetary].GetTotalValue() != 100 || len(ub.UnitCounters) != 2 || - len(ub.BalanceMap[utils.VOICE]) != 2 || + len(ub.BalanceMap[utils.MetaVoice]) != 2 || ub.ActionTriggers[0].Executed != true { t.Error("Reset counters action failed!", ub.UnitCounters) } @@ -1439,7 +1439,7 @@ func TestActionTopup(t *testing.T) { initialUb, _ := dm.GetAccount("vdf:minu") a := &Action{ ActionType: utils.TOPUP, - Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY), Value: &utils.ValueFormula{Static: 25}, + Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary), Value: &utils.ValueFormula{Static: 25}, DestinationIDs: utils.StringMapPointer(utils.NewStringMap("RET")), Weight: utils.Float64Pointer(20)}, } @@ -1451,8 +1451,8 @@ func TestActionTopup(t *testing.T) { at.Execute(nil, nil) afterUb, _ := dm.GetAccount("vdf:minu") - initialValue := initialUb.BalanceMap[utils.MONETARY].GetTotalValue() - afterValue := afterUb.BalanceMap[utils.MONETARY].GetTotalValue() + initialValue := initialUb.BalanceMap[utils.MetaMonetary].GetTotalValue() + afterValue := afterUb.BalanceMap[utils.MetaMonetary].GetTotalValue() if afterValue != initialValue+25 { t.Error("Bad topup before and after: ", initialValue, afterValue) } @@ -1462,7 +1462,7 @@ func TestActionTopupLoaded(t *testing.T) { initialUb, _ := dm.GetAccount("vdf:minitsboy") a := &Action{ ActionType: utils.TOPUP, - Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY), + Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary), Value: &utils.ValueFormula{Static: 25}, DestinationIDs: utils.StringMapPointer(utils.NewStringMap("RET")), Weight: utils.Float64Pointer(20)}, @@ -1475,8 +1475,8 @@ func TestActionTopupLoaded(t *testing.T) { at.Execute(nil, nil) afterUb, _ := dm.GetAccount("vdf:minitsboy") - initialValue := initialUb.BalanceMap[utils.MONETARY].GetTotalValue() - afterValue := afterUb.BalanceMap[utils.MONETARY].GetTotalValue() + initialValue := initialUb.BalanceMap[utils.MetaMonetary].GetTotalValue() + afterValue := afterUb.BalanceMap[utils.MetaMonetary].GetTotalValue() if afterValue != initialValue+25 { t.Logf("Initial: %+v", initialUb) t.Logf("After: %+v", afterUb) @@ -1488,7 +1488,7 @@ func TestActionTransactionFuncType(t *testing.T) { err := dm.SetAccount(&Account{ ID: "cgrates.org:trans", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{ + utils.MetaMonetary: {&Balance{ Value: 10, }}, }, @@ -1503,7 +1503,7 @@ func TestActionTransactionFuncType(t *testing.T) { { ActionType: utils.TOPUP, Balance: &BalanceFilter{Value: &utils.ValueFormula{Static: 1.1}, - Type: utils.StringPointer(utils.MONETARY)}, + Type: utils.StringPointer(utils.MetaMonetary)}, }, { ActionType: "VALID_FUNCTION_TYPE", @@ -1517,8 +1517,8 @@ func TestActionTransactionFuncType(t *testing.T) { if err != nil || acc == nil { t.Error("Error getting account: ", acc, err) } - if acc.BalanceMap[utils.MONETARY][0].Value != 10 { - t.Errorf("Transaction didn't work: %v", acc.BalanceMap[utils.MONETARY][0].Value) + if acc.BalanceMap[utils.MetaMonetary][0].Value != 10 { + t.Errorf("Transaction didn't work: %v", acc.BalanceMap[utils.MetaMonetary][0].Value) } } @@ -1526,7 +1526,7 @@ func TestActionTransactionBalanceType(t *testing.T) { err := dm.SetAccount(&Account{ ID: "cgrates.org:trans", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{ + utils.MetaMonetary: {&Balance{ Value: 10, }}, }, @@ -1541,7 +1541,7 @@ func TestActionTransactionBalanceType(t *testing.T) { { ActionType: utils.TOPUP, Balance: &BalanceFilter{Value: &utils.ValueFormula{Static: 1.1}, - Type: utils.StringPointer(utils.MONETARY)}, + Type: utils.StringPointer(utils.MetaMonetary)}, }, { ActionType: utils.TOPUP, @@ -1554,8 +1554,8 @@ func TestActionTransactionBalanceType(t *testing.T) { if err != nil || acc == nil { t.Error("Error getting account: ", acc, err) } - if acc.BalanceMap[utils.MONETARY][0].Value != 11.1 { - t.Errorf("Transaction didn't work: %v", acc.BalanceMap[utils.MONETARY][0].Value) + if acc.BalanceMap[utils.MetaMonetary][0].Value != 11.1 { + t.Errorf("Transaction didn't work: %v", acc.BalanceMap[utils.MetaMonetary][0].Value) } } @@ -1563,7 +1563,7 @@ func TestActionTransactionBalanceNotType(t *testing.T) { err := dm.SetAccount(&Account{ ID: "cgrates.org:trans", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{ + utils.MetaMonetary: {&Balance{ Value: 10, }}, }, @@ -1578,7 +1578,7 @@ func TestActionTransactionBalanceNotType(t *testing.T) { { ActionType: utils.TOPUP, Balance: &BalanceFilter{Value: &utils.ValueFormula{Static: 1.1}, - Type: utils.StringPointer(utils.VOICE)}, + Type: utils.StringPointer(utils.MetaVoice)}, }, { ActionType: utils.TOPUP, @@ -1591,8 +1591,8 @@ func TestActionTransactionBalanceNotType(t *testing.T) { if err != nil || acc == nil { t.Error("Error getting account: ", acc, err) } - if acc.BalanceMap[utils.MONETARY][0].Value != 10.0 { - t.Errorf("Transaction didn't work: %v", acc.BalanceMap[utils.MONETARY][0].Value) + if acc.BalanceMap[utils.MetaMonetary][0].Value != 10.0 { + t.Errorf("Transaction didn't work: %v", acc.BalanceMap[utils.MetaMonetary][0].Value) } } @@ -1600,7 +1600,7 @@ func TestActionWithExpireWithoutExpire(t *testing.T) { err := dm.SetAccount(&Account{ ID: "cgrates.org:exp", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{ + utils.MetaMonetary: {&Balance{ Value: 10, }}, }, @@ -1615,14 +1615,14 @@ func TestActionWithExpireWithoutExpire(t *testing.T) { { ActionType: utils.TOPUP, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Value: &utils.ValueFormula{Static: 15}, }, }, { ActionType: utils.TOPUP, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Value: &utils.ValueFormula{Static: 30}, ExpirationDate: utils.TimePointer(time.Date(2025, time.November, 11, 22, 39, 0, 0, time.UTC)), }, @@ -1635,8 +1635,8 @@ func TestActionWithExpireWithoutExpire(t *testing.T) { t.Errorf("Error getting account: %+v: %v", acc, err) } if len(acc.BalanceMap) != 2 || - len(acc.BalanceMap[utils.VOICE]) != 2 { - t.Errorf("Error debiting expir and unexpire: %+v", acc.BalanceMap[utils.VOICE][0]) + len(acc.BalanceMap[utils.MetaVoice]) != 2 { + t.Errorf("Error debiting expir and unexpire: %+v", acc.BalanceMap[utils.MetaVoice][0]) } } @@ -1644,7 +1644,7 @@ func TestActionRemoveBalance(t *testing.T) { err := dm.SetAccount(&Account{ ID: "cgrates.org:rembal", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ Value: 10, }, @@ -1670,7 +1670,7 @@ func TestActionRemoveBalance(t *testing.T) { { ActionType: utils.REMOVE_BALANCE, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("NAT", "RET")), }, }, @@ -1682,8 +1682,8 @@ func TestActionRemoveBalance(t *testing.T) { t.Errorf("Error getting account: %+v: %v", acc, err) } if len(acc.BalanceMap) != 1 || - len(acc.BalanceMap[utils.MONETARY]) != 1 { - t.Errorf("Error removing balance: %+v", acc.BalanceMap[utils.MONETARY]) + len(acc.BalanceMap[utils.MetaMonetary]) != 1 { + t.Errorf("Error removing balance: %+v", acc.BalanceMap[utils.MetaMonetary]) } } @@ -1691,7 +1691,7 @@ func TestActionRemoveExpiredBalance(t *testing.T) { err := dm.SetAccount(&Account{ ID: "cgrates.org:rembal2", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ Value: 10, }, @@ -1724,7 +1724,7 @@ func TestActionRemoveExpiredBalance(t *testing.T) { { ActionType: utils.MetaRemoveExpired, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, }, }, @@ -1735,8 +1735,8 @@ func TestActionRemoveExpiredBalance(t *testing.T) { t.Errorf("Error getting account: %+v: %v", acc, err) } if len(acc.BalanceMap) != 1 || - len(acc.BalanceMap[utils.MONETARY]) != 2 { - t.Errorf("Error removing balance: %+v", utils.ToJSON(acc.BalanceMap[utils.MONETARY])) + len(acc.BalanceMap[utils.MetaMonetary]) != 2 { + t.Errorf("Error removing balance: %+v", utils.ToJSON(acc.BalanceMap[utils.MetaMonetary])) } } @@ -1745,7 +1745,7 @@ func TestActionTransferMonetaryDefault(t *testing.T) { &Account{ ID: "cgrates.org:trans", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ Uuid: utils.GenUUID(), ID: utils.MetaDefault, @@ -1784,15 +1784,15 @@ func TestActionTransferMonetaryDefault(t *testing.T) { if err != nil { t.Error("account not found: ", err, afterUb) } - if afterUb.BalanceMap[utils.MONETARY].GetTotalValue() != 17 || - afterUb.BalanceMap[utils.MONETARY][0].Value != 19 || - afterUb.BalanceMap[utils.MONETARY][1].Value != 0 || - afterUb.BalanceMap[utils.MONETARY][2].Value != 0 || - afterUb.BalanceMap[utils.MONETARY][3].Value != -2 { - for _, b := range afterUb.BalanceMap[utils.MONETARY] { + if afterUb.BalanceMap[utils.MetaMonetary].GetTotalValue() != 17 || + afterUb.BalanceMap[utils.MetaMonetary][0].Value != 19 || + afterUb.BalanceMap[utils.MetaMonetary][1].Value != 0 || + afterUb.BalanceMap[utils.MetaMonetary][2].Value != 0 || + afterUb.BalanceMap[utils.MetaMonetary][3].Value != -2 { + for _, b := range afterUb.BalanceMap[utils.MetaMonetary] { t.Logf("B: %+v", b) } - t.Error("ransfer balance value: ", afterUb.BalanceMap[utils.MONETARY].GetTotalValue()) + t.Error("ransfer balance value: ", afterUb.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } @@ -1801,7 +1801,7 @@ func TestActionTransferMonetaryDefaultFilter(t *testing.T) { &Account{ ID: "cgrates.org:trans", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ Uuid: utils.GenUUID(), ID: utils.MetaDefault, @@ -1845,15 +1845,15 @@ func TestActionTransferMonetaryDefaultFilter(t *testing.T) { if err != nil { t.Error("account not found: ", err, afterUb) } - if afterUb.BalanceMap[utils.MONETARY].GetTotalValue() != 20 || - afterUb.BalanceMap[utils.MONETARY][0].Value != 19 || - afterUb.BalanceMap[utils.MONETARY][1].Value != 0 || - afterUb.BalanceMap[utils.MONETARY][2].Value != 1 || - afterUb.BalanceMap[utils.MONETARY][3].Value != 0 { - for _, b := range afterUb.BalanceMap[utils.MONETARY] { + if afterUb.BalanceMap[utils.MetaMonetary].GetTotalValue() != 20 || + afterUb.BalanceMap[utils.MetaMonetary][0].Value != 19 || + afterUb.BalanceMap[utils.MetaMonetary][1].Value != 0 || + afterUb.BalanceMap[utils.MetaMonetary][2].Value != 1 || + afterUb.BalanceMap[utils.MetaMonetary][3].Value != 0 { + for _, b := range afterUb.BalanceMap[utils.MetaMonetary] { t.Logf("B: %+v", b) } - t.Error("ransfer balance value: ", afterUb.BalanceMap[utils.MONETARY].GetTotalValue()) + t.Error("ransfer balance value: ", afterUb.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } @@ -1862,7 +1862,7 @@ func TestActionConditionalTopup(t *testing.T) { &Account{ ID: "cgrates.org:cond", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ Uuid: utils.GenUUID(), ID: utils.MetaDefault, @@ -1895,7 +1895,7 @@ func TestActionConditionalTopup(t *testing.T) { ActionType: utils.TOPUP, Filter: `{"Type":"*monetary","Value":1,"Weight":10}`, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Value: &utils.ValueFormula{Static: 11}, Weight: utils.Float64Pointer(30), }, @@ -1911,13 +1911,13 @@ func TestActionConditionalTopup(t *testing.T) { if err != nil { t.Error("account not found: ", err, afterUb) } - if len(afterUb.BalanceMap[utils.MONETARY]) != 5 || - afterUb.BalanceMap[utils.MONETARY].GetTotalValue() != 31 || - afterUb.BalanceMap[utils.MONETARY][4].Value != 11 { - for _, b := range afterUb.BalanceMap[utils.MONETARY] { + if len(afterUb.BalanceMap[utils.MetaMonetary]) != 5 || + afterUb.BalanceMap[utils.MetaMonetary].GetTotalValue() != 31 || + afterUb.BalanceMap[utils.MetaMonetary][4].Value != 11 { + for _, b := range afterUb.BalanceMap[utils.MetaMonetary] { t.Logf("B: %+v", b) } - t.Error("ransfer balance value: ", afterUb.BalanceMap[utils.MONETARY].GetTotalValue()) + t.Error("ransfer balance value: ", afterUb.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } @@ -1926,7 +1926,7 @@ func TestActionConditionalTopupNoMatch(t *testing.T) { &Account{ ID: "cgrates.org:cond", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ Uuid: utils.GenUUID(), ID: utils.MetaDefault, @@ -1959,7 +1959,7 @@ func TestActionConditionalTopupNoMatch(t *testing.T) { ActionType: utils.TOPUP, Filter: `{"Type":"*monetary","Value":2,"Weight":10}`, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Value: &utils.ValueFormula{Static: 11}, Weight: utils.Float64Pointer(30), }, @@ -1975,12 +1975,12 @@ func TestActionConditionalTopupNoMatch(t *testing.T) { if err != nil { t.Error("account not found: ", err, afterUb) } - if len(afterUb.BalanceMap[utils.MONETARY]) != 4 || - afterUb.BalanceMap[utils.MONETARY].GetTotalValue() != 20 { - for _, b := range afterUb.BalanceMap[utils.MONETARY] { + if len(afterUb.BalanceMap[utils.MetaMonetary]) != 4 || + afterUb.BalanceMap[utils.MetaMonetary].GetTotalValue() != 20 { + for _, b := range afterUb.BalanceMap[utils.MetaMonetary] { t.Logf("B: %+v", b) } - t.Error("ransfer balance value: ", afterUb.BalanceMap[utils.MONETARY].GetTotalValue()) + t.Error("ransfer balance value: ", afterUb.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } @@ -1989,7 +1989,7 @@ func TestActionConditionalTopupExistingBalance(t *testing.T) { &Account{ ID: "cgrates.org:cond", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ Uuid: utils.GenUUID(), Value: 1, @@ -2001,7 +2001,7 @@ func TestActionConditionalTopupExistingBalance(t *testing.T) { Weight: 20, }, }, - utils.VOICE: { + utils.MetaVoice: { &Balance{ Uuid: utils.GenUUID(), Value: 10, @@ -2023,7 +2023,7 @@ func TestActionConditionalTopupExistingBalance(t *testing.T) { ActionType: utils.TOPUP, Filter: `{"Type":"*voice","Value":{"*gte":100}}`, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Value: &utils.ValueFormula{Static: 11}, Weight: utils.Float64Pointer(10), }, @@ -2039,12 +2039,12 @@ func TestActionConditionalTopupExistingBalance(t *testing.T) { if err != nil { t.Error("account not found: ", err, afterUb) } - if len(afterUb.BalanceMap[utils.MONETARY]) != 2 || - afterUb.BalanceMap[utils.MONETARY].GetTotalValue() != 18 { - for _, b := range afterUb.BalanceMap[utils.MONETARY] { + if len(afterUb.BalanceMap[utils.MetaMonetary]) != 2 || + afterUb.BalanceMap[utils.MetaMonetary].GetTotalValue() != 18 { + for _, b := range afterUb.BalanceMap[utils.MetaMonetary] { t.Logf("B: %+v", b) } - t.Error("ransfer balance value: ", afterUb.BalanceMap[utils.MONETARY].GetTotalValue()) + t.Error("ransfer balance value: ", afterUb.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } @@ -2191,7 +2191,7 @@ func TestActionConditionalDisabledIfNegative(t *testing.T) { } for btype, chain := range afterUb.BalanceMap { - if btype != utils.MONETARY { + if btype != utils.MetaMonetary { for _, b := range chain { if b.Disabled != true { t.Errorf("Failed to disabled balance (%s): %+v", btype, b) @@ -2206,7 +2206,7 @@ func TestActionSetBalance(t *testing.T) { &Account{ ID: "cgrates.org:setb", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ ID: "m1", Uuid: utils.GenUUID(), @@ -2220,7 +2220,7 @@ func TestActionSetBalance(t *testing.T) { Weight: 20, }, }, - utils.VOICE: { + utils.MetaVoice: { &Balance{ ID: "v1", Uuid: utils.GenUUID(), @@ -2244,7 +2244,7 @@ func TestActionSetBalance(t *testing.T) { ActionType: utils.SET_BALANCE, Balance: &BalanceFilter{ ID: utils.StringPointer("m2"), - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Value: &utils.ValueFormula{Static: 11}, Weight: utils.Float64Pointer(10), }, @@ -2260,13 +2260,13 @@ func TestActionSetBalance(t *testing.T) { if err != nil { t.Error("account not found: ", err, afterUb) } - if len(afterUb.BalanceMap[utils.MONETARY]) != 2 || - afterUb.BalanceMap[utils.MONETARY][1].Value != 11 || - afterUb.BalanceMap[utils.MONETARY][1].Weight != 10 { - for _, b := range afterUb.BalanceMap[utils.MONETARY] { + if len(afterUb.BalanceMap[utils.MetaMonetary]) != 2 || + afterUb.BalanceMap[utils.MetaMonetary][1].Value != 11 || + afterUb.BalanceMap[utils.MetaMonetary][1].Weight != 10 { + for _, b := range afterUb.BalanceMap[utils.MetaMonetary] { t.Logf("B: %+v", b) } - t.Errorf("Balance: %+v", afterUb.BalanceMap[utils.MONETARY][1]) + t.Errorf("Balance: %+v", afterUb.BalanceMap[utils.MetaMonetary][1]) } } @@ -2294,7 +2294,7 @@ func TestActionExpirationTime(t *testing.T) { at.Execute(nil, nil) afterUb, err := dm.GetAccount("cgrates.org:expo") if err != nil || - len(afterUb.BalanceMap[utils.VOICE]) != rep+1 { + len(afterUb.BalanceMap[utils.MetaVoice]) != rep+1 { t.Error("error topuping expiration balance: ", utils.ToIJSON(afterUb)) } } @@ -2317,7 +2317,7 @@ func TestActionExpNoExp(t *testing.T) { at.Execute(nil, nil) afterUb, err := dm.GetAccount("cgrates.org:expnoexp") if err != nil || - len(afterUb.BalanceMap[utils.VOICE]) != 2 { + len(afterUb.BalanceMap[utils.MetaVoice]) != 2 { t.Error("error topuping expiration balance: ", utils.ToIJSON(afterUb)) } } @@ -2326,7 +2326,7 @@ func TestActionTopUpZeroNegative(t *testing.T) { account := &Account{ ID: "cgrates.org:zeroNegative", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ ID: "Bal1", Value: -10, @@ -2350,7 +2350,7 @@ func TestActionTopUpZeroNegative(t *testing.T) { Id: "ZeroMonetary", ActionType: utils.TopUpZeroNegative, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, }, }, @@ -2361,12 +2361,12 @@ func TestActionTopUpZeroNegative(t *testing.T) { t.Error("Error getting account: ", acc, err) } //Verify value for first balance(Bal1) should be 0 after execute action TopUpZeroNegative - if acc.BalanceMap[utils.MONETARY][0].Value != 0 { - t.Errorf("Expecting 0, received: %+v", acc.BalanceMap[utils.MONETARY][0].Value) + if acc.BalanceMap[utils.MetaMonetary][0].Value != 0 { + t.Errorf("Expecting 0, received: %+v", acc.BalanceMap[utils.MetaMonetary][0].Value) } //Verify value for secound balance(Bal2) should be the same - if acc.BalanceMap[utils.MONETARY][1].Value != 5 { - t.Errorf("Expecting 5, received: %+v", acc.BalanceMap[utils.MONETARY][1].Value) + if acc.BalanceMap[utils.MetaMonetary][1].Value != 5 { + t.Errorf("Expecting 5, received: %+v", acc.BalanceMap[utils.MetaMonetary][1].Value) } } @@ -2375,7 +2375,7 @@ func TestActionSetExpiry(t *testing.T) { account := &Account{ ID: "cgrates.org:zeroNegative", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{ ID: "Bal1", Value: -10, @@ -2400,7 +2400,7 @@ func TestActionSetExpiry(t *testing.T) { ActionType: utils.SetExpiry, Balance: &BalanceFilter{ ID: utils.StringPointer("Bal1"), - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), ExpirationDate: utils.TimePointer(timeNowPlus24h), }, }, @@ -2412,8 +2412,8 @@ func TestActionSetExpiry(t *testing.T) { t.Error("Error getting account: ", acc, err) } //Verify ExpirationDate for first balance(Bal1) - if !acc.BalanceMap[utils.MONETARY][0].ExpirationDate.Equal(timeNowPlus24h) { - t.Errorf("Expecting: %+v, received: %+v", timeNowPlus24h, acc.BalanceMap[utils.MONETARY][0].ExpirationDate) + if !acc.BalanceMap[utils.MetaMonetary][0].ExpirationDate.Equal(timeNowPlus24h) { + t.Errorf("Expecting: %+v, received: %+v", timeNowPlus24h, acc.BalanceMap[utils.MetaMonetary][0].ExpirationDate) } } @@ -2491,7 +2491,7 @@ func TestValueFormulaDebit(t *testing.T) { at.Execute(nil, nil) afterUb, err := dm.GetAccount("cgrates.org:vf") // not an exact value, depends of month - v := afterUb.BalanceMap[utils.MONETARY].GetTotalValue() + v := afterUb.BalanceMap[utils.MetaMonetary].GetTotalValue() if err != nil || v > -0.30 || v < -0.36 { t.Error("error debiting account: ", err, utils.ToIJSON(afterUb), v) } @@ -2504,7 +2504,7 @@ func TestClonedAction(t *testing.T) { Balance: &BalanceFilter{ ID: utils.StringPointer(utils.MetaDefault), Value: &utils.ValueFormula{Static: 1}, - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, Weight: float64(10), } @@ -2521,7 +2521,7 @@ func TestClonedActions(t *testing.T) { Balance: &BalanceFilter{ ID: utils.StringPointer(utils.MetaDefault), Value: &utils.ValueFormula{Static: 1}, - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, Weight: float64(30), }, @@ -2531,7 +2531,7 @@ func TestClonedActions(t *testing.T) { Balance: &BalanceFilter{ ID: utils.StringPointer(utils.MetaDefault), Value: &utils.ValueFormula{Static: 2}, - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, Weight: float64(20), }, @@ -2552,7 +2552,7 @@ func TestCacheGetClonedActions(t *testing.T) { Balance: &BalanceFilter{ ID: utils.StringPointer(utils.MetaDefault), Value: &utils.ValueFormula{Static: 1}, - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, Weight: float64(30), }, @@ -2561,7 +2561,7 @@ func TestCacheGetClonedActions(t *testing.T) { ActionType: utils.SET_BALANCE, Balance: &BalanceFilter{ ID: utils.StringPointer("for_v3hsillmill_sms_ill"), - Type: utils.StringPointer(utils.SMS), + Type: utils.StringPointer(utils.MetaSMS), Value: &utils.ValueFormula{Static: 20000}, DestinationIDs: &utils.StringMap{ "FRANCE_NATIONAL": true, @@ -2628,12 +2628,12 @@ func TestCdrLogAction(t *testing.T) { acc := &Account{ ID: "cgrates.org:1001", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 20}, }, }, UnitCounters: UnitCounters{ - utils.MONETARY: []*UnitCounter{ + utils.MetaMonetary: []*UnitCounter{ { Counters: CounterFilters{ &CounterFilter{Value: 1}, @@ -2656,7 +2656,7 @@ func TestCdrLogAction(t *testing.T) { Balance: &BalanceFilter{ ID: utils.StringPointer(utils.MetaDefault), Value: &utils.ValueFormula{Static: 9.95}, - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Weight: utils.Float64Pointer(0), }, Weight: float64(90), @@ -2715,7 +2715,7 @@ func TestRemoteSetAccountAction(t *testing.T) { ActionTriggers: ActionTriggers{{ Balance: &BalanceFilter{ Value: &utils.ValueFormula{ - Params: map[string]interface{}{utils.VOICE: func() {}}, + Params: map[string]interface{}{utils.MetaVoice: func() {}}, }, }, }}, @@ -2741,7 +2741,7 @@ func TestRemoteSetAccountAction(t *testing.T) { exp = &Account{ ID: "1001", BalanceMap: map[string]Balances{ - utils.META_VOICE: {{ + utils.MetaVoice: {{ ID: "money", Value: 15, }}, diff --git a/engine/attributes.go b/engine/attributes.go index 738d0208d..034bc43ef 100644 --- a/engine/attributes.go +++ b/engine/attributes.go @@ -140,7 +140,7 @@ func (attrReply *AttrSProcessEventReply) Digest() (rplyDigest string) { continue //maybe removed } if i != 0 { - rplyDigest += utils.FIELDS_SEP + rplyDigest += utils.FieldsSep } fldStrVal, _ := attrReply.CGREvent.FieldAsString(fld) rplyDigest += fld + utils.InInFieldSep + fldStrVal @@ -225,11 +225,11 @@ func (alS *AttributeService) processEvent(tnt string, args *AttrArgsProcessEvent } var substitute string switch attribute.Type { - case utils.META_CONSTANT: + case utils.MetaConstant: substitute, err = attribute.Value.ParseValue(utils.EmptyString) - case utils.MetaVariable, utils.META_COMPOSED: + case utils.MetaVariable, utils.MetaComposed: substitute, err = attribute.Value.ParseDataProvider(dynDP) - case utils.META_USAGE_DIFFERENCE: + case utils.MetaUsageDifference: if len(attribute.Value) != 2 { return nil, fmt.Errorf("invalid arguments <%s>", utils.ToJSON(attribute.Value)) } @@ -390,7 +390,7 @@ func (alS *AttributeService) processEvent(tnt string, args *AttrArgsProcessEvent rply.AlteredFields = append(rply.AlteredFields, attribute.Path) } if attribute.Path == utils.MetaTenant { - if attribute.Type == utils.META_COMPOSED { + if attribute.Type == utils.MetaComposed { rply.CGREvent.Tenant += substitute } else { rply.CGREvent.Tenant = substitute @@ -401,7 +401,7 @@ func (alS *AttributeService) processEvent(tnt string, args *AttrArgsProcessEvent evNm.Remove(strings.Split(attribute.Path, utils.NestingSep)) continue } - if attribute.Type == utils.META_COMPOSED { + if attribute.Type == utils.MetaComposed { var val string if val, err = evNm.FieldAsString(strings.Split(attribute.Path, utils.NestingSep)); err != nil && err != utils.ErrNotFound { rply = nil diff --git a/engine/balances.go b/engine/balances.go index 3bb76ed04..346bb40b0 100644 --- a/engine/balances.go +++ b/engine/balances.go @@ -252,7 +252,7 @@ func (b *Balance) GetCost(cd *CallDescriptor, getStandardIfEmpty bool) (*CallCos if cd.testCallcost != nil { return cd.testCallcost, nil } - if b.RatingSubject != "" && !strings.HasPrefix(b.RatingSubject, utils.ZERO_RATING_SUBJECT_PREFIX) { + if b.RatingSubject != "" && !strings.HasPrefix(b.RatingSubject, utils.MetaRatingSubjectPrefix) { origSubject := cd.Subject cd.Subject = b.RatingSubject origAccount := cd.Account @@ -439,7 +439,7 @@ func (b *Balance) debitUnits(cd *CallDescriptor, ub *Account, moneyBalances Bala } cost := inc.Cost inc.paid = false - if strategy == utils.MAX_COST_DISCONNECT && cd.MaxCostSoFar >= maxCost { + if strategy == utils.MetaMaxCostDisconnect && cd.MaxCostSoFar >= maxCost { // cut the entire current timespan cc.maxCostDisconect = true if dryRun { @@ -453,7 +453,7 @@ func (b *Balance) debitUnits(cd *CallDescriptor, ub *Account, moneyBalances Bala return cc, nil } } - if strategy == utils.MAX_COST_FREE && cd.MaxCostSoFar >= maxCost { + if strategy == utils.MetaMaxCostFree && cd.MaxCostSoFar >= maxCost { cost, inc.Cost = 0.0, 0.0 inc.BalanceInfo.Monetary = &MonetaryInfo{ UUID: b.Uuid, @@ -464,7 +464,7 @@ func (b *Balance) debitUnits(cd *CallDescriptor, ub *Account, moneyBalances Bala inc.BalanceInfo.AccountID = ub.ID inc.paid = true if count { - ub.countUnits(cost, utils.MONETARY, cc, b) + ub.countUnits(cost, utils.MetaMonetary, cc, b) } // go to nextincrement continue @@ -505,7 +505,7 @@ func (b *Balance) debitUnits(cd *CallDescriptor, ub *Account, moneyBalances Bala if count { ub.countUnits(amount, cc.ToR, cc, b) if cost != 0 { - ub.countUnits(cost, utils.MONETARY, cc, moneyBal) + ub.countUnits(cost, utils.MetaMonetary, cc, moneyBal) } } } else { @@ -600,7 +600,7 @@ func (b *Balance) debitMoney(cd *CallDescriptor, ub *Account, moneyBalances Bala amount := inc.Cost inc.paid = false - if strategy == utils.MAX_COST_DISCONNECT && cd.MaxCostSoFar >= maxCost { + if strategy == utils.MetaMaxCostDisconnect && cd.MaxCostSoFar >= maxCost { // cut the entire current timespan cc.maxCostDisconect = true if dryRun { @@ -614,7 +614,7 @@ func (b *Balance) debitMoney(cd *CallDescriptor, ub *Account, moneyBalances Bala return cc, nil } } - if strategy == utils.MAX_COST_FREE && cd.MaxCostSoFar >= maxCost { + if strategy == utils.MetaMaxCostFree && cd.MaxCostSoFar >= maxCost { amount, inc.Cost = 0.0, 0.0 inc.BalanceInfo.Monetary = &MonetaryInfo{ UUID: b.Uuid, @@ -627,7 +627,7 @@ func (b *Balance) debitMoney(cd *CallDescriptor, ub *Account, moneyBalances Bala } inc.paid = true if count { - ub.countUnits(amount, utils.MONETARY, cc, b) + ub.countUnits(amount, utils.MetaMonetary, cc, b) } //log.Printf("TS: %+v", cc.Cost) @@ -649,7 +649,7 @@ func (b *Balance) debitMoney(cd *CallDescriptor, ub *Account, moneyBalances Bala } inc.paid = true if count { - ub.countUnits(amount, utils.MONETARY, cc, b) + ub.countUnits(amount, utils.MetaMonetary, cc, b) } } else { inc.paid = false diff --git a/engine/callcost.go b/engine/callcost.go index 369ce3fe0..c6f831b7f 100644 --- a/engine/callcost.go +++ b/engine/callcost.go @@ -104,7 +104,7 @@ func (cc *CallCost) IsPaid() bool { } func (cc *CallCost) ToDataCost() (*DataCost, error) { - if cc.ToR == utils.VOICE { + if cc.ToR == utils.MetaVoice { return nil, errors.New("Not a data call!") } dc := &DataCost{ diff --git a/engine/callcost_test.go b/engine/callcost_test.go index f8cfc91e3..fde122623 100644 --- a/engine/callcost_test.go +++ b/engine/callcost_test.go @@ -190,7 +190,7 @@ func TestCallCostToDataCostError(t *testing.T) { Destination: utils.MetaAny, TimeStart: time.Date(2014, 3, 4, 6, 0, 0, 0, time.UTC), TimeEnd: time.Date(2014, 3, 4, 6, 1, 5, 0, time.UTC), - ToR: utils.VOICE, + ToR: utils.MetaVoice, } cc, _ := cd.getCost() _, err := cc.ToDataCost() diff --git a/engine/calldesc.go b/engine/calldesc.go index dbad74519..e81e7d043 100644 --- a/engine/calldesc.go +++ b/engine/calldesc.go @@ -378,7 +378,7 @@ func (cd *CallDescriptor) addRatingInfos(ris RatingInfos) bool { // GetKey constructs the key for the storage lookup. // The prefixLen is limiting the length of the destination prefix. func (cd *CallDescriptor) GetKey(subject string) string { - return utils.ConcatenatedKey(utils.META_OUT, cd.Tenant, cd.Category, subject) + return utils.ConcatenatedKey(utils.MetaOut, cd.Tenant, cd.Category, subject) } // GetAccountKey returns the key used to retrive the user balance involved in this call @@ -400,7 +400,7 @@ func (cd *CallDescriptor) splitInTimeSpans() (timespans []*TimeSpan) { return } firstSpan.setRatingInfo(cd.RatingInfos[0]) - if cd.ToR == utils.VOICE { + if cd.ToR == utils.MetaVoice { // split on rating plans afterStart, afterEnd := false, false //optimization for multiple activation periods for _, rp := range cd.RatingInfos { @@ -456,7 +456,7 @@ func (cd *CallDescriptor) splitInTimeSpans() (timespans []*TimeSpan) { //log.Print(timespans[i].RateInterval) for _, interval := range rateIntervals { //log.Printf("\tINTERVAL: %+v", interval.Timing) - newTs := timespans[i].SplitByRateInterval(interval, cd.ToR != utils.VOICE) + newTs := timespans[i].SplitByRateInterval(interval, cd.ToR != utils.MetaVoice) //utils.PrintFull(timespans[i]) //utils.PrintFull(newTs) if newTs != nil { @@ -547,7 +547,7 @@ func (cd *CallDescriptor) GetCost() (*CallCost, error) { if strategy != "" && maxCost > 0 { //log.Print("HERE: ", strategy, maxCost) - if strategy == utils.MAX_COST_FREE && cd.MaxCostSoFar >= maxCost { + if strategy == utils.MetaMaxCostFree && cd.MaxCostSoFar >= maxCost { cost = maxCost cd.MaxCostSoFar = maxCost } @@ -581,7 +581,7 @@ func (cd *CallDescriptor) getCost() (*CallCost, error) { cd.DurationIndex = cd.TimeEnd.Sub(cd.TimeStart) } if cd.ToR == "" { - cd.ToR = utils.VOICE + cd.ToR = utils.MetaVoice } err := cd.LoadRatingPlans() if err != nil { @@ -627,7 +627,7 @@ func (origCD *CallDescriptor) getMaxSessionDuration(origAcc *Account) (time.Dura origCD.DurationIndex = origCD.TimeEnd.Sub(origCD.TimeStart) } if origCD.ToR == "" { - origCD.ToR = utils.VOICE + origCD.ToR = utils.MetaVoice } cd := origCD.Clone() initialDuration := cd.TimeEnd.Sub(cd.TimeStart) @@ -694,7 +694,7 @@ func (cd *CallDescriptor) GetMaxSessionDuration() (duration time.Duration, err e var lkIDs []string for acntID := range acntIDs { if acntID != cd.GetAccountKey() { - lkIDs = append(lkIDs, utils.ACCOUNT_PREFIX+acntID) + lkIDs = append(lkIDs, utils.AccountPrefix+acntID) } } _, err = guardian.Guardian.Guard(func() (iface interface{}, err error) { @@ -702,7 +702,7 @@ func (cd *CallDescriptor) GetMaxSessionDuration() (duration time.Duration, err e return }, config.CgrConfig().GeneralCfg().LockingTimeout, lkIDs...) return - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACCOUNT_PREFIX+cd.GetAccountKey()) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.AccountPrefix+cd.GetAccountKey()) return } @@ -724,7 +724,7 @@ func (cd *CallDescriptor) debit(account *Account, dryRun bool, goNegative bool) return cc, nil } if cd.ToR == "" { - cd.ToR = utils.VOICE + cd.ToR = utils.MetaVoice } //log.Printf("Debit CD: %+v", cd) cc, err = account.debitCreditBalance(cd, !dryRun, dryRun, goNegative) @@ -768,7 +768,7 @@ func (cd *CallDescriptor) Debit() (cc *CallCost, err error) { var lkIDs []string for acntID := range acntIDs { if acntID != cd.GetAccountKey() { - lkIDs = append(lkIDs, utils.ACCOUNT_PREFIX+acntID) + lkIDs = append(lkIDs, utils.AccountPrefix+acntID) } } _, err = guardian.Guardian.Guard(func() (iface interface{}, err error) { @@ -779,7 +779,7 @@ func (cd *CallDescriptor) Debit() (cc *CallCost, err error) { return }, config.CgrConfig().GeneralCfg().LockingTimeout, lkIDs...) return - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACCOUNT_PREFIX+cd.GetAccountKey()) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.AccountPrefix+cd.GetAccountKey()) return } @@ -802,7 +802,7 @@ func (cd *CallDescriptor) MaxDebit() (cc *CallCost, err error) { var lkIDs []string for acntID := range acntIDs { if acntID != cd.GetAccountKey() { - lkIDs = append(lkIDs, utils.ACCOUNT_PREFIX+acntID) + lkIDs = append(lkIDs, utils.AccountPrefix+acntID) } } _, err = guardian.Guardian.Guard(func() (iface interface{}, err error) { @@ -844,7 +844,7 @@ func (cd *CallDescriptor) MaxDebit() (cc *CallCost, err error) { return }, config.CgrConfig().GeneralCfg().LockingTimeout, lkIDs...) return - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACCOUNT_PREFIX+cd.GetAccountKey()) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.AccountPrefix+cd.GetAccountKey()) return cc, err } @@ -886,11 +886,11 @@ func (cd *CallDescriptor) refundIncrements() (acnt *Account, err error) { } // check money too if increment.BalanceInfo.Monetary != nil && increment.BalanceInfo.Monetary.UUID != "" { - if balance = account.BalanceMap[utils.MONETARY].GetBalance(increment.BalanceInfo.Monetary.UUID); balance == nil { + if balance = account.BalanceMap[utils.MetaMonetary].GetBalance(increment.BalanceInfo.Monetary.UUID); balance == nil { return } balance.AddValue(increment.Cost) - account.countUnits(-increment.Cost, utils.MONETARY, cc, balance) + account.countUnits(-increment.Cost, utils.MetaMonetary, cc, balance) } } acnt = accountsCache[utils.ConcatenatedKey(cd.Tenant, cd.Account)] @@ -908,7 +908,7 @@ func (cd *CallDescriptor) RefundIncrements() (acnt *Account, err error) { continue } if increment.BalanceInfo.Monetary != nil || increment.BalanceInfo.Unit != nil { - accMap[utils.ACCOUNT_PREFIX+increment.BalanceInfo.AccountID] = true + accMap[utils.AccountPrefix+increment.BalanceInfo.AccountID] = true } } _, err = guardian.Guardian.Guard(func() (iface interface{}, err error) { @@ -939,11 +939,11 @@ func (cd *CallDescriptor) refundRounding() (err error) { cc := cd.CreateCallCost() if increment.BalanceInfo.Monetary != nil { var balance *Balance - if balance = account.BalanceMap[utils.MONETARY].GetBalance(increment.BalanceInfo.Monetary.UUID); balance == nil { + if balance = account.BalanceMap[utils.MetaMonetary].GetBalance(increment.BalanceInfo.Monetary.UUID); balance == nil { return } balance.AddValue(-increment.Cost) - account.countUnits(increment.Cost, utils.MONETARY, cc, balance) + account.countUnits(increment.Cost, utils.MetaMonetary, cc, balance) } } return @@ -952,7 +952,7 @@ func (cd *CallDescriptor) refundRounding() (err error) { func (cd *CallDescriptor) RefundRounding() (err error) { accMap := make(utils.StringMap) for _, inc := range cd.Increments { - accMap[utils.ACCOUNT_PREFIX+inc.BalanceInfo.AccountID] = true + accMap[utils.AccountPrefix+inc.BalanceInfo.AccountID] = true } _, err = guardian.Guardian.Guard(func() (iface interface{}, err error) { err = cd.refundRounding() @@ -1021,7 +1021,7 @@ func (cd *CallDescriptor) FieldAsInterface(fldPath []string) (fldVal interface{} if len(fldPath) == 0 { return nil, utils.ErrNotFound } - return utils.ReflectFieldInterface(cd, fldPath[0], utils.EXTRA_FIELDS) + return utils.ReflectFieldInterface(cd, fldPath[0], utils.ExtraFields) } // FieldAsString is part of utils.DataProvider @@ -1029,7 +1029,7 @@ func (cd *CallDescriptor) FieldAsString(fldPath []string) (fldVal string, err er if len(fldPath) == 0 { return "", utils.ErrNotFound } - return utils.ReflectFieldAsString(cd, fldPath[0], utils.EXTRA_FIELDS) + return utils.ReflectFieldAsString(cd, fldPath[0], utils.ExtraFields) } // String is part of utils.DataProvider diff --git a/engine/calldesc_test.go b/engine/calldesc_test.go index fc9918fbf..be05ee27c 100644 --- a/engine/calldesc_test.go +++ b/engine/calldesc_test.go @@ -39,10 +39,10 @@ func init() { func populateDB() { ats := []*Action{ {ActionType: "*topup", - Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY), + Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary), Value: &utils.ValueFormula{Static: 10}}}, {ActionType: "*topup", - Balance: &BalanceFilter{Type: utils.StringPointer(utils.VOICE), + Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaVoice), Weight: utils.Float64Pointer(20), Value: &utils.ValueFormula{Static: 10 * float64(time.Second)}, DestinationIDs: utils.StringMapPointer(utils.NewStringMap("NAT"))}}, @@ -51,7 +51,7 @@ func populateDB() { ats1 := []*Action{ {ActionType: "*topup", Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Value: &utils.ValueFormula{Static: 10}}, Weight: 10}, {ActionType: "*reset_account", Weight: 20}, } @@ -59,8 +59,8 @@ func populateDB() { minu := &Account{ ID: "vdf:minu", BalanceMap: map[string]Balances{ - utils.MONETARY: {&Balance{Value: 50}}, - utils.VOICE: { + utils.MetaMonetary: {&Balance{Value: 50}}, + utils.MetaVoice: { &Balance{Value: 200 * float64(time.Second), DestinationIDs: utils.NewStringMap("NAT"), Weight: 10}, &Balance{Value: 100 * float64(time.Second), @@ -70,7 +70,7 @@ func populateDB() { broker := &Account{ ID: "vdf:broker", BalanceMap: map[string]Balances{ - utils.VOICE: { + utils.MetaVoice: { &Balance{Value: 20 * float64(time.Second), DestinationIDs: utils.NewStringMap("NAT"), Weight: 10, RatingSubject: "rif"}, @@ -81,7 +81,7 @@ func populateDB() { luna := &Account{ ID: "vdf:luna", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 0, Weight: 20}, }}, } @@ -89,14 +89,14 @@ func populateDB() { minitsboy := &Account{ ID: "vdf:minitsboy", BalanceMap: map[string]Balances{ - utils.VOICE: { + utils.MetaVoice: { &Balance{Value: 20 * float64(time.Second), DestinationIDs: utils.NewStringMap("NAT"), Weight: 10, RatingSubject: "rif"}, &Balance{Value: 100 * float64(time.Second), DestinationIDs: utils.NewStringMap("RET"), Weight: 20}, }, - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 100, Weight: 10}, }, }, @@ -104,14 +104,14 @@ func populateDB() { max := &Account{ ID: "cgrates.org:max", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 11, Weight: 20}, }}, } money := &Account{ ID: "cgrates.org:money", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: 10000, Weight: 10}, }}, } @@ -149,7 +149,7 @@ func TestSerialDebit(t *testing.T) { moneyConcurent := &Account{ ID: "cgrates.org:moneyp", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: initialBalance, Weight: 10}, }}, } @@ -173,9 +173,9 @@ func TestSerialDebit(t *testing.T) { t.Errorf("Error debiting balance: %+v", err) } expBalance := initialBalance - float64(debitsToDo*60) - if acc.BalanceMap[utils.MONETARY][0].GetValue() != expBalance { + if acc.BalanceMap[utils.MetaMonetary][0].GetValue() != expBalance { t.Errorf("Balance does not match: %f, expected %f", - acc.BalanceMap[utils.MONETARY][0].GetValue(), expBalance) + acc.BalanceMap[utils.MetaMonetary][0].GetValue(), expBalance) } } @@ -186,7 +186,7 @@ func TestParallelDebit(t *testing.T) { moneyConcurent := &Account{ ID: "cgrates.org:moneyp", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Value: initialBalance, Weight: 10}, }}, } @@ -212,9 +212,9 @@ func TestParallelDebit(t *testing.T) { t.Errorf("Error debiting balance: %+v", err) } expBalance := initialBalance - float64(debitsToDo*60) - if acc.BalanceMap[utils.MONETARY][0].GetValue() != expBalance { + if acc.BalanceMap[utils.MetaMonetary][0].GetValue() != expBalance { t.Errorf("Balance does not match: %f, expected %f", - acc.BalanceMap[utils.MONETARY][0].GetValue(), expBalance) + acc.BalanceMap[utils.MetaMonetary][0].GetValue(), expBalance) } } @@ -223,7 +223,7 @@ func TestSplitSpans(t *testing.T) { t1 := time.Date(2012, time.February, 2, 17, 30, 0, 0, time.UTC) t2 := time.Date(2012, time.February, 2, 18, 30, 0, 0, time.UTC) cd := &CallDescriptor{Category: "0", Tenant: "vdf", Subject: "rif", - Destination: "0256", TimeStart: t1, TimeEnd: t2, ToR: utils.VOICE} + Destination: "0256", TimeStart: t1, TimeEnd: t2, ToR: utils.MetaVoice} cd.LoadRatingPlans() timespans := cd.splitInTimeSpans() @@ -236,7 +236,7 @@ func TestSplitSpans(t *testing.T) { func TestSplitSpansWeekend(t *testing.T) { cd := &CallDescriptor{ Category: "postpaid", - ToR: utils.VOICE, + ToR: utils.MetaVoice, Tenant: "foehn", Subject: "foehn", Account: "foehn", @@ -743,12 +743,12 @@ func TestGetMaxSessiontWithBlocker(t *testing.T) { if err != nil { t.Error("error getting account: ", err) } - if len(acc.BalanceMap[utils.MONETARY]) != 2 || - acc.BalanceMap[utils.MONETARY][0].Blocker != true { - for _, b := range acc.BalanceMap[utils.MONETARY] { + if len(acc.BalanceMap[utils.MetaMonetary]) != 2 || + acc.BalanceMap[utils.MetaMonetary][0].Blocker != true { + for _, b := range acc.BalanceMap[utils.MetaMonetary] { t.Logf("B: %+v", b) } - t.Error("Error executing action plan on account: ", acc.BalanceMap[utils.MONETARY]) + t.Error("Error executing action plan on account: ", acc.BalanceMap[utils.MetaMonetary]) } cd := &CallDescriptor{ Category: "call", @@ -792,12 +792,12 @@ func TestGetMaxSessiontWithBlockerEmpty(t *testing.T) { if err != nil { t.Error("error getting account: ", err) } - if len(acc.BalanceMap[utils.MONETARY]) != 2 || - acc.BalanceMap[utils.MONETARY][0].Blocker != true { - for _, b := range acc.BalanceMap[utils.MONETARY] { + if len(acc.BalanceMap[utils.MetaMonetary]) != 2 || + acc.BalanceMap[utils.MetaMonetary][0].Blocker != true { + for _, b := range acc.BalanceMap[utils.MetaMonetary] { t.Logf("B: %+v", b) } - t.Error("Error executing action plan on account: ", acc.BalanceMap[utils.MONETARY]) + t.Error("Error executing action plan on account: ", acc.BalanceMap[utils.MetaMonetary]) } cd := &CallDescriptor{ Category: "call", @@ -1000,7 +1000,7 @@ func TestMaxDebitRoundingIssue(t *testing.T) { PerformRounding: true, } acc, err := dm.GetAccount("cgrates.org:dy") - if err != nil || acc.BalanceMap[utils.MONETARY][0].Value != 1 { + if err != nil || acc.BalanceMap[utils.MetaMonetary][0].Value != 1 { t.Errorf("Error getting account: %+v (%v)", utils.ToIJSON(acc), err) } @@ -1011,7 +1011,7 @@ func TestMaxDebitRoundingIssue(t *testing.T) { t.Errorf("Expected %v was %+v (%v)", expected, cc, err) } acc, err = dm.GetAccount("cgrates.org:dy") - if err != nil || acc.BalanceMap[utils.MONETARY][0].Value != 1-expected { + if err != nil || acc.BalanceMap[utils.MetaMonetary][0].Value != 1-expected { t.Errorf("Error getting account: %+v (%v)", utils.ToIJSON(acc), err) } } @@ -1034,7 +1034,7 @@ func TestDebitRoundingRefund(t *testing.T) { PerformRounding: true, } acc, err := dm.GetAccount("cgrates.org:dy") - if err != nil || acc.BalanceMap[utils.MONETARY][0].Value != 1 { + if err != nil || acc.BalanceMap[utils.MetaMonetary][0].Value != 1 { t.Errorf("Error getting account: %+v (%v)", utils.ToIJSON(acc), err) } @@ -1045,7 +1045,7 @@ func TestDebitRoundingRefund(t *testing.T) { t.Errorf("Expected %v was %+v (%v)", expected, cc, err) } acc, err = dm.GetAccount("cgrates.org:dy") - if err != nil || acc.BalanceMap[utils.MONETARY][0].Value != 1-expected { + if err != nil || acc.BalanceMap[utils.MetaMonetary][0].Value != 1-expected { t.Errorf("Error getting account: %+v (%v)", utils.ToIJSON(acc), err) } } @@ -1186,13 +1186,13 @@ func TestMaxDebitWithAccountShared(t *testing.T) { t.Errorf("Wrong callcost in shared debit: %+v, %v", cc, err) } acc, _ := cd.getAccount() - balanceMap := acc.BalanceMap[utils.MONETARY] + balanceMap := acc.BalanceMap[utils.MetaMonetary] if len(balanceMap) != 1 || balanceMap[0].GetValue() != 0 { t.Errorf("Wrong shared balance debited: %+v", balanceMap[0]) } other, err := dm.GetAccount("vdf:empty10") - if err != nil || other.BalanceMap[utils.MONETARY][0].GetValue() != 7.5 { - t.Errorf("Error debiting shared balance: %+v", other.BalanceMap[utils.MONETARY][0]) + if err != nil || other.BalanceMap[utils.MetaMonetary][0].GetValue() != 7.5 { + t.Errorf("Error debiting shared balance: %+v", other.BalanceMap[utils.MetaMonetary][0]) } } @@ -1221,7 +1221,7 @@ func TestMaxSessionTimeNoCredit(t *testing.T) { Tenant: "vdf", Subject: "broker", Destination: "0723", - ToR: utils.VOICE, + ToR: utils.MetaVoice, } result, err := cd.GetMaxSessionDuration() if result != time.Minute || err != nil { @@ -1241,7 +1241,7 @@ func TestMaxSessionModifiesCallDesc(t *testing.T) { Account: "minu", Destination: "0723", DurationIndex: t2.Sub(t1), - ToR: utils.VOICE, + ToR: utils.MetaVoice, } initial := cd.Clone() _, err := cd.GetMaxSessionDuration() @@ -1393,7 +1393,7 @@ func TestDebitFromShareAndNormal(t *testing.T) { } cc, err := cd.MaxDebit() acc, _ := cd.getAccount() - balanceMap := acc.BalanceMap[utils.MONETARY] + balanceMap := acc.BalanceMap[utils.MetaMonetary] if err != nil || cc.Cost != 2.5 { t.Errorf("Debit from share and normal error: %+v, %v", cc, err) } @@ -1425,7 +1425,7 @@ func TestDebitFromEmptyShare(t *testing.T) { t.Errorf("Debit from empty share error: %+v, %v", cc, err) } acc, _ := cd.getAccount() - balanceMap := acc.BalanceMap[utils.MONETARY] + balanceMap := acc.BalanceMap[utils.MetaMonetary] if len(balanceMap) != 2 || balanceMap[0].GetValue() != 0 || balanceMap[1].GetValue() != -2.5 { t.Errorf("Error debiting from empty share: %+v", balanceMap[1].GetValue()) } @@ -1454,13 +1454,13 @@ func TestDebitNegatve(t *testing.T) { } acc, _ := cd.getAccount() //utils.PrintFull(acc) - balanceMap := acc.BalanceMap[utils.MONETARY] + balanceMap := acc.BalanceMap[utils.MetaMonetary] if len(balanceMap) != 1 || balanceMap[0].GetValue() != -2.5 { t.Errorf("Error debiting from empty share: %+v", balanceMap[0].GetValue()) } cc, err = cd.MaxDebit() acc, _ = cd.getAccount() - balanceMap = acc.BalanceMap[utils.MONETARY] + balanceMap = acc.BalanceMap[utils.MetaMonetary] //utils.LogFull(balanceMap) if err != nil || cc.Cost != 2.5 { t.Errorf("Debit from empty share error: %+v, %v", cc, err) @@ -1568,9 +1568,9 @@ func TestMaxDebitConsumesMinutes(t *testing.T) { LoopIndex: 0, DurationIndex: 0} cd1.MaxDebit() - if cd1.account.BalanceMap[utils.VOICE][0].GetValue() != 20*float64(time.Second) { + if cd1.account.BalanceMap[utils.MetaVoice][0].GetValue() != 20*float64(time.Second) { t.Error("Error using minutes: ", - cd1.account.BalanceMap[utils.VOICE][0].GetValue()) + cd1.account.BalanceMap[utils.MetaVoice][0].GetValue()) } } @@ -1582,7 +1582,7 @@ func TestCDGetCostANY(t *testing.T) { Destination: utils.MetaAny, TimeStart: time.Date(2014, 3, 4, 6, 0, 0, 0, time.UTC), TimeEnd: time.Date(2014, 3, 4, 6, 0, 1, 0, time.UTC), - ToR: utils.DATA, + ToR: utils.MetaData, } cc, err := cd1.GetCost() if err != nil || cc.Cost != 60 { @@ -1598,7 +1598,7 @@ func TestCDSplitInDataSlots(t *testing.T) { Destination: utils.MetaAny, TimeStart: time.Date(2014, 3, 4, 6, 0, 0, 0, time.UTC), TimeEnd: time.Date(2014, 3, 4, 6, 1, 5, 0, time.UTC), - ToR: utils.DATA, + ToR: utils.MetaData, DurationIndex: 65 * time.Second, } cd.LoadRatingPlans() @@ -1617,7 +1617,7 @@ func TestCDDataGetCost(t *testing.T) { Destination: utils.MetaAny, TimeStart: time.Date(2014, 3, 4, 6, 0, 0, 0, time.UTC), TimeEnd: time.Date(2014, 3, 4, 6, 1, 5, 0, time.UTC), - ToR: utils.DATA, + ToR: utils.MetaData, } cc, err := cd.GetCost() if err != nil || cc.Cost != 65 { @@ -1629,10 +1629,10 @@ func TestCDRefundIncrements(t *testing.T) { ub := &Account{ ID: "test:ref", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Uuid: "moneya", Value: 100}, }, - utils.VOICE: { + utils.MetaVoice: { &Balance{Uuid: "minutea", Value: 10 * float64(time.Second), Weight: 20, @@ -1653,12 +1653,12 @@ func TestCDRefundIncrements(t *testing.T) { &Increment{Duration: 4 * time.Second, BalanceInfo: &DebitInfo{ Unit: &UnitInfo{UUID: "minuteb"}, AccountID: ub.ID}}, } - cd := &CallDescriptor{ToR: utils.VOICE, Increments: increments} + cd := &CallDescriptor{ToR: utils.MetaVoice, Increments: increments} cd.RefundIncrements() ub, _ = dm.GetAccount(ub.ID) - if ub.BalanceMap[utils.MONETARY][0].GetValue() != 104 || - ub.BalanceMap[utils.VOICE][0].GetValue() != 13*float64(time.Second) || - ub.BalanceMap[utils.VOICE][1].GetValue() != 14*float64(time.Second) { + if ub.BalanceMap[utils.MetaMonetary][0].GetValue() != 104 || + ub.BalanceMap[utils.MetaVoice][0].GetValue() != 13*float64(time.Second) || + ub.BalanceMap[utils.MetaVoice][1].GetValue() != 14*float64(time.Second) { t.Error("Error refunding money: ", utils.ToIJSON(ub.BalanceMap)) } } @@ -1667,10 +1667,10 @@ func TestCDRefundIncrementsZeroValue(t *testing.T) { ub := &Account{ ID: "test:ref", BalanceMap: map[string]Balances{ - utils.MONETARY: { + utils.MetaMonetary: { &Balance{Uuid: "moneya", Value: 100}, }, - utils.VOICE: { + utils.MetaVoice: { &Balance{Uuid: "minutea", Value: 10, Weight: 20, DestinationIDs: utils.StringMap{"NAT": true}}, &Balance{Uuid: "minuteb", Value: 10, DestinationIDs: utils.StringMap{"RET": true}}, }, @@ -1682,12 +1682,12 @@ func TestCDRefundIncrementsZeroValue(t *testing.T) { &Increment{Cost: 0, Duration: 3 * time.Second, BalanceInfo: &DebitInfo{AccountID: ub.ID}}, &Increment{Cost: 0, Duration: 4 * time.Second, BalanceInfo: &DebitInfo{AccountID: ub.ID}}, } - cd := &CallDescriptor{ToR: utils.VOICE, Increments: increments} + cd := &CallDescriptor{ToR: utils.MetaVoice, Increments: increments} cd.RefundIncrements() ub, _ = dm.GetAccount(ub.ID) - if ub.BalanceMap[utils.MONETARY][0].GetValue() != 100 || - ub.BalanceMap[utils.VOICE][0].GetValue() != 10 || - ub.BalanceMap[utils.VOICE][1].GetValue() != 10 { + if ub.BalanceMap[utils.MetaMonetary][0].GetValue() != 100 || + ub.BalanceMap[utils.MetaVoice][0].GetValue() != 10 || + ub.BalanceMap[utils.MetaVoice][1].GetValue() != 10 { t.Error("Error refunding money: ", utils.ToIJSON(ub.BalanceMap)) } } @@ -1696,7 +1696,7 @@ func TestCDDebitBalanceSubjectWithFallback(t *testing.T) { acnt := &Account{ ID: "TCDDBSWF:account1", BalanceMap: map[string]Balances{ - utils.VOICE: { + utils.MetaVoice: { &Balance{ID: "voice1", Value: 60 * float64(time.Second), RatingSubject: "SubjTCDDBSWF"}, }}, @@ -1801,7 +1801,7 @@ func TestCDDebitBalanceSubjectWithFallback(t *testing.T) { Destination: "1716", TimeStart: time.Date(2015, 01, 01, 9, 0, 0, 0, time.UTC), TimeEnd: time.Date(2015, 01, 01, 9, 2, 0, 0, time.UTC), - ToR: utils.VOICE, + ToR: utils.MetaVoice, } if cc, err := cd1.GetCost(); err != nil || cc.Cost != 0 { t.Errorf("Error getting *any dest: %+v %v", cc, err) @@ -1813,7 +1813,7 @@ func TestCDDebitBalanceSubjectWithFallback(t *testing.T) { Destination: "1716", TimeStart: time.Date(2015, 01, 01, 9, 1, 0, 0, time.UTC), TimeEnd: time.Date(2015, 01, 01, 9, 2, 0, 0, time.UTC), - ToR: utils.VOICE, + ToR: utils.MetaVoice, } if cc, err := cd2.GetCost(); err != nil || cc.Cost != 0.6 { t.Errorf("Error getting *any dest: %+v %v", cc, err) @@ -1826,7 +1826,7 @@ func TestCDDebitBalanceSubjectWithFallback(t *testing.T) { Destination: "1716", TimeStart: time.Date(2015, 01, 01, 9, 0, 0, 0, time.UTC), TimeEnd: time.Date(2015, 01, 01, 9, 2, 0, 0, time.UTC), - ToR: utils.VOICE, + ToR: utils.MetaVoice, } if cc, err := cd.Debit(); err != nil { t.Error(err) @@ -1835,12 +1835,12 @@ func TestCDDebitBalanceSubjectWithFallback(t *testing.T) { } if resAcnt, err := dm.GetAccount(acnt.ID); err != nil { t.Error(err) - } else if resAcnt.BalanceMap[utils.VOICE][0].ID != "voice1" || - resAcnt.BalanceMap[utils.VOICE][0].Value != 0 { + } else if resAcnt.BalanceMap[utils.MetaVoice][0].ID != "voice1" || + resAcnt.BalanceMap[utils.MetaVoice][0].Value != 0 { t.Errorf("Account: %v", resAcnt) - } else if len(resAcnt.BalanceMap[utils.MONETARY]) == 0 || - resAcnt.BalanceMap[utils.MONETARY][0].ID != utils.MetaDefault || - resAcnt.BalanceMap[utils.MONETARY][0].Value != -0.600013 { // rounding issue + } else if len(resAcnt.BalanceMap[utils.MetaMonetary]) == 0 || + resAcnt.BalanceMap[utils.MetaMonetary][0].ID != utils.MetaDefault || + resAcnt.BalanceMap[utils.MetaMonetary][0].Value != -0.600013 { // rounding issue t.Errorf("Account: %s", utils.ToIJSON(resAcnt)) } } diff --git a/engine/cdr.go b/engine/cdr.go index 4f06d94ee..e9689beec 100644 --- a/engine/cdr.go +++ b/engine/cdr.go @@ -106,7 +106,7 @@ func (cdr *CDR) AddDefaults(cfg *config.CGRConfig) { cdr.RunID = utils.MetaDefault } if cdr.ToR == utils.EmptyString { - cdr.ToR = utils.VOICE + cdr.ToR = utils.MetaVoice } if cdr.RequestType == utils.EmptyString { cdr.RequestType = cfg.GeneralCfg().DefaultReqType @@ -240,7 +240,7 @@ func (cdr *CDR) AsMapStringIface() (mp map[string]interface{}) { func (cdr *CDR) AsExternalCDR() *ExternalCDR { var usageStr string switch cdr.ToR { - case utils.VOICE: // usage as time + case utils.MetaVoice: // usage as time usageStr = cdr.Usage.String() default: // usage as units usageStr = strconv.FormatInt(cdr.Usage.Nanoseconds(), 10) @@ -303,7 +303,7 @@ func (cdr *CDR) exportFieldValue(cfgCdrFld *config.FCTemplate, filterS *FilterS) var cdrVal string var roundDec int switch cfgCdrFld.Path { - case utils.MetaExp + utils.NestingSep + utils.COST: + case utils.MetaExp + utils.NestingSep + utils.Cost: roundDec = config.CgrConfig().GeneralCfg().RoundingDecimals if cfgCdrFld.RoundingDecimals != nil { roundDec = *cfgCdrFld.RoundingDecimals @@ -336,10 +336,10 @@ func (cdr *CDR) exportFieldValue(cfgCdrFld *config.FCTemplate, filterS *FilterS) func (cdr *CDR) formatField(cfgFld *config.FCTemplate, groupedCDRs []*CDR, filterS *FilterS) (outVal string, err error) { switch cfgFld.Type { - case utils.META_FILLER: + case utils.MetaFiller: outVal, err = cfgFld.Value.ParseValue(utils.EmptyString) cfgFld.Padding = utils.MetaRight - case utils.META_CONSTANT: + case utils.MetaConstant: outVal, err = cfgFld.Value.ParseValue(utils.EmptyString) case utils.MetaDateTime: // Convert the requested field value into datetime with layout rawVal, err := cdr.exportFieldValue(cfgFld, filterS) @@ -369,9 +369,9 @@ func (cdr *CDR) formatField(cfgFld *config.FCTemplate, groupedCDRs []*CDR, err = fmt.Errorf("Empty result for http_post field: %s", cfgFld.Tag) } } - case utils.META_COMBIMED: + case utils.MetaCombimed: outVal, err = cdr.combimedCdrFieldVal(cfgFld, groupedCDRs, filterS) - case utils.META_COMPOSED, utils.MetaVariable: + case utils.MetaComposed, utils.MetaVariable: outVal, err = cdr.exportFieldValue(cfgFld, filterS) case utils.MetaMaskedDestination: if len(cfgFld.MaskDestID) != 0 && CachedDestHasPrefix(cfgFld.MaskDestID, cdr.Destination) { diff --git a/engine/cdr_test.go b/engine/cdr_test.go index fdcf78a79..47a2daac8 100644 --- a/engine/cdr_test.go +++ b/engine/cdr_test.go @@ -30,16 +30,16 @@ import ( func TestNewCDRFromExternalCDR(t *testing.T) { extCdr := &ExternalCDR{ CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), - OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, RequestType: utils.MetaRated, + OrderID: 123, ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: "2013-11-07T08:42:20Z", AnswerTime: "2013-11-07T08:42:26Z", RunID: utils.MetaDefault, Usage: "10", Cost: 1.01, PreRated: true, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, } eStorCdr := &CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), - OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, RequestType: utils.MetaRated, RunID: utils.MetaDefault, + OrderID: 123, ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", + Source: utils.UnitTest, RequestType: utils.MetaRated, RunID: utils.MetaDefault, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), @@ -56,8 +56,8 @@ func TestNewCDRFromExternalCDR(t *testing.T) { func TestCDRClone(t *testing.T) { storCdr := &CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), - OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, RequestType: utils.MetaRated, Tenant: "cgrates.org", + OrderID: 123, ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), @@ -72,7 +72,7 @@ func TestCDRClone(t *testing.T) { func TestFieldAsString(t *testing.T) { cdr := CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), - OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", + OrderID: 123, ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: "test", RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), @@ -216,7 +216,7 @@ func TestFieldAsString(t *testing.T) { func TestFieldsAsString(t *testing.T) { cdr := CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), - OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: "test", + OrderID: 123, ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: "test", RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), @@ -247,13 +247,13 @@ func TestFieldAsStringForCostDetails(t *testing.T) { { UUID: "f9be602747f4", ID: "monetary", - Type: utils.MONETARY, + Type: utils.MetaMonetary, Value: 0.5, }, { UUID: "2e02510ab90a", ID: "voice", - Type: utils.VOICE, + Type: utils.MetaVoice, Value: 10, }, }, @@ -263,10 +263,10 @@ func TestFieldAsStringForCostDetails(t *testing.T) { cdr := &CDR{ CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", @@ -329,7 +329,7 @@ func TestFormatCost(t *testing.T) { /* func TestCDRAsHttpForm(t *testing.T) { - storCdr := CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", + storCdr := CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), RunID: utils.MetaDefault, @@ -337,8 +337,8 @@ func TestCDRAsHttpForm(t *testing.T) { ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, } cdrForm := storCdr.AsHttpForm() - if cdrForm.Get(utils.ToR) != utils.VOICE { - t.Errorf("Expected: %s, received: %s", utils.VOICE, cdrForm.Get(utils.ToR)) + if cdrForm.Get(utils.ToR) != utils.MetaVoice { + t.Errorf("Expected: %s, received: %s", utils.MetaVoice, cdrForm.Get(utils.ToR)) } if cdrForm.Get(utils.OriginID) != "dsafdsaf" { t.Errorf("Expected: %s, received: %s", "dsafdsaf", cdrForm.Get(utils.OriginID)) @@ -376,8 +376,8 @@ func TestCDRAsHttpForm(t *testing.T) { if cdrForm.Get(utils.Usage) != "10" { t.Errorf("Expected: %s, received: %s", "10", cdrForm.Get(utils.Usage)) } - if cdrForm.Get(utils.ROUTE) != "SUPPL1" { - t.Errorf("Expected: %s, received: %s", "1001", cdrForm.Get(utils.ROUTE)) + if cdrForm.Get(utils.Route) != "SUPPL1" { + t.Errorf("Expected: %s, received: %s", "1001", cdrForm.Get(utils.Route)) } if cdrForm.Get("field_extr1") != "val_extr1" { t.Errorf("Expected: %s, received: %s", "val_extr1", cdrForm.Get("field_extr1")) @@ -390,8 +390,8 @@ func TestCDRAsHttpForm(t *testing.T) { func TestCDRAsExternalCDR(t *testing.T) { storCdr := CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), - OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, RequestType: utils.MetaRated, + OrderID: 123, ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), @@ -399,8 +399,8 @@ func TestCDRAsExternalCDR(t *testing.T) { ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}} expectOutCdr := &ExternalCDR{ CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), - OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, RequestType: utils.MetaRated, + OrderID: 123, ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: "2013-11-07T08:42:20Z", AnswerTime: "2013-11-07T08:42:26Z", RunID: utils.MetaDefault, Usage: "10s", Cost: 1.01, CostDetails: "null", @@ -411,7 +411,7 @@ func TestCDRAsExternalCDR(t *testing.T) { } func TestUsageReqAsCD(t *testing.T) { - req := &UsageRecord{ToR: utils.VOICE, RequestType: utils.MetaRated, + req := &UsageRecord{ToR: utils.MetaVoice, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: "2013-11-07T08:42:20Z", AnswerTime: "2013-11-07T08:42:26Z", @@ -479,10 +479,10 @@ func TestCDRAsMapStringIface(t *testing.T) { cdr := &CDR{ CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", @@ -504,9 +504,9 @@ func TestCDRAsMapStringIface(t *testing.T) { utils.RunID: utils.MetaDefault, utils.OrderID: cdr.OrderID, utils.OriginHost: "192.168.1.1", - utils.Source: utils.UNIT_TEST, + utils.Source: utils.UnitTest, utils.OriginID: "dsafdsaf", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", @@ -541,10 +541,10 @@ func TestCDRTestCDRAsMapStringIface2(t *testing.T) { cdr := &CDR{ CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", @@ -567,9 +567,9 @@ func TestCDRTestCDRAsMapStringIface2(t *testing.T) { utils.RunID: utils.MetaDefault, utils.OrderID: cdr.OrderID, utils.OriginHost: "192.168.1.1", - utils.Source: utils.UNIT_TEST, + utils.Source: utils.UnitTest, utils.OriginID: "dsafdsaf", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", @@ -617,7 +617,7 @@ func TestCDRAsExportRecord(t *testing.T) { cdr := &CDR{ CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), - ToR: utils.VOICE, OriginID: "dsafdsaf", + ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", RequestType: utils.MetaRated, Tenant: "cgrates.org", @@ -637,7 +637,7 @@ func TestCDRAsExportRecord(t *testing.T) { cfgCdrFld := &config.FCTemplate{ Tag: "destination", Path: "*exp.Destination", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: prsr, Timezone: "UTC", } @@ -654,7 +654,7 @@ func TestCDRAsExportRecord(t *testing.T) { cfgCdrFld = &config.FCTemplate{ Tag: "Destination", Path: "*exp.Destination", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: prsr, MaskDestID: "MASKED_DESTINATIONS", MaskLen: 3, @@ -684,7 +684,7 @@ func TestCDRAsExportRecord(t *testing.T) { cfgCdrFld = &config.FCTemplate{ Tag: "destination", Path: "*exp.Destination", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: prsr, Filters: []string{"*string:~*req.Tenant:itsyscom.com"}, Timezone: "UTC", @@ -744,7 +744,7 @@ func TestCDRAsExportRecord(t *testing.T) { prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.CGRID", utils.InfieldSep) cfgCdrFld = &config.FCTemplate{ Tag: "CGRIDFromCostDetails", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Path: "*exp.CGRIDFromCostDetails", Value: prsr, } @@ -756,7 +756,7 @@ func TestCDRAsExportRecord(t *testing.T) { prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.AccountSummary.ID", utils.InfieldSep) cfgCdrFld = &config.FCTemplate{ Tag: "AccountID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Path: "*exp.CustomAccountID", Value: prsr, } @@ -770,7 +770,7 @@ func TestCDRAsExportRecord(t *testing.T) { prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.RatingFilters", utils.InfieldSep) cfgCdrFld = &config.FCTemplate{ Tag: "DestinationID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Path: "*exp.CustomDestinationID", Value: prsr, } @@ -784,7 +784,7 @@ func TestCDRAsExportRecord(t *testing.T) { prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.RatingFilters:s/RatingPlanID\"\\s?\\:\\s?\"([^\"]*)\".*/$1/", utils.InfieldSep) cfgCdrFld = &config.FCTemplate{ Tag: "DestinationID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Path: "*exp.CustomDestinationID", Value: prsr, } @@ -798,7 +798,7 @@ func TestCDRAsExportRecord(t *testing.T) { prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.RatingFilters:s/DestinationID\"\\s?\\:\\s?\"([^\"]*)\".*/$1/", utils.InfieldSep) cfgCdrFld = &config.FCTemplate{ Tag: "DestinationID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Path: "*exp.CustomDestinationID", Value: prsr, } @@ -812,7 +812,7 @@ func TestCDRAsExportRecord(t *testing.T) { prsr = config.NewRSRParsersMustCompile("~*req.CostDetails.RatingFilters:s/DestinationPrefix\"\\s?\\:\\s?\"([^\"]*)\".*/$1/", utils.InfieldSep) cfgCdrFld = &config.FCTemplate{ Tag: "DestinationID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Path: "*exp.CustomDestinationID", Value: prsr, } @@ -827,10 +827,10 @@ func TestCDRAsExportRecord(t *testing.T) { func TestCDRAsCDRsql(t *testing.T) { cdr := &CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", @@ -849,8 +849,8 @@ func TestCDRAsCDRsql(t *testing.T) { Cgrid: cdr.CGRID, RunID: cdr.RunID, OriginID: "dsafdsaf", - TOR: utils.VOICE, - Source: utils.UNIT_TEST, + TOR: utils.MetaVoice, + Source: utils.UnitTest, Tenant: "cgrates.org", Category: "call", Account: "1001", @@ -879,8 +879,8 @@ func TestCDRNewCDRFromSQL(t *testing.T) { Cgrid: "abecd993d06672714c4218a6dcf8278e0589a171", RunID: utils.MetaDefault, OriginID: "dsafdsaf", - TOR: utils.VOICE, - Source: utils.UNIT_TEST, + TOR: utils.MetaVoice, + Source: utils.UnitTest, Tenant: "cgrates.org", Category: "call", Account: "1001", @@ -897,10 +897,10 @@ func TestCDRNewCDRFromSQL(t *testing.T) { cdr := &CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", @@ -927,10 +927,10 @@ func TestCDRAsCGREvent(t *testing.T) { cdr := &CDR{ CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", @@ -997,12 +997,12 @@ func TestCDRAddDefaults(t *testing.T) { eCDR := &CDR{ CGRID: "bf736fb56ce586357ab2f286b777187a1612c6e6", - ToR: utils.VOICE, + ToR: utils.MetaVoice, RunID: utils.MetaDefault, Subject: "1001", RequestType: utils.MetaRated, Tenant: "cgrates.org", - Category: utils.CALL, + Category: utils.Call, OriginID: "dsafdsaf", OriginHost: "192.168.1.2", Account: "1001", @@ -1017,10 +1017,10 @@ func TestCDRexportFieldValue(t *testing.T) { cdr := &CDR{ CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", @@ -1035,7 +1035,7 @@ func TestCDRexportFieldValue(t *testing.T) { ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, } - cfgCdrFld := &config.FCTemplate{Path: "*exp.SetupTime", Type: utils.META_COMPOSED, + cfgCdrFld := &config.FCTemplate{Path: "*exp.SetupTime", Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~SetupTime", utils.InfieldSep), Layout: time.RFC3339} eVal := "2013-11-07T08:42:20Z" @@ -1051,10 +1051,10 @@ func TestCDReRoundingDecimals(t *testing.T) { cdr := &CDR{ CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", @@ -1071,7 +1071,7 @@ func TestCDReRoundingDecimals(t *testing.T) { cfgCdrFld := &config.FCTemplate{ Path: "*exp.Cost", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~SetupTime", utils.InfieldSep), } @@ -1177,10 +1177,10 @@ func TestCDRcombimedCdrFieldVal(t *testing.T) { cdr := &CDR{ CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", @@ -1199,10 +1199,10 @@ func TestCDRcombimedCdrFieldVal(t *testing.T) { { CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 124, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", @@ -1218,10 +1218,10 @@ func TestCDRcombimedCdrFieldVal(t *testing.T) { { CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 125, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", @@ -1238,7 +1238,7 @@ func TestCDRcombimedCdrFieldVal(t *testing.T) { tpFld := &config.FCTemplate{ Tag: "TestCombiMed", - Type: utils.META_COMBIMED, + Type: utils.MetaCombimed, Filters: []string{"*string:~*req.RunID:testRun1"}, Value: config.NewRSRParsersMustCompile("~*req.Cost", utils.InfieldSep), } diff --git a/engine/cdrs.go b/engine/cdrs.go index 43eb56801..b7b37e93f 100644 --- a/engine/cdrs.go +++ b/engine/cdrs.go @@ -930,7 +930,7 @@ func (cdrS *CDRServer) V2ProcessEvent(arg *ArgV1ProcessEvent, evs *[]*utils.Even // V1StoreSessionCost handles storing of the cost into session_costs table func (cdrS *CDRServer) V1StoreSessionCost(attr *AttrCDRSStoreSMCost, reply *string) (err error) { if attr.Cost.CGRID == "" { - return utils.NewCGRError(utils.CDRSCtx, + return utils.NewCGRError(utils.CDRsCtx, utils.MandatoryIEMissingCaps, fmt.Sprintf("%s: CGRID", utils.MandatoryInfoMissing), "SMCost: %+v with empty CGRID") } @@ -963,7 +963,7 @@ func (cdrS *CDRServer) V1StoreSessionCost(attr *AttrCDRSStoreSMCost, reply *stri // V2StoreSessionCost will store the SessionCost into session_costs table func (cdrS *CDRServer) V2StoreSessionCost(args *ArgsV2CDRSStoreSMCost, reply *string) (err error) { if args.Cost.CGRID == "" { - return utils.NewCGRError(utils.CDRSCtx, + return utils.NewCGRError(utils.CDRsCtx, utils.MandatoryIEMissingCaps, fmt.Sprintf("%s: CGRID", utils.MandatoryInfoMissing), "SMCost: %+v with empty CGRID") } diff --git a/engine/datamanager.go b/engine/datamanager.go index 8cea625bf..662689c6e 100644 --- a/engine/datamanager.go +++ b/engine/datamanager.go @@ -44,14 +44,14 @@ var ( } cachePrefixMap = utils.StringSet{ utils.DestinationPrefix: {}, - utils.REVERSE_DESTINATION_PREFIX: {}, - utils.RATING_PLAN_PREFIX: {}, - utils.RATING_PROFILE_PREFIX: {}, - utils.ACTION_PREFIX: {}, - utils.ACTION_PLAN_PREFIX: {}, + utils.ReverseDestinationPrefix: {}, + utils.RatingPlanPrefix: {}, + utils.RatingProfilePrefix: {}, + utils.ActionPrefix: {}, + utils.ActionPlanPrefix: {}, utils.AccountActionPlansPrefix: {}, - utils.ACTION_TRIGGER_PREFIX: {}, - utils.SHARED_GROUP_PREFIX: {}, + utils.ActionTriggerPrefix: {}, + utils.SharedGroupPrefix: {}, utils.ResourceProfilesPrefix: {}, utils.TimingsPrefix: {}, utils.ResourcesPrefix: {}, @@ -170,21 +170,21 @@ func (dm *DataManager) CacheDataFromDB(prfx string, ids []string, mustBeCached b switch prfx { case utils.DestinationPrefix: _, err = dm.GetDestination(dataID, false, true, utils.NonTransactional) - case utils.REVERSE_DESTINATION_PREFIX: + case utils.ReverseDestinationPrefix: _, err = dm.GetReverseDestination(dataID, false, true, utils.NonTransactional) - case utils.RATING_PLAN_PREFIX: + case utils.RatingPlanPrefix: _, err = dm.GetRatingPlan(dataID, true, utils.NonTransactional) - case utils.RATING_PROFILE_PREFIX: + case utils.RatingProfilePrefix: _, err = dm.GetRatingProfile(dataID, true, utils.NonTransactional) - case utils.ACTION_PREFIX: + case utils.ActionPrefix: _, err = dm.GetActions(dataID, true, utils.NonTransactional) - case utils.ACTION_PLAN_PREFIX: + case utils.ActionPlanPrefix: _, err = dm.GetActionPlan(dataID, true, utils.NonTransactional) case utils.AccountActionPlansPrefix: _, err = dm.GetAccountActionPlans(dataID, true, utils.NonTransactional) - case utils.ACTION_TRIGGER_PREFIX: + case utils.ActionTriggerPrefix: _, err = dm.GetActionTriggers(dataID, true, utils.NonTransactional) - case utils.SHARED_GROUP_PREFIX: + case utils.SharedGroupPrefix: _, err = dm.GetSharedGroup(dataID, true, utils.NonTransactional) case utils.ResourceProfilesPrefix: tntID := utils.NewTenantID(dataID) @@ -326,7 +326,7 @@ func (dm *DataManager) CacheDataFromDB(prfx string, ids []string, mustBeCached b func (dm *DataManager) RebuildReverseForPrefix(prefix string) (err error) { switch prefix { - case utils.REVERSE_DESTINATION_PREFIX: + case utils.ReverseDestinationPrefix: if err = dm.dataDB.RemoveKeysForPrefix(prefix); err != nil { return } @@ -348,12 +348,12 @@ func (dm *DataManager) RebuildReverseForPrefix(prefix string) (err error) { return } var keys []string - if keys, err = dm.dataDB.GetKeysForPrefix(utils.ACTION_PLAN_PREFIX); err != nil { + if keys, err = dm.dataDB.GetKeysForPrefix(utils.ActionPlanPrefix); err != nil { return } for _, key := range keys { var apl *ActionPlan - if apl, err = dm.GetActionPlan(key[len(utils.ACTION_PLAN_PREFIX):], true, utils.NonTransactional); err != nil { + if apl, err = dm.GetActionPlan(key[len(utils.ActionPlanPrefix):], true, utils.NonTransactional); err != nil { return err } for acntID := range apl.AccountIDs { @@ -1811,7 +1811,7 @@ func (dm *DataManager) SetActionTriggers(key string, attr ActionTriggers, if err = dm.DataDB().SetActionTriggersDrv(key, attr); err != nil { return } - if err = dm.CacheDataFromDB(utils.ACTION_TRIGGER_PREFIX, []string{key}, true); err != nil { + if err = dm.CacheDataFromDB(utils.ActionTriggerPrefix, []string{key}, true); err != nil { return } if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaActionTriggers]; itm.Replicate { @@ -1888,7 +1888,7 @@ func (dm *DataManager) SetSharedGroup(sg *SharedGroup, if err = dm.DataDB().SetSharedGroupDrv(sg); err != nil { return } - if err = dm.CacheDataFromDB(utils.SHARED_GROUP_PREFIX, + if err = dm.CacheDataFromDB(utils.SharedGroupPrefix, []string{sg.Id}, true); err != nil { return } @@ -2302,7 +2302,7 @@ func (dm *DataManager) SetRatingPlan(rp *RatingPlan, transactionID string) (err if err = dm.DataDB().SetRatingPlanDrv(rp); err != nil { return } - if err = dm.CacheDataFromDB(utils.RATING_PLAN_PREFIX, []string{rp.Id}, true); err != nil { + if err = dm.CacheDataFromDB(utils.RatingPlanPrefix, []string{rp.Id}, true); err != nil { return } if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaRatingPlans]; itm.Replicate { diff --git a/engine/eventcost.go b/engine/eventcost.go index 15b1613fe..223328c36 100644 --- a/engine/eventcost.go +++ b/engine/eventcost.go @@ -336,7 +336,7 @@ func (ec *EventCost) AsRefundIncrements(tor string) (cd *CallDescriptor) { AccountID: ec.Accounting[cIcrm.AccountingID].AccountID, } blncSmry := ec.AccountSummary.BalanceSummaries.BalanceSummaryWithUUD(ec.Accounting[cIcrm.AccountingID].BalanceUUID) - if blncSmry.Type == utils.MONETARY { + if blncSmry.Type == utils.MetaMonetary { cd.Increments[iIdx].BalanceInfo.Monetary = &MonetaryInfo{UUID: blncSmry.UUID} } else if utils.NonMonetaryBalances.Has(blncSmry.Type) { cd.Increments[iIdx].BalanceInfo.Unit = &UnitInfo{UUID: blncSmry.UUID} @@ -349,7 +349,7 @@ func (ec *EventCost) AsRefundIncrements(tor string) (cd *CallDescriptor) { // extra charges, ie: non-free *voice extraSmry := ec.AccountSummary.BalanceSummaries.BalanceSummaryWithUUD( ec.Accounting[ec.Accounting[cIcrm.AccountingID].ExtraChargeID].BalanceUUID) - if extraSmry.Type == utils.MONETARY { + if extraSmry.Type == utils.MetaMonetary { cd.Increments[iIdx].BalanceInfo.Monetary = &MonetaryInfo{UUID: extraSmry.UUID} } else if utils.NonMonetaryBalances.Has(blncSmry.Type) { cd.Increments[iIdx].BalanceInfo.Unit = &UnitInfo{UUID: extraSmry.UUID} @@ -365,7 +365,7 @@ func (ec *EventCost) AsRefundIncrements(tor string) (cd *CallDescriptor) { // AsCallCost converts an EventCost into a CallCost func (ec *EventCost) AsCallCost(tor string) *CallCost { cc := &CallCost{ - ToR: utils.FirstNonEmpty(tor, utils.VOICE), + ToR: utils.FirstNonEmpty(tor, utils.MetaVoice), Cost: ec.GetCost(), RatedUsage: float64(ec.GetUsage().Nanoseconds()), AccountSummary: ec.AccountSummary, @@ -437,7 +437,7 @@ func (ec *EventCost) newIntervalFromCharge(cInc *ChargingIncrement) (incr *Incre } } } - if utils.SliceHasMember([]string{utils.DATA, utils.VOICE}, balanceType) && cBC.ExtraChargeID == "" { + if utils.SliceHasMember([]string{utils.MetaData, utils.MetaVoice}, balanceType) && cBC.ExtraChargeID == "" { cBC.ExtraChargeID = utils.MetaNone // mark the balance to be exported as Unit type } if cBC.ExtraChargeID != "" { // have both monetary and data diff --git a/engine/eventcost_test.go b/engine/eventcost_test.go index 95aadbd3a..63f39e62c 100644 --- a/engine/eventcost_test.go +++ b/engine/eventcost_test.go @@ -106,17 +106,17 @@ var testEC = &EventCost{ BalanceSummaries: []*BalanceSummary{ { UUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010", - Type: utils.MONETARY, + Type: utils.MetaMonetary, Value: 50, }, { UUID: "7a54a9e9-d610-4c82-bcb5-a315b9a65010", - Type: utils.MONETARY, + Type: utils.MetaMonetary, Value: 25, }, { UUID: "4b8b53d7-c1a1-4159-b845-4623a00a0165", - Type: utils.VOICE, + Type: utils.MetaVoice, Value: 200, }, }, @@ -322,7 +322,7 @@ func TestNewEventCostFromCallCost(t *testing.T) { Subject: "dan", Account: "dan", Destination: "+4986517174963", - ToR: utils.VOICE, + ToR: utils.MetaVoice, Cost: 0.75, RatedUsage: 120.0, Timespans: TimeSpans{ @@ -384,7 +384,7 @@ func TestNewEventCostFromCallCost(t *testing.T) { ID: "free_mins", Value: 0, Consumed: 1.0, - ToR: utils.VOICE, + ToR: utils.MetaVoice, }, AccountID: "cgrates.org:dan", }, @@ -399,7 +399,7 @@ func TestNewEventCostFromCallCost(t *testing.T) { ID: "discounted_mins", Value: 0, Consumed: 1.0, - ToR: utils.VOICE, + ToR: utils.MetaVoice, RateInterval: &RateInterval{ Timing: &RITiming{ StartTime: "00:00:00", @@ -731,7 +731,7 @@ func TestECAsRefundIncrements(t *testing.T) { eCD := &CallDescriptor{ CgrID: "164b0422fdc6a5117031b427439482c6a4f90e41", RunID: utils.MetaDefault, - ToR: utils.VOICE, + ToR: utils.MetaVoice, TimeStart: time.Date(2017, 1, 9, 16, 18, 21, 0, time.UTC), TimeEnd: time.Date(2017, 1, 9, 16, 28, 21, 0, time.UTC), DurationIndex: 10 * time.Minute, @@ -958,7 +958,7 @@ func TestECAsRefundIncrements(t *testing.T) { }, } - if cd := testEC.Clone().AsRefundIncrements(utils.VOICE); !reflect.DeepEqual(eCD, cd) { + if cd := testEC.Clone().AsRefundIncrements(utils.MetaVoice); !reflect.DeepEqual(eCD, cd) { t.Errorf("expecting: %s\n\n, received: %s", utils.ToIJSON(eCD), utils.ToIJSON(cd)) } } @@ -1114,7 +1114,7 @@ func TestECAsCallCost(t *testing.T) { }, } eCC := &CallCost{ - ToR: utils.VOICE, + ToR: utils.MetaVoice, Cost: 0.85, RatedUsage: 120000000000, AccountSummary: acntSummary, @@ -1539,7 +1539,7 @@ func TestECMergeGT(t *testing.T) { { UUID: "9a767726-fe69-4940-b7bd-f43de9f0f8a5", ID: "addon_data", - Type: utils.DATA, + Type: utils.MetaData, Value: 10726871040}, }, }, @@ -1597,7 +1597,7 @@ func TestECMergeGT(t *testing.T) { { UUID: "9a767726-fe69-4940-b7bd-f43de9f0f8a5", ID: "addon_data", - Type: utils.DATA, + Type: utils.MetaData, Value: 10718269440}, }, }, @@ -1656,7 +1656,7 @@ func TestECMergeGT(t *testing.T) { { UUID: "9a767726-fe69-4940-b7bd-f43de9f0f8a5", ID: "addon_data", - Type: utils.DATA, + Type: utils.MetaData, Value: 10718269440}, }, }, @@ -2455,12 +2455,12 @@ func TestECSyncKeys(t *testing.T) { BalanceSummaries: []*BalanceSummary{ { UUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010", - Type: utils.MONETARY, + Type: utils.MetaMonetary, Value: 50, Disabled: false}, { UUID: "7a54a9e9-d610-4c82-bcb5-a315b9a65010", - Type: utils.MONETARY, + Type: utils.MetaMonetary, Value: 25, Disabled: false}, { diff --git a/engine/fscdr.go b/engine/fscdr.go index 90fc22585..e74f7c089 100644 --- a/engine/fscdr.go +++ b/engine/fscdr.go @@ -134,7 +134,7 @@ func (fsCdr FSCdr) AsCDR(timezone string) (storCdr *CDR, err error) { OriginHost: utils.FirstNonEmpty(fsCdr.vars[utils.CGROriginHost], fsCdr.vars[FsIPv4]), Source: FS_CDR_SOURCE, OriginID: fsCdr.vars[FS_UUID], - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: utils.FirstNonEmpty(fsCdr.vars[utils.CGR_REQTYPE], fsCdr.cgrCfg.GeneralCfg().DefaultReqType), Tenant: utils.FirstNonEmpty(fsCdr.vars[utils.CGR_TENANT], fsCdr.cgrCfg.GeneralCfg().DefaultTenant), Category: utils.FirstNonEmpty(fsCdr.vars[utils.CGR_CATEGORY], fsCdr.cgrCfg.GeneralCfg().DefaultCategory), diff --git a/engine/fscdr_test.go b/engine/fscdr_test.go index 58f26e719..fc763aeb3 100644 --- a/engine/fscdr_test.go +++ b/engine/fscdr_test.go @@ -407,7 +407,7 @@ func TestFsCdrFirstNonEmpty(t *testing.T) { } func TestFsCdrCDRFields(t *testing.T) { - fsCdrCfg.CdrsCfg().ExtraFields = config.NewRSRParsersMustCompile("~*req.sip_user_agent", utils.FIELDS_SEP) + fsCdrCfg.CdrsCfg().ExtraFields = config.NewRSRParsersMustCompile("~*req.sip_user_agent", utils.FieldsSep) reader := bytes.NewReader(body) fsCdr, err := NewFSCdr(reader, fsCdrCfg) if err != nil { @@ -417,7 +417,7 @@ func TestFsCdrCDRFields(t *testing.T) { answerTime, _ := utils.ParseTimeDetectLayout("1515666347", "") expctCDR := &CDR{ CGRID: "24b5766be325fa751fab5a0a06373e106f33a257", - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "3da8bf84-c133-4959-9e24-e72875cb33a1", OriginHost: "", Source: "freeswitch_json", @@ -575,7 +575,7 @@ func TestFscdrAsCDR(t *testing.T) { }`) expectedCdr := &CDR{ OrderID: 123, - ToR: utils.META_VOICE, + ToR: utils.MetaVoice, Source: FS_CDR_SOURCE, Category: cgrCfg.GeneralCfg().DefaultCategory, Tenant: cgrCfg.GeneralCfg().DefaultTenant, RequestType: cgrCfg.GeneralCfg().DefaultReqType, @@ -710,7 +710,7 @@ func TestFscdrAsCdrFirstDefined(t *testing.T) { } }`) expectedCdr := &CDR{ - ToR: utils.META_VOICE, + ToR: utils.MetaVoice, Source: FS_CDR_SOURCE, Category: cgrCfg.GeneralCfg().DefaultCategory, Tenant: cgrCfg.GeneralCfg().DefaultTenant, RequestType: cgrCfg.GeneralCfg().DefaultReqType, diff --git a/engine/libattributes_test.go b/engine/libattributes_test.go index 8e7add285..052aa522a 100644 --- a/engine/libattributes_test.go +++ b/engine/libattributes_test.go @@ -150,12 +150,12 @@ func TestNewAttributeFromInlineWithMultipleRuns(t *testing.T) { Contexts: []string{utils.MetaAny}, Attributes: []*Attribute{{ Path: utils.MetaReq + utils.NestingSep + "RequestType", - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("*rated", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "Category", - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("call", utils.InfieldSep), }, }, diff --git a/engine/libroutes.go b/engine/libroutes.go index 675cde400..8284db646 100644 --- a/engine/libroutes.go +++ b/engine/libroutes.go @@ -179,7 +179,7 @@ func (sSpls *SortedRoutes) SortLoadDistribution() { // Digest returns list of routeIDs + parameters for easier outside access // format route1:route1params,route2:route2params func (sSpls *SortedRoutes) Digest() string { - return strings.Join(sSpls.RoutesWithParams(), utils.FIELDS_SEP) + return strings.Join(sSpls.RoutesWithParams(), utils.FieldsSep) } func (ss *SortedRoute) AsNavigableMap() (nm utils.NavigableMap2) { diff --git a/engine/libtest.go b/engine/libtest.go index d30615fb1..95d41be61 100644 --- a/engine/libtest.go +++ b/engine/libtest.go @@ -595,14 +595,14 @@ func GetDefaultEmptyCacheStats() map[string]*ltcache.CacheStats { func GetDefaultEmptyArgCachePrefix() map[string][]string { return map[string][]string{ utils.DestinationPrefix: nil, - utils.REVERSE_DESTINATION_PREFIX: nil, - utils.RATING_PLAN_PREFIX: nil, - utils.RATING_PROFILE_PREFIX: nil, - utils.ACTION_PREFIX: nil, - utils.ACTION_PLAN_PREFIX: nil, + utils.ReverseDestinationPrefix: nil, + utils.RatingPlanPrefix: nil, + utils.RatingProfilePrefix: nil, + utils.ActionPrefix: nil, + utils.ActionPlanPrefix: nil, utils.AccountActionPlansPrefix: nil, - utils.ACTION_TRIGGER_PREFIX: nil, - utils.SHARED_GROUP_PREFIX: nil, + utils.ActionTriggerPrefix: nil, + utils.SharedGroupPrefix: nil, utils.ResourceProfilesPrefix: nil, utils.ResourcesPrefix: nil, utils.StatQueuePrefix: nil, diff --git a/engine/loader_csv_test.go b/engine/loader_csv_test.go index 1b946a566..8da1c9856 100644 --- a/engine/loader_csv_test.go +++ b/engine/loader_csv_test.go @@ -645,7 +645,7 @@ func TestLoadActions(t *testing.T) { ExtraParameters: "", Weight: 10, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Uuid: as1[0].Balance.Uuid, Value: &utils.ValueFormula{Static: 10}, Weight: utils.Float64Pointer(10), @@ -664,7 +664,7 @@ func TestLoadActions(t *testing.T) { ExtraParameters: "", Weight: 10, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Uuid: as1[1].Balance.Uuid, Value: &utils.ValueFormula{Static: 100 * float64(time.Second)}, Weight: utils.Float64Pointer(10), @@ -690,7 +690,7 @@ func TestLoadActions(t *testing.T) { ExpirationString: utils.UNLIMITED, Weight: 10, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), DestinationIDs: nil, Uuid: as2[0].Balance.Uuid, Value: &utils.ValueFormula{Static: 100}, @@ -738,7 +738,7 @@ func TestLoadActions(t *testing.T) { ExpirationString: utils.UNLIMITED, Balance: &BalanceFilter{ Uuid: asGnrc[0].Balance.Uuid, - Type: utils.StringPointer(utils.GENERIC), + Type: utils.StringPointer(utils.MetaGeneric), Value: &utils.ValueFormula{Static: 1000}, Weight: utils.Float64Pointer(20), Disabled: utils.BoolPointer(false), @@ -852,11 +852,11 @@ func TestLoadActionTriggers(t *testing.T) { expected := &ActionTrigger{ ID: "STANDARD_TRIGGER", UniqueID: "st0", - ThresholdType: utils.TRIGGER_MIN_EVENT_COUNTER, + ThresholdType: utils.TriggerMinEventCounter, ThresholdValue: 10, Balance: &BalanceFilter{ ID: nil, - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("GERMANY_O2")), Categories: nil, TimingIDs: nil, @@ -875,10 +875,10 @@ func TestLoadActionTriggers(t *testing.T) { expected = &ActionTrigger{ ID: "STANDARD_TRIGGER", UniqueID: "st1", - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, ThresholdValue: 200, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("GERMANY")), Categories: nil, TimingIDs: nil, @@ -901,7 +901,7 @@ func TestLoadAccountActions(t *testing.T) { expected := &Account{ ID: "vdf:minitsboy", UnitCounters: UnitCounters{ - utils.VOICE: []*UnitCounter{ + utils.MetaVoice: []*UnitCounter{ { CounterType: "*event", Counters: CounterFilters{ @@ -909,7 +909,7 @@ func TestLoadAccountActions(t *testing.T) { Value: 0, Filter: &BalanceFilter{ ID: utils.StringPointer("st0"), - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("GERMANY_O2")), SharedGroups: nil, Categories: nil, @@ -926,11 +926,11 @@ func TestLoadAccountActions(t *testing.T) { for i, atr := range aa.ActionTriggers { csvr.actionsTriggers["STANDARD_TRIGGER"][i].ID = atr.ID } - for i, b := range aa.UnitCounters[utils.VOICE][0].Counters { - expected.UnitCounters[utils.VOICE][0].Counters[i].Filter.ID = b.Filter.ID + for i, b := range aa.UnitCounters[utils.MetaVoice][0].Counters { + expected.UnitCounters[utils.MetaVoice][0].Counters[i].Filter.ID = b.Filter.ID } - if !reflect.DeepEqual(aa.UnitCounters[utils.VOICE][0].Counters[0], expected.UnitCounters[utils.VOICE][0].Counters[0]) { - t.Errorf("Error loading account action: %+v", utils.ToIJSON(aa.UnitCounters[utils.VOICE][0].Counters[0].Filter)) + if !reflect.DeepEqual(aa.UnitCounters[utils.MetaVoice][0].Counters[0], expected.UnitCounters[utils.MetaVoice][0].Counters[0]) { + t.Errorf("Error loading account action: %+v", utils.ToIJSON(aa.UnitCounters[utils.MetaVoice][0].Counters[0].Filter)) } // test that it does not overwrite balances existing, err := dm.GetAccount(aa.ID) @@ -1264,8 +1264,8 @@ func TestLoadRouteProfiles(t *testing.T) { Weight: 20, } sort.Slice(eSppProfile.Routes, func(i, j int) bool { - return strings.Compare(eSppProfile.Routes[i].ID+strings.Join(eSppProfile.Routes[i].FilterIDs, utils.CONCATENATED_KEY_SEP), - eSppProfile.Routes[j].ID+strings.Join(eSppProfile.Routes[j].FilterIDs, utils.CONCATENATED_KEY_SEP)) < 0 + return strings.Compare(eSppProfile.Routes[i].ID+strings.Join(eSppProfile.Routes[i].FilterIDs, utils.ConcatenatedKeySep), + eSppProfile.Routes[j].ID+strings.Join(eSppProfile.Routes[j].FilterIDs, utils.ConcatenatedKeySep)) < 0 }) resKey := utils.TenantID{Tenant: "cgrates.org", ID: "RoutePrf1"} if len(csvr.routeProfiles) != 1 { @@ -1276,8 +1276,8 @@ func TestLoadRouteProfiles(t *testing.T) { t.Fatal("Missing route") } sort.Slice(rcvRoute.Routes, func(i, j int) bool { - return strings.Compare(rcvRoute.Routes[i].ID+strings.Join(rcvRoute.Routes[i].FilterIDs, utils.CONCATENATED_KEY_SEP), - rcvRoute.Routes[j].ID+strings.Join(rcvRoute.Routes[j].FilterIDs, utils.CONCATENATED_KEY_SEP)) < 0 + return strings.Compare(rcvRoute.Routes[i].ID+strings.Join(rcvRoute.Routes[i].FilterIDs, utils.ConcatenatedKeySep), + rcvRoute.Routes[j].ID+strings.Join(rcvRoute.Routes[j].FilterIDs, utils.ConcatenatedKeySep)) < 0 }) if !reflect.DeepEqual(eSppProfile, rcvRoute) { t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eSppProfile), utils.ToJSON(rcvRoute)) @@ -1637,7 +1637,7 @@ func TestLoadAccountProfiles(t *testing.T) { ID: "MonetaryBalance", FilterIDs: []string{}, Weight: 10, - Type: utils.MONETARY, + Type: utils.MetaMonetary, CostIncrement: []*utils.TPBalanceCostIncrement{ &utils.TPBalanceCostIncrement{ FilterIDs: []string{"fltr1", "fltr2"}, @@ -1663,7 +1663,7 @@ func TestLoadAccountProfiles(t *testing.T) { ID: "VoiceBalance", FilterIDs: []string{}, Weight: 10, - Type: utils.VOICE, + Type: utils.MetaVoice, CostIncrement: []*utils.TPBalanceCostIncrement{}, CostAttributes: []string{}, UnitFactors: []*utils.TPBalanceUnitFactor{}, diff --git a/engine/mapevent_test.go b/engine/mapevent_test.go index fcc1e53d0..3f931ac81 100644 --- a/engine/mapevent_test.go +++ b/engine/mapevent_test.go @@ -323,7 +323,7 @@ func TestMapEventAsCDR(t *testing.T) { CGRID: "da39a3ee5e6b4b0d3255bfef95601890afd80709", Cost: -1.0, RunID: utils.MetaDefault, - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: cfg.GeneralCfg().DefaultReqType, Tenant: cfg.GeneralCfg().DefaultTenant, Category: cfg.GeneralCfg().DefaultCategory, @@ -396,7 +396,7 @@ func TestMapEventAsCDR(t *testing.T) { "ExtraField2": "extra", }, RunID: utils.MetaDefault, - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: cfg.GeneralCfg().DefaultReqType, Tenant: cfg.GeneralCfg().DefaultTenant, Category: cfg.GeneralCfg().DefaultCategory, @@ -412,10 +412,10 @@ func TestMapEventAsCDR(t *testing.T) { utils.RunID: utils.MetaDefault, utils.OriginHost: utils.FreeSWITCHAgent, utils.OriginID: "127.0.0.1", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.RequestType: utils.MetaPrepaid, utils.Tenant: "cgrates.org", - utils.Category: utils.CALL, + utils.Category: utils.Call, utils.AccountField: "10010", utils.Subject: "10010", utils.Destination: "10012", @@ -430,10 +430,10 @@ func TestMapEventAsCDR(t *testing.T) { RunID: utils.MetaDefault, OriginHost: utils.FreeSWITCHAgent, OriginID: "127.0.0.1", - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", - Category: utils.CALL, + Category: utils.Call, Account: "10010", Subject: "10010", Destination: "10012", @@ -653,7 +653,7 @@ func TestMapEventAsCDR(t *testing.T) { "ExtraField2": "extra", }, RunID: utils.MetaDefault, - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: cfg.GeneralCfg().DefaultReqType, Category: cfg.GeneralCfg().DefaultCategory, CostDetails: ec1, diff --git a/engine/model_helpers.go b/engine/model_helpers.go index 471460819..2b13267bf 100644 --- a/engine/model_helpers.go +++ b/engine/model_helpers.go @@ -2825,7 +2825,7 @@ func APItoDispatcherProfile(tpDPP *utils.TPDispatcherProfile, timezone string) ( if param == utils.EmptyString { continue } - if p := strings.SplitN(utils.IfaceAsString(param), utils.CONCATENATED_KEY_SEP, 2); len(p) == 1 { + if p := strings.SplitN(utils.IfaceAsString(param), utils.ConcatenatedKeySep, 2); len(p) == 1 { dpp.Hosts[i].Params[strconv.Itoa(j)] = p[0] } else { dpp.Hosts[i].Params[p[0]] = p[1] diff --git a/engine/model_helpers_test.go b/engine/model_helpers_test.go index bee210f9f..e7a58fa0f 100644 --- a/engine/model_helpers_test.go +++ b/engine/model_helpers_test.go @@ -6996,7 +6996,7 @@ func TestAccountProfileMdlsAsTPAccountProfile(t *testing.T) { BalanceFilterIDs: "FLTR_RES_GR2", BalanceWeight: 10, BalanceBlocker: false, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, BalanceUnits: 3600000000000, ThresholdIDs: "WARN_RES1", }, @@ -7017,7 +7017,7 @@ func TestAccountProfileMdlsAsTPAccountProfile(t *testing.T) { ID: "VoiceBalance", FilterIDs: []string{"FLTR_RES_GR2"}, Weight: 10, - Type: utils.VOICE, + Type: utils.MetaVoice, CostIncrement: []*utils.TPBalanceCostIncrement{}, CostAttributes: []string{}, UnitFactors: []*utils.TPBalanceUnitFactor{}, @@ -7048,7 +7048,7 @@ func TestAccountProfileMdlsAsTPAccountProfileCase2(t *testing.T) { BalanceFilterIDs: "FLTR_RES_GR2", BalanceWeight: 10, BalanceBlocker: false, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, BalanceUnits: 3600000000000, ThresholdIDs: "WARN_RES1", }, @@ -7068,7 +7068,7 @@ func TestAccountProfileMdlsAsTPAccountProfileCase2(t *testing.T) { ID: "VoiceBalance", FilterIDs: []string{"FLTR_RES_GR2"}, Weight: 10, - Type: utils.VOICE, + Type: utils.MetaVoice, CostIncrement: []*utils.TPBalanceCostIncrement{}, CostAttributes: []string{}, UnitFactors: []*utils.TPBalanceUnitFactor{}, @@ -7102,7 +7102,7 @@ func TestAPItoModelTPAccountProfile(t *testing.T) { ID: "VoiceBalance", FilterIDs: []string{"FLTR_RES_GR2"}, Weight: 10, - Type: utils.VOICE, + Type: utils.MetaVoice, Units: 3600000000000, }, }, @@ -7119,7 +7119,7 @@ func TestAPItoModelTPAccountProfile(t *testing.T) { BalanceFilterIDs: "FLTR_RES_GR2", BalanceWeight: 10, BalanceBlocker: false, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, BalanceUnits: 3600000000000, ThresholdIDs: "WARN_RES1", }} @@ -7166,7 +7166,7 @@ func TestAPItoModelTPAccountProfileCase2(t *testing.T) { ID: "VoiceBalance", FilterIDs: []string{"FLTR_RES_GR1", "FLTR_RES_GR2"}, Weight: 10, - Type: utils.VOICE, + Type: utils.MetaVoice, Units: 3600000000000, }, }, @@ -7183,7 +7183,7 @@ func TestAPItoModelTPAccountProfileCase2(t *testing.T) { BalanceFilterIDs: "FLTR_RES_GR1;FLTR_RES_GR2", BalanceWeight: 10, BalanceBlocker: false, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, BalanceUnits: 3600000000000, ThresholdIDs: "WARN_RES1;WARN_RES2", }} @@ -7211,7 +7211,7 @@ func TestApitoAccountProfileCase2(t *testing.T) { ID: "VoiceBalance", FilterIDs: []string{"FLTR_RES_GR2"}, Weight: 10, - Type: utils.VOICE, + Type: utils.MetaVoice, Units: 3600000000000, Opts: "key1:val1", }, @@ -7232,7 +7232,7 @@ func TestApitoAccountProfileCase2(t *testing.T) { ID: "VoiceBalance", FilterIDs: []string{"FLTR_RES_GR2"}, Weight: 10, - Type: utils.VOICE, + Type: utils.MetaVoice, Units: &utils.Decimal{decimal.New(3600000000000, 0)}, Opts: map[string]interface{}{ "key1": "val1", @@ -7263,8 +7263,8 @@ func TestApitoAccountProfileCaseTimeError(t *testing.T) { "VoiceBalance": { ID: "VoiceBalance", FilterIDs: []string{"FLTR_RES_GR2"}, - Weight: 10, - Type: utils.VOICE, + Weight: 10, + Type: utils.MetaVoice, Units: 3600000000000, }, }, @@ -7291,7 +7291,7 @@ func TestApitoAccountProfileCaseTimeError2(t *testing.T) { ID: "VoiceBalance", FilterIDs: []string{"FLTR_RES_GR2"}, Weight: 10, - Type: utils.VOICE, + Type: utils.MetaVoice, Units: 3600000000000, Opts: "22:22:4fs", }, @@ -7391,7 +7391,7 @@ func TestModelHelpersAccountProfileToAPI(t *testing.T) { ID: "VoiceBalance", FilterIDs: []string{"FLTR_RES_GR2"}, Weight: 10, - Type: utils.VOICE, + Type: utils.MetaVoice, Units: &utils.Decimal{decimal.New(3600000000000, 0)}, Opts: map[string]interface{}{ "key1": "val1", @@ -7413,7 +7413,7 @@ func TestModelHelpersAccountProfileToAPI(t *testing.T) { ID: "VoiceBalance", FilterIDs: []string{"FLTR_RES_GR2"}, Weight: 10, - Type: utils.VOICE, + Type: utils.MetaVoice, Units: 3600000000000, Opts: "22:22:4fs", }, diff --git a/engine/models.go b/engine/models.go index 1dfb19c49..ed9bfd206 100644 --- a/engine/models.go +++ b/engine/models.go @@ -211,7 +211,7 @@ func (AccountActionMdl) TableName() string { } func (aa *AccountActionMdl) SetAccountActionId(id string) error { - ids := strings.Split(id, utils.CONCATENATED_KEY_SEP) + ids := strings.Split(id, utils.ConcatenatedKeySep) if len(ids) != 3 { return fmt.Errorf("Wrong TP Account Action Id: %s", id) } diff --git a/engine/ratingprofile.go b/engine/ratingprofile.go index 70050d266..5a9ce8027 100644 --- a/engine/ratingprofile.go +++ b/engine/ratingprofile.go @@ -266,7 +266,7 @@ func RatingProfileSubjectPrefixMatching(key string) (rp *RatingProfile, err erro if rp, err = dm.GetRatingProfile(key, false, utils.NonTransactional); err == nil && rp != nil { // rp nil represents cached no-result return } - lastIndex := strings.LastIndex(key, utils.CONCATENATED_KEY_SEP) + lastIndex := strings.LastIndex(key, utils.ConcatenatedKeySep) baseKey := key[:lastIndex] subject := key[lastIndex:] lenSubject := len(subject) diff --git a/engine/responder.go b/engine/responder.go index 8cb8f690d..3738c1a54 100644 --- a/engine/responder.go +++ b/engine/responder.go @@ -99,7 +99,7 @@ func (rs *Responder) GetCost(arg *CallDescriptorWithOpts, reply *CallCost) (err } r, e := guardian.Guardian.Guard(func() (interface{}, error) { return arg.GetCost() - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACCOUNT_PREFIX+arg.GetAccountKey()) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.AccountPrefix+arg.GetAccountKey()) if r != nil { *reply = *r.(*CallCost) } @@ -118,7 +118,7 @@ func (rs *Responder) GetCostOnRatingPlans(arg *utils.GetCostOnRatingPlansArgs, r } for _, rp := range arg.RatingPlanIDs { // loop through RatingPlans until we find one without errors rPrfl := &RatingProfile{ - Id: utils.ConcatenatedKey(utils.META_OUT, + Id: utils.ConcatenatedKey(utils.MetaOut, tnt, utils.MetaTmp, arg.Subject), RatingPlanActivations: RatingPlanActivations{ &RatingPlanActivation{ diff --git a/engine/responder_test.go b/engine/responder_test.go index b84d0d816..03c755998 100644 --- a/engine/responder_test.go +++ b/engine/responder_test.go @@ -127,28 +127,28 @@ func TestResponderGobSMCost(t *testing.T) { func TestResponderUsageAllow(t *testing.T) { rsp := &Responder{ MaxComputedUsage: map[string]time.Duration{ - utils.MetaAny: 10 * time.Second, - utils.VOICE: 20 * time.Second, + utils.MetaAny: 10 * time.Second, + utils.MetaVoice: 20 * time.Second, }, } - if allow := rsp.usageAllowed(utils.VOICE, 17*time.Second); !allow { + if allow := rsp.usageAllowed(utils.MetaVoice, 17*time.Second); !allow { t.Errorf("Expected true, received : %+v", allow) } - if allow := rsp.usageAllowed(utils.VOICE, 22*time.Second); allow { + if allow := rsp.usageAllowed(utils.MetaVoice, 22*time.Second); allow { t.Errorf("Expected false, received : %+v", allow) } - if allow := rsp.usageAllowed(utils.DATA, 7*time.Second); !allow { + if allow := rsp.usageAllowed(utils.MetaData, 7*time.Second); !allow { t.Errorf("Expected true, received : %+v", allow) } - if allow := rsp.usageAllowed(utils.DATA, 12*time.Second); allow { + if allow := rsp.usageAllowed(utils.MetaData, 12*time.Second); allow { t.Errorf("Expected false, received : %+v", allow) } } func TestResponderGetCostMaxUsageANY(t *testing.T) { rsponder.MaxComputedUsage = map[string]time.Duration{ - utils.MetaAny: 10 * time.Second, - utils.VOICE: 20 * time.Second, + utils.MetaAny: 10 * time.Second, + utils.MetaVoice: 20 * time.Second, } tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "") tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "") @@ -174,8 +174,8 @@ func TestResponderGetCostMaxUsageANY(t *testing.T) { func TestResponderGetCostMaxUsageVOICE(t *testing.T) { rsponder.MaxComputedUsage = map[string]time.Duration{ - utils.MetaAny: 10 * time.Second, - utils.VOICE: 20 * time.Second, + utils.MetaAny: 10 * time.Second, + utils.MetaVoice: 20 * time.Second, } tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "") tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "") @@ -184,7 +184,7 @@ func TestResponderGetCostMaxUsageVOICE(t *testing.T) { Category: "call", Tenant: "cgrates.org", Subject: "dan", - ToR: utils.VOICE, + ToR: utils.MetaVoice, Account: "dan", Destination: "+4917621621391", DurationIndex: 9, @@ -201,8 +201,8 @@ func TestResponderGetCostMaxUsageVOICE(t *testing.T) { func TestResponderDebitMaxUsageANY(t *testing.T) { rsponder.MaxComputedUsage = map[string]time.Duration{ - utils.MetaAny: 10 * time.Second, - utils.VOICE: 20 * time.Second, + utils.MetaAny: 10 * time.Second, + utils.MetaVoice: 20 * time.Second, } tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "") tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "") @@ -228,8 +228,8 @@ func TestResponderDebitMaxUsageANY(t *testing.T) { func TestResponderDebitMaxUsageVOICE(t *testing.T) { rsponder.MaxComputedUsage = map[string]time.Duration{ - utils.MetaAny: 10 * time.Second, - utils.VOICE: 20 * time.Second, + utils.MetaAny: 10 * time.Second, + utils.MetaVoice: 20 * time.Second, } tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "") tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "") @@ -238,7 +238,7 @@ func TestResponderDebitMaxUsageVOICE(t *testing.T) { Category: "call", Tenant: "cgrates.org", Subject: "dan", - ToR: utils.VOICE, + ToR: utils.MetaVoice, Account: "dan", Destination: "+4917621621391", DurationIndex: 9, @@ -255,8 +255,8 @@ func TestResponderDebitMaxUsageVOICE(t *testing.T) { func TestResponderMaxDebitMaxUsageANY(t *testing.T) { rsponder.MaxComputedUsage = map[string]time.Duration{ - utils.MetaAny: 10 * time.Second, - utils.VOICE: 20 * time.Second, + utils.MetaAny: 10 * time.Second, + utils.MetaVoice: 20 * time.Second, } tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "") tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "") @@ -282,8 +282,8 @@ func TestResponderMaxDebitMaxUsageANY(t *testing.T) { func TestResponderMaxDebitMaxUsageVOICE(t *testing.T) { rsponder.MaxComputedUsage = map[string]time.Duration{ - utils.MetaAny: 10 * time.Second, - utils.VOICE: 20 * time.Second, + utils.MetaAny: 10 * time.Second, + utils.MetaVoice: 20 * time.Second, } tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "") tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "") @@ -292,7 +292,7 @@ func TestResponderMaxDebitMaxUsageVOICE(t *testing.T) { Category: "call", Tenant: "cgrates.org", Subject: "dan", - ToR: utils.VOICE, + ToR: utils.MetaVoice, Account: "dan", Destination: "+4917621621391", DurationIndex: 9, @@ -309,8 +309,8 @@ func TestResponderMaxDebitMaxUsageVOICE(t *testing.T) { func TestResponderRefundIncrementsMaxUsageANY(t *testing.T) { rsponder.MaxComputedUsage = map[string]time.Duration{ - utils.MetaAny: 10 * time.Second, - utils.VOICE: 20 * time.Second, + utils.MetaAny: 10 * time.Second, + utils.MetaVoice: 20 * time.Second, } tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "") tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "") @@ -336,8 +336,8 @@ func TestResponderRefundIncrementsMaxUsageANY(t *testing.T) { func TestResponderRefundIncrementsMaxUsageVOICE(t *testing.T) { rsponder.MaxComputedUsage = map[string]time.Duration{ - utils.MetaAny: 10 * time.Second, - utils.VOICE: 20 * time.Second, + utils.MetaAny: 10 * time.Second, + utils.MetaVoice: 20 * time.Second, } tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "") tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "") @@ -346,7 +346,7 @@ func TestResponderRefundIncrementsMaxUsageVOICE(t *testing.T) { Category: "call", Tenant: "cgrates.org", Subject: "dan", - ToR: utils.VOICE, + ToR: utils.MetaVoice, Account: "dan", Destination: "+4917621621391", DurationIndex: 9, @@ -363,8 +363,8 @@ func TestResponderRefundIncrementsMaxUsageVOICE(t *testing.T) { func TestResponderRefundRoundingMaxUsageANY(t *testing.T) { rsponder.MaxComputedUsage = map[string]time.Duration{ - utils.MetaAny: 10 * time.Second, - utils.VOICE: 20 * time.Second, + utils.MetaAny: 10 * time.Second, + utils.MetaVoice: 20 * time.Second, } tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "") tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "") @@ -390,8 +390,8 @@ func TestResponderRefundRoundingMaxUsageANY(t *testing.T) { func TestResponderRefundRoundingMaxUsageVOICE(t *testing.T) { rsponder.MaxComputedUsage = map[string]time.Duration{ - utils.MetaAny: 10 * time.Second, - utils.VOICE: 20 * time.Second, + utils.MetaAny: 10 * time.Second, + utils.MetaVoice: 20 * time.Second, } tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "") tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "") @@ -400,7 +400,7 @@ func TestResponderRefundRoundingMaxUsageVOICE(t *testing.T) { Category: "call", Tenant: "cgrates.org", Subject: "dan", - ToR: utils.VOICE, + ToR: utils.MetaVoice, Account: "dan", Destination: "+4917621621391", DurationIndex: 9, @@ -417,8 +417,8 @@ func TestResponderRefundRoundingMaxUsageVOICE(t *testing.T) { func TestResponderGetMaxSessionTimeMaxUsageANY(t *testing.T) { rsponder.MaxComputedUsage = map[string]time.Duration{ - utils.MetaAny: 10 * time.Second, - utils.VOICE: 20 * time.Second, + utils.MetaAny: 10 * time.Second, + utils.MetaVoice: 20 * time.Second, } tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "") tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "") @@ -444,8 +444,8 @@ func TestResponderGetMaxSessionTimeMaxUsageANY(t *testing.T) { func TestResponderGetMaxSessionTimeMaxUsageVOICE(t *testing.T) { rsponder.MaxComputedUsage = map[string]time.Duration{ - utils.MetaAny: 10 * time.Second, - utils.VOICE: 20 * time.Second, + utils.MetaAny: 10 * time.Second, + utils.MetaVoice: 20 * time.Second, } tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "") tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "") @@ -454,7 +454,7 @@ func TestResponderGetMaxSessionTimeMaxUsageVOICE(t *testing.T) { Category: "call", Tenant: "cgrates.org", Subject: "dan", - ToR: utils.VOICE, + ToR: utils.MetaVoice, Account: "dan", Destination: "+4917621621391", DurationIndex: 9, diff --git a/engine/routes.go b/engine/routes.go index 24772978c..375f769aa 100644 --- a/engine/routes.go +++ b/engine/routes.go @@ -72,7 +72,7 @@ func (rp *RouteProfile) compileCacheParameters() error { ratioMap := make(map[string]int) // []string{"routeID:Ratio"} for _, splIDWithRatio := range rp.SortingParameters { - splitted := strings.Split(splIDWithRatio, utils.CONCATENATED_KEY_SEP) + splitted := strings.Split(splIDWithRatio, utils.ConcatenatedKeySep) ratioVal, err := strconv.Atoi(splitted[1]) if err != nil { return err diff --git a/engine/safevent_test.go b/engine/safevent_test.go index 3a32ef1e1..607dd4840 100644 --- a/engine/safevent_test.go +++ b/engine/safevent_test.go @@ -639,7 +639,7 @@ func TestSafEventAsCDR(t *testing.T) { CGRID: "da39a3ee5e6b4b0d3255bfef95601890afd80709", Cost: -1.0, RunID: utils.MetaDefault, - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: cfg.GeneralCfg().DefaultReqType, Tenant: cfg.GeneralCfg().DefaultTenant, Category: cfg.GeneralCfg().DefaultCategory, @@ -702,7 +702,7 @@ func TestSafEventAsCDR(t *testing.T) { "ExtraField2": "extra", }, RunID: utils.MetaDefault, - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: cfg.GeneralCfg().DefaultReqType, Tenant: cfg.GeneralCfg().DefaultTenant, Category: cfg.GeneralCfg().DefaultCategory, @@ -736,7 +736,7 @@ func TestSafEventAsCDR(t *testing.T) { "ExtraField2": "extra", }, RunID: utils.MetaDefault, - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: cfg.GeneralCfg().DefaultReqType, Category: cfg.GeneralCfg().DefaultCategory, } diff --git a/engine/statmetrics.go b/engine/statmetrics.go index 90d9abaaf..1a08c0b8d 100644 --- a/engine/statmetrics.go +++ b/engine/statmetrics.go @@ -118,7 +118,7 @@ func (asr *StatASR) GetValue(roundingDecimal int) (v interface{}) { func (asr *StatASR) GetStringValue(roundingDecimal int) (valStr string) { if val := asr.getValue(roundingDecimal); val == utils.StatsNA { - valStr = utils.NOT_AVAILABLE + valStr = utils.NotAvailable } else { valStr = fmt.Sprintf("%v%%", asr.getValue(roundingDecimal)) } @@ -257,7 +257,7 @@ func (acd *StatACD) getValue(roundingDecimal int) time.Duration { func (acd *StatACD) GetStringValue(roundingDecimal int) (valStr string) { if val := acd.getValue(roundingDecimal); val == -time.Nanosecond { - valStr = utils.NOT_AVAILABLE + valStr = utils.NotAvailable } else { valStr = fmt.Sprintf("%+v", acd.getValue(roundingDecimal)) } @@ -394,7 +394,7 @@ func (tcd *StatTCD) getValue(roundingDecimal int) time.Duration { func (tcd *StatTCD) GetStringValue(roundingDecimal int) (valStr string) { if val := tcd.getValue(roundingDecimal); val == -time.Nanosecond { - valStr = utils.NOT_AVAILABLE + valStr = utils.NotAvailable } else { valStr = fmt.Sprintf("%+v", tcd.getValue(roundingDecimal)) } @@ -530,7 +530,7 @@ func (acc *StatACC) getValue(roundingDecimal int) float64 { func (acc *StatACC) GetStringValue(roundingDecimal int) (valStr string) { if val := acc.getValue(roundingDecimal); val == utils.StatsNA { - valStr = utils.NOT_AVAILABLE + valStr = utils.NotAvailable } else { valStr = strconv.FormatFloat(acc.getValue(roundingDecimal), 'f', -1, 64) } @@ -549,9 +549,9 @@ func (acc *StatACC) GetFloat64Value(roundingDecimal int) (v float64) { func (acc *StatACC) AddEvent(evID string, ev utils.DataProvider) (err error) { var cost float64 var val interface{} - if val, err = ev.FieldAsInterface([]string{utils.MetaReq, utils.COST}); err != nil { + if val, err = ev.FieldAsInterface([]string{utils.MetaReq, utils.Cost}); err != nil { if err == utils.ErrNotFound { - err = utils.ErrPrefix(err, utils.COST) + err = utils.ErrPrefix(err, utils.Cost) } return } else if cost, err = utils.IfaceAsFloat64(val); err != nil { @@ -661,7 +661,7 @@ func (tcc *StatTCC) getValue(roundingDecimal int) float64 { func (tcc *StatTCC) GetStringValue(roundingDecimal int) (valStr string) { if val := tcc.getValue(roundingDecimal); val == utils.StatsNA { - valStr = utils.NOT_AVAILABLE + valStr = utils.NotAvailable } else { valStr = strconv.FormatFloat(tcc.getValue(roundingDecimal), 'f', -1, 64) } @@ -679,9 +679,9 @@ func (tcc *StatTCC) GetFloat64Value(roundingDecimal int) (v float64) { func (tcc *StatTCC) AddEvent(evID string, ev utils.DataProvider) (err error) { var cost float64 var val interface{} - if val, err = ev.FieldAsInterface([]string{utils.MetaReq, utils.COST}); err != nil { + if val, err = ev.FieldAsInterface([]string{utils.MetaReq, utils.Cost}); err != nil { if err == utils.ErrNotFound { - err = utils.ErrPrefix(err, utils.COST) + err = utils.ErrPrefix(err, utils.Cost) } return } else if cost, err = utils.IfaceAsFloat64(val); err != nil { @@ -793,7 +793,7 @@ func (pdd *StatPDD) getValue(roundingDecimal int) time.Duration { func (pdd *StatPDD) GetStringValue(roundingDecimal int) (valStr string) { if val := pdd.getValue(roundingDecimal); val == -time.Nanosecond { - valStr = utils.NOT_AVAILABLE + valStr = utils.NotAvailable } else { valStr = fmt.Sprintf("%+v", pdd.getValue(roundingDecimal)) } @@ -922,7 +922,7 @@ func (ddc *StatDDC) getValue(roundingDecimal int) float64 { func (ddc *StatDDC) GetStringValue(roundingDecimal int) (valStr string) { if val := ddc.getValue(roundingDecimal); val == utils.StatsNA { - valStr = utils.NOT_AVAILABLE + valStr = utils.NotAvailable } else { valStr = strconv.FormatFloat(ddc.getValue(roundingDecimal), 'f', -1, 64) } @@ -1072,7 +1072,7 @@ func (sum *StatSum) getValue(roundingDecimal int) float64 { func (sum *StatSum) GetStringValue(roundingDecimal int) (valStr string) { if val := sum.getValue(roundingDecimal); val == utils.StatsNA { - valStr = utils.NOT_AVAILABLE + valStr = utils.NotAvailable } else { valStr = strconv.FormatFloat(sum.getValue(roundingDecimal), 'f', -1, 64) } @@ -1205,7 +1205,7 @@ func (avg *StatAverage) getValue(roundingDecimal int) float64 { func (avg *StatAverage) GetStringValue(roundingDecimal int) (valStr string) { if val := avg.getValue(roundingDecimal); val == utils.StatsNA { - valStr = utils.NOT_AVAILABLE + valStr = utils.NotAvailable } else { valStr = strconv.FormatFloat(avg.getValue(roundingDecimal), 'f', -1, 64) } @@ -1332,7 +1332,7 @@ func (dst *StatDistinct) getValue(roundingDecimal int) float64 { func (dst *StatDistinct) GetStringValue(roundingDecimal int) (valStr string) { if val := dst.getValue(roundingDecimal); val == utils.StatsNA { - valStr = utils.NOT_AVAILABLE + valStr = utils.NotAvailable } else { valStr = strconv.FormatFloat(dst.getValue(roundingDecimal), 'f', -1, 64) } diff --git a/engine/statmetrics_test.go b/engine/statmetrics_test.go index be927b2f5..f7f7928ff 100644 --- a/engine/statmetrics_test.go +++ b/engine/statmetrics_test.go @@ -33,11 +33,11 @@ func TestASRGetStringValue(t *testing.T) { ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1", Event: map[string]interface{}{ "AnswerTime": time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC)}} - if strVal := asr.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := asr.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong asr value: %s", strVal) } asr.AddEvent(ev.ID, utils.MapStorage{utils.MetaReq: ev.Event}) - if strVal := asr.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := asr.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong asr value: %s", strVal) } ev2 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_2"} @@ -72,7 +72,7 @@ func TestASRGetStringValue(t *testing.T) { } asr.RemEvent(ev4.ID) asr.RemEvent(ev5.ID) - if strVal := asr.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := asr.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong asr value: %s", strVal) } } @@ -328,13 +328,13 @@ func TestACDGetStringValue(t *testing.T) { utils.Usage: 10 * time.Second, "AnswerTime": time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), }} - if strVal := acd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := acd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong acd value: %s", strVal) } if err := acd.AddEvent(ev.ID, utils.MapStorage{utils.MetaReq: ev.Event}); err != nil { t.Error(err) } - if strVal := acd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := acd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong acd value: %s", strVal) } ev2 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_2"} @@ -345,14 +345,14 @@ func TestACDGetStringValue(t *testing.T) { if err := acd.AddEvent(ev3.ID, utils.MapStorage{utils.MetaReq: ev3.Event}); err == nil || err.Error() != "NOT_FOUND:Usage" { t.Error(err) } - if strVal := acd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := acd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong acd value: %s", strVal) } - if strVal := acd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := acd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong acd value: %s", strVal) } acd.RemEvent(ev.ID) - if strVal := acd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := acd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong acd value: %s", strVal) } ev4 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_4", @@ -368,7 +368,7 @@ func TestACDGetStringValue(t *testing.T) { }, } acd.AddEvent(ev4.ID, utils.MapStorage{utils.MetaReq: ev4.Event}) - if strVal := acd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := acd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong acd value: %s", strVal) } acd.AddEvent(ev5.ID, utils.MapStorage{utils.MetaReq: ev5.Event}) @@ -382,7 +382,7 @@ func TestACDGetStringValue(t *testing.T) { acd.RemEvent(ev5.ID) acd.RemEvent(ev4.ID) acd.RemEvent(ev5.ID) - if strVal := acd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := acd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong acd value: %s", strVal) } } @@ -683,11 +683,11 @@ func TestTCDGetStringValue(t *testing.T) { "Usage": 10 * time.Second, "AnswerTime": time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), }} - if strVal := tcd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := tcd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong tcd value: %s", strVal) } tcd.AddEvent(ev.ID, utils.MapStorage{utils.MetaReq: ev.Event}) - if strVal := tcd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := tcd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong tcd value: %s", strVal) } ev2 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_2", @@ -702,11 +702,11 @@ func TestTCDGetStringValue(t *testing.T) { t.Errorf("wrong tcd value: %s", strVal) } tcd.RemEvent(ev2.ID) - if strVal := tcd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := tcd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong tcd value: %s", strVal) } tcd.RemEvent(ev.ID) - if strVal := tcd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := tcd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong tcd value: %s", strVal) } ev4 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_4", @@ -727,12 +727,12 @@ func TestTCDGetStringValue(t *testing.T) { t.Errorf("wrong tcd value: %s", strVal) } tcd.RemEvent(ev4.ID) - if strVal := tcd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := tcd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong tcd value: %s", strVal) } tcd.RemEvent(ev5.ID) tcd.RemEvent(ev3.ID) - if strVal := tcd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := tcd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong tcd value: %s", strVal) } } @@ -1007,11 +1007,11 @@ func TestACCGetStringValue(t *testing.T) { Event: map[string]interface{}{ "AnswerTime": time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), "Cost": 12.3}} - if strVal := acc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := acc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong acc value: %s", strVal) } acc.AddEvent(ev.ID, utils.MapStorage{utils.MetaReq: ev.Event}) - if strVal := acc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := acc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong acc value: %s", strVal) } ev2 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_2"} @@ -1025,7 +1025,7 @@ func TestACCGetStringValue(t *testing.T) { t.Errorf("wrong acc value: %s", strVal) } acc.RemEvent(ev3.ID) - if strVal := acc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := acc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong acc value: %s", strVal) } ev4 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_4", @@ -1048,7 +1048,7 @@ func TestACCGetStringValue(t *testing.T) { } acc.RemEvent(ev4.ID) acc.RemEvent(ev5.ID) - if strVal := acc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := acc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong acc value: %s", strVal) } } @@ -1277,11 +1277,11 @@ func TestTCCGetStringValue(t *testing.T) { Event: map[string]interface{}{ "AnswerTime": time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), "Cost": 12.3}} - if strVal := tcc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := tcc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong tcc value: %s", strVal) } tcc.AddEvent(ev.ID, utils.MapStorage{utils.MetaReq: ev.Event}) - if strVal := tcc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := tcc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong tcc value: %s", strVal) } ev2 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_2"} @@ -1295,7 +1295,7 @@ func TestTCCGetStringValue(t *testing.T) { t.Errorf("wrong tcc value: %s", strVal) } tcc.RemEvent(ev3.ID) - if strVal := tcc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := tcc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong tcc value: %s", strVal) } ev4 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_4", @@ -1318,7 +1318,7 @@ func TestTCCGetStringValue(t *testing.T) { } tcc.RemEvent(ev4.ID) tcc.RemEvent(ev5.ID) - if strVal := tcc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := tcc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong tcc value: %s", strVal) } } @@ -1552,26 +1552,26 @@ func TestPDDGetStringValue(t *testing.T) { "AnswerTime": time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.PDD: 5 * time.Second, }} - if strVal := pdd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := pdd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong pdd value: %s", strVal) } pdd.AddEvent(ev.ID, utils.MapStorage{utils.MetaReq: ev.Event}) - if strVal := pdd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := pdd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong pdd value: %s", strVal) } ev2 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_2"} ev3 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_3"} pdd.AddEvent(ev2.ID, utils.MapStorage{utils.MetaReq: ev2.Event}) pdd.AddEvent(ev3.ID, utils.MapStorage{utils.MetaReq: ev3.Event}) - if strVal := pdd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := pdd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong pdd value: %s", strVal) } pdd.RemEvent(ev3.ID) - if strVal := pdd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := pdd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong pdd value: %s", strVal) } pdd.RemEvent(ev.ID) - if strVal := pdd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := pdd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong pdd value: %s", strVal) } ev4 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_4", @@ -1587,7 +1587,7 @@ func TestPDDGetStringValue(t *testing.T) { }, } pdd.AddEvent(ev4.ID, utils.MapStorage{utils.MetaReq: ev4.Event}) - if strVal := pdd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := pdd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong pdd value: %s", strVal) } pdd.AddEvent(ev5.ID, utils.MapStorage{utils.MetaReq: ev5.Event}) @@ -1601,7 +1601,7 @@ func TestPDDGetStringValue(t *testing.T) { pdd.RemEvent(ev5.ID) pdd.RemEvent(ev4.ID) pdd.RemEvent(ev5.ID) - if strVal := pdd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := pdd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong pdd value: %s", strVal) } } @@ -1893,12 +1893,12 @@ func TestDDCGetStringValue(t *testing.T) { Event: map[string]interface{}{ "AnswerTime": time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Destination: "1002"}} - if strVal := ddc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := ddc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong ddc value: %s", strVal) } ddc.AddEvent(ev.ID, utils.MapStorage{utils.MetaReq: ev.Event}) - if strVal := ddc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := ddc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong ddc value: %s", strVal) } ev2 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_2", @@ -1920,11 +1920,11 @@ func TestDDCGetStringValue(t *testing.T) { t.Errorf("wrong ddc value: %s", strVal) } ddc.RemEvent(ev2.ID) - if strVal := ddc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := ddc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong ddc value: %s", strVal) } ddc.RemEvent(ev3.ID) - if strVal := ddc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := ddc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong ddc value: %s", strVal) } } @@ -1991,12 +1991,12 @@ func TestDDCGetStringValue2(t *testing.T) { statDistinct, _ := NewDDC(2, "", []string{}) ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1", Event: map[string]interface{}{utils.Destination: "1001"}} - if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong statDistinct value: %s", strVal) } statDistinct.AddEvent(ev.ID, utils.MapStorage{utils.MetaReq: ev.Event}) - if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong statDistinct value: %s", strVal) } ev2 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1", @@ -2006,7 +2006,7 @@ func TestDDCGetStringValue2(t *testing.T) { t.Errorf("wrong statDistinct value: %s", strVal) } statDistinct.RemEvent(ev.ID) - if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong statDistinct value: %s", strVal) } } @@ -2173,12 +2173,12 @@ func TestStatSumGetStringValue(t *testing.T) { "Cost": "20", "AnswerTime": time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Destination: "1002"}} - if strVal := statSum.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statSum.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong ddc value: %s", strVal) } statSum.AddEvent(ev.ID, utils.MapStorage{utils.MetaReq: ev.Event}) - if strVal := statSum.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statSum.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong statSum value: %s", strVal) } ev2 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_2", @@ -2202,11 +2202,11 @@ func TestStatSumGetStringValue(t *testing.T) { t.Errorf("wrong statSum value: %s", strVal) } statSum.RemEvent(ev2.ID) - if strVal := statSum.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statSum.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong statSum value: %s", strVal) } statSum.RemEvent(ev3.ID) - if strVal := statSum.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statSum.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong statSum value: %s", strVal) } } @@ -2451,12 +2451,12 @@ func TestStatAverageGetStringValue(t *testing.T) { "Cost": "20", "AnswerTime": time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Destination: "1002"}} - if strVal := statAvg.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statAvg.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong ddc value: %s", strVal) } statAvg.AddEvent(ev.ID, utils.MapStorage{utils.MetaReq: ev.Event}) - if strVal := statAvg.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statAvg.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong statAvg value: %s", strVal) } ev2 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_2", @@ -2480,11 +2480,11 @@ func TestStatAverageGetStringValue(t *testing.T) { t.Errorf("wrong statAvg value: %s", strVal) } statAvg.RemEvent(ev2.ID) - if strVal := statAvg.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statAvg.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong statAvg value: %s", strVal) } statAvg.RemEvent(ev3.ID) - if strVal := statAvg.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statAvg.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong statAvg value: %s", strVal) } } @@ -2717,12 +2717,12 @@ func TestStatDistinctGetStringValue(t *testing.T) { statDistinct, _ := NewStatDistinct(2, "~*req.Cost", []string{}) ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1", Event: map[string]interface{}{"Cost": "20"}} - if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong statDistinct value: %s", strVal) } statDistinct.AddEvent(ev.ID, utils.MapStorage{utils.MetaReq: ev.Event}) - if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong statDistinct value: %s", strVal) } ev2 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_2", @@ -2739,11 +2739,11 @@ func TestStatDistinctGetStringValue(t *testing.T) { t.Errorf("wrong statDistinct value: %s", strVal) } statDistinct.RemEvent(ev2.ID) - if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong statDistinct value: %s", strVal) } statDistinct.RemEvent(ev3.ID) - if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong statDistinct value: %s", strVal) } } @@ -2752,12 +2752,12 @@ func TestStatDistinctGetStringValue2(t *testing.T) { statDistinct, _ := NewStatDistinct(2, "~*req.Cost", []string{}) ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1", Event: map[string]interface{}{"Cost": "20"}} - if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong statDistinct value: %s", strVal) } statDistinct.AddEvent(ev.ID, utils.MapStorage{utils.MetaReq: ev.Event}) - if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong statDistinct value: %s", strVal) } ev2 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1", @@ -2767,7 +2767,7 @@ func TestStatDistinctGetStringValue2(t *testing.T) { t.Errorf("wrong statDistinct value: %s", strVal) } statDistinct.RemEvent(ev.ID) - if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NOT_AVAILABLE { + if strVal := statDistinct.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong statDistinct value: %s", strVal) } } diff --git a/engine/stats.go b/engine/stats.go index 8261da4c5..899cb87bd 100644 --- a/engine/stats.go +++ b/engine/stats.go @@ -482,7 +482,7 @@ func (sS *StatService) V1GetQueueIDs(tenant string, qIDs *[]string) (err error) if tenant == utils.EmptyString { tenant = sS.cgrcfg.GeneralCfg().DefaultTenant } - prfx := utils.StatQueuePrefix + tenant + utils.CONCATENATED_KEY_SEP + prfx := utils.StatQueuePrefix + tenant + utils.ConcatenatedKeySep keys, err := sS.dm.DataDB().GetKeysForPrefix(prfx) if err != nil { return err diff --git a/engine/stats_test.go b/engine/stats_test.go index 2db2dab12..562ec53d2 100644 --- a/engine/stats_test.go +++ b/engine/stats_test.go @@ -111,7 +111,7 @@ var ( "PddInterval": "1s", "Weight": "9.0", utils.Usage: 135 * time.Second, - utils.COST: 123.0, + utils.Cost: 123.0, }, }, }, diff --git a/engine/storage_interface.go b/engine/storage_interface.go index bd5c290d3..bb95d0c4d 100644 --- a/engine/storage_interface.go +++ b/engine/storage_interface.go @@ -222,7 +222,7 @@ type LoadWriter interface { // NewMarshaler returns the marshaler type selected by mrshlerStr func NewMarshaler(mrshlerStr string) (ms Marshaler, err error) { switch mrshlerStr { - case utils.MSGPACK: + case utils.MsgPack: ms = NewCodecMsgpackMarshaler() case utils.JSON: ms = new(JSONMarshaler) diff --git a/engine/storage_internal_datadb.go b/engine/storage_internal_datadb.go index 68e54f638..32e8b32b5 100644 --- a/engine/storage_internal_datadb.go +++ b/engine/storage_internal_datadb.go @@ -183,8 +183,8 @@ func (iDB *InternalDB) IsDBEmpty() (isEmpty bool, err error) { func (iDB *InternalDB) HasDataDrv(category, subject, tenant string) (bool, error) { switch category { - case utils.DestinationPrefix, utils.RATING_PLAN_PREFIX, utils.RATING_PROFILE_PREFIX, - utils.ACTION_PREFIX, utils.ACTION_PLAN_PREFIX, utils.ACCOUNT_PREFIX: + case utils.DestinationPrefix, utils.RatingPlanPrefix, utils.RatingProfilePrefix, + utils.ActionPrefix, utils.ActionPlanPrefix, utils.AccountPrefix: return Cache.HasItem(utils.CachePrefixToInstance[category], subject), nil case utils.ResourcesPrefix, utils.ResourceProfilesPrefix, utils.StatQueuePrefix, utils.StatQueueProfilePrefix, utils.ThresholdPrefix, utils.ThresholdProfilePrefix, @@ -398,18 +398,18 @@ func (iDB *InternalDB) RemoveActionPlanDrv(key string, transactionID string) (er func (iDB *InternalDB) GetAllActionPlansDrv() (ats map[string]*ActionPlan, err error) { var keys []string - if keys, err = iDB.GetKeysForPrefix(utils.ACTION_PLAN_PREFIX); err != nil { + if keys, err = iDB.GetKeysForPrefix(utils.ActionPlanPrefix); err != nil { return } ats = make(map[string]*ActionPlan, len(keys)) for _, key := range keys { var ap *ActionPlan - if ap, err = iDB.GetActionPlanDrv(key[len(utils.ACTION_PLAN_PREFIX):], false, utils.NonTransactional); err != nil { + if ap, err = iDB.GetActionPlanDrv(key[len(utils.ActionPlanPrefix):], false, utils.NonTransactional); err != nil { ats = nil return } - ats[key[len(utils.ACTION_PLAN_PREFIX):]] = ap + ats[key[len(utils.ActionPlanPrefix):]] = ap } return } @@ -874,7 +874,7 @@ func (iDB *InternalDB) GetIndexesDrv(idxItmType, tntCtx, idxKey string) (indexes if !ok || x == nil { continue } - dbKey = strings.TrimPrefix(dbKey, tntCtx+utils.CONCATENATED_KEY_SEP) + dbKey = strings.TrimPrefix(dbKey, tntCtx+utils.ConcatenatedKeySep) indexes[dbKey] = x.(utils.StringSet).Clone() } if len(indexes) == 0 { @@ -905,7 +905,7 @@ func (iDB *InternalDB) SetIndexesDrv(idxItmType, tntCtx string, } Cache.RemoveWithoutReplicate(idxItmType, dbKey, cacheCommit(utils.NonTransactional), utils.NonTransactional) - key := strings.TrimSuffix(strings.TrimPrefix(dbKey, "tmp_"), utils.CONCATENATED_KEY_SEP+transactionID) + key := strings.TrimSuffix(strings.TrimPrefix(dbKey, "tmp_"), utils.ConcatenatedKeySep+transactionID) Cache.SetWithoutReplicate(idxItmType, key, x, []string{tntCtx}, cacheCommit(utils.NonTransactional), utils.NonTransactional) } diff --git a/engine/storage_internal_stordb.go b/engine/storage_internal_stordb.go index 8148e0cb4..87d2fc483 100644 --- a/engine/storage_internal_stordb.go +++ b/engine/storage_internal_stordb.go @@ -54,7 +54,7 @@ func (iDB *InternalDB) GetTpTableIds(tpid, table string, distinct utils.TPDistin // the retutned value may be only the loadID case utils.TBLTPAccountActions, utils.TBLTPRatingProfiles: if len(distinct) == 1 { // special case when to return only the loadID - sliceID := strings.Split(fullID[len(tpid)+1:], utils.CONCATENATED_KEY_SEP) + sliceID := strings.Split(fullID[len(tpid)+1:], utils.ConcatenatedKeySep) idSet.Add(sliceID[0]) continue } @@ -70,7 +70,7 @@ func (iDB *InternalDB) GetTpTableIds(tpid, table string, distinct utils.TPDistin func (iDB *InternalDB) GetTPTimings(tpid, id string) (timings []*utils.ApierTPTiming, err error) { key := tpid if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPTimings, key) @@ -90,7 +90,7 @@ func (iDB *InternalDB) GetTPTimings(tpid, id string) (timings []*utils.ApierTPTi func (iDB *InternalDB) GetTPDestinations(tpid, id string) (dsts []*utils.TPDestination, err error) { key := tpid if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPDestinations, key) for _, id := range ids { @@ -110,7 +110,7 @@ func (iDB *InternalDB) GetTPDestinations(tpid, id string) (dsts []*utils.TPDesti func (iDB *InternalDB) GetTPRates(tpid, id string) (rates []*utils.TPRateRALs, err error) { key := tpid if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPRates, key) for _, id := range ids { @@ -135,7 +135,7 @@ func (iDB *InternalDB) GetTPDestinationRates(tpid, id string, paginator *utils.Paginator) (dRates []*utils.TPDestinationRate, err error) { key := tpid if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPDestinationRates, key) for _, id := range ids { @@ -180,7 +180,7 @@ func (iDB *InternalDB) GetTPDestinationRates(tpid, id string, func (iDB *InternalDB) GetTPRatingPlans(tpid, id string, paginator *utils.Paginator) (rPlans []*utils.TPRatingPlan, err error) { key := tpid if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPRatingPlans, key) for _, id := range ids { @@ -225,16 +225,16 @@ func (iDB *InternalDB) GetTPRatingProfiles(filter *utils.TPRatingProfile) (rProf key := filter.TPid if filter.LoadId != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + filter.LoadId + key += utils.ConcatenatedKeySep + filter.LoadId } if filter.Tenant != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + filter.Tenant + key += utils.ConcatenatedKeySep + filter.Tenant } if filter.Category != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + filter.Category + key += utils.ConcatenatedKeySep + filter.Category } if filter.Subject != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + filter.Subject + key += utils.ConcatenatedKeySep + filter.Subject } ids := Cache.GetItemIDs(utils.CacheTBLTPRatingProfiles, key) for _, id := range ids { @@ -254,7 +254,7 @@ func (iDB *InternalDB) GetTPRatingProfiles(filter *utils.TPRatingProfile) (rProf func (iDB *InternalDB) GetTPSharedGroups(tpid, id string) (sGroups []*utils.TPSharedGroups, err error) { key := tpid if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPSharedGroups, key) for _, id := range ids { @@ -274,7 +274,7 @@ func (iDB *InternalDB) GetTPSharedGroups(tpid, id string) (sGroups []*utils.TPSh func (iDB *InternalDB) GetTPActions(tpid, id string) (actions []*utils.TPActions, err error) { key := tpid if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPActions, key) for _, id := range ids { @@ -294,7 +294,7 @@ func (iDB *InternalDB) GetTPActions(tpid, id string) (actions []*utils.TPActions func (iDB *InternalDB) GetTPActionPlans(tpid, id string) (aPlans []*utils.TPActionPlan, err error) { key := tpid if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPActionPlans, key) for _, id := range ids { @@ -314,7 +314,7 @@ func (iDB *InternalDB) GetTPActionPlans(tpid, id string) (aPlans []*utils.TPActi func (iDB *InternalDB) GetTPActionTriggers(tpid, id string) (aTriggers []*utils.TPActionTriggers, err error) { key := tpid if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPActionTriggers, key) for _, id := range ids { @@ -333,13 +333,13 @@ func (iDB *InternalDB) GetTPAccountActions(filter *utils.TPAccountActions) (acco key := filter.TPid if filter.LoadId != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + filter.LoadId + key += utils.ConcatenatedKeySep + filter.LoadId } if filter.Tenant != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + filter.Tenant + key += utils.ConcatenatedKeySep + filter.Tenant } if filter.Account != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + filter.Account + key += utils.ConcatenatedKeySep + filter.Account } ids := Cache.GetItemIDs(utils.CacheTBLTPAccountActions, key) for _, id := range ids { @@ -359,10 +359,10 @@ func (iDB *InternalDB) GetTPAccountActions(filter *utils.TPAccountActions) (acco func (iDB *InternalDB) GetTPResources(tpid, tenant, id string) (resources []*utils.TPResourceProfile, err error) { key := tpid if tenant != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + tenant + key += utils.ConcatenatedKeySep + tenant } if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPResources, key) for _, id := range ids { @@ -382,10 +382,10 @@ func (iDB *InternalDB) GetTPResources(tpid, tenant, id string) (resources []*uti func (iDB *InternalDB) GetTPStats(tpid, tenant, id string) (stats []*utils.TPStatProfile, err error) { key := tpid if tenant != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + tenant + key += utils.ConcatenatedKeySep + tenant } if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPStats, key) for _, id := range ids { @@ -405,10 +405,10 @@ func (iDB *InternalDB) GetTPStats(tpid, tenant, id string) (stats []*utils.TPSta func (iDB *InternalDB) GetTPThresholds(tpid, tenant, id string) (ths []*utils.TPThresholdProfile, err error) { key := tpid if tenant != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + tenant + key += utils.ConcatenatedKeySep + tenant } if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPThresholds, key) for _, id := range ids { @@ -428,10 +428,10 @@ func (iDB *InternalDB) GetTPThresholds(tpid, tenant, id string) (ths []*utils.TP func (iDB *InternalDB) GetTPFilters(tpid, tenant, id string) (fltrs []*utils.TPFilterProfile, err error) { key := tpid if tenant != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + tenant + key += utils.ConcatenatedKeySep + tenant } if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPFilters, key) for _, id := range ids { @@ -451,10 +451,10 @@ func (iDB *InternalDB) GetTPFilters(tpid, tenant, id string) (fltrs []*utils.TPF func (iDB *InternalDB) GetTPRoutes(tpid, tenant, id string) (supps []*utils.TPRouteProfile, err error) { key := tpid if tenant != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + tenant + key += utils.ConcatenatedKeySep + tenant } if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPRoutes, key) for _, id := range ids { @@ -474,10 +474,10 @@ func (iDB *InternalDB) GetTPRoutes(tpid, tenant, id string) (supps []*utils.TPRo func (iDB *InternalDB) GetTPAttributes(tpid, tenant, id string) (attrs []*utils.TPAttributeProfile, err error) { key := tpid if tenant != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + tenant + key += utils.ConcatenatedKeySep + tenant } if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPAttributes, key) for _, id := range ids { @@ -497,10 +497,10 @@ func (iDB *InternalDB) GetTPAttributes(tpid, tenant, id string) (attrs []*utils. func (iDB *InternalDB) GetTPChargers(tpid, tenant, id string) (cpps []*utils.TPChargerProfile, err error) { key := tpid if tenant != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + tenant + key += utils.ConcatenatedKeySep + tenant } if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPChargers, key) for _, id := range ids { @@ -520,10 +520,10 @@ func (iDB *InternalDB) GetTPChargers(tpid, tenant, id string) (cpps []*utils.TPC func (iDB *InternalDB) GetTPDispatcherProfiles(tpid, tenant, id string) (dpps []*utils.TPDispatcherProfile, err error) { key := tpid if tenant != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + tenant + key += utils.ConcatenatedKeySep + tenant } if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPDispatchers, key) for _, id := range ids { @@ -543,10 +543,10 @@ func (iDB *InternalDB) GetTPDispatcherProfiles(tpid, tenant, id string) (dpps [] func (iDB *InternalDB) GetTPDispatcherHosts(tpid, tenant, id string) (dpps []*utils.TPDispatcherHost, err error) { key := tpid if tenant != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + tenant + key += utils.ConcatenatedKeySep + tenant } if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPDispatcherHosts, key) for _, id := range ids { @@ -566,10 +566,10 @@ func (iDB *InternalDB) GetTPDispatcherHosts(tpid, tenant, id string) (dpps []*ut func (iDB *InternalDB) GetTPRateProfiles(tpid, tenant, id string) (tpPrfs []*utils.TPRateProfile, err error) { key := tpid if tenant != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + tenant + key += utils.ConcatenatedKeySep + tenant } if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPRateProfiles, key) for _, id := range ids { @@ -588,10 +588,10 @@ func (iDB *InternalDB) GetTPRateProfiles(tpid, tenant, id string) (tpPrfs []*uti func (iDB *InternalDB) GetTPActionProfiles(tpid, tenant, id string) (tpPrfs []*utils.TPActionProfile, err error) { key := tpid if tenant != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + tenant + key += utils.ConcatenatedKeySep + tenant } if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPActionProfiles, key) for _, id := range ids { @@ -610,10 +610,10 @@ func (iDB *InternalDB) GetTPActionProfiles(tpid, tenant, id string) (tpPrfs []*u func (iDB *InternalDB) GetTPAccountProfiles(tpid, tenant, id string) (tpPrfs []*utils.TPAccountProfile, err error) { key := tpid if tenant != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + tenant + key += utils.ConcatenatedKeySep + tenant } if id != utils.EmptyString { - key += utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + id } ids := Cache.GetItemIDs(utils.CacheTBLTPAccountProfiles, key) for _, id := range ids { @@ -637,19 +637,19 @@ func (iDB *InternalDB) RemTpData(table, tpid string, args map[string]string) (er key := tpid if args != nil { if table == utils.TBLTPAccountActions { - key += utils.CONCATENATED_KEY_SEP + args["loadid"] + - utils.CONCATENATED_KEY_SEP + args["tenant"] + - utils.CONCATENATED_KEY_SEP + args["account"] + key += utils.ConcatenatedKeySep + args["loadid"] + + utils.ConcatenatedKeySep + args["tenant"] + + utils.ConcatenatedKeySep + args["account"] } else if table == utils.TBLTPRatingProfiles { - key += utils.CONCATENATED_KEY_SEP + args["loadid"] + - utils.CONCATENATED_KEY_SEP + args["tenant"] + - utils.CONCATENATED_KEY_SEP + args["category"] + - utils.CONCATENATED_KEY_SEP + args["subject"] + key += utils.ConcatenatedKeySep + args["loadid"] + + utils.ConcatenatedKeySep + args["tenant"] + + utils.ConcatenatedKeySep + args["category"] + + utils.ConcatenatedKeySep + args["subject"] } else if tag, has := args["tag"]; has { - key += utils.CONCATENATED_KEY_SEP + tag + key += utils.ConcatenatedKeySep + tag } else if id, has := args["id"]; has { - key += utils.CONCATENATED_KEY_SEP + args["tenant"] + - utils.CONCATENATED_KEY_SEP + id + key += utils.ConcatenatedKeySep + args["tenant"] + + utils.ConcatenatedKeySep + id } } ids := Cache.GetItemIDs(utils.CacheStorDBPartitions[table], key) diff --git a/engine/storage_mongo_datadb.go b/engine/storage_mongo_datadb.go index be24af651..e4202467d 100644 --- a/engine/storage_mongo_datadb.go +++ b/engine/storage_mongo_datadb.go @@ -102,7 +102,7 @@ var ( UpdatedAtLow = strings.ToLower(utils.UpdatedAt) UsageLow = strings.ToLower(utils.Usage) DestinationLow = strings.ToLower(utils.Destination) - CostLow = strings.ToLower(utils.COST) + CostLow = strings.ToLower(utils.Cost) CostSourceLow = strings.ToLower(utils.CostSource) tTime = reflect.TypeOf(time.Time{}) @@ -435,29 +435,29 @@ func (ms *MongoStorage) RemoveKeysForPrefix(prefix string) (err error) { switch prefix { case utils.DestinationPrefix: colName = ColDst - case utils.REVERSE_DESTINATION_PREFIX: + case utils.ReverseDestinationPrefix: colName = ColRds - case utils.ACTION_PREFIX: + case utils.ActionPrefix: colName = ColAct - case utils.ACTION_PLAN_PREFIX: + case utils.ActionPlanPrefix: colName = ColApl case utils.AccountActionPlansPrefix: colName = ColAAp - case utils.TASKS_KEY: + case utils.TasksKey: colName = ColTsk - case utils.ACTION_TRIGGER_PREFIX: + case utils.ActionTriggerPrefix: colName = ColAtr - case utils.RATING_PLAN_PREFIX: + case utils.RatingPlanPrefix: colName = ColRpl - case utils.RATING_PROFILE_PREFIX: + case utils.RatingProfilePrefix: colName = ColRpf - case utils.ACCOUNT_PREFIX: + case utils.AccountPrefix: colName = ColAcc - case utils.SHARED_GROUP_PREFIX: + case utils.SharedGroupPrefix: colName = ColShg - case utils.LOADINST_KEY: + case utils.LoadInstKey: colName = ColLht - case utils.VERSION_PREFIX: + case utils.VersionPrefix: colName = ColVer case utils.TimingsPrefix: colName = ColTmg @@ -593,25 +593,25 @@ func (ms *MongoStorage) GetKeysForPrefix(prefix string) (result []string, err er switch category { case utils.DestinationPrefix: result, err = ms.getField(sctx, ColDst, utils.DestinationPrefix, subject, "key") - case utils.REVERSE_DESTINATION_PREFIX: - result, err = ms.getField(sctx, ColRds, utils.REVERSE_DESTINATION_PREFIX, subject, "key") - case utils.RATING_PLAN_PREFIX: - result, err = ms.getField(sctx, ColRpl, utils.RATING_PLAN_PREFIX, subject, "key") - case utils.RATING_PROFILE_PREFIX: - if strings.HasPrefix(prefix[keyLen:], utils.META_OUT) { + case utils.ReverseDestinationPrefix: + result, err = ms.getField(sctx, ColRds, utils.ReverseDestinationPrefix, subject, "key") + case utils.RatingPlanPrefix: + result, err = ms.getField(sctx, ColRpl, utils.RatingPlanPrefix, subject, "key") + case utils.RatingProfilePrefix: + if strings.HasPrefix(prefix[keyLen:], utils.MetaOut) { subject = fmt.Sprintf("^\\%s", prefix[keyLen:]) // rewrite the id cause it start with * from `*out` } - result, err = ms.getField(sctx, ColRpf, utils.RATING_PROFILE_PREFIX, subject, "id") - case utils.ACTION_PREFIX: - result, err = ms.getField(sctx, ColAct, utils.ACTION_PREFIX, subject, "key") - case utils.ACTION_PLAN_PREFIX: - result, err = ms.getField(sctx, ColApl, utils.ACTION_PLAN_PREFIX, subject, "key") - case utils.ACTION_TRIGGER_PREFIX: - result, err = ms.getField(sctx, ColAtr, utils.ACTION_TRIGGER_PREFIX, subject, "key") - case utils.SHARED_GROUP_PREFIX: - result, err = ms.getField(sctx, ColShg, utils.SHARED_GROUP_PREFIX, subject, "id") - case utils.ACCOUNT_PREFIX: - result, err = ms.getField(sctx, ColAcc, utils.ACCOUNT_PREFIX, subject, "id") + result, err = ms.getField(sctx, ColRpf, utils.RatingProfilePrefix, subject, "id") + case utils.ActionPrefix: + result, err = ms.getField(sctx, ColAct, utils.ActionPrefix, subject, "key") + case utils.ActionPlanPrefix: + result, err = ms.getField(sctx, ColApl, utils.ActionPlanPrefix, subject, "key") + case utils.ActionTriggerPrefix: + result, err = ms.getField(sctx, ColAtr, utils.ActionTriggerPrefix, subject, "key") + case utils.SharedGroupPrefix: + result, err = ms.getField(sctx, ColShg, utils.SharedGroupPrefix, subject, "id") + case utils.AccountPrefix: + result, err = ms.getField(sctx, ColAcc, utils.AccountPrefix, subject, "id") case utils.ResourceProfilesPrefix: result, err = ms.getField2(sctx, ColRsP, utils.ResourceProfilesPrefix, subject, tntID) case utils.ResourcesPrefix: @@ -686,15 +686,15 @@ func (ms *MongoStorage) HasDataDrv(category, subject, tenant string) (has bool, switch category { case utils.DestinationPrefix: count, err = ms.getCol(ColDst).CountDocuments(sctx, bson.M{"key": subject}) - case utils.RATING_PLAN_PREFIX: + case utils.RatingPlanPrefix: count, err = ms.getCol(ColRpl).CountDocuments(sctx, bson.M{"key": subject}) - case utils.RATING_PROFILE_PREFIX: + case utils.RatingProfilePrefix: count, err = ms.getCol(ColRpf).CountDocuments(sctx, bson.M{"key": subject}) - case utils.ACTION_PREFIX: + case utils.ActionPrefix: count, err = ms.getCol(ColAct).CountDocuments(sctx, bson.M{"key": subject}) - case utils.ACTION_PLAN_PREFIX: + case utils.ActionPlanPrefix: count, err = ms.getCol(ColApl).CountDocuments(sctx, bson.M{"key": subject}) - case utils.ACCOUNT_PREFIX: + case utils.AccountPrefix: count, err = ms.getCol(ColAcc).CountDocuments(sctx, bson.M{"id": subject}) case utils.ResourcesPrefix: count, err = ms.getCol(ColRes).CountDocuments(sctx, bson.M{"tenant": tenant, "id": subject}) @@ -1079,7 +1079,7 @@ func (ms *MongoStorage) GetLoadHistory(limit int, skipCache bool, return nil, nil } if !skipCache { - if x, ok := Cache.Get(utils.LOADINST_KEY, ""); ok { + if x, ok := Cache.Get(utils.LoadInstKey, ""); ok { if x != nil { items := x.([]*utils.LoadInstance) if len(items) < limit || limit == -1 { @@ -1095,7 +1095,7 @@ func (ms *MongoStorage) GetLoadHistory(limit int, skipCache bool, Value []*utils.LoadInstance } err = ms.query(func(sctx mongo.SessionContext) (err error) { - cur := ms.getCol(ColLht).FindOne(sctx, bson.M{"key": utils.LOADINST_KEY}) + cur := ms.getCol(ColLht).FindOne(sctx, bson.M{"key": utils.LoadInstKey}) if err := cur.Decode(&kv); err != nil { if err == mongo.ErrNoDocuments { return utils.ErrNotFound @@ -1107,10 +1107,10 @@ func (ms *MongoStorage) GetLoadHistory(limit int, skipCache bool, cCommit := cacheCommit(transactionID) if err == nil { loadInsts = kv.Value - if errCh := Cache.Remove(utils.LOADINST_KEY, "", cCommit, transactionID); errCh != nil { + if errCh := Cache.Remove(utils.LoadInstKey, "", cCommit, transactionID); errCh != nil { return nil, errCh } - if errCh := Cache.Set(utils.LOADINST_KEY, "", loadInsts, nil, cCommit, transactionID); errCh != nil { + if errCh := Cache.Set(utils.LoadInstKey, "", loadInsts, nil, cCommit, transactionID); errCh != nil { return nil, errCh } } @@ -1133,7 +1133,7 @@ func (ms *MongoStorage) AddLoadHistory(ldInst *utils.LoadInstance, Value []*utils.LoadInstance } if err := ms.query(func(sctx mongo.SessionContext) (err error) { - cur := ms.getCol(ColLht).FindOne(sctx, bson.M{"key": utils.LOADINST_KEY}) + cur := ms.getCol(ColLht).FindOne(sctx, bson.M{"key": utils.LoadInstKey}) if err := cur.Decode(&kv); err != nil { if err == mongo.ErrNoDocuments { return nil // utils.ErrNotFound @@ -1159,18 +1159,18 @@ func (ms *MongoStorage) AddLoadHistory(ldInst *utils.LoadInstance, existingLoadHistory = existingLoadHistory[:loadHistSize] } return nil, ms.query(func(sctx mongo.SessionContext) (err error) { - _, err = ms.getCol(ColLht).UpdateOne(sctx, bson.M{"key": utils.LOADINST_KEY}, + _, err = ms.getCol(ColLht).UpdateOne(sctx, bson.M{"key": utils.LoadInstKey}, bson.M{"$set": struct { Key string Value []*utils.LoadInstance - }{Key: utils.LOADINST_KEY, Value: existingLoadHistory}}, + }{Key: utils.LoadInstKey, Value: existingLoadHistory}}, options.Update().SetUpsert(true), ) return err }) - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.LOADINST_KEY) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.LoadInstKey) - if errCh := Cache.Remove(utils.LOADINST_KEY, "", + if errCh := Cache.Remove(utils.LoadInstKey, "", cacheCommit(transactionID), transactionID); errCh != nil { return errCh } @@ -1339,7 +1339,7 @@ func (ms *MongoStorage) RemoveActionPlanDrv(key string, transactionID string) er } func (ms *MongoStorage) GetAllActionPlansDrv() (ats map[string]*ActionPlan, err error) { - keys, err := ms.GetKeysForPrefix(utils.ACTION_PLAN_PREFIX) + keys, err := ms.GetKeysForPrefix(utils.ActionPlanPrefix) if err != nil { return nil, err } @@ -1348,12 +1348,12 @@ func (ms *MongoStorage) GetAllActionPlansDrv() (ats map[string]*ActionPlan, err } ats = make(map[string]*ActionPlan, len(keys)) for _, key := range keys { - ap, err := ms.GetActionPlanDrv(key[len(utils.ACTION_PLAN_PREFIX):], + ap, err := ms.GetActionPlanDrv(key[len(utils.ActionPlanPrefix):], false, utils.NonTransactional) if err != nil { return nil, err } - ats[key[len(utils.ACTION_PLAN_PREFIX):]] = ap + ats[key[len(utils.ActionPlanPrefix):]] = ap } return } @@ -2115,7 +2115,7 @@ func (ms *MongoStorage) GetIndexesDrv(idxItmType, tntCtx, idxKey string) (indexe if len(elem.Value) == 0 { continue } - indexKey := strings.TrimPrefix(elem.Key, utils.CacheInstanceToPrefix[idxItmType]+tntCtx+utils.CONCATENATED_KEY_SEP) + indexKey := strings.TrimPrefix(elem.Key, utils.CacheInstanceToPrefix[idxItmType]+tntCtx+utils.ConcatenatedKeySep) indexes[indexKey] = utils.NewStringSet(elem.Value) } return cur.Close(sctx) diff --git a/engine/storage_mongo_stordb.go b/engine/storage_mongo_stordb.go index e6fb2e2f4..edcc304bb 100644 --- a/engine/storage_mongo_stordb.go +++ b/engine/storage_mongo_stordb.go @@ -141,7 +141,7 @@ func (ms *MongoStorage) GetTpTableIds(tpid, table string, distinct utils.TPDisti id += distinctValue.(string) } if i < last { - id += utils.CONCATENATED_KEY_SEP + id += utils.ConcatenatedKeySep } } distinctIds[id] = true diff --git a/engine/storage_redis.go b/engine/storage_redis.go index 95602dc02..0a467e02b 100644 --- a/engine/storage_redis.go +++ b/engine/storage_redis.go @@ -229,7 +229,7 @@ func (rs *RedisStorage) getKeysForFilterIndexesKeys(fkeys []string) (keys []stri func (rs *RedisStorage) RebbuildActionPlanKeys() (err error) { var keys []string - if err = rs.Cmd(&keys, redis_KEYS, utils.ACTION_PLAN_PREFIX+"*"); err != nil { + if err = rs.Cmd(&keys, redis_KEYS, utils.ActionPlanPrefix+"*"); err != nil { return } for _, key := range keys { @@ -241,7 +241,7 @@ func (rs *RedisStorage) RebbuildActionPlanKeys() (err error) { } func (rs *RedisStorage) GetKeysForPrefix(prefix string) (keys []string, err error) { - if prefix == utils.ACTION_PLAN_PREFIX { // so we can avoid the full scan on scheduler reloads + if prefix == utils.ActionPlanPrefix { // so we can avoid the full scan on scheduler reloads err = rs.Cmd(&keys, redis_SMEMBERS, utils.ActionPlanIndexes) } else { err = rs.Cmd(&keys, redis_KEYS, prefix+"*") @@ -262,8 +262,8 @@ func (rs *RedisStorage) GetKeysForPrefix(prefix string) (keys []string, err erro func (rs *RedisStorage) HasDataDrv(category, subject, tenant string) (exists bool, err error) { var i int switch category { - case utils.DestinationPrefix, utils.RATING_PLAN_PREFIX, utils.RATING_PROFILE_PREFIX, - utils.ACTION_PREFIX, utils.ACTION_PLAN_PREFIX, utils.ACCOUNT_PREFIX: + case utils.DestinationPrefix, utils.RatingPlanPrefix, utils.RatingProfilePrefix, + utils.ActionPrefix, utils.ActionPlanPrefix, utils.AccountPrefix: err = rs.Cmd(&i, redis_EXISTS, category+subject) return i == 1, err case utils.ResourcesPrefix, utils.ResourceProfilesPrefix, utils.StatQueuePrefix, @@ -278,7 +278,7 @@ func (rs *RedisStorage) HasDataDrv(category, subject, tenant string) (exists boo } func (rs *RedisStorage) GetRatingPlanDrv(key string) (rp *RatingPlan, err error) { - key = utils.RATING_PLAN_PREFIX + key + key = utils.RatingPlanPrefix + key var values []byte if err = rs.Cmd(&values, redis_GET, key); err != nil { return @@ -306,13 +306,13 @@ func (rs *RedisStorage) SetRatingPlanDrv(rp *RatingPlan) (err error) { w := zlib.NewWriter(&b) w.Write(result) w.Close() - err = rs.Cmd(nil, redis_SET, utils.RATING_PLAN_PREFIX+rp.Id, b.String()) + err = rs.Cmd(nil, redis_SET, utils.RatingPlanPrefix+rp.Id, b.String()) return } func (rs *RedisStorage) RemoveRatingPlanDrv(key string) (err error) { var keys []string - if err = rs.Cmd(&keys, redis_KEYS, utils.RATING_PLAN_PREFIX+key+"*"); err != nil { + if err = rs.Cmd(&keys, redis_KEYS, utils.RatingPlanPrefix+key+"*"); err != nil { return } for _, key := range keys { @@ -324,7 +324,7 @@ func (rs *RedisStorage) RemoveRatingPlanDrv(key string) (err error) { } func (rs *RedisStorage) GetRatingProfileDrv(key string) (rpf *RatingProfile, err error) { - key = utils.RATING_PROFILE_PREFIX + key + key = utils.RatingProfilePrefix + key var values []byte if err = rs.Cmd(&values, redis_GET, key); err != nil { return @@ -341,14 +341,14 @@ func (rs *RedisStorage) SetRatingProfileDrv(rpf *RatingProfile) (err error) { if result, err = rs.ms.Marshal(rpf); err != nil { return } - key := utils.RATING_PROFILE_PREFIX + rpf.Id + key := utils.RatingProfilePrefix + rpf.Id err = rs.Cmd(nil, redis_SET, key, string(result)) return } func (rs *RedisStorage) RemoveRatingProfileDrv(key string) (err error) { var keys []string - if err = rs.Cmd(&keys, redis_KEYS, utils.RATING_PROFILE_PREFIX+key+"*"); err != nil { + if err = rs.Cmd(&keys, redis_KEYS, utils.RatingProfilePrefix+key+"*"); err != nil { return } for _, key := range keys { @@ -396,7 +396,7 @@ func (rs *RedisStorage) SetDestinationDrv(dest *Destination, transactionID strin } func (rs *RedisStorage) GetReverseDestinationDrv(key, transactionID string) (ids []string, err error) { - if err = rs.Cmd(&ids, redis_SMEMBERS, utils.REVERSE_DESTINATION_PREFIX+key); err != nil { + if err = rs.Cmd(&ids, redis_SMEMBERS, utils.ReverseDestinationPrefix+key); err != nil { return } if len(ids) == 0 { @@ -407,7 +407,7 @@ func (rs *RedisStorage) GetReverseDestinationDrv(key, transactionID string) (ids func (rs *RedisStorage) SetReverseDestinationDrv(destID string, prefixes []string, transactionID string) (err error) { for _, p := range prefixes { - if err = rs.Cmd(nil, redis_SADD, utils.REVERSE_DESTINATION_PREFIX+p, destID); err != nil { + if err = rs.Cmd(nil, redis_SADD, utils.ReverseDestinationPrefix+p, destID); err != nil { return } } @@ -419,12 +419,12 @@ func (rs *RedisStorage) RemoveDestinationDrv(destID, transactionID string) (err } func (rs *RedisStorage) RemoveReverseDestinationDrv(dstID, prfx, transactionID string) (err error) { - return rs.Cmd(nil, redis_SREM, utils.REVERSE_DESTINATION_PREFIX+prfx, dstID) + return rs.Cmd(nil, redis_SREM, utils.ReverseDestinationPrefix+prfx, dstID) } func (rs *RedisStorage) GetActionsDrv(key string) (as Actions, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.ACTION_PREFIX+key); err != nil { + if err = rs.Cmd(&values, redis_GET, utils.ActionPrefix+key); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -439,16 +439,16 @@ func (rs *RedisStorage) SetActionsDrv(key string, as Actions) (err error) { if result, err = rs.ms.Marshal(&as); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.ACTION_PREFIX+key, string(result)) + return rs.Cmd(nil, redis_SET, utils.ActionPrefix+key, string(result)) } func (rs *RedisStorage) RemoveActionsDrv(key string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.ACTION_PREFIX+key) + return rs.Cmd(nil, redis_DEL, utils.ActionPrefix+key) } func (rs *RedisStorage) GetSharedGroupDrv(key string) (sg *SharedGroup, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.SHARED_GROUP_PREFIX+key); err != nil { + if err = rs.Cmd(&values, redis_GET, utils.SharedGroupPrefix+key); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -463,16 +463,16 @@ func (rs *RedisStorage) SetSharedGroupDrv(sg *SharedGroup) (err error) { if result, err = rs.ms.Marshal(sg); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.SHARED_GROUP_PREFIX+sg.Id, string(result)) + return rs.Cmd(nil, redis_SET, utils.SharedGroupPrefix+sg.Id, string(result)) } func (rs *RedisStorage) RemoveSharedGroupDrv(id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.SHARED_GROUP_PREFIX+id) + return rs.Cmd(nil, redis_DEL, utils.SharedGroupPrefix+id) } func (rs *RedisStorage) GetAccountDrv(key string) (ub *Account, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.ACCOUNT_PREFIX+key); err != nil { + if err = rs.Cmd(&values, redis_GET, utils.AccountPrefix+key); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -504,11 +504,11 @@ func (rs *RedisStorage) SetAccountDrv(acc *Account) (err error) { if result, err = rs.ms.Marshal(acc); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.ACCOUNT_PREFIX+acc.ID, string(result)) + return rs.Cmd(nil, redis_SET, utils.AccountPrefix+acc.ID, string(result)) } func (rs *RedisStorage) RemoveAccountDrv(key string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.ACCOUNT_PREFIX+key) + return rs.Cmd(nil, redis_DEL, utils.AccountPrefix+key) } // Limit will only retrieve the last n items out of history, newest first @@ -519,7 +519,7 @@ func (rs *RedisStorage) GetLoadHistory(limit int, skipCache bool, } if !skipCache { - if x, ok := Cache.Get(utils.LOADINST_KEY, ""); ok { + if x, ok := Cache.Get(utils.LoadInstKey, ""); ok { if x != nil { items := x.([]*utils.LoadInstance) if len(items) < limit || limit == -1 { @@ -536,8 +536,8 @@ func (rs *RedisStorage) GetLoadHistory(limit int, skipCache bool, cCommit := cacheCommit(transactionID) var marshaleds [][]byte if err = rs.Cmd(&marshaleds, redis_LRANGE, - utils.LOADINST_KEY, "0", strconv.Itoa(limit)); err != nil { - if errCh := Cache.Set(utils.LOADINST_KEY, "", nil, nil, + utils.LoadInstKey, "0", strconv.Itoa(limit)); err != nil { + if errCh := Cache.Set(utils.LoadInstKey, "", nil, nil, cCommit, transactionID); errCh != nil { return nil, errCh } @@ -549,10 +549,10 @@ func (rs *RedisStorage) GetLoadHistory(limit int, skipCache bool, return nil, err } } - if err = Cache.Remove(utils.LOADINST_KEY, "", cCommit, transactionID); err != nil { + if err = Cache.Remove(utils.LoadInstKey, "", cCommit, transactionID); err != nil { return nil, err } - if err := Cache.Set(utils.LOADINST_KEY, "", loadInsts, nil, + if err := Cache.Set(utils.LoadInstKey, "", loadInsts, nil, cCommit, transactionID); err != nil { return nil, err } @@ -573,18 +573,18 @@ func (rs *RedisStorage) AddLoadHistory(ldInst *utils.LoadInstance, loadHistSize } _, err = guardian.Guardian.Guard(func() (interface{}, error) { // Make sure we do it locked since other instance can modify history while we read it var histLen int - if err := rs.Cmd(&histLen, redis_LLEN, utils.LOADINST_KEY); err != nil { + if err := rs.Cmd(&histLen, redis_LLEN, utils.LoadInstKey); err != nil { return nil, err } if histLen >= loadHistSize { // Have hit maximum history allowed, remove oldest element in order to add new one - if err = rs.Cmd(nil, redis_RPOP, utils.LOADINST_KEY); err != nil { + if err = rs.Cmd(nil, redis_RPOP, utils.LoadInstKey); err != nil { return nil, err } } - return nil, rs.Cmd(nil, redis_LPUSH, utils.LOADINST_KEY, string(marshaled)) - }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.LOADINST_KEY) + return nil, rs.Cmd(nil, redis_LPUSH, utils.LoadInstKey, string(marshaled)) + }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.LoadInstKey) - if errCh := Cache.Remove(utils.LOADINST_KEY, "", + if errCh := Cache.Remove(utils.LoadInstKey, "", cacheCommit(transactionID), transactionID); errCh != nil { return errCh } @@ -593,7 +593,7 @@ func (rs *RedisStorage) AddLoadHistory(ldInst *utils.LoadInstance, loadHistSize func (rs *RedisStorage) GetActionTriggersDrv(key string) (atrs ActionTriggers, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.ACTION_TRIGGER_PREFIX+key); err != nil { + if err = rs.Cmd(&values, redis_GET, utils.ActionTriggerPrefix+key); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -606,20 +606,20 @@ func (rs *RedisStorage) GetActionTriggersDrv(key string) (atrs ActionTriggers, e func (rs *RedisStorage) SetActionTriggersDrv(key string, atrs ActionTriggers) (err error) { if len(atrs) == 0 { // delete the key - return rs.Cmd(nil, redis_DEL, utils.ACTION_TRIGGER_PREFIX+key) + return rs.Cmd(nil, redis_DEL, utils.ActionTriggerPrefix+key) } var result []byte if result, err = rs.ms.Marshal(atrs); err != nil { return } - if err = rs.Cmd(nil, redis_SET, utils.ACTION_TRIGGER_PREFIX+key, string(result)); err != nil { + if err = rs.Cmd(nil, redis_SET, utils.ActionTriggerPrefix+key, string(result)); err != nil { return } return } func (rs *RedisStorage) RemoveActionTriggersDrv(key string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.ACTION_TRIGGER_PREFIX+key) + return rs.Cmd(nil, redis_DEL, utils.ActionTriggerPrefix+key) } func (rs *RedisStorage) GetActionPlanDrv(key string, skipCache bool, @@ -636,7 +636,7 @@ func (rs *RedisStorage) GetActionPlanDrv(key string, skipCache bool, } } var values []byte - if err = rs.Cmd(&values, redis_GET, utils.ACTION_PLAN_PREFIX+key); err != nil { + if err = rs.Cmd(&values, redis_GET, utils.ActionPlanPrefix+key); err != nil { return } else if len(values) == 0 { if errCh := Cache.Set(utils.CacheActionPlans, key, nil, nil, @@ -666,10 +666,10 @@ func (rs *RedisStorage) GetActionPlanDrv(key string, skipCache bool, func (rs *RedisStorage) RemoveActionPlanDrv(key string, transactionID string) (err error) { cCommit := cacheCommit(transactionID) - if err = rs.Cmd(nil, redis_SREM, utils.ActionPlanIndexes, utils.ACTION_PLAN_PREFIX+key); err != nil { + if err = rs.Cmd(nil, redis_SREM, utils.ActionPlanIndexes, utils.ActionPlanPrefix+key); err != nil { return } - err = rs.Cmd(nil, redis_DEL, utils.ACTION_PLAN_PREFIX+key) + err = rs.Cmd(nil, redis_DEL, utils.ActionPlanPrefix+key) if errCh := Cache.Remove(utils.CacheActionPlans, key, cCommit, transactionID); errCh != nil { return errCh @@ -682,10 +682,10 @@ func (rs *RedisStorage) SetActionPlanDrv(key string, ats *ActionPlan, cCommit := cacheCommit(transactionID) if len(ats.ActionTimings) == 0 { // delete the key - if err = rs.Cmd(nil, redis_SREM, utils.ActionPlanIndexes, utils.ACTION_PLAN_PREFIX+key); err != nil { + if err = rs.Cmd(nil, redis_SREM, utils.ActionPlanIndexes, utils.ActionPlanPrefix+key); err != nil { return } - err = rs.Cmd(nil, redis_DEL, utils.ACTION_PLAN_PREFIX+key) + err = rs.Cmd(nil, redis_DEL, utils.ActionPlanPrefix+key) if errCh := Cache.Remove(utils.CacheActionPlans, key, cCommit, transactionID); errCh != nil { return errCh @@ -711,15 +711,15 @@ func (rs *RedisStorage) SetActionPlanDrv(key string, ats *ActionPlan, w := zlib.NewWriter(&b) w.Write(result) w.Close() - if err = rs.Cmd(nil, redis_SADD, utils.ActionPlanIndexes, utils.ACTION_PLAN_PREFIX+key); err != nil { + if err = rs.Cmd(nil, redis_SADD, utils.ActionPlanIndexes, utils.ActionPlanPrefix+key); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.ACTION_PLAN_PREFIX+key, b.String()) + return rs.Cmd(nil, redis_SET, utils.ActionPlanPrefix+key, b.String()) } func (rs *RedisStorage) GetAllActionPlansDrv() (ats map[string]*ActionPlan, err error) { var keys []string - if keys, err = rs.GetKeysForPrefix(utils.ACTION_PLAN_PREFIX); err != nil { + if keys, err = rs.GetKeysForPrefix(utils.ActionPlanPrefix); err != nil { return } if len(keys) == 0 { @@ -728,7 +728,7 @@ func (rs *RedisStorage) GetAllActionPlansDrv() (ats map[string]*ActionPlan, err } ats = make(map[string]*ActionPlan, len(keys)) for _, key := range keys { - if ats[key[len(utils.ACTION_PLAN_PREFIX):]], err = rs.GetActionPlanDrv(key[len(utils.ACTION_PLAN_PREFIX):], + if ats[key[len(utils.ActionPlanPrefix):]], err = rs.GetActionPlanDrv(key[len(utils.ActionPlanPrefix):], false, utils.NonTransactional); err != nil { return nil, err } @@ -816,12 +816,12 @@ func (rs *RedisStorage) PushTask(t *Task) (err error) { if result, err = rs.ms.Marshal(t); err != nil { return } - return rs.Cmd(nil, redis_RPUSH, utils.TASKS_KEY, string(result)) + return rs.Cmd(nil, redis_RPUSH, utils.TasksKey, string(result)) } func (rs *RedisStorage) PopTask() (t *Task, err error) { var values []byte - if err = rs.Cmd(&values, redis_LPOP, utils.TASKS_KEY); err != nil { + if err = rs.Cmd(&values, redis_LPOP, utils.TasksKey); err != nil { return } t = &Task{} diff --git a/engine/storage_sql.go b/engine/storage_sql.go index 82ca7c6dc..7ace0e9a8 100644 --- a/engine/storage_sql.go +++ b/engine/storage_sql.go @@ -56,7 +56,7 @@ func (self *SQLStorage) ExportGormDB() *gorm.DB { } func (self *SQLStorage) Flush(scriptsPath string) (err error) { - for _, scriptName := range []string{utils.CREATE_CDRS_TABLES_SQL, utils.CREATE_TARIFFPLAN_TABLES_SQL} { + for _, scriptName := range []string{utils.CreateCDRsTablesSQL, utils.CreateTariffPlanTablesSQL} { if err := self.CreateTablesFromScript(path.Join(scriptsPath, scriptName)); err != nil { return err } @@ -219,7 +219,7 @@ func (self *SQLStorage) GetTpTableIds(tpid, table string, distinct utils.TPDisti } finalID := vals[0] if len(vals) > 1 { - finalID = strings.Join(vals, utils.CONCATENATED_KEY_SEP) + finalID = strings.Join(vals, utils.ConcatenatedKeySep) } ids = append(ids, finalID) } diff --git a/engine/storage_test.go b/engine/storage_test.go index 15181e63f..374e42496 100644 --- a/engine/storage_test.go +++ b/engine/storage_test.go @@ -141,9 +141,9 @@ func TestDifferentUuid(t *testing.T) { if err != nil { t.Error("Error getting account: ", err) } - if a1.BalanceMap[utils.VOICE][0].Uuid == a2.BalanceMap[utils.VOICE][0].Uuid || - a1.BalanceMap[utils.MONETARY][0].Uuid == a2.BalanceMap[utils.MONETARY][0].Uuid { - t.Errorf("Identical uuids in different accounts: %+v <-> %+v", a1.BalanceMap[utils.VOICE][0], a1.BalanceMap[utils.MONETARY][0]) + if a1.BalanceMap[utils.MetaVoice][0].Uuid == a2.BalanceMap[utils.MetaVoice][0].Uuid || + a1.BalanceMap[utils.MetaMonetary][0].Uuid == a2.BalanceMap[utils.MetaMonetary][0].Uuid { + t.Errorf("Identical uuids in different accounts: %+v <-> %+v", a1.BalanceMap[utils.MetaVoice][0], a1.BalanceMap[utils.MetaMonetary][0]) } } @@ -193,7 +193,7 @@ func GetUB() *Account { ID: "some_uuid", ThresholdValue: 100.0, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("NAT")), }, Weight: 10.0, @@ -205,11 +205,11 @@ func GetUB() *Account { ID: "rif", AllowNegative: true, BalanceMap: map[string]Balances{ - utils.SMS: {&Balance{Value: 14, ExpirationDate: zeroTime}}, - utils.DATA: {&Balance{Value: 1024, ExpirationDate: zeroTime}}, - utils.VOICE: {&Balance{Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, + utils.MetaSMS: {&Balance{Value: 14, ExpirationDate: zeroTime}}, + utils.MetaData: {&Balance{Value: 1024, ExpirationDate: zeroTime}}, + utils.MetaVoice: {&Balance{Weight: 20, DestinationIDs: utils.NewStringMap("NAT")}, &Balance{Weight: 10, DestinationIDs: utils.NewStringMap("RET")}}}, - UnitCounters: UnitCounters{utils.SMS: []*UnitCounter{uc, uc}}, + UnitCounters: UnitCounters{utils.MetaSMS: []*UnitCounter{uc, uc}}, ActionTriggers: ActionTriggers{at, at, at}, } return ub diff --git a/engine/suretax.go b/engine/suretax.go index a0065c41e..966c6b908 100644 --- a/engine/suretax.go +++ b/engine/suretax.go @@ -232,6 +232,6 @@ func SureTaxProcessCdr(cdr *CDR) error { utils.MetaRoundingMiddle) } // Add response into extra fields to be available for later review - cdr.ExtraFields[utils.META_SURETAX] = respFull.D + cdr.ExtraFields[utils.MetaSureTax] = respFull.D return nil } diff --git a/engine/suretax_test.go b/engine/suretax_test.go index 9a02ccce3..e2b435a5e 100644 --- a/engine/suretax_test.go +++ b/engine/suretax_test.go @@ -29,9 +29,9 @@ import ( func TestNewSureTaxRequest(t *testing.T) { CGRID := utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()) - cdr := &CDR{CGRID: CGRID, OrderID: 123, ToR: utils.VOICE, + cdr := &CDR{CGRID: CGRID, OrderID: 123, ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, RequestType: utils.MetaRated, + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), diff --git a/engine/thresholds.go b/engine/thresholds.go index 84533ff20..e11838a3f 100644 --- a/engine/thresholds.go +++ b/engine/thresholds.go @@ -432,7 +432,7 @@ func (tS *ThresholdService) V1GetThresholdIDs(tenant string, tIDs *[]string) (er if tenant == utils.EmptyString { tenant = tS.cgrcfg.GeneralCfg().DefaultTenant } - prfx := utils.ThresholdPrefix + tenant + utils.CONCATENATED_KEY_SEP + prfx := utils.ThresholdPrefix + tenant + utils.ConcatenatedKeySep keys, err := tS.dm.DataDB().GetKeysForPrefix(prfx) if err != nil { return err diff --git a/engine/timespans_test.go b/engine/timespans_test.go index d9f0899ce..a02a50855 100644 --- a/engine/timespans_test.go +++ b/engine/timespans_test.go @@ -1513,7 +1513,7 @@ func TestIncrementsCompressDecompress(t *testing.T) { Duration: time.Minute, Cost: 2, BalanceInfo: &DebitInfo{ - Unit: &UnitInfo{UUID: "1", Value: 25, DestinationID: "1", Consumed: 1, ToR: utils.VOICE, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, + Unit: &UnitInfo{UUID: "1", Value: 25, DestinationID: "1", Consumed: 1, ToR: utils.MetaVoice, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, Monetary: &MonetaryInfo{UUID: "2", Value: 98}, AccountID: "3"}, }, @@ -1521,7 +1521,7 @@ func TestIncrementsCompressDecompress(t *testing.T) { Duration: time.Minute, Cost: 2, BalanceInfo: &DebitInfo{ - Unit: &UnitInfo{UUID: "1", Value: 24, DestinationID: "1", Consumed: 1, ToR: utils.VOICE, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, + Unit: &UnitInfo{UUID: "1", Value: 24, DestinationID: "1", Consumed: 1, ToR: utils.MetaVoice, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, Monetary: &MonetaryInfo{UUID: "2", Value: 96}, AccountID: "3"}, }, @@ -1529,7 +1529,7 @@ func TestIncrementsCompressDecompress(t *testing.T) { Duration: time.Minute, Cost: 2, BalanceInfo: &DebitInfo{ - Unit: &UnitInfo{UUID: "1", Value: 23, DestinationID: "1", Consumed: 1, ToR: utils.VOICE, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, + Unit: &UnitInfo{UUID: "1", Value: 23, DestinationID: "1", Consumed: 1, ToR: utils.MetaVoice, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, Monetary: &MonetaryInfo{UUID: "2", Value: 94}, AccountID: "3"}, }, @@ -1537,7 +1537,7 @@ func TestIncrementsCompressDecompress(t *testing.T) { Duration: time.Minute, Cost: 2, BalanceInfo: &DebitInfo{ - Unit: &UnitInfo{UUID: "1", Value: 22, DestinationID: "1", Consumed: 1, ToR: utils.VOICE, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 1111 * time.Second, RateUnit: time.Second}}}}}, + Unit: &UnitInfo{UUID: "1", Value: 22, DestinationID: "1", Consumed: 1, ToR: utils.MetaVoice, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 1111 * time.Second, RateUnit: time.Second}}}}}, Monetary: &MonetaryInfo{UUID: "2", Value: 92}, AccountID: "3"}, }, @@ -1545,7 +1545,7 @@ func TestIncrementsCompressDecompress(t *testing.T) { Duration: time.Minute, Cost: 2, BalanceInfo: &DebitInfo{ - Unit: &UnitInfo{UUID: "1", Value: 21, DestinationID: "1", Consumed: 1, ToR: utils.VOICE, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, + Unit: &UnitInfo{UUID: "1", Value: 21, DestinationID: "1", Consumed: 1, ToR: utils.MetaVoice, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, Monetary: &MonetaryInfo{UUID: "2", Value: 90}, AccountID: "3"}, }, @@ -1570,7 +1570,7 @@ func TestMultipleIncrementsCompressDecompress(t *testing.T) { Duration: time.Minute, Cost: 10.4, BalanceInfo: &DebitInfo{ - Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.VOICE, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, + Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.MetaVoice, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, Monetary: &MonetaryInfo{UUID: "2"}, AccountID: "3"}, }, @@ -1578,7 +1578,7 @@ func TestMultipleIncrementsCompressDecompress(t *testing.T) { Duration: time.Minute, Cost: 10.4, BalanceInfo: &DebitInfo{ - Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.VOICE, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, + Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.MetaVoice, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, Monetary: &MonetaryInfo{UUID: "2"}, AccountID: "3"}, }, @@ -1586,7 +1586,7 @@ func TestMultipleIncrementsCompressDecompress(t *testing.T) { Duration: time.Minute, Cost: 10.4, BalanceInfo: &DebitInfo{ - Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.VOICE, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, + Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.MetaVoice, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, Monetary: &MonetaryInfo{UUID: "2"}, AccountID: "3"}, }, @@ -1594,7 +1594,7 @@ func TestMultipleIncrementsCompressDecompress(t *testing.T) { Duration: time.Minute, Cost: 10.4, BalanceInfo: &DebitInfo{ - Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.VOICE, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 1111 * time.Second, RateUnit: time.Second}}}}}, + Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.MetaVoice, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 1111 * time.Second, RateUnit: time.Second}}}}}, Monetary: &MonetaryInfo{UUID: "2"}, AccountID: "3"}, }, @@ -1602,7 +1602,7 @@ func TestMultipleIncrementsCompressDecompress(t *testing.T) { Duration: time.Minute, Cost: 10.4, BalanceInfo: &DebitInfo{ - Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.VOICE, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, + Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.MetaVoice, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, Monetary: &MonetaryInfo{UUID: "2"}, AccountID: "3"}, }, @@ -1873,7 +1873,7 @@ func TestMerge(t *testing.T) { Duration: time.Minute, Cost: 1, BalanceInfo: &DebitInfo{ - Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.VOICE, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, + Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.MetaVoice, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, Monetary: &MonetaryInfo{UUID: "2"}, AccountID: "3"}, CompressFactor: 3, @@ -1902,7 +1902,7 @@ func TestMerge(t *testing.T) { Duration: time.Minute, Cost: 1, BalanceInfo: &DebitInfo{ - Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.VOICE, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, + Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.MetaVoice, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, Monetary: &MonetaryInfo{UUID: "2"}, AccountID: "3"}, }, @@ -1910,7 +1910,7 @@ func TestMerge(t *testing.T) { Duration: time.Minute, Cost: 1, BalanceInfo: &DebitInfo{ - Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.VOICE, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, + Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.MetaVoice, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, Monetary: &MonetaryInfo{UUID: "2"}, AccountID: "3"}, }, @@ -1938,7 +1938,7 @@ func TestMerge(t *testing.T) { Duration: time.Minute, Cost: 1, BalanceInfo: &DebitInfo{ - Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.VOICE, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, + Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.MetaVoice, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, Monetary: &MonetaryInfo{UUID: "2"}, AccountID: "3"}, CompressFactor: 3, @@ -1947,7 +1947,7 @@ func TestMerge(t *testing.T) { Duration: time.Minute, Cost: 1, BalanceInfo: &DebitInfo{ - Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.VOICE, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, + Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.MetaVoice, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, Monetary: &MonetaryInfo{UUID: "2"}, AccountID: "3"}, CompressFactor: 1, @@ -1956,7 +1956,7 @@ func TestMerge(t *testing.T) { Duration: time.Minute, Cost: 1, BalanceInfo: &DebitInfo{ - Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.VOICE, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, + Unit: &UnitInfo{UUID: "1", DestinationID: "1", Consumed: 2.3, ToR: utils.MetaVoice, RateInterval: &RateInterval{Rating: &RIRate{Rates: RateGroups{&RGRate{GroupIntervalStart: 0, Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}}, Monetary: &MonetaryInfo{UUID: "2"}, AccountID: "3"}, CompressFactor: 1, diff --git a/engine/tpimporter_csv.go b/engine/tpimporter_csv.go index af3dc7f0b..5ad94382a 100644 --- a/engine/tpimporter_csv.go +++ b/engine/tpimporter_csv.go @@ -170,7 +170,7 @@ func (self *TPCSVImporter) importRatingProfiles(fn string) error { if err != nil { return err } - loadId := utils.CSV_LOAD //Autogenerate rating profile id + loadId := utils.CSVLoad //Autogenerate rating profile id if self.ImportId != "" { loadId += "_" + self.ImportId } @@ -251,7 +251,7 @@ func (self *TPCSVImporter) importAccountActions(fn string) error { if err != nil { return err } - loadId := utils.CSV_LOAD //Autogenerate rating profile id + loadId := utils.CSVLoad //Autogenerate rating profile id if self.ImportId != "" { loadId += "_" + self.ImportId } diff --git a/engine/tpreader.go b/engine/tpreader.go index 15384df17..c89529eb3 100644 --- a/engine/tpreader.go +++ b/engine/tpreader.go @@ -340,7 +340,7 @@ func (tpr *TpReader) LoadRatingProfilesFiltered(qriedRpf *utils.TPRatingProfile) } _, exists := tpr.ratingPlans[tpRa.RatingPlanId] if !exists && tpr.dm.dataDB != nil { - if exists, err = tpr.dm.HasData(utils.RATING_PLAN_PREFIX, tpRa.RatingPlanId, ""); err != nil { + if exists, err = tpr.dm.HasData(utils.RatingPlanPrefix, tpRa.RatingPlanId, ""); err != nil { return err } } @@ -381,7 +381,7 @@ func (tpr *TpReader) LoadRatingProfiles() (err error) { } _, exists := tpr.ratingPlans[tpRa.RatingPlanId] if !exists && tpr.dm.dataDB != nil { // Only query if there is a connection, eg on dry run there is none - if exists, err = tpr.dm.HasData(utils.RATING_PLAN_PREFIX, tpRa.RatingPlanId, ""); err != nil { + if exists, err = tpr.dm.HasData(utils.RatingPlanPrefix, tpRa.RatingPlanId, ""); err != nil { return err } } @@ -556,7 +556,7 @@ func (tpr *TpReader) LoadActionPlans() (err error) { _, exists := tpr.actions[at.ActionsId] if !exists && tpr.dm.dataDB != nil { - if exists, err = tpr.dm.HasData(utils.ACTION_PREFIX, at.ActionsId, ""); err != nil { + if exists, err = tpr.dm.HasData(utils.ActionPrefix, at.ActionsId, ""); err != nil { return fmt.Errorf("[ActionPlans] Error querying actions: %v - %s", at.ActionsId, err.Error()) } } @@ -2033,7 +2033,7 @@ func (tpr *TpReader) GetLoadedIds(categ string) ([]string, error) { i++ } return keys, nil - case utils.REVERSE_DESTINATION_PREFIX: + case utils.ReverseDestinationPrefix: keys := utils.StringSet{} for _, dst := range tpr.destinations { for _, prfx := range dst.Prefixes { @@ -2041,7 +2041,7 @@ func (tpr *TpReader) GetLoadedIds(categ string) ([]string, error) { } } return keys.AsSlice(), nil - case utils.RATING_PLAN_PREFIX: + case utils.RatingPlanPrefix: keys := make([]string, len(tpr.ratingPlans)) i := 0 for k := range tpr.ratingPlans { @@ -2049,7 +2049,7 @@ func (tpr *TpReader) GetLoadedIds(categ string) ([]string, error) { i++ } return keys, nil - case utils.RATING_PROFILE_PREFIX: + case utils.RatingProfilePrefix: keys := make([]string, len(tpr.ratingProfiles)) i := 0 for k := range tpr.ratingProfiles { @@ -2057,7 +2057,7 @@ func (tpr *TpReader) GetLoadedIds(categ string) ([]string, error) { i++ } return keys, nil - case utils.ACTION_PREFIX: + case utils.ActionPrefix: keys := make([]string, len(tpr.actions)) i := 0 for k := range tpr.actions { @@ -2065,7 +2065,7 @@ func (tpr *TpReader) GetLoadedIds(categ string) ([]string, error) { i++ } return keys, nil - case utils.ACTION_PLAN_PREFIX: // actionPlans + case utils.ActionPlanPrefix: // actionPlans keys := make([]string, len(tpr.actionPlans)) i := 0 for k := range tpr.actionPlans { @@ -2081,7 +2081,7 @@ func (tpr *TpReader) GetLoadedIds(categ string) ([]string, error) { i++ } return keys, nil - case utils.SHARED_GROUP_PREFIX: + case utils.SharedGroupPrefix: keys := make([]string, len(tpr.sharedGroups)) i := 0 for k := range tpr.sharedGroups { @@ -2097,7 +2097,7 @@ func (tpr *TpReader) GetLoadedIds(categ string) ([]string, error) { i++ } return keys, nil - case utils.ACTION_TRIGGER_PREFIX: + case utils.ActionTriggerPrefix: keys := make([]string, len(tpr.actionsTriggers)) i := 0 for k := range tpr.actionsTriggers { @@ -2465,7 +2465,7 @@ func (tpr *TpReader) RemoveFromDatabase(verbose, disableReverse bool) (err error if verbose { log.Print("Removing reverse destinations") } - if err = tpr.dm.DataDB().RemoveKeysForPrefix(utils.REVERSE_DESTINATION_PREFIX); err != nil { + if err = tpr.dm.DataDB().RemoveKeysForPrefix(utils.ReverseDestinationPrefix); err != nil { return } } @@ -2577,15 +2577,15 @@ func (tpr *TpReader) ReloadCache(caching string, verbose bool, opts map[string]i } // take IDs for each type dstIds, _ := tpr.GetLoadedIds(utils.DestinationPrefix) - revDstIDs, _ := tpr.GetLoadedIds(utils.REVERSE_DESTINATION_PREFIX) - rplIds, _ := tpr.GetLoadedIds(utils.RATING_PLAN_PREFIX) - rpfIds, _ := tpr.GetLoadedIds(utils.RATING_PROFILE_PREFIX) - actIds, _ := tpr.GetLoadedIds(utils.ACTION_PREFIX) + revDstIDs, _ := tpr.GetLoadedIds(utils.ReverseDestinationPrefix) + rplIds, _ := tpr.GetLoadedIds(utils.RatingPlanPrefix) + rpfIds, _ := tpr.GetLoadedIds(utils.RatingProfilePrefix) + actIds, _ := tpr.GetLoadedIds(utils.ActionPrefix) aapIDs, _ := tpr.GetLoadedIds(utils.AccountActionPlansPrefix) - shgIds, _ := tpr.GetLoadedIds(utils.SHARED_GROUP_PREFIX) + shgIds, _ := tpr.GetLoadedIds(utils.SharedGroupPrefix) rspIDs, _ := tpr.GetLoadedIds(utils.ResourceProfilesPrefix) resIDs, _ := tpr.GetLoadedIds(utils.ResourcesPrefix) - aatIDs, _ := tpr.GetLoadedIds(utils.ACTION_TRIGGER_PREFIX) + aatIDs, _ := tpr.GetLoadedIds(utils.ActionTriggerPrefix) stqIDs, _ := tpr.GetLoadedIds(utils.StatQueuePrefix) stqpIDs, _ := tpr.GetLoadedIds(utils.StatQueueProfilePrefix) trsIDs, _ := tpr.GetLoadedIds(utils.ThresholdPrefix) @@ -2598,7 +2598,7 @@ func (tpr *TpReader) ReloadCache(caching string, verbose bool, opts map[string]i dphIDs, _ := tpr.GetLoadedIds(utils.DispatcherHostPrefix) ratePrfIDs, _ := tpr.GetLoadedIds(utils.RateProfilePrefix) actionPrfIDs, _ := tpr.GetLoadedIds(utils.ActionProfilePrefix) - aps, _ := tpr.GetLoadedIds(utils.ACTION_PLAN_PREFIX) + aps, _ := tpr.GetLoadedIds(utils.ActionPlanPrefix) accountPrfIDs, _ := tpr.GetLoadedIds(utils.AccountProfilePrefix) //compose Reload Cache argument @@ -2720,7 +2720,7 @@ func (tpr *TpReader) ReloadCache(caching string, verbose bool, opts map[string]i func (tpr *TpReader) ReloadScheduler(verbose bool) (err error) { var reply string - aps, _ := tpr.GetLoadedIds(utils.ACTION_PLAN_PREFIX) + aps, _ := tpr.GetLoadedIds(utils.ActionPlanPrefix) // in case we have action plans reload the scheduler if len(aps) == 0 { return diff --git a/engine/units_counter.go b/engine/units_counter.go index 77f883c7c..b0f2a5fce 100644 --- a/engine/units_counter.go +++ b/engine/units_counter.go @@ -117,15 +117,15 @@ func (ucs UnitCounters) addUnits(amount float64, kind string, cc *CallCost, b *B continue } if uc.CounterType == "" { - uc.CounterType = utils.COUNTER_EVENT + uc.CounterType = utils.MetaCounterEvent } for _, c := range uc.Counters { - if uc.CounterType == utils.COUNTER_EVENT && cc != nil && cc.MatchCCFilter(c.Filter) { + if uc.CounterType == utils.MetaCounterEvent && cc != nil && cc.MatchCCFilter(c.Filter) { c.Value += amount continue } - if uc.CounterType == utils.COUNTER_BALANCE && b != nil && b.MatchFilter(c.Filter, true, false) { + if uc.CounterType == utils.MetaCounterBalance && b != nil && b.MatchFilter(c.Filter, true, false) { c.Value += amount continue } diff --git a/engine/units_counter_test.go b/engine/units_counter_test.go index 8ba8e84c9..133eb0aef 100644 --- a/engine/units_counter_test.go +++ b/engine/units_counter_test.go @@ -146,7 +146,7 @@ func TestUnitsCounterAddBalance(t *testing.T) { &CounterFilter{Filter: &BalanceFilter{Weight: utils.Float64Pointer(10), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("RET"))}}}, } - UnitCounters{utils.SMS: []*UnitCounter{uc}}.addUnits(20, utils.SMS, + UnitCounters{utils.MetaSMS: []*UnitCounter{uc}}.addUnits(20, utils.MetaSMS, &CallCost{Destination: "test"}, nil) if len(uc.Counters) != 3 { t.Error("Error adding minute bucket: ", uc.Counters) @@ -161,8 +161,8 @@ func TestUnitsCounterAddBalanceExists(t *testing.T) { &CounterFilter{Filter: &BalanceFilter{Weight: utils.Float64Pointer(10), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("RET"))}}}, } - UnitCounters{utils.SMS: []*UnitCounter{uc}}.addUnits(5, - utils.SMS, &CallCost{Destination: "0723"}, nil) + UnitCounters{utils.MetaSMS: []*UnitCounter{uc}}.addUnits(5, + utils.MetaSMS, &CallCost{Destination: "0723"}, nil) if len(uc.Counters) != 3 || uc.Counters[1].Value != 15 { t.Error("Error adding minute bucket!") } @@ -173,61 +173,61 @@ func TestUnitCountersCountAllMonetary(t *testing.T) { ActionTriggers: ActionTriggers{ &ActionTrigger{ UniqueID: "TestTR1", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR11", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR2", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR3", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR4", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.SMS), + Type: utils.StringPointer(utils.MetaSMS), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR5", - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.SMS), + Type: utils.StringPointer(utils.MetaSMS), Weight: utils.Float64Pointer(10), }, }, }, } a.InitCounters() - a.UnitCounters.addUnits(10, utils.MONETARY, &CallCost{}, nil) + a.UnitCounters.addUnits(10, utils.MetaMonetary, &CallCost{}, nil) if len(a.UnitCounters) != 3 || - len(a.UnitCounters[utils.MONETARY][0].Counters) != 2 || - a.UnitCounters[utils.MONETARY][0].Counters[0].Value != 10 || - a.UnitCounters[utils.MONETARY][0].Counters[1].Value != 10 { + len(a.UnitCounters[utils.MetaMonetary][0].Counters) != 2 || + a.UnitCounters[utils.MetaMonetary][0].Counters[0].Value != 10 || + a.UnitCounters[utils.MetaMonetary][0].Counters[1].Value != 10 { for key, counters := range a.UnitCounters { t.Log(key) for _, uc := range counters { @@ -246,60 +246,60 @@ func TestUnitCountersCountAllMonetaryId(t *testing.T) { ActionTriggers: ActionTriggers{ &ActionTrigger{ UniqueID: "TestTR1", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR11", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Weight: utils.Float64Pointer(20), }, }, &ActionTrigger{ UniqueID: "TestTR2", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR3", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR4", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.SMS), + Type: utils.StringPointer(utils.MetaSMS), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR5", - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.SMS), + Type: utils.StringPointer(utils.MetaSMS), Weight: utils.Float64Pointer(10), }, }, }, } a.InitCounters() - a.UnitCounters.addUnits(10, utils.MONETARY, nil, &Balance{Weight: 20}) + a.UnitCounters.addUnits(10, utils.MetaMonetary, nil, &Balance{Weight: 20}) if len(a.UnitCounters) != 3 || - len(a.UnitCounters[utils.MONETARY][0].Counters) != 2 || - a.UnitCounters[utils.MONETARY][0].Counters[0].Value != 0 || - a.UnitCounters[utils.MONETARY][0].Counters[1].Value != 10 { + len(a.UnitCounters[utils.MetaMonetary][0].Counters) != 2 || + a.UnitCounters[utils.MetaMonetary][0].Counters[0].Value != 0 || + a.UnitCounters[utils.MetaMonetary][0].Counters[1].Value != 10 { for key, counters := range a.UnitCounters { t.Log(key) for _, uc := range counters { @@ -318,71 +318,71 @@ func TestUnitCountersCountAllVoiceDestinationEvent(t *testing.T) { ActionTriggers: ActionTriggers{ &ActionTrigger{ UniqueID: "TestTR1", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR11", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Weight: utils.Float64Pointer(20), }, }, &ActionTrigger{ UniqueID: "TestTR2", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("NAT")), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR22", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("RET")), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR3", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR4", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.SMS), + Type: utils.StringPointer(utils.MetaSMS), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR5", - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.SMS), + Type: utils.StringPointer(utils.MetaSMS), Weight: utils.Float64Pointer(10), }, }, }, } a.InitCounters() - a.UnitCounters.addUnits(10, utils.VOICE, &CallCost{Destination: "0723045326"}, nil) + a.UnitCounters.addUnits(10, utils.MetaVoice, &CallCost{Destination: "0723045326"}, nil) if len(a.UnitCounters) != 3 || - len(a.UnitCounters[utils.VOICE][0].Counters) != 2 || - a.UnitCounters[utils.VOICE][0].Counters[0].Value != 10 || - a.UnitCounters[utils.VOICE][0].Counters[1].Value != 10 { + len(a.UnitCounters[utils.MetaVoice][0].Counters) != 2 || + a.UnitCounters[utils.MetaVoice][0].Counters[0].Value != 10 || + a.UnitCounters[utils.MetaVoice][0].Counters[1].Value != 10 { for key, counters := range a.UnitCounters { t.Log(key) for _, uc := range counters { @@ -401,71 +401,71 @@ func TestUnitCountersKeepValuesAfterInit(t *testing.T) { ActionTriggers: ActionTriggers{ &ActionTrigger{ UniqueID: "TestTR1", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR11", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Weight: utils.Float64Pointer(20), }, }, &ActionTrigger{ UniqueID: "TestTR2", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("NAT")), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR22", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("RET")), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR3", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR4", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.SMS), + Type: utils.StringPointer(utils.MetaSMS), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR5", - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.SMS), + Type: utils.StringPointer(utils.MetaSMS), Weight: utils.Float64Pointer(10), }, }, }, } a.InitCounters() - a.UnitCounters.addUnits(10, utils.VOICE, &CallCost{Destination: "0723045326"}, nil) + a.UnitCounters.addUnits(10, utils.MetaVoice, &CallCost{Destination: "0723045326"}, nil) if len(a.UnitCounters) != 3 || - len(a.UnitCounters[utils.VOICE][0].Counters) != 2 || - a.UnitCounters[utils.VOICE][0].Counters[0].Value != 10 || - a.UnitCounters[utils.VOICE][0].Counters[1].Value != 10 { + len(a.UnitCounters[utils.MetaVoice][0].Counters) != 2 || + a.UnitCounters[utils.MetaVoice][0].Counters[0].Value != 10 || + a.UnitCounters[utils.MetaVoice][0].Counters[1].Value != 10 { for key, counters := range a.UnitCounters { t.Log(key) for _, uc := range counters { @@ -480,9 +480,9 @@ func TestUnitCountersKeepValuesAfterInit(t *testing.T) { a.InitCounters() if len(a.UnitCounters) != 3 || - len(a.UnitCounters[utils.VOICE][0].Counters) != 2 || - a.UnitCounters[utils.VOICE][0].Counters[0].Value != 10 || - a.UnitCounters[utils.VOICE][0].Counters[1].Value != 10 { + len(a.UnitCounters[utils.MetaVoice][0].Counters) != 2 || + a.UnitCounters[utils.MetaVoice][0].Counters[0].Value != 10 || + a.UnitCounters[utils.MetaVoice][0].Counters[1].Value != 10 { for key, counters := range a.UnitCounters { t.Log(key) for _, uc := range counters { @@ -501,61 +501,61 @@ func TestUnitCountersResetCounterById(t *testing.T) { ActionTriggers: ActionTriggers{ &ActionTrigger{ UniqueID: "TestTR1", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR11", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR2", - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR3", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR4", - ThresholdType: utils.TRIGGER_MAX_BALANCE_COUNTER, + ThresholdType: utils.TriggerMaxBalanceCounter, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.SMS), + Type: utils.StringPointer(utils.MetaSMS), Weight: utils.Float64Pointer(10), }, }, &ActionTrigger{ UniqueID: "TestTR5", - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.SMS), + Type: utils.StringPointer(utils.MetaSMS), Weight: utils.Float64Pointer(10), }, }, }, } a.InitCounters() - a.UnitCounters.addUnits(10, utils.MONETARY, &CallCost{}, nil) + a.UnitCounters.addUnits(10, utils.MetaMonetary, &CallCost{}, nil) if len(a.UnitCounters) != 3 || - len(a.UnitCounters[utils.MONETARY][0].Counters) != 2 || - a.UnitCounters[utils.MONETARY][0].Counters[0].Value != 10 || - a.UnitCounters[utils.MONETARY][0].Counters[1].Value != 10 { + len(a.UnitCounters[utils.MetaMonetary][0].Counters) != 2 || + a.UnitCounters[utils.MetaMonetary][0].Counters[0].Value != 10 || + a.UnitCounters[utils.MetaMonetary][0].Counters[1].Value != 10 { for key, counters := range a.UnitCounters { t.Log(key) for _, uc := range counters { @@ -569,14 +569,14 @@ func TestUnitCountersResetCounterById(t *testing.T) { } a.UnitCounters.resetCounters(&Action{ Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), ID: utils.StringPointer("TestTR11"), }, }) if len(a.UnitCounters) != 3 || - len(a.UnitCounters[utils.MONETARY][0].Counters) != 2 || - a.UnitCounters[utils.MONETARY][0].Counters[0].Value != 10 || - a.UnitCounters[utils.MONETARY][0].Counters[1].Value != 0 { + len(a.UnitCounters[utils.MetaMonetary][0].Counters) != 2 || + a.UnitCounters[utils.MetaMonetary][0].Counters[0].Value != 10 || + a.UnitCounters[utils.MetaMonetary][0].Counters[1].Value != 0 { for key, counters := range a.UnitCounters { t.Log(key) for _, uc := range counters { diff --git a/engine/z_actions2_it_test.go b/engine/z_actions2_it_test.go index 64aaba4c1..914d2ab85 100644 --- a/engine/z_actions2_it_test.go +++ b/engine/z_actions2_it_test.go @@ -248,7 +248,7 @@ func testActionsUpdateBalance(t *testing.T) { t.Errorf("Calling APIerSv1.SetAccount received: %s", reply) } topupAction := &utils.AttrSetActions{ActionsId: "ACT_TOPUP_RST", Actions: []*utils.TPAction{ - {Identifier: utils.TOPUP, BalanceId: "test", BalanceType: utils.MONETARY, Units: "5", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, + {Identifier: utils.TOPUP, BalanceId: "test", BalanceType: utils.MetaMonetary, Units: "5", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, }} if err := actsRPC.Call(utils.APIerSv2SetActions, topupAction, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) @@ -280,10 +280,10 @@ func testActionsUpdateBalance(t *testing.T) { attrs2 := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "testAcc"} if err := actsRPC.Call(utils.APIerSv2GetAccount, attrs2, &acc); err != nil { t.Error("Got error on APIerSv1.GetAccount: ", err.Error()) - } else if acc.BalanceMap[utils.MONETARY][0].ID != "test" { - t.Errorf("Expected test result received %v ", acc.BalanceMap[utils.MONETARY][0].ID) - } else if acc.BalanceMap[utils.MONETARY][0].Blocker != true { - t.Errorf("Expected true result received %v ", acc.BalanceMap[utils.MONETARY][0].Blocker) + } else if acc.BalanceMap[utils.MetaMonetary][0].ID != "test" { + t.Errorf("Expected test result received %v ", acc.BalanceMap[utils.MetaMonetary][0].ID) + } else if acc.BalanceMap[utils.MetaMonetary][0].Blocker != true { + t.Errorf("Expected true result received %v ", acc.BalanceMap[utils.MetaMonetary][0].Blocker) } } diff --git a/engine/z_actions_it_test.go b/engine/z_actions_it_test.go index eff069f7b..0729418ae 100644 --- a/engine/z_actions_it_test.go +++ b/engine/z_actions_it_test.go @@ -128,7 +128,7 @@ func testActionsitSetCdrlogDebit(t *testing.T) { t.Errorf("Calling APIerSv1.SetAccount received: %s", reply) } attrsAA := &utils.AttrSetActions{ActionsId: "ACTS_1", Actions: []*utils.TPAction{ - {Identifier: utils.DEBIT, BalanceType: utils.MONETARY, Units: "5", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, + {Identifier: utils.DEBIT, BalanceType: utils.MetaMonetary, Units: "5", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, {Identifier: utils.CDRLOG}, }} if err := actsLclRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { @@ -148,7 +148,7 @@ func testActionsitSetCdrlogDebit(t *testing.T) { t.Error("Unexpected error: ", err.Error()) } else if len(rcvedCdrs) != 1 { t.Error("Unexpected number of CDRs returned: ", len(rcvedCdrs)) - } else if rcvedCdrs[0].ToR != utils.MONETARY || + } else if rcvedCdrs[0].ToR != utils.MetaMonetary || rcvedCdrs[0].OriginHost != "127.0.0.1" || rcvedCdrs[0].Source != utils.CDRLOG || rcvedCdrs[0].RequestType != utils.MetaNone || @@ -171,7 +171,7 @@ func testActionsitSetCdrlogTopup(t *testing.T) { t.Errorf("Calling APIerSv1.SetAccount received: %s", reply) } attrsAA := &utils.AttrSetActions{ActionsId: "ACTS_2", Actions: []*utils.TPAction{ - {Identifier: utils.TOPUP, BalanceType: utils.MONETARY, Units: "5", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, + {Identifier: utils.TOPUP, BalanceType: utils.MetaMonetary, Units: "5", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, {Identifier: utils.CDRLOG}, }} if err := actsLclRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { @@ -191,7 +191,7 @@ func testActionsitSetCdrlogTopup(t *testing.T) { t.Error("Unexpected error: ", err.Error()) } else if len(rcvedCdrs) != 1 { t.Error("Unexpected number of CDRs returned: ", len(rcvedCdrs)) - } else if rcvedCdrs[0].ToR != utils.MONETARY || + } else if rcvedCdrs[0].ToR != utils.MetaMonetary || rcvedCdrs[0].OriginHost != "127.0.0.1" || rcvedCdrs[0].Source != utils.CDRLOG || rcvedCdrs[0].RequestType != utils.MetaNone || @@ -209,7 +209,7 @@ func testActionsitCdrlogEmpty(t *testing.T) { var reply string attrsSetAccount := &utils.AttrSetAccount{Tenant: "cgrates.org", Account: "dan2904"} attrsAA := &utils.AttrSetActions{ActionsId: "ACTS_3", Actions: []*utils.TPAction{ - {Identifier: utils.DEBIT, BalanceType: utils.MONETARY, DestinationIds: "RET", + {Identifier: utils.DEBIT, BalanceType: utils.MetaMonetary, DestinationIds: "RET", Units: "5", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, {Identifier: utils.CDRLOG}, }} @@ -244,11 +244,11 @@ func testActionsitCdrlogWithParams(t *testing.T) { attrsSetAccount := &utils.AttrSetAccount{Tenant: "cgrates.org", Account: "dan2904"} attrsAA := &utils.AttrSetActions{ActionsId: "ACTS_4", Actions: []*utils.TPAction{ - {Identifier: utils.DEBIT, BalanceType: utils.MONETARY, + {Identifier: utils.DEBIT, BalanceType: utils.MetaMonetary, DestinationIds: "RET", Units: "25", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, {Identifier: utils.CDRLOG, ExtraParameters: `{"RequestType":"*pseudoprepaid","Subject":"DifferentThanAccount", "ToR":"~ActionType:s/^\\*(.*)$/did_$1/"}`}, - {Identifier: utils.DEBIT_RESET, BalanceType: utils.MONETARY, + {Identifier: utils.DEBIT_RESET, BalanceType: utils.MetaMonetary, DestinationIds: "RET", Units: "25", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, }, } @@ -284,7 +284,7 @@ func testActionsitCdrlogWithParams2(t *testing.T) { attrsAA := &utils.AttrSetActions{ ActionsId: "CustomAction", Actions: []*utils.TPAction{ - {Identifier: utils.DEBIT, BalanceType: utils.MONETARY, + {Identifier: utils.DEBIT, BalanceType: utils.MetaMonetary, DestinationIds: "RET", Units: "25", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, {Identifier: utils.CDRLOG, ExtraParameters: `{"RequestType":"*pseudoprepaid", "Usage":"10", "Subject":"testActionsitCdrlogWithParams2", "ToR":"~ActionType:s/^\\*(.*)$/did_$1/"}`}, @@ -325,7 +325,7 @@ func testActionsitThresholdCDrLog(t *testing.T) { t.Errorf("Calling APIerSv1.SetAccount received: %s", reply) } attrsAA := &utils.AttrSetActions{ActionsId: "ACT_TH_CDRLOG", Actions: []*utils.TPAction{ - {Identifier: utils.TOPUP, BalanceType: utils.MONETARY, Units: "5", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, + {Identifier: utils.TOPUP, BalanceType: utils.MetaMonetary, Units: "5", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, {Identifier: utils.CDRLOG}, }} if err := actsLclRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { @@ -380,9 +380,9 @@ func testActionsitThresholdCDrLog(t *testing.T) { utils.RunID: utils.MetaRaw, utils.OrderID: 123, utils.OriginHost: "192.168.1.1", - utils.Source: utils.UNIT_TEST, + utils.Source: utils.UnitTest, utils.OriginID: "dsafdsaf", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", @@ -393,8 +393,8 @@ func testActionsitThresholdCDrLog(t *testing.T) { utils.PDD: 0 * time.Second, utils.AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), utils.Usage: 10 * time.Second, - utils.ROUTE: "SUPPL1", - utils.COST: -1.0, + utils.Route: "SUPPL1", + utils.Cost: -1.0, }, }, Opts: map[string]interface{}{ @@ -415,7 +415,7 @@ func testActionsitThresholdCDrLog(t *testing.T) { t.Error("Unexpected error: ", err.Error()) } else if len(rcvedCdrs) != 1 { t.Error("Unexpected number of CDRs returned: ", len(rcvedCdrs)) - } else if rcvedCdrs[0].ToR != utils.MONETARY || + } else if rcvedCdrs[0].ToR != utils.MetaMonetary || rcvedCdrs[0].OriginHost != "127.0.0.1" || rcvedCdrs[0].Source != utils.CDRLOG || rcvedCdrs[0].RequestType != utils.MetaNone || @@ -445,7 +445,7 @@ func testActionsitCDRAccount(t *testing.T) { attrs := &AttrAddBalance{ Tenant: "cgrates.org", Account: acnt, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: float64(30 * time.Second), Balance: map[string]interface{}{ utils.UUID: "testUUID", @@ -477,7 +477,7 @@ func testActionsitCDRAccount(t *testing.T) { if err := actsLclRpc.Call(utils.APIerSv2GetAccount, attrs2, &acc); err != nil { t.Error("Got error on APIerSv1.GetAccount: ", err.Error()) } else { - voice := acc.BalanceMap[utils.VOICE] + voice := acc.BalanceMap[utils.MetaVoice] for _, u := range voice { uuid = u.Uuid break @@ -508,7 +508,7 @@ func testActionsitCDRAccount(t *testing.T) { { UUID: uuid, ID: "TestID", - Type: utils.VOICE, + Type: utils.MetaVoice, Value: float64(10 * time.Second), }, }, @@ -532,7 +532,7 @@ func testActionsitCDRAccount(t *testing.T) { if err := actsLclRpc.Call(utils.APIerSv2GetAccount, attrs2, &acc); err != nil { t.Error("Got error on APIerSv1.GetAccount: ", err.Error()) - } else if tv := acc.BalanceMap[utils.VOICE].GetTotalValue(); tv != float64(10*time.Second) { + } else if tv := acc.BalanceMap[utils.MetaVoice].GetTotalValue(); tv != float64(10*time.Second) { t.Errorf("Calling APIerSv1.GetBalance expected: %f, received: %f", float64(10*time.Second), tv) } } @@ -663,7 +663,7 @@ func testActionsitThresholdPostEvent(t *testing.T) { utils.RunID: utils.MetaRaw, utils.OrderID: 123, utils.OriginHost: "192.168.1.1", - utils.Source: utils.UNIT_TEST, + utils.Source: utils.UnitTest, utils.OriginID: "dsafdsaf", utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", @@ -671,8 +671,8 @@ func testActionsitThresholdPostEvent(t *testing.T) { utils.PDD: 0 * time.Second, utils.AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), utils.Usage: 10 * time.Second, - utils.ROUTE: "SUPPL1", - utils.COST: -1.0, + utils.Route: "SUPPL1", + utils.Cost: -1.0, }, }, Opts: map[string]interface{}{ @@ -702,7 +702,7 @@ func testActionsitSetSDestinations(t *testing.T) { t.Errorf("Calling APIerSv1.SetAccount received: %s", reply) } attrsAA := &utils.AttrSetActions{ActionsId: "ACT_AddBalance", Actions: []*utils.TPAction{ - {Identifier: utils.TOPUP, BalanceType: utils.MONETARY, DestinationIds: "*ddc_test", + {Identifier: utils.TOPUP, BalanceType: utils.MetaMonetary, DestinationIds: "*ddc_test", Units: "5", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, }} if err := actsLclRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { @@ -722,8 +722,8 @@ func testActionsitSetSDestinations(t *testing.T) { attrs2 := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "testAccSetDDestination"} if err := actsLclRpc.Call(utils.APIerSv2GetAccount, attrs2, &acc); err != nil { t.Error(err.Error()) - } else if _, has := acc.BalanceMap[utils.MONETARY][0].DestinationIDs["*ddc_test"]; !has { - t.Errorf("Unexpected destinationIDs: %+v", acc.BalanceMap[utils.MONETARY][0].DestinationIDs) + } else if _, has := acc.BalanceMap[utils.MetaMonetary][0].DestinationIDs["*ddc_test"]; !has { + t.Errorf("Unexpected destinationIDs: %+v", acc.BalanceMap[utils.MetaMonetary][0].DestinationIDs) } if err := actsLclRpc.Call(utils.APIerSv1SetDestination, @@ -865,7 +865,7 @@ func testActionsitresetAccountCDR(t *testing.T) { if err := actsLclRpc.Call(utils.APIerSv2GetAccount, attrs2, &acc); err != nil { t.Error("Got error on APIerSv1.GetAccount: ", err.Error()) } else { - voice := acc.BalanceMap[utils.VOICE] + voice := acc.BalanceMap[utils.MetaVoice] for _, u := range voice { uuid = u.Uuid break @@ -895,7 +895,7 @@ func testActionsitresetAccountCDR(t *testing.T) { { UUID: uuid, ID: "ID", - Type: utils.VOICE, + Type: utils.MetaVoice, Value: float64(10 * time.Second), }, }, @@ -919,7 +919,7 @@ func testActionsitresetAccountCDR(t *testing.T) { if err := actsLclRpc.Call(utils.APIerSv2GetAccount, attrs2, &acc); err != nil { t.Error("Got error on APIerSv1.GetAccount: ", err.Error()) - } else if tv := acc.BalanceMap[utils.VOICE].GetTotalValue(); tv != float64(10*time.Second) { + } else if tv := acc.BalanceMap[utils.MetaVoice].GetTotalValue(); tv != float64(10*time.Second) { t.Errorf("Calling APIerSv1.GetBalance expected: %f, received: %f", float64(10*time.Second), tv) } } @@ -940,7 +940,7 @@ func testActionsitremoteSetAccount(t *testing.T) { exp := &Account{ ID: accID, BalanceMap: map[string]Balances{ - utils.MONETARY: []*Balance{{ + utils.MetaMonetary: []*Balance{{ Value: 20, Weight: 10, }}, diff --git a/engine/z_attributes_test.go b/engine/z_attributes_test.go index 2261bacb7..12566e4ac 100644 --- a/engine/z_attributes_test.go +++ b/engine/z_attributes_test.go @@ -1354,7 +1354,7 @@ func TestAttributeProcessEventConstant(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("ConstVal", utils.InfieldSep), }, }, @@ -1511,17 +1511,17 @@ func TestAttributeProcessEventComposed(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.Field1", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "Field2", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("_", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "Field2", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.TheField", utils.InfieldSep), }, }, @@ -1677,7 +1677,7 @@ func TestAttributeProcessEventUsageDifference(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Type: utils.META_USAGE_DIFFERENCE, + Type: utils.MetaUsageDifference, Value: config.NewRSRParsersMustCompile("~*req.UnixTimeStamp;~*req.UnixTimeStamp2", utils.InfieldSep), }, }, @@ -1847,7 +1847,7 @@ func BenchmarkAttributeProcessEventConstant(b *testing.B) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("ConstVal", utils.InfieldSep), }, }, @@ -1987,7 +1987,7 @@ func TestProcessAttributeConstant(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("Val2", utils.InfieldSep), }, }, @@ -2113,12 +2113,12 @@ func TestProcessAttributeComposed(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.RandomField", utils.InfieldSep), }, { Path: utils.MetaReq + utils.NestingSep + "Field2", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.RandomField2", utils.InfieldSep), }, }, @@ -2183,7 +2183,7 @@ func TestProcessAttributeUsageDifference(t *testing.T) { Attributes: []*Attribute{ { Path: utils.MetaReq + utils.NestingSep + "Field2", - Type: utils.META_USAGE_DIFFERENCE, + Type: utils.MetaUsageDifference, Value: config.NewRSRParsersMustCompile("~*req.RandomField;~*req.RandomField2", utils.InfieldSep), }, }, diff --git a/engine/z_cdr_it_test.go b/engine/z_cdr_it_test.go index e60d73126..cf2529e0b 100644 --- a/engine/z_cdr_it_test.go +++ b/engine/z_cdr_it_test.go @@ -30,8 +30,8 @@ import ( // Sample HttpJsonPost, more for usage purposes func TestHttpJsonPost(t *testing.T) { cdrOut := &ExternalCDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), OrderID: 123, - ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, RequestType: utils.MetaRated, Tenant: "cgrates.org", + ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "account1", Subject: "tgooiscs0014", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String(), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String(), RunID: utils.MetaDefault, diff --git a/engine/z_loader_it_test.go b/engine/z_loader_it_test.go index 2298936a6..94b530f68 100644 --- a/engine/z_loader_it_test.go +++ b/engine/z_loader_it_test.go @@ -508,25 +508,25 @@ func testLoaderITWriteToDatabase(t *testing.T) { // Imports data from csv files in tpScenario to storDb func testLoaderITImportToStorDb(t *testing.T) { csvImporter := TPCSVImporter{ - TPid: utils.TEST_SQL, + TPid: utils.TestSQL, StorDb: storDb, DirPath: path.Join(*dataDir, "tariffplans", *tpCsvScenario), Sep: utils.CSVSep, Verbose: false, - ImportId: utils.TEST_SQL} + ImportId: utils.TestSQL} if err := csvImporter.Run(); err != nil { t.Error("Error when importing tpdata to storDb: ", err) } if tpids, err := storDb.GetTpIds(""); err != nil { t.Error("Error when querying storDb for imported data: ", err) - } else if len(tpids) != 1 || tpids[0] != utils.TEST_SQL { + } else if len(tpids) != 1 || tpids[0] != utils.TestSQL { t.Errorf("Data in storDb is different than expected %v", tpids) } } // Loads data from storDb into dataDb func testLoaderITLoadFromStorDb(t *testing.T) { - loader, _ := NewTpReader(dataDbCsv.DataDB(), storDb, utils.TEST_SQL, "", []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)}, nil, false) + loader, _ := NewTpReader(dataDbCsv.DataDB(), storDb, utils.TestSQL, "", []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)}, nil, false) if err := loader.LoadDestinations(); err != nil && err.Error() != utils.NotFoundCaps { t.Error("Failed loading destinations: ", err.Error()) } @@ -560,9 +560,9 @@ func testLoaderITLoadFromStorDb(t *testing.T) { } func testLoaderITLoadIndividualProfiles(t *testing.T) { - loader, _ := NewTpReader(dataDbCsv.DataDB(), storDb, utils.TEST_SQL, "", []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)}, nil, false) + loader, _ := NewTpReader(dataDbCsv.DataDB(), storDb, utils.TestSQL, "", []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)}, nil, false) // Load ratingPlans. This will also set destination keys - if rps, err := storDb.GetTPRatingPlans(utils.TEST_SQL, "", nil); err != nil { + if rps, err := storDb.GetTPRatingPlans(utils.TestSQL, "", nil); err != nil { t.Fatal("Could not retrieve rating plans") } else { for _, r := range rps { @@ -574,8 +574,8 @@ func testLoaderITLoadIndividualProfiles(t *testing.T) { } } // Load rating profiles - loadId := utils.CSV_LOAD + "_" + utils.TEST_SQL - if rprs, err := storDb.GetTPRatingProfiles(&utils.TPRatingProfile{TPid: utils.TEST_SQL, LoadId: loadId}); err != nil { + loadId := utils.CSVLoad + "_" + utils.TestSQL + if rprs, err := storDb.GetTPRatingProfiles(&utils.TPRatingProfile{TPid: utils.TestSQL, LoadId: loadId}); err != nil { t.Fatal("Could not retrieve rating profiles, error: ", err.Error()) } else if len(rprs) == 0 { t.Fatal("Could not retrieve rating profiles") @@ -588,7 +588,7 @@ func testLoaderITLoadIndividualProfiles(t *testing.T) { } // Load account actions - if aas, err := storDb.GetTPAccountActions(&utils.TPAccountActions{TPid: utils.TEST_SQL, LoadId: loadId}); err != nil { + if aas, err := storDb.GetTPAccountActions(&utils.TPAccountActions{TPid: utils.TestSQL, LoadId: loadId}); err != nil { t.Fatal("Could not retrieve account action profiles, error: ", err.Error()) } else if len(aas) == 0 { t.Error("No account actions") @@ -619,7 +619,7 @@ func TestMatchLoadCsvWithStorRating(t *testing.T) { for _, key := range keysCsv { var refVal []byte for idx, rs := range []*RedisStorage{rsCsv, rsStor, rsApier} { - if key == utils.TASKS_KEY || strings.HasPrefix(key, utils.ACTION_PLAN_PREFIX) { // action plans are not consistent + if key == utils.TasksKey || strings.HasPrefix(key, utils.ActionPlanPrefix) { // action plans are not consistent continue } qVal, err := rs.db.Cmd("GET", key).Bytes() diff --git a/engine/z_onstor_it_test.go b/engine/z_onstor_it_test.go index e7b951222..fcfeef780 100644 --- a/engine/z_onstor_it_test.go +++ b/engine/z_onstor_it_test.go @@ -186,7 +186,7 @@ func testOnStorITCacheReverseDestinations(t *testing.T) { t.Errorf("Prefix: %s already in cache", prfx) } } - if err := onStor.CacheDataFromDB(utils.REVERSE_DESTINATION_PREFIX, dst.Prefixes, false); err != nil { + if err := onStor.CacheDataFromDB(utils.ReverseDestinationPrefix, dst.Prefixes, false); err != nil { t.Error(err) } if onStor.dataDB.GetStorageType() != utils.INTERNAL { @@ -239,7 +239,7 @@ func testOnStorITCacheActionPlan(t *testing.T) { t.Error(err) } expectedCAp := []string{"apl_MORE_MINUTES"} - if itm, err := onStor.DataDB().GetKeysForPrefix(utils.ACTION_PLAN_PREFIX); err != nil { + if itm, err := onStor.DataDB().GetKeysForPrefix(utils.ActionPlanPrefix); err != nil { t.Error(err) } else if !reflect.DeepEqual(expectedCAp, itm) { t.Errorf("Expected : %+v, but received %+v", expectedCAp, itm) @@ -248,7 +248,7 @@ func testOnStorITCacheActionPlan(t *testing.T) { onStor.dataDB.GetStorageType() != utils.INTERNAL { t.Error("Already in cache") } - if err := onStor.CacheDataFromDB(utils.ACTION_PLAN_PREFIX, []string{ap.Id}, false); err != nil { + if err := onStor.CacheDataFromDB(utils.ActionPlanPrefix, []string{ap.Id}, false); err != nil { t.Error(err) } if onStor.dataDB.GetStorageType() != utils.INTERNAL { @@ -292,10 +292,10 @@ func testOnStorITCacheActionTriggers(t *testing.T) { ats := ActionTriggers{ &ActionTrigger{ ID: "testOnStorITCacheActionTrigger", - Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY), + Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary), Timings: make([]*RITiming, 0)}, ThresholdValue: 2, - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, ActionsID: "TEST_ACTIONS", LastExecutionTime: time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), ExpirationDate: time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), @@ -306,7 +306,7 @@ func testOnStorITCacheActionTriggers(t *testing.T) { t.Error(err) } expectedCAt := []string{"atr_testOnStorITCacheActionTrigger"} - if itm, err := onStor.DataDB().GetKeysForPrefix(utils.ACTION_TRIGGER_PREFIX); err != nil { + if itm, err := onStor.DataDB().GetKeysForPrefix(utils.ActionTriggerPrefix); err != nil { t.Error(err) } else if !reflect.DeepEqual(expectedCAt, itm) { t.Errorf("Expected : %+v, but received %+v", expectedCAt, itm) @@ -315,7 +315,7 @@ func testOnStorITCacheActionTriggers(t *testing.T) { onStor.dataDB.GetStorageType() != utils.INTERNAL { t.Error("Already in cache") } - if err := onStor.CacheDataFromDB(utils.ACTION_TRIGGER_PREFIX, []string{atsID}, false); err != nil { + if err := onStor.CacheDataFromDB(utils.ActionTriggerPrefix, []string{atsID}, false); err != nil { t.Error(err) } if itm, hasIt := Cache.Get(utils.CacheActionTriggers, atsID); !hasIt { @@ -366,12 +366,12 @@ func testOnStorITHasData(t *testing.T) { t.Error(err) } expectedRP := []string{"rpl_HasData"} - if itm, err := onStor.DataDB().GetKeysForPrefix(utils.RATING_PLAN_PREFIX); err != nil { + if itm, err := onStor.DataDB().GetKeysForPrefix(utils.RatingPlanPrefix); err != nil { t.Error(err) } else if !reflect.DeepEqual(len(expectedRP), len(itm)) { t.Errorf("Expected : %+v, but received %+v", len(expectedRP), len(itm)) } - if rcv, err := onStor.HasData(utils.RATING_PLAN_PREFIX, rp.Id, ""); err != nil { + if rcv, err := onStor.HasData(utils.RatingPlanPrefix, rp.Id, ""); err != nil { t.Error(err) } else if rcv != true { t.Errorf("Expecting: true, received: %v", rcv) @@ -467,7 +467,7 @@ func testOnStorITRatingPlan(t *testing.T) { t.Errorf("Expecting: %v, received: %v", rp, rcv) } expectedRP := []string{"rpl_HasData", "rpl_CRUDRatingPlan"} - if itm, err := onStor.DataDB().GetKeysForPrefix(utils.RATING_PLAN_PREFIX); err != nil { + if itm, err := onStor.DataDB().GetKeysForPrefix(utils.RatingPlanPrefix); err != nil { t.Error(err) } else if !reflect.DeepEqual(len(expectedRP), len(itm)) { t.Errorf("Expected : %+v, but received %+v", len(expectedRP), len(itm)) @@ -557,7 +557,7 @@ func testOnStorITRatingProfile(t *testing.T) { } expectedCRPl := []string{"rpf_*out:test:1:trp"} - if itm, err := onStor.DataDB().GetKeysForPrefix(utils.RATING_PROFILE_PREFIX); err != nil { + if itm, err := onStor.DataDB().GetKeysForPrefix(utils.RatingProfilePrefix); err != nil { t.Error(err) } else if !reflect.DeepEqual(expectedCRPl, itm) { t.Errorf("Expected : %+v, but received %+v", expectedCRPl, itm) @@ -697,7 +697,7 @@ func testOnStorITActions(t *testing.T) { ExpirationString: utils.UNLIMITED, Weight: 10, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Uuid: utils.StringPointer(utils.GenUUID()), Value: &utils.ValueFormula{Static: 10, Params: make(map[string]interface{})}, @@ -721,7 +721,7 @@ func testOnStorITActions(t *testing.T) { ExpirationString: utils.UNLIMITED, Weight: 10, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Uuid: utils.StringPointer(utils.GenUUID()), Value: &utils.ValueFormula{Static: 100, Params: make(map[string]interface{})}, @@ -750,7 +750,7 @@ func testOnStorITActions(t *testing.T) { acts, utils.NonTransactional); err != nil { t.Error(err) } - if rcv, err := onStor.HasData(utils.ACTION_PREFIX, acts[0].Id, ""); err != nil { + if rcv, err := onStor.HasData(utils.ActionPrefix, acts[0].Id, ""); err != nil { t.Error(err) } else if rcv != true { t.Errorf("Expecting: true, received: %v", rcv) @@ -772,7 +772,7 @@ func testOnStorITActions(t *testing.T) { } } expectedCA := []string{"act_MINI"} - if itm, err := onStor.DataDB().GetKeysForPrefix(utils.ACTION_PREFIX); err != nil { + if itm, err := onStor.DataDB().GetKeysForPrefix(utils.ActionPrefix); err != nil { t.Error(err) } else if !reflect.DeepEqual(expectedCA, itm) { t.Errorf("Expected : %+v, but received %+v", expectedCA, itm) @@ -785,7 +785,7 @@ func testOnStorITActions(t *testing.T) { ExpirationString: utils.UNLIMITED, Weight: 10, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Uuid: utils.StringPointer(utils.GenUUID()), Value: &utils.ValueFormula{Static: 10, Params: make(map[string]interface{})}, @@ -809,7 +809,7 @@ func testOnStorITActions(t *testing.T) { ExpirationString: utils.UNLIMITED, Weight: 10, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Uuid: utils.StringPointer(utils.GenUUID()), Value: &utils.ValueFormula{Static: 100, Params: make(map[string]interface{})}, @@ -835,7 +835,7 @@ func testOnStorITActions(t *testing.T) { ExpirationString: utils.UNLIMITED, Weight: 20, Balance: &BalanceFilter{ - Type: utils.StringPointer(utils.VOICE), + Type: utils.StringPointer(utils.MetaVoice), Uuid: utils.StringPointer(utils.GenUUID()), Value: &utils.ValueFormula{Static: 200, Params: make(map[string]interface{})}, @@ -975,10 +975,10 @@ func testOnStorITCRUDActionTriggers(t *testing.T) { ats := ActionTriggers{ &ActionTrigger{ ID: "testOnStorITCRUDActionTriggers", - Balance: &BalanceFilter{Type: utils.StringPointer(utils.MONETARY), + Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary), Timings: make([]*RITiming, 0)}, ThresholdValue: 2, - ThresholdType: utils.TRIGGER_MAX_EVENT_COUNTER, + ThresholdType: utils.TriggerMaxEventCounter, ActionsID: "TEST_ACTIONS", LastExecutionTime: time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), ExpirationDate: time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), @@ -1149,7 +1149,7 @@ func testOnStorITCRUDAccountActionPlans(t *testing.T) { func testOnStorITCRUDAccount(t *testing.T) { acc := &Account{ ID: utils.ConcatenatedKey("cgrates.org", "account2"), - BalanceMap: map[string]Balances{utils.MONETARY: {&Balance{Value: 10, Weight: 10}}}, + BalanceMap: map[string]Balances{utils.MetaMonetary: {&Balance{Value: 10, Weight: 10}}}, } if _, rcvErr := onStor.GetAccount(acc.ID); rcvErr != utils.ErrNotFound { t.Error(rcvErr) @@ -1161,10 +1161,10 @@ func testOnStorITCRUDAccount(t *testing.T) { t.Error(err) } else if !reflect.DeepEqual(acc.ID, rcv.ID) { t.Errorf("Expecting: %v, received: %v", acc.ID, rcv.ID) - } else if !reflect.DeepEqual(acc.BalanceMap[utils.MONETARY][0].Value, rcv.BalanceMap[utils.MONETARY][0].Value) { - t.Errorf("Expecting: %v, received: %v", acc.BalanceMap[utils.MONETARY][0].Value, rcv.BalanceMap[utils.MONETARY][0].Value) - } else if !reflect.DeepEqual(acc.BalanceMap[utils.MONETARY][0].Weight, rcv.BalanceMap[utils.MONETARY][0].Weight) { - t.Errorf("Expecting: %v, received: %v", acc.BalanceMap[utils.MONETARY][0].Weight, rcv.BalanceMap[utils.MONETARY][0].Weight) + } else if !reflect.DeepEqual(acc.BalanceMap[utils.MetaMonetary][0].Value, rcv.BalanceMap[utils.MetaMonetary][0].Value) { + t.Errorf("Expecting: %v, received: %v", acc.BalanceMap[utils.MetaMonetary][0].Value, rcv.BalanceMap[utils.MetaMonetary][0].Value) + } else if !reflect.DeepEqual(acc.BalanceMap[utils.MetaMonetary][0].Weight, rcv.BalanceMap[utils.MetaMonetary][0].Weight) { + t.Errorf("Expecting: %v, received: %v", acc.BalanceMap[utils.MetaMonetary][0].Weight, rcv.BalanceMap[utils.MetaMonetary][0].Weight) } if err := onStor.RemoveAccount(acc.ID); err != nil { t.Error(err) @@ -1412,7 +1412,7 @@ func testOnStorITCRUDStructVersion(t *testing.T) { } else if !reflect.DeepEqual(eAcnts, rcv) { t.Errorf("Expecting: %v, received: %v", eAcnts, rcv) } - if _, err := onStor.DataDB().GetVersions(utils.NOT_AVAILABLE); err != utils.ErrNotFound { //query non-existent + if _, err := onStor.DataDB().GetVersions(utils.NotAvailable); err != utils.ErrNotFound { //query non-existent t.Error(err) } eAcnts[utils.Accounts] = 2 @@ -2330,7 +2330,7 @@ func testOnStorITAccountProfile(t *testing.T) { ID: "VoiceBalance", FilterIDs: []string{"FLTR_RES_GR2"}, Weight: 10, - Type: utils.VOICE, + Type: utils.MetaVoice, Units: &utils.Decimal{ new(decimal.Big).SetUint64(10), }, diff --git a/engine/z_resources_test.go b/engine/z_resources_test.go index 8f0071c63..431fdab08 100644 --- a/engine/z_resources_test.go +++ b/engine/z_resources_test.go @@ -109,7 +109,7 @@ var ( "PddInterval": "1s", utils.Weight: "20.0", utils.Usage: 135 * time.Second, - utils.COST: 123.0, + utils.Cost: 123.0, }, }, }, diff --git a/engine/z_storage_cdrs_it_test.go b/engine/z_storage_cdrs_it_test.go index 52c65a1df..bfa81d706 100644 --- a/engine/z_storage_cdrs_it_test.go +++ b/engine/z_storage_cdrs_it_test.go @@ -83,7 +83,7 @@ func testSetCDR(cfg *config.CGRConfig) error { OriginHost: "127.0.0.1", Source: "testSetCDRs", OriginID: "testevent1", - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "call", @@ -110,7 +110,7 @@ func testSetCDR(cfg *config.CGRConfig) error { OriginHost: "127.0.0.1", Source: "testSetCDRs", OriginID: "testevent1", - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "call", @@ -193,10 +193,10 @@ func testSMCosts(cfg *config.CGRConfig) error { Value: 100, RateIncrement: 10 * time.Second, RateUnit: time.Second}}}}, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, } if err := cdrStorage.SetSMCost(&SMCost{CGRID: "164b0422fdc6a5117031b427439482c6a4f90e41", - RunID: utils.MetaDefault, OriginHost: "localhost", OriginID: "12345", CostSource: utils.UNIT_TEST, + RunID: utils.MetaDefault, OriginHost: "localhost", OriginID: "12345", CostSource: utils.UnitTest, CostDetails: NewEventCostFromCallCost(cc, "164b0422fdc6a5117031b427439482c6a4f90e41", utils.MetaDefault)}); err != nil { return fmt.Errorf("testSMCosts #3 err: %v", err) } @@ -209,7 +209,7 @@ func testSMCosts(cfg *config.CGRConfig) error { for i := 0; i < 3; i++ { if err := cdrStorage.SetSMCost(&SMCost{CGRID: "164b0422fdc6a5117031b427439482c6a4f90e5" + strconv.Itoa(i), RunID: utils.MetaDefault, OriginHost: "localhost", OriginID: "abc" + strconv.Itoa(i), - CostSource: utils.UNIT_TEST, + CostSource: utils.UnitTest, CostDetails: NewEventCostFromCallCost(cc, "164b0422fdc6a5117031b427439482c6a4f90e5"+strconv.Itoa(i), utils.MetaDefault)}); err != nil { return fmt.Errorf("testSMCosts #7 err: %v", err) } @@ -255,7 +255,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { OriginHost: "127.0.0.1", Source: "testGetCDRs", OriginID: "testevent1", - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "call", @@ -275,7 +275,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { OriginHost: "127.0.0.1", Source: "testGetCDRs", OriginID: "testevent1", - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "call", @@ -295,7 +295,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { OriginHost: "127.0.0.1", Source: "testGetCDRs", OriginID: "testevent1", - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call_derived", @@ -315,7 +315,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { OriginHost: "192.168.1.12", Source: "testGetCDRs", OriginID: "testevent2", - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: utils.MetaPostpaid, Tenant: "itsyscom.com", Category: "call", @@ -335,7 +335,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { OriginHost: "192.168.1.13", Source: "testGetCDRs3", OriginID: "testevent3", - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: utils.MetaPseudoPrepaid, Tenant: "cgrates.org", Category: "call", @@ -355,7 +355,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { OriginHost: "192.168.1.13", Source: "testGetCDRs3", OriginID: "testevent3", - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", @@ -376,7 +376,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { OriginHost: "192.168.1.14", Source: "testGetCDRs", OriginID: "testevent4", - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: utils.MetaPseudoPrepaid, Tenant: "itsyscom.com", Category: "call", @@ -396,7 +396,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { OriginHost: "192.168.1.14", Source: "testGetCDRs", OriginID: "testevent4", - ToR: utils.VOICE, + ToR: utils.MetaVoice, RequestType: utils.MetaRated, Tenant: "itsyscom.com", Category: "call", @@ -416,7 +416,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { OriginHost: "127.0.0.1", Source: "testGetCDRs5", OriginID: "testevent5", - ToR: utils.SMS, + ToR: utils.MetaSMS, RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "sms", @@ -436,7 +436,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { OriginHost: "127.0.0.1", Source: "testGetCDRs5", OriginID: "testevent5", - ToR: utils.SMS, + ToR: utils.MetaSMS, RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "sms", @@ -542,13 +542,13 @@ func testGetCDRs(cfg *config.CGRConfig) error { return fmt.Errorf("testGetCDRs #23, unexpected number of CDRs returned: %+v", CDRs) } // Filter on ToR - if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{ToRs: []string{utils.SMS}}, false); err != nil { + if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{ToRs: []string{utils.MetaSMS}}, false); err != nil { return fmt.Errorf("testGetCDRs #23 err: %v", err) } else if len(CDRs) != 2 { return fmt.Errorf("testGetCDRs #24, unexpected number of CDRs returned: %+v", CDRs) } // Filter on multiple ToR - if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{ToRs: []string{utils.SMS, utils.VOICE}}, false); err != nil { + if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{ToRs: []string{utils.MetaSMS, utils.MetaVoice}}, false); err != nil { return fmt.Errorf("testGetCDRs #25 err: %v", err) } else if len(CDRs) != 10 { return fmt.Errorf("testGetCDRs #26, unexpected number of CDRs returned: %+v", CDRs) diff --git a/engine/z_stordb_it_test.go b/engine/z_stordb_it_test.go index a69167dd8..adaab8b0b 100644 --- a/engine/z_stordb_it_test.go +++ b/engine/z_stordb_it_test.go @@ -163,7 +163,7 @@ func testStorDBitCRUDTPAccountProfiles(t *testing.T) { ID: "MonetaryBalance", FilterIDs: []string{}, Weight: 10, - Type: utils.MONETARY, + Type: utils.MetaMonetary, CostIncrement: []*utils.TPBalanceCostIncrement{ &utils.TPBalanceCostIncrement{ FilterIDs: []string{"fltr1", "fltr2"}, diff --git a/ers/filecsv_it_test.go b/ers/filecsv_it_test.go index 61884cb09..b87da70f9 100644 --- a/ers/filecsv_it_test.go +++ b/ers/filecsv_it_test.go @@ -179,8 +179,8 @@ func testCsvITHandleSessionFile(t *testing.T) { eAcntVal := 10.0 if err := csvRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } aSessions := make([]*sessions.ExternalSession, 0) @@ -271,8 +271,8 @@ func testCsvITAnalyseCDRs(t *testing.T) { eAcntVal := 9.85 if err := csvRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } diff --git a/ers/filejson_it_test.go b/ers/filejson_it_test.go index 112c923b0..93ed529eb 100644 --- a/ers/filejson_it_test.go +++ b/ers/filejson_it_test.go @@ -159,7 +159,7 @@ func testJSONAddData(t *testing.T) { attrs := &utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "voiceAccount", - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 600000000000, Balance: map[string]interface{}{ utils.ID: utils.MetaDefault, @@ -175,8 +175,8 @@ func testJSONAddData(t *testing.T) { if err := jsonRPC.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "voiceAccount"}, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.VOICE][0].Value != 600000000000 { - t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.VOICE][0]) + } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MetaVoice][0].Value != 600000000000 { + t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MetaVoice][0]) } } @@ -214,8 +214,8 @@ func testJSONVerify(t *testing.T) { if err := jsonRPC.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "voiceAccount"}, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.VOICE][0].Value != 480000000000 { - t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.VOICE][0]) + } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MetaVoice][0].Value != 480000000000 { + t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MetaVoice][0]) } } diff --git a/general_tests/a1_it_test.go b/general_tests/a1_it_test.go index 3d5fcc574..cf6387eff 100644 --- a/general_tests/a1_it_test.go +++ b/general_tests/a1_it_test.go @@ -159,7 +159,7 @@ func testA1itAddBalance1(t *testing.T) { argAdd := &v1.AttrAddBalance{ Tenant: "cgrates.org", Account: "rpdata1", - BalanceType: utils.DATA, + BalanceType: utils.MetaData, Value: 10000000000, Balance: map[string]interface{}{ utils.ID: "rpdata1_test", @@ -175,8 +175,8 @@ func testA1itAddBalance1(t *testing.T) { if err := a1rpc.Call(utils.APIerSv2GetAccount, argGet, &acnt); err != nil { t.Error(err) } else { - if acnt.BalanceMap[utils.DATA].GetTotalValue() != argAdd.Value { // We expect 11.5 since we have added in the previous test 1.5 - t.Errorf("Received account value: %f", acnt.BalanceMap[utils.DATA].GetTotalValue()) + if acnt.BalanceMap[utils.MetaData].GetTotalValue() != argAdd.Value { // We expect 11.5 since we have added in the previous test 1.5 + t.Errorf("Received account value: %f", acnt.BalanceMap[utils.MetaData].GetTotalValue()) } } } @@ -195,8 +195,8 @@ func testA1itDataSession1(t *testing.T) { Tenant: "cgrates.org", ID: "TestA1itDataSession1", Event: map[string]interface{}{ - utils.EVENT_NAME: "INITIATE_SESSION", - utils.ToR: utils.DATA, + utils.EventName: "INITIATE_SESSION", + utils.ToR: utils.MetaData, utils.OriginID: "504966119", utils.AccountField: "rpdata1", utils.Subject: "rpdata1", @@ -233,7 +233,7 @@ func testA1itDataSession1(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsed", Event: map[string]interface{}{ - utils.EVENT_NAME: "UPDATE_SESSION", + utils.EventName: "UPDATE_SESSION", utils.AccountField: "rpdata1", utils.Category: "data1", utils.Destination: "data", @@ -243,7 +243,7 @@ func testA1itDataSession1(t *testing.T) { utils.RequestType: utils.MetaPrepaid, utils.Subject: "rpdata1", utils.Tenant: "cgrates.org", - utils.ToR: utils.DATA, + utils.ToR: utils.MetaData, utils.SetupTime: "2017-03-03 11:39:32 +0100 CET", utils.AnswerTime: "2017-03-03 11:39:32 +0100 CET", utils.Usage: "2097152", @@ -269,7 +269,7 @@ func testA1itDataSession1(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsed", Event: map[string]interface{}{ - utils.EVENT_NAME: "TERMINATE_SESSION", + utils.EventName: "TERMINATE_SESSION", utils.AccountField: "rpdata1", utils.Category: "data1", utils.Destination: "data", @@ -281,7 +281,7 @@ func testA1itDataSession1(t *testing.T) { utils.AnswerTime: "2017-03-03 11:39:32 +0100 CET", utils.Subject: "rpdata1", utils.Tenant: "cgrates.org", - utils.ToR: utils.DATA, + utils.ToR: utils.MetaData, }, }, }, @@ -328,8 +328,8 @@ func testA1itDataSession1(t *testing.T) { if err := a1rpc.Call(utils.APIerSv2GetAccount, &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "rpdata1"}, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.DATA].GetTotalValue() != expBalance { // We expect 11.5 since we have added in the previous test 1.5 - t.Errorf("Expecting: %f, received: %f", expBalance, acnt.BalanceMap[utils.DATA].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaData].GetTotalValue() != expBalance { // We expect 11.5 since we have added in the previous test 1.5 + t.Errorf("Expecting: %f, received: %f", expBalance, acnt.BalanceMap[utils.MetaData].GetTotalValue()) } } diff --git a/general_tests/accounts_it_test.go b/general_tests/accounts_it_test.go index 283252c4b..68c5d4f22 100644 --- a/general_tests/accounts_it_test.go +++ b/general_tests/accounts_it_test.go @@ -223,13 +223,13 @@ func testV1AccMonthly(t *testing.T) { &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1002"}, &reply); err != nil { t.Error(err) - } else if _, has := reply.BalanceMap[utils.DATA]; !has { - t.Error("Unexpected balance returned: ", utils.ToJSON(reply.BalanceMap[utils.DATA])) - } else if len(reply.BalanceMap[utils.DATA]) != 1 { - t.Error("Unexpected number of balances returned: ", len(reply.BalanceMap[utils.DATA])) - } else if reply.BalanceMap[utils.DATA][0].ExpirationDate.After(timeAfter) && - reply.BalanceMap[utils.DATA][0].ExpirationDate.Before(timeBefore) { - t.Error("Unexpected expiration date returned: ", reply.BalanceMap[utils.DATA][0].ExpirationDate) + } else if _, has := reply.BalanceMap[utils.MetaData]; !has { + t.Error("Unexpected balance returned: ", utils.ToJSON(reply.BalanceMap[utils.MetaData])) + } else if len(reply.BalanceMap[utils.MetaData]) != 1 { + t.Error("Unexpected number of balances returned: ", len(reply.BalanceMap[utils.MetaData])) + } else if reply.BalanceMap[utils.MetaData][0].ExpirationDate.After(timeAfter) && + reply.BalanceMap[utils.MetaData][0].ExpirationDate.Before(timeBefore) { + t.Error("Unexpected expiration date returned: ", reply.BalanceMap[utils.MetaData][0].ExpirationDate) } } @@ -241,7 +241,7 @@ func testV1AccSendToThreshold(t *testing.T) { // Add a disable and log action attrsAA := &utils.AttrSetActions{ActionsId: "DISABLE_LOG", Actions: []*utils.TPAction{ {Identifier: utils.DISABLE_ACCOUNT}, - {Identifier: utils.LOG}, + {Identifier: utils.MetaLog}, }} if err := accRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) diff --git a/general_tests/attributes_it_test.go b/general_tests/attributes_it_test.go index 12a32aa47..c557cbc9f 100644 --- a/general_tests/attributes_it_test.go +++ b/general_tests/attributes_it_test.go @@ -137,8 +137,8 @@ func testAttributeSProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSProcessEvent", Event: map[string]interface{}{ - utils.EVENT_NAME: "VariableTest", - utils.ToR: utils.VOICE, + utils.EventName: "VariableTest", + utils.ToR: utils.MetaVoice, }, }, }, @@ -151,9 +151,9 @@ func testAttributeSProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSProcessEvent", Event: map[string]interface{}{ - utils.EVENT_NAME: "VariableTest", - utils.Category: utils.VOICE, - utils.ToR: utils.VOICE, + utils.EventName: "VariableTest", + utils.Category: utils.MetaVoice, + utils.ToR: utils.MetaVoice, }, }, }, @@ -363,7 +363,7 @@ func testAttributeSProcessEventWithStat(t *testing.T) { utils.AccountField: "1001", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 11 * time.Second, - utils.COST: 10.0, + utils.Cost: 10.0, }, }, }, @@ -382,7 +382,7 @@ func testAttributeSProcessEventWithStat(t *testing.T) { utils.AccountField: "1001", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 11 * time.Second, - utils.COST: 10.5, + utils.Cost: 10.5, }, } if err := attrRPC.Call(utils.StatSv1ProcessEvent, &ev1, &reply); err != nil { @@ -902,7 +902,7 @@ func testAttributeSProcessEventWithLibPhoneNumberComposed(t *testing.T) { Attributes: []*engine.Attribute{ { Path: utils.MetaReq + utils.NestingSep + "DestinationCarrier", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.RSRParsers{ &config.RSRParser{ Rules: "~*libphonenumber.<~*req.Destination>.Carrier", @@ -911,7 +911,7 @@ func testAttributeSProcessEventWithLibPhoneNumberComposed(t *testing.T) { }, { Path: utils.MetaReq + utils.NestingSep + "DestinationCarrier", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.RSRParsers{ &config.RSRParser{ Rules: ";", @@ -920,7 +920,7 @@ func testAttributeSProcessEventWithLibPhoneNumberComposed(t *testing.T) { }, { Path: utils.MetaReq + utils.NestingSep + "DestinationCarrier", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.RSRParsers{ &config.RSRParser{ Rules: "~*libphonenumber.<~*req.Destination>.CountryCode", diff --git a/general_tests/auth_test.go b/general_tests/auth_test.go index 505290401..bb8593ad4 100644 --- a/general_tests/auth_test.go +++ b/general_tests/auth_test.go @@ -125,7 +125,7 @@ cgrates.org,call,*any,2013-01-06T00:00:00Z,RP_ANY,` } func TestAuthPostpaidNoAcnt(t *testing.T) { - cdr := &engine.UsageRecord{ToR: utils.VOICE, RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", + cdr := &engine.UsageRecord{ToR: utils.MetaVoice, RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "call", Account: "nonexistent", Subject: "testauthpostpaid1", Destination: "4986517174963", SetupTime: time.Date(2015, 8, 27, 11, 26, 0, 0, time.UTC).String()} cd, err := cdr.AsCallDescriptor("", false) @@ -140,7 +140,7 @@ func TestAuthPostpaidNoAcnt(t *testing.T) { func TestAuthPostpaidFallbackDest(t *testing.T) { // Test subject which has fallback for destination - cdr := &engine.UsageRecord{ToR: utils.VOICE, RequestType: utils.MetaPostpaid, Tenant: "cgrates.org", + cdr := &engine.UsageRecord{ToR: utils.MetaVoice, RequestType: utils.MetaPostpaid, Tenant: "cgrates.org", Category: "call", Account: "testauthpostpaid1", Subject: "testauthpostpaid2", Destination: "441231234", SetupTime: time.Date(2015, 8, 27, 11, 26, 0, 0, time.UTC).String()} cd, err := cdr.AsCallDescriptor("", false) @@ -157,7 +157,7 @@ func TestAuthPostpaidFallbackDest(t *testing.T) { func TestAuthPostpaidWithDestination(t *testing.T) { // Test subject which does not have destination attached - cdr := &engine.UsageRecord{ToR: utils.VOICE, RequestType: utils.MetaPostpaid, Tenant: "cgrates.org", + cdr := &engine.UsageRecord{ToR: utils.MetaVoice, RequestType: utils.MetaPostpaid, Tenant: "cgrates.org", Category: "call", Account: "testauthpostpaid1", Subject: "testauthpostpaid1", Destination: "4986517174963", SetupTime: time.Date(2015, 8, 27, 11, 26, 0, 0, time.UTC).String()} cd, err := cdr.AsCallDescriptor("", false) diff --git a/general_tests/broadcast_client_it_test.go b/general_tests/broadcast_client_it_test.go index 59c35b611..ac14b8ce3 100644 --- a/general_tests/broadcast_client_it_test.go +++ b/general_tests/broadcast_client_it_test.go @@ -139,8 +139,8 @@ func testbrodcastItProccessEvent(t *testing.T) { ID: "TestSSv1ItProcessCDR", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.Category: utils.CALL, - utils.ToR: utils.VOICE, + utils.Category: utils.Call, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1Brodcast", utils.RequestType: utils.MetaPostpaid, utils.AccountField: "1001", diff --git a/general_tests/cdrs_exp_it_test.go b/general_tests/cdrs_exp_it_test.go index ee4e0f03b..960d38ffd 100644 --- a/general_tests/cdrs_exp_it_test.go +++ b/general_tests/cdrs_exp_it_test.go @@ -63,7 +63,7 @@ var ( Tenant: "cgrates.org", Event: map[string]interface{}{ utils.CGRID: "TestCGRID", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestCDRsExp", utils.OriginHost: "192.168.1.0", utils.RequestType: utils.MetaRated, @@ -82,7 +82,7 @@ var ( cdrsExpEvExp = map[string]interface{}{ utils.CGRID: "TestCGRID", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestCDRsExp", utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", diff --git a/general_tests/cdrs_it_test.go b/general_tests/cdrs_it_test.go index a8e5a14f2..d64319e77 100644 --- a/general_tests/cdrs_it_test.go +++ b/general_tests/cdrs_it_test.go @@ -509,7 +509,7 @@ func testV2CDRsSetThresholdProfile(t *testing.T) { var actreply string // Set Action - attrsAA := &utils.AttrSetActions{ActionsId: "ACT_THD_PoccessCDR", Actions: []*utils.TPAction{{Identifier: utils.LOG}}} + attrsAA := &utils.AttrSetActions{ActionsId: "ACT_THD_PoccessCDR", Actions: []*utils.TPAction{{Identifier: utils.MetaLog}}} if err := cdrsRpc.Call(utils.APIerSv2SetActions, attrsAA, &actreply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) } else if actreply != utils.OK { @@ -593,7 +593,7 @@ func testV2CDRsGetStats1(t *testing.T) { expectedIDs := []string{"STS_PoccessCDR"} var metrics map[string]string expectedMetrics := map[string]string{ - utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: utils.NOT_AVAILABLE, + utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: utils.NotAvailable, } if err := cdrsRpc.Call(utils.StatSv1GetQueueStringMetrics, &utils.TenantIDWithOpts{ diff --git a/general_tests/cdrs_onlexp_it_test.go b/general_tests/cdrs_onlexp_it_test.go index 5a73eb410..75c93f0b0 100644 --- a/general_tests/cdrs_onlexp_it_test.go +++ b/general_tests/cdrs_onlexp_it_test.go @@ -212,7 +212,7 @@ func testCDRsOnExpLoadDefaultCharger(t *testing.T) { func testCDRsOnExpDisableOnlineExport(t *testing.T) { testCdr := &engine.CDR{ CGRID: utils.Sha1("NoOnlineExport", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()), - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "TestCDRsOnExpDisableOnlineExport", OriginHost: "192.168.1.0", Source: "UNKNOWN", @@ -255,7 +255,7 @@ func testCDRsOnExpDisableOnlineExport(t *testing.T) { func testCDRsOnExpHttpCdrReplication(t *testing.T) { testCdr1 := &engine.CDR{ CGRID: httpCGRID, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "httpjsonrpc1", OriginHost: "192.168.1.1", Source: "UNKNOWN", @@ -375,7 +375,7 @@ func testCDRsOnExpAMQPReplication(t *testing.T) { time.Sleep(2 * time.Second) testCdr := &engine.CDR{ CGRID: amqpCGRID, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "amqpreconnect", OriginHost: "192.168.1.1", Source: "UNKNOWN", diff --git a/general_tests/cdrs_processevent_it_test.go b/general_tests/cdrs_processevent_it_test.go index 701780273..64056a965 100644 --- a/general_tests/cdrs_processevent_it_test.go +++ b/general_tests/cdrs_processevent_it_test.go @@ -135,7 +135,7 @@ func testV1CDRsProcessEventAttrS(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: acntAttrs.Tenant, Account: acntAttrs.Account, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 120000000000, Balance: map[string]interface{}{ utils.ID: "BALANCE1", @@ -151,7 +151,7 @@ func testV1CDRsProcessEventAttrS(t *testing.T) { expectedVoice := 120000000000.0 if err := pecdrsRpc.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.VOICE].GetTotalValue(); rply != expectedVoice { + } else if rply := acnt.BalanceMap[utils.MetaVoice].GetTotalValue(); rply != expectedVoice { t.Errorf("Expecting: %v, received: %v", expectedVoice, rply) } argsEv := &engine.ArgV1ProcessEvent{ @@ -334,7 +334,7 @@ func testV1CDRsProcessEventSts(t *testing.T) { utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "test4_processEvent", utils.OriginHost: "OriginHost4", utils.RequestType: utils.MetaPseudoPrepaid, @@ -450,9 +450,9 @@ func testV1CDRsProcessEventThreshold(t *testing.T) { if err := pecdrsRpc.Call(utils.APIerSv2SetActions, &utils.AttrSetActions{ ActionsId: "ACT_LOG", Actions: []*utils.TPAction{ - {Identifier: utils.LOG}, + {Identifier: utils.MetaLog}, { - Identifier: utils.TOPUP_RESET, BalanceType: utils.VOICE, + Identifier: utils.TOPUP_RESET, BalanceType: utils.MetaVoice, Units: "10", ExpiryTime: "*unlimited", DestinationIds: "*any", BalanceWeight: "10", Weight: 10}, }, @@ -493,7 +493,7 @@ func testV1CDRsProcessEventThreshold(t *testing.T) { attrs := &utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "1005", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 1, Balance: map[string]interface{}{ utils.ID: utils.MetaDefault, @@ -553,7 +553,7 @@ func testV1CDRsProcessEventThreshold(t *testing.T) { expectedVoice := 10.0 if err := pecdrsRpc.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.VOICE].GetTotalValue(); rply != expectedVoice { + } else if rply := acnt.BalanceMap[utils.MetaVoice].GetTotalValue(); rply != expectedVoice { t.Errorf("Expecting: %v, received: %v", expectedVoice, rply) } } diff --git a/general_tests/data_it_test.go b/general_tests/data_it_test.go index 098206afa..c13e754bd 100644 --- a/general_tests/data_it_test.go +++ b/general_tests/data_it_test.go @@ -137,7 +137,7 @@ func testV1DataDataDebitUsageWith10Kilo(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "testV1DataDataCost", - BalanceType: utils.DATA, + BalanceType: utils.MetaData, Value: 356000000, Balance: map[string]interface{}{ utils.Categories: "data", @@ -158,9 +158,9 @@ func testV1DataDataDebitUsageWith10Kilo(t *testing.T) { &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "testV1DataDataCost"}, &acc); err != nil { t.Error(err) - } else if _, has := acc.BalanceMap[utils.DATA]; !has { - t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.DATA])) - } else if rply := acc.BalanceMap[utils.DATA].GetTotalValue(); rply != expected { + } else if _, has := acc.BalanceMap[utils.MetaData]; !has { + t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.MetaData])) + } else if rply := acc.BalanceMap[utils.MetaData].GetTotalValue(); rply != expected { t.Errorf("Expecting: %v, received: %v", expected, rply) } @@ -170,7 +170,7 @@ func testV1DataDataDebitUsageWith10Kilo(t *testing.T) { Account: "testV1DataDataCost", Destination: "*any", Usage: "256000000", - ToR: utils.DATA, + ToR: utils.MetaData, Category: "data", SetupTime: time.Date(2013, 11, 7, 7, 42, 20, 0, time.UTC).String(), AnswerTime: time.Date(2013, 11, 7, 7, 42, 20, 0, time.UTC).String(), @@ -189,9 +189,9 @@ func testV1DataDataDebitUsageWith10Kilo(t *testing.T) { &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "testV1DataDataCost"}, &acc); err != nil { t.Error(err) - } else if _, has := acc.BalanceMap[utils.DATA]; !has { - t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.DATA])) - } else if rply := acc.BalanceMap[utils.DATA].GetTotalValue(); rply != expected { + } else if _, has := acc.BalanceMap[utils.MetaData]; !has { + t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.MetaData])) + } else if rply := acc.BalanceMap[utils.MetaData].GetTotalValue(); rply != expected { t.Errorf("Expecting: %v, received: %v", expected, rply) } @@ -216,7 +216,7 @@ func testV1DataDebitBalanceWith10Kilo(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "testV1DataDebitBalance", - BalanceType: utils.DATA, + BalanceType: utils.MetaData, Value: 356000000, Balance: map[string]interface{}{ utils.Categories: "data", @@ -237,9 +237,9 @@ func testV1DataDebitBalanceWith10Kilo(t *testing.T) { &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "testV1DataDebitBalance"}, &acc); err != nil { t.Error(err) - } else if _, has := acc.BalanceMap[utils.DATA]; !has { - t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.DATA])) - } else if rply := acc.BalanceMap[utils.DATA].GetTotalValue(); rply != expected { + } else if _, has := acc.BalanceMap[utils.MetaData]; !has { + t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.MetaData])) + } else if rply := acc.BalanceMap[utils.MetaData].GetTotalValue(); rply != expected { t.Errorf("Expecting: %v, received: %v", expected, rply) } @@ -247,7 +247,7 @@ func testV1DataDebitBalanceWith10Kilo(t *testing.T) { if err := dataRpc.Call(utils.APIerSv1DebitBalance, &v1.AttrAddBalance{ Tenant: "cgrates.org", Account: "testV1DataDebitBalance", - BalanceType: utils.DATA, + BalanceType: utils.MetaData, Value: 256000000, }, &reply); err != nil { t.Error(err) @@ -263,9 +263,9 @@ func testV1DataDebitBalanceWith10Kilo(t *testing.T) { &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "testV1DataDebitBalance"}, &acc); err != nil { t.Error(err) - } else if _, has := acc.BalanceMap[utils.DATA]; !has { - t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.DATA])) - } else if rply := acc.BalanceMap[utils.DATA].GetTotalValue(); rply != expected { + } else if _, has := acc.BalanceMap[utils.MetaData]; !has { + t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.MetaData])) + } else if rply := acc.BalanceMap[utils.MetaData].GetTotalValue(); rply != expected { t.Errorf("Expecting: %v, received: %v", expected, rply) } @@ -275,7 +275,7 @@ func testV1DataDataDebitUsage1G0(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "testV1DataDataDebitUsage1G0", - BalanceType: utils.DATA, + BalanceType: utils.MetaData, Value: 1100000000, Balance: map[string]interface{}{ utils.Categories: "data", @@ -296,9 +296,9 @@ func testV1DataDataDebitUsage1G0(t *testing.T) { &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "testV1DataDataDebitUsage1G0"}, &acc); err != nil { t.Error(err) - } else if _, has := acc.BalanceMap[utils.DATA]; !has { - t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.DATA])) - } else if rply := acc.BalanceMap[utils.DATA].GetTotalValue(); rply != expected { + } else if _, has := acc.BalanceMap[utils.MetaData]; !has { + t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.MetaData])) + } else if rply := acc.BalanceMap[utils.MetaData].GetTotalValue(); rply != expected { t.Errorf("Expecting: %v, received: %v", expected, rply) } @@ -308,7 +308,7 @@ func testV1DataDataDebitUsage1G0(t *testing.T) { Account: "testV1DataDataDebitUsage1G0", Destination: "*any", Usage: "1000000000", - ToR: utils.DATA, + ToR: utils.MetaData, Category: "data", SetupTime: time.Date(2013, 11, 7, 7, 42, 20, 0, time.UTC).String(), AnswerTime: time.Date(2013, 11, 7, 7, 42, 20, 0, time.UTC).String(), @@ -327,9 +327,9 @@ func testV1DataDataDebitUsage1G0(t *testing.T) { &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "testV1DataDataDebitUsage1G0"}, &acc); err != nil { t.Error(err) - } else if _, has := acc.BalanceMap[utils.DATA]; !has { - t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.DATA])) - } else if rply := acc.BalanceMap[utils.DATA].GetTotalValue(); rply != expected { + } else if _, has := acc.BalanceMap[utils.MetaData]; !has { + t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.MetaData])) + } else if rply := acc.BalanceMap[utils.MetaData].GetTotalValue(); rply != expected { t.Errorf("Expecting: %v, received: %v", expected, rply) } @@ -354,7 +354,7 @@ func testV1DataDebitBalance1G0(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "testV1DataDebitBalance1G0", - BalanceType: utils.DATA, + BalanceType: utils.MetaData, Value: 1100000000, Balance: map[string]interface{}{ utils.Categories: "data", @@ -375,9 +375,9 @@ func testV1DataDebitBalance1G0(t *testing.T) { &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "testV1DataDebitBalance1G0"}, &acc); err != nil { t.Error(err) - } else if _, has := acc.BalanceMap[utils.DATA]; !has { - t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.DATA])) - } else if rply := acc.BalanceMap[utils.DATA].GetTotalValue(); rply != expected { + } else if _, has := acc.BalanceMap[utils.MetaData]; !has { + t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.MetaData])) + } else if rply := acc.BalanceMap[utils.MetaData].GetTotalValue(); rply != expected { t.Errorf("Expecting: %v, received: %v", expected, rply) } @@ -385,7 +385,7 @@ func testV1DataDebitBalance1G0(t *testing.T) { if err := dataRpc.Call(utils.APIerSv1DebitBalance, &v1.AttrAddBalance{ Tenant: "cgrates.org", Account: "testV1DataDebitBalance1G0", - BalanceType: utils.DATA, + BalanceType: utils.MetaData, Value: 1000000000, }, &reply); err != nil { t.Error(err) @@ -401,9 +401,9 @@ func testV1DataDebitBalance1G0(t *testing.T) { &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "testV1DataDebitBalance1G0"}, &acc); err != nil { t.Error(err) - } else if _, has := acc.BalanceMap[utils.DATA]; !has { - t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.DATA])) - } else if rply := acc.BalanceMap[utils.DATA].GetTotalValue(); rply != expected { + } else if _, has := acc.BalanceMap[utils.MetaData]; !has { + t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.MetaData])) + } else if rply := acc.BalanceMap[utils.MetaData].GetTotalValue(); rply != expected { t.Errorf("Expecting: %v, received: %v", expected, rply) } @@ -413,7 +413,7 @@ func testV1DataInitSession(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "testV1DataInitSession", - BalanceType: utils.DATA, + BalanceType: utils.MetaData, Value: 1100000000, Balance: map[string]interface{}{ utils.Categories: "data", @@ -434,9 +434,9 @@ func testV1DataInitSession(t *testing.T) { &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "testV1DataInitSession"}, &acc); err != nil { t.Error(err) - } else if _, has := acc.BalanceMap[utils.DATA]; !has { - t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.DATA])) - } else if rply := acc.BalanceMap[utils.DATA].GetTotalValue(); rply != expected { + } else if _, has := acc.BalanceMap[utils.MetaData]; !has { + t.Error("Unexpected balance returned: ", utils.ToJSON(acc.BalanceMap[utils.MetaData])) + } else if rply := acc.BalanceMap[utils.MetaData].GetTotalValue(); rply != expected { t.Errorf("Expecting: %v, received: %v", expected, rply) } @@ -456,7 +456,7 @@ func testV1DataInitSession(t *testing.T) { ID: "testV1DataInitSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.DATA, + utils.ToR: utils.MetaData, utils.Category: "data", utils.OriginID: "781512335", utils.RequestType: utils.MetaPrepaid, @@ -501,7 +501,7 @@ func testV1DataUpdateWith1Mo(t *testing.T) { ID: "testV1DataUpdateWith1Mo", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.DATA, + utils.ToR: utils.MetaData, utils.Category: "data", "InitialOriginID": "781512335", "LastUsed": 0, @@ -547,7 +547,7 @@ func testV1DataUpdateWith1Go(t *testing.T) { ID: "testV1DataUpdateWith1Go", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.DATA, + utils.ToR: utils.MetaData, utils.Category: "data", "InitialOriginID": "781512335", "LastUsed": 946405, diff --git a/general_tests/datachrg1_test.go b/general_tests/datachrg1_test.go index b73396f1b..2c18a2994 100644 --- a/general_tests/datachrg1_test.go +++ b/general_tests/datachrg1_test.go @@ -90,7 +90,7 @@ func TestGetDataCostDtChrg1(t *testing.T) { TimeStart: timeStart, TimeEnd: timeStart.Add(usageDur), DurationIndex: usageDur, - ToR: utils.DATA, + ToR: utils.MetaData, } if cc, err := cd.GetCost(); err != nil { t.Error(err) @@ -111,7 +111,7 @@ func TestGetDataCostSecondIntDtChrg1(t *testing.T) { TimeStart: timeStart, TimeEnd: timeStart.Add(usageDur), DurationIndex: usageDur, - ToR: utils.DATA, + ToR: utils.MetaData, } if cc, err := cd.GetCost(); err != nil { t.Error(err) @@ -132,7 +132,7 @@ func TestGetDataBetweenCostDtChrg1(t *testing.T) { TimeStart: timeStart, TimeEnd: timeStart.Add(usageDur), DurationIndex: usageDur, - ToR: utils.DATA, + ToR: utils.MetaData, } if cc, err := cd.GetCost(); err != nil { t.Error(err) diff --git a/general_tests/ddazmbl1_test.go b/general_tests/ddazmbl1_test.go index 957e0010c..5e9f51d6e 100644 --- a/general_tests/ddazmbl1_test.go +++ b/general_tests/ddazmbl1_test.go @@ -136,12 +136,12 @@ func TestDZ1ExecuteActions(t *testing.T) { t.Error(err) } else if len(acnt.BalanceMap) != 2 { t.Error("Account does not have enough balances: ", acnt.BalanceMap) - } else if acnt.BalanceMap[utils.VOICE][0].Value != 40000000000 { + } else if acnt.BalanceMap[utils.MetaVoice][0].Value != 40000000000 { t.Error("Account does not have enough minutes in balance", - acnt.BalanceMap[utils.VOICE][0].Value) - } else if acnt.BalanceMap[utils.MONETARY][0].Value != 10 { + acnt.BalanceMap[utils.MetaVoice][0].Value) + } else if acnt.BalanceMap[utils.MetaMonetary][0].Value != 10 { t.Error("Account does not have enough monetary balance", - acnt.BalanceMap[utils.MONETARY][0].Value) + acnt.BalanceMap[utils.MetaMonetary][0].Value) } } @@ -164,12 +164,12 @@ func TestDZ1Debit(t *testing.T) { if err != nil { t.Fatal(err) } - if acnt.BalanceMap[utils.VOICE][0].Value != 20000000000 { + if acnt.BalanceMap[utils.MetaVoice][0].Value != 20000000000 { t.Error("Account does not have expected *voice units in balance", - acnt.BalanceMap[utils.VOICE][0].Value) + acnt.BalanceMap[utils.MetaVoice][0].Value) } - if acnt.BalanceMap[utils.MONETARY][0].Value != 9.99 { + if acnt.BalanceMap[utils.MetaMonetary][0].Value != 9.99 { t.Error("Account does not have expected *monetary units in balance", - acnt.BalanceMap[utils.MONETARY][0].Value) + acnt.BalanceMap[utils.MetaMonetary][0].Value) } } diff --git a/general_tests/ddazmbl2_test.go b/general_tests/ddazmbl2_test.go index 9e632d523..e8ddc8371 100644 --- a/general_tests/ddazmbl2_test.go +++ b/general_tests/ddazmbl2_test.go @@ -133,10 +133,10 @@ func TestExecuteActions2(t *testing.T) { t.Error(err) } else if len(acnt.BalanceMap) != 2 { t.Error("Account does not have enough balances: ", acnt.BalanceMap) - } else if acnt.BalanceMap[utils.VOICE][0].Value != 40*float64(time.Second) { - t.Error("Account does not have enough minutes in balance", acnt.BalanceMap[utils.VOICE][0].Value) - } else if acnt.BalanceMap[utils.MONETARY][0].Value != 0 { - t.Error("Account does not have enough monetary balance", acnt.BalanceMap[utils.MONETARY][0].Value) + } else if acnt.BalanceMap[utils.MetaVoice][0].Value != 40*float64(time.Second) { + t.Error("Account does not have enough minutes in balance", acnt.BalanceMap[utils.MetaVoice][0].Value) + } else if acnt.BalanceMap[utils.MetaMonetary][0].Value != 0 { + t.Error("Account does not have enough monetary balance", acnt.BalanceMap[utils.MetaMonetary][0].Value) } } @@ -162,10 +162,10 @@ func TestDebit2(t *testing.T) { if len(acnt.BalanceMap) != 2 { t.Error("Wrong number of user balances found", acnt.BalanceMap) } - if acnt.BalanceMap[utils.VOICE][0].Value != 20*float64(time.Second) { - t.Error("Account does not have expected minutes in balance", acnt.BalanceMap[utils.VOICE][0].Value) + if acnt.BalanceMap[utils.MetaVoice][0].Value != 20*float64(time.Second) { + t.Error("Account does not have expected minutes in balance", acnt.BalanceMap[utils.MetaVoice][0].Value) } - for _, blnc := range acnt.BalanceMap[utils.MONETARY] { // Test negative balance for default one + for _, blnc := range acnt.BalanceMap[utils.MetaMonetary] { // Test negative balance for default one if blnc.Weight == 10 && blnc.Value != 0 { t.Errorf("Balance with weight: %f, having value: %f ", blnc.Weight, blnc.Value) } else if blnc.Weight == 0 && blnc.Value != -0.01 { diff --git a/general_tests/ddazmbl3_test.go b/general_tests/ddazmbl3_test.go index 05fa78fa4..bb46f442a 100644 --- a/general_tests/ddazmbl3_test.go +++ b/general_tests/ddazmbl3_test.go @@ -132,8 +132,8 @@ func TestExecuteActions3(t *testing.T) { t.Error(err) } else if len(acnt.BalanceMap) != 1 { t.Error("Account does not have enough balances: ", acnt.BalanceMap) - } else if acnt.BalanceMap[utils.VOICE][0].Value != 40*float64(time.Second) { - t.Error("Account does not have enough minutes in balance", acnt.BalanceMap[utils.VOICE][0].Value) + } else if acnt.BalanceMap[utils.MetaVoice][0].Value != 40*float64(time.Second) { + t.Error("Account does not have enough minutes in balance", acnt.BalanceMap[utils.MetaVoice][0].Value) } } @@ -159,10 +159,10 @@ func TestDebit3(t *testing.T) { if len(acnt.BalanceMap) != 2 { t.Error("Wrong number of user balances found", acnt.BalanceMap) } - if acnt.BalanceMap[utils.VOICE][0].Value != 20*float64(time.Second) { - t.Error("Account does not have expected minutes in balance", acnt.BalanceMap[utils.VOICE][0].Value) + if acnt.BalanceMap[utils.MetaVoice][0].Value != 20*float64(time.Second) { + t.Error("Account does not have expected minutes in balance", acnt.BalanceMap[utils.MetaVoice][0].Value) } - if acnt.BalanceMap[utils.MONETARY][0].Value != -0.01 { - t.Error("Account does not have expected monetary balance", acnt.BalanceMap[utils.MONETARY][0].Value) + if acnt.BalanceMap[utils.MetaMonetary][0].Value != -0.01 { + t.Error("Account does not have expected monetary balance", acnt.BalanceMap[utils.MetaMonetary][0].Value) } } diff --git a/general_tests/doubleremove_it_test.go b/general_tests/doubleremove_it_test.go index 5fba207f8..92377ee8b 100644 --- a/general_tests/doubleremove_it_test.go +++ b/general_tests/doubleremove_it_test.go @@ -188,7 +188,7 @@ func testdoubleRemoveActions(t *testing.T) { Actions: []*v1.V1TPAction{ { Identifier: utils.TOPUP_RESET, - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Units: 75.0, ExpiryTime: utils.UNLIMITED, Weight: 20.0}}, @@ -207,7 +207,7 @@ func testdoubleRemoveActions(t *testing.T) { eOut := []*utils.TPAction{ { Identifier: utils.TOPUP_RESET, - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Units: "75", BalanceWeight: "0", BalanceBlocker: "false", @@ -244,7 +244,7 @@ func testdoubleRemoveActionPlan(t *testing.T) { var reply string if err := sesRPC.Call(utils.APIerSv2SetActions, &utils.AttrSetActions{ ActionsId: "ACTS_2", - Actions: []*utils.TPAction{{Identifier: utils.LOG}}, + Actions: []*utils.TPAction{{Identifier: utils.MetaLog}}, }, &reply); err != nil { t.Error(err) } else if reply != utils.OK { diff --git a/general_tests/export_it_test.go b/general_tests/export_it_test.go index 64149f8eb..e78e5c09c 100644 --- a/general_tests/export_it_test.go +++ b/general_tests/export_it_test.go @@ -160,7 +160,7 @@ func testExpVerifyAttributes(t *testing.T) { { Path: utils.MetaReq + utils.NestingSep + "OfficeGroup", FilterIDs: []string{}, - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("Marketing", utils.InfieldSep), }, }, @@ -375,7 +375,7 @@ func testExpVerifyRateProfiles(t *testing.T) { RoundingMethod: utils.MetaRoundingUp, MinCost: 0, MaxCost: 0, - MaxCostStrategy: utils.MAX_COST_FREE, + MaxCostStrategy: utils.MetaMaxCostFree, Rates: map[string]*engine.Rate{ "RT_ALWAYS": { ID: "RT_ALWAYS", @@ -424,7 +424,7 @@ func testExpVerifyActionProfiles(t *testing.T) { ID: "TOPUP", FilterIDs: []string{}, Type: utils.TOPUP, - Path: utils.DynamicDataPrefix + utils.COUNTER_BALANCE + utils.NestingSep + "TestBalance" + utils.NestingSep + utils.Value, + Path: utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestBalance" + utils.NestingSep + utils.Value, Value: config.NewRSRParsersMustCompile("10", utils.InfieldSep), }, @@ -432,28 +432,28 @@ func testExpVerifyActionProfiles(t *testing.T) { ID: "SET_BALANCE_TEST_DATA", 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.InfieldSep), + Path: utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestDataBalance" + utils.NestingSep + utils.Type, + Value: config.NewRSRParsersMustCompile(utils.MetaData, utils.InfieldSep), }, { ID: "TOPUP_TEST_DATA", FilterIDs: []string{}, Type: utils.TOPUP, - Path: utils.DynamicDataPrefix + utils.COUNTER_BALANCE + utils.NestingSep + "TestDataBalance" + utils.NestingSep + utils.Value, + Path: utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestDataBalance" + utils.NestingSep + utils.Value, 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.InfieldSep), + Path: utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestVoiceBalance" + utils.NestingSep + utils.Type, + Value: config.NewRSRParsersMustCompile(utils.MetaVoice, utils.InfieldSep), }, { ID: "TOPUP_TEST_VOICE", FilterIDs: []string{}, Type: utils.TOPUP, - Path: utils.DynamicDataPrefix + utils.COUNTER_BALANCE + utils.NestingSep + "TestVoiceBalance" + utils.NestingSep + utils.Value, + Path: utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestVoiceBalance" + utils.NestingSep + utils.Value, Value: config.NewRSRParsersMustCompile("15m15s", utils.InfieldSep), }, }, diff --git a/general_tests/filters_it_test.go b/general_tests/filters_it_test.go index cf740ca06..61124a2b3 100644 --- a/general_tests/filters_it_test.go +++ b/general_tests/filters_it_test.go @@ -142,7 +142,7 @@ func testV1FltrAddStats(t *testing.T) { utils.AccountField: "1001", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 11 * time.Second, - utils.COST: 10.0, + utils.Cost: 10.0, }, }, }, @@ -161,7 +161,7 @@ func testV1FltrAddStats(t *testing.T) { utils.AccountField: "1001", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 11 * time.Second, - utils.COST: 10.5, + utils.Cost: 10.5, }, } if err := fltrRpc.Call(utils.StatSv1ProcessEvent, &ev1, &reply); err != nil { @@ -178,7 +178,7 @@ func testV1FltrAddStats(t *testing.T) { utils.AccountField: "1002", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 5 * time.Second, - utils.COST: 12.5, + utils.Cost: 12.5, }, } if err := fltrRpc.Call(utils.StatSv1ProcessEvent, &ev1, &reply); err != nil { @@ -195,7 +195,7 @@ func testV1FltrAddStats(t *testing.T) { utils.AccountField: "1002", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 6 * time.Second, - utils.COST: 17.5, + utils.Cost: 17.5, }, } if err := fltrRpc.Call(utils.StatSv1ProcessEvent, &ev1, &reply); err != nil { @@ -212,7 +212,7 @@ func testV1FltrAddStats(t *testing.T) { utils.AccountField: "1003", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 11 * time.Second, - utils.COST: 12.5, + utils.Cost: 12.5, }, } if err := fltrRpc.Call(utils.StatSv1ProcessEvent, &ev1, &reply); err != nil { @@ -229,7 +229,7 @@ func testV1FltrAddStats(t *testing.T) { "Stat": "Stat1_1", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 11 * time.Second, - utils.COST: 12.5, + utils.Cost: 12.5, utils.PDD: 12 * time.Second, }, } @@ -247,7 +247,7 @@ func testV1FltrAddStats(t *testing.T) { "Stat": "Stat1_1", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: 15 * time.Second, - utils.COST: 15.5, + utils.Cost: 15.5, utils.PDD: 15 * time.Second, }, } @@ -284,7 +284,7 @@ func testV1FltrPupulateThreshold(t *testing.T) { // Add a disable and log action attrsAA := &utils.AttrSetActions{ActionsId: "LOG", Actions: []*utils.TPAction{ - {Identifier: utils.LOG}, + {Identifier: utils.MetaLog}, }} if err := fltrRpc.Call(utils.APIerSv2SetActions, attrsAA, &result); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) @@ -588,7 +588,7 @@ func testV1FltrAccounts(t *testing.T) { } // Add a log action attrsAA := &utils.AttrSetActions{ActionsId: "LOG", Actions: []*utils.TPAction{ - {Identifier: utils.LOG}, + {Identifier: utils.MetaLog}, }} if err := fltrRpc.Call(utils.APIerSv2SetActions, attrsAA, &result); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) @@ -680,7 +680,7 @@ func testV1FltrAccountsExistsDynamicaly(t *testing.T) { var result string // Add a log action attrsAA := &utils.AttrSetActions{ActionsId: "LOG", Actions: []*utils.TPAction{ - {Identifier: utils.LOG}, + {Identifier: utils.MetaLog}, }} if err := fltrRpc.Call(utils.APIerSv2SetActions, attrsAA, &result); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) @@ -873,7 +873,7 @@ func testV1FltrAttributesPrefix(t *testing.T) { { FilterIDs: []string{}, Path: utils.MetaReq + utils.NestingSep + "CustomField", - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("2007", utils.InfieldSep), }, }, diff --git a/general_tests/gocs_it_test.go b/general_tests/gocs_it_test.go index a132c45cb..0b37d1001 100644 --- a/general_tests/gocs_it_test.go +++ b/general_tests/gocs_it_test.go @@ -195,7 +195,7 @@ func testGOCSLoadData(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: acntAttrs.Tenant, Account: acntAttrs.Account, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 3540000000000, Balance: map[string]interface{}{ utils.ID: "BALANCE1", @@ -212,7 +212,7 @@ func testGOCSLoadData(t *testing.T) { expectedVoice := 3540000000000.0 if err := usRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.VOICE].GetTotalValue(); rply != expectedVoice { + } else if rply := acnt.BalanceMap[utils.MetaVoice].GetTotalValue(); rply != expectedVoice { t.Errorf("Expecting: %v, received: %v", expectedVoice, rply) } time.Sleep(time.Duration(*waitRater) * time.Millisecond) // Give time for scheduler to execute topups on au_site @@ -228,7 +228,7 @@ func testGOCSAuthSession(t *testing.T) { ID: "TestSSv1ItAuth", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testGOCS", utils.Category: "call", utils.RequestType: utils.MetaPrepaid, @@ -260,7 +260,7 @@ func testGOCSInitSession(t *testing.T) { ID: "TestSSv1ItInitiateSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testGOCS", utils.Category: "call", utils.RequestType: utils.MetaPrepaid, @@ -316,14 +316,14 @@ func testGOCSInitSession(t *testing.T) { // 59 mins - 5 mins = 54 mins if err := auRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != 3240000000000.0 { - t.Errorf("Expecting : %+v, received: %+v", 3240000000000.0, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != 3240000000000.0 { + t.Errorf("Expecting : %+v, received: %+v", 3240000000000.0, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } if err := usRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != 3240000000000.0 { - t.Errorf("Expecting : %+v, received: %+v", 3240000000000.0, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != 3240000000000.0 { + t.Errorf("Expecting : %+v, received: %+v", 3240000000000.0, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } } @@ -338,7 +338,7 @@ func testGOCSUpdateSession(t *testing.T) { ID: "TestSSv1ItUpdateSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testGOCS", utils.Category: "call", utils.RequestType: utils.MetaPrepaid, @@ -381,8 +381,8 @@ func testGOCSUpdateSession(t *testing.T) { // 54 min - 5 mins = 49 min if err := auRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != 2940000000000.0 { - t.Errorf("Expecting : %+v, received: %+v", 2940000000000.0, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != 2940000000000.0 { + t.Errorf("Expecting : %+v, received: %+v", 2940000000000.0, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } } @@ -396,14 +396,14 @@ func testGOCSVerifyAccountsAfterStart(t *testing.T) { // because US_SITE was down we should notice a difference between balance from accounts from US_SITE and AU_SITE if err := auRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != 2940000000000.0 { - t.Errorf("Expecting : %+v, received: %+v", 2940000000000.0, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != 2940000000000.0 { + t.Errorf("Expecting : %+v, received: %+v", 2940000000000.0, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } if err := usRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != 3240000000000.0 { - t.Errorf("Expecting : %+v, received: %+v", 3240000000000.0, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != 3240000000000.0 { + t.Errorf("Expecting : %+v, received: %+v", 3240000000000.0, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } } @@ -417,7 +417,7 @@ func testGOCSUpdateSession2(t *testing.T) { ID: "TestSSv1ItUpdateSession2", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testGOCS", utils.Category: "call", utils.RequestType: utils.MetaPrepaid, @@ -470,14 +470,14 @@ func testGOCSUpdateSession2(t *testing.T) { if err := auRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != 2940000000000.0 { - t.Errorf("Expecting : %+v, received: %+v", 2940000000000.0, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != 2940000000000.0 { + t.Errorf("Expecting : %+v, received: %+v", 2940000000000.0, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } if err := usRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != 2940000000000.0 { - t.Errorf("Expecting : %+v, received: %+v", 2940000000000.0, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != 2940000000000.0 { + t.Errorf("Expecting : %+v, received: %+v", 2940000000000.0, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } } @@ -490,7 +490,7 @@ func testGOCSTerminateSession(t *testing.T) { ID: "testGOCSTerminateSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testGOCS", utils.Category: "call", utils.RequestType: utils.MetaPrepaid, @@ -532,14 +532,14 @@ func testGOCSTerminateSession(t *testing.T) { if err := auRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != 2640000000000.0 { - t.Errorf("Expecting : %+v, received: %+v", 2640000000000.0, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != 2640000000000.0 { + t.Errorf("Expecting : %+v, received: %+v", 2640000000000.0, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } if err := usRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != 2640000000000.0 { - t.Errorf("Expecting : %+v, received: %+v", 2640000000000.0, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != 2640000000000.0 { + t.Errorf("Expecting : %+v, received: %+v", 2640000000000.0, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } } @@ -550,7 +550,7 @@ func testGOCSProcessCDR(t *testing.T) { ID: "TestSSv1ItProcessCDR", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testGOCS", utils.Category: "call", utils.RequestType: utils.MetaPrepaid, @@ -582,14 +582,14 @@ func testGOCSProcessCDR(t *testing.T) { if err := auRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != 2640000000000.0 { - t.Errorf("Expecting : %+v, received: %+v", 2640000000000.0, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != 2640000000000.0 { + t.Errorf("Expecting : %+v, received: %+v", 2640000000000.0, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } if err := usRPC.Call(utils.APIerSv2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != 2640000000000.0 { - t.Errorf("Expecting : %+v, received: %+v", 2640000000000.0, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != 2640000000000.0 { + t.Errorf("Expecting : %+v, received: %+v", 2640000000000.0, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } } diff --git a/general_tests/objectdp_test.go b/general_tests/objectdp_test.go index b29702589..808da06a6 100644 --- a/general_tests/objectdp_test.go +++ b/general_tests/objectdp_test.go @@ -29,7 +29,7 @@ func TestAccountNewObjectDPFieldAsInterface(t *testing.T) { acc := &engine.Account{ ID: "cgrates.org:1001", BalanceMap: map[string]engine.Balances{ - utils.MONETARY: []*engine.Balance{ + utils.MetaMonetary: []*engine.Balance{ { Value: 20, Weight: 10, @@ -57,7 +57,7 @@ func TestAccountNewObjectDPFieldAsInterfaceFromCache(t *testing.T) { acc := &engine.Account{ ID: "cgrates.org:1001", BalanceMap: map[string]engine.Balances{ - utils.MONETARY: []*engine.Balance{ + utils.MetaMonetary: []*engine.Balance{ { Value: 20, Weight: 10, @@ -80,7 +80,7 @@ func TestAccountNewObjectDPFieldAsInterfaceFromCache(t *testing.T) { } if data, err := accDP.FieldAsInterface([]string{"BalanceMap", "*monetary[0]"}); err != nil { t.Error(err) - } else if data != acc.BalanceMap[utils.MONETARY][0] { - t.Errorf("Expected: %+v ,received: %+v", acc.BalanceMap[utils.MONETARY][0], data) + } else if data != acc.BalanceMap[utils.MetaMonetary][0] { + t.Errorf("Expected: %+v ,received: %+v", acc.BalanceMap[utils.MetaMonetary][0], data) } } diff --git a/general_tests/rpccaching_it_test.go b/general_tests/rpccaching_it_test.go index 7a151e597..41ca423b5 100644 --- a/general_tests/rpccaching_it_test.go +++ b/general_tests/rpccaching_it_test.go @@ -144,7 +144,7 @@ func testRPCMethodsAddData(t *testing.T) { // Add a disable and log action attrsAA := &utils.AttrSetActions{ActionsId: "DISABLE_LOG", Actions: []*utils.TPAction{ {Identifier: utils.DISABLE_ACCOUNT}, - {Identifier: utils.LOG}, + {Identifier: utils.MetaLog}, }} if err := rpcRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) @@ -154,7 +154,7 @@ func testRPCMethodsAddData(t *testing.T) { // Add an enable and log action attrsAA2 := &utils.AttrSetActions{ActionsId: "ENABLE_LOG", Actions: []*utils.TPAction{ {Identifier: utils.ENABLE_ACCOUNT}, - {Identifier: utils.LOG}, + {Identifier: utils.MetaLog}, }} if err := rpcRpc.Call(utils.APIerSv2SetActions, attrsAA2, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) @@ -208,7 +208,7 @@ func testRPCMethodsAuthorizeSession(t *testing.T) { ID: "testRPCMethodsAuthorizeSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testRPCMethodsAuthorizeSession", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -306,7 +306,7 @@ func testRPCMethodsInitSession(t *testing.T) { ID: "testRPCMethodsInitSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testRPCMethodsInitSession", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -406,7 +406,7 @@ func testRPCMethodsUpdateSession(t *testing.T) { ID: "testRPCMethodsUpdateSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testRPCMethodsUpdateSession", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -504,7 +504,7 @@ func testRPCMethodsTerminateSession(t *testing.T) { ID: "testRPCMethodsTerminateSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testRPCMethodsTerminateSession", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -552,7 +552,7 @@ func testRPCMethodsProcessCDR(t *testing.T) { ID: "testRPCMethodsProcessCDR", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testRPCMethodsProcessCDR", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -627,7 +627,7 @@ func testRPCMethodsProcessEvent(t *testing.T) { ID: "testRPCMethodsProcessEvent", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testRPCMethodsProcessEvent", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -724,7 +724,7 @@ func testRPCMethodsCdrsProcessCDR(t *testing.T) { ID: "testRPCMethodsCdrsProcessCDR", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginHost: "host", utils.OriginID: "testRPCMethodsCdrsProcessCDR", utils.RequestType: utils.MetaPrepaid, diff --git a/general_tests/rpcclient_it_test.go b/general_tests/rpcclient_it_test.go index 08630cc17..989579c62 100644 --- a/general_tests/rpcclient_it_test.go +++ b/general_tests/rpcclient_it_test.go @@ -315,7 +315,7 @@ func TestRPCITStatusBcastCmd(t *testing.T) { var stats utils.CacheStats if err := rpcRAL1.Call(utils.APIerSv2GetCacheStats, utils.AttrCacheStats{}, &stats); err != nil { t.Error(err) - } else if stats.LastRatingLoadID != utils.NOT_AVAILABLE || stats.LastAccountingLoadID != utils.NOT_AVAILABLE { + } else if stats.LastRatingLoadID != utils.NotAvailable || stats.LastAccountingLoadID != utils.NotAvailable { t.Errorf("Received unexpected stats: %+v", stats) } var loadInst utils.LoadInstance diff --git a/general_tests/session2_it_test.go b/general_tests/session2_it_test.go index f6127b8bd..c102c4bbe 100644 --- a/general_tests/session2_it_test.go +++ b/general_tests/session2_it_test.go @@ -120,7 +120,7 @@ func testSes2ItInitSession(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "1001", - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: float64(time.Hour), Balance: map[string]interface{}{ utils.ID: "TestDynamicDebitBalance", @@ -140,9 +140,9 @@ func testSes2ItInitSession(t *testing.T) { Tenant: "cgrates.org", ID: utils.UUIDSha1Prefix(), Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", + utils.EventName: "TEST_EVENT", utils.OriginID: utils.UUIDSha1Prefix(), - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.Category: "call", utils.Tenant: "cgrates.org", utils.AccountField: "1001", @@ -197,7 +197,7 @@ func testSes2StirAuthenticate(t *testing.T) { Tenant: "cgrates.org", ID: "testSes2StirAuthorize", Event: map[string]interface{}{ - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testSes2StirAuthorize", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -240,7 +240,7 @@ func testSes2StirInit(t *testing.T) { Tenant: "cgrates.org", ID: "testSes2StirInit", Event: map[string]interface{}{ - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testSes2StirInit", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", diff --git a/general_tests/session3_it_test.go b/general_tests/session3_it_test.go index 6b55fcd72..8233bfaad 100644 --- a/general_tests/session3_it_test.go +++ b/general_tests/session3_it_test.go @@ -138,7 +138,7 @@ func testSes3ItProcessEvent(t *testing.T) { utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It2", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -180,7 +180,7 @@ func testSes3ItProcessEvent(t *testing.T) { utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.AccountField: "1001", utils.Destination: "1002", "OfficeGroup": "Marketing", @@ -272,7 +272,7 @@ func testSes3ItAddVoiceBalance(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "1002", - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 5 * float64(time.Second), Balance: map[string]interface{}{ utils.ID: "TestDynamicDebitBalance", @@ -292,7 +292,7 @@ func testSes3ItAddVoiceBalance(t *testing.T) { } if err := ses3RPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.VOICE].GetTotalValue(); rply != float64(5*time.Second) { + } else if rply := acnt.BalanceMap[utils.MetaVoice].GetTotalValue(); rply != float64(5*time.Second) { t.Errorf("Expecting: %v, received: %v", float64(5*time.Second), rply) } @@ -310,7 +310,7 @@ func testSes3ItTerminatWithoutInit(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestTerminate", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1002", @@ -346,7 +346,7 @@ func testSes3ItTerminatWithoutInit(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestTerminate", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1002", @@ -383,7 +383,7 @@ func testSes3ItBalance(t *testing.T) { } if err := ses3RPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.VOICE].GetTotalValue(); rply != float64(3*time.Second) { + } else if rply := acnt.BalanceMap[utils.MetaVoice].GetTotalValue(); rply != float64(3*time.Second) { t.Errorf("Expecting: %v, received: %v", 3*time.Second, rply) } @@ -398,7 +398,7 @@ func testSes3ItCDRs(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestTerminate", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1002", diff --git a/general_tests/session_it_test.go b/general_tests/session_it_test.go index 4c9077311..22f1878f6 100644 --- a/general_tests/session_it_test.go +++ b/general_tests/session_it_test.go @@ -132,7 +132,7 @@ func testSesItAddVoiceBalance(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: sesTenant, Account: sesAccount, - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 0, Balance: map[string]interface{}{ utils.ID: "TestDynamicDebitBalance", @@ -145,7 +145,7 @@ func testSesItAddVoiceBalance(t *testing.T) { } else if reply != utils.OK { t.Errorf("Received: %s", reply) } - t.Run("TestAddVoiceBalance", func(t *testing.T) { testAccountBalance2(t, sesAccount, sesTenant, utils.MONETARY, 0) }) + t.Run("TestAddVoiceBalance", func(t *testing.T) { testAccountBalance2(t, sesAccount, sesTenant, utils.MetaMonetary, 0) }) } func testSesItInitSession(t *testing.T) { @@ -158,7 +158,7 @@ func testSesItInitSession(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: sesTenant, utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestRefund", utils.RequestType: utils.MetaPrepaid, utils.AccountField: sesAccount, @@ -179,7 +179,7 @@ func testSesItInitSession(t *testing.T) { } else if rply1.MaxUsage != nil && *rply1.MaxUsage != 0 { t.Errorf("Unexpected MaxUsage: %v", rply1.MaxUsage) } - t.Run("TestInitSession", func(t *testing.T) { testAccountBalance2(t, sesAccount, sesTenant, utils.MONETARY, 0) }) + t.Run("TestInitSession", func(t *testing.T) { testAccountBalance2(t, sesAccount, sesTenant, utils.MetaMonetary, 0) }) } func testSesItTerminateSession(t *testing.T) { @@ -192,7 +192,7 @@ func testSesItTerminateSession(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: sesTenant, utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestRefund", utils.RequestType: utils.MetaPrepaid, utils.AccountField: sesAccount, @@ -218,7 +218,7 @@ func testSesItTerminateSession(t *testing.T) { err.Error() != utils.ErrNotFound.Error() { t.Error(err) } - t.Run("TestTerminateSession", func(t *testing.T) { testAccountBalance2(t, sesAccount, sesTenant, utils.MONETARY, 0) }) + t.Run("TestTerminateSession", func(t *testing.T) { testAccountBalance2(t, sesAccount, sesTenant, utils.MetaMonetary, 0) }) } func testSesItStopCgrEngine(t *testing.T) { diff --git a/general_tests/session_replications_automaticdebit_it_test.go b/general_tests/session_replications_automaticdebit_it_test.go index de254ae05..3812f0c8d 100644 --- a/general_tests/session_replications_automaticdebit_it_test.go +++ b/general_tests/session_replications_automaticdebit_it_test.go @@ -80,7 +80,7 @@ func testSessionSRplAddVoiceBalance(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "1005", - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 5 * float64(time.Second), //value -> 20ms for future Balance: map[string]interface{}{ utils.ID: "TestDynamicDebitBalance", @@ -101,7 +101,7 @@ func testSessionSRplAddVoiceBalance(t *testing.T) { //get balance if err := smgRplcMstrRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if rply := acnt.BalanceMap[utils.VOICE].GetTotalValue(); rply != float64(5*time.Second) { + } else if rply := acnt.BalanceMap[utils.MetaVoice].GetTotalValue(); rply != float64(5*time.Second) { t.Errorf("Expecting: %v, received: %v", float64(5*time.Second), rply) } @@ -179,10 +179,10 @@ func testSessionSRplInitiate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionSRplInitiate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", + utils.EventName: "TEST_EVENT", utils.Tenant: "cgrates.org", utils.OriginID: "123451", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1005", utils.Subject: "1005", @@ -284,7 +284,7 @@ func testSessionSRplInitiate(t *testing.T) { if err := smgRplcMstrRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) // a tolerance of +/- 5ms is acceptable - } else if rply := acnt.BalanceMap[utils.VOICE].GetTotalValue(); rply < float64(5*time.Second-25*time.Millisecond) || rply > float64(5*time.Second-15*time.Millisecond) { + } else if rply := acnt.BalanceMap[utils.MetaVoice].GetTotalValue(); rply < float64(5*time.Second-25*time.Millisecond) || rply > float64(5*time.Second-15*time.Millisecond) { t.Errorf("Expecting: ~%v, received: %v", float64(5*time.Second-20*time.Millisecond), rply) } } @@ -345,7 +345,7 @@ func testSessionSRplCheckAccount(t *testing.T) { if err := smgRplcSlvRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) // a tolerance of +/- 5ms is acceptable - } else if rply := acnt.BalanceMap[utils.VOICE].GetTotalValue(); rply < float64(5*time.Second-45*time.Millisecond) || rply > float64(5*time.Second-35*time.Millisecond) { + } else if rply := acnt.BalanceMap[utils.MetaVoice].GetTotalValue(); rply < float64(5*time.Second-45*time.Millisecond) || rply > float64(5*time.Second-35*time.Millisecond) { t.Errorf("Expecting: ~%v, received: %v", float64(5*time.Second-40*time.Millisecond), rply) } } @@ -358,10 +358,10 @@ func testSessionSRplTerminate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionSRplTerminate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", + utils.EventName: "TEST_EVENT", utils.Tenant: "cgrates.org", utils.OriginID: "123451", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1005", utils.Subject: "1005", @@ -402,7 +402,7 @@ func testSessionSRplTerminate(t *testing.T) { if err := smgRplcSlvRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) // a tolerance of +/- 5ms is acceptable - } else if rply := acnt.BalanceMap[utils.VOICE].GetTotalValue(); rply != float64(3*time.Second) { + } else if rply := acnt.BalanceMap[utils.MetaVoice].GetTotalValue(); rply != float64(3*time.Second) { t.Errorf("Expecting: ~%v, received: %v", 3*time.Second, rply) } } diff --git a/general_tests/sessionrefund_it_test.go b/general_tests/sessionrefund_it_test.go index 8934457b7..b6a84395c 100644 --- a/general_tests/sessionrefund_it_test.go +++ b/general_tests/sessionrefund_it_test.go @@ -134,7 +134,7 @@ func testSrItAddVoiceBalance(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: srtenant, Account: sraccount, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 5 * float64(time.Second), Balance: map[string]interface{}{ utils.ID: "TestDynamicDebitBalance", @@ -147,7 +147,9 @@ func testSrItAddVoiceBalance(t *testing.T) { } else if reply != utils.OK { t.Errorf("Received: %s", reply) } - t.Run("TestAddVoiceBalance", func(t *testing.T) { testAccountBalance(t, sraccount, srtenant, utils.VOICE, 5*float64(time.Second)) }) + t.Run("TestAddVoiceBalance", func(t *testing.T) { + testAccountBalance(t, sraccount, srtenant, utils.MetaVoice, 5*float64(time.Second)) + }) } func testSrItInitSession(t *testing.T) { @@ -160,7 +162,7 @@ func testSrItInitSession(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: srtenant, utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestRefund", utils.RequestType: utils.MetaPrepaid, utils.AccountField: sraccount, @@ -181,7 +183,9 @@ func testSrItInitSession(t *testing.T) { } else if rply1.MaxUsage == nil || *rply1.MaxUsage != 2*time.Second { t.Errorf("Unexpected MaxUsage: %v", rply1.MaxUsage) } - t.Run("TestInitSession", func(t *testing.T) { testAccountBalance(t, sraccount, srtenant, utils.VOICE, 3*float64(time.Second)) }) + t.Run("TestInitSession", func(t *testing.T) { + testAccountBalance(t, sraccount, srtenant, utils.MetaVoice, 3*float64(time.Second)) + }) } func testSrItTerminateSession(t *testing.T) { @@ -194,7 +198,7 @@ func testSrItTerminateSession(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: srtenant, utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestRefund", utils.RequestType: utils.MetaPrepaid, utils.AccountField: sraccount, @@ -220,7 +224,9 @@ func testSrItTerminateSession(t *testing.T) { err.Error() != utils.ErrNotFound.Error() { t.Error(err) } - t.Run("TestTerminateSession", func(t *testing.T) { testAccountBalance(t, sraccount, srtenant, utils.VOICE, 5*float64(time.Second)) }) + t.Run("TestTerminateSession", func(t *testing.T) { + testAccountBalance(t, sraccount, srtenant, utils.MetaVoice, 5*float64(time.Second)) + }) } func testSrItAddMonetaryBalance(t *testing.T) { @@ -228,7 +234,7 @@ func testSrItAddMonetaryBalance(t *testing.T) { attrs := &utils.AttrSetBalance{ Tenant: srtenant, Account: sraccount, - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 10.65, Balance: map[string]interface{}{ utils.ID: utils.MetaDefault, @@ -240,7 +246,7 @@ func testSrItAddMonetaryBalance(t *testing.T) { } else if reply != utils.OK { t.Errorf("Received: %s", reply) } - t.Run("TestAddMonetaryBalance", func(t *testing.T) { testAccountBalance(t, sraccount, srtenant, utils.MONETARY, 10.65) }) + t.Run("TestAddMonetaryBalance", func(t *testing.T) { testAccountBalance(t, sraccount, srtenant, utils.MetaMonetary, 10.65) }) } func testSrItInitSession2(t *testing.T) { @@ -253,7 +259,7 @@ func testSrItInitSession2(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: srtenant, utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestRefund", utils.RequestType: utils.MetaPrepaid, utils.AccountField: sraccount, @@ -274,7 +280,7 @@ func testSrItInitSession2(t *testing.T) { } else if rply1.MaxUsage == nil || *rply1.MaxUsage != 2*time.Minute { t.Errorf("Unexpected MaxUsage: %v", rply1.MaxUsage) } - t.Run("TestInitSession", func(t *testing.T) { testAccountBalance(t, sraccount, srtenant, utils.MONETARY, 10.3002) }) + t.Run("TestInitSession", func(t *testing.T) { testAccountBalance(t, sraccount, srtenant, utils.MetaMonetary, 10.3002) }) } func testSrItTerminateSession2(t *testing.T) { @@ -287,7 +293,7 @@ func testSrItTerminateSession2(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: srtenant, utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestRefund", utils.RequestType: utils.MetaPrepaid, utils.AccountField: sraccount, @@ -313,7 +319,7 @@ func testSrItTerminateSession2(t *testing.T) { err.Error() != utils.ErrNotFound.Error() { t.Error(err) } - t.Run("TestTerminateSession", func(t *testing.T) { testAccountBalance(t, sraccount, srtenant, utils.MONETARY, 10.65) }) + t.Run("TestTerminateSession", func(t *testing.T) { testAccountBalance(t, sraccount, srtenant, utils.MetaMonetary, 10.65) }) } func testSrItStopCgrEngine(t *testing.T) { diff --git a/general_tests/sessions_concur_test.go b/general_tests/sessions_concur_test.go index 4dded96c0..e2b223888 100644 --- a/general_tests/sessions_concur_test.go +++ b/general_tests/sessions_concur_test.go @@ -157,7 +157,7 @@ func testSCncrRunSessions(t *testing.T) { argsAddBalance := &v1.AttrAddBalance{ Tenant: "cgrates.org", Account: acntID, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: float64(bufferTopup.Nanoseconds()), Balance: map[string]interface{}{ utils.ID: "BUFFER", @@ -184,9 +184,9 @@ func testSCncrRunSessions(t *testing.T) { Account: acntID} if err = sCncrRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { return - } else if vcBlnc := acnt.BalanceMap[utils.VOICE].GetTotalValue(); float64(bufferTopup.Nanoseconds())-vcBlnc > 1000000.0 { // eliminate rounding errors + } else if vcBlnc := acnt.BalanceMap[utils.MetaVoice].GetTotalValue(); float64(bufferTopup.Nanoseconds())-vcBlnc > 1000000.0 { // eliminate rounding errors t.Errorf("unexpected voice balance received: %+v", utils.ToIJSON(acnt)) - } else if mnBlnc := acnt.BalanceMap[utils.MONETARY].GetTotalValue(); mnBlnc != 0 { + } else if mnBlnc := acnt.BalanceMap[utils.MetaMonetary].GetTotalValue(); mnBlnc != 0 { t.Errorf("unexpected monetary balance received: %+v", utils.ToIJSON(acnt)) } } @@ -208,7 +208,7 @@ func testRunSession(t *testing.T) { argsAddBalance := &v1.AttrAddBalance{ Tenant: "cgrates.org", Account: acntID, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: float64(mainTopup.Nanoseconds()), Balance: map[string]interface{}{ utils.ID: "MAIN", diff --git a/general_tests/sessions_race_test.go b/general_tests/sessions_race_test.go index 908893f32..a2e4a2e15 100644 --- a/general_tests/sessions_race_test.go +++ b/general_tests/sessions_race_test.go @@ -122,7 +122,7 @@ func TestSessionSRace(t *testing.T) { if err = dm.SetAccount(&engine.Account{ ID: utils.ConcatenatedKey("cgrates.org", "1001"), // AllowNegative: true, - BalanceMap: map[string]engine.Balances{utils.VOICE: {{Value: float64(0 * time.Second), Weight: 10}}}}); err != nil { + BalanceMap: map[string]engine.Balances{utils.MetaVoice: {{Value: float64(0 * time.Second), Weight: 10}}}}); err != nil { t.Fatal(err) } @@ -140,7 +140,7 @@ func TestSessionSRace(t *testing.T) { ID: "testSSv1ItProcessEventInitiateSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testSSv1ItProcessEvent", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", @@ -167,7 +167,7 @@ func TestSessionSRace(t *testing.T) { ID: "testSSv1ItProcessEventInitiateSession", Event: map[string]interface{}{ utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "testSSv1ItProcessEvent", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", diff --git a/general_tests/smschrg1_test.go b/general_tests/smschrg1_test.go index 16e957175..31bb039e5 100644 --- a/general_tests/smschrg1_test.go +++ b/general_tests/smschrg1_test.go @@ -90,7 +90,7 @@ func TestSMSGetDataCostSmsChrg1(t *testing.T) { TimeStart: timeStart, TimeEnd: timeStart.Add(usageDur), DurationIndex: usageDur, - ToR: utils.SMS, + ToR: utils.MetaSMS, } if cc, err := cd.GetCost(); err != nil { t.Error(err) diff --git a/general_tests/suretax_it_test.go b/general_tests/suretax_it_test.go index 133c6fb08..685a6e546 100644 --- a/general_tests/suretax_it_test.go +++ b/general_tests/suretax_it_test.go @@ -129,7 +129,7 @@ func testSTICacheStats(t *testing.T) { // Test CDR from external sources func testSTIProcessExternalCdr(t *testing.T) { - cdr := &engine.ExternalCDR{ToR: utils.VOICE, + cdr := &engine.ExternalCDR{ToR: utils.MetaVoice, OriginID: "teststicdr1", OriginHost: "192.168.1.1", Source: "STI_TEST", RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "+14082342500", Destination: "+16268412300", Supplier: "SUPPL1", SetupTime: "2015-10-18T13:00:00Z", AnswerTime: "2015-10-18T13:00:00Z", @@ -156,7 +156,7 @@ func testSTIGetCdrs(t *testing.T) { t.Errorf("Unexpected Cost for CDR: %+v", cdrs[0]) } } - req = utils.RPCCDRsFilter{RunIDs: []string{utils.META_SURETAX}, Accounts: []string{"1001"}} + req = utils.RPCCDRsFilter{RunIDs: []string{utils.MetaSureTax}, Accounts: []string{"1001"}} if err := stiRpc.Call(utils.APIerSv2GetCDRs, &req, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { diff --git a/general_tests/tls_it_test.go b/general_tests/tls_it_test.go index a7590c86b..483c05276 100755 --- a/general_tests/tls_it_test.go +++ b/general_tests/tls_it_test.go @@ -146,7 +146,7 @@ func testTLSPing(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.OriginID: "TestSSv1It1", utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", diff --git a/general_tests/tp_it_test.go b/general_tests/tp_it_test.go index 14528f9f5..3418ed074 100644 --- a/general_tests/tp_it_test.go +++ b/general_tests/tp_it_test.go @@ -151,7 +151,7 @@ func testTpBalanceCounter(t *testing.T) { attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001"} if err := tpRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error("Got error on APIerSv2.GetAccount: ", err.Error()) - } else if acnt.UnitCounters[utils.MONETARY][1].Counters[0].Value != 20.0 { + } else if acnt.UnitCounters[utils.MetaMonetary][1].Counters[0].Value != 20.0 { t.Errorf("Calling APIerSv2.GetBalance received: %s", utils.ToIJSON(acnt)) } } @@ -212,7 +212,7 @@ func testTpZeroCost(t *testing.T) { // if this happens try to run this test manualy return } - balanceValueBefore := acnt.BalanceMap[utils.MONETARY][0].Value + balanceValueBefore := acnt.BalanceMap[utils.MetaMonetary][0].Value tStart := time.Date(2016, 3, 31, 0, 0, 0, 0, time.UTC) cd := &engine.CallDescriptorWithOpts{ CallDescriptor: &engine.CallDescriptor{ @@ -234,7 +234,7 @@ func testTpZeroCost(t *testing.T) { } if err := tpRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error("Got error on APIerSv2.GetAccount: ", err.Error()) - } else if acnt.BalanceMap[utils.MONETARY][0].Value != balanceValueBefore { + } else if acnt.BalanceMap[utils.MetaMonetary][0].Value != balanceValueBefore { t.Errorf("Calling APIerSv2.GetAccount received: %s", utils.ToIJSON(acnt)) } } @@ -263,7 +263,7 @@ func testTpZeroNegativeCost(t *testing.T) { attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1013"} if err := tpRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error("Got error on APIerSv2.GetAccount: ", err.Error()) - } else if acnt.BalanceMap[utils.VOICE][0].Value != 100.0 { + } else if acnt.BalanceMap[utils.MetaVoice][0].Value != 100.0 { t.Errorf("Calling APIerSv2.GetAccount received: %s", utils.ToIJSON(acnt)) } } @@ -342,8 +342,8 @@ func testTpCreateExecuteActionMatch(t *testing.T) { t.Error("Got error on APIerSv2.GetAccount: ", err.Error()) } if len(acnt.BalanceMap) != 1 || - len(acnt.BalanceMap[utils.MONETARY]) != 1 || - acnt.BalanceMap[utils.MONETARY].GetTotalValue() != 21 { + len(acnt.BalanceMap[utils.MetaMonetary]) != 1 || + acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != 21 { t.Error("error matching previous created balance: ", utils.ToIJSON(acnt.BalanceMap)) } } diff --git a/general_tests/tutorial2_it_test.go b/general_tests/tutorial2_it_test.go index 0399a7146..865c74111 100644 --- a/general_tests/tutorial2_it_test.go +++ b/general_tests/tutorial2_it_test.go @@ -303,13 +303,13 @@ func testTutAccounts(t *testing.T) { t.Fatal(err) } if len(acnt.BalanceMap) != 4 || - len(acnt.BalanceMap[utils.MONETARY]) != 1 || - acnt.BalanceMap[utils.MONETARY][0].Value != 10 || - len(acnt.BalanceMap[utils.VOICE]) != 2 || - len(acnt.BalanceMap[utils.SMS]) != 1 || - acnt.BalanceMap[utils.SMS][0].Value != 100 || - len(acnt.BalanceMap[utils.DATA]) != 1 || - acnt.BalanceMap[utils.DATA][0].Value != 1024 || + len(acnt.BalanceMap[utils.MetaMonetary]) != 1 || + acnt.BalanceMap[utils.MetaMonetary][0].Value != 10 || + len(acnt.BalanceMap[utils.MetaVoice]) != 2 || + len(acnt.BalanceMap[utils.MetaSMS]) != 1 || + acnt.BalanceMap[utils.MetaSMS][0].Value != 100 || + len(acnt.BalanceMap[utils.MetaData]) != 1 || + acnt.BalanceMap[utils.MetaData][0].Value != 1024 || len(acnt.ActionTriggers) != 2 || acnt.Disabled { t.Errorf("received account: %s", utils.ToIJSON(acnt)) @@ -319,7 +319,7 @@ func testTutAccounts(t *testing.T) { attrBlc := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "1001", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 1, Balance: map[string]interface{}{ utils.ID: utils.MetaDefault, @@ -333,14 +333,14 @@ func testTutAccounts(t *testing.T) { &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001"}, &acnt); err != nil { t.Error(err) - } else if len(acnt.BalanceMap[utils.SMS]) != 2 || - acnt.GetBalanceWithID(utils.SMS, "BONUS_SMSes").Value != 10 { + } else if len(acnt.BalanceMap[utils.MetaSMS]) != 2 || + acnt.GetBalanceWithID(utils.MetaSMS, "BONUS_SMSes").Value != 10 { t.Errorf("account: %s", utils.ToIJSON(acnt)) } attrBlc = utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "1001", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, Value: 101, Balance: map[string]interface{}{ utils.ID: utils.MetaDefault, diff --git a/general_tests/tutorial_calls_test.go b/general_tests/tutorial_calls_test.go index 7d0656b1f..4d7305f8c 100755 --- a/general_tests/tutorial_calls_test.go +++ b/general_tests/tutorial_calls_test.go @@ -264,30 +264,30 @@ func testCallAccountsBefore(t *testing.T) { attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001"} if err := tutorialCallsRpc.Call(utils.APIerSv2GetAccount, attrs, &reply); err != nil { t.Error("Got error on APIerSv2.GetAccount: ", err.Error()) - } else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 10.0 { - t.Errorf("Calling APIerSv1.GetBalance received: %f", reply.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if reply.BalanceMap[utils.MetaMonetary].GetTotalValue() != 10.0 { + t.Errorf("Calling APIerSv1.GetBalance received: %f", reply.BalanceMap[utils.MetaMonetary].GetTotalValue()) } var reply2 *engine.Account attrs2 := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1002"} if err := tutorialCallsRpc.Call(utils.APIerSv2GetAccount, attrs2, &reply2); err != nil { t.Error("Got error on APIerSv2.GetAccount: ", err.Error()) - } else if reply2.BalanceMap[utils.MONETARY].GetTotalValue() != 10.0 { - t.Errorf("Calling APIerSv1.GetBalance received: %f", reply2.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if reply2.BalanceMap[utils.MetaMonetary].GetTotalValue() != 10.0 { + t.Errorf("Calling APIerSv1.GetBalance received: %f", reply2.BalanceMap[utils.MetaMonetary].GetTotalValue()) } var reply3 *engine.Account attrs3 := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1003"} if err := tutorialCallsRpc.Call(utils.APIerSv2GetAccount, attrs3, &reply3); err != nil { t.Error("Got error on APIerSv2.GetAccount: ", err.Error()) - } else if reply3.BalanceMap[utils.MONETARY].GetTotalValue() != 10.0 { - t.Errorf("Calling APIerSv1.GetBalance received: %f", reply3.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if reply3.BalanceMap[utils.MetaMonetary].GetTotalValue() != 10.0 { + t.Errorf("Calling APIerSv1.GetBalance received: %f", reply3.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } func testCallStatMetricsBefore(t *testing.T) { var metrics map[string]string expectedMetrics := map[string]string{ - utils.MetaTCC: utils.NOT_AVAILABLE, - utils.MetaTCD: utils.NOT_AVAILABLE, + utils.MetaTCC: utils.NotAvailable, + utils.MetaTCD: utils.NotAvailable, } if err := tutorialCallsRpc.Call(utils.StatSv1GetQueueStringMetrics, &utils.TenantID{Tenant: "cgrates.org", ID: "Stats2"}, &metrics); err != nil { @@ -492,8 +492,8 @@ func testCallAccount1001(t *testing.T) { attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001"} if err := tutorialCallsRpc.Call(utils.APIerSv2GetAccount, attrs, &reply); err != nil { t.Error(err.Error()) - } else if reply.BalanceMap[utils.MONETARY].GetTotalValue() == 10.0 { // Make sure we debitted - t.Errorf("Expected: 10, received: %+v", reply.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if reply.BalanceMap[utils.MetaMonetary].GetTotalValue() == 10.0 { // Make sure we debitted + t.Errorf("Expected: 10, received: %+v", reply.BalanceMap[utils.MetaMonetary].GetTotalValue()) } else if reply.Disabled == true { t.Error("Account disabled") } diff --git a/loaders/lib_test.go b/loaders/lib_test.go index 0cbb82d76..4a15612b6 100644 --- a/loaders/lib_test.go +++ b/loaders/lib_test.go @@ -108,17 +108,17 @@ func TestProcessContentCallsLoadCache(t *testing.T) { utils.MetaRateProfiles: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "Weight", Path: "Weight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, }, } @@ -206,17 +206,17 @@ func TestProcessContentCallsReloadCache(t *testing.T) { utils.MetaRateProfiles: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "Weight", Path: "Weight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, }, } @@ -304,12 +304,12 @@ func TestProcessContentCallsRemoveItems(t *testing.T) { utils.MetaAttributes: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -408,12 +408,12 @@ func TestProcessContentCallsClear(t *testing.T) { utils.MetaAttributes: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -519,12 +519,12 @@ func TestRemoveContentCallsReload(t *testing.T) { utils.MetaAttributes: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -625,12 +625,12 @@ func TestRemoveContentCallsLoad(t *testing.T) { utils.MetaAttributes: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -731,12 +731,12 @@ func TestRemoveContentCallsRemove(t *testing.T) { utils.MetaAttributes: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -848,12 +848,12 @@ func TestRemoveContentCallsClear(t *testing.T) { utils.MetaAttributes: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, diff --git a/loaders/libloader.go b/loaders/libloader.go index 72c389a7c..c6d95013c 100644 --- a/loaders/libloader.go +++ b/loaders/libloader.go @@ -70,7 +70,7 @@ func (ld LoaderData) UpdateFromCSV(fileName string, record []string, return err } switch cfgFld.Type { - case utils.META_COMPOSED: + case utils.MetaComposed: if _, has := ld[cfgFld.Path]; !has { ld[cfgFld.Path] = out } else if valOrig, canCast := ld[cfgFld.Path].(string); canCast { diff --git a/loaders/libloader_test.go b/loaders/libloader_test.go index cf685b09c..2a1da26f7 100644 --- a/loaders/libloader_test.go +++ b/loaders/libloader_test.go @@ -32,45 +32,45 @@ func TestDataUpdateFromCSVOneFile(t *testing.T) { attrSFlds := []*config.FCTemplate{ {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "Contexts", Path: "Contexts", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "FilterIDs", Path: "FilterIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "Path", Path: "Path", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "Initial", Path: "Initial", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "Substitute", Path: "Substitute", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "Append", Path: "Append", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, } @@ -217,7 +217,7 @@ func TestDataUpdateFromCSVMultiFiles(t *testing.T) { Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*file(File2.csv).1", utils.InfieldSep), Mandatory: true}, {Tag: "Contexts", @@ -226,15 +226,15 @@ func TestDataUpdateFromCSVMultiFiles(t *testing.T) { Value: config.NewRSRParsersMustCompile("*any", utils.InfieldSep)}, {Tag: "Path", Path: "Path", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*file(File1.csv).5", utils.InfieldSep)}, {Tag: "Initial", Path: "Initial", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*file(File1.csv).6", utils.InfieldSep)}, {Tag: "Substitute", Path: "Substitute", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*file(File1.csv).7", utils.InfieldSep)}, {Tag: "Append", Path: "Append", @@ -315,7 +315,7 @@ func TestUpdateFromCsvWithFiltersError(t *testing.T) { Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*file(File2.csv).1", utils.InfieldSep), Filters: []string{"*string:~*req.Account:10"}, Mandatory: true}, @@ -349,7 +349,7 @@ func TestUpdateFromCsvWithFiltersContinue(t *testing.T) { Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*file(File2.csv).1", utils.InfieldSep), Filters: []string{`*string:~*req.2:10`}, Mandatory: true}, diff --git a/loaders/loader_it_test.go b/loaders/loader_it_test.go index 3754a8a83..aef0e6cd1 100644 --- a/loaders/loader_it_test.go +++ b/loaders/loader_it_test.go @@ -384,7 +384,7 @@ func testLoaderCheckForCustomSep(t *testing.T) { { FilterIDs: []string{}, Path: "*req.Destination", - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("12018209998", utils.InfieldSep), }, }, @@ -449,12 +449,12 @@ cgrates.org,SET_ACTPROFILE_3 utils.MetaActionProfiles: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -575,12 +575,12 @@ cgrates.org,SET_ACTPROFILE_3 utils.MetaActionProfiles: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -755,7 +755,7 @@ cgrates.org,NewRes1 ldr := &Loader{ ldrID: "testProcessFile", dm: engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil), - fieldSep: utils.FIELDS_SEP, + fieldSep: utils.FieldsSep, tpInDir: flPath, tpOutDir: "/tmp", lockFilename: utils.ResourcesCsv, @@ -766,12 +766,12 @@ cgrates.org,NewRes1 utils.MetaResources: { {Tag: "Tenant", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -917,7 +917,7 @@ func testProcessFileRenameError(t *testing.T) { ldr := &Loader{ ldrID: "testProcessFileRenameError", dm: engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil), - fieldSep: utils.FIELDS_SEP, + fieldSep: utils.FieldsSep, tpInDir: flPath1, tpOutDir: "INEXISTING_FILE", lockFilename: utils.ResourcesCsv, @@ -928,12 +928,12 @@ func testProcessFileRenameError(t *testing.T) { utils.MetaResources: { {Tag: "Tenant", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, diff --git a/loaders/loader_test.go b/loaders/loader_test.go index a25a48680..d5b05dbff 100644 --- a/loaders/loader_test.go +++ b/loaders/loader_test.go @@ -45,49 +45,49 @@ func TestLoaderProcessContentSingleFile(t *testing.T) { utils.MetaAttributes: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "Contexts", Path: "Contexts", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "FilterIDs", Path: "FilterIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "AttributeFilterIDs", Path: "AttributeFilterIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "Path", Path: "Path", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "Type", Path: "Type", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "Value", Path: "Value", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "Blocker", Path: "Blocker", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep)}, }, } @@ -190,7 +190,7 @@ func TestLoaderProcessContentMultiFiles(t *testing.T) { Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*file(File2.csv).1", utils.InfieldSep), Mandatory: true}, {Tag: "Contexts", @@ -199,11 +199,11 @@ func TestLoaderProcessContentMultiFiles(t *testing.T) { Value: config.NewRSRParsersMustCompile("*any", utils.InfieldSep)}, {Tag: "Path", Path: "Path", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*file(File1.csv).6", utils.InfieldSep)}, {Tag: "Value", Path: "Value", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*file(File1.csv).7", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", @@ -264,49 +264,49 @@ func TestLoaderProcessResource(t *testing.T) { utils.MetaResources: { {Tag: "Tenant", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "FilterIDs", Path: "FilterIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "TTL", Path: "UsageTTL", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "Limit", Path: "Limit", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "AllocationMessage", Path: "AllocationMessage", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "Blocker", Path: "Blocker", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "Stored", Path: "Stored", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, {Tag: "Thresholds", Path: "Thresholds", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep)}, }, } @@ -382,29 +382,29 @@ func TestLoaderProcessFilters(t *testing.T) { utils.MetaFilters: { {Tag: "Tenant", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "Type", Path: "Type", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "Element", Path: "Element", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "Values", Path: "Values", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, }, } @@ -525,49 +525,49 @@ func TestLoaderProcessThresholds(t *testing.T) { utils.MetaThresholds: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "FilterIDs", Path: "FilterIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "MaxHits", Path: "MaxHits", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "MinHits", Path: "MinHits", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "MinSleep", Path: "MinSleep", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "Blocker", Path: "Blocker", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "ActionIDs", Path: "ActionIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, {Tag: "Async", Path: "Async", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep)}, }, } @@ -637,58 +637,58 @@ func TestLoaderProcessStats(t *testing.T) { utils.MetaStats: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "FilterIDs", Path: "FilterIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "QueueLength", Path: "QueueLength", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "TTL", Path: "TTL", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "MinItems", Path: "MinItems", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "MetricIDs", Path: "MetricIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "MetricFilterIDs", Path: "MetricFilterIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "Blocker", Path: "Blocker", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, {Tag: "Stored", Path: "Stored", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.11", utils.InfieldSep)}, {Tag: "ThresholdIDs", Path: "ThresholdIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.12", utils.InfieldSep)}, }, } @@ -773,11 +773,11 @@ func TestLoaderProcessStatsWrongMetrics(t *testing.T) { utils.MetaStats: { {Tag: "MetricIDs", Path: "MetricIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, {Tag: "Stored", Path: "Stored", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep)}, }, } @@ -834,73 +834,73 @@ func TestLoaderProcessRoutes(t *testing.T) { utils.MetaRoutes: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "FilterIDs", Path: "FilterIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "Sorting", Path: "Sorting", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "SortingParameters", Path: "SortingParameters", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "RouteID", Path: "RouteID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "RouteFilterIDs", Path: "RouteFilterIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "RouteAccountIDs", Path: "RouteAccountIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "RouteRatingPlanIDs", Path: "RouteRatingplanIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, {Tag: "RouteRateProfileIDs", Path: "RouteRateProfileIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep)}, {Tag: "RouteResourceIDs", Path: "RouteResourceIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.11", utils.InfieldSep)}, {Tag: "RouteStatIDs", Path: "RouteStatIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.12", utils.InfieldSep)}, {Tag: "RouteWeight", Path: "RouteWeight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.13", utils.InfieldSep)}, {Tag: "RouteBlocker", Path: "RouteBlocker", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.14", utils.InfieldSep)}, {Tag: "RouteParameters", Path: "RouteParameters", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.15", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.16", utils.InfieldSep)}, }, } @@ -965,8 +965,8 @@ func TestLoaderProcessRoutes(t *testing.T) { Weight: 20, } sort.Slice(eSp.Routes, func(i, j int) bool { - return strings.Compare(eSp.Routes[i].ID+strings.Join(eSp.Routes[i].FilterIDs, utils.CONCATENATED_KEY_SEP), - eSp.Routes[j].ID+strings.Join(eSp.Routes[j].FilterIDs, utils.CONCATENATED_KEY_SEP)) < 0 + return strings.Compare(eSp.Routes[i].ID+strings.Join(eSp.Routes[i].FilterIDs, utils.ConcatenatedKeySep), + eSp.Routes[j].ID+strings.Join(eSp.Routes[j].FilterIDs, utils.ConcatenatedKeySep)) < 0 }) aps, err := ldr.dm.GetRouteProfile("cgrates.org", "RoutePrf1", @@ -975,8 +975,8 @@ func TestLoaderProcessRoutes(t *testing.T) { t.Fatal(err) } sort.Slice(aps.Routes, func(i, j int) bool { - return strings.Compare(aps.Routes[i].ID+strings.Join(aps.Routes[i].FilterIDs, utils.CONCATENATED_KEY_SEP), - aps.Routes[j].ID+strings.Join(aps.Routes[j].FilterIDs, utils.CONCATENATED_KEY_SEP)) < 0 + return strings.Compare(aps.Routes[i].ID+strings.Join(aps.Routes[i].FilterIDs, utils.ConcatenatedKeySep), + aps.Routes[j].ID+strings.Join(aps.Routes[j].FilterIDs, utils.ConcatenatedKeySep)) < 0 }) if !reflect.DeepEqual(eSp, aps) { t.Errorf("expecting: %s, received: %s", @@ -1010,12 +1010,12 @@ func TestLoaderProcessAccountProfiles(t *testing.T) { utils.MetaAccountProfiles: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -1069,33 +1069,33 @@ func TestLoaderProcessChargers(t *testing.T) { utils.MetaChargers: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "FilterIDs", Path: "FilterIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "RunID", Path: "RunID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "AttributeIDs", Path: "AttributeIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, }, } @@ -1161,81 +1161,81 @@ func TestLoaderProcessDispatches(t *testing.T) { { Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, }, { Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, }, { Tag: "Subsystems", Path: "Subsystems", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), }, { Tag: "FilterIDs", Path: "FilterIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), }, { Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), }, { Tag: "Strategy", Path: "Strategy", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep), }, { Tag: "StrategyParameters", Path: "StrategyParameters", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep), }, { Tag: "ConnID", Path: "ConnID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep), }, { Tag: "ConnFilterIDs", Path: "ConnFilterIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep), }, { Tag: "ConnWeight", Path: "ConnWeight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep), }, { Tag: "ConnBlocker", Path: "ConnBlocker", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep), }, { Tag: "ConnParameters", Path: "ConnParameters", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.11", utils.InfieldSep), }, { Tag: "Weight", Path: "Weight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.12", utils.InfieldSep), }, }, @@ -1330,33 +1330,33 @@ func TestLoaderProcessDispatcheHosts(t *testing.T) { { Tag: "Tenant", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, }, { Tag: "ID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, }, { Tag: "Address", Path: "Address", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), }, { Tag: "Transport", Path: "Transport", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), }, { Tag: "TLS", Path: "TLS", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), }, }, @@ -1429,12 +1429,12 @@ func TestLoaderRemoveContentSingleFile(t *testing.T) { utils.MetaAttributes: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -1532,85 +1532,85 @@ func TestLoaderProcessRateProfile(t *testing.T) { utils.MetaRateProfiles: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "FilterIDs", Path: "FilterIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "RoundingMethod", Path: "RoundingMethod", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "RoundingDecimals", Path: "RoundingDecimals", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "MinCost", Path: "MinCost", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "MaxCost", Path: "MaxCost", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "MaxCostStrategy", Path: "MaxCostStrategy", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, {Tag: "RateID", Path: "RateID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep)}, {Tag: "RateFilterIDs", Path: "RateFilterIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.11", utils.InfieldSep)}, {Tag: "RateActivationTimes", Path: "RateActivationTimes", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.12", utils.InfieldSep)}, {Tag: "RateWeight", Path: "RateWeight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.13", utils.InfieldSep)}, {Tag: "RateBlocker", Path: "RateBlocker", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.14", utils.InfieldSep)}, {Tag: "RateIntervalStart", Path: "RateIntervalStart", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.15", utils.InfieldSep)}, {Tag: "RateFixedFee", Path: "RateFixedFee", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.16", utils.InfieldSep)}, {Tag: "RateRecurrentFee", Path: "RateRecurrentFee", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.17", utils.InfieldSep)}, {Tag: "RateUnit", Path: "RateUnit", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.18", utils.InfieldSep)}, {Tag: "RateIncrement", Path: "RateIncrement", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.19", utils.InfieldSep)}, }, } @@ -1730,85 +1730,85 @@ func TestLoaderProcessRateProfileRates(t *testing.T) { utils.MetaRateProfiles: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "FilterIDs", Path: "FilterIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep)}, {Tag: "RoundingMethod", Path: "RoundingMethod", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.5", utils.InfieldSep)}, {Tag: "RoundingDecimals", Path: "RoundingDecimals", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.6", utils.InfieldSep)}, {Tag: "MinCost", Path: "MinCost", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.7", utils.InfieldSep)}, {Tag: "MaxCost", Path: "MaxCost", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.8", utils.InfieldSep)}, {Tag: "MaxCostStrategy", Path: "MaxCostStrategy", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.9", utils.InfieldSep)}, {Tag: "RateID", Path: "RateID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.10", utils.InfieldSep)}, {Tag: "RateFilterIDs", Path: "RateFilterIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.11", utils.InfieldSep)}, {Tag: "RateActivationTimes", Path: "RateActivationTimes", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.12", utils.InfieldSep)}, {Tag: "RateWeight", Path: "RateWeight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.13", utils.InfieldSep)}, {Tag: "RateBlocker", Path: "RateBlocker", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.14", utils.InfieldSep)}, {Tag: "RateIntervalStart", Path: "RateIntervalStart", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.15", utils.InfieldSep)}, {Tag: "RateFixedFee", Path: "RateFixedFee", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.16", utils.InfieldSep)}, {Tag: "RateRecurrentFee", Path: "RateRecurrentFee", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.17", utils.InfieldSep)}, {Tag: "RateUnit", Path: "RateUnit", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.18", utils.InfieldSep)}, {Tag: "RateIncrement", Path: "RateIncrement", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.19", utils.InfieldSep)}, }, } @@ -1980,17 +1980,17 @@ func TestLoaderRemoveRateProfileRates(t *testing.T) { utils.MetaRateProfiles: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "RateIDs", Path: "RateIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, }, } @@ -2295,12 +2295,12 @@ func TestRemoveRateProfileFlagsError(t *testing.T) { utils.MetaRateProfiles: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -2344,7 +2344,7 @@ func TestNewLoaderWithMultiFiles(t *testing.T) { Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*file(File2.csv).1", utils.InfieldSep), Mandatory: true}, {Tag: "Contexts", @@ -2353,11 +2353,11 @@ func TestNewLoaderWithMultiFiles(t *testing.T) { Value: config.NewRSRParsersMustCompile("*any", utils.InfieldSep)}, {Tag: "Path", Path: "Path", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*file(File1.csv).6", utils.InfieldSep)}, {Tag: "Value", Path: "Value", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*file(File1.csv).7", utils.InfieldSep)}, {Tag: "Weight", Path: "Weight", @@ -2812,7 +2812,7 @@ func TestLoaderAttributesAsStructErrType(t *testing.T) { utils.MetaAttributes: { {Tag: "Weight", Path: "Weight", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -2846,7 +2846,7 @@ func TestLoaderAttributesAsStructErrConversion(t *testing.T) { utils.MetaAttributes: { {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -2880,7 +2880,7 @@ func TestLoadResourcesAsStructErrType(t *testing.T) { utils.MetaResources: { {Tag: "Blocker", Path: "Blocker", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -2914,7 +2914,7 @@ func TestLoadResourcesAsStructErrConversion(t *testing.T) { utils.MetaResources: { {Tag: "UsageTTL", Path: "UsageTTL", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -2948,7 +2948,7 @@ func TestLoadFiltersAsStructErrType(t *testing.T) { utils.MetaFilters: { {Tag: "PK", Path: "PK", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -2986,7 +2986,7 @@ func TestLoadFiltersAsStructErrConversion(t *testing.T) { utils.MetaFilters: { {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -3024,7 +3024,7 @@ func TestLoadStatsAsStructErrType(t *testing.T) { utils.MetaStats: { {Tag: "PK", Path: "PK", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -3062,7 +3062,7 @@ func TestLoadStatsAsStructErrConversion(t *testing.T) { utils.MetaStats: { {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -3100,7 +3100,7 @@ func TestLoadThresholdsAsStructErrType(t *testing.T) { utils.MetaThresholds: { {Tag: "PK", Path: "PK", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -3138,7 +3138,7 @@ func TestLoadThresholdsAsStructErrConversion(t *testing.T) { utils.MetaThresholds: { {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -3176,7 +3176,7 @@ func TestLoadRoutesAsStructErrType(t *testing.T) { utils.MetaRoutes: { {Tag: "PK", Path: "PK", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -3214,7 +3214,7 @@ func TestLoadRoutesAsStructErrConversion(t *testing.T) { utils.MetaRoutes: { {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -3252,7 +3252,7 @@ func TestLoadChargersAsStructErrType(t *testing.T) { utils.MetaChargers: { {Tag: "PK", Path: "PK", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -3290,7 +3290,7 @@ func TestLoadChargersAsStructErrConversion(t *testing.T) { utils.MetaChargers: { {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -3328,7 +3328,7 @@ func TestLoadDispatchersAsStructErrType(t *testing.T) { utils.MetaDispatchers: { {Tag: "PK", Path: "PK", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -3366,7 +3366,7 @@ func TestLoadDispatcherAsStructErrConversion(t *testing.T) { utils.MetaDispatchers: { {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -3404,7 +3404,7 @@ func TestLoadDispatcherHostsAsStructErrType(t *testing.T) { utils.MetaDispatcherHosts: { {Tag: "PK", Path: "PK", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -3442,7 +3442,7 @@ func TestLoadRateProfilesAsStructErrType(t *testing.T) { utils.MetaRateProfiles: { {Tag: "PK", Path: "PK", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -3480,7 +3480,7 @@ func TestLoadRateProfilesAsStructErrConversion(t *testing.T) { utils.MetaRateProfiles: { {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -3518,7 +3518,7 @@ func TestLoadAccountProfilesAsStructErrConversion(t *testing.T) { utils.MetaAccountProfiles: { {Tag: "ActivationInterval", Path: "ActivationInterval", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -3556,19 +3556,19 @@ func TestProcessContentAccountProfileAsTPError(t *testing.T) { utils.MetaAccountProfiles: { {Tag: "Tenant", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, {Tag: "ID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep)}, {Tag: "BalanceID", Path: "BalanceID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, {Tag: "BalanceUnitFactors", Path: "BalanceUnitFactors", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)}, }, } @@ -3607,7 +3607,7 @@ func TestLoadAccountProfilesAsStructErrType(t *testing.T) { utils.MetaAccountProfiles: { {Tag: "PK", Path: "PK", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep)}, }, } @@ -3646,12 +3646,12 @@ func TestLoadAndRemoveResources(t *testing.T) { utils.MetaResources: { {Tag: "Tenant", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -3779,12 +3779,12 @@ func TestRemoveFilterContent(t *testing.T) { utils.MetaFilters: { {Tag: "Tenant", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -3872,12 +3872,12 @@ func TestRemoveStatsContent(t *testing.T) { utils.MetaStats: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -3965,12 +3965,12 @@ func TestRemoveThresholdsContent(t *testing.T) { utils.MetaThresholds: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -4058,12 +4058,12 @@ func TestRemoveRoutesContent(t *testing.T) { utils.MetaRoutes: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -4151,12 +4151,12 @@ func TestRemoveChargersContent(t *testing.T) { utils.MetaChargers: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -4244,12 +4244,12 @@ func TestRemoveDispatchersContent(t *testing.T) { utils.MetaDispatchers: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -4336,12 +4336,12 @@ func TestRemoveDispatcherHostsContent(t *testing.T) { utils.MetaDispatcherHosts: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -4408,33 +4408,33 @@ func TestProcessContentEmptyDataBase(t *testing.T) { { Tag: "Tenant", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true, }, { Tag: "ID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true, }, { Tag: "Address", Path: "Address", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep), }, { Tag: "Transport", Path: "Transport", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep), }, { Tag: "TLS", Path: "TLS", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.4", utils.InfieldSep), }, }, @@ -4469,12 +4469,12 @@ func TestRemoveRateProfileContent(t *testing.T) { utils.MetaRateProfiles: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -4562,12 +4562,12 @@ func TestRemoveActionProfileContent(t *testing.T) { utils.MetaActionProfiles: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -4643,12 +4643,12 @@ func TestRemoveAccountProfileContent(t *testing.T) { utils.MetaAccountProfiles: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -4723,12 +4723,12 @@ func TestRemoveContentError1(t *testing.T) { utils.MetaActionProfiles: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -4775,12 +4775,12 @@ func TestRemoveContentError2(t *testing.T) { utils.MetaActionProfiles: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -4850,17 +4850,17 @@ func TestRemoveRateProfileRatesError(t *testing.T) { utils.MetaRateProfiles: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, {Tag: "RateIDs", Path: "RateIDs", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)}, }, } @@ -4934,12 +4934,12 @@ func TestRemoveThresholdsMockError(t *testing.T) { utils.MetaThresholds: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -4993,12 +4993,12 @@ func TestRemoveStatQueueMockError(t *testing.T) { utils.MetaStats: { {Tag: "TenantID", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ProfileID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -5051,12 +5051,12 @@ func TestRemoveResourcesMockError(t *testing.T) { utils.MetaResources: { {Tag: "Tenant", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, diff --git a/loaders/loaders_it_test.go b/loaders/loaders_it_test.go index 277d2e6c5..c3efa4086 100644 --- a/loaders/loaders_it_test.go +++ b/loaders/loaders_it_test.go @@ -78,7 +78,7 @@ cgrates.org,NewRes1 cfgLdr[0] = &config.LoaderSCfg{ ID: "testV1LoadResource", Enabled: true, - FieldSeparator: utils.FIELDS_SEP, + FieldSeparator: utils.FieldsSep, TpInDir: flPath, TpOutDir: "/tmp", LockFileName: utils.ResourcesCsv, @@ -89,12 +89,12 @@ cgrates.org,NewRes1 utils.MetaResources: { {Tag: "Tenant", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.0", utils.InfieldSep), Mandatory: true}, {Tag: "ID", Path: "ID", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, @@ -170,7 +170,7 @@ cgrates.org,NewRes1 cfgLdr[0] = &config.LoaderSCfg{ ID: "testV1LoadDefaultIDError", Enabled: true, - FieldSeparator: utils.FIELDS_SEP, + FieldSeparator: utils.FieldsSep, TpInDir: flPath, TpOutDir: "/tmp", LockFileName: utils.ResourcesCsv, @@ -207,7 +207,7 @@ func testV1LoadUnableToDeleteFile(t *testing.T) { cfgLdr[0] = &config.LoaderSCfg{ ID: "testV1LoadUnableToDeleteFile", Enabled: true, - FieldSeparator: utils.FIELDS_SEP, + FieldSeparator: utils.FieldsSep, TpInDir: "/\x00", TpOutDir: "/tmp", LockFileName: utils.ResourcesCsv, @@ -250,7 +250,7 @@ NOT_UINT cfgLdr[0] = &config.LoaderSCfg{ ID: "testV1LoadResource", Enabled: true, - FieldSeparator: utils.FIELDS_SEP, + FieldSeparator: utils.FieldsSep, TpInDir: flPath, TpOutDir: "/tmp", LockFileName: utils.ResourcesCsv, @@ -261,8 +261,8 @@ NOT_UINT utils.MetaFilters: { {Tag: "PK", Path: "PK", - Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~*req.0", utils.INFIELD_SEP)}, + Type: utils.utils.MetaComposed, + Value: config.NewRSRParsersMustCompile("~*req.0", utils.FieldsSep)}, }, } resCsv := ` @@ -319,7 +319,7 @@ cgrates.org,NewRes1 cfgLdr[0] = &config.LoaderSCfg{ ID: "testV1RemoveResource", Enabled: true, - FieldSeparator: utils.FIELDS_SEP, + FieldSeparator: utils.FieldsSep, TpInDir: flPath, TpOutDir: "/tmp", LockFileName: utils.ResourcesCsv, @@ -330,13 +330,13 @@ cgrates.org,NewRes1 utils.MetaResources: { {Tag: "Tenant", Path: "Tenant", - Type: utils.META_COMPOSED, + Type: utils.MetaComposed, 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), + Type: utils.MetaComposed, + Value: config.NewRSRParsersMustCompile("~*req.1", utils.InfieldSep), Mandatory: true}, }, } @@ -415,7 +415,7 @@ cgrates.org,NewRes1 cfgLdr[0] = &config.LoaderSCfg{ ID: "testV1RemoveDefaultIDError", Enabled: true, - FieldSeparator: utils.FIELDS_SEP, + FieldSeparator: utils.FieldsSep, TpInDir: flPath, TpOutDir: "/tmp", LockFileName: utils.ResourcesCsv, @@ -453,7 +453,7 @@ func testV1RemoveUnableToDeleteFile(t *testing.T) { cfgLdr[0] = &config.LoaderSCfg{ ID: "testV1RemoveUnableToDeleteFile", Enabled: true, - FieldSeparator: utils.FIELDS_SEP, + FieldSeparator: utils.FieldsSep, TpInDir: "/\x00", TpOutDir: "/tmp", LockFileName: utils.ResourcesCsv, @@ -491,7 +491,7 @@ func testV1LoadAndRemoveProcessRemoveFolderError(t *testing.T) { cfgLdr[0] = &config.LoaderSCfg{ ID: "testV1RemoveProcessFolderError", Enabled: true, - FieldSeparator: utils.FIELDS_SEP, + FieldSeparator: utils.FieldsSep, TpInDir: flPath, TpOutDir: "/tmp", Data: nil, @@ -549,7 +549,7 @@ func testV1RemoveProcessFolderError(t *testing.T) { cfgLdr[0] = &config.LoaderSCfg{ ID: "testV1RemoveProcessFolderError", Enabled: true, - FieldSeparator: utils.FIELDS_SEP, + FieldSeparator: utils.FieldsSep, TpInDir: flPath, TpOutDir: "/tmp", LockFileName: "notResource.csv", @@ -613,7 +613,7 @@ func testLoaderServiceReload(t *testing.T) { cfgLdr[0] = &config.LoaderSCfg{ ID: "testV1LoadResource", Enabled: true, - FieldSeparator: utils.FIELDS_SEP, + FieldSeparator: utils.FieldsSep, TpInDir: flPath, TpOutDir: "/tmp", LockFileName: utils.ResourcesCsv, diff --git a/migrator/accounts.go b/migrator/accounts.go index af5499704..b596f6fb1 100755 --- a/migrator/accounts.go +++ b/migrator/accounts.go @@ -37,12 +37,12 @@ const ( func (m *Migrator) migrateCurrentAccounts() (err error) { var ids []string - ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.ACCOUNT_PREFIX) + ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.AccountPrefix) if err != nil { return err } for _, id := range ids { - idg := strings.TrimPrefix(id, utils.ACCOUNT_PREFIX) + idg := strings.TrimPrefix(id, utils.AccountPrefix) acc, err := m.dmIN.DataManager().GetAccount(idg) if err != nil { return err @@ -261,7 +261,7 @@ func (v1Acc v1Account) V1toV3Account() (ac *engine.Account) { AllowNegative: v1Acc.AllowNegative, Disabled: v1Acc.Disabled, } - idElements := strings.Split(ac.ID, utils.CONCATENATED_KEY_SEP) + idElements := strings.Split(ac.ID, utils.ConcatenatedKeySep) if len(idElements) != 3 { log.Printf("Malformed account ID %s", v1Acc.Id) } @@ -273,7 +273,7 @@ func (v1Acc v1Account) V1toV3Account() (ac *engine.Account) { ac.BalanceMap[newBalKey] = make(engine.Balances, len(oldBalChain)) for index, oldBal := range oldBalChain { balVal := oldBal.Value - if newBalKey == utils.VOICE { + if newBalKey == utils.MetaVoice { balVal = utils.Round(balVal/float64(time.Second), config.CgrConfig().GeneralCfg().RoundingDecimals, utils.MetaRoundingMiddle) @@ -408,7 +408,7 @@ func (v2Acc v2Account) V2toV3Account() (ac *engine.Account) { ac.BalanceMap[balType] = make(engine.Balances, len(oldBalChain)) for index, oldBal := range oldBalChain { balVal := oldBal.Value - if balType == utils.VOICE { + if balType == utils.MetaVoice { balVal = utils.Round(balVal*float64(time.Second), config.CgrConfig().GeneralCfg().RoundingDecimals, utils.MetaRoundingMiddle) diff --git a/migrator/accounts2_it_test.go b/migrator/accounts2_it_test.go index 00628fec8..4ea61e91b 100755 --- a/migrator/accounts2_it_test.go +++ b/migrator/accounts2_it_test.go @@ -153,9 +153,9 @@ func testAcc2ITMigrate(t *testing.T) { v1Acc := &v1Account{ Id: "*OUT:CUSTOMER_1:rif", BalanceMap: map[string]v1BalanceChain{ - utils.DATA: {v1b}, - utils.VOICE: {v1b}, - utils.MONETARY: { + utils.MetaData: {v1b}, + utils.MetaVoice: {v1b}, + utils.MetaMonetary: { &v1Balance{Value: 21, ExpirationDate: time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Timings: timingSlice}}}} @@ -199,9 +199,9 @@ func testAcc2ITMigrate(t *testing.T) { testAccount := &engine.Account{ ID: "CUSTOMER_1:rif", BalanceMap: map[string]engine.Balances{ - utils.DATA: {v2d}, - utils.VOICE: {v2b}, - utils.MONETARY: {m2}}, + utils.MetaData: {v2d}, + utils.MetaVoice: {v2b}, + utils.MetaMonetary: {m2}}, UnitCounters: engine.UnitCounters{}, ActionTriggers: engine.ActionTriggers{}, } diff --git a/migrator/accounts_it_test.go b/migrator/accounts_it_test.go index 6a8fff897..6dafc31c5 100755 --- a/migrator/accounts_it_test.go +++ b/migrator/accounts_it_test.go @@ -221,9 +221,9 @@ func testAccITMigrateAndMove(t *testing.T) { v1Acc := &v1Account{ Id: "*OUT:CUSTOMER_1:rif", BalanceMap: map[string]v1BalanceChain{ - utils.DATA: {v1b}, - utils.VOICE: {v1b}, - utils.MONETARY: { + utils.MetaData: {v1b}, + utils.MetaVoice: {v1b}, + utils.MetaMonetary: { &v1Balance{Value: 21, ExpirationDate: time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Timings: timingSlice}}}} @@ -267,9 +267,9 @@ func testAccITMigrateAndMove(t *testing.T) { testAccount := &engine.Account{ ID: "CUSTOMER_1:rif", BalanceMap: map[string]engine.Balances{ - utils.DATA: {v2d}, - utils.VOICE: {v2b}, - utils.MONETARY: {m2}}, + utils.MetaData: {v2d}, + utils.MetaVoice: {v2b}, + utils.MetaMonetary: {m2}}, UnitCounters: engine.UnitCounters{}, ActionTriggers: engine.ActionTriggers{}, } diff --git a/migrator/accounts_test.go b/migrator/accounts_test.go index b6a43c6de..cebcd69e8 100755 --- a/migrator/accounts_test.go +++ b/migrator/accounts_test.go @@ -49,9 +49,9 @@ func TestV1AccountAsAccount(t *testing.T) { v1Acc := &v1Account{ Id: "*OUT:CUSTOMER_1:rif", BalanceMap: map[string]v1BalanceChain{ - utils.DATA: v1BalanceChain{d1b}, - utils.VOICE: v1BalanceChain{v1b}, - utils.MONETARY: v1BalanceChain{&v1Balance{ + utils.MetaData: v1BalanceChain{d1b}, + utils.MetaVoice: v1BalanceChain{v1b}, + utils.MetaMonetary: v1BalanceChain{&v1Balance{ Value: 21, Timings: []*engine.RITiming{ &engine.RITiming{ @@ -102,9 +102,9 @@ func TestV1AccountAsAccount(t *testing.T) { testAccount := &engine.Account{ ID: "CUSTOMER_1:rif", BalanceMap: map[string]engine.Balances{ - utils.DATA: engine.Balances{d2}, - utils.VOICE: engine.Balances{v2}, - utils.MONETARY: engine.Balances{m2}, + utils.MetaData: engine.Balances{d2}, + utils.MetaVoice: engine.Balances{v2}, + utils.MetaMonetary: engine.Balances{m2}, }, UnitCounters: engine.UnitCounters{}, ActionTriggers: engine.ActionTriggers{}, diff --git a/migrator/action.go b/migrator/action.go index 5bd4d9ddc..e9827c953 100644 --- a/migrator/action.go +++ b/migrator/action.go @@ -41,12 +41,12 @@ type v1Actions []*v1Action func (m *Migrator) migrateCurrentActions() (err error) { var ids []string - ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.ACTION_PREFIX) + ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.ActionPrefix) if err != nil { return err } for _, id := range ids { - idg := strings.TrimPrefix(id, utils.ACTION_PREFIX) + idg := strings.TrimPrefix(id, utils.ActionPrefix) acts, err := m.dmIN.DataManager().GetActions(idg, true, utils.NonTransactional) if err != nil { return err diff --git a/migrator/action_plan.go b/migrator/action_plan.go index 6df1ac763..3e4b22bf2 100644 --- a/migrator/action_plan.go +++ b/migrator/action_plan.go @@ -49,12 +49,12 @@ func (at *v1ActionPlan) IsASAP() bool { func (m *Migrator) migrateCurrentActionPlans() (err error) { var ids []string - ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.ACTION_PLAN_PREFIX) + ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.ActionPlanPrefix) if err != nil { return } for _, id := range ids { - idg := strings.TrimPrefix(id, utils.ACTION_PLAN_PREFIX) + idg := strings.TrimPrefix(id, utils.ActionPlanPrefix) var acts *engine.ActionPlan if acts, err = m.dmIN.DataManager().GetActionPlan(idg, true, utils.NonTransactional); err != nil { return diff --git a/migrator/action_test.go b/migrator/action_test.go index 4cbd3f791..e80b26d24 100644 --- a/migrator/action_test.go +++ b/migrator/action_test.go @@ -54,7 +54,7 @@ func TestV1ActionsAsActions2(t *testing.T) { v1act := &v1Action{ Id: "ID", ActionType: "*log", - BalanceType: utils.MONETARY, + BalanceType: utils.MetaMonetary, ExtraParameters: "", ExpirationString: "", Balance: &v1Balance{ @@ -62,7 +62,7 @@ func TestV1ActionsAsActions2(t *testing.T) { Id: utils.MetaDefault, Value: 10, Weight: 30, - Category: utils.CALL, + Category: utils.Call, }, } @@ -75,10 +75,10 @@ func TestV1ActionsAsActions2(t *testing.T) { Balance: &engine.BalanceFilter{ Uuid: utils.StringPointer("UUID1"), ID: utils.StringPointer(utils.MetaDefault), - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), Value: &utils.ValueFormula{Static: 10}, Weight: utils.Float64Pointer(30), - Categories: utils.StringMapPointer(utils.ParseStringMap(utils.CALL)), + Categories: utils.StringMapPointer(utils.ParseStringMap(utils.Call)), }, } newact := v1act.AsAction() diff --git a/migrator/action_trigger.go b/migrator/action_trigger.go index 7287e8a1e..cad32ebea 100644 --- a/migrator/action_trigger.go +++ b/migrator/action_trigger.go @@ -54,12 +54,12 @@ type v1ActionTriggers []*v1ActionTrigger func (m *Migrator) migrateCurrentActionTrigger() (err error) { var ids []string - ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.ACTION_TRIGGER_PREFIX) + ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.ActionTriggerPrefix) if err != nil { return err } for _, id := range ids { - idg := strings.TrimPrefix(id, utils.ACTION_TRIGGER_PREFIX) + idg := strings.TrimPrefix(id, utils.ActionTriggerPrefix) acts, err := m.dmIN.DataManager().GetActionTriggers(idg, true, utils.NonTransactional) if err != nil { return err diff --git a/migrator/action_trigger_it_test.go b/migrator/action_trigger_it_test.go index 343f3318f..99d3c640e 100644 --- a/migrator/action_trigger_it_test.go +++ b/migrator/action_trigger_it_test.go @@ -198,12 +198,12 @@ func testActTrgITMigrateAndMove(t *testing.T) { ID: "Test", Balance: &engine.BalanceFilter{ ExpirationDate: utils.TimePointer(tim), - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, ExpirationDate: tim, LastExecutionTime: tim, ActivationDate: tim, - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true, diff --git a/migrator/action_trigger_test.go b/migrator/action_trigger_test.go index 7bee7918a..b34c35507 100644 --- a/migrator/action_trigger_test.go +++ b/migrator/action_trigger_test.go @@ -42,12 +42,12 @@ func TestV1ActionTriggersAsActionTriggers(t *testing.T) { ID: "Test", Balance: &engine.BalanceFilter{ ExpirationDate: utils.TimePointer(tim), - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, ExpirationDate: tim, LastExecutionTime: tim, ActivationDate: tim, - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true, diff --git a/migrator/alias.go b/migrator/alias.go index c3cf3678b..9d467a9bf 100644 --- a/migrator/alias.go +++ b/migrator/alias.go @@ -55,7 +55,7 @@ type v1AliasValue struct { type v1AliasPairs map[string]map[string]string func (al *v1Alias) SetId(id string) error { - vals := strings.Split(id, utils.CONCATENATED_KEY_SEP) + vals := strings.Split(id, utils.ConcatenatedKeySep) if len(vals) != 6 { return utils.ErrInvalidKey } diff --git a/migrator/alias_test.go b/migrator/alias_test.go index 0f68bc406..98f685f71 100644 --- a/migrator/alias_test.go +++ b/migrator/alias_test.go @@ -34,7 +34,7 @@ func TestAlias2AtttributeProfile(t *testing.T) { aliases := map[int]*v1Alias{ 0: { Tenant: utils.MetaAny, - Direction: utils.META_OUT, + Direction: utils.MetaOut, Category: utils.MetaAny, Account: utils.MetaAny, Subject: utils.MetaAny, @@ -43,7 +43,7 @@ func TestAlias2AtttributeProfile(t *testing.T) { }, 1: { Tenant: utils.MetaAny, - Direction: utils.META_OUT, + Direction: utils.MetaOut, Category: utils.MetaAny, Account: utils.MetaAny, Subject: utils.MetaAny, @@ -62,7 +62,7 @@ func TestAlias2AtttributeProfile(t *testing.T) { }, 2: { Tenant: utils.MetaAny, - Direction: utils.META_OUT, + Direction: utils.MetaOut, Category: utils.MetaAny, Account: utils.MetaAny, Subject: utils.MetaAny, diff --git a/migrator/attributes.go b/migrator/attributes.go index 81d72d10b..3bc633c48 100644 --- a/migrator/attributes.go +++ b/migrator/attributes.go @@ -340,11 +340,11 @@ func (v1AttrPrf v1AttributeProfile) AsAttributeProfileV1To4() (attrPrf *v4Attrib filterIDs := make([]string, 0) //append false translate to if FieldName exist do stuff if attr.Append == false { - filterIDs = append(filterIDs, utils.MetaExists+utils.CONCATENATED_KEY_SEP+attr.FieldName+utils.CONCATENATED_KEY_SEP) + filterIDs = append(filterIDs, utils.MetaExists+utils.ConcatenatedKeySep+attr.FieldName+utils.ConcatenatedKeySep) } //Initial not *any translate to if value of fieldName = initial do stuff if attr.Initial != utils.MetaAny { - filterIDs = append(filterIDs, utils.MetaString+utils.CONCATENATED_KEY_SEP+attr.FieldName+utils.CONCATENATED_KEY_SEP+attr.Initial) + filterIDs = append(filterIDs, utils.MetaString+utils.ConcatenatedKeySep+attr.FieldName+utils.ConcatenatedKeySep+attr.Initial) } // create RSRParser sbstPrsr, err := config.NewRSRParsers(attr.Substitute, config.CgrConfig().GeneralCfg().RSRSep) diff --git a/migrator/cdrs_it_test.go b/migrator/cdrs_it_test.go index f0e6ad968..838cb69f5 100755 --- a/migrator/cdrs_it_test.go +++ b/migrator/cdrs_it_test.go @@ -128,15 +128,15 @@ func testCdrITMigrateAndMove(t *testing.T) { }, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, } v1Cdr := &v1Cdrs{ CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), OrderID: 123, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, + Source: utils.UnitTest, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", diff --git a/migrator/derived_chargers.go b/migrator/derived_chargers.go index 9dd51388d..441f6275d 100644 --- a/migrator/derived_chargers.go +++ b/migrator/derived_chargers.go @@ -117,7 +117,7 @@ func derivedChargers2AttributeProfile(dc *v1DerivedCharger, tenant, key string, attr.Attributes = fieldinfo2Attribute(attr.Attributes, utils.AnswerTime, dc.AnswerTimeField) attr.Attributes = fieldinfo2Attribute(attr.Attributes, utils.Usage, dc.UsageField) attr.Attributes = fieldinfo2Attribute(attr.Attributes, SUPPLIER, dc.SupplierField) - attr.Attributes = fieldinfo2Attribute(attr.Attributes, utils.DISCONNECT_CAUSE, dc.DisconnectCauseField) + attr.Attributes = fieldinfo2Attribute(attr.Attributes, utils.DisconnectCause, dc.DisconnectCauseField) attr.Attributes = fieldinfo2Attribute(attr.Attributes, utils.Cost, dc.CostField) attr.Attributes = fieldinfo2Attribute(attr.Attributes, utils.PreRated, dc.PreRatedField) return diff --git a/migrator/destinations.go b/migrator/destinations.go index 27cb29250..13529f560 100644 --- a/migrator/destinations.go +++ b/migrator/destinations.go @@ -95,12 +95,12 @@ func (m *Migrator) migrateDestinations() (err error) { func (m *Migrator) migrateCurrentReverseDestinations() (err error) { var ids []string - ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.REVERSE_DESTINATION_PREFIX) + ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.ReverseDestinationPrefix) if err != nil { return err } for _, id := range ids { - id := strings.TrimPrefix(id, utils.REVERSE_DESTINATION_PREFIX) + id := strings.TrimPrefix(id, utils.ReverseDestinationPrefix) rdst, err := m.dmIN.DataManager().GetReverseDestination(id, false, true, utils.NonTransactional) if err != nil { return err diff --git a/migrator/rating_plan.go b/migrator/rating_plan.go index 0575c9574..812ffb53d 100644 --- a/migrator/rating_plan.go +++ b/migrator/rating_plan.go @@ -28,12 +28,12 @@ import ( func (m *Migrator) migrateCurrentRatingPlans() (err error) { var ids []string - ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.RATING_PLAN_PREFIX) + ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.RatingPlanPrefix) if err != nil { return err } for _, id := range ids { - idg := strings.TrimPrefix(id, utils.RATING_PLAN_PREFIX) + idg := strings.TrimPrefix(id, utils.RatingPlanPrefix) rp, err := m.dmIN.DataManager().GetRatingPlan(idg, true, utils.NonTransactional) if err != nil { return err diff --git a/migrator/rating_profile.go b/migrator/rating_profile.go index 48a9d877f..961e60d39 100644 --- a/migrator/rating_profile.go +++ b/migrator/rating_profile.go @@ -28,12 +28,12 @@ import ( func (m *Migrator) migrateCurrentRatingProfiles() (err error) { var ids []string - ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.RATING_PROFILE_PREFIX) + ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.RatingProfilePrefix) if err != nil { return err } for _, id := range ids { - idg := strings.TrimPrefix(id, utils.RATING_PROFILE_PREFIX) + idg := strings.TrimPrefix(id, utils.RatingProfilePrefix) rp, err := m.dmIN.DataManager().GetRatingProfile(idg, true, utils.NonTransactional) if err != nil { return err diff --git a/migrator/session_costs_it_test.go b/migrator/session_costs_it_test.go index b003aefe7..5541f6db7 100755 --- a/migrator/session_costs_it_test.go +++ b/migrator/session_costs_it_test.go @@ -174,7 +174,7 @@ func testSessionCostITMigrate(t *testing.T) { }, }, }, - ToR: utils.VOICE, + ToR: utils.MetaVoice, } v2Cost := &v2SessionsCost{ CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), diff --git a/migrator/session_costs_test.go b/migrator/session_costs_test.go index db87c4727..3be06bf44 100644 --- a/migrator/session_costs_test.go +++ b/migrator/session_costs_test.go @@ -29,7 +29,7 @@ import ( func TestV2toV3Cost(t *testing.T) { cc := &engine.CallCost{ - Category: utils.CALL, + Category: utils.Call, Tenant: "cgrates.org", Subject: "1001", Account: "1001", @@ -63,7 +63,7 @@ func TestV2toV3Cost(t *testing.T) { &engine.BalanceSummary{ UUID: "UUID", ID: "First", - Type: utils.MONETARY, + Type: utils.MetaMonetary, Value: 10, }, }, diff --git a/migrator/sharedgroup.go b/migrator/sharedgroup.go index bcb1b1a93..5a106237e 100644 --- a/migrator/sharedgroup.go +++ b/migrator/sharedgroup.go @@ -34,12 +34,12 @@ type v1SharedGroup struct { func (m *Migrator) migrateCurrentSharedGroups() (err error) { var ids []string - ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.SHARED_GROUP_PREFIX) + ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.SharedGroupPrefix) if err != nil { return err } for _, id := range ids { - idg := strings.TrimPrefix(id, utils.SHARED_GROUP_PREFIX) + idg := strings.TrimPrefix(id, utils.SharedGroupPrefix) sgs, err := m.dmIN.DataManager().GetSharedGroup(idg, true, utils.NonTransactional) if err != nil { return err diff --git a/migrator/stats_it_test.go b/migrator/stats_it_test.go index 29d508955..7aee4550a 100755 --- a/migrator/stats_it_test.go +++ b/migrator/stats_it_test.go @@ -176,12 +176,12 @@ func testStsITMigrateAndMove(t *testing.T) { ID: utils.StringPointer("TESTB"), Timings: []*engine.RITiming{}, ExpirationDate: utils.TimePointer(tim), - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, ExpirationDate: tim, LastExecutionTime: tim, ActivationDate: tim, - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true, @@ -361,12 +361,12 @@ func testStsITMigrateFromv1(t *testing.T) { ID: utils.StringPointer("TESTB"), Timings: []*engine.RITiming{}, ExpirationDate: utils.TimePointer(tim), - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, ExpirationDate: tim, LastExecutionTime: tim, ActivationDate: tim, - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true, diff --git a/migrator/stats_test.go b/migrator/stats_test.go index dfacd8bd9..aa8e6a013 100644 --- a/migrator/stats_test.go +++ b/migrator/stats_test.go @@ -61,12 +61,12 @@ func TestV1StatsAsStats(t *testing.T) { ID: utils.StringPointer("TESTB"), Timings: []*engine.RITiming{}, ExpirationDate: utils.TimePointer(tim), - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, ExpirationDate: tim, LastExecutionTime: tim, ActivationDate: tim, - ThresholdType: utils.TRIGGER_MAX_BALANCE, + ThresholdType: utils.TriggerMaxBalance, ThresholdValue: 2, ActionsID: "TEST_ACTIONS", Executed: true, diff --git a/migrator/storage_mongo_datadb.go b/migrator/storage_mongo_datadb.go index e629a5cb1..1f898cd52 100644 --- a/migrator/storage_mongo_datadb.go +++ b/migrator/storage_mongo_datadb.go @@ -162,7 +162,7 @@ func (v1ms *mongoMigrator) getV1ActionPlans() (v1aps *v1ActionPlans, err error) //set func (v1ms *mongoMigrator) setV1ActionPlans(x *v1ActionPlans) (err error) { - key := utils.ACTION_PLAN_PREFIX + (*x)[0].Id + key := utils.ActionPlanPrefix + (*x)[0].Id _, err = v1ms.mgoDB.DB().Collection("actiontimings").InsertOne(v1ms.mgoDB.GetContext(), &AtKeyValue{key, *x}) return } @@ -199,7 +199,7 @@ func (v1ms *mongoMigrator) getV1Actions() (v1acs *v1Actions, err error) { //set func (v1ms *mongoMigrator) setV1Actions(x *v1Actions) (err error) { - key := utils.ACTION_PREFIX + (*x)[0].Id + key := utils.ActionPrefix + (*x)[0].Id _, err = v1ms.mgoDB.DB().Collection("actions").InsertOne(v1ms.mgoDB.GetContext(), &AcKeyValue{key, *x}) return } @@ -255,7 +255,7 @@ func (v1ms *mongoMigrator) remV1ActionTriggers(x *v1ActionTriggers) (err error) //get func (v1ms *mongoMigrator) getV1SharedGroup() (v1sg *v1SharedGroup, err error) { if v1ms.cursor == nil { - v1ms.cursor, err = v1ms.mgoDB.DB().Collection(utils.SHARED_GROUP_PREFIX).Find(v1ms.mgoDB.GetContext(), bson.D{}) + v1ms.cursor, err = v1ms.mgoDB.DB().Collection(utils.SharedGroupPrefix).Find(v1ms.mgoDB.GetContext(), bson.D{}) if err != nil { return nil, err } @@ -274,7 +274,7 @@ func (v1ms *mongoMigrator) getV1SharedGroup() (v1sg *v1SharedGroup, err error) { //set func (v1ms *mongoMigrator) setV1SharedGroup(x *v1SharedGroup) (err error) { - _, err = v1ms.mgoDB.DB().Collection(utils.SHARED_GROUP_PREFIX).InsertOne(v1ms.mgoDB.GetContext(), x) + _, err = v1ms.mgoDB.DB().Collection(utils.SharedGroupPrefix).InsertOne(v1ms.mgoDB.GetContext(), x) return } @@ -282,7 +282,7 @@ func (v1ms *mongoMigrator) setV1SharedGroup(x *v1SharedGroup) (err error) { //get func (v1ms *mongoMigrator) getV1Stats() (v1st *v1Stat, err error) { if v1ms.cursor == nil { - v1ms.cursor, err = v1ms.mgoDB.DB().Collection(utils.CDR_STATS_PREFIX).Find(v1ms.mgoDB.GetContext(), bson.D{}) + v1ms.cursor, err = v1ms.mgoDB.DB().Collection(utils.CDRsStatsPrefix).Find(v1ms.mgoDB.GetContext(), bson.D{}) if err != nil { return nil, err } @@ -320,7 +320,7 @@ func (v1ms *mongoMigrator) getV3Stats() (v1st *engine.StatQueueProfile, err erro //set func (v1ms *mongoMigrator) setV1Stats(x *v1Stat) (err error) { - _, err = v1ms.mgoDB.DB().Collection(utils.CDR_STATS_PREFIX).InsertOne(v1ms.mgoDB.GetContext(), x) + _, err = v1ms.mgoDB.DB().Collection(utils.CDRsStatsPrefix).InsertOne(v1ms.mgoDB.GetContext(), x) return } diff --git a/migrator/storage_redis.go b/migrator/storage_redis.go index f172637fa..162044c14 100644 --- a/migrator/storage_redis.go +++ b/migrator/storage_redis.go @@ -104,7 +104,7 @@ func (v1rs *redisMigrator) remV1Account(id string) (err error) { //get func (v1rs *redisMigrator) getv2Account() (v2Acnt *v2Account, err error) { if v1rs.qryIdx == nil { - v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.ACCOUNT_PREFIX) + v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.AccountPrefix) if err != nil { return } else if len(v1rs.dataKeys) == 0 { @@ -131,7 +131,7 @@ func (v1rs *redisMigrator) getv2Account() (v2Acnt *v2Account, err error) { //set func (v1rs *redisMigrator) setV2Account(x *v2Account) (err error) { - key := utils.ACCOUNT_PREFIX + x.ID + key := utils.AccountPrefix + x.ID bit, err := v1rs.rds.Marshaler().Marshal(x) if err != nil { return err @@ -144,7 +144,7 @@ func (v1rs *redisMigrator) setV2Account(x *v2Account) (err error) { //rem func (v1rs *redisMigrator) remV2Account(id string) (err error) { - key := utils.ACCOUNT_PREFIX + id + key := utils.AccountPrefix + id return v1rs.rds.Cmd(nil, "DEL", key) } @@ -152,7 +152,7 @@ func (v1rs *redisMigrator) remV2Account(id string) (err error) { //get func (v1rs *redisMigrator) getV1ActionPlans() (v1aps *v1ActionPlans, err error) { if v1rs.qryIdx == nil { - v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.ACTION_PLAN_PREFIX) + v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.ActionPlanPrefix) if err != nil { return } else if len(v1rs.dataKeys) == 0 { @@ -178,7 +178,7 @@ func (v1rs *redisMigrator) getV1ActionPlans() (v1aps *v1ActionPlans, err error) //set func (v1rs *redisMigrator) setV1ActionPlans(x *v1ActionPlans) (err error) { - key := utils.ACTION_PLAN_PREFIX + (*x)[0].Id + key := utils.ActionPlanPrefix + (*x)[0].Id bit, err := v1rs.rds.Marshaler().Marshal(x) if err != nil { return err @@ -191,7 +191,7 @@ func (v1rs *redisMigrator) setV1ActionPlans(x *v1ActionPlans) (err error) { //rem func (v1rs *redisMigrator) remV1ActionPlans(x *v1ActionPlans) (err error) { - key := utils.ACTION_PLAN_PREFIX + (*x)[0].Id + key := utils.ActionPlanPrefix + (*x)[0].Id return v1rs.rds.Cmd(nil, "DEL", key) } @@ -199,7 +199,7 @@ func (v1rs *redisMigrator) remV1ActionPlans(x *v1ActionPlans) (err error) { //get func (v1rs *redisMigrator) getV1Actions() (v1acs *v1Actions, err error) { if v1rs.qryIdx == nil { - v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.ACTION_PREFIX) + v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.ActionPrefix) if err != nil { return } else if len(v1rs.dataKeys) == 0 { @@ -225,7 +225,7 @@ func (v1rs *redisMigrator) getV1Actions() (v1acs *v1Actions, err error) { //set func (v1rs *redisMigrator) setV1Actions(x *v1Actions) (err error) { - key := utils.ACTION_PREFIX + (*x)[0].Id + key := utils.ActionPrefix + (*x)[0].Id bit, err := v1rs.rds.Marshaler().Marshal(x) if err != nil { return err @@ -238,7 +238,7 @@ func (v1rs *redisMigrator) setV1Actions(x *v1Actions) (err error) { //rem func (v1rs *redisMigrator) remV1Actions(x v1Actions) (err error) { - key := utils.ACTION_PREFIX + x[0].Id + key := utils.ActionPrefix + x[0].Id return v1rs.rds.Cmd(nil, "DEL", key) } @@ -247,7 +247,7 @@ func (v1rs *redisMigrator) remV1Actions(x v1Actions) (err error) { //get func (v1rs *redisMigrator) getV1ActionTriggers() (v1acts *v1ActionTriggers, err error) { if v1rs.qryIdx == nil { - v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.ACTION_TRIGGER_PREFIX) + v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.ActionTriggerPrefix) if err != nil { return } else if len(v1rs.dataKeys) == 0 { @@ -273,7 +273,7 @@ func (v1rs *redisMigrator) getV1ActionTriggers() (v1acts *v1ActionTriggers, err //set func (v1rs *redisMigrator) setV1ActionTriggers(x *v1ActionTriggers) (err error) { - key := utils.ACTION_TRIGGER_PREFIX + (*x)[0].Id + key := utils.ActionTriggerPrefix + (*x)[0].Id bit, err := v1rs.rds.Marshaler().Marshal(x) if err != nil { return err @@ -286,7 +286,7 @@ func (v1rs *redisMigrator) setV1ActionTriggers(x *v1ActionTriggers) (err error) //rem func (v1rs *redisMigrator) remV1ActionTriggers(x *v1ActionTriggers) (err error) { - key := utils.ACTION_TRIGGER_PREFIX + (*x)[0].Id + key := utils.ActionTriggerPrefix + (*x)[0].Id return v1rs.rds.Cmd(nil, "DEL", key) } @@ -294,7 +294,7 @@ func (v1rs *redisMigrator) remV1ActionTriggers(x *v1ActionTriggers) (err error) //get func (v1rs *redisMigrator) getV1SharedGroup() (v1sg *v1SharedGroup, err error) { if v1rs.qryIdx == nil { - v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.SHARED_GROUP_PREFIX) + v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.SharedGroupPrefix) if err != nil { return } else if len(v1rs.dataKeys) == 0 { @@ -320,7 +320,7 @@ func (v1rs *redisMigrator) getV1SharedGroup() (v1sg *v1SharedGroup, err error) { //set func (v1rs *redisMigrator) setV1SharedGroup(x *v1SharedGroup) (err error) { - key := utils.SHARED_GROUP_PREFIX + x.Id + key := utils.SharedGroupPrefix + x.Id bit, err := v1rs.rds.Marshaler().Marshal(x) if err != nil { return err @@ -335,7 +335,7 @@ func (v1rs *redisMigrator) setV1SharedGroup(x *v1SharedGroup) (err error) { //get func (v1rs *redisMigrator) getV1Stats() (v1st *v1Stat, err error) { if v1rs.qryIdx == nil { - v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.CDR_STATS_PREFIX) + v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.CDRsStatsPrefix) if err != nil { return } else if len(v1rs.dataKeys) == 0 { @@ -387,7 +387,7 @@ func (v1rs *redisMigrator) getV3Stats() (v1st *engine.StatQueueProfile, err erro //set func (v1rs *redisMigrator) setV1Stats(x *v1Stat) (err error) { - key := utils.CDR_STATS_PREFIX + x.Id + key := utils.CDRsStatsPrefix + x.Id bit, err := v1rs.rds.Marshaler().Marshal(x) if err != nil { return err @@ -442,7 +442,7 @@ func (v1rs *redisMigrator) setV2Stats(v2 *engine.StatQueue) (err error) { //get func (v1rs *redisMigrator) getV2ActionTrigger() (v2at *v2ActionTrigger, err error) { if v1rs.qryIdx == nil { - v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.ACTION_TRIGGER_PREFIX) + v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.ActionTriggerPrefix) if err != nil { return } else if len(v1rs.dataKeys) == 0 { @@ -468,7 +468,7 @@ func (v1rs *redisMigrator) getV2ActionTrigger() (v2at *v2ActionTrigger, err erro //set func (v1rs *redisMigrator) setV2ActionTrigger(x *v2ActionTrigger) (err error) { - key := utils.ACTION_TRIGGER_PREFIX + x.ID + key := utils.ActionTriggerPrefix + x.ID bit, err := v1rs.rds.Marshaler().Marshal(x) if err != nil { return err @@ -684,7 +684,7 @@ func (v1rs *redisMigrator) remV1Alias(key string) (err error) { //get func (v1rs *redisMigrator) getV1User() (v1u *v1UserProfile, err error) { if v1rs.qryIdx == nil { - v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.USERS_PREFIX) + v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.UsersPrefix) if err != nil { return } else if len(v1rs.dataKeys) == 0 { @@ -714,19 +714,19 @@ func (v1rs *redisMigrator) setV1User(us *v1UserProfile) (err error) { if err != nil { return err } - return v1rs.rds.Cmd(nil, "SET", utils.USERS_PREFIX+us.GetId(), string(bit)) + return v1rs.rds.Cmd(nil, "SET", utils.UsersPrefix+us.GetId(), string(bit)) } //rem func (v1rs *redisMigrator) remV1User(key string) (err error) { - return v1rs.rds.Cmd(nil, "DEL", utils.USERS_PREFIX+key) + return v1rs.rds.Cmd(nil, "DEL", utils.UsersPrefix+key) } // DerivedChargers methods //get func (v1rs *redisMigrator) getV1DerivedChargers() (v1d *v1DerivedChargersWithKey, err error) { if v1rs.qryIdx == nil { - v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.DERIVEDCHARGERS_PREFIX) + v1rs.dataKeys, err = v1rs.rds.GetKeysForPrefix(utils.DerivedChargersPrefix) if err != nil { return } else if len(v1rs.dataKeys) == 0 { @@ -740,7 +740,7 @@ func (v1rs *redisMigrator) getV1DerivedChargers() (v1d *v1DerivedChargersWithKey return nil, err } v1d = new(v1DerivedChargersWithKey) - v1d.Key = strings.TrimPrefix(v1rs.dataKeys[*v1rs.qryIdx], utils.DERIVEDCHARGERS_PREFIX) + v1d.Key = strings.TrimPrefix(v1rs.dataKeys[*v1rs.qryIdx], utils.DerivedChargersPrefix) v1d.Value = new(v1DerivedChargers) if err := v1rs.rds.Marshaler().Unmarshal(strVal, v1d.Value); err != nil { return nil, err @@ -761,12 +761,12 @@ func (v1rs *redisMigrator) setV1DerivedChargers(dc *v1DerivedChargersWithKey) (e if err != nil { return err } - return v1rs.rds.Cmd(nil, "SET", utils.DERIVEDCHARGERS_PREFIX+dc.Key, string(bit)) + return v1rs.rds.Cmd(nil, "SET", utils.DerivedChargersPrefix+dc.Key, string(bit)) } //rem func (v1rs *redisMigrator) remV1DerivedChargers(key string) (err error) { - return v1rs.rds.Cmd(nil, "DEL", utils.DERIVEDCHARGERS_PREFIX+key) + return v1rs.rds.Cmd(nil, "DEL", utils.DerivedChargersPrefix+key) } //AttributeProfile methods diff --git a/migrator/thresholds_it_test.go b/migrator/thresholds_it_test.go index 7158ebbc5..b9498966a 100644 --- a/migrator/thresholds_it_test.go +++ b/migrator/thresholds_it_test.go @@ -194,7 +194,7 @@ func testTrsITMigrateAndMove(t *testing.T) { ID: utils.StringPointer("TESTZ"), Timings: []*engine.RITiming{}, ExpirationDate: utils.TimePointer(tim), - Type: utils.StringPointer(utils.MONETARY), + Type: utils.StringPointer(utils.MetaMonetary), }, Weight: 0, ActionsID: "Action1", diff --git a/migrator/tp_destination_rates_it_test.go b/migrator/tp_destination_rates_it_test.go index d690f932c..a41a024ff 100644 --- a/migrator/tp_destination_rates_it_test.go +++ b/migrator/tp_destination_rates_it_test.go @@ -106,7 +106,7 @@ func testTpDstRtITFlush(t *testing.T) { func testTpDstRtITPopulate(t *testing.T) { tpDestinationRate = []*utils.TPDestinationRate{ { - TPid: utils.TEST_SQL, + TPid: utils.TestSQL, ID: "DR_FREESWITCH_USERS", DestinationRates: []*utils.DestinationRate{ { diff --git a/migrator/user.go b/migrator/user.go index 29dbbf46b..93aed5eb3 100644 --- a/migrator/user.go +++ b/migrator/user.go @@ -40,7 +40,7 @@ func (ud *v1UserProfile) GetId() string { } func (ud *v1UserProfile) SetId(id string) error { - vals := strings.Split(id, utils.CONCATENATED_KEY_SEP) + vals := strings.Split(id, utils.ConcatenatedKeySep) if len(vals) != 2 { return utils.ErrInvalidKey } @@ -65,7 +65,7 @@ func userProfile2attributeProfile(user *v1UserProfile) (attr *engine.AttributePr attr.Attributes = append(attr.Attributes, &engine.Attribute{ Path: utils.MetaTenant, Value: config.NewRSRParsersMustCompile(user.Tenant, utils.InfieldSep), - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, }) } for fieldName, substitute := range user.Profile { diff --git a/migrator/user_it_test.go b/migrator/user_it_test.go index 32eaf2034..db66d83f3 100644 --- a/migrator/user_it_test.go +++ b/migrator/user_it_test.go @@ -141,7 +141,7 @@ func testUsrITMigrateAndMove(t *testing.T) { }, { Path: utils.MetaTenant, - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile("cgrates.com", utils.InfieldSep), }, }, diff --git a/migrator/user_test.go b/migrator/user_test.go index 58318dc85..358cf5f29 100644 --- a/migrator/user_test.go +++ b/migrator/user_test.go @@ -110,7 +110,7 @@ func TestUserProfile2attributeProfile(t *testing.T) { }, { Path: utils.MetaTenant, - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile(usrTenant, utils.InfieldSep), }, }, @@ -154,7 +154,7 @@ func TestUserProfile2attributeProfile(t *testing.T) { }, { Path: utils.MetaTenant, - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile(usrTenant, utils.InfieldSep), }, }, @@ -192,7 +192,7 @@ func TestUserProfile2attributeProfile(t *testing.T) { }, { Path: utils.MetaTenant, - Type: utils.META_CONSTANT, + Type: utils.MetaConstant, Value: config.NewRSRParsersMustCompile(usrTenant, utils.InfieldSep), }, }, diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go index 4b5521317..c83046f9d 100644 --- a/scheduler/scheduler.go +++ b/scheduler/scheduler.go @@ -268,7 +268,7 @@ func (s *Scheduler) GetScheduledActions(fltr ArgsGetScheduledActions) (schedActi if fltr.Tenant != nil || fltr.Account != nil { found := false for accID := range at.GetAccountIDs() { - split := strings.Split(accID, utils.CONCATENATED_KEY_SEP) + split := strings.Split(accID, utils.ConcatenatedKeySep) if len(split) != 2 { continue // malformed account id } diff --git a/scheduler/scheduler_test.go b/scheduler/scheduler_test.go index 0f093a6b9..b58ccf6e5 100644 --- a/scheduler/scheduler_test.go +++ b/scheduler/scheduler_test.go @@ -35,8 +35,8 @@ func TestSchedulerUpdateActStats(t *testing.T) { if len(sched.actSuccessStats[utils.REMOVE_ACCOUNT]) != 2 { t.Errorf("Wrong stats: %+v", sched.actSuccessStats[utils.REMOVE_ACCOUNT]) } - sched.updateActStats(&engine.Action{Id: "LOG1", ActionType: utils.LOG}, false) - if len(sched.actSuccessStats[utils.LOG]) != 1 || + sched.updateActStats(&engine.Action{Id: "LOG1", ActionType: utils.MetaLog}, false) + if len(sched.actSuccessStats[utils.MetaLog]) != 1 || len(sched.actSuccessStats[utils.REMOVE_ACCOUNT]) != 2 { t.Errorf("Wrong stats: %+v", sched.actSuccessStats) } diff --git a/sessions/libsessions_test.go b/sessions/libsessions_test.go index 19cdf8ad8..a64f7de1c 100644 --- a/sessions/libsessions_test.go +++ b/sessions/libsessions_test.go @@ -30,23 +30,23 @@ import ( func TestLibSessionSGetSetCGRID(t *testing.T) { sEv := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: "*voice", - utils.OriginID: "12345", - utils.AccountField: "account1", - utils.Subject: "subject1", - utils.Destination: "+4986517174963", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: "*prepaid", - utils.SetupTime: "2015-11-09 14:21:24", - utils.AnswerTime: "2015-11-09 14:22:02", - utils.Usage: "1m23s", - utils.LastUsed: "21s", - utils.PDD: "300ms", - utils.ROUTE: "supplier1", - utils.DISCONNECT_CAUSE: "NORMAL_DISCONNECT", - utils.OriginHost: "127.0.0.1", + utils.EventName: "TEST_EVENT", + utils.ToR: "*voice", + utils.OriginID: "12345", + utils.AccountField: "account1", + utils.Subject: "subject1", + utils.Destination: "+4986517174963", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: "*prepaid", + utils.SetupTime: "2015-11-09 14:21:24", + utils.AnswerTime: "2015-11-09 14:22:02", + utils.Usage: "1m23s", + utils.LastUsed: "21s", + utils.PDD: "300ms", + utils.Route: "supplier1", + utils.DisconnectCause: "NORMAL_DISCONNECT", + utils.OriginHost: "127.0.0.1", }) //Empty CGRID in event cgrID := GetSetCGRID(sEv) diff --git a/sessions/session.go b/sessions/session.go index f6b64dd8a..f9a9d6528 100644 --- a/sessions/session.go +++ b/sessions/session.go @@ -142,7 +142,7 @@ func (s *Session) AsExternalSessions(tmz, nodeID string) (aSs []*ExternalSession ToR: sr.Event.GetStringIgnoreErrors(utils.ToR), OriginID: s.EventStart.GetStringIgnoreErrors(utils.OriginID), OriginHost: s.EventStart.GetStringIgnoreErrors(utils.OriginHost), - Source: utils.SessionS + "_" + s.EventStart.GetStringIgnoreErrors(utils.EVENT_NAME), + Source: utils.SessionS + "_" + s.EventStart.GetStringIgnoreErrors(utils.EventName), RequestType: sr.Event.GetStringIgnoreErrors(utils.RequestType), Tenant: s.Tenant, Category: sr.Event.GetStringIgnoreErrors(utils.Category), @@ -179,7 +179,7 @@ func (s *Session) AsExternalSession(sr *SRun, tmz, nodeID string) (aS *ExternalS ToR: sr.Event.GetStringIgnoreErrors(utils.ToR), OriginID: s.EventStart.GetStringIgnoreErrors(utils.OriginID), OriginHost: s.EventStart.GetStringIgnoreErrors(utils.OriginHost), - Source: utils.SessionS + "_" + s.EventStart.GetStringIgnoreErrors(utils.EVENT_NAME), + Source: utils.SessionS + "_" + s.EventStart.GetStringIgnoreErrors(utils.EventName), RequestType: sr.Event.GetStringIgnoreErrors(utils.RequestType), Tenant: s.Tenant, Category: sr.Event.GetStringIgnoreErrors(utils.Category), diff --git a/sessions/session_test.go b/sessions/session_test.go index d5c43db4e..8b561dabf 100644 --- a/sessions/session_test.go +++ b/sessions/session_test.go @@ -300,8 +300,8 @@ func TestSRunDebitReserve6(t *testing.T) { func TestSessionAsCGREventsRawEvent(t *testing.T) { ev := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "123451", utils.AccountField: "1001", utils.Subject: "1001", @@ -327,8 +327,8 @@ func TestSessionAsCGREventsRawEvent(t *testing.T) { func TestSessionAsCGREvents(t *testing.T) { startEv := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "123451", utils.AccountField: "1001", utils.Subject: "1001", @@ -342,8 +342,8 @@ func TestSessionAsCGREvents(t *testing.T) { utils.Cost: 12.12, } ev := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT2", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT2", + utils.ToR: utils.MetaVoice, utils.OriginID: "123451", utils.AccountField: "1001", utils.Subject: "1001", @@ -382,8 +382,8 @@ func TestSessionAsCGREvents(t *testing.T) { func TestSessionAsExternalSessions(t *testing.T) { startEv := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "123451", utils.AccountField: "1001", utils.Subject: "1001", @@ -397,8 +397,8 @@ func TestSessionAsExternalSessions(t *testing.T) { utils.Cost: 12.12, } ev := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT2", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT2", + utils.ToR: utils.MetaVoice, utils.OriginID: "123451", utils.AccountField: "1001", utils.Subject: "1001", @@ -427,7 +427,7 @@ func TestSessionAsExternalSessions(t *testing.T) { exp := []*ExternalSession{{ CGRID: "RandomCGRID", RunID: utils.MetaDefault, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "123451", // OriginHost: s.EventStart.GetStringIgnoreErrors(utils.OriginHost), Source: utils.SessionS + "_" + "TEST_EVENT", @@ -441,7 +441,7 @@ func TestSessionAsExternalSessions(t *testing.T) { AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), Usage: 2 * time.Second, ExtraFields: map[string]string{ - utils.EVENT_NAME: "TEST_EVENT2", + utils.EventName: "TEST_EVENT2", }, NodeID: "ALL", DebitInterval: time.Second, @@ -462,8 +462,8 @@ func TestSessionAsExternalSessions(t *testing.T) { func TestSessionAsExternalSessions2(t *testing.T) { startEv := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "123451", utils.AccountField: "1001", utils.Subject: "1001", @@ -477,8 +477,8 @@ func TestSessionAsExternalSessions2(t *testing.T) { utils.Cost: 12.12, } ev := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT2", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT2", + utils.ToR: utils.MetaVoice, utils.OriginID: "123451", utils.AccountField: "1001", utils.Subject: "1001", @@ -512,7 +512,7 @@ func TestSessionAsExternalSessions2(t *testing.T) { exp := []*ExternalSession{{ CGRID: "RandomCGRID", RunID: utils.MetaDefault, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "123451", // OriginHost: s.EventStart.GetStringIgnoreErrors(utils.OriginHost), Source: utils.SessionS + "_" + "TEST_EVENT", @@ -526,7 +526,7 @@ func TestSessionAsExternalSessions2(t *testing.T) { AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), Usage: 2 * time.Second, ExtraFields: map[string]string{ - utils.EVENT_NAME: "TEST_EVENT2", + utils.EventName: "TEST_EVENT2", }, NodeID: "ALL", DebitInterval: time.Second, @@ -546,8 +546,8 @@ func TestSessionAsExternalSessions2(t *testing.T) { func TestSessionAsExternalSessions3(t *testing.T) { startEv := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "123451", utils.AccountField: "1001", utils.Subject: "1001", @@ -561,8 +561,8 @@ func TestSessionAsExternalSessions3(t *testing.T) { utils.Cost: 12.12, } ev := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT2", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT2", + utils.ToR: utils.MetaVoice, utils.OriginID: "123451", utils.AccountField: "1001", utils.Subject: "1001", @@ -599,7 +599,7 @@ func TestSessionAsExternalSessions3(t *testing.T) { exp := &ExternalSession{ CGRID: "RandomCGRID", RunID: utils.MetaDefault, - ToR: utils.VOICE, + ToR: utils.MetaVoice, OriginID: "123451", // OriginHost: s.EventStart.GetStringIgnoreErrors(utils.OriginHost), Source: utils.SessionS + "_" + "TEST_EVENT", @@ -613,7 +613,7 @@ func TestSessionAsExternalSessions3(t *testing.T) { AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), Usage: 2 * time.Second, ExtraFields: map[string]string{ - utils.EVENT_NAME: "TEST_EVENT2", + utils.EventName: "TEST_EVENT2", }, NodeID: "ALL", DebitInterval: time.Second, @@ -708,8 +708,8 @@ func TestSessionstopDebitLoops(t *testing.T) { func TestUpdateSRuns(t *testing.T) { startEv := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "123451", utils.AccountField: "1001", utils.Subject: "1001", @@ -723,8 +723,8 @@ func TestUpdateSRuns(t *testing.T) { utils.Cost: 12.12, } ev := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT2", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT2", + utils.ToR: utils.MetaVoice, utils.OriginID: "123451", utils.AccountField: "1001", utils.Subject: "1001", @@ -756,7 +756,7 @@ func TestUpdateSRuns(t *testing.T) { }}, } updEv := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT2", + utils.EventName: "TEST_EVENT2", utils.Tenant: "cgrates.org", utils.RequestType: utils.MetaPostpaid, } diff --git a/sessions/sessions.go b/sessions/sessions.go index 5c1bd6e9b..0eb4d97e5 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -632,7 +632,7 @@ func (sS *SessionS) refundSession(s *Session, sRunIdx int, rUsage time.Duration) Subject: sr.CD.Subject, Account: sr.CD.Account, Destination: sr.CD.Destination, - ToR: utils.FirstNonEmpty(sr.CD.ToR, utils.VOICE), + ToR: utils.FirstNonEmpty(sr.CD.ToR, utils.MetaVoice), Increments: incrmts, } var acnt engine.Account @@ -851,7 +851,7 @@ func (sS *SessionS) indexSession(s *Session, pSessions bool) { for _, sr := range s.SRuns { fieldVal, err := sr.Event.GetString(fieldName) // the only error from GetString is ErrNotFound if err != nil { - fieldVal = utils.NOT_AVAILABLE + fieldVal = utils.NotAvailable } if fieldVal == "" { fieldVal = utils.MetaEmpty @@ -1815,7 +1815,7 @@ type V1AuthorizeArgs struct { // ParseFlags will populate the V1AuthorizeArgs flags func (args *V1AuthorizeArgs) ParseFlags(flags string) { - for _, subsystem := range strings.Split(flags, utils.FIELDS_SEP) { + for _, subsystem := range strings.Split(flags, utils.FieldsSep) { switch { case subsystem == utils.MetaAccounts: args.GetMaxUsage = true @@ -2054,11 +2054,11 @@ func (sS *SessionS) BiRPCv1AuthorizeEventWithDigest(clnt rpcclient.ClientConnect } if args.ProcessThresholds { authReply.Thresholds = utils.StringPointer( - strings.Join(*initAuthRply.ThresholdIDs, utils.FIELDS_SEP)) + strings.Join(*initAuthRply.ThresholdIDs, utils.FieldsSep)) } if args.ProcessStats { authReply.StatQueues = utils.StringPointer( - strings.Join(*initAuthRply.StatQueueIDs, utils.FIELDS_SEP)) + strings.Join(*initAuthRply.StatQueueIDs, utils.FieldsSep)) } return nil } @@ -2108,7 +2108,7 @@ type V1InitSessionArgs struct { // ParseFlags will populate the V1InitSessionArgs flags func (args *V1InitSessionArgs) ParseFlags(flags string) { - for _, subsystem := range strings.Split(flags, utils.FIELDS_SEP) { + for _, subsystem := range strings.Split(flags, utils.FieldsSep) { switch { case subsystem == utils.MetaAccounts: args.InitSession = true @@ -2348,11 +2348,11 @@ func (sS *SessionS) BiRPCv1InitiateSessionWithDigest(clnt rpcclient.ClientConnec if args.ProcessThresholds { initReply.Thresholds = utils.StringPointer( - strings.Join(*initSessionRply.ThresholdIDs, utils.FIELDS_SEP)) + strings.Join(*initSessionRply.ThresholdIDs, utils.FieldsSep)) } if args.ProcessStats { initReply.StatQueues = utils.StringPointer( - strings.Join(*initSessionRply.StatQueueIDs, utils.FIELDS_SEP)) + strings.Join(*initSessionRply.StatQueueIDs, utils.FieldsSep)) } return nil } @@ -2538,7 +2538,7 @@ type V1TerminateSessionArgs struct { // ParseFlags will populate the V1TerminateSessionArgs flags func (args *V1TerminateSessionArgs) ParseFlags(flags string) { - for _, subsystem := range strings.Split(flags, utils.FIELDS_SEP) { + for _, subsystem := range strings.Split(flags, utils.FieldsSep) { switch { case subsystem == utils.MetaAccounts: args.TerminateSession = true @@ -2785,7 +2785,7 @@ type V1ProcessMessageArgs struct { // ParseFlags will populate the V1ProcessMessageArgs flags func (args *V1ProcessMessageArgs) ParseFlags(flags string) { - for _, subsystem := range strings.Split(flags, utils.FIELDS_SEP) { + for _, subsystem := range strings.Split(flags, utils.FieldsSep) { switch { case subsystem == utils.MetaAccounts: args.Debit = true diff --git a/sessions/sessions_bench_test.go b/sessions/sessions_bench_test.go index 163a8e822..290e16d8b 100644 --- a/sessions/sessions_bench_test.go +++ b/sessions/sessions_bench_test.go @@ -76,7 +76,7 @@ func addBalance(sBenchRPC *rpc.Client, sraccount string) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: sraccount, - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 5 * float64(time.Hour), Balance: map[string]interface{}{ utils.ID: "TestDynamicDebitBalance", @@ -113,8 +113,8 @@ func initSession(i int) { Tenant: "cgrates.org", ID: "", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.Category: "call", utils.Tenant: "cgrates.org", utils.RequestType: utils.MetaPrepaid, diff --git a/sessions/sessions_birpc_it_test.go b/sessions/sessions_birpc_it_test.go index 11ab1f738..0d9101aaf 100644 --- a/sessions/sessions_birpc_it_test.go +++ b/sessions/sessions_birpc_it_test.go @@ -139,7 +139,7 @@ func testSessionsBiRPCSessionAutomaticDisconnects(t *testing.T) { // Create a balance with 1 second inside and rating increments of 1ms (to be compatible with debit interval) attrSetBalance := utils.AttrSetBalance{Tenant: "cgrates.org", Account: "TestSessionsBiRPCSessionAutomaticDisconnects", - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 0.01 * float64(time.Second), Balance: map[string]interface{}{ utils.ID: "TestSessionsBiRPCSessionAutomaticDisconnects", @@ -160,9 +160,9 @@ func testSessionsBiRPCSessionAutomaticDisconnects(t *testing.T) { eAcntVal := 0.01 * float64(time.Second) if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrGetAcnt, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { t.Errorf("Expecting: %f, received: %f", eAcntVal, - acnt.BalanceMap[utils.VOICE].GetTotalValue()) + acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } initArgs := &V1InitSessionArgs{ @@ -172,8 +172,8 @@ func testSessionsBiRPCSessionAutomaticDisconnects(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsBiRPCSessionAutomaticDisconnects", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "123451", utils.AccountField: attrSetBalance.Account, utils.Subject: attrSetBalance.Account, @@ -216,8 +216,8 @@ func testSessionsBiRPCSessionAutomaticDisconnects(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedData", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "123451", utils.AccountField: attrSetBalance.Account, utils.Subject: attrSetBalance.Account, @@ -240,8 +240,8 @@ func testSessionsBiRPCSessionAutomaticDisconnects(t *testing.T) { time.Sleep(100 * time.Millisecond) // Give time for debits to occur if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrGetAcnt, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != 0 { - t.Errorf("Balance should be empty, have: %f", acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != 0 { + t.Errorf("Balance should be empty, have: %f", acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } if err := sessionsBiRPC.Call(utils.SessionSv1ProcessCDR, termArgs.CGREvent, &reply); err != nil { t.Error(err) @@ -269,7 +269,7 @@ func testSessionsBiRPCSessionOriginatorTerminate(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "TestSessionsBiRPCSessionOriginatorTerminate", - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: float64(time.Second), Balance: map[string]interface{}{ utils.ID: "TestSessionsBiRPCSessionOriginatorTerminate", @@ -287,8 +287,8 @@ func testSessionsBiRPCSessionOriginatorTerminate(t *testing.T) { eAcntVal := 1.0 * float64(time.Second) if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrGetAcnt, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { - t.Errorf("Expecting: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { + t.Errorf("Expecting: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } initArgs := &V1InitSessionArgs{ @@ -298,8 +298,8 @@ func testSessionsBiRPCSessionOriginatorTerminate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsBiRPCSessionOriginatorTerminate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "123452", utils.AccountField: attrSetBalance.Account, utils.Subject: attrSetBalance.Account, @@ -335,8 +335,8 @@ func testSessionsBiRPCSessionOriginatorTerminate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsBiRPCSessionOriginatorTerminate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "123452", utils.AccountField: attrSetBalance.Account, utils.Subject: attrSetBalance.Account, @@ -360,8 +360,8 @@ func testSessionsBiRPCSessionOriginatorTerminate(t *testing.T) { time.Sleep(50 * time.Millisecond) // Give time for debits to occur if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrGetAcnt, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() > 0.995*float64(time.Second) { // FixMe: should be not 0.93? - t.Errorf("Balance value: %f", acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() > 0.995*float64(time.Second) { // FixMe: should be not 0.93? + t.Errorf("Balance value: %f", acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } if err := sessionsRPC.Call(utils.SessionSv1ProcessCDR, &utils.CGREventWithOpts{CGREvent: termArgs.CGREvent}, &reply); err != nil { diff --git a/sessions/sessions_data_it_test.go b/sessions/sessions_data_it_test.go index 152b2a2e2..d89b4b16b 100644 --- a/sessions/sessions_data_it_test.go +++ b/sessions/sessions_data_it_test.go @@ -129,9 +129,9 @@ func testSessionsDataLastUsedData(t *testing.T) { eAcntVal := 102400.0 if err := sDataRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.DATA].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaData].GetTotalValue() != eAcntVal { t.Errorf("Expected: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.DATA].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaData].GetTotalValue()) } tStart, _ := utils.ParseTimeDetectLayout("2016-01-05T18:31:05Z", "") cd := engine.CallDescriptor{ @@ -139,7 +139,7 @@ func testSessionsDataLastUsedData(t *testing.T) { Tenant: "cgrates.org", Subject: "1001", Account: "1001", - Destination: utils.DATA, + Destination: utils.MetaData, TimeStart: tStart, TimeEnd: tStart.Add(1024), } @@ -159,12 +159,12 @@ func testSessionsDataLastUsedData(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedData", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaData, utils.OriginID: "123491", utils.AccountField: "1001", utils.Subject: "1001", - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: "cgrates.org", utils.RequestType: utils.MetaPrepaid, @@ -188,9 +188,9 @@ func testSessionsDataLastUsedData(t *testing.T) { eAcntVal = 97280.0 // 100 -5 if err := sDataRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.DATA].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaData].GetTotalValue() != eAcntVal { t.Errorf("Expected: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.DATA].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaData].GetTotalValue()) } updateArgs := &V1UpdateSessionArgs{ @@ -200,12 +200,12 @@ func testSessionsDataLastUsedData(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedData", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaData, utils.OriginID: "123491", utils.AccountField: "1001", utils.Subject: "1001", - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: "cgrates.org", utils.RequestType: utils.MetaPrepaid, @@ -229,8 +229,8 @@ func testSessionsDataLastUsedData(t *testing.T) { eAcntVal = 93184.0 // 100-9 if err := sDataRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.DATA].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.DATA].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaData].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaData].GetTotalValue()) } termArgs := &V1TerminateSessionArgs{ @@ -240,12 +240,12 @@ func testSessionsDataLastUsedData(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedData", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaData, utils.OriginID: "123491", utils.AccountField: "1001", utils.Subject: "1001", - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: "cgrates.org", utils.RequestType: utils.MetaPrepaid, @@ -264,9 +264,9 @@ func testSessionsDataLastUsedData(t *testing.T) { eAcntVal = 98304.0 //100-4 if err := sDataRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.DATA].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaData].GetTotalValue() != eAcntVal { t.Errorf("Expected: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.DATA].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaData].GetTotalValue()) } } @@ -277,7 +277,7 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { eAcntVal := 102400.0 attrSetBalance := utils.AttrSetBalance{ Tenant: acntAttrs.Tenant, Account: acntAttrs.Account, - BalanceType: utils.DATA, + BalanceType: utils.MetaData, Value: eAcntVal, Balance: map[string]interface{}{ utils.ID: "TestSessionsDataLastUsedMultipleData", @@ -291,7 +291,7 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { } if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if totalVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); totalVal != eAcntVal { + } else if totalVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); totalVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, totalVal) } @@ -303,12 +303,12 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedMultipleUpdates", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaData, utils.OriginID: "123492", utils.AccountField: acntAttrs.Account, utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: acntAttrs.Tenant, utils.RequestType: utils.MetaPrepaid, @@ -332,7 +332,7 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { eAcntVal = 96256 // 100-6 if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if totalVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); totalVal != eAcntVal { + } else if totalVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); totalVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, totalVal) } aSessions := make([]*ExternalSession, 0) @@ -351,12 +351,12 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedMultipleUpdates", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaData, utils.OriginID: "123492", utils.AccountField: acntAttrs.Account, utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: acntAttrs.Tenant, utils.RequestType: utils.MetaPrepaid, @@ -381,7 +381,7 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { eAcntVal = 87040.000000 // 15MB used if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if totalVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); totalVal != eAcntVal { + } else if totalVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); totalVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, totalVal) } if err := sDataRPC.Call(utils.SessionSv1GetActiveSessions, new(utils.SessionFilter), &aSessions); err != nil { @@ -401,12 +401,12 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedMultipleUpdates", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaData, utils.OriginID: "123492", utils.AccountField: acntAttrs.Account, utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: acntAttrs.Tenant, utils.RequestType: utils.MetaPrepaid, @@ -431,7 +431,7 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { eAcntVal = 87040.000000 // the amount is not modified and there will be 1024 extra left in SMG if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if totalVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); totalVal != eAcntVal { + } else if totalVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); totalVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, totalVal) } if err := sDataRPC.Call(utils.SessionSv1GetActiveSessions, new(utils.SessionFilter), &aSessions); err != nil { @@ -453,12 +453,12 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedMultipleUpdates", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaData, utils.OriginID: "123492", utils.AccountField: acntAttrs.Account, utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: acntAttrs.Tenant, utils.RequestType: utils.MetaPrepaid, @@ -480,7 +480,7 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { eAcntVal = 87040.000000 if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if totalVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); totalVal != eAcntVal { + } else if totalVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); totalVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, totalVal) } if err := sDataRPC.Call(utils.SessionSv1GetActiveSessions, new(utils.SessionFilter), &aSessions); err != nil { @@ -497,12 +497,12 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedMultipleUpdates", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaData, utils.OriginID: "123492", utils.AccountField: acntAttrs.Account, utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: acntAttrs.Tenant, utils.RequestType: utils.MetaPrepaid, @@ -523,7 +523,7 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { eAcntVal = 89088.000000 if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if totalVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); totalVal != eAcntVal { + } else if totalVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); totalVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, totalVal) } if err := sDataRPC.Call(utils.SessionSv1GetActiveSessions, @@ -562,7 +562,7 @@ func testSessionsDataTTLExpired(t *testing.T) { eAcntVal := 102400.0 attrSetBalance := utils.AttrSetBalance{ Tenant: acntAttrs.Tenant, Account: acntAttrs.Account, - BalanceType: utils.DATA, + BalanceType: utils.MetaData, Value: eAcntVal, Balance: map[string]interface{}{ utils.ID: "TestSessionsDataTTLExpired", @@ -576,7 +576,7 @@ func testSessionsDataTTLExpired(t *testing.T) { } if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if totalVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); totalVal != eAcntVal { + } else if totalVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); totalVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, totalVal) } @@ -591,12 +591,12 @@ func testSessionsDataTTLExpired(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataTTLExpired", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaData, utils.OriginID: "TestSessionsDataTTLExpired", utils.AccountField: acntAttrs.Account, utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: "cgrates.org", utils.RequestType: utils.MetaPrepaid, @@ -620,7 +620,7 @@ func testSessionsDataTTLExpired(t *testing.T) { eAcntVal = 101376.000000 if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if dataVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); dataVal != eAcntVal { + } else if dataVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); dataVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, dataVal) } time.Sleep(70 * time.Millisecond) @@ -628,7 +628,7 @@ func testSessionsDataTTLExpired(t *testing.T) { eAcntVal = 100352.000000 if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if dataVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); dataVal != eAcntVal { + } else if dataVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); dataVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, dataVal) } @@ -656,7 +656,7 @@ func testSessionsDataTTLExpMultiUpdates(t *testing.T) { eAcntVal := 102400.0 attrSetBalance := utils.AttrSetBalance{ Tenant: acntAttrs.Tenant, Account: acntAttrs.Account, - BalanceType: utils.DATA, + BalanceType: utils.MetaData, Value: eAcntVal, Balance: map[string]interface{}{ utils.ID: "TestSessionsDataTTLExpMultiUpdates", @@ -670,7 +670,7 @@ func testSessionsDataTTLExpMultiUpdates(t *testing.T) { } if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if totalVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); totalVal != eAcntVal { + } else if totalVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); totalVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, totalVal) } @@ -682,12 +682,12 @@ func testSessionsDataTTLExpMultiUpdates(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataTTLExpMultiUpdates", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaData, utils.OriginID: "123495", utils.AccountField: acntAttrs.Account, utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: "cgrates.org", utils.RequestType: utils.MetaPrepaid, @@ -712,7 +712,7 @@ func testSessionsDataTTLExpMultiUpdates(t *testing.T) { eAcntVal = 98304.000000 //96MB if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if dataVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); dataVal != eAcntVal { + } else if dataVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); dataVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, dataVal) } aSessions := make([]*ExternalSession, 0) @@ -735,12 +735,12 @@ func testSessionsDataTTLExpMultiUpdates(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataTTLExpMultiUpdates", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaData, utils.OriginID: "123495", utils.AccountField: acntAttrs.Account, utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: "cgrates.org", utils.RequestType: utils.MetaPrepaid, @@ -764,15 +764,15 @@ func testSessionsDataTTLExpMultiUpdates(t *testing.T) { eAcntVal = 97280.000000 // 20480 if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.DATA].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.DATA].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaData].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaData].GetTotalValue()) } time.Sleep(60 * time.Millisecond) // TTL will kick in eAcntVal = 100352.000000 // initial balance ( 102400 ) - SessionTTLUsage from update ( 2048 ) if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if dataVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); dataVal != eAcntVal { + } else if dataVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); dataVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, dataVal) } if err := sDataRPC.Call(utils.SessionSv1GetActiveSessions, @@ -801,7 +801,7 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { eAcntVal := 102400.0 attrSetBalance := utils.AttrSetBalance{ Tenant: acntAttrs.Tenant, Account: acntAttrs.Account, - BalanceType: utils.DATA, + BalanceType: utils.MetaData, Value: eAcntVal, Balance: map[string]interface{}{ utils.ID: "TestSessionsDataTTLExpMultiUpdates", @@ -815,7 +815,7 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { } if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if totalVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); totalVal != eAcntVal { + } else if totalVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); totalVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, totalVal) } @@ -827,12 +827,12 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataMultipleDataNoUsage", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaData, utils.OriginID: "123495", utils.AccountField: acntAttrs.Account, utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: "cgrates.org", utils.RequestType: utils.MetaPrepaid, @@ -856,7 +856,7 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { eAcntVal = 100352.000000 // 1054720 if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if dataVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); dataVal != eAcntVal { + } else if dataVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); dataVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, dataVal) } aSessions := make([]*ExternalSession, 0) @@ -878,12 +878,12 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataMultipleDataNoUsage", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaData, utils.OriginID: "123495", utils.AccountField: acntAttrs.Account, utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: "cgrates.org", utils.RequestType: utils.MetaPrepaid, @@ -907,7 +907,7 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { eAcntVal = 100352.000000 if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if dataVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); dataVal != eAcntVal { + } else if dataVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); dataVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, dataVal) } aSessions = make([]*ExternalSession, 0) @@ -929,12 +929,12 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataMultipleDataNoUsage", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaData, utils.OriginID: "123495", utils.AccountField: acntAttrs.Account, utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: "cgrates.org", utils.RequestType: utils.MetaPrepaid, @@ -964,7 +964,7 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { eAcntVal = 100352.000000 if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if dataVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); dataVal != eAcntVal { + } else if dataVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); dataVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, dataVal) } aSessions = make([]*ExternalSession, 0) @@ -982,12 +982,12 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataMultipleDataNoUsage", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaData, utils.OriginID: "123495", utils.AccountField: acntAttrs.Account, utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: "cgrates.org", utils.RequestType: utils.MetaPrepaid, @@ -1007,9 +1007,9 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { eAcntVal = 101376.000000 // refunded last 1MB reserved and unused if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.DATA].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaData].GetTotalValue() != eAcntVal { t.Errorf("Expected: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.DATA].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaData].GetTotalValue()) } if err := sDataRPC.Call(utils.SessionSv1GetActiveSessions, new(utils.SessionFilter), &aSessions); err == nil || @@ -1027,7 +1027,7 @@ func testSessionsDataTTLUsageProtection(t *testing.T) { eAcntVal := 102400.0 attrSetBalance := utils.AttrSetBalance{ Tenant: acntAttrs.Tenant, Account: acntAttrs.Account, - BalanceType: utils.DATA, + BalanceType: utils.MetaData, Value: eAcntVal, Balance: map[string]interface{}{ utils.ID: "TestSessionsDataTTLUsageProtection", @@ -1041,7 +1041,7 @@ func testSessionsDataTTLUsageProtection(t *testing.T) { } if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if totalVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); totalVal != eAcntVal { + } else if totalVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); totalVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, totalVal) } @@ -1053,12 +1053,12 @@ func testSessionsDataTTLUsageProtection(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataTTLUsageProtection", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaData, utils.OriginID: "123495", utils.AccountField: acntAttrs.Account, utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: "cgrates.org", utils.RequestType: utils.MetaPrepaid, @@ -1082,7 +1082,7 @@ func testSessionsDataTTLUsageProtection(t *testing.T) { eAcntVal = 100352.000000 // 1054720 if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if dataVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); dataVal != eAcntVal { + } else if dataVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); dataVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, dataVal) } aSessions := make([]*ExternalSession, 0) @@ -1106,7 +1106,7 @@ func testSessionsDataTTLLastUsage(t *testing.T) { eAcntVal := 102400.0 attrSetBalance := utils.AttrSetBalance{ Tenant: acntAttrs.Tenant, Account: acntAttrs.Account, - BalanceType: utils.DATA, + BalanceType: utils.MetaData, Value: eAcntVal, Balance: map[string]interface{}{ utils.ID: "testSessionsDataTTLLastUsage", @@ -1120,7 +1120,7 @@ func testSessionsDataTTLLastUsage(t *testing.T) { } if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if totalVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); totalVal != eAcntVal { + } else if totalVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); totalVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, totalVal) } @@ -1135,12 +1135,12 @@ func testSessionsDataTTLLastUsage(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataTTLLastUsage", Event: map[string]interface{}{ - utils.EVENT_NAME: "testSessionsDataTTLLastUsage", - utils.ToR: utils.DATA, + utils.EventName: "testSessionsDataTTLLastUsage", + utils.ToR: utils.MetaData, utils.OriginID: "testSessionsDataTTLLastUsage", utils.AccountField: acntAttrs.Account, utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, + utils.Destination: utils.MetaData, utils.Category: "data", utils.Tenant: "cgrates.org", utils.RequestType: utils.MetaPrepaid, @@ -1164,7 +1164,7 @@ func testSessionsDataTTLLastUsage(t *testing.T) { eAcntVal = 101376.000000 if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if dataVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); dataVal != eAcntVal { + } else if dataVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); dataVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, dataVal) } time.Sleep(70 * time.Millisecond) @@ -1172,7 +1172,7 @@ func testSessionsDataTTLLastUsage(t *testing.T) { eAcntVal = 99328.000000 // 101376.000000 ( units remains after init session ) - SessionTTLLastUsage ( 2048 ) if err := sDataRPC.Call(utils.APIerSv2GetAccount, acntAttrs, &acnt); err != nil { t.Error(err) - } else if dataVal := acnt.BalanceMap[utils.DATA].GetTotalValue(); dataVal != eAcntVal { + } else if dataVal := acnt.BalanceMap[utils.MetaData].GetTotalValue(); dataVal != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, dataVal) } diff --git a/sessions/sessions_it_test.go b/sessions/sessions_it_test.go index 60a8dd328..01e81bee9 100644 --- a/sessions/sessions_it_test.go +++ b/sessions/sessions_it_test.go @@ -126,8 +126,8 @@ func testSessionsItTerminatNonexist(t *testing.T) { eAcntVal := 10.0 if err := sItRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } usage := 2 * time.Minute @@ -141,8 +141,8 @@ func testSessionsItTerminatNonexist(t *testing.T) { Tenant: "cgrates.org", ID: "testSessionsItTerminatNonexist", Event: map[string]interface{}{ - utils.EVENT_NAME: "TerminateEvent", - utils.ToR: utils.VOICE, + utils.EventName: "TerminateEvent", + utils.ToR: utils.MetaVoice, utils.OriginID: "123451", utils.AccountField: "1001", utils.Subject: "1001", @@ -167,8 +167,8 @@ func testSessionsItTerminatNonexist(t *testing.T) { eAcntVal = 9.299800 if err := sItRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } time.Sleep(100 * time.Millisecond) if err := sItRPC.Call(utils.SessionSv1ProcessCDR, &utils.CGREventWithOpts{CGREvent: termArgs.CGREvent}, &rpl); err != nil { @@ -203,8 +203,8 @@ func testSessionsItUpdateNonexist(t *testing.T) { eAcntVal := 9.299800 if err := sItRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } usage := 2 * time.Minute @@ -218,8 +218,8 @@ func testSessionsItUpdateNonexist(t *testing.T) { Tenant: "cgrates.org", ID: "testSessionsItUpdateNonexist", Event: map[string]interface{}{ - utils.EVENT_NAME: "UpdateEvent", - utils.ToR: utils.VOICE, + utils.EventName: "UpdateEvent", + utils.ToR: utils.MetaVoice, utils.OriginID: "123789", utils.AccountField: "1001", utils.Subject: "1001", @@ -248,8 +248,8 @@ func testSessionsItUpdateNonexist(t *testing.T) { eAcntVal = 8.599600 if err := sItRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } var rpl string termArgs := &V1TerminateSessionArgs{ @@ -259,8 +259,8 @@ func testSessionsItUpdateNonexist(t *testing.T) { Tenant: "cgrates.org", ID: "testSessionsItTerminatNonexist", Event: map[string]interface{}{ - utils.EVENT_NAME: "TerminateEvent", - utils.ToR: utils.VOICE, + utils.EventName: "TerminateEvent", + utils.ToR: utils.MetaVoice, utils.OriginID: "123789", utils.AccountField: "1001", utils.Subject: "1001", @@ -284,8 +284,8 @@ func testSessionsItUpdateNonexist(t *testing.T) { func testSessionsItTerminatePassive(t *testing.T) { //create the event for session sEv := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "UpdateEvent", - utils.ToR: utils.VOICE, + utils.EventName: "UpdateEvent", + utils.ToR: utils.MetaVoice, utils.OriginID: "123789", utils.AccountField: "1001", utils.Subject: "1001", @@ -341,8 +341,8 @@ func testSessionsItTerminatePassive(t *testing.T) { Tenant: "cgrates.org", ID: "testSessionsItTerminatNonexist", Event: map[string]interface{}{ - utils.EVENT_NAME: "TerminateEvent", - utils.ToR: utils.VOICE, + utils.EventName: "TerminateEvent", + utils.ToR: utils.MetaVoice, utils.OriginID: "123789", utils.AccountField: "1001", utils.Subject: "1001", @@ -382,7 +382,7 @@ func testSessionsItEventCostCompressing(t *testing.T) { Tenant: "cgrates.org", Account: "TestSessionsItEventCostCompressing", Value: float64(5) * float64(time.Second), - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Balance: map[string]interface{}{ utils.ID: "TestSessionsItEventCostCompressing", utils.RatingSubject: "*zero50ms", diff --git a/sessions/sessions_rpl_it_test.go b/sessions/sessions_rpl_it_test.go index 513aba654..f79f8148e 100644 --- a/sessions/sessions_rpl_it_test.go +++ b/sessions/sessions_rpl_it_test.go @@ -147,10 +147,10 @@ func testSessionSRplInitiate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionSRplInitiate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", + utils.EventName: "TEST_EVENT", utils.Tenant: "cgrates.org", utils.OriginID: "123451", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", @@ -215,10 +215,10 @@ func testSessionSRplUpdate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionSRplUpdate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", + utils.EventName: "TEST_EVENT", utils.Tenant: "cgrates.org", utils.OriginID: "123451", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", @@ -295,10 +295,10 @@ func testSessionSRplTerminate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionSRplTerminate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", + utils.EventName: "TEST_EVENT", utils.Tenant: "cgrates.org", utils.OriginID: "123451", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", @@ -360,10 +360,10 @@ func testSessionSRplManualReplicate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItAuth", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", + utils.EventName: "TEST_EVENT", utils.Tenant: "cgrates.org", utils.OriginID: "123451", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", @@ -384,10 +384,10 @@ func testSessionSRplManualReplicate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItAuth2", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", + utils.EventName: "TEST_EVENT", utils.Tenant: "cgrates.org", utils.OriginID: "123481", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", diff --git a/sessions/sessions_test.go b/sessions/sessions_test.go index a522817a2..e72a61bf3 100644 --- a/sessions/sessions_test.go +++ b/sessions/sessions_test.go @@ -44,7 +44,7 @@ var attrs = &engine.AttrSProcessEventReply{ utils.CGRID: "5668666d6b8e44eb949042f25ce0796ec3592ff9", utils.Tenant: "cgrates.org", utils.Category: "call", - utils.ToR: utils.VOICE, + utils.ToR: utils.MetaVoice, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", @@ -97,26 +97,26 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { } sS := NewSessionS(sSCfg, nil, nil) sEv := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: "*voice", - utils.OriginID: "12345", - utils.AccountField: "account1", - utils.Subject: "subject1", - utils.Destination: "+4986517174963", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: "*prepaid", - utils.SetupTime: "2015-11-09T14:21:24Z", - utils.AnswerTime: "2015-11-09T14:22:02Z", - utils.Usage: "1m23s", - utils.LastUsed: "21s", - utils.PDD: "300ms", - utils.ROUTE: "supplier1", - utils.DISCONNECT_CAUSE: "NORMAL_DISCONNECT", - utils.OriginHost: "127.0.0.1", - "Extra1": "Value1", - "Extra2": 5, - "Extra3": "", + utils.EventName: "TEST_EVENT", + utils.ToR: "*voice", + utils.OriginID: "12345", + utils.AccountField: "account1", + utils.Subject: "subject1", + utils.Destination: "+4986517174963", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: "*prepaid", + utils.SetupTime: "2015-11-09T14:21:24Z", + utils.AnswerTime: "2015-11-09T14:22:02Z", + utils.Usage: "1m23s", + utils.LastUsed: "21s", + utils.PDD: "300ms", + utils.Route: "supplier1", + utils.DisconnectCause: "NORMAL_DISCONNECT", + utils.OriginHost: "127.0.0.1", + "Extra1": "Value1", + "Extra2": 5, + "Extra3": "", }) // Index first session session := &Session{ @@ -155,7 +155,7 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { }, }, "Extra4": { - utils.NOT_AVAILABLE: map[string]utils.StringSet{ + utils.NotAvailable: map[string]utils.StringSet{ cgrID: {utils.MetaDefault: {}}, }, }, @@ -169,7 +169,7 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { &riFieldNameVal{fieldName: "Tenant", fieldValue: "cgrates.org"}, &riFieldNameVal{fieldName: "Account", fieldValue: "account1"}, &riFieldNameVal{fieldName: "Extra3", fieldValue: utils.MetaEmpty}, - &riFieldNameVal{fieldName: "Extra4", fieldValue: utils.NOT_AVAILABLE}, + &riFieldNameVal{fieldName: "Extra4", fieldValue: utils.NotAvailable}, &riFieldNameVal{fieldName: "OriginID", fieldValue: "12345"}, }, } @@ -179,7 +179,7 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { } // Index second session sSEv2 := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT2", + utils.EventName: "TEST_EVENT2", utils.OriginID: "12346", utils.AccountField: "account2", utils.Destination: "+4986517174964", @@ -202,7 +202,7 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { } sS.indexSession(session2, false) sSEv3 := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT3", + utils.EventName: "TEST_EVENT3", utils.Tenant: "cgrates.org", utils.OriginID: "12347", utils.AccountField: "account2", @@ -257,12 +257,12 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { cgrID: {utils.MetaDefault: {}}, cgrID2: {utils.MetaDefault: {}}, }, - utils.NOT_AVAILABLE: map[string]utils.StringSet{ + utils.NotAvailable: map[string]utils.StringSet{ cgrID3: {utils.MetaDefault: {}}, }, }, "Extra4": { - utils.NOT_AVAILABLE: map[string]utils.StringSet{ + utils.NotAvailable: map[string]utils.StringSet{ cgrID: {utils.MetaDefault: {}}, cgrID3: {utils.MetaDefault: {}}, }, @@ -279,7 +279,7 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { &riFieldNameVal{fieldName: "Tenant", fieldValue: "cgrates.org"}, &riFieldNameVal{fieldName: "Account", fieldValue: "account1"}, &riFieldNameVal{fieldName: "Extra3", fieldValue: utils.MetaEmpty}, - &riFieldNameVal{fieldName: "Extra4", fieldValue: utils.NOT_AVAILABLE}, + &riFieldNameVal{fieldName: "Extra4", fieldValue: utils.NotAvailable}, &riFieldNameVal{fieldName: "OriginID", fieldValue: "12345"}, }, cgrID2: { @@ -292,8 +292,8 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { cgrID3: { &riFieldNameVal{fieldName: "Tenant", fieldValue: "cgrates.org"}, &riFieldNameVal{fieldName: "Account", fieldValue: "account2"}, - &riFieldNameVal{fieldName: "Extra3", fieldValue: utils.NOT_AVAILABLE}, - &riFieldNameVal{fieldName: "Extra4", fieldValue: utils.NOT_AVAILABLE}, + &riFieldNameVal{fieldName: "Extra3", fieldValue: utils.NotAvailable}, + &riFieldNameVal{fieldName: "Extra4", fieldValue: utils.NotAvailable}, &riFieldNameVal{fieldName: "OriginID", fieldValue: "12347"}, }, } @@ -331,7 +331,7 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { utils.MetaEmpty: map[string]utils.StringSet{ cgrID2: {utils.MetaDefault: {}}, }, - utils.NOT_AVAILABLE: map[string]utils.StringSet{ + utils.NotAvailable: map[string]utils.StringSet{ cgrID3: {utils.MetaDefault: {}}, }, }, @@ -339,7 +339,7 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { "info2": map[string]utils.StringSet{ cgrID2: {utils.MetaDefault: {}}, }, - utils.NOT_AVAILABLE: map[string]utils.StringSet{ + utils.NotAvailable: map[string]utils.StringSet{ cgrID3: {utils.MetaDefault: {}}, }, }, @@ -358,8 +358,8 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { cgrID3: { &riFieldNameVal{fieldName: "Tenant", fieldValue: "cgrates.org"}, &riFieldNameVal{fieldName: "Account", fieldValue: "account2"}, - &riFieldNameVal{fieldName: "Extra3", fieldValue: utils.NOT_AVAILABLE}, - &riFieldNameVal{fieldName: "Extra4", fieldValue: utils.NOT_AVAILABLE}, + &riFieldNameVal{fieldName: "Extra3", fieldValue: utils.NotAvailable}, + &riFieldNameVal{fieldName: "Extra4", fieldValue: utils.NotAvailable}, &riFieldNameVal{fieldName: "OriginID", fieldValue: "12347"}, }, } @@ -417,7 +417,7 @@ func TestSessionSRegisterAndUnregisterASessions(t *testing.T) { sSCfg := config.NewDefaultCGRConfig() sS := NewSessionS(sSCfg, nil, nil) sSEv := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", + utils.EventName: "TEST_EVENT", utils.ToR: "*voice", utils.OriginID: "111", utils.AccountField: "account1", @@ -431,7 +431,7 @@ func TestSessionSRegisterAndUnregisterASessions(t *testing.T) { utils.Usage: "1m23s", utils.LastUsed: "21s", utils.PDD: "300ms", - utils.ROUTE: "supplier1", + utils.Route: "supplier1", utils.OriginHost: "127.0.0.1", }) s := &Session{ @@ -477,7 +477,7 @@ func TestSessionSRegisterAndUnregisterASessions(t *testing.T) { } sSEv2 := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", + utils.EventName: "TEST_EVENT", utils.ToR: "*voice", utils.OriginID: "222", utils.AccountField: "account2", @@ -489,7 +489,7 @@ func TestSessionSRegisterAndUnregisterASessions(t *testing.T) { utils.Usage: "1m23s", utils.LastUsed: "21s", utils.PDD: "300ms", - utils.ROUTE: "supplier2", + utils.Route: "supplier2", utils.OriginHost: "127.0.0.1", }) s2 := &Session{ @@ -543,21 +543,21 @@ func TestSessionSRegisterAndUnregisterASessions(t *testing.T) { } sSEv3 := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: "*voice", - utils.OriginID: "111", - utils.AccountField: "account3", - utils.Destination: "+4986517174963", - utils.Category: "call", - utils.Tenant: "itsyscom.com", - utils.RequestType: "*prepaid", - utils.AnswerTime: "2015-11-09T14:22:02Z", - utils.Usage: "1m23s", - utils.LastUsed: "21s", - utils.PDD: "300ms", - utils.ROUTE: "supplier2", - utils.DISCONNECT_CAUSE: "NORMAL_DISCONNECT", - utils.OriginHost: "127.0.0.1", + utils.EventName: "TEST_EVENT", + utils.ToR: "*voice", + utils.OriginID: "111", + utils.AccountField: "account3", + utils.Destination: "+4986517174963", + utils.Category: "call", + utils.Tenant: "itsyscom.com", + utils.RequestType: "*prepaid", + utils.AnswerTime: "2015-11-09T14:22:02Z", + utils.Usage: "1m23s", + utils.LastUsed: "21s", + utils.PDD: "300ms", + utils.Route: "supplier2", + utils.DisconnectCause: "NORMAL_DISCONNECT", + utils.OriginHost: "127.0.0.1", }) s3 := &Session{ CGRID: "session1", @@ -635,7 +635,7 @@ func TestSessionSRegisterAndUnregisterPSessions(t *testing.T) { sSCfg := config.NewDefaultCGRConfig() sS := NewSessionS(sSCfg, nil, nil) sSEv := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", + utils.EventName: "TEST_EVENT", utils.ToR: "*voice", utils.OriginID: "111", utils.AccountField: "account1", @@ -649,7 +649,7 @@ func TestSessionSRegisterAndUnregisterPSessions(t *testing.T) { utils.Usage: "1m23s", utils.LastUsed: "21s", utils.PDD: "300ms", - utils.ROUTE: "supplier1", + utils.Route: "supplier1", utils.OriginHost: "127.0.0.1", }) s := &Session{ @@ -698,7 +698,7 @@ func TestSessionSRegisterAndUnregisterPSessions(t *testing.T) { } sSEv2 := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", + utils.EventName: "TEST_EVENT", utils.ToR: "*voice", utils.OriginID: "222", utils.AccountField: "account2", @@ -710,7 +710,7 @@ func TestSessionSRegisterAndUnregisterPSessions(t *testing.T) { utils.Usage: "1m23s", utils.LastUsed: "21s", utils.PDD: "300ms", - utils.ROUTE: "supplier2", + utils.Route: "supplier2", utils.OriginHost: "127.0.0.1", }) s2 := &Session{ @@ -764,21 +764,21 @@ func TestSessionSRegisterAndUnregisterPSessions(t *testing.T) { } sSEv3 := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: "*voice", - utils.OriginID: "111", - utils.AccountField: "account3", - utils.Destination: "+4986517174963", - utils.Category: "call", - utils.Tenant: "itsyscom.com", - utils.RequestType: "*prepaid", - utils.AnswerTime: "2015-11-09T14:22:02Z", - utils.Usage: "1m23s", - utils.LastUsed: "21s", - utils.PDD: "300ms", - utils.ROUTE: "supplier2", - utils.DISCONNECT_CAUSE: "NORMAL_DISCONNECT", - utils.OriginHost: "127.0.0.1", + utils.EventName: "TEST_EVENT", + utils.ToR: "*voice", + utils.OriginID: "111", + utils.AccountField: "account3", + utils.Destination: "+4986517174963", + utils.Category: "call", + utils.Tenant: "itsyscom.com", + utils.RequestType: "*prepaid", + utils.AnswerTime: "2015-11-09T14:22:02Z", + utils.Usage: "1m23s", + utils.LastUsed: "21s", + utils.PDD: "300ms", + utils.Route: "supplier2", + utils.DisconnectCause: "NORMAL_DISCONNECT", + utils.OriginHost: "127.0.0.1", }) s3 := &Session{ CGRID: "session1", @@ -1419,7 +1419,7 @@ func TestSessionStransitSState(t *testing.T) { sSCfg := config.NewDefaultCGRConfig() sS := NewSessionS(sSCfg, nil, nil) sSEv := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", + utils.EventName: "TEST_EVENT", utils.ToR: "*voice", utils.OriginID: "111", utils.AccountField: "account1", @@ -1433,7 +1433,7 @@ func TestSessionStransitSState(t *testing.T) { utils.Usage: "1m23s", utils.LastUsed: "21s", utils.PDD: "300ms", - utils.ROUTE: "supplier1", + utils.Route: "supplier1", utils.OriginHost: "127.0.0.1", }) s := &Session{ @@ -1465,7 +1465,7 @@ func TestSessionSrelocateSessionS(t *testing.T) { sSCfg := config.NewDefaultCGRConfig() sS := NewSessionS(sSCfg, nil, nil) sSEv := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", + utils.EventName: "TEST_EVENT", utils.ToR: "*voice", utils.OriginID: "111", utils.AccountField: "account1", @@ -1479,7 +1479,7 @@ func TestSessionSrelocateSessionS(t *testing.T) { utils.Usage: "1m23s", utils.LastUsed: "21s", utils.PDD: "300ms", - utils.ROUTE: "supplier1", + utils.Route: "supplier1", utils.OriginHost: "127.0.0.1", }) initialCGRID := GetSetCGRID(sSEv) @@ -1620,7 +1620,7 @@ func TestSessionSGetIndexedFilters(t *testing.T) { { Type: utils.MetaString, Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.ToR, - Values: []string{utils.VOICE}, + Values: []string{utils.MetaVoice}, }, } if err := expUindx[0].CompileValues(); err != nil { @@ -1636,7 +1636,7 @@ func TestSessionSGetIndexedFilters(t *testing.T) { "ToR": {}, } sS = NewSessionS(sSCfg, engine.NewDataManager(mpStr, config.CgrConfig().CacheCfg(), nil), nil) - expIndx = map[string][]string{(utils.ToR): {utils.VOICE}} + expIndx = map[string][]string{(utils.ToR): {utils.MetaVoice}} expUindx = nil if rplyindx, rplyUnindx := sS.getIndexedFilters("", fltrs); !reflect.DeepEqual(expIndx, rplyindx) { t.Errorf("Expected %s , received: %s", utils.ToJSON(expIndx), utils.ToJSON(rplyindx)) @@ -1671,26 +1671,26 @@ func TestSessionSgetSessionIDsMatchingIndexes(t *testing.T) { } sS := NewSessionS(sSCfg, nil, nil) sEv := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: "*voice", - utils.OriginID: "12345", - utils.AccountField: "account1", - utils.Subject: "subject1", - utils.Destination: "+4986517174963", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: "*prepaid", - utils.SetupTime: "2015-11-09T14:21:24Z", - utils.AnswerTime: "2015-11-09T14:22:02Z", - utils.Usage: "1m23s", - utils.LastUsed: "21s", - utils.PDD: "300ms", - utils.ROUTE: "supplier1", - utils.DISCONNECT_CAUSE: "NORMAL_DISCONNECT", - utils.OriginHost: "127.0.0.1", - "Extra1": "Value1", - "Extra2": 5, - "Extra3": "", + utils.EventName: "TEST_EVENT", + utils.ToR: "*voice", + utils.OriginID: "12345", + utils.AccountField: "account1", + utils.Subject: "subject1", + utils.Destination: "+4986517174963", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: "*prepaid", + utils.SetupTime: "2015-11-09T14:21:24Z", + utils.AnswerTime: "2015-11-09T14:22:02Z", + utils.Usage: "1m23s", + utils.LastUsed: "21s", + utils.PDD: "300ms", + utils.Route: "supplier1", + utils.DisconnectCause: "NORMAL_DISCONNECT", + utils.OriginHost: "127.0.0.1", + "Extra1": "Value1", + "Extra2": 5, + "Extra3": "", }) // Index first session session := &Session{ @@ -1707,7 +1707,7 @@ func TestSessionSgetSessionIDsMatchingIndexes(t *testing.T) { } cgrID := GetSetCGRID(sEv) sS.indexSession(session, false) - indx := map[string][]string{"ToR": {utils.VOICE, utils.DATA}} + indx := map[string][]string{"ToR": {utils.MetaVoice, utils.MetaData}} expCGRIDs := []string{cgrID} expmatchingSRuns := map[string]utils.StringSet{cgrID: { "RunID": {}, @@ -1724,7 +1724,7 @@ func TestSessionSgetSessionIDsMatchingIndexes(t *testing.T) { sS = NewSessionS(sSCfg, nil, nil) sS.indexSession(session, false) indx = map[string][]string{ - "ToR": {utils.VOICE, utils.DATA}, + "ToR": {utils.MetaVoice, utils.MetaData}, "Extra2": {"55"}, } expCGRIDs = []string{} @@ -1744,8 +1744,8 @@ func TestSessionSgetSessionIDsMatchingIndexes(t *testing.T) { }, { Event: engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: "*voice"}), + utils.EventName: "TEST_EVENT", + utils.ToR: "*voice"}), CD: &engine.CallDescriptor{ RunID: "RunID2", }, @@ -1758,7 +1758,7 @@ func TestSessionSgetSessionIDsMatchingIndexes(t *testing.T) { sS = NewSessionS(sSCfg, nil, nil) sS.indexSession(session, true) indx = map[string][]string{ - "ToR": {utils.VOICE, utils.DATA}, + "ToR": {utils.MetaVoice, utils.MetaData}, "Extra2": {"5"}, } @@ -1947,7 +1947,7 @@ func TestSessionSgetSession(t *testing.T) { sSCfg := config.NewDefaultCGRConfig() sS := NewSessionS(sSCfg, nil, nil) sSEv := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", + utils.EventName: "TEST_EVENT", utils.ToR: "*voice", utils.OriginID: "111", utils.AccountField: "account1", @@ -1961,7 +1961,7 @@ func TestSessionSgetSession(t *testing.T) { utils.Usage: "1m23s", utils.LastUsed: "21s", utils.PDD: "300ms", - utils.ROUTE: "supplier1", + utils.Route: "supplier1", utils.OriginHost: "127.0.0.1", }) s := &Session{ @@ -1994,26 +1994,26 @@ func TestSessionSfilterSessions(t *testing.T) { } sS := NewSessionS(sSCfg, nil, nil) sEv := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: "*voice", - utils.OriginID: "12345", - utils.AccountField: "account1", - utils.Subject: "subject1", - utils.Destination: "+4986517174963", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: "*prepaid", - utils.SetupTime: "2015-11-09T14:21:24Z", - utils.AnswerTime: "2015-11-09T14:22:02Z", - utils.Usage: "1m23s", - utils.LastUsed: "21s", - utils.PDD: "300ms", - utils.ROUTE: "supplier1", - utils.DISCONNECT_CAUSE: "NORMAL_DISCONNECT", - utils.OriginHost: "127.0.0.1", - "Extra1": "Value1", - "Extra2": 5, - "Extra3": "", + utils.EventName: "TEST_EVENT", + utils.ToR: "*voice", + utils.OriginID: "12345", + utils.AccountField: "account1", + utils.Subject: "subject1", + utils.Destination: "+4986517174963", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: "*prepaid", + utils.SetupTime: "2015-11-09T14:21:24Z", + utils.AnswerTime: "2015-11-09T14:22:02Z", + utils.Usage: "1m23s", + utils.LastUsed: "21s", + utils.PDD: "300ms", + utils.Route: "supplier1", + utils.DisconnectCause: "NORMAL_DISCONNECT", + utils.OriginHost: "127.0.0.1", + "Extra1": "Value1", + "Extra2": 5, + "Extra3": "", }) sr2 := sEv.Clone() // Index first session @@ -2035,7 +2035,7 @@ func TestSessionSfilterSessions(t *testing.T) { }, }, } - sr2[utils.ToR] = utils.SMS + sr2[utils.ToR] = utils.MetaSMS sr2[utils.Subject] = "subject2" sr2[utils.CGRID] = GetSetCGRID(sEv) sS.registerSession(session, false) @@ -2068,13 +2068,13 @@ func TestSessionSfilterSessions(t *testing.T) { "Extra3": "", "LastUsed": "21s", "PDD": "300ms", - utils.ROUTE: "supplier1", + utils.Route: "supplier1", }, NodeID: sSCfg.GeneralCfg().NodeID, } eses2 := &ExternalSession{ CGRID: "cade401f46f046311ed7f62df3dfbb84adb98aad", - ToR: utils.SMS, + ToR: utils.MetaSMS, OriginID: "12345", OriginHost: "127.0.0.1", Source: "SessionS_TEST_EVENT", @@ -2093,14 +2093,14 @@ func TestSessionSfilterSessions(t *testing.T) { "Extra3": "", "LastUsed": "21s", "PDD": "300ms", - utils.ROUTE: "supplier1", + utils.Route: "supplier1", }, NodeID: sSCfg.GeneralCfg().NodeID, } expSess := []*ExternalSession{ eses1, } - fltrs := &utils.SessionFilter{Filters: []string{fmt.Sprintf("*string:~*req.ToR:%s;%s", utils.VOICE, utils.DATA)}} + fltrs := &utils.SessionFilter{Filters: []string{fmt.Sprintf("*string:~*req.ToR:%s;%s", utils.MetaVoice, utils.MetaData)}} if sess := sS.filterSessions(fltrs, true); len(sess) != 0 { t.Errorf("Expected no session, received: %s", utils.ToJSON(sess)) } @@ -2155,7 +2155,7 @@ func TestSessionSfilterSessions(t *testing.T) { } else if !reflect.DeepEqual(expSess[0], eses1) && !reflect.DeepEqual(expSess[0], eses2) { t.Errorf("Expected %s or %s, received: %s", utils.ToJSON(eses1), utils.ToJSON(eses2), utils.ToJSON(sess[0])) } - fltrs = &utils.SessionFilter{Filters: []string{fmt.Sprintf("*string:~*req.ToR:%s;%s", utils.VOICE, utils.SMS)}, Limit: utils.IntPointer(1)} + fltrs = &utils.SessionFilter{Filters: []string{fmt.Sprintf("*string:~*req.ToR:%s;%s", utils.MetaVoice, utils.MetaSMS)}, Limit: utils.IntPointer(1)} if sess := sS.filterSessions(fltrs, false); len(sess) != 1 { t.Errorf("Expected one session, received: %s", utils.ToJSON(sess)) } else if !reflect.DeepEqual(expSess[0], eses1) && !reflect.DeepEqual(expSess[0], eses2) { @@ -2170,26 +2170,26 @@ func TestSessionSfilterSessionsCount(t *testing.T) { } sS := NewSessionS(sSCfg, nil, nil) sEv := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: "*voice", - utils.OriginID: "12345", - utils.AccountField: "account1", - utils.Subject: "subject1", - utils.Destination: "+4986517174963", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: "*prepaid", - utils.SetupTime: "2015-11-09T14:21:24Z", - utils.AnswerTime: "2015-11-09T14:22:02Z", - utils.Usage: "1m23s", - utils.LastUsed: "21s", - utils.PDD: "300ms", - utils.ROUTE: "supplier1", - utils.DISCONNECT_CAUSE: "NORMAL_DISCONNECT", - utils.OriginHost: "127.0.0.1", - "Extra1": "Value1", - "Extra2": 5, - "Extra3": "", + utils.EventName: "TEST_EVENT", + utils.ToR: "*voice", + utils.OriginID: "12345", + utils.AccountField: "account1", + utils.Subject: "subject1", + utils.Destination: "+4986517174963", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: "*prepaid", + utils.SetupTime: "2015-11-09T14:21:24Z", + utils.AnswerTime: "2015-11-09T14:22:02Z", + utils.Usage: "1m23s", + utils.LastUsed: "21s", + utils.PDD: "300ms", + utils.Route: "supplier1", + utils.DisconnectCause: "NORMAL_DISCONNECT", + utils.OriginHost: "127.0.0.1", + "Extra1": "Value1", + "Extra2": 5, + "Extra3": "", }) sr2 := sEv.Clone() // Index first session @@ -2211,10 +2211,10 @@ func TestSessionSfilterSessionsCount(t *testing.T) { }, }, } - sEv[utils.ToR] = utils.DATA + sEv[utils.ToR] = utils.MetaData sr2[utils.CGRID] = GetSetCGRID(sEv) sS.registerSession(session, false) - fltrs := &utils.SessionFilter{Filters: []string{fmt.Sprintf("*string:~*req.ToR:%s;%s", utils.VOICE, utils.DATA)}} + fltrs := &utils.SessionFilter{Filters: []string{fmt.Sprintf("*string:~*req.ToR:%s;%s", utils.MetaVoice, utils.MetaData)}} if noSess := sS.filterSessionsCount(fltrs, false); noSess != 2 { t.Errorf("Expected %v , received: %s", 2, utils.ToJSON(noSess)) @@ -2255,7 +2255,7 @@ func TestSessionSfilterSessionsCount(t *testing.T) { } sS = NewSessionS(sSCfg, nil, nil) sS.registerSession(session, true) - fltrs = &utils.SessionFilter{Filters: []string{fmt.Sprintf("*string:~*req.ToR:%s;%s", utils.VOICE, utils.DATA)}} + fltrs = &utils.SessionFilter{Filters: []string{fmt.Sprintf("*string:~*req.ToR:%s;%s", utils.MetaVoice, utils.MetaData)}} if noSess := sS.filterSessionsCount(fltrs, true); noSess != 2 { t.Errorf("Expected %v , received: %s", 2, utils.ToJSON(noSess)) } diff --git a/sessions/sessions_voice_it_test.go b/sessions/sessions_voice_it_test.go index ddae30f41..a5064b17e 100644 --- a/sessions/sessions_voice_it_test.go +++ b/sessions/sessions_voice_it_test.go @@ -134,8 +134,8 @@ func testSessionsVoiceMonetaryRefund(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceMonetaryRefund", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "123451", utils.AccountField: "1001", utils.Subject: "1001", @@ -164,8 +164,8 @@ func testSessionsVoiceMonetaryRefund(t *testing.T) { eAcntVal := 8.700010 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } usage = time.Minute @@ -176,8 +176,8 @@ func testSessionsVoiceMonetaryRefund(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceMonetaryRefund", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "123451", utils.AccountField: "1001", utils.Subject: "1001", @@ -201,8 +201,8 @@ func testSessionsVoiceMonetaryRefund(t *testing.T) { eAcntVal = 8.8 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } @@ -215,8 +215,8 @@ func testSessionsVoiceVoiceRefund(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceVoiceRefund", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "123452", utils.AccountField: "1001", utils.Subject: "1001", @@ -246,9 +246,9 @@ func testSessionsVoiceVoiceRefund(t *testing.T) { eAcntVal := 120.0 * float64(time.Second) if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { t.Errorf("Expected: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } usage = time.Minute @@ -259,8 +259,8 @@ func testSessionsVoiceVoiceRefund(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceVoiceRefund", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "123452", utils.AccountField: "1001", utils.Subject: "1001", @@ -284,8 +284,8 @@ func testSessionsVoiceVoiceRefund(t *testing.T) { eAcntVal = 150.0 * float64(time.Second) if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } } @@ -304,8 +304,8 @@ func testSessionsVoiceMixedRefund(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceMixedRefund", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "123453", utils.AccountField: "1001", utils.Subject: "1001", @@ -336,11 +336,11 @@ func testSessionsVoiceMixedRefund(t *testing.T) { eMoneyVal := 8.7399 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eVoiceVal || - acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eMoneyVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eVoiceVal || + acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eMoneyVal { t.Errorf("Expected: %f, received: %f, expetced money: %f, recieved money : %f", - eVoiceVal, acnt.BalanceMap[utils.VOICE].GetTotalValue(), - eMoneyVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + eVoiceVal, acnt.BalanceMap[utils.MetaVoice].GetTotalValue(), + eMoneyVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } usage = time.Minute @@ -351,8 +351,8 @@ func testSessionsVoiceMixedRefund(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceMixedRefund", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "123453", utils.AccountField: "1001", utils.Subject: "1001", @@ -377,14 +377,14 @@ func testSessionsVoiceMixedRefund(t *testing.T) { eMoneyVal = 8.79 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eVoiceVal || - acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eMoneyVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eVoiceVal || + acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eMoneyVal { t.Errorf("Expected voice: %f, received voice : %f, expected money: %f, received money: %f", - eVoiceVal, acnt.BalanceMap[utils.VOICE].GetTotalValue(), - eMoneyVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + eVoiceVal, acnt.BalanceMap[utils.MetaVoice].GetTotalValue(), + eMoneyVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } - //t.Logf("After monetary: %f", acnt.BalanceMap[utils.MONETARY].GetTotalValue()) - //t.Logf("After voice: %f", acnt.BalanceMap[utils.VOICE].GetTotalValue()) + //t.Logf("After monetary: %f", acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) + //t.Logf("After voice: %f", acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } func testSessionsVoiceLastUsed(t *testing.T) { @@ -393,8 +393,8 @@ func testSessionsVoiceLastUsed(t *testing.T) { eAcntVal := 8.790000 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } usage := 2 * time.Minute @@ -405,8 +405,8 @@ func testSessionsVoiceLastUsed(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsed", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "12350", utils.AccountField: "1001", utils.Subject: "1001", @@ -434,8 +434,8 @@ func testSessionsVoiceLastUsed(t *testing.T) { eAcntVal = 7.39002 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } lastUsage := time.Minute + 30*time.Second @@ -446,8 +446,8 @@ func testSessionsVoiceLastUsed(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsed", Event: map[string]interface{}{ - utils.EVENT_NAME: "Update1", - utils.ToR: utils.VOICE, + utils.EventName: "Update1", + utils.ToR: utils.MetaVoice, utils.OriginID: "12350", utils.AccountField: "1001", utils.Subject: "1001", @@ -473,8 +473,8 @@ func testSessionsVoiceLastUsed(t *testing.T) { eAcntVal = 7.09005 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } lastUsage = 2*time.Minute + 30*time.Second @@ -485,8 +485,8 @@ func testSessionsVoiceLastUsed(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsed", Event: map[string]interface{}{ - utils.EVENT_NAME: "Update2", - utils.ToR: utils.VOICE, + utils.EventName: "Update2", + utils.ToR: utils.MetaVoice, utils.OriginID: "12350", utils.AccountField: "1001", utils.Subject: "1001", @@ -513,8 +513,8 @@ func testSessionsVoiceLastUsed(t *testing.T) { eAcntVal = 6.590100 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } usage = time.Minute @@ -525,8 +525,8 @@ func testSessionsVoiceLastUsed(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsed", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "12350", utils.AccountField: "1001", utils.Subject: "1001", @@ -550,9 +550,9 @@ func testSessionsVoiceLastUsed(t *testing.T) { eAcntVal = 7.59 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { t.Errorf("Expected: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } @@ -562,8 +562,8 @@ func testSessionsVoiceLastUsedEnd(t *testing.T) { eAcntVal := 7.59000 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } usage := 2 * time.Minute @@ -574,8 +574,8 @@ func testSessionsVoiceLastUsedEnd(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsedEnd", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "1234911", utils.AccountField: "1001", utils.Subject: "1001", @@ -603,8 +603,8 @@ func testSessionsVoiceLastUsedEnd(t *testing.T) { eAcntVal = 6.190020 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } lastUsage := 30 * time.Second @@ -615,8 +615,8 @@ func testSessionsVoiceLastUsedEnd(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsedEnd", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "1234911", utils.AccountField: "1001", utils.Subject: "1001", @@ -643,9 +643,9 @@ func testSessionsVoiceLastUsedEnd(t *testing.T) { eAcntVal = 6.090030 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { t.Errorf("Expected: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } termArgs := &V1TerminateSessionArgs{ @@ -655,8 +655,8 @@ func testSessionsVoiceLastUsedEnd(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsedEnd", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "1234911", utils.AccountField: "1001", utils.Subject: "1001", @@ -678,9 +678,9 @@ func testSessionsVoiceLastUsedEnd(t *testing.T) { eAcntVal = 6.590000 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { t.Errorf("Expected: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } @@ -690,8 +690,8 @@ func testSessionsVoiceLastUsedNotFixed(t *testing.T) { eAcntVal := 6.59000 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } usage := 2 * time.Minute @@ -702,8 +702,8 @@ func testSessionsVoiceLastUsedNotFixed(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsedNotFixed", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "1234922", utils.AccountField: "1001", utils.Subject: "1001", @@ -731,8 +731,8 @@ func testSessionsVoiceLastUsedNotFixed(t *testing.T) { eAcntVal = 5.190020 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } //Update @@ -744,8 +744,8 @@ func testSessionsVoiceLastUsedNotFixed(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsedNotFixed", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "1234922", utils.AccountField: "1001", utils.Subject: "1001", @@ -771,9 +771,9 @@ func testSessionsVoiceLastUsedNotFixed(t *testing.T) { eAcntVal = 5.123360 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { t.Errorf("Expected: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } termArgs := &V1TerminateSessionArgs{ @@ -783,8 +783,8 @@ func testSessionsVoiceLastUsedNotFixed(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsedNotFixed", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "1234922", utils.AccountField: "1001", utils.Subject: "1001", @@ -806,9 +806,9 @@ func testSessionsVoiceLastUsedNotFixed(t *testing.T) { eAcntVal = 5.590000 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { t.Errorf("Expected: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } } @@ -818,9 +818,9 @@ func testSessionsVoiceSessionTTL(t *testing.T) { eAcntVal := 5.590000 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { t.Errorf("Expected: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } usage := 2 * time.Minute @@ -831,8 +831,8 @@ func testSessionsVoiceSessionTTL(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceSessionTTL", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT_SESSION_TTL", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT_SESSION_TTL", + utils.ToR: utils.MetaVoice, utils.OriginID: "12360", utils.AccountField: "1001", utils.Subject: "1001", @@ -888,8 +888,8 @@ func testSessionsVoiceSessionTTL(t *testing.T) { eAcntVal = 4.190020 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } //Update @@ -901,8 +901,8 @@ func testSessionsVoiceSessionTTL(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceSessionTTL", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT_SESSION_TTL", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT_SESSION_TTL", + utils.ToR: utils.MetaVoice, utils.OriginID: "12360", utils.AccountField: "1001", utils.Subject: "1001", @@ -943,15 +943,15 @@ func testSessionsVoiceSessionTTL(t *testing.T) { eAcntVal = 4.090030 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } time.Sleep(200 * time.Millisecond) eAcntVal = 4.0566 // rounding issue; old values : 4.0565 , 4.0566 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaMonetary].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaMonetary].GetTotalValue()) } var cdrs []*engine.ExternalCDR @@ -974,7 +974,7 @@ func testSessionsVoiceSessionTTLWithRelocate(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "TestTTLWithRelocate", - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 300 * float64(time.Second), Balance: map[string]interface{}{ utils.ID: "TestTTLWithRelocate", @@ -995,9 +995,9 @@ func testSessionsVoiceSessionTTLWithRelocate(t *testing.T) { eAcntVal := 300.0 * float64(time.Second) if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { t.Errorf("Expecting: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } usage := 2 * time.Minute @@ -1008,8 +1008,8 @@ func testSessionsVoiceSessionTTLWithRelocate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceSessionTTLWithRelocate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT_SESSION_TTL_RELOCATE", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT_SESSION_TTL_RELOCATE", + utils.ToR: utils.MetaVoice, utils.OriginID: "12361", utils.AccountField: "TestTTLWithRelocate", utils.Subject: "TestTTLWithRelocate", @@ -1052,9 +1052,9 @@ func testSessionsVoiceSessionTTLWithRelocate(t *testing.T) { eAcntVal = 180.0 * float64(time.Second) if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { t.Errorf("Expecting: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } //Update @@ -1066,8 +1066,8 @@ func testSessionsVoiceSessionTTLWithRelocate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceSessionTTLWithRelocate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT_SESSION_TTL_RELOCATE", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT_SESSION_TTL_RELOCATE", + utils.ToR: utils.MetaVoice, utils.InitialOriginID: "12361", //take the initial originID from init utils.OriginID: "12362", utils.AccountField: "TestTTLWithRelocate", @@ -1111,18 +1111,18 @@ func testSessionsVoiceSessionTTLWithRelocate(t *testing.T) { eAcntVal = 150.0 * float64(time.Second) if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { t.Errorf("Expecting: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } time.Sleep(200 * time.Millisecond) // should trigger the TTL from config eAcntVal = 149.95 * float64(time.Second) if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { t.Errorf("Expecting: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } if err := sessionsRPC.Call(utils.SessionSv1GetActiveSessions, utils.SessionFilter{ @@ -1151,7 +1151,7 @@ func testSessionsVoiceRelocateWithOriginIDPrefix(t *testing.T) { attrSetBalance := utils.AttrSetBalance{ Tenant: "cgrates.org", Account: "TestRelocateWithOriginIDPrefix", - BalanceType: utils.VOICE, + BalanceType: utils.MetaVoice, Value: 300 * float64(time.Second), Balance: map[string]interface{}{ utils.ID: "TestRelocateWithOriginIDPrefix", @@ -1172,9 +1172,9 @@ func testSessionsVoiceRelocateWithOriginIDPrefix(t *testing.T) { eAcntVal := 300.0 * float64(time.Second) if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { t.Errorf("Expecting: %f, received: %f", eAcntVal, - acnt.BalanceMap[utils.VOICE].GetTotalValue()) + acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } usage := 2 * time.Minute @@ -1185,8 +1185,8 @@ func testSessionsVoiceRelocateWithOriginIDPrefix(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceRelocateWithOriginIDPrefix", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT_RELOCATE_ORIGPREFIX", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT_RELOCATE_ORIGPREFIX", + utils.ToR: utils.MetaVoice, utils.OriginID: "12371", utils.AccountField: attrSetBalance.Account, utils.Subject: attrSetBalance.Account, @@ -1229,9 +1229,9 @@ func testSessionsVoiceRelocateWithOriginIDPrefix(t *testing.T) { eAcntVal = 180.0 * float64(time.Second) if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { t.Errorf("Expecting: %f, received: %f", eAcntVal, - acnt.BalanceMap[utils.VOICE].GetTotalValue()) + acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } //Update @@ -1243,8 +1243,8 @@ func testSessionsVoiceRelocateWithOriginIDPrefix(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceSessionTTLWithRelocate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT_RELOCATE_ORIGPREFIX", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT_RELOCATE_ORIGPREFIX", + utils.ToR: utils.MetaVoice, utils.InitialOriginID: "12371", utils.OriginID: "12372-1", utils.AccountField: attrSetBalance.Account, @@ -1288,9 +1288,9 @@ func testSessionsVoiceRelocateWithOriginIDPrefix(t *testing.T) { eAcntVal = 150.0 * float64(time.Second) if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { t.Errorf("Expecting: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } termArgs := &V1TerminateSessionArgs{ @@ -1300,8 +1300,8 @@ func testSessionsVoiceRelocateWithOriginIDPrefix(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsedNotFixed", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT_RELOCATE_ORIGPREFIX", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT_RELOCATE_ORIGPREFIX", + utils.ToR: utils.MetaVoice, utils.OriginID: "12372-1", utils.AccountField: attrSetBalance.Account, utils.Subject: attrSetBalance.Account, @@ -1338,9 +1338,9 @@ func testSessionsVoiceRelocateWithOriginIDPrefix(t *testing.T) { if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { t.Errorf("Expecting: %f, received: %f", - eAcntVal, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + eAcntVal, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } if err := sessionsRPC.Call(utils.SessionSv1ProcessCDR, &utils.CGREventWithOpts{CGREvent: termArgs.CGREvent}, &reply); err != nil { @@ -1371,12 +1371,12 @@ func TestSMGDataDerivedChargingNoCredit(t *testing.T) { eAcntVal := 50000.0 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } smgEv := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, + utils.EventName: "TEST_EVENT", + utils.ToR: utils.MetaVoice, utils.OriginID: "1234967", utils.AccountField: "1011", utils.Subject: "1011", @@ -1400,8 +1400,8 @@ func TestSMGDataDerivedChargingNoCredit(t *testing.T) { eAcntVal = 50000.0 if err := sessionsRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { - t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.VOICE].GetTotalValue()) + } else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal { + t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MetaVoice].GetTotalValue()) } } */ diff --git a/utils/apitpdata.go b/utils/apitpdata.go index 56fbeea49..1e18abd93 100755 --- a/utils/apitpdata.go +++ b/utils/apitpdata.go @@ -30,7 +30,7 @@ import ( type TPDistinctIds []string func (tpdi TPDistinctIds) String() string { - return strings.Join(tpdi, FIELDS_SEP) + return strings.Join(tpdi, FieldsSep) } type PaginatorWithSearch struct { @@ -250,17 +250,17 @@ type TPRatingProfile struct { // Used as key in nosql db (eg: redis) func (rpf *TPRatingProfile) KeyId() string { - return ConcatenatedKey(META_OUT, + return ConcatenatedKey(MetaOut, rpf.Tenant, rpf.Category, rpf.Subject) } func (rpf *TPRatingProfile) GetId() string { - return ConcatenatedKey(rpf.LoadId, META_OUT, + return ConcatenatedKey(rpf.LoadId, MetaOut, rpf.Tenant, rpf.Category, rpf.Subject) } func (rpf *TPRatingProfile) SetRatingProfileID(id string) error { - ids := strings.Split(id, CONCATENATED_KEY_SEP) + ids := strings.Split(id, ConcatenatedKeySep) if len(ids) != 4 { return fmt.Errorf("Wrong TPRatingProfileId: %s", id) } @@ -286,7 +286,7 @@ type AttrGetRatingProfile struct { } func (self *AttrGetRatingProfile) GetID() string { - return ConcatenatedKey(META_OUT, self.Tenant, self.Category, self.Subject) + return ConcatenatedKey(MetaOut, self.Tenant, self.Category, self.Subject) } type TPRatingActivation struct { @@ -300,7 +300,7 @@ func FallbackSubjKeys(tenant, tor, fallbackSubjects string) []string { var sslice sort.StringSlice if len(fallbackSubjects) != 0 { for _, fbs := range strings.Split(fallbackSubjects, string(FallbackSep)) { - newKey := ConcatenatedKey(META_OUT, tenant, tor, fbs) + newKey := ConcatenatedKey(MetaOut, tenant, tor, fbs) i := sslice.Search(newKey) if i < len(sslice) && sslice[i] != newKey { // not found so insert it @@ -426,11 +426,11 @@ func (aa *TPAccountActions) KeyId() string { } func (aa *TPAccountActions) GetId() string { - return aa.LoadId + CONCATENATED_KEY_SEP + aa.Tenant + CONCATENATED_KEY_SEP + aa.Account + return aa.LoadId + ConcatenatedKeySep + aa.Tenant + ConcatenatedKeySep + aa.Account } func (aa *TPAccountActions) SetAccountActionsId(id string) error { - ids := strings.Split(id, CONCATENATED_KEY_SEP) + ids := strings.Split(id, ConcatenatedKeySep) if len(ids) != 3 { return fmt.Errorf("Wrong TP Account Action Id: %s", id) } @@ -543,7 +543,7 @@ type AttrImportTPFromFolder struct { } func NewTAFromAccountKey(accountKey string) (*TenantAccount, error) { - accountSplt := strings.Split(accountKey, CONCATENATED_KEY_SEP) + accountSplt := strings.Split(accountKey, ConcatenatedKeySep) if len(accountSplt) != 2 { return nil, fmt.Errorf("Unsupported format for TenantAccount: %s", accountKey) } diff --git a/utils/apitpdata_test.go b/utils/apitpdata_test.go index 7be9546f3..63b16b80d 100644 --- a/utils/apitpdata_test.go +++ b/utils/apitpdata_test.go @@ -27,7 +27,7 @@ import ( func TestTPDistinctIdsString(t *testing.T) { eIn1 := []string{"1", "2", "3", "4"} eIn2 := TPDistinctIds(eIn1) - expected := strings.Join(eIn1, FIELDS_SEP) + expected := strings.Join(eIn1, FieldsSep) received := eIn2.String() if !reflect.DeepEqual(expected, received) { @@ -315,7 +315,7 @@ func TestFallbackSubjKeys(t *testing.T) { } //check with test vars eOut := []string{"*out:cgrates.org:*voice:1001", "*out:cgrates.org:*voice:1002", "*out:cgrates.org:*voice:1003"} - rcv = FallbackSubjKeys("cgrates.org", VOICE, "1001;1003;1002") + rcv = FallbackSubjKeys("cgrates.org", MetaVoice, "1001;1003;1002") if !reflect.DeepEqual(eOut, rcv) { t.Errorf("Expected %+v, received %+v", eOut, rcv) } @@ -375,7 +375,7 @@ func TestAttrGetCdrsAsCDRsFilter(t *testing.T) { TimeEnd: "2019-04-04T11:46:26.371Z", SkipRated: true, CgrIds: []string{"CGRID"}, - TORs: []string{VOICE}, + TORs: []string{MetaVoice}, Accounts: []string{"1001"}, Subjects: []string{"1001"}, } diff --git a/utils/consts.go b/utils/consts.go index f47f953a4..1227fe208 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -24,7 +24,7 @@ import ( var ( MainCDRFields = NewStringSet([]string{CGRID, Source, OriginHost, OriginID, ToR, RequestType, Tenant, Category, - AccountField, Subject, Destination, SetupTime, AnswerTime, Usage, COST, RATED, Partial, RunID, + AccountField, Subject, Destination, SetupTime, AnswerTime, Usage, Cost, Rated, Partial, RunID, PreRated, CostSource, CostDetails, ExtraInfo, OrderID}) PostPaidRatedSlice = []string{MetaPostpaid, MetaRated} @@ -67,14 +67,14 @@ var ( CacheTBLTPDispatcherHosts, CacheTBLTPRateProfiles, CacheTBLTPActionProfiles, CacheTBLTPAccountProfiles}) CacheInstanceToPrefix = map[string]string{ CacheDestinations: DestinationPrefix, - CacheReverseDestinations: REVERSE_DESTINATION_PREFIX, - CacheRatingPlans: RATING_PLAN_PREFIX, - CacheRatingProfiles: RATING_PROFILE_PREFIX, - CacheActions: ACTION_PREFIX, - CacheActionPlans: ACTION_PLAN_PREFIX, + CacheReverseDestinations: ReverseDestinationPrefix, + CacheRatingPlans: RatingPlanPrefix, + CacheRatingProfiles: RatingProfilePrefix, + CacheActions: ActionPrefix, + CacheActionPlans: ActionPlanPrefix, CacheAccountActionPlans: AccountActionPlansPrefix, - CacheActionTriggers: ACTION_TRIGGER_PREFIX, - CacheSharedGroups: SHARED_GROUP_PREFIX, + CacheActionTriggers: ActionTriggerPrefix, + CacheSharedGroups: SharedGroupPrefix, CacheResourceProfiles: ResourceProfilesPrefix, CacheResources: ResourcesPrefix, CacheTimings: TimingsPrefix, @@ -103,7 +103,7 @@ var ( CacheAccountProfilesFilterIndexes: AccountProfileFilterIndexPrfx, CacheLoadIDs: LoadIDPrefix, - CacheAccounts: ACCOUNT_PREFIX, + CacheAccounts: AccountPrefix, CacheRateFilterIndexes: RateFilterIndexPrfx, CacheReverseFilterIndexes: FilterIndexPrfx, MetaAPIBan: MetaAPIBan, // special case as it is not in a DB @@ -138,7 +138,7 @@ var ( } // NonMonetaryBalances are types of balances which are not handled as monetary - NonMonetaryBalances = NewStringSet([]string{VOICE, SMS, DATA, GENERIC}) + NonMonetaryBalances = NewStringSet([]string{MetaVoice, MetaSMS, MetaData, MetaGeneric}) // AccountableRequestTypes are the ones handled by Accounting subsystem AccountableRequestTypes = NewStringSet([]string{MetaPrepaid, MetaPostpaid, MetaPseudoPrepaid}) @@ -174,14 +174,14 @@ var ( ProtectedSFlds = NewStringSet([]string{CGRID, OriginHost, OriginID, Usage}) ArgCacheToPrefix = map[string]string{ DestinationIDs: DestinationPrefix, - ReverseDestinationIDs: REVERSE_DESTINATION_PREFIX, - RatingPlanIDs: RATING_PLAN_PREFIX, - RatingProfileIDs: RATING_PROFILE_PREFIX, - ActionIDs: ACTION_PREFIX, - ActionPlanIDs: ACTION_PLAN_PREFIX, + ReverseDestinationIDs: ReverseDestinationPrefix, + RatingPlanIDs: RatingPlanPrefix, + RatingProfileIDs: RatingProfilePrefix, + ActionIDs: ActionPrefix, + ActionPlanIDs: ActionPlanPrefix, AccountActionPlanIDs: AccountActionPlansPrefix, - ActionTriggerIDs: ACTION_TRIGGER_PREFIX, - SharedGroupIDs: SHARED_GROUP_PREFIX, + ActionTriggerIDs: ActionTriggerPrefix, + SharedGroupIDs: SharedGroupPrefix, ResourceProfileIDs: ResourceProfilesPrefix, ResourceIDs: ResourcesPrefix, StatsQueueIDs: StatQueuePrefix, @@ -256,323 +256,322 @@ var ( ) const ( - CGRateS = "CGRateS" - Version = "v0.11.0~dev" - DiameterFirmwareRevision = 918 - RedisMaxConns = 10 - CGRateSLwr = "cgrates" - Postgres = "postgres" - MySQL = "mysql" - Mongo = "mongo" - Redis = "redis" - INTERNAL = "internal" - DataManager = "DataManager" - Localhost = "127.0.0.1" - Prepaid = "prepaid" - MetaPrepaid = "*prepaid" - Postpaid = "postpaid" - MetaPostpaid = "*postpaid" - PseudoPrepaid = "pseudoprepaid" - MetaPseudoPrepaid = "*pseudoprepaid" - MetaRated = "*rated" - MetaNone = "*none" - MetaNow = "*now" - MetaRoundingUp = "*up" - MetaRoundingMiddle = "*middle" - MetaRoundingDown = "*down" - MetaAny = "*any" - MetaAll = "*all" - MetaSingle = "*single" - MetaZero = "*zero" - MetaASAP = "*asap" - CommentChar = '#' - CSVSep = ',' - FallbackSep = ';' - InfieldSep = ";" - MetaPipe = "*|" - FIELDS_SEP = "," - InInFieldSep = ":" - STATIC_HDRVAL_SEP = "::" - FilterValStart = "(" - FilterValEnd = ")" - JSON = "json" - MSGPACK = "msgpack" - CSV_LOAD = "CSVLOAD" - CGRID = "CGRID" - ToR = "ToR" - OrderID = "OrderID" - OriginID = "OriginID" - InitialOriginID = "InitialOriginID" - OriginIDPrefix = "OriginIDPrefix" - Source = "Source" - OriginHost = "OriginHost" - RequestType = "RequestType" - Direction = "Direction" - Tenant = "Tenant" - Category = "Category" - Contexts = "Contexts" - AccountField = "Account" - BalancesFld = "Balances" - Subject = "Subject" - Destination = "Destination" - SetupTime = "SetupTime" - AnswerTime = "AnswerTime" - Usage = "Usage" - DurationIndex = "DurationIndex" - MaxRateUnit = "MaxRateUnit" - DebitInterval = "DebitInterval" - TimeStart = "TimeStart" - TimeEnd = "TimeEnd" - CallDuration = "CallDuration" - FallbackSubject = "FallbackSubject" - DryRun = "DryRun" - ExtraFields = "ExtraFields" - CustomValue = "CustomValue" - Value = "Value" - LastUsed = "LastUsed" - PDD = "PDD" - ROUTE = "Route" - RunID = "RunID" - AttributeIDs = "AttributeIDs" - MetaReqRunID = "*req.RunID" - COST = "Cost" - CostDetails = "CostDetails" - RATED = "rated" - Partial = "Partial" - PreRated = "PreRated" - StaticValuePrefix = "^" - CSV = "csv" - FWV = "fwv" - MetaPartialCSV = "*partial_csv" - META_COMBIMED = "*combimed" - MetaMongo = "*mongo" - MetaPostgres = "*postgres" - MetaInternal = "*internal" - MetaLocalHost = "*localhost" - ZERO_RATING_SUBJECT_PREFIX = "*zero" - OK = "OK" - MetaFileXML = "*file_xml" - MetaFileJSON = "*file_json" - MASK_CHAR = "*" - CONCATENATED_KEY_SEP = ":" - UNIT_TEST = "UNIT_TEST" - HDR_VAL_SEP = "/" - MONETARY = "*monetary" - SMS = "*sms" - MMS = "*mms" - GENERIC = "*generic" - DATA = "*data" - VOICE = "*voice" - MAX_COST_FREE = "*free" - MAX_COST_DISCONNECT = "*disconnect" - META_OUT = "*out" + CGRateS = "CGRateS" + Version = "v0.11.0~dev" + DiameterFirmwareRevision = 918 + RedisMaxConns = 10 + CGRateSLwr = "cgrates" + Postgres = "postgres" + MySQL = "mysql" + Mongo = "mongo" + Redis = "redis" + INTERNAL = "internal" + DataManager = "DataManager" + Localhost = "127.0.0.1" + Prepaid = "prepaid" + MetaPrepaid = "*prepaid" + Postpaid = "postpaid" + MetaPostpaid = "*postpaid" + PseudoPrepaid = "pseudoprepaid" + MetaPseudoPrepaid = "*pseudoprepaid" + MetaRated = "*rated" + MetaNone = "*none" + MetaNow = "*now" + MetaRoundingUp = "*up" + MetaRoundingMiddle = "*middle" + MetaRoundingDown = "*down" + MetaAny = "*any" + MetaAll = "*all" + MetaSingle = "*single" + MetaZero = "*zero" + MetaASAP = "*asap" + CommentChar = '#' + CSVSep = ',' + FallbackSep = ';' + InfieldSep = ";" + MetaPipe = "*|" + FieldsSep = "," + InInFieldSep = ":" + StaticHDRValSep = "::" + FilterValStart = "(" + FilterValEnd = ")" + JSON = "json" + MsgPack = "msgpack" + CSVLoad = "CSVLOAD" + CGRID = "CGRID" + ToR = "ToR" + OrderID = "OrderID" + OriginID = "OriginID" + InitialOriginID = "InitialOriginID" + OriginIDPrefix = "OriginIDPrefix" + Source = "Source" + OriginHost = "OriginHost" + RequestType = "RequestType" + Direction = "Direction" + Tenant = "Tenant" + Category = "Category" + Contexts = "Contexts" + AccountField = "Account" + BalancesFld = "Balances" + Subject = "Subject" + Destination = "Destination" + SetupTime = "SetupTime" + AnswerTime = "AnswerTime" + Usage = "Usage" + DurationIndex = "DurationIndex" + MaxRateUnit = "MaxRateUnit" + DebitInterval = "DebitInterval" + TimeStart = "TimeStart" + TimeEnd = "TimeEnd" + CallDuration = "CallDuration" + FallbackSubject = "FallbackSubject" + DryRun = "DryRun" - META_VOICE = "*voice" - ACD = "ACD" - TASKS_KEY = "tasks" - ACTION_PLAN_PREFIX = "apl_" - AccountActionPlansPrefix = "aap_" - ACTION_TRIGGER_PREFIX = "atr_" - RATING_PLAN_PREFIX = "rpl_" - RATING_PROFILE_PREFIX = "rpf_" - ACTION_PREFIX = "act_" - SHARED_GROUP_PREFIX = "shg_" - ACCOUNT_PREFIX = "acc_" - DestinationPrefix = "dst_" - REVERSE_DESTINATION_PREFIX = "rds_" - DERIVEDCHARGERS_PREFIX = "dcs_" - USERS_PREFIX = "usr_" - ResourcesPrefix = "res_" - ResourceProfilesPrefix = "rsp_" - ThresholdPrefix = "thd_" - TimingsPrefix = "tmg_" - FilterPrefix = "ftr_" - CDR_STATS_PREFIX = "cst_" - VERSION_PREFIX = "ver_" - StatQueueProfilePrefix = "sqp_" - RouteProfilePrefix = "rpp_" - RatePrefix = "rep_" - AttributeProfilePrefix = "alp_" - ChargerProfilePrefix = "cpp_" - DispatcherProfilePrefix = "dpp_" - RateProfilePrefix = "rtp_" - ActionProfilePrefix = "acp_" - AccountProfilePrefix = "anp_" - DispatcherHostPrefix = "dph_" - ThresholdProfilePrefix = "thp_" - StatQueuePrefix = "stq_" - LoadIDPrefix = "lid_" - LOADINST_KEY = "load_history" - CREATE_CDRS_TABLES_SQL = "create_cdrs_tables.sql" - CREATE_TARIFFPLAN_TABLES_SQL = "create_tariffplan_tables.sql" - TEST_SQL = "TEST_SQL" - META_CONSTANT = "*constant" - META_FILLER = "*filler" - MetaHTTPPost = "*http_post" - MetaHTTPjson = "*http_json" - MetaHTTPjsonCDR = "*http_json_cdr" - MetaHTTPjsonMap = "*http_json_map" - MetaAMQPjsonCDR = "*amqp_json_cdr" - MetaAMQPjsonMap = "*amqp_json_map" - MetaAMQPV1jsonMap = "*amqpv1_json_map" - MetaSQSjsonMap = "*sqs_json_map" - MetaKafkajsonMap = "*kafka_json_map" - MetaSQL = "*sql" - MetaMySQL = "*mysql" - MetaS3jsonMap = "*s3_json_map" - CONFIG_PATH = "/etc/cgrates/" - DISCONNECT_CAUSE = "DisconnectCause" - MetaFlatstore = "*flatstore" - MetaRating = "*rating" - NOT_AVAILABLE = "N/A" - CALL = "call" - EXTRA_FIELDS = "ExtraFields" - META_SURETAX = "*sure_tax" - MetaDynamic = "*dynamic" - COUNTER_EVENT = "*event" - COUNTER_BALANCE = "*balance" - EVENT_NAME = "EventName" + CustomValue = "CustomValue" + Value = "Value" + LastUsed = "LastUsed" + PDD = "PDD" + Route = "Route" + RunID = "RunID" + AttributeIDs = "AttributeIDs" + MetaReqRunID = "*req.RunID" + Cost = "Cost" + CostDetails = "CostDetails" + Rated = "rated" + Partial = "Partial" + PreRated = "PreRated" + StaticValuePrefix = "^" + CSV = "csv" + FWV = "fwv" + MetaPartialCSV = "*partial_csv" + MetaCombimed = "*combimed" + MetaMongo = "*mongo" + MetaPostgres = "*postgres" + MetaInternal = "*internal" + MetaLocalHost = "*localhost" + MetaRatingSubjectPrefix = "*zero" + OK = "OK" + MetaFileXML = "*file_xml" + MetaFileJSON = "*file_json" + MaskChar = "*" + ConcatenatedKeySep = ":" + UnitTest = "UNIT_TEST" + HDRValSep = "/" + MetaMonetary = "*monetary" + MetaSMS = "*sms" + MetaMMS = "*mms" + MetaGeneric = "*generic" + MetaData = "*data" + MetaMaxCostFree = "*free" + MetaMaxCostDisconnect = "*disconnect" + MetaOut = "*out" + + MetaVoice = "*voice" + ACD = "ACD" + TasksKey = "tasks" + ActionPlanPrefix = "apl_" + AccountActionPlansPrefix = "aap_" + ActionTriggerPrefix = "atr_" + RatingPlanPrefix = "rpl_" + RatingProfilePrefix = "rpf_" + ActionPrefix = "act_" + SharedGroupPrefix = "shg_" + AccountPrefix = "acc_" + DestinationPrefix = "dst_" + ReverseDestinationPrefix = "rds_" + DerivedChargersPrefix = "dcs_" + UsersPrefix = "usr_" + ResourcesPrefix = "res_" + ResourceProfilesPrefix = "rsp_" + ThresholdPrefix = "thd_" + TimingsPrefix = "tmg_" + FilterPrefix = "ftr_" + CDRsStatsPrefix = "cst_" + VersionPrefix = "ver_" + StatQueueProfilePrefix = "sqp_" + RouteProfilePrefix = "rpp_" + RatePrefix = "rep_" + AttributeProfilePrefix = "alp_" + ChargerProfilePrefix = "cpp_" + DispatcherProfilePrefix = "dpp_" + RateProfilePrefix = "rtp_" + ActionProfilePrefix = "acp_" + AccountProfilePrefix = "anp_" + DispatcherHostPrefix = "dph_" + ThresholdProfilePrefix = "thp_" + StatQueuePrefix = "stq_" + LoadIDPrefix = "lid_" + LoadInstKey = "load_history" + CreateCDRsTablesSQL = "create_cdrs_tables.sql" + CreateTariffPlanTablesSQL = "create_tariffplan_tables.sql" + TestSQL = "TEST_SQL" + MetaConstant = "*constant" + MetaFiller = "*filler" + MetaHTTPPost = "*http_post" + MetaHTTPjson = "*http_json" + MetaHTTPjsonCDR = "*http_json_cdr" + MetaHTTPjsonMap = "*http_json_map" + MetaAMQPjsonCDR = "*amqp_json_cdr" + MetaAMQPjsonMap = "*amqp_json_map" + MetaAMQPV1jsonMap = "*amqpv1_json_map" + MetaSQSjsonMap = "*sqs_json_map" + MetaKafkajsonMap = "*kafka_json_map" + MetaSQL = "*sql" + MetaMySQL = "*mysql" + MetaS3jsonMap = "*s3_json_map" + ConfigPath = "/etc/cgrates/" + DisconnectCause = "DisconnectCause" + MetaFlatstore = "*flatstore" + MetaRating = "*rating" + NotAvailable = "N/A" + Call = "call" + ExtraFields = "ExtraFields" + MetaSureTax = "*sure_tax" + MetaDynamic = "*dynamic" + MetaCounterEvent = "*event" + MetaCounterBalance = "*balance" + EventName = "EventName" // action trigger threshold types - TRIGGER_MIN_EVENT_COUNTER = "*min_event_counter" - TRIGGER_MAX_EVENT_COUNTER = "*max_event_counter" - TRIGGER_MAX_BALANCE_COUNTER = "*max_balance_counter" - TRIGGER_MIN_BALANCE = "*min_balance" - TRIGGER_MAX_BALANCE = "*max_balance" - TRIGGER_BALANCE_EXPIRED = "*balance_expired" - HIERARCHY_SEP = ">" - META_COMPOSED = "*composed" - META_USAGE_DIFFERENCE = "*usage_difference" - MetaDifference = "*difference" - MetaVariable = "*variable" - MetaCCUsage = "*cc_usage" - MetaValueExponent = "*value_exponent" - NegativePrefix = "!" - MatchStartPrefix = "^" - MatchGreaterThanOrEqual = ">=" - MatchLessThanOrEqual = "<=" - MatchGreaterThan = ">" - MatchLessThan = "<" - MatchEndPrefix = "$" - MetaRaw = "*raw" - CreatedAt = "CreatedAt" - UpdatedAt = "UpdatedAt" - HandlerArgSep = "|" - NodeID = "NodeID" - ActiveGoroutines = "ActiveGoroutines" - MemoryUsage = "MemoryUsage" - RunningSince = "RunningSince" - GoVersion = "GoVersion" - HandlerSubstractUsage = "*substract_usage" - XML = "xml" - MetaGOB = "*gob" - MetaJSON = "*json" - MetaMSGPACK = "*msgpack" - MetaDateTime = "*datetime" - MetaMaskedDestination = "*masked_destination" - MetaUnixTimestamp = "*unix_timestamp" - MetaPostCDR = "*post_cdr" - MetaDumpToFile = "*dump_to_file" - NonTransactional = "" - DataDB = "data_db" - StorDB = "stor_db" - NotFoundCaps = "NOT_FOUND" - ServerErrorCaps = "SERVER_ERROR" - MandatoryIEMissingCaps = "MANDATORY_IE_MISSING" - UnsupportedCachePrefix = "unsupported cache prefix" - CDRSCtx = "cdrs" - MandatoryInfoMissing = "mandatory information missing" - UnsupportedServiceIDCaps = "UNSUPPORTED_SERVICE_ID" - ServiceManager = "service_manager" - ServiceAlreadyRunning = "service already running" - RunningCaps = "RUNNING" - StoppedCaps = "STOPPED" - SchedulerNotRunningCaps = "SCHEDULLER_NOT_RUNNING" - MetaScheduler = "*scheduler" - MetaSessionsCosts = "*sessions_costs" - MetaRALs = "*rals" - MetaReplicator = "*replicator" - MetaRerate = "*rerate" - MetaRefund = "*refund" - MetaStats = "*stats" - MetaResponder = "*responder" - MetaCore = "*core" - MetaServiceManager = "*servicemanager" - MetaChargers = "*chargers" - MetaBlockerError = "*blocker_error" - MetaConfig = "*config" - MetaDispatchers = "*dispatchers" - MetaDispatcherh = "*dispatcherh" - MetaDispatcherHosts = "*dispatcher_hosts" - MetaFilters = "*filters" - MetaCDRs = "*cdrs" - MetaDC = "*dc" - MetaCaches = "*caches" - MetaUCH = "*uch" - MetaGuardian = "*guardians" - MetaEEs = "*ees" - MetaRateS = "*rates" - MetaContinue = "*continue" - MetaUp = "*up" - Migrator = "migrator" - UnsupportedMigrationTask = "unsupported migration task" - NoStorDBConnection = "not connected to StorDB" - UndefinedVersion = "undefined version" - TxtSuffix = ".txt" - JSNSuffix = ".json" - GOBSuffix = ".gob" - XMLSuffix = ".xml" - CSVSuffix = ".csv" - FWVSuffix = ".fwv" - ContentJSON = "json" - ContentForm = "form" - ContentText = "text" - FileLockPrefix = "file_" - ActionsPoster = "act" - CDRPoster = "cdr" - MetaFileCSV = "*file_csv" - MetaVirt = "*virt" - MetaElastic = "*elastic" - MetaFileFWV = "*file_fwv" - MetaFile = "*file" - Accounts = "Accounts" - AccountService = "AccountS" - AccountS = "AccountS" - Actions = "Actions" - ActionPlans = "ActionPlans" - ActionTriggers = "ActionTriggers" - BalanceMap = "BalanceMap" - UnitCounters = "UnitCounters" - UpdateTime = "UpdateTime" - SharedGroups = "SharedGroups" - Timings = "Timings" - Rates = "Rates" - DestinationRates = "DestinationRates" - RatingPlans = "RatingPlans" - RatingProfiles = "RatingProfiles" - AccountActions = "AccountActions" - Resources = "Resources" - Stats = "Stats" - Filters = "Filters" - DispatcherProfiles = "DispatcherProfiles" - DispatcherHosts = "DispatcherHosts" - RateProfiles = "RateProfiles" - ActionProfiles = "ActionProfiles" - AccountProfilesString = "AccountProfiles" - MetaEveryMinute = "*every_minute" - MetaHourly = "*hourly" - ID = "ID" - Address = "Address" - Addresses = "Addresses" - Transport = "Transport" - TLS = "TLS" - Subsystems = "Subsystems" - Strategy = "Strategy" - StrategyParameters = "StrategyParameters" - ConnID = "ConnID" - ConnFilterIDs = "ConnFilterIDs" - ConnWeight = "ConnWeight" - ConnBlocker = "ConnBlocker" - ConnParameters = "ConnParameters" + TriggerMinEventCounter = "*min_event_counter" + TriggerMaxEventCounter = "*max_event_counter" + TriggerMaxBalanceCounter = "*max_balance_counter" + TriggerMinBalance = "*min_balance" + TriggerMaxBalance = "*max_balance" + TriggerBalanceExpired = "*balance_expired" + HierarchySep = ">" + MetaComposed = "*composed" + MetaUsageDifference = "*usage_difference" + MetaDifference = "*difference" + MetaVariable = "*variable" + MetaCCUsage = "*cc_usage" + MetaValueExponent = "*value_exponent" + NegativePrefix = "!" + MatchStartPrefix = "^" + MatchGreaterThanOrEqual = ">=" + MatchLessThanOrEqual = "<=" + MatchGreaterThan = ">" + MatchLessThan = "<" + MatchEndPrefix = "$" + MetaRaw = "*raw" + CreatedAt = "CreatedAt" + UpdatedAt = "UpdatedAt" + HandlerArgSep = "|" + NodeID = "NodeID" + ActiveGoroutines = "ActiveGoroutines" + MemoryUsage = "MemoryUsage" + RunningSince = "RunningSince" + GoVersion = "GoVersion" + HandlerSubstractUsage = "*substract_usage" + XML = "xml" + MetaGOB = "*gob" + MetaJSON = "*json" + MetaMSGPACK = "*msgpack" + MetaDateTime = "*datetime" + MetaMaskedDestination = "*masked_destination" + MetaUnixTimestamp = "*unix_timestamp" + MetaPostCDR = "*post_cdr" + MetaDumpToFile = "*dump_to_file" + NonTransactional = "" + DataDB = "data_db" + StorDB = "stor_db" + NotFoundCaps = "NOT_FOUND" + ServerErrorCaps = "SERVER_ERROR" + MandatoryIEMissingCaps = "MANDATORY_IE_MISSING" + UnsupportedCachePrefix = "unsupported cache prefix" + CDRsCtx = "cdrs" + MandatoryInfoMissing = "mandatory information missing" + UnsupportedServiceIDCaps = "UNSUPPORTED_SERVICE_ID" + ServiceManager = "service_manager" + ServiceAlreadyRunning = "service already running" + RunningCaps = "RUNNING" + StoppedCaps = "STOPPED" + SchedulerNotRunningCaps = "SCHEDULLER_NOT_RUNNING" + MetaScheduler = "*scheduler" + MetaSessionsCosts = "*sessions_costs" + MetaRALs = "*rals" + MetaReplicator = "*replicator" + MetaRerate = "*rerate" + MetaRefund = "*refund" + MetaStats = "*stats" + MetaResponder = "*responder" + MetaCore = "*core" + MetaServiceManager = "*servicemanager" + MetaChargers = "*chargers" + MetaBlockerError = "*blocker_error" + MetaConfig = "*config" + MetaDispatchers = "*dispatchers" + MetaDispatcherh = "*dispatcherh" + MetaDispatcherHosts = "*dispatcher_hosts" + MetaFilters = "*filters" + MetaCDRs = "*cdrs" + MetaDC = "*dc" + MetaCaches = "*caches" + MetaUCH = "*uch" + MetaGuardian = "*guardians" + MetaEEs = "*ees" + MetaRateS = "*rates" + MetaContinue = "*continue" + MetaUp = "*up" + Migrator = "migrator" + UnsupportedMigrationTask = "unsupported migration task" + NoStorDBConnection = "not connected to StorDB" + UndefinedVersion = "undefined version" + TxtSuffix = ".txt" + JSNSuffix = ".json" + GOBSuffix = ".gob" + XMLSuffix = ".xml" + CSVSuffix = ".csv" + FWVSuffix = ".fwv" + ContentJSON = "json" + ContentForm = "form" + ContentText = "text" + FileLockPrefix = "file_" + ActionsPoster = "act" + CDRPoster = "cdr" + MetaFileCSV = "*file_csv" + MetaVirt = "*virt" + MetaElastic = "*elastic" + MetaFileFWV = "*file_fwv" + MetaFile = "*file" + Accounts = "Accounts" + AccountService = "AccountS" + AccountS = "AccountS" + Actions = "Actions" + ActionPlans = "ActionPlans" + ActionTriggers = "ActionTriggers" + BalanceMap = "BalanceMap" + UnitCounters = "UnitCounters" + UpdateTime = "UpdateTime" + SharedGroups = "SharedGroups" + Timings = "Timings" + Rates = "Rates" + DestinationRates = "DestinationRates" + RatingPlans = "RatingPlans" + RatingProfiles = "RatingProfiles" + AccountActions = "AccountActions" + Resources = "Resources" + Stats = "Stats" + Filters = "Filters" + DispatcherProfiles = "DispatcherProfiles" + DispatcherHosts = "DispatcherHosts" + RateProfiles = "RateProfiles" + ActionProfiles = "ActionProfiles" + AccountProfilesString = "AccountProfiles" + MetaEveryMinute = "*every_minute" + MetaHourly = "*hourly" + ID = "ID" + Address = "Address" + Addresses = "Addresses" + Transport = "Transport" + TLS = "TLS" + Subsystems = "Subsystems" + Strategy = "Strategy" + StrategyParameters = "StrategyParameters" + ConnID = "ConnID" + ConnFilterIDs = "ConnFilterIDs" + ConnWeight = "ConnWeight" + ConnBlocker = "ConnBlocker" + ConnParameters = "ConnParameters" Thresholds = "Thresholds" Routes = "Routes" @@ -642,7 +641,6 @@ const ( MetaReas = "*reas" MetaReds = "*reds" Weight = "Weight" - Cost = "Cost" Limit = "Limit" UsageTTL = "UsageTTL" AllocationMessage = "AllocationMessage" @@ -698,7 +696,7 @@ const ( MetaCgreq = "*cgreq" MetaCgrep = "*cgrep" MetaCGRAReq = "*cgrareq" - CGR_ACD = "cgr_acd" + CgrAcd = "cgr_acd" ActivationIntervalString = "ActivationInterval" MaxHits = "MaxHits" MinHits = "MinHits" @@ -785,166 +783,166 @@ const ( ProductName = "ProductName" IdxStart = "[" IdxEnd = "]" - MetaLog = "*log" - MetaRemoteHost = "*remote_host" - RemoteHost = "RemoteHost" - Local = "local" - TCP = "tcp" - UDP = "udp" - CGRDebitInterval = "CGRDebitInterval" - VersionName = "Version" - MetaTenant = "*tenant" - ResourceUsage = "ResourceUsage" - MetaDuration = "*duration" - MetaLibPhoneNumber = "*libphonenumber" - MetaTimeString = "*time_string" - MetaIP2Hex = "*ip2hex" - MetaString2Hex = "*string2hex" - MetaUnixTime = "*unixtime" - MetaSIPURIMethod = "*sipuri_method" - MetaSIPURIHost = "*sipuri_host" - MetaSIPURIUser = "*sipuri_user" - MetaReload = "*reload" - MetaLoad = "*load" - MetaRemove = "*remove" - MetaRemoveAll = "*removeall" - MetaStore = "*store" - MetaClear = "*clear" - MetaExport = "*export" - MetaExportID = "*export_id" - MetaTimeNow = "*time_now" - MetaFirstEventATime = "*first_event_atime" - MetaLastEventATime = "*last_event_atime" - MetaEventNumber = "*event_number" - LoadIDs = "load_ids" - DNSAgent = "DNSAgent" - TLSNoCaps = "tls" - UsageID = "UsageID" - Rcode = "Rcode" - Replacement = "Replacement" - Regexp = "Regexp" - Order = "Order" - Preference = "Preference" - Flags = "Flags" - Service = "Service" - ApierV = "ApierV" - MetaApier = "*apier" - MetaAnalyzer = "*analyzer" - CGREventString = "CGREvent" - MetaTextPlain = "*text_plain" - MetaIgnoreErrors = "*ignore_errors" - MetaRelease = "*release" - MetaAllocate = "*allocate" - MetaAuthorize = "*authorize" - MetaSTIRAuthenticate = "*stir_authenticate" - MetaSTIRInitiate = "*stir_initiate" - MetaInit = "*init" - MetaRatingPlanCost = "*rating_plan_cost" - ERs = "ERs" - EEs = "EEs" - Ratio = "Ratio" - Load = "Load" - Slash = "/" - UUID = "UUID" - ActionsID = "ActionsID" - MetaAct = "*act" - MetaAcnt = "*acnt" - DestinationPrefixName = "DestinationPrefix" - DestinationID = "DestinationID" - ExportTemplate = "ExportTemplate" - ExportFormat = "ExportFormat" - Synchronous = "Synchronous" - Attempts = "Attempts" - FieldSeparator = "FieldSeparator" - ExportPath = "ExportPath" - ExporterIDs = "ExporterIDs" - TimeNow = "TimeNow" - ExportFileName = "ExportFileName" - GroupID = "GroupID" - ThresholdType = "ThresholdType" - ThresholdValue = "ThresholdValue" - Recurrent = "Recurrent" - Executed = "Executed" - MinSleep = "MinSleep" - ActivationDate = "ActivationDate" - ExpirationDate = "ExpirationDate" - MinQueuedItems = "MinQueuedItems" - OrderIDStart = "OrderIDStart" - OrderIDEnd = "OrderIDEnd" - MinCost = "MinCost" - MaxCost = "MaxCost" - MetaLoaders = "*loaders" - TmpSuffix = ".tmp" - MetaDiamreq = "*diamreq" - MetaCost = "*cost" - MetaGroup = "*group" - InternalRPCSet = "InternalRPCSet" - FileName = "FileName" - MetaRadauth = "*radauth" - UserPassword = "UserPassword" - RadauthFailed = "RADAUTH_FAILED" - MetaPAP = "*pap" - MetaCHAP = "*chap" - MetaMSCHAPV2 = "*mschapv2" - MetaDynaprepaid = "*dynaprepaid" - MetaFD = "*fd" - SortingData = "SortingData" - Count = "Count" - ProfileID = "ProfileID" - SortedRoutes = "SortedRoutes" - EventExporterS = "EventExporterS" - MetaMonthly = "*monthly" - MetaYearly = "*yearly" - MetaDaily = "*daily" - MetaWeekly = "*weekly" - RateS = "RateS" - Underline = "_" - MetaPartial = "*partial" - MetaBusy = "*busy" - MetaQueue = "*queue" - MetaMonthEnd = "*month_end" - APIKey = "ApiKey" - RouteID = "RouteID" - MetaMonthlyEstimated = "*monthly_estimated" - ProcessRuns = "ProcessRuns" - HashtagSep = "#" - MetaRounding = "*rounding" - StatsNA = -1.0 - RateProfileMatched = "RateProfileMatched" - InvalidDuration = time.Duration(-1) - ActionS = "ActionS" - Schedule = "Schedule" - ActionFilterIDs = "ActionFilterIDs" - ActionBlocker = "ActionBlocker" - ActionTTL = "ActionTTL" - ActionOpts = "ActionOpts" - ActionPath = "ActionPath" - TPid = "TPid" - LoadId = "LoadId" - ActionPlanId = "ActionPlanId" - AccountActionsId = "AccountActionsId" - Loadid = "loadid" - AccountLowerCase = "account" - ActionPlan = "ActionPlan" - ActionsId = "ActionsId" - TimingId = "TimingId" - Prefixes = "Prefixes" - RateSlots = "RateSlots" - RatingPlanBindings = "RatingPlanBindings" - RatingPlanActivations = "RatingPlanActivations" - CategoryLowerCase = "category" - SubjectLowerCase = "subject" - RatingProfileID = "RatingProfileID" - Time = "Time" - TargetIDs = "TargetIDs" - TargetType = "TargetType" - MetaRow = "*row" - BalanceFilterIDs = "BalanceFilterIDs" - BalanceOpts = "BalanceOpts" - MetaConcrete = "*concrete" - MetaAbstract = "*abstract" - MetaBalanceLimit = "*balanceLimit" - MetaBalanceUnlimited = "*balanceUnlimited" + + MetaRemoteHost = "*remote_host" + RemoteHost = "RemoteHost" + Local = "local" + TCP = "tcp" + UDP = "udp" + CGRDebitInterval = "CGRDebitInterval" + VersionName = "Version" + MetaTenant = "*tenant" + ResourceUsage = "ResourceUsage" + MetaDuration = "*duration" + MetaLibPhoneNumber = "*libphonenumber" + MetaTimeString = "*time_string" + MetaIP2Hex = "*ip2hex" + MetaString2Hex = "*string2hex" + MetaUnixTime = "*unixtime" + MetaSIPURIMethod = "*sipuri_method" + MetaSIPURIHost = "*sipuri_host" + MetaSIPURIUser = "*sipuri_user" + MetaReload = "*reload" + MetaLoad = "*load" + MetaRemove = "*remove" + MetaRemoveAll = "*removeall" + MetaStore = "*store" + MetaClear = "*clear" + MetaExport = "*export" + MetaExportID = "*export_id" + MetaTimeNow = "*time_now" + MetaFirstEventATime = "*first_event_atime" + MetaLastEventATime = "*last_event_atime" + MetaEventNumber = "*event_number" + LoadIDs = "load_ids" + DNSAgent = "DNSAgent" + TLSNoCaps = "tls" + UsageID = "UsageID" + Rcode = "Rcode" + Replacement = "Replacement" + Regexp = "Regexp" + Order = "Order" + Preference = "Preference" + Flags = "Flags" + Service = "Service" + ApierV = "ApierV" + MetaApier = "*apier" + MetaAnalyzer = "*analyzer" + CGREventString = "CGREvent" + MetaTextPlain = "*text_plain" + MetaIgnoreErrors = "*ignore_errors" + MetaRelease = "*release" + MetaAllocate = "*allocate" + MetaAuthorize = "*authorize" + MetaSTIRAuthenticate = "*stir_authenticate" + MetaSTIRInitiate = "*stir_initiate" + MetaInit = "*init" + MetaRatingPlanCost = "*rating_plan_cost" + ERs = "ERs" + EEs = "EEs" + Ratio = "Ratio" + Load = "Load" + Slash = "/" + UUID = "UUID" + ActionsID = "ActionsID" + MetaAct = "*act" + MetaAcnt = "*acnt" + DestinationPrefixName = "DestinationPrefix" + DestinationID = "DestinationID" + ExportTemplate = "ExportTemplate" + ExportFormat = "ExportFormat" + Synchronous = "Synchronous" + Attempts = "Attempts" + FieldSeparator = "FieldSeparator" + ExportPath = "ExportPath" + ExporterIDs = "ExporterIDs" + TimeNow = "TimeNow" + ExportFileName = "ExportFileName" + GroupID = "GroupID" + ThresholdType = "ThresholdType" + ThresholdValue = "ThresholdValue" + Recurrent = "Recurrent" + Executed = "Executed" + MinSleep = "MinSleep" + ActivationDate = "ActivationDate" + ExpirationDate = "ExpirationDate" + MinQueuedItems = "MinQueuedItems" + OrderIDStart = "OrderIDStart" + OrderIDEnd = "OrderIDEnd" + MinCost = "MinCost" + MaxCost = "MaxCost" + MetaLoaders = "*loaders" + TmpSuffix = ".tmp" + MetaDiamreq = "*diamreq" + MetaCost = "*cost" + MetaGroup = "*group" + InternalRPCSet = "InternalRPCSet" + FileName = "FileName" + MetaRadauth = "*radauth" + UserPassword = "UserPassword" + RadauthFailed = "RADAUTH_FAILED" + MetaPAP = "*pap" + MetaCHAP = "*chap" + MetaMSCHAPV2 = "*mschapv2" + MetaDynaprepaid = "*dynaprepaid" + MetaFD = "*fd" + SortingData = "SortingData" + Count = "Count" + ProfileID = "ProfileID" + SortedRoutes = "SortedRoutes" + EventExporterS = "EventExporterS" + MetaMonthly = "*monthly" + MetaYearly = "*yearly" + MetaDaily = "*daily" + MetaWeekly = "*weekly" + RateS = "RateS" + Underline = "_" + MetaPartial = "*partial" + MetaBusy = "*busy" + MetaQueue = "*queue" + MetaMonthEnd = "*month_end" + APIKey = "ApiKey" + RouteID = "RouteID" + MetaMonthlyEstimated = "*monthly_estimated" + ProcessRuns = "ProcessRuns" + HashtagSep = "#" + MetaRounding = "*rounding" + StatsNA = -1.0 + RateProfileMatched = "RateProfileMatched" + InvalidDuration = time.Duration(-1) + ActionS = "ActionS" + Schedule = "Schedule" + ActionFilterIDs = "ActionFilterIDs" + ActionBlocker = "ActionBlocker" + ActionTTL = "ActionTTL" + ActionOpts = "ActionOpts" + ActionPath = "ActionPath" + TPid = "TPid" + LoadId = "LoadId" + ActionPlanId = "ActionPlanId" + AccountActionsId = "AccountActionsId" + Loadid = "loadid" + AccountLowerCase = "account" + ActionPlan = "ActionPlan" + ActionsId = "ActionsId" + TimingId = "TimingId" + Prefixes = "Prefixes" + RateSlots = "RateSlots" + RatingPlanBindings = "RatingPlanBindings" + RatingPlanActivations = "RatingPlanActivations" + CategoryLowerCase = "category" + SubjectLowerCase = "subject" + RatingProfileID = "RatingProfileID" + Time = "Time" + TargetIDs = "TargetIDs" + TargetType = "TargetType" + MetaRow = "*row" + BalanceFilterIDs = "BalanceFilterIDs" + BalanceOpts = "BalanceOpts" + MetaConcrete = "*concrete" + MetaAbstract = "*abstract" + MetaBalanceLimit = "*balanceLimit" + MetaBalanceUnlimited = "*balanceUnlimited" ) // Migrator Action @@ -1039,7 +1037,7 @@ const ( // Actions const ( - LOG = "*log" + MetaLog = "*log" RESET_TRIGGERS = "*reset_triggers" SET_RECURRENT = "*set_recurrent" UNSET_RECURRENT = "*unset_recurrent" diff --git a/utils/coreutils.go b/utils/coreutils.go index 6729a5703..c3f1a7078 100644 --- a/utils/coreutils.go +++ b/utils/coreutils.go @@ -381,10 +381,10 @@ func ParseZeroRatingSubject(tor, rateSubj string, defaultRateSubj map[string]str rateSubj = defaultRateSubj[MetaAny] } } - if !strings.HasPrefix(rateSubj, ZERO_RATING_SUBJECT_PREFIX) { + if !strings.HasPrefix(rateSubj, MetaRatingSubjectPrefix) { return 0, errors.New("malformed rating subject: " + rateSubj) } - durStr := rateSubj[len(ZERO_RATING_SUBJECT_PREFIX):] + durStr := rateSubj[len(MetaRatingSubjectPrefix):] if _, err := strconv.ParseFloat(durStr, 64); err == nil { // No time unit, postpend durStr += "ns" } @@ -392,11 +392,11 @@ func ParseZeroRatingSubject(tor, rateSubj string, defaultRateSubj map[string]str } func ConcatenatedKey(keyVals ...string) string { - return strings.Join(keyVals, CONCATENATED_KEY_SEP) + return strings.Join(keyVals, ConcatenatedKeySep) } func SplitConcatenatedKey(key string) []string { - return strings.Split(key, CONCATENATED_KEY_SEP) + return strings.Split(key, ConcatenatedKeySep) } func InfieldJoin(vals ...string) string { @@ -668,7 +668,7 @@ func MaskSuffix(dest string, maskLen int) string { } dest = dest[:destLen-maskLen] for i := 0; i < maskLen; i++ { - dest += MASK_CHAR + dest += MaskChar } return dest } @@ -728,10 +728,10 @@ func GetCGRVersion() (vers string, err error) { } func NewTenantID(tntID string) *TenantID { - if strings.Index(tntID, CONCATENATED_KEY_SEP) == -1 { // no :, ID without Tenant + if strings.Index(tntID, ConcatenatedKeySep) == -1 { // no :, ID without Tenant return &TenantID{ID: tntID} } - tIDSplt := strings.Split(tntID, CONCATENATED_KEY_SEP) + tIDSplt := strings.Split(tntID, ConcatenatedKeySep) return &TenantID{Tenant: tIDSplt[0], ID: ConcatenatedKey(tIDSplt[1:]...)} } diff --git a/utils/coreutils_test.go b/utils/coreutils_test.go index 75c51f975..4475a4de7 100644 --- a/utils/coreutils_test.go +++ b/utils/coreutils_test.go @@ -693,28 +693,28 @@ func TestParseZeroRatingSubject(t *testing.T) { dur := []time.Duration{time.Second, 1024, time.Second, 5 * time.Minute, 10 * time.Hour} dfltRatingSubject := map[string]string{ - MetaAny: "*zero1ns", - VOICE: "*zero1s", + MetaAny: "*zero1ns", + MetaVoice: "*zero1s", } for i, s := range subj { - if d, err := ParseZeroRatingSubject(VOICE, s, dfltRatingSubject); err != nil || d != dur[i] { + if d, err := ParseZeroRatingSubject(MetaVoice, s, dfltRatingSubject); err != nil || d != dur[i] { t.Error("Error parsing rating subject: ", s, d, err) } } - if d, err := ParseZeroRatingSubject(DATA, EmptyString, dfltRatingSubject); err != nil || d != time.Nanosecond { + if d, err := ParseZeroRatingSubject(MetaData, EmptyString, dfltRatingSubject); err != nil || d != time.Nanosecond { t.Error("Error parsing rating subject: ", EmptyString, d, err) } - if d, err := ParseZeroRatingSubject(SMS, EmptyString, dfltRatingSubject); err != nil || d != time.Nanosecond { + if d, err := ParseZeroRatingSubject(MetaSMS, EmptyString, dfltRatingSubject); err != nil || d != time.Nanosecond { t.Error("Error parsing rating subject: ", EmptyString, d, err) } - if d, err := ParseZeroRatingSubject(MMS, EmptyString, dfltRatingSubject); err != nil || d != time.Nanosecond { + if d, err := ParseZeroRatingSubject(MetaMMS, EmptyString, dfltRatingSubject); err != nil || d != time.Nanosecond { t.Error("Error parsing rating subject: ", EmptyString, d, err) } - if d, err := ParseZeroRatingSubject(MONETARY, EmptyString, dfltRatingSubject); err != nil || d != time.Nanosecond { + if d, err := ParseZeroRatingSubject(MetaMonetary, EmptyString, dfltRatingSubject); err != nil || d != time.Nanosecond { t.Error("Error parsing rating subject: ", EmptyString, d, err) } expecting := "malformed rating subject: test" - if _, err := ParseZeroRatingSubject(MONETARY, "test", dfltRatingSubject); err == nil || err.Error() != expecting { + if _, err := ParseZeroRatingSubject(MetaMonetary, "test", dfltRatingSubject); err == nil || err.Error() != expecting { t.Errorf("Expecting: %+v, received: %+v ", expecting, err) } } @@ -723,10 +723,10 @@ func TestConcatenatedKey(t *testing.T) { if key := ConcatenatedKey("a"); key != "a" { t.Error("Unexpected key value received: ", key) } - if key := ConcatenatedKey("a", "b"); key != fmt.Sprintf("a%sb", CONCATENATED_KEY_SEP) { + if key := ConcatenatedKey("a", "b"); key != fmt.Sprintf("a%sb", ConcatenatedKeySep) { t.Error("Unexpected key value received: ", key) } - if key := ConcatenatedKey("a", "b", "c"); key != fmt.Sprintf("a%sb%sc", CONCATENATED_KEY_SEP, CONCATENATED_KEY_SEP) { + if key := ConcatenatedKey("a", "b", "c"); key != fmt.Sprintf("a%sb%sc", ConcatenatedKeySep, ConcatenatedKeySep) { t.Error("Unexpected key value received: ", key) } } diff --git a/utils/dateseries_test.go b/utils/dateseries_test.go index c3c3ae9a1..f80be7e08 100644 --- a/utils/dateseries_test.go +++ b/utils/dateseries_test.go @@ -92,7 +92,7 @@ func TestYearsParse(t *testing.T) { if reflect.DeepEqual(ys2, ys1) != false { t.Errorf("Expected: %+v, received: %+v", Years{}, ys1) } - ys1.Parse(in, FIELDS_SEP) + ys1.Parse(in, FieldsSep) if !reflect.DeepEqual(ys2, ys1) { t.Errorf("Expected: %+v, received: %+v", ys2, ys1) } @@ -187,7 +187,7 @@ func TestMonthsParse(t *testing.T) { m1 := Months{} m1.Parse(MetaAny, EmptyString) eOut := Months{time.May, time.June, time.July, time.August} - if m1.Parse("5,6,7,8", FIELDS_SEP); !reflect.DeepEqual(eOut, m1) { + if m1.Parse("5,6,7,8", FieldsSep); !reflect.DeepEqual(eOut, m1) { t.Errorf("Expected: %+v, received: %+v", eOut, m1) } } @@ -385,7 +385,7 @@ func TestWeekDaysParse(t *testing.T) { wd := WeekDays{} wd.Parse(MetaAny, EmptyString) eOut := WeekDays{time.Monday, time.Tuesday, time.Wednesday} - wd.Parse("1,2,3", FIELDS_SEP) + wd.Parse("1,2,3", FieldsSep) if !reflect.DeepEqual(eOut, wd) { t.Errorf("Expected: %+v, received: %+v", eOut, wd) } diff --git a/utils/net.go b/utils/net.go index 304a3594b..3db151dfe 100644 --- a/utils/net.go +++ b/utils/net.go @@ -90,7 +90,7 @@ func GetRemoteIP(r *http.Request) (ip string, err error) { if net.ParseIP(ip) != nil { return } - for _, ip = range strings.Split(r.Header.Get("X-FORWARDED-FOR"), FIELDS_SEP) { + for _, ip = range strings.Split(r.Header.Get("X-FORWARDED-FOR"), FieldsSep) { if net.ParseIP(ip) != nil { return } diff --git a/utils/value_formula.go b/utils/value_formula.go index 4c49a1f75..6a236c765 100644 --- a/utils/value_formula.go +++ b/utils/value_formula.go @@ -33,7 +33,7 @@ type ValueFormula struct { } func ParseBalanceFilterValue(tor string, val string) (*ValueFormula, error) { - if tor == VOICE { // VOICE balance is parsed as nanoseconds with support for time duration strings + if tor == MetaVoice { // Voice balance is parsed as nanoseconds with support for time duration strings if d, err := ParseDurationWithNanosecs(val); err == nil { return &ValueFormula{Static: float64(d.Nanoseconds())}, err } diff --git a/utils/value_formula_test.go b/utils/value_formula_test.go index c2e07b215..871850834 100644 --- a/utils/value_formula_test.go +++ b/utils/value_formula_test.go @@ -62,19 +62,19 @@ func TestValueFormulaDayYear(t *testing.T) { func TestValueFormulaParseBalanceFilterValue(t *testing.T) { eVF := &ValueFormula{Static: 10000000000.0} - if vf, err := ParseBalanceFilterValue(VOICE, "10s"); err != nil { + if vf, err := ParseBalanceFilterValue(MetaVoice, "10s"); err != nil { t.Error(err) } else if !reflect.DeepEqual(eVF, vf) { t.Errorf("Expecting: %+v, received: %+v", eVF, vf) } eVF = &ValueFormula{Static: 1024.0} - if vf, err := ParseBalanceFilterValue(DATA, "1024"); err != nil { + if vf, err := ParseBalanceFilterValue(MetaData, "1024"); err != nil { t.Error(err) } else if !reflect.DeepEqual(eVF, vf) { t.Errorf("Expecting: %+v, received: %+v", eVF, vf) } eVF = &ValueFormula{Static: 10.0} - if vf, err := ParseBalanceFilterValue(MONETARY, "10"); err != nil { + if vf, err := ParseBalanceFilterValue(MetaMonetary, "10"); err != nil { t.Error(err) } else if !reflect.DeepEqual(eVF, vf) { t.Errorf("Expecting: %+v, received: %+v", eVF, vf) @@ -103,7 +103,7 @@ func TestParseBalanceFilterValue(t *testing.T) { eOut := &ValueFormula{ Static: float64(d.Nanoseconds()), } - if rcv, err := ParseBalanceFilterValue(VOICE, "18"); err != nil { + if rcv, err := ParseBalanceFilterValue(MetaVoice, "18"); err != nil { t.Errorf("Expecting: nil, received: %+v", err) } else if !reflect.DeepEqual(rcv, eOut) { t.Errorf("Expecting: %+v, received: %+v", eOut, rcv)