diff --git a/actions/actions.go b/actions/actions.go index 2aece6b88..f321caf44 100644 --- a/actions/actions.go +++ b/actions/actions.go @@ -135,6 +135,7 @@ func (aS *ActionS) schedInit() (err error) { if aS.crn != nil { aS.crn.Stop() } + aS.crn = cron.New() aS.crn.Start() return } diff --git a/agents/agentreq_test.go b/agents/agentreq_test.go index c8fd45879..7a66b4e9b 100644 --- a/agents/agentreq_test.go +++ b/agents/agentreq_test.go @@ -47,7 +47,7 @@ func TestAgReqSetFields(t *testing.T) { 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.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, utils.NewNMData("1001")) + 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( time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC))) @@ -68,7 +68,7 @@ func TestAgReqSetFields(t *testing.T) { Path: utils.MetaRep + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, {Tag: "Account", - Path: utils.MetaRep + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + Path: utils.MetaRep + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, {Tag: "Destination", Path: utils.MetaRep + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, @@ -114,8 +114,8 @@ func TestAgReqSetFields(t *testing.T) { eMp.Set(&utils.FullPath{Path: utils.Tenant, PathItems: utils.PathItems{{Field: utils.Tenant}}}, &utils.NMSlice{ &config.NMItem{Data: "cgrates.org", Path: []string{utils.Tenant}, Config: tplFlds[0]}}) - eMp.Set(&utils.FullPath{Path: utils.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, &utils.NMSlice{ - &config.NMItem{Data: "1001", Path: []string{utils.Account}, + eMp.Set(&utils.FullPath{Path: utils.AccountField, PathItems: utils.PathItems{{Field: utils.AccountField}}}, &utils.NMSlice{ + &config.NMItem{Data: "1001", Path: []string{utils.AccountField}, Config: tplFlds[1]}}) eMp.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, &utils.NMSlice{ &config.NMItem{Data: "1002", Path: []string{utils.Destination}, @@ -139,8 +139,8 @@ func TestAgReqSetFields(t *testing.T) { func TestAgentRequestSetFields(t *testing.T) { req := map[string]interface{}{ - utils.Account: 1009, - utils.Tenant: "cgrates.org", + utils.AccountField: 1009, + utils.Tenant: "cgrates.org", } cfg := config.NewDefaultCGRConfig() dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), @@ -741,7 +741,7 @@ func TestAgReqEmptyFilter(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.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, utils.NewNMData("1001")) + 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")) tplFlds := []*config.FCTemplate{ @@ -750,7 +750,7 @@ func TestAgReqEmptyFilter(t *testing.T) { Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, {Tag: "Account", Filters: []string{}, - Path: utils.MetaCgrep + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, {Tag: "Destination", Filters: []string{}, Path: utils.MetaCgrep + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, @@ -763,8 +763,8 @@ func TestAgReqEmptyFilter(t *testing.T) { eMp.Set(utils.PathItems{{Field: utils.Tenant}}, &utils.NMSlice{ &config.NMItem{Data: "cgrates.org", Path: []string{utils.Tenant}, Config: tplFlds[0]}}) - eMp.Set(utils.PathItems{{Field: utils.Account}}, &utils.NMSlice{ - &config.NMItem{Data: "1001", Path: []string{utils.Account}, + eMp.Set(utils.PathItems{{Field: utils.AccountField}}, &utils.NMSlice{ + &config.NMItem{Data: "1001", Path: []string{utils.AccountField}, Config: tplFlds[1]}}) eMp.Set(utils.PathItems{{Field: utils.Destination}}, &utils.NMSlice{ &config.NMItem{Data: "1002", Path: []string{utils.Destination}, @@ -812,7 +812,7 @@ func TestAgReqFieldAsNone(t *testing.T) { 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.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, utils.NewNMData("1001")) + 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")) tplFlds := []*config.FCTemplate{ @@ -820,7 +820,7 @@ func TestAgReqFieldAsNone(t *testing.T) { Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, {Type: utils.META_NONE, Blocker: true}, {Tag: "Destination", @@ -834,8 +834,8 @@ func TestAgReqFieldAsNone(t *testing.T) { eMp.Set(utils.PathItems{{Field: utils.Tenant}}, &utils.NMSlice{ &config.NMItem{Data: "cgrates.org", Path: []string{utils.Tenant}, Config: tplFlds[0]}}) - eMp.Set(utils.PathItems{{Field: utils.Account}}, &utils.NMSlice{ - &config.NMItem{Data: "1001", Path: []string{utils.Account}, + eMp.Set(utils.PathItems{{Field: utils.AccountField}}, &utils.NMSlice{ + &config.NMItem{Data: "1001", Path: []string{utils.AccountField}, Config: tplFlds[1]}}) if err := agReq.SetFields(tplFlds); err != nil { t.Error(err) @@ -852,7 +852,7 @@ func TestAgReqFieldAsNone2(t *testing.T) { 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.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, utils.NewNMData("1001")) + 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")) tplFlds := []*config.FCTemplate{ @@ -860,7 +860,7 @@ func TestAgReqFieldAsNone2(t *testing.T) { Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, {Type: utils.META_NONE}, {Tag: "Destination", @@ -874,8 +874,8 @@ func TestAgReqFieldAsNone2(t *testing.T) { eMp.Set(utils.PathItems{{Field: utils.Tenant}}, &utils.NMSlice{ &config.NMItem{Data: "cgrates.org", Path: []string{utils.Tenant}, Config: tplFlds[0]}}) - eMp.Set(utils.PathItems{{Field: utils.Account}}, &utils.NMSlice{ - &config.NMItem{Data: "1001", Path: []string{utils.Account}, + eMp.Set(utils.PathItems{{Field: utils.AccountField}}, &utils.NMSlice{ + &config.NMItem{Data: "1001", Path: []string{utils.AccountField}, Config: tplFlds[1]}}) eMp.Set(utils.PathItems{{Field: utils.Destination}}, &utils.NMSlice{ &config.NMItem{Data: "1002", Path: []string{utils.Destination}, @@ -895,7 +895,7 @@ func TestAgReqSetField2(t *testing.T) { 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.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, utils.NewNMData("1001")) + 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( time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC))) @@ -908,7 +908,7 @@ func TestAgReqSetField2(t *testing.T) { Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.META_COMPOSED, Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.Account, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, {Tag: "Destination", Path: utils.MetaCgrep + utils.NestingSep + utils.Destination, Type: utils.META_COMPOSED, @@ -928,8 +928,8 @@ func TestAgReqSetField2(t *testing.T) { eMp.Set(utils.PathItems{{Field: utils.Tenant}}, &utils.NMSlice{ &config.NMItem{Data: "cgrates.org", Path: []string{utils.Tenant}, Config: tplFlds[0]}}) - eMp.Set(utils.PathItems{{Field: utils.Account}}, &utils.NMSlice{ - &config.NMItem{Data: "1001", Path: []string{utils.Account}, + eMp.Set(utils.PathItems{{Field: utils.AccountField}}, &utils.NMSlice{ + &config.NMItem{Data: "1001", Path: []string{utils.AccountField}, Config: tplFlds[1]}}) eMp.Set(utils.PathItems{{Field: utils.Destination}}, &utils.NMSlice{ &config.NMItem{Data: "1002", Path: []string{utils.Destination}, @@ -958,7 +958,7 @@ func TestAgReqFieldAsInterface(t *testing.T) { 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.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, utils.NewNMData("1001")) + 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")) path := []string{utils.MetaCgreq, utils.Usage} @@ -978,7 +978,7 @@ func TestAgReqFieldAsInterface(t *testing.T) { t.Errorf("Expected %v , received: %v", utils.ToJSON(expVal), utils.ToJSON(rply)) } - path = []string{utils.MetaCgreq, utils.Account} + path = []string{utils.MetaCgreq, utils.AccountField} expVal = "1001" if rply, err := agReq.FieldAsInterface(path); err != nil { t.Error(err) @@ -1541,7 +1541,7 @@ func TestAgReqOverwrite(t *testing.T) { 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.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, utils.NewNMData("1001")) + 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( time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC))) @@ -1551,19 +1551,19 @@ func TestAgReqOverwrite(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.Account, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.Account, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, Value: config.NewRSRParsersMustCompile(":", utils.INFIELD_SEP)}, {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.Account, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("OverwrittenAccount", utils.INFIELD_SEP)}, {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.Account, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, Value: config.NewRSRParsersMustCompile("WithComposed", utils.INFIELD_SEP)}, } for _, v := range tplFlds { @@ -1573,7 +1573,7 @@ func TestAgReqOverwrite(t *testing.T) { t.Error(err) } - if rcv, err := agReq.CGRReply.Field(utils.PathItems{{Field: utils.Account}}); err != nil { + if rcv, err := agReq.CGRReply.Field(utils.PathItems{{Field: utils.AccountField}}); err != nil { t.Error(err) } else if sls, canCast := rcv.(*utils.NMSlice); !canCast { t.Errorf("Cannot cast to &utils.NMSlice %+v", rcv) @@ -1593,7 +1593,7 @@ func TestAgReqGroupType(t *testing.T) { 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.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, utils.NewNMData("1001")) + 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( time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC))) @@ -1603,10 +1603,10 @@ func TestAgReqGroupType(t *testing.T) { tplFlds := []*config.FCTemplate{ {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.Account, Type: utils.MetaGroup, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaGroup, Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.Account, Type: utils.MetaGroup, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.MetaGroup, Value: config.NewRSRParsersMustCompile("test", utils.INFIELD_SEP)}, } for _, v := range tplFlds { @@ -1616,7 +1616,7 @@ func TestAgReqGroupType(t *testing.T) { t.Error(err) } - if rcv, err := agReq.CGRReply.Field(utils.PathItems{{Field: utils.Account}}); err != nil { + if rcv, err := agReq.CGRReply.Field(utils.PathItems{{Field: utils.AccountField}}); err != nil { t.Error(err) } else if sls, canCast := rcv.(*utils.NMSlice); !canCast { t.Errorf("Cannot cast to &utils.NMSlice %+v", rcv) @@ -1635,14 +1635,14 @@ func TestAgReqSetFieldsInTmp(t *testing.T) { dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) agReq := NewAgentRequest(nil, nil, nil, nil, nil, nil, "cgrates.org", "", filterS, nil, nil) - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, utils.NewNMData("1001")) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AccountField, PathItems: utils.PathItems{{Field: utils.AccountField}}}, utils.NewNMData("1001")) tplFlds := []*config.FCTemplate{ {Tag: "Tenant", Path: utils.MetaTmp + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, {Tag: "Account", - Path: utils.MetaTmp + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + Path: utils.MetaTmp + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, } for _, v := range tplFlds { @@ -1652,8 +1652,8 @@ func TestAgReqSetFieldsInTmp(t *testing.T) { eMp.Set(utils.PathItems{{Field: utils.Tenant}}, &utils.NMSlice{ &config.NMItem{Data: "cgrates.org", Path: []string{utils.Tenant}, Config: tplFlds[0]}}) - eMp.Set(utils.PathItems{{Field: utils.Account}}, &utils.NMSlice{ - &config.NMItem{Data: "1001", Path: []string{utils.Account}, + eMp.Set(utils.PathItems{{Field: utils.AccountField}}, &utils.NMSlice{ + &config.NMItem{Data: "1001", Path: []string{utils.AccountField}, Config: tplFlds[1]}}) if err := agReq.SetFields(tplFlds); err != nil { @@ -1729,7 +1729,7 @@ func TestAgReqSetFieldsWithRemove(t *testing.T) { 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.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, utils.NewNMData("1001")) + 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( time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC))) @@ -1749,7 +1749,7 @@ func TestAgReqSetFieldsWithRemove(t *testing.T) { Path: utils.MetaRep + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, {Tag: "Account", - Path: utils.MetaRep + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + Path: utils.MetaRep + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, {Tag: "Destination", Path: utils.MetaRep + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, @@ -1794,8 +1794,8 @@ func TestAgReqSetFieldsWithRemove(t *testing.T) { eMp.Set(&utils.FullPath{Path: utils.Tenant, PathItems: utils.PathItems{{Field: utils.Tenant}}}, &utils.NMSlice{ &config.NMItem{Data: "cgrates.org", Path: []string{utils.Tenant}, Config: tplFlds[0]}}) - eMp.Set(&utils.FullPath{Path: utils.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, &utils.NMSlice{ - &config.NMItem{Data: "1001", Path: []string{utils.Account}, + eMp.Set(&utils.FullPath{Path: utils.AccountField, PathItems: utils.PathItems{{Field: utils.AccountField}}}, &utils.NMSlice{ + &config.NMItem{Data: "1001", Path: []string{utils.AccountField}, Config: tplFlds[1]}}) eMp.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, &utils.NMSlice{ &config.NMItem{Data: "1002", Path: []string{utils.Destination}, @@ -1820,7 +1820,7 @@ func TestAgReqSetFieldsWithRemove(t *testing.T) { {Tag: "Tenant", Path: utils.MetaRep + utils.NestingSep + utils.Tenant, Type: utils.MetaRemove}, {Tag: "Account", - Path: utils.MetaRep + utils.NestingSep + utils.Account, Type: utils.MetaRemove}, + Path: utils.MetaRep + utils.NestingSep + utils.AccountField, Type: utils.MetaRemove}, } for _, v := range tplFldsRemove { v.ComputePath() @@ -1864,14 +1864,14 @@ func TestAgReqSetFieldsInCache(t *testing.T) { filterS := engine.NewFilterS(cfg, nil, dm) engine.NewCacheS(cfg, dm, nil) agReq := NewAgentRequest(nil, nil, nil, nil, nil, nil, "cgrates.org", "", filterS, nil, nil) - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, utils.NewNMData("1001")) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AccountField, PathItems: utils.PathItems{{Field: utils.AccountField}}}, utils.NewNMData("1001")) tplFlds := []*config.FCTemplate{ {Tag: "Tenant", Path: utils.MetaUCH + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, {Tag: "Account", - Path: utils.MetaUCH + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + Path: utils.MetaUCH + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, } for _, v := range tplFlds { @@ -1887,7 +1887,7 @@ func TestAgReqSetFieldsInCache(t *testing.T) { t.Errorf("expecting: %+v, \n received: %+v ", "cgrates.org", utils.ToJSON(val)) } - if val, err := agReq.FieldAsInterface([]string{utils.MetaUCH, utils.Account}); err != nil { + if val, err := agReq.FieldAsInterface([]string{utils.MetaUCH, utils.AccountField}); err != nil { t.Error(err) } else if val != "1001" { t.Errorf("expecting: %+v, \n received: %+v ", "1001", utils.ToJSON(val)) @@ -1907,14 +1907,14 @@ func TestAgReqSetFieldsInCacheWithTimeOut(t *testing.T) { cfg.CacheCfg().Partitions[utils.CacheUCH].TTL = time.Second engine.Cache = engine.NewCacheS(cfg, dm, nil) agReq := NewAgentRequest(nil, nil, nil, nil, nil, nil, "cgrates.org", "", filterS, nil, nil) - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, utils.NewNMData("1001")) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AccountField, PathItems: utils.PathItems{{Field: utils.AccountField}}}, utils.NewNMData("1001")) tplFlds := []*config.FCTemplate{ {Tag: "Tenant", Path: utils.MetaUCH + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, {Tag: "Account", - Path: utils.MetaUCH + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + Path: utils.MetaUCH + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, } for _, v := range tplFlds { @@ -1930,7 +1930,7 @@ func TestAgReqSetFieldsInCacheWithTimeOut(t *testing.T) { t.Errorf("expecting: %+v, \n received: %+v ", "cgrates.org", utils.ToJSON(val)) } - if val, err := agReq.FieldAsInterface([]string{utils.MetaUCH, utils.Account}); err != nil { + if val, err := agReq.FieldAsInterface([]string{utils.MetaUCH, utils.AccountField}); err != nil { t.Error(err) } else if val != "1001" { t.Errorf("expecting: %+v, \n received: %+v ", "1001", utils.ToJSON(val)) @@ -1944,7 +1944,7 @@ func TestAgReqSetFieldsInCacheWithTimeOut(t *testing.T) { if _, err := agReq.FieldAsInterface([]string{utils.MetaUCH, utils.Tenant}); err == nil || err != utils.ErrNotFound { t.Error(err) } - if _, err := agReq.FieldAsInterface([]string{utils.MetaUCH, utils.Account}); err == nil || err != utils.ErrNotFound { + if _, err := agReq.FieldAsInterface([]string{utils.MetaUCH, utils.AccountField}); err == nil || err != utils.ErrNotFound { t.Error(err) } } @@ -2032,7 +2032,7 @@ func TestAgReqDynamicPath(t *testing.T) { 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.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, utils.NewNMData("1001")) + 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( time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC))) @@ -2051,7 +2051,7 @@ func TestAgReqDynamicPath(t *testing.T) { Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.META_COMPOSED, Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.Account, Type: utils.META_COMPOSED, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField, Type: utils.META_COMPOSED, Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, {Tag: "Destination", Path: utils.MetaCgrep + utils.NestingSep + utils.Destination, Type: utils.META_COMPOSED, @@ -2075,8 +2075,8 @@ func TestAgReqDynamicPath(t *testing.T) { eMp.Set(utils.PathItems{{Field: utils.Tenant}}, &utils.NMSlice{ &config.NMItem{Data: "cgrates.org", Path: []string{utils.Tenant}, Config: tplFlds[0]}}) - eMp.Set(utils.PathItems{{Field: utils.Account}}, &utils.NMSlice{ - &config.NMItem{Data: "1001", Path: []string{utils.Account}, + eMp.Set(utils.PathItems{{Field: utils.AccountField}}, &utils.NMSlice{ + &config.NMItem{Data: "1001", Path: []string{utils.AccountField}, Config: tplFlds[1]}}) eMp.Set(utils.PathItems{{Field: utils.Destination}}, &utils.NMSlice{ &config.NMItem{Data: "1002", Path: []string{utils.Destination}, @@ -2106,7 +2106,7 @@ func TestAgReqRoundingDecimals(t *testing.T) { 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.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, utils.NewNMData("1001")) + 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( time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC))) @@ -2160,10 +2160,10 @@ func BenchmarkAgReqSetField(b *testing.B) { Path: utils.MetaCgrep + utils.NestingSep + utils.Tenant, Type: utils.META_COMPOSED, Value: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP)}, {Tag: "Account", - Path: utils.MetaCgrep + utils.NestingSep + utils.Account + "[0].ID", Type: utils.MetaVariable, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField + "[0].ID", Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("~*cgreq.Account", utils.INFIELD_SEP)}, {Tag: "Account2", - Path: utils.MetaCgrep + utils.NestingSep + utils.Account + "[1].ID", Type: utils.META_CONSTANT, + Path: utils.MetaCgrep + utils.NestingSep + utils.AccountField + "[1].ID", Type: utils.META_CONSTANT, Value: config.NewRSRParsersMustCompile("1003", utils.INFIELD_SEP)}, } for _, v := range tplFlds { @@ -2173,11 +2173,11 @@ func BenchmarkAgReqSetField(b *testing.B) { eMp.Set(utils.PathItems{{Field: utils.Tenant}}, &utils.NMSlice{ &config.NMItem{Data: "cgrates.org", Path: []string{utils.Tenant}, Config: tplFlds[0]}}) - eMp.Set(utils.PathItems{{Field: utils.Account, Index: utils.StringPointer("0")}, {Field: "ID"}}, &utils.NMSlice{ - &config.NMItem{Data: "1001", Path: []string{utils.Account + "[0]", "ID"}, + eMp.Set(utils.PathItems{{Field: utils.AccountField, Index: utils.StringPointer("0")}, {Field: "ID"}}, &utils.NMSlice{ + &config.NMItem{Data: "1001", Path: []string{utils.AccountField + "[0]", "ID"}, Config: tplFlds[1]}}) - eMp.Set(utils.PathItems{{Field: utils.Account, Index: utils.StringPointer("1")}, {Field: "ID"}}, &utils.NMSlice{ - &config.NMItem{Data: "1003", Path: []string{utils.Account + "[1]", "ID"}, + eMp.Set(utils.PathItems{{Field: utils.AccountField, Index: utils.StringPointer("1")}, {Field: "ID"}}, &utils.NMSlice{ + &config.NMItem{Data: "1003", Path: []string{utils.AccountField + "[1]", "ID"}, Config: tplFlds[2]}}) b.ResetTimer() @@ -2185,7 +2185,7 @@ func BenchmarkAgReqSetField(b *testing.B) { 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.Account, PathItems: utils.PathItems{{Field: utils.Account}}}, utils.NewNMData("1001")) + 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( time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC))) diff --git a/agents/asterisk_event.go b/agents/asterisk_event.go index a160dbc43..4e63f1456 100644 --- a/agents/asterisk_event.go +++ b/agents/asterisk_event.go @@ -256,7 +256,7 @@ func (smaEv *SMAsteriskEvent) AsMapStringInterface() (mp map[string]interface{}) mp[utils.Subject] = smaEv.Subject() } mp[utils.OriginHost] = utils.FirstNonEmpty(smaEv.OriginHost(), smaEv.asteriskAlias, smaEv.OriginatorIP()) - mp[utils.Account] = smaEv.Account() + mp[utils.AccountField] = smaEv.Account() mp[utils.Destination] = smaEv.Destination() mp[utils.SetupTime] = smaEv.SetupTime() if smaEv.Route() != "" { diff --git a/agents/diamagent_test.go b/agents/diamagent_test.go index 9b9189918..a04ee33ce 100644 --- a/agents/diamagent_test.go +++ b/agents/diamagent_test.go @@ -83,8 +83,8 @@ func TestProcessRequest(t *testing.T) { {Tag: utils.Category, Type: utils.META_CONSTANT, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Value: config.NewRSRParsersMustCompile(utils.CALL, utils.INFIELD_SEP)}, - {Tag: utils.Account, - Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.Account, + {Tag: utils.AccountField, + Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("~*req.Account", utils.INFIELD_SEP), Mandatory: true}, {Tag: utils.Destination, Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, diff --git a/agents/fsevent.go b/agents/fsevent.go index 7ada33b04..17c06f1e2 100644 --- a/agents/fsevent.go +++ b/agents/fsevent.go @@ -168,7 +168,7 @@ func (fsev FSEvent) GetReqType(fieldName string) string { func (fsev FSEvent) MissingParameter(timezone string) string { if strings.TrimSpace(fsev.GetAccount(utils.MetaDefault)) == "" { - return utils.Account + return utils.AccountField } if strings.TrimSpace(fsev.GetSubject(utils.MetaDefault)) == "" { return utils.Subject @@ -315,7 +315,7 @@ func (fsev FSEvent) ParseEventValue(rsrFld *config.RSRParser, timezone string) ( return rsrFld.ParseValue(fsev.GetTenant("")) case utils.Category: return rsrFld.ParseValue(fsev.GetCategory("")) - case utils.Account: + case utils.AccountField: return rsrFld.ParseValue(fsev.GetAccount("")) case utils.Subject: return rsrFld.ParseValue(fsev.GetSubject("")) @@ -377,7 +377,7 @@ func (fsev FSEvent) AsMapStringInterface(timezone string) map[string]interface{} mp[utils.RequestType] = fsev.GetReqType(utils.MetaDefault) mp[utils.Tenant] = fsev.GetTenant(utils.MetaDefault) mp[utils.Category] = fsev.GetCategory(utils.MetaDefault) - mp[utils.Account] = fsev.GetAccount(utils.MetaDefault) + mp[utils.AccountField] = fsev.GetAccount(utils.MetaDefault) mp[utils.Subject] = fsev.GetSubject(utils.MetaDefault) mp[utils.Destination] = fsev.GetDestination(utils.MetaDefault) mp[utils.SetupTime], _ = fsev.GetSetupTime(utils.MetaDefault, timezone) diff --git a/agents/fsevent_test.go b/agents/fsevent_test.go index f071fa8f4..d2ae7882b 100644 --- a/agents/fsevent_test.go +++ b/agents/fsevent_test.go @@ -513,7 +513,7 @@ func TestParseEventValue(t *testing.T) { if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.Category), ""); parsed != "call" { t.Error("Unexpected result parsed", parsed) } - if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.Account), ""); parsed != "1001" { + if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.AccountField), ""); parsed != "1001" { t.Error("Unexpected result parsed", parsed) } if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.Subject), ""); parsed != "1001" { @@ -592,7 +592,7 @@ func TestFsEvAsMapStringInterface(t *testing.T) { expectedMap[utils.Destination] = "1003" expectedMap[utils.Usage] = 66 * time.Second expectedMap[utils.Tenant] = "cgrates.org" - expectedMap[utils.Account] = "1001" + expectedMap[utils.AccountField] = "1001" expectedMap[utils.Subject] = "1001" expectedMap[utils.Cost] = -1.0 expectedMap[utils.PDD] = 28 * time.Millisecond diff --git a/agents/kamevent.go b/agents/kamevent.go index 925185118..00d2a5671 100644 --- a/agents/kamevent.go +++ b/agents/kamevent.go @@ -96,14 +96,14 @@ func (kev KamEvent) MissingParameter() bool { kev[KamHashID], kev[utils.OriginID], kev[utils.AnswerTime], - kev[utils.Account], + kev[utils.AccountField], kev[utils.Destination], }, "") case CGR_CALL_END: return utils.IsSliceMember([]string{ kev[utils.OriginID], kev[utils.AnswerTime], - kev[utils.Account], + kev[utils.AccountField], kev[utils.Destination], }, "") case CGR_PROCESS_MESSAGE: @@ -115,7 +115,7 @@ func (kev KamEvent) MissingParameter() bool { if has { mndPrm = append(mndPrm, kev[utils.OriginID], kev[utils.AnswerTime], - kev[utils.Account], + kev[utils.AccountField], kev[utils.Destination]) } return utils.IsSliceMember(mndPrm, "") diff --git a/agents/kamevent_test.go b/agents/kamevent_test.go index 89b504e59..2fdb76623 100644 --- a/agents/kamevent_test.go +++ b/agents/kamevent_test.go @@ -255,10 +255,10 @@ func TestKamEvAsKamAuthReply(t *testing.T) { Tenant: "cgrates.org", ID: "TestKamEvAsKamAuthReply", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Account: "1001", - "Password": "check123", - utils.RequestType: utils.META_PREPAID, + utils.Tenant: "cgrates.org", + utils.AccountField: "1001", + "Password": "check123", + utils.RequestType: utils.META_PREPAID, }, }, }, @@ -454,10 +454,10 @@ func TestKamEvAsKamProcessEventReply(t *testing.T) { Tenant: "cgrates.org", ID: "TestKamEvAsKamAuthReply", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Account: "1001", - "Password": "check123", - utils.RequestType: utils.META_PREPAID, + utils.Tenant: "cgrates.org", + utils.AccountField: "1001", + "Password": "check123", + utils.RequestType: utils.META_PREPAID, }, }, }, diff --git a/agents/librad_test.go b/agents/librad_test.go index b566f9b19..498e48dfe 100644 --- a/agents/librad_test.go +++ b/agents/librad_test.go @@ -92,7 +92,7 @@ func TestRadReplyAppendAttributes(t *testing.T) { agReq := NewAgentRequest(nil, nil, nil, nil, nil, nil, "cgrates.org", "", nil, nil, nil) agReq.CGRReply.Set(utils.NewPathItems([]string{utils.CapMaxUsage}), utils.NewNMData(time.Hour)) agReq.CGRReply.Set(utils.NewPathItems([]string{utils.CapAttributes, "RadReply"}), utils.NewNMData("AccessAccept")) - agReq.CGRReply.Set(utils.NewPathItems([]string{utils.CapAttributes, utils.Account}), utils.NewNMData("1001")) + agReq.CGRReply.Set(utils.NewPathItems([]string{utils.CapAttributes, utils.AccountField}), utils.NewNMData("1001")) if err := agReq.SetFields(rplyFlds); err != nil { t.Error(err) diff --git a/agents/libsip_test.go b/agents/libsip_test.go index 756cd1ee5..f30dc98e4 100644 --- a/agents/libsip_test.go +++ b/agents/libsip_test.go @@ -44,7 +44,7 @@ func TestUpdateSIPMsgFromNavMap(t *testing.T) { agReq := NewAgentRequest(nil, nil, nil, nil, nil, nil, "cgrates.org", "", nil, nil, nil) agReq.CGRReply.Set(utils.NewPathItems([]string{utils.CapMaxUsage}), utils.NewNMData(time.Hour)) agReq.CGRReply.Set(utils.NewPathItems([]string{utils.CapAttributes, "Request"}), utils.NewNMData("SIP/2.0 302 Moved Temporarily")) - agReq.CGRReply.Set(utils.NewPathItems([]string{utils.CapAttributes, utils.Account}), utils.NewNMData("1001")) + agReq.CGRReply.Set(utils.NewPathItems([]string{utils.CapAttributes, utils.AccountField}), utils.NewNMData("1001")) if err := agReq.SetFields(rplyFlds); err != nil { t.Error(err) @@ -65,7 +65,7 @@ func TestUpdateSIPMsgFromNavMap2(t *testing.T) { m := sipingo.Message{} mv := utils.NewOrderedNavigableMap() var nm *config.NMItem - mv.Set(&utils.FullPath{PathItems: utils.NewPathItems([]string{utils.CapAttributes, utils.Account}), Path: utils.CapAttributes + utils.NestingSep + utils.Account}, nm) + mv.Set(&utils.FullPath{PathItems: utils.NewPathItems([]string{utils.CapAttributes, utils.AccountField}), Path: utils.CapAttributes + utils.NestingSep + utils.AccountField}, nm) mv.Set(&utils.FullPath{PathItems: utils.NewPathItems([]string{utils.CapMaxUsage}), Path: utils.CapMaxUsage}, utils.NewNMData(time.Hour)) expectedErr := `cannot encode reply value: [{"Field":"MaxUsage","Index":null}], err: not NMItems` diff --git a/analyzers/analyzers_it_test.go b/analyzers/analyzers_it_test.go index d425fb0df..fbb5fae56 100644 --- a/analyzers/analyzers_it_test.go +++ b/analyzers/analyzers_it_test.go @@ -142,9 +142,9 @@ func testAnalyzerSChargerSv1ProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1010", - utils.Subject: "Something_inter", - utils.Destination: "999", + utils.AccountField: "1010", + utils.Subject: "Something_inter", + utils.Destination: "999", }, }, } diff --git a/apier/v1/accounts.go b/apier/v1/accounts.go index 412d0d1d8..73f20f36f 100644 --- a/apier/v1/accounts.go +++ b/apier/v1/accounts.go @@ -38,7 +38,7 @@ type AccountActionTiming struct { } func (apierSv1 *APIerSv1) GetAccountActionPlan(attrs *utils.TenantAccount, reply *[]*AccountActionTiming) error { - if missing := utils.MissingStructFields(attrs, []string{utils.Account}); len(missing) != 0 { + if missing := utils.MissingStructFields(attrs, []string{utils.AccountField}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(strings.Join(missing, ","), "") } tnt := attrs.Tenant @@ -95,7 +95,7 @@ func (apierSv1 *APIerSv1) RemoveActionTiming(attrs *AttrRemoveActionTiming, repl } var accID string if len(attrs.Account) != 0 { // Presence of Account requires complete account details to be provided - if missing := utils.MissingStructFields(attrs, []string{utils.Account}); len(missing) != 0 { + if missing := utils.MissingStructFields(attrs, []string{utils.AccountField}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } tnt := attrs.Tenant @@ -181,7 +181,7 @@ func (apierSv1 *APIerSv1) RemoveActionTiming(attrs *AttrRemoveActionTiming, repl // SetAccount adds a new account into dataDb. If already defined, returns success. func (apierSv1 *APIerSv1) SetAccount(attr *utils.AttrSetAccount, reply *string) (err error) { - if missing := utils.MissingStructFields(attr, []string{utils.Account}); len(missing) != 0 { + if missing := utils.MissingStructFields(attr, []string{utils.AccountField}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } tnt := attr.Tenant @@ -306,7 +306,7 @@ func (apierSv1 *APIerSv1) SetAccount(attr *utils.AttrSetAccount, reply *string) } func (apierSv1 *APIerSv1) RemoveAccount(attr *utils.AttrRemoveAccount, reply *string) (err error) { - if missing := utils.MissingStructFields(attr, []string{utils.Account}); len(missing) != 0 { + if missing := utils.MissingStructFields(attr, []string{utils.AccountField}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } tnt := attr.Tenant @@ -449,7 +449,7 @@ func (apierSv1 *APIerSv1) DebitBalance(attr *AttrAddBalance, reply *string) erro } func (apierSv1 *APIerSv1) modifyBalance(aType string, attr *AttrAddBalance, reply *string) (err error) { - if missing := utils.MissingStructFields(attr, []string{utils.Account, utils.BalanceType, utils.Value}); len(missing) != 0 { + if missing := utils.MissingStructFields(attr, []string{utils.AccountField, utils.BalanceType, utils.Value}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } var balance *engine.BalanceFilter @@ -526,7 +526,7 @@ func (apierSv1 *APIerSv1) modifyBalance(aType string, attr *AttrAddBalance, repl // SetBalance sets the balance for the given account // if the account is not already created it will create the account also func (apierSv1 *APIerSv1) SetBalance(attr *utils.AttrSetBalance, reply *string) (err error) { - if missing := utils.MissingStructFields(attr, []string{utils.Account, utils.BalanceType}); len(missing) != 0 { + if missing := utils.MissingStructFields(attr, []string{utils.AccountField, utils.BalanceType}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } var balance *engine.BalanceFilter @@ -604,7 +604,7 @@ func (apierSv1 *APIerSv1) SetBalance(attr *utils.AttrSetBalance, reply *string) // SetBalances sets multiple balances for the given account // if the account is not already created it will create the account also func (apierSv1 *APIerSv1) SetBalances(attr *utils.AttrSetBalances, reply *string) (err error) { - if missing := utils.MissingStructFields(attr, []string{utils.Account, utils.Balances}); len(missing) != 0 { + if missing := utils.MissingStructFields(attr, []string{utils.AccountField, utils.Balances}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } tnt := attr.Tenant @@ -687,7 +687,7 @@ func (apierSv1 *APIerSv1) SetBalances(attr *utils.AttrSetBalances, reply *string // RemoveBalances remove the matching balances for the account func (apierSv1 *APIerSv1) RemoveBalances(attr *utils.AttrSetBalance, reply *string) (err error) { - if missing := utils.MissingStructFields(attr, []string{utils.Account, utils.BalanceType}); len(missing) != 0 { + if missing := utils.MissingStructFields(attr, []string{utils.AccountField, utils.BalanceType}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } var balance *engine.BalanceFilter diff --git a/apier/v1/apier2_it_test.go b/apier/v1/apier2_it_test.go index 93a8f9ab1..57bd5e071 100644 --- a/apier/v1/apier2_it_test.go +++ b/apier/v1/apier2_it_test.go @@ -143,7 +143,7 @@ func testAPIerVerifyAttributesAfterLoad(t *testing.T) { Tenant: "cgrates.org", ID: "testAPIerAfterDelete", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", }, }, }, @@ -221,7 +221,7 @@ func testAPIerVerifyAttributesAfterDelete(t *testing.T) { Tenant: "cgrates.org", ID: "testAPIerAfterDelete", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", }, }, }, diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index 6ce6a943d..08e10e114 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -1710,11 +1710,11 @@ func testApierMaxDebitInexistentAcnt(t *testing.T) { func testApierCdrServer(t *testing.T) { httpClient := new(http.Client) cdrForm1 := url.Values{utils.OriginID: []string{"dsafdsaf"}, utils.OriginHost: []string{"192.168.1.1"}, utils.RequestType: []string{utils.META_RATED}, - utils.Tenant: []string{"cgrates.org"}, utils.Category: []string{"call"}, utils.Account: []string{"1001"}, utils.Subject: []string{"1001"}, utils.Destination: []string{"1002"}, + utils.Tenant: []string{"cgrates.org"}, utils.Category: []string{"call"}, utils.AccountField: []string{"1001"}, utils.Subject: []string{"1001"}, utils.Destination: []string{"1002"}, utils.SetupTime: []string{"2013-11-07T08:42:22Z"}, utils.AnswerTime: []string{"2013-11-07T08:42:26Z"}, utils.Usage: []string{"10"}, "field_extr1": []string{"val_extr1"}, "fieldextr2": []string{"valextr2"}} cdrForm2 := url.Values{utils.OriginID: []string{"adsafdsaf"}, utils.OriginHost: []string{"192.168.1.1"}, utils.RequestType: []string{utils.META_RATED}, - utils.Tenant: []string{"cgrates.org"}, utils.Category: []string{"call"}, utils.Account: []string{"1001"}, utils.Subject: []string{"1001"}, utils.Destination: []string{"1002"}, + utils.Tenant: []string{"cgrates.org"}, utils.Category: []string{"call"}, utils.AccountField: []string{"1001"}, utils.Subject: []string{"1001"}, utils.Destination: []string{"1002"}, 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} { diff --git a/apier/v1/attributes_it_test.go b/apier/v1/attributes_it_test.go index a3194d9c1..b5b0f2ff9 100644 --- a/apier/v1/attributes_it_test.go +++ b/apier/v1/attributes_it_test.go @@ -177,8 +177,8 @@ func testAttributeSGetAttributeForEvent(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ - utils.Account: "1007", - utils.Destination: "+491511231234", + utils.AccountField: "1007", + utils.Destination: "+491511231234", }, }, }, @@ -193,7 +193,7 @@ func testAttributeSGetAttributeForEvent(t *testing.T) { ActivationTime: time.Date(2014, 1, 14, 0, 0, 0, 0, time.UTC)}, Attributes: []*engine.Attribute{ { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), Type: utils.META_CONSTANT, FilterIDs: []string{}, @@ -244,8 +244,8 @@ func testAttributeSGetAttributeForEventNotFound(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEventWihMetaAnyContext", Event: map[string]interface{}{ - utils.Account: "dan", - utils.Destination: "+491511231234", + utils.AccountField: "dan", + utils.Destination: "+491511231234", }, }, }, @@ -260,7 +260,7 @@ func testAttributeSGetAttributeForEventNotFound(t *testing.T) { ActivationTime: time.Date(2014, 1, 14, 0, 0, 0, 0, time.UTC)}, Attributes: []*engine.Attribute{ { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), }, }, @@ -298,8 +298,8 @@ func testAttributeSGetAttributeForEventWithMetaAnyContext(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEventWihMetaAnyContext", Event: map[string]interface{}{ - utils.Account: "dan", - utils.Destination: "+491511231234", + utils.AccountField: "dan", + utils.Destination: "+491511231234", }, }, }, @@ -314,7 +314,7 @@ func testAttributeSGetAttributeForEventWithMetaAnyContext(t *testing.T) { ActivationTime: time.Date(2014, 1, 14, 0, 0, 0, 0, time.UTC)}, Attributes: []*engine.Attribute{ { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), }, }, @@ -356,24 +356,24 @@ func testAttributeSProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSProcessEvent", Event: map[string]interface{}{ - utils.Account: "1007", - utils.Destination: "+491511231234", + utils.AccountField: "1007", + utils.Destination: "+491511231234", }, }, }, } eRply := &engine.AttrSProcessEventReply{ MatchedProfiles: []string{"ATTR_1"}, - AlteredFields: []string{utils.MetaReq + utils.NestingSep + utils.Account, + AlteredFields: []string{utils.MetaReq + utils.NestingSep + utils.AccountField, utils.MetaReq + utils.NestingSep + utils.Subject}, CGREventWithOpts: &utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", ID: "testAttributeSProcessEvent", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "+491511231234", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "+491511231234", }, }, }, @@ -415,8 +415,8 @@ func testAttributeSProcessEventNotFound(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSProcessEventNotFound", Event: map[string]interface{}{ - utils.Account: "Inexistent", - utils.Destination: "+491511231234", + utils.AccountField: "Inexistent", + utils.Destination: "+491511231234", }, }, }, @@ -437,9 +437,9 @@ func testAttributeSProcessEventMissing(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSProcessEvent", Event: map[string]interface{}{ - utils.Account: "NonExist", - utils.Category: "*attributes", - utils.Destination: "+491511231234", + utils.AccountField: "NonExist", + utils.Category: "*attributes", + utils.Destination: "+491511231234", }, }, }, @@ -460,8 +460,8 @@ func testAttributeSProcessEventWithNoneSubstitute(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSWithNoneSubstitute", Event: map[string]interface{}{ - utils.Account: "1008", - utils.Destination: "+491511231234", + utils.AccountField: "1008", + utils.Destination: "+491511231234", }, }, }, @@ -479,7 +479,7 @@ func testAttributeSProcessEventWithNoneSubstitute(t *testing.T) { Attributes: []*engine.Attribute{ { FilterIDs: []string{"*string:~*req.Account:1008"}, - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), }, { @@ -499,15 +499,15 @@ func testAttributeSProcessEventWithNoneSubstitute(t *testing.T) { } eRply := &engine.AttrSProcessEventReply{ MatchedProfiles: []string{"AttributeWithNonSubstitute"}, - AlteredFields: []string{utils.MetaReq + utils.NestingSep + utils.Account, + AlteredFields: []string{utils.MetaReq + utils.NestingSep + utils.AccountField, utils.MetaReq + utils.NestingSep + utils.Subject}, CGREventWithOpts: &utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", ID: "testAttributeSWithNoneSubstitute", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: "+491511231234", + utils.AccountField: "1001", + utils.Destination: "+491511231234", }, }, }, @@ -533,9 +533,9 @@ func testAttributeSProcessEventWithNoneSubstitute2(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSWithNoneSubstitute", Event: map[string]interface{}{ - utils.Account: "1008", - utils.Subject: "1008", - utils.Destination: "+491511231234", + utils.AccountField: "1008", + utils.Subject: "1008", + utils.Destination: "+491511231234", }, }, }, @@ -553,7 +553,7 @@ func testAttributeSProcessEventWithNoneSubstitute2(t *testing.T) { Attributes: []*engine.Attribute{ { FilterIDs: []string{"*string:~*req.Account:1008"}, - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), }, { @@ -578,8 +578,8 @@ func testAttributeSProcessEventWithNoneSubstitute2(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSWithNoneSubstitute", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: "+491511231234", + utils.AccountField: "1001", + utils.Destination: "+491511231234", }, }, }, @@ -587,14 +587,14 @@ func testAttributeSProcessEventWithNoneSubstitute2(t *testing.T) { eRply2 := &engine.AttrSProcessEventReply{ MatchedProfiles: []string{"AttributeWithNonSubstitute"}, AlteredFields: []string{utils.MetaReq + utils.NestingSep + utils.Subject, - utils.MetaReq + utils.NestingSep + utils.Account}, + utils.MetaReq + utils.NestingSep + utils.AccountField}, CGREventWithOpts: &utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", ID: "testAttributeSWithNoneSubstitute", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: "+491511231234", + utils.AccountField: "1001", + utils.Destination: "+491511231234", }, }, }, @@ -618,9 +618,9 @@ func testAttributeSProcessEventWithNoneSubstitute3(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSWithNoneSubstitute", Event: map[string]interface{}{ - utils.Account: "1008", - utils.Subject: "1001", - utils.Destination: "+491511231234", + utils.AccountField: "1008", + utils.Subject: "1001", + utils.Destination: "+491511231234", }, }, }, @@ -638,7 +638,7 @@ func testAttributeSProcessEventWithNoneSubstitute3(t *testing.T) { Attributes: []*engine.Attribute{ { FilterIDs: []string{"*string:~*req.Account:1008"}, - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), }, { @@ -664,9 +664,9 @@ func testAttributeSProcessEventWithNoneSubstitute3(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSWithNoneSubstitute", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "+491511231234", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "+491511231234", }, }, }, diff --git a/apier/v1/cache_replication_it_test.go b/apier/v1/cache_replication_it_test.go index 2ab62ec39..856ef8d02 100644 --- a/apier/v1/cache_replication_it_test.go +++ b/apier/v1/cache_replication_it_test.go @@ -131,7 +131,7 @@ func testCacheSReplicateProcessAttributes(t *testing.T) { Tenant: "cgrates.org", ID: "testCacheSReplicateProcessAttributes", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", }, }, }, @@ -144,8 +144,8 @@ func testCacheSReplicateProcessAttributes(t *testing.T) { Tenant: "cgrates.org", ID: "testCacheSReplicateProcessAttributes", Event: map[string]interface{}{ - utils.Account: "1001", - "OfficeGroup": "Marketing", + utils.AccountField: "1001", + "OfficeGroup": "Marketing", }, }, }, @@ -183,7 +183,7 @@ func testCacheSReplicateProcessRateProfile(t *testing.T) { Tenant: "cgrates.org", ID: utils.UUIDSha1Prefix(), Event: map[string]interface{}{ - utils.Account: "1002", + utils.AccountField: "1002", }, }, }, diff --git a/apier/v1/cdrs_it_test.go b/apier/v1/cdrs_it_test.go index 764a0d1b6..a6137a085 100644 --- a/apier/v1/cdrs_it_test.go +++ b/apier/v1/cdrs_it_test.go @@ -172,13 +172,13 @@ func testV1CDRsProcessEventWithRefund(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.RunID: "testv1", - utils.OriginID: "testV1CDRsProcessEventWithRefund", - utils.RequestType: utils.META_PSEUDOPREPAID, - utils.Account: "testV1CDRsProcessEventWithRefund", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), - utils.Usage: 3 * time.Minute, + utils.RunID: "testv1", + utils.OriginID: "testV1CDRsProcessEventWithRefund", + utils.RequestType: utils.META_PSEUDOPREPAID, + utils.AccountField: "testV1CDRsProcessEventWithRefund", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), + utils.Usage: 3 * time.Minute, }, }, }, @@ -222,13 +222,13 @@ func testV1CDRsProcessEventWithRefund(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.RunID: "testv1", - utils.OriginID: "testV1CDRsProcessEventWithRefund", - utils.RequestType: utils.META_PSEUDOPREPAID, - utils.Account: "testV1CDRsProcessEventWithRefund", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), - utils.Usage: time.Minute, + utils.RunID: "testv1", + utils.OriginID: "testV1CDRsProcessEventWithRefund", + utils.RequestType: utils.META_PSEUDOPREPAID, + utils.AccountField: "testV1CDRsProcessEventWithRefund", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), + utils.Usage: time.Minute, }, }, }, @@ -371,14 +371,14 @@ func testV1CDRsRefundOutOfSessionCost(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.CGRID: "test1", - utils.RunID: utils.MetaDefault, - utils.OriginID: "testV1CDRsRefundOutOfSessionCost", - utils.RequestType: utils.META_PREPAID, - utils.Account: "testV1CDRsRefundOutOfSessionCost", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), - utils.Usage: 123 * time.Minute, + utils.CGRID: "test1", + utils.RunID: utils.MetaDefault, + utils.OriginID: "testV1CDRsRefundOutOfSessionCost", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "testV1CDRsRefundOutOfSessionCost", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), + utils.Usage: 123 * time.Minute, }, }, }, @@ -437,13 +437,13 @@ func testV1CDRsRefundCDR(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.RunID: utils.MetaDefault, - utils.OriginID: "testV1CDRsRefundCDR", - utils.RequestType: utils.META_PSEUDOPREPAID, - utils.Account: "testV1CDRsRefundCDR", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), - utils.Usage: 10 * time.Minute, + utils.RunID: utils.MetaDefault, + utils.OriginID: "testV1CDRsRefundCDR", + utils.RequestType: utils.META_PSEUDOPREPAID, + utils.AccountField: "testV1CDRsRefundCDR", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), + utils.Usage: 10 * time.Minute, utils.CostDetails: &engine.EventCost{ CGRID: "test1", RunID: utils.MetaDefault, @@ -594,16 +594,16 @@ func testV1CDRsAddBalanceForSMS(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.CGRID: "asdfas", - utils.ToR: utils.SMS, - utils.Category: "sms", - utils.RunID: utils.MetaDefault, - utils.OriginID: "testV1CDRsAddBalanceForSMS", - utils.RequestType: utils.META_PREPAID, - utils.Account: "testV1CDRsAddBalanceForSMS", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), - utils.Usage: 1, + utils.CGRID: "asdfas", + utils.ToR: utils.SMS, + utils.Category: "sms", + utils.RunID: utils.MetaDefault, + utils.OriginID: "testV1CDRsAddBalanceForSMS", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "testV1CDRsAddBalanceForSMS", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), + utils.Usage: 1, }, }, }, diff --git a/apier/v1/chargers_it_test.go b/apier/v1/chargers_it_test.go index 1e6f406b2..7f42f9860 100755 --- a/apier/v1/chargers_it_test.go +++ b/apier/v1/chargers_it_test.go @@ -46,7 +46,7 @@ var ( Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", }, }, Opts: map[string]interface{}{utils.OptsContext: "simpleauth"}, @@ -56,8 +56,8 @@ var ( Tenant: "cgrates.org", ID: "event2", Event: map[string]interface{}{ - utils.Account: "1010", - "DistinctMatch": "cgrates", + utils.AccountField: "1010", + "DistinctMatch": "cgrates", }, }, }, @@ -66,7 +66,7 @@ var ( Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1007", + utils.AccountField: "1007", }, }, Opts: map[string]interface{}{utils.OptsContext: "simpleauth"}, @@ -306,8 +306,8 @@ func testChargerSGetChargersForEvent2(t *testing.T) { Tenant: utils.EmptyString, ID: "event1", Event: map[string]interface{}{ - utils.Account: "1015", - utils.Usage: 1, + utils.AccountField: "1015", + utils.Usage: 1, }, }, }, &result); err == nil || @@ -328,9 +328,9 @@ func testChargerSProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1001", - "Password": "CGRateS.org", - "RunID": utils.MetaDefault, + utils.AccountField: "1001", + "Password": "CGRateS.org", + "RunID": utils.MetaDefault, }, }, }, @@ -356,10 +356,10 @@ func testChargerSProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1007", - utils.RequestType: "*rated", - utils.Category: "call", - utils.RunID: utils.MetaDefault, + utils.AccountField: "1007", + utils.RequestType: "*rated", + utils.Category: "call", + utils.RunID: utils.MetaDefault, }, }, }, @@ -518,8 +518,8 @@ func testChargerSProcessWithNotFoundAttribute(t *testing.T) { Tenant: "cgrates.org", ID: "CustomEvent", Event: map[string]interface{}{ - utils.Account: "Random", - "CustomField": "WithoutAttributes", + utils.AccountField: "Random", + "CustomField": "WithoutAttributes", }, }, } @@ -533,9 +533,9 @@ func testChargerSProcessWithNotFoundAttribute(t *testing.T) { Tenant: "cgrates.org", ID: "CustomEvent", Event: map[string]interface{}{ - utils.Account: "Random", - "CustomField": "WithoutAttributes", - "RunID": "CustomRun", + utils.AccountField: "Random", + "CustomField": "WithoutAttributes", + "RunID": "CustomRun", }, }, }, @@ -599,8 +599,8 @@ func testChargerSProccessEventWithProcceSRunS(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1002", - utils.RunID: "*default", + utils.AccountField: "1002", + utils.RunID: "*default", }, }, }, @@ -610,7 +610,7 @@ func testChargerSProccessEventWithProcceSRunS(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1010", + utils.AccountField: "1010", }, }, Opts: map[string]interface{}{utils.OptsAttributesProcessRuns: 1.}, diff --git a/apier/v1/filter_indexes_it_test.go b/apier/v1/filter_indexes_it_test.go index 7194eceda..f824b0ca4 100644 --- a/apier/v1/filter_indexes_it_test.go +++ b/apier/v1/filter_indexes_it_test.go @@ -158,7 +158,7 @@ func testV1FIdxSetThresholdProfile(t *testing.T) { Tenant: tenant, ID: "TestFilter", Rules: []*engine.FilterRule{{ - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1001"}, }}, @@ -253,7 +253,7 @@ func testV1FIdxSetSecondThresholdProfile(t *testing.T) { Tenant: tenant, ID: "TestFilter2", Rules: []*engine.FilterRule{{ - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1002"}, }}, @@ -418,7 +418,7 @@ func testV1FIdxSetStatQueueProfileIndexes(t *testing.T) { Tenant: tenant, ID: "FLTR_1", Rules: []*engine.FilterRule{{ - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1001"}, }}, @@ -521,7 +521,7 @@ func testV1FIdxSetSecondStatQueueProfileIndexes(t *testing.T) { Tenant: tenant, ID: "FLTR_2", Rules: []*engine.FilterRule{{ - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1001"}, }}, @@ -667,7 +667,7 @@ func testV1FIdxSetResourceProfileIndexes(t *testing.T) { Tenant: tenant, ID: "FLTR_RES_RCFG1", Rules: []*engine.FilterRule{{ - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1001"}, }}, @@ -760,7 +760,7 @@ func testV1FIdxSetSecondResourceProfileIndexes(t *testing.T) { Tenant: tenant, ID: "FLTR_2", Rules: []*engine.FilterRule{{ - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1001"}, }}, @@ -896,7 +896,7 @@ func testV1FIdxSetRouteProfileIndexes(t *testing.T) { ID: "FLTR_1", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1001"}, }, @@ -995,7 +995,7 @@ func testV1FIdxSetSecondRouteProfileIndexes(t *testing.T) { Tenant: tenant, ID: "FLTR_2", Rules: []*engine.FilterRule{{ - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1001"}, }}, @@ -1138,7 +1138,7 @@ func testV1FIdxSetAttributeProfileIndexes(t *testing.T) { Tenant: tenant, ID: "FLTR_1", Rules: []*engine.FilterRule{{ - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1001"}, }}, @@ -1246,7 +1246,7 @@ func testV1FIdxSetSecondAttributeProfileIndexes(t *testing.T) { Tenant: tenant, ID: "FLTR_2", Rules: []*engine.FilterRule{{ - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1001"}, }}, diff --git a/apier/v1/filterindexecache_it_test.go b/apier/v1/filterindexecache_it_test.go index 24ad05345..f80d72c6a 100644 --- a/apier/v1/filterindexecache_it_test.go +++ b/apier/v1/filterindexecache_it_test.go @@ -149,8 +149,8 @@ func testV1FIdxCaProcessEventWithNotFound(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EventType: utils.BalanceUpdate, - utils.Account: "1001", + utils.EventType: utils.BalanceUpdate, + utils.AccountField: "1001", }, }, Opts: map[string]interface{}{ @@ -171,7 +171,7 @@ func testV1FIdxCaSetThresholdProfile(t *testing.T) { ID: "TestFilter", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1001"}, }, @@ -222,8 +222,8 @@ func testV1FIdxCaSetThresholdProfile(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EventType: utils.BalanceUpdate, - utils.Account: "1001", + utils.EventType: utils.BalanceUpdate, + utils.AccountField: "1001", }, }, Opts: map[string]interface{}{ @@ -251,10 +251,10 @@ func testV1FIdxCaGetThresholdFromTP(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EventType: utils.BalanceUpdate, - utils.Account: "1001", - utils.BalanceID: utils.MetaDefault, - utils.Units: 12.3, + utils.EventType: utils.BalanceUpdate, + utils.AccountField: "1001", + utils.BalanceID: utils.MetaDefault, + utils.Units: 12.3, }, }, Opts: map[string]interface{}{ @@ -281,7 +281,7 @@ func testV1FIdxCaUpdateThresholdProfile(t *testing.T) { ID: "TestFilter2", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1002"}, }, @@ -328,8 +328,8 @@ func testV1FIdxCaUpdateThresholdProfile(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EventType: utils.AccountUpdate, - utils.Account: "1001", + utils.EventType: utils.AccountUpdate, + utils.AccountField: "1001", }, }, Opts: map[string]interface{}{ @@ -351,8 +351,8 @@ func testV1FIdxCaUpdateThresholdProfile(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EventType: utils.AccountUpdate, - utils.Account: "1002", + utils.EventType: utils.AccountUpdate, + utils.AccountField: "1002", }, }, Opts: map[string]interface{}{ @@ -377,7 +377,7 @@ func testV1FIdxCaUpdateThresholdProfileFromTP(t *testing.T) { ID: "TestFilter3", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1003"}, }, @@ -423,8 +423,8 @@ func testV1FIdxCaUpdateThresholdProfileFromTP(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1002", - utils.EventType: utils.BalanceUpdate, + utils.AccountField: "1002", + utils.EventType: utils.BalanceUpdate, }, }, Opts: map[string]interface{}{ @@ -444,8 +444,8 @@ func testV1FIdxCaUpdateThresholdProfileFromTP(t *testing.T) { Tenant: "cgrates.org", ID: "event3", Event: map[string]interface{}{ - utils.Account: "1003", - utils.EventType: utils.BalanceUpdate, + utils.AccountField: "1003", + utils.EventType: utils.BalanceUpdate, }, }, Opts: map[string]interface{}{ @@ -470,8 +470,8 @@ func testV1FIdxCaRemoveThresholdProfile(t *testing.T) { Tenant: "cgrates.org", ID: "event8", Event: map[string]interface{}{ - utils.Account: "1002", - utils.EventType: utils.AccountUpdate, + utils.AccountField: "1002", + utils.EventType: utils.AccountUpdate, }, }, Opts: map[string]interface{}{ @@ -493,8 +493,8 @@ func testV1FIdxCaRemoveThresholdProfile(t *testing.T) { Tenant: "cgrates.org", ID: "event9", Event: map[string]interface{}{ - utils.Account: "1003", - utils.EventType: utils.BalanceUpdate, + utils.AccountField: "1003", + utils.EventType: utils.BalanceUpdate, }, }, Opts: map[string]interface{}{ @@ -554,8 +554,8 @@ func testV1FIdxCaGetStatQueuesWithNotFound(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EventType: utils.AccountUpdate, - utils.Account: "1001", + utils.EventType: utils.AccountUpdate, + utils.AccountField: "1001", }, }, Opts: map[string]interface{}{ @@ -583,7 +583,7 @@ func testV1FIdxCaSetStatQueueProfile(t *testing.T) { ID: "FLTR_1", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1001"}, }, @@ -639,9 +639,9 @@ func testV1FIdxCaSetStatQueueProfile(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EventType: utils.AccountUpdate, - utils.Account: "1001", - "Val": 10, + utils.EventType: utils.AccountUpdate, + utils.AccountField: "1001", + "Val": 10, }, }, Opts: map[string]interface{}{ @@ -668,10 +668,10 @@ func testV1FIdxCaGetStatQueuesFromTP(t *testing.T) { Tenant: "cgrates.org", ID: "event2", Event: map[string]interface{}{ - utils.Account: "1002", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 45 * time.Second, - utils.Cost: 12.1, + utils.AccountField: "1002", + utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.Usage: 45 * time.Second, + utils.Cost: 12.1, }, }, }, @@ -687,10 +687,10 @@ func testV1FIdxCaGetStatQueuesFromTP(t *testing.T) { Tenant: "cgrates.org", ID: "event3", Event: map[string]interface{}{ - utils.Account: "1002", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 45 * time.Second, - utils.Cost: 12.1, + utils.AccountField: "1002", + utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.Usage: 45 * time.Second, + utils.Cost: 12.1, }, }, }, @@ -707,11 +707,11 @@ func testV1FIdxCaGetStatQueuesFromTP(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EventType: utils.AccountUpdate, - utils.Account: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 45 * time.Second, - utils.Cost: 12.1, + utils.EventType: utils.AccountUpdate, + utils.AccountField: "1001", + utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.Usage: 45 * time.Second, + utils.Cost: 12.1, }, }, Opts: map[string]interface{}{ @@ -730,11 +730,11 @@ func testV1FIdxCaGetStatQueuesFromTP(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EventType: utils.AccountUpdate, - utils.Account: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 45 * time.Second, - utils.Cost: 12.1, + utils.EventType: utils.AccountUpdate, + utils.AccountField: "1001", + utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.Usage: 45 * time.Second, + utils.Cost: 12.1, }, }, Opts: map[string]interface{}{ @@ -756,7 +756,7 @@ func testV1FIdxCaUpdateStatQueueProfile(t *testing.T) { ID: "FLTR_2", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1003"}, }, @@ -812,9 +812,9 @@ func testV1FIdxCaUpdateStatQueueProfile(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EventType: utils.BalanceUpdate, - utils.Account: "1003", - "Val": 10, + utils.EventType: utils.BalanceUpdate, + utils.AccountField: "1003", + "Val": 10, }, }, Opts: map[string]interface{}{ @@ -836,7 +836,7 @@ func testV1FIdxCaUpdateStatQueueProfileFromTP(t *testing.T) { ID: "FLTR_3", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1003"}, }, @@ -876,11 +876,11 @@ func testV1FIdxCaUpdateStatQueueProfileFromTP(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EventType: utils.AccountUpdate, - utils.Account: "1003", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 45 * time.Second, - utils.Cost: 12.1, + utils.EventType: utils.AccountUpdate, + utils.AccountField: "1003", + utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.Usage: 45 * time.Second, + utils.Cost: 12.1, }, }, Opts: map[string]interface{}{ @@ -907,9 +907,9 @@ func testV1FIdxCaRemoveStatQueueProfile(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EventType: utils.BalanceUpdate, - utils.Account: "1003", - "Val": 10, + utils.EventType: utils.BalanceUpdate, + utils.AccountField: "1003", + "Val": 10, }, }, Opts: map[string]interface{}{ @@ -929,11 +929,11 @@ func testV1FIdxCaRemoveStatQueueProfile(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EventType: utils.AccountUpdate, - utils.Account: "1003", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 45 * time.Second, - utils.Cost: 12.1, + utils.EventType: utils.AccountUpdate, + utils.AccountField: "1003", + utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.Usage: 45 * time.Second, + utils.Cost: 12.1, }, }, Opts: map[string]interface{}{ @@ -994,8 +994,8 @@ func testV1FIdxCaProcessAttributeProfileEventWithNotFound(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSProcessEvent", Event: map[string]interface{}{ - utils.Account: "3009", - utils.Destination: "+492511231234", + utils.AccountField: "3009", + utils.Destination: "+492511231234", }, }, }, @@ -1014,7 +1014,7 @@ func testV1FIdxCaSetAttributeProfile(t *testing.T) { ID: "TestFilter", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1009"}, }, @@ -1046,7 +1046,7 @@ func testV1FIdxCaSetAttributeProfile(t *testing.T) { }, Attributes: []*engine.Attribute{ { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), }, { @@ -1070,8 +1070,8 @@ func testV1FIdxCaSetAttributeProfile(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSProcessEvent", Event: map[string]interface{}{ - utils.Account: "1009", - utils.Destination: "+491511231234", + utils.AccountField: "1009", + utils.Destination: "+491511231234", }, }, }, @@ -1092,8 +1092,8 @@ func testV1FIdxCaGetAttributeProfileFromTP(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSProcessEvent", Event: map[string]interface{}{ - utils.Account: "1007", - utils.Destination: "+491511231234", + utils.AccountField: "1007", + utils.Destination: "+491511231234", }, }, }, @@ -1111,7 +1111,7 @@ func testV1FIdxCaUpdateAttributeProfile(t *testing.T) { ID: "TestFilter2", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"2009"}, }, @@ -1143,7 +1143,7 @@ func testV1FIdxCaUpdateAttributeProfile(t *testing.T) { }, Attributes: []*engine.Attribute{ { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), }, { @@ -1167,8 +1167,8 @@ func testV1FIdxCaUpdateAttributeProfile(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSProcessEvent", Event: map[string]interface{}{ - utils.Account: "2009", - utils.Destination: "+492511231234", + utils.AccountField: "2009", + utils.Destination: "+492511231234", }, }, }, @@ -1186,7 +1186,7 @@ func testV1FIdxCaUpdateAttributeProfileFromTP(t *testing.T) { ID: "TestFilter3", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"3009"}, }, @@ -1227,8 +1227,8 @@ func testV1FIdxCaUpdateAttributeProfileFromTP(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSProcessEvent", Event: map[string]interface{}{ - utils.Account: "3009", - utils.Destination: "+492511231234", + utils.AccountField: "3009", + utils.Destination: "+492511231234", }, }, }, @@ -1248,8 +1248,8 @@ func testV1FIdxCaRemoveAttributeProfile(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSProcessEvent", Event: map[string]interface{}{ - utils.Account: "3009", - utils.Destination: "+492511231234", + utils.AccountField: "3009", + utils.Destination: "+492511231234", }, }, }, @@ -1266,8 +1266,8 @@ func testV1FIdxCaRemoveAttributeProfile(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSProcessEvent", Event: map[string]interface{}{ - utils.Account: "2009", - utils.Destination: "+492511231234", + utils.AccountField: "2009", + utils.Destination: "+492511231234", }, }, }, @@ -1324,9 +1324,9 @@ func testV1FIdxCaGetResourceProfileWithNotFound(t *testing.T) { Tenant: "cgrates.org", ID: utils.UUIDSha1Prefix(), Event: map[string]interface{}{ - utils.Account: "1002", - utils.Subject: "1001", - utils.Destination: "1002"}, + utils.AccountField: "1002", + utils.Subject: "1001", + utils.Destination: "1002"}, }, }, Units: 6, @@ -1358,7 +1358,7 @@ func testV1FIdxCaSetResourceProfile(t *testing.T) { ID: "FLTR_RES_RCFG1", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1001"}, }, @@ -1413,9 +1413,9 @@ func testV1FIdxCaSetResourceProfile(t *testing.T) { Tenant: "cgrates.org", ID: utils.UUIDSha1Prefix(), Event: map[string]interface{}{ - utils.Account: "1001", - utils.Subject: "1002", - utils.Destination: "1001"}, + utils.AccountField: "1001", + utils.Subject: "1002", + utils.Destination: "1001"}, }, }, Units: 6, @@ -1444,9 +1444,9 @@ func testV1FIdxCaGetResourceProfileFromTP(t *testing.T) { Tenant: "cgrates.org", ID: utils.UUIDSha1Prefix(), Event: map[string]interface{}{ - utils.Account: "1001", - utils.Subject: "1002", - utils.Destination: "1001"}, + utils.AccountField: "1001", + utils.Subject: "1002", + utils.Destination: "1001"}, }, }, Units: 6, @@ -1471,9 +1471,9 @@ func testV1FIdxCaGetResourceProfileFromTP(t *testing.T) { Tenant: "cgrates.org", ID: utils.UUIDSha1Prefix(), Event: map[string]interface{}{ - utils.Account: "1002", - utils.Subject: "1001", - utils.Destination: "1002"}, + utils.AccountField: "1002", + utils.Subject: "1001", + utils.Destination: "1002"}, }, }, Units: 6, @@ -1493,7 +1493,7 @@ func testV1FIdxCaUpdateResourceProfile(t *testing.T) { ID: "FLTR_RES_RCFG2", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"2002"}, }, @@ -1549,9 +1549,9 @@ func testV1FIdxCaUpdateResourceProfile(t *testing.T) { Tenant: "cgrates.org", ID: utils.UUIDSha1Prefix(), Event: map[string]interface{}{ - utils.Account: "2002", - utils.Subject: "2001", - utils.Destination: "2002"}, + utils.AccountField: "2002", + utils.Subject: "2001", + utils.Destination: "2002"}, }, }, Units: 6, @@ -1571,7 +1571,7 @@ func testV1FIdxCaUpdateResourceProfileFromTP(t *testing.T) { ID: "FLTR_RES_RCFG3", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1002"}, }, @@ -1617,9 +1617,9 @@ func testV1FIdxCaUpdateResourceProfileFromTP(t *testing.T) { Tenant: "cgrates.org", ID: utils.UUIDSha1Prefix(), Event: map[string]interface{}{ - utils.Account: "1002", - utils.Subject: "1001", - utils.Destination: "1002"}, + utils.AccountField: "1002", + utils.Subject: "1001", + utils.Destination: "1002"}, }, }, Units: 6, @@ -1640,9 +1640,9 @@ func testV1FIdxCaRemoveResourceProfile(t *testing.T) { Tenant: "cgrates.org", ID: utils.UUIDSha1Prefix(), Event: map[string]interface{}{ - utils.Account: "2002", - utils.Subject: "2001", - utils.Destination: "2002"}, + utils.AccountField: "2002", + utils.Subject: "2001", + utils.Destination: "2002"}, }, }, Units: 6, @@ -1664,9 +1664,9 @@ func testV1FIdxCaRemoveResourceProfile(t *testing.T) { Tenant: "cgrates.org", ID: utils.UUIDSha1Prefix(), Event: map[string]interface{}{ - utils.Account: "1002", - utils.Subject: "1001", - utils.Destination: "1002"}, + utils.AccountField: "1002", + utils.Subject: "1001", + utils.Destination: "1002"}, }, }, Units: 6, diff --git a/apier/v1/remote_it_test.go b/apier/v1/remote_it_test.go index 2cc7d2087..8dece30f1 100644 --- a/apier/v1/remote_it_test.go +++ b/apier/v1/remote_it_test.go @@ -473,7 +473,7 @@ func testInternalRemoteITGetFilter(t *testing.T) { Rules: []*engine.FilterRule{ { Type: utils.MetaString, - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Values: []string{"1001"}, }, }, @@ -897,7 +897,7 @@ func testInternalMatchThreshold(t *testing.T) { Tenant: "cgrates.org", ID: "event2", Event: map[string]interface{}{ - utils.Account: "1002", + utils.AccountField: "1002", }, }, }, @@ -915,7 +915,7 @@ func testInternalMatchThreshold(t *testing.T) { Tenant: "cgrates.org", ID: "event2", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", }, }, }, @@ -932,7 +932,7 @@ func testInternalMatchThreshold(t *testing.T) { Tenant: "cgrates.org", ID: "event3", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", }, }, }, diff --git a/apier/v1/replicate_it_test.go b/apier/v1/replicate_it_test.go index 1feb61ab3..d293d790a 100644 --- a/apier/v1/replicate_it_test.go +++ b/apier/v1/replicate_it_test.go @@ -1213,7 +1213,7 @@ func testInternalReplicateITThreshold(t *testing.T) { ID: "event1", Event: map[string]interface{}{ utils.EventType: utils.AccountUpdate, - utils.Account: "1005", + utils.AccountField: "1005", utils.AllowNegative: true, utils.Disabled: false, utils.Units: 12.3}, @@ -1469,7 +1469,7 @@ func testInternalReplicateITLoadIds(t *testing.T) { Attributes: []*engine.Attribute{ { FilterIDs: []string{"*string:~*req.Account:1008"}, - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("1001", utils.INFIELD_SEP), }, { diff --git a/apier/v1/routes_it_test.go b/apier/v1/routes_it_test.go index 69443ac62..dffa41c7b 100644 --- a/apier/v1/routes_it_test.go +++ b/apier/v1/routes_it_test.go @@ -161,8 +161,8 @@ func testV1RouteGetWeightRoutes(t *testing.T) { Tenant: "cgrates.org", ID: "testV1RouteGetWeightRoutes", Event: map[string]interface{}{ - utils.Account: "1007", - utils.Destination: "+491511231234", + utils.AccountField: "1007", + utils.Destination: "+491511231234", }, }, }, @@ -212,11 +212,11 @@ func testV1RouteGetLeastCostRoutes(t *testing.T) { Tenant: "cgrates.org", ID: "testV1RouteGetLeastCostRoutes", Event: map[string]interface{}{ - utils.Account: "1003", - utils.Subject: "1003", - utils.Destination: "1002", - utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), - utils.Usage: "1m20s", + utils.AccountField: "1003", + utils.Subject: "1003", + utils.Destination: "1002", + utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), + utils.Usage: "1m20s", }, }, }, @@ -269,10 +269,10 @@ func testV1RouteGetLeastCostRoutesWithoutUsage(t *testing.T) { Tenant: "cgrates.org", ID: "testV1RouteGetLeastCostRoutes", Event: map[string]interface{}{ - utils.Account: "1003", - utils.Subject: "1003", - utils.Destination: "1002", - utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), + utils.AccountField: "1003", + utils.Subject: "1003", + utils.Destination: "1002", + utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), }, }, }, @@ -326,11 +326,11 @@ func testV1RouteGetLeastCostRoutesWithMaxCost(t *testing.T) { Tenant: "cgrates.org", ID: "testV1RouteGetLeastCostRoutes", Event: map[string]interface{}{ - utils.Account: "1003", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), - utils.Usage: "1m20s", + utils.AccountField: "1003", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), + utils.Usage: "1m20s", }, }, }, @@ -376,11 +376,11 @@ func testV1RouteGetLeastCostRoutesWithMaxCostNotFound(t *testing.T) { Tenant: "cgrates.org", ID: "testV1RouteGetLeastCostRoutes", Event: map[string]interface{}{ - utils.Account: "1003", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), - utils.Usage: "1m20s", + utils.AccountField: "1003", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), + utils.Usage: "1m20s", }, }, }, @@ -400,12 +400,12 @@ func testV1RouteGetLeastCostRoutesWithMaxCost2(t *testing.T) { Tenant: "cgrates.org", ID: "testV1RouteGetLeastCostRoutes", Event: map[string]interface{}{ - utils.Account: "1003", - utils.Subject: "SPECIAL_1002", - utils.Destination: "1002", - utils.SetupTime: time.Date(2014, 01, 14, 0, 0, 0, 0, time.UTC), - utils.Usage: "10m20s", - utils.Category: "call", + utils.AccountField: "1003", + utils.Subject: "SPECIAL_1002", + utils.Destination: "1002", + utils.SetupTime: time.Date(2014, 01, 14, 0, 0, 0, 0, time.UTC), + utils.Usage: "10m20s", + utils.Category: "call", }, }, }, @@ -450,11 +450,11 @@ func testV1RouteGetHighestCostRoutes(t *testing.T) { Tenant: "cgrates.org", ID: "testV1RouteGetHighestCostRoutes", Event: map[string]interface{}{ - utils.Account: "1003", - utils.Destination: "1002", - utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), - utils.Usage: "1m20s", - "DistinctMatch": "*highest_cost", + utils.AccountField: "1003", + utils.Destination: "1002", + utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), + utils.Usage: "1m20s", + "DistinctMatch": "*highest_cost", }, }, }, @@ -508,10 +508,10 @@ func testV1RouteGetLeastCostRoutesErr(t *testing.T) { Tenant: "cgrates.org", ID: "testV1RouteGetHighestCostRoutes", Event: map[string]interface{}{ - utils.Account: "1000", - utils.Destination: "1001", - utils.SetupTime: "*now", - "Subject": "TEST", + utils.AccountField: "1000", + utils.Destination: "1001", + utils.SetupTime: "*now", + "Subject": "TEST", }, }, }, @@ -532,10 +532,10 @@ func testV1RoutePolulateStatsForQOS(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 11 * time.Second, - utils.COST: 10.0, + 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, }, }, }, @@ -553,10 +553,10 @@ func testV1RoutePolulateStatsForQOS(t *testing.T) { Tenant: "cgrates.org", ID: "event2", Event: map[string]interface{}{ - utils.Account: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 11 * time.Second, - utils.COST: 10.5, + 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, }, }, }, @@ -574,10 +574,10 @@ func testV1RoutePolulateStatsForQOS(t *testing.T) { Tenant: "cgrates.org", ID: "event2", Event: map[string]interface{}{ - utils.Account: "1002", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 5 * time.Second, - utils.COST: 12.5, + 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, }, }, }, @@ -595,10 +595,10 @@ func testV1RoutePolulateStatsForQOS(t *testing.T) { Tenant: "cgrates.org", ID: "event2", Event: map[string]interface{}{ - utils.Account: "1002", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 6 * time.Second, - utils.COST: 17.5, + 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, }, }, }, @@ -616,10 +616,10 @@ func testV1RoutePolulateStatsForQOS(t *testing.T) { Tenant: "cgrates.org", ID: "event3", Event: map[string]interface{}{ - utils.Account: "1003", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 11 * time.Second, - utils.COST: 12.5, + 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, }, }, }, @@ -814,11 +814,11 @@ func testV1RouteGetQOSRoutesFiltred2(t *testing.T) { Tenant: "cgrates.org", ID: "testV1RouteGetQOSRoutes", Event: map[string]interface{}{ - "DistinctMatch": "*qos_filtred2", - utils.Account: "1003", - utils.Destination: "1002", - utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), - utils.Usage: "1m20s", + "DistinctMatch": "*qos_filtred2", + utils.AccountField: "1003", + utils.Destination: "1002", + utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), + utils.Usage: "1m20s", }, }, }, @@ -851,8 +851,8 @@ func testV1RouteGetRouteWithoutFilter(t *testing.T) { Tenant: "cgrates.org", ID: "testV1RouteGetRouteWithoutFilter", Event: map[string]interface{}{ - utils.Account: "1008", - utils.Destination: "+49", + utils.AccountField: "1008", + utils.Destination: "+49", }, }, }, @@ -1050,10 +1050,10 @@ func testV1RouteGetRouteForEvent(t *testing.T) { Tenant: "cgrates.org", ID: "testV1RouteGetHighestCostRoutes", Event: map[string]interface{}{ - utils.Account: "1000", - utils.Destination: "1001", - utils.SetupTime: "*now", - utils.Subject: "TEST", + utils.AccountField: "1000", + utils.Destination: "1001", + utils.SetupTime: "*now", + utils.Subject: "TEST", }, }, } @@ -1181,10 +1181,10 @@ func testV1RoutesOneRouteWithoutDestination(t *testing.T) { Tenant: "cgrates.org", ID: "testV1RoutesOneRouteWithoutDestination", Event: map[string]interface{}{ - utils.Account: "SpecialCase", - utils.Destination: "+24680", - utils.SetupTime: utils.MetaNow, - utils.Usage: "2m", + utils.AccountField: "SpecialCase", + utils.Destination: "+24680", + utils.SetupTime: utils.MetaNow, + utils.Usage: "2m", }, }, }, @@ -1259,11 +1259,11 @@ func testV1RouteMultipleRouteSameID(t *testing.T) { Time: &tNow, ID: "testV1RouteMultipleRouteSameID", Event: map[string]interface{}{ - utils.Account: "SpecialCase2", - utils.Destination: "+135876", - utils.SetupTime: utils.MetaNow, - utils.Usage: "2m", - "Month": "April", + utils.AccountField: "SpecialCase2", + utils.Destination: "+135876", + utils.SetupTime: utils.MetaNow, + utils.Usage: "2m", + "Month": "April", }, }, }, @@ -1299,11 +1299,11 @@ func testV1RouteMultipleRouteSameID(t *testing.T) { Time: &tNow, ID: "testV1RouteMultipleRouteSameID", Event: map[string]interface{}{ - utils.Account: "SpecialCase2", - utils.Destination: "+135876", - utils.SetupTime: utils.MetaNow, - utils.Usage: "2m", - "Month": "May", + utils.AccountField: "SpecialCase2", + utils.Destination: "+135876", + utils.SetupTime: utils.MetaNow, + utils.Usage: "2m", + "Month": "May", }, }, }, @@ -1399,11 +1399,11 @@ func testV1RouteAccountWithRatingPlan(t *testing.T) { Time: &tNow, ID: "testV1RouteAccountWithRatingPlan", Event: map[string]interface{}{ - utils.Account: "RandomAccount", - utils.Destination: "+135876", - utils.SetupTime: utils.MetaNow, - utils.Usage: "30s", - "EventType": "testV1RouteAccountWithRatingPlan", + utils.AccountField: "RandomAccount", + utils.Destination: "+135876", + utils.SetupTime: utils.MetaNow, + utils.Usage: "30s", + "EventType": "testV1RouteAccountWithRatingPlan", }, }, }, @@ -1416,10 +1416,10 @@ func testV1RouteAccountWithRatingPlan(t *testing.T) { { RouteID: "RouteWithAccAndRP", SortingData: map[string]interface{}{ - utils.Account: "AccWithVoice", - utils.Cost: 0.0, - "MaxUsage": 30000000000.0, - utils.Weight: 20.0, + utils.AccountField: "AccWithVoice", + utils.Cost: 0.0, + "MaxUsage": 30000000000.0, + utils.Weight: 20.0, }, }, { @@ -1437,10 +1437,10 @@ func testV1RouteAccountWithRatingPlan(t *testing.T) { { RouteID: "RouteWithAccAndRP", SortingData: map[string]interface{}{ - utils.Account: "AccWithVoice", - utils.Cost: 0., - "MaxUsage": 30 * time.Second, - utils.Weight: 20., + utils.AccountField: "AccWithVoice", + utils.Cost: 0., + "MaxUsage": 30 * time.Second, + utils.Weight: 20., }, }, { @@ -1471,11 +1471,11 @@ func testV1RouteAccountWithRatingPlan(t *testing.T) { Time: &tNow, ID: "testV1RouteAccountWithRatingPlan", Event: map[string]interface{}{ - utils.Account: "RandomAccount", - utils.Destination: "+135876", - utils.SetupTime: utils.MetaNow, - utils.Usage: "60s", - "EventType": "testV1RouteAccountWithRatingPlan", + utils.AccountField: "RandomAccount", + utils.Destination: "+135876", + utils.SetupTime: utils.MetaNow, + utils.Usage: "60s", + "EventType": "testV1RouteAccountWithRatingPlan", }, }, }, @@ -1488,11 +1488,11 @@ func testV1RouteAccountWithRatingPlan(t *testing.T) { { RouteID: "RouteWithAccAndRP", SortingData: map[string]interface{}{ - utils.Account: "AccWithVoice", - utils.Cost: 0.6, - "MaxUsage": 30000000000.0, - "RatingPlanID": "RP_ANY2CNT_SEC", - utils.Weight: 20.0, + utils.AccountField: "AccWithVoice", + utils.Cost: 0.6, + "MaxUsage": 30000000000.0, + "RatingPlanID": "RP_ANY2CNT_SEC", + utils.Weight: 20.0, }, }, { @@ -1510,11 +1510,11 @@ func testV1RouteAccountWithRatingPlan(t *testing.T) { { RouteID: "RouteWithAccAndRP", SortingData: map[string]interface{}{ - utils.Account: "AccWithVoice", - utils.Cost: 0.6, - "MaxUsage": 30 * time.Second, - "RatingPlanID": "RP_ANY2CNT_SEC", - utils.Weight: 20., + utils.AccountField: "AccWithVoice", + utils.Cost: 0.6, + "MaxUsage": 30 * time.Second, + "RatingPlanID": "RP_ANY2CNT_SEC", + utils.Weight: 20., }, }, { @@ -1545,11 +1545,11 @@ func testV1RouteAccountWithRatingPlan(t *testing.T) { Time: &tNow, ID: "testV1RouteAccountWithRatingPlan", Event: map[string]interface{}{ - utils.Account: "RandomAccount", - utils.Destination: "+135876", - utils.SetupTime: utils.MetaNow, - utils.Usage: "1m1s", - "EventType": "testV1RouteAccountWithRatingPlan", + utils.AccountField: "RandomAccount", + utils.Destination: "+135876", + utils.SetupTime: utils.MetaNow, + utils.Usage: "1m1s", + "EventType": "testV1RouteAccountWithRatingPlan", }, }, }, @@ -1570,11 +1570,11 @@ func testV1RouteAccountWithRatingPlan(t *testing.T) { { RouteID: "RouteWithAccAndRP", SortingData: map[string]interface{}{ - utils.Account: "AccWithVoice", - utils.Cost: 0.62, - "MaxUsage": 30000000000.0, - "RatingPlanID": "RP_ANY2CNT_SEC", - utils.Weight: 20.0, + utils.AccountField: "AccWithVoice", + utils.Cost: 0.62, + "MaxUsage": 30000000000.0, + "RatingPlanID": "RP_ANY2CNT_SEC", + utils.Weight: 20.0, }, }, }, @@ -1592,11 +1592,11 @@ func testV1RouteAccountWithRatingPlan(t *testing.T) { { RouteID: "RouteWithAccAndRP", SortingData: map[string]interface{}{ - utils.Account: "AccWithVoice", - utils.Cost: 0.62, - "MaxUsage": 30 * time.Second, - "RatingPlanID": "RP_ANY2CNT_SEC", - utils.Weight: 20., + utils.AccountField: "AccWithVoice", + utils.Cost: 0.62, + "MaxUsage": 30 * time.Second, + "RatingPlanID": "RP_ANY2CNT_SEC", + utils.Weight: 20., }, }, } diff --git a/apier/v1/routes_with_rates_it_test.go b/apier/v1/routes_with_rates_it_test.go index 2761d234b..bddb85b42 100644 --- a/apier/v1/routes_with_rates_it_test.go +++ b/apier/v1/routes_with_rates_it_test.go @@ -115,12 +115,12 @@ func testV1RouteSWithRateSGetRoutes(t *testing.T) { Tenant: "cgrates.org", ID: "testV1RouteSWithRateSGetRoutes", Event: map[string]interface{}{ - utils.Account: "1003", - utils.Subject: "1003", - utils.Destination: "1002", - utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), - utils.Usage: "1m20s", - "EventName": "RouteWithRateS", + utils.AccountField: "1003", + utils.Subject: "1003", + utils.Destination: "1002", + utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), + utils.Usage: "1m20s", + "EventName": "RouteWithRateS", }, }, }, @@ -233,11 +233,11 @@ func testV1RouteSWithRateSAccountWithRateProfile(t *testing.T) { Time: &tNow, ID: "testV1RouteAccountWithRatingPlan", Event: map[string]interface{}{ - utils.Account: "RandomAccount", - utils.Destination: "+135876", - utils.SetupTime: utils.MetaNow, - utils.Usage: "30s", - "EventType": "testV1RouteSWithRateSAccountWithRateProfile", + utils.AccountField: "RandomAccount", + utils.Destination: "+135876", + utils.SetupTime: utils.MetaNow, + utils.Usage: "30s", + "EventType": "testV1RouteSWithRateSAccountWithRateProfile", }, }, }, @@ -250,10 +250,10 @@ func testV1RouteSWithRateSAccountWithRateProfile(t *testing.T) { { RouteID: "RouteWithAccAndRatePrf", SortingData: map[string]interface{}{ - utils.Account: "AccWithVoice", - utils.Cost: 0.0, - utils.CapMaxUsage: 30000000000.0, - utils.Weight: 20.0, + utils.AccountField: "AccWithVoice", + utils.Cost: 0.0, + utils.CapMaxUsage: 30000000000.0, + utils.Weight: 20.0, }, }, { @@ -287,11 +287,11 @@ func testV1RouteSWithRateSAccountWithRateProfile(t *testing.T) { Time: &tNow, ID: "testV1RouteAccountWithRatingPlan", Event: map[string]interface{}{ - utils.Account: "RandomAccount", - utils.Destination: "+135876", - utils.SetupTime: utils.MetaNow, - utils.Usage: "60s", - "EventType": "testV1RouteSWithRateSAccountWithRateProfile", + utils.AccountField: "RandomAccount", + utils.Destination: "+135876", + utils.SetupTime: utils.MetaNow, + utils.Usage: "60s", + "EventType": "testV1RouteSWithRateSAccountWithRateProfile", }, }, }, @@ -304,7 +304,7 @@ func testV1RouteSWithRateSAccountWithRateProfile(t *testing.T) { { RouteID: "RouteWithAccAndRatePrf", SortingData: map[string]interface{}{ - utils.Account: "AccWithVoice", + utils.AccountField: "AccWithVoice", utils.Cost: 0.6, utils.CapMaxUsage: 30000000000.0, utils.RateProfileMatched: "RT_ANY2CNT_SEC", @@ -342,11 +342,11 @@ func testV1RouteSWithRateSAccountWithRateProfile(t *testing.T) { Time: &tNow, ID: "testV1RouteAccountWithRatingPlan", Event: map[string]interface{}{ - utils.Account: "RandomAccount", - utils.Destination: "+135876", - utils.SetupTime: utils.MetaNow, - utils.Usage: "1m1s", - "EventType": "testV1RouteSWithRateSAccountWithRateProfile", + utils.AccountField: "RandomAccount", + utils.Destination: "+135876", + utils.SetupTime: utils.MetaNow, + utils.Usage: "1m1s", + "EventType": "testV1RouteSWithRateSAccountWithRateProfile", }, }, }, @@ -367,7 +367,7 @@ func testV1RouteSWithRateSAccountWithRateProfile(t *testing.T) { { RouteID: "RouteWithAccAndRatePrf", SortingData: map[string]interface{}{ - utils.Account: "AccWithVoice", + utils.AccountField: "AccWithVoice", utils.Cost: 0.62, utils.CapMaxUsage: 30000000000.0, utils.RateProfileMatched: "RT_ANY2CNT_SEC", @@ -426,12 +426,12 @@ func testV1RouteSWithRateSWithEmptyRateProfileIDs(t *testing.T) { Tenant: "cgrates.org", ID: "testV1RouteSWithRateSGetRoutes", Event: map[string]interface{}{ - utils.Account: "1003", - utils.Subject: "1003", - utils.Destination: "1002", - utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), - utils.Usage: "1m20s", - "EventName": "testV1RouteSWithRateSWithEmptyRateProfileIDs", + utils.AccountField: "1003", + utils.Subject: "1003", + utils.Destination: "1002", + utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), + utils.Usage: "1m20s", + "EventName": "testV1RouteSWithRateSWithEmptyRateProfileIDs", }, }, }, diff --git a/apier/v1/sessions_process_event_it_test.go b/apier/v1/sessions_process_event_it_test.go index d8d128ce8..c150bb8eb 100644 --- a/apier/v1/sessions_process_event_it_test.go +++ b/apier/v1/sessions_process_event_it_test.go @@ -168,15 +168,15 @@ func testSSv1ItProcessEventAuth(t *testing.T) { Tenant: "cgrates.org", ID: "testSSv1ItProcessEventAuth", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testSSv1ItProcessEvent", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), - utils.Usage: authUsage, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testSSv1ItProcessEvent", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), + utils.Usage: authUsage, }, }, }, @@ -228,17 +228,17 @@ func testSSv1ItProcessEventAuth(t *testing.T) { Tenant: "cgrates.org", ID: "testSSv1ItProcessEventAuth", Event: map[string]interface{}{ - utils.CGRID: "4be779c004d9f784e836db9ffd41b50319d71fe8", - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - "OfficeGroup": "Marketing", - utils.OriginID: "testSSv1ItProcessEvent", - utils.RequestType: sSV1RequestType, - utils.SetupTime: "2018-01-07T17:00:00Z", - utils.Usage: 300000000000.0, + utils.CGRID: "4be779c004d9f784e836db9ffd41b50319d71fe8", + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + "OfficeGroup": "Marketing", + utils.OriginID: "testSSv1ItProcessEvent", + utils.RequestType: sSV1RequestType, + utils.SetupTime: "2018-01-07T17:00:00Z", + utils.Usage: 300000000000.0, }, }, }, @@ -262,16 +262,16 @@ func testSSv1ItProcessEventInitiateSession(t *testing.T) { Tenant: "cgrates.org", ID: "testSSv1ItProcessEventInitiateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testSSv1ItProcessEvent", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testSSv1ItProcessEvent", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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, }, }, }, @@ -305,18 +305,18 @@ func testSSv1ItProcessEventInitiateSession(t *testing.T) { Tenant: "cgrates.org", ID: "testSSv1ItProcessEventInitiateSession", Event: map[string]interface{}{ - utils.CGRID: "4be779c004d9f784e836db9ffd41b50319d71fe8", - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - "OfficeGroup": "Marketing", - utils.OriginID: "testSSv1ItProcessEvent", - utils.RequestType: sSV1RequestType, - utils.SetupTime: "2018-01-07T17:00:00Z", - utils.AnswerTime: "2018-01-07T17:00:10Z", - utils.Usage: 300000000000.0, + utils.CGRID: "4be779c004d9f784e836db9ffd41b50319d71fe8", + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + "OfficeGroup": "Marketing", + utils.OriginID: "testSSv1ItProcessEvent", + utils.RequestType: sSV1RequestType, + utils.SetupTime: "2018-01-07T17:00:00Z", + utils.AnswerTime: "2018-01-07T17:00:10Z", + utils.Usage: 300000000000.0, }, }, }, @@ -344,16 +344,16 @@ func testSSv1ItProcessEventUpdateSession(t *testing.T) { Tenant: "cgrates.org", ID: "testSSv1ItProcessEventUpdateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testSSv1ItProcessEvent", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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: reqUsage, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testSSv1ItProcessEvent", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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: reqUsage, }, }, }, @@ -372,18 +372,18 @@ func testSSv1ItProcessEventUpdateSession(t *testing.T) { Tenant: "cgrates.org", ID: "testSSv1ItProcessEventUpdateSession", Event: map[string]interface{}{ - utils.CGRID: "4be779c004d9f784e836db9ffd41b50319d71fe8", - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - "OfficeGroup": "Marketing", - utils.OriginID: "testSSv1ItProcessEvent", - utils.RequestType: sSV1RequestType, - utils.SetupTime: "2018-01-07T17:00:00Z", - utils.AnswerTime: "2018-01-07T17:00:10Z", - utils.Usage: 300000000000.0, + utils.CGRID: "4be779c004d9f784e836db9ffd41b50319d71fe8", + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + "OfficeGroup": "Marketing", + utils.OriginID: "testSSv1ItProcessEvent", + utils.RequestType: sSV1RequestType, + utils.SetupTime: "2018-01-07T17:00:00Z", + utils.AnswerTime: "2018-01-07T17:00:10Z", + utils.Usage: 300000000000.0, }, }, }, @@ -421,16 +421,16 @@ func testSSv1ItProcessEventTerminateSession(t *testing.T) { Tenant: "cgrates.org", ID: "testSSv1ItProcessEventTerminateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testSSv1ItProcessEvent", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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: 10 * time.Minute, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testSSv1ItProcessEvent", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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: 10 * time.Minute, }, }, }, @@ -452,16 +452,16 @@ func testSSv1ItProcessCDRForSessionFromProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "testSSv1ItProcessCDRForSessionFromProcessEvent", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testSSv1ItProcessEvent", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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: 10 * time.Minute, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testSSv1ItProcessEvent", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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: 10 * time.Minute, }, } var rply string @@ -723,16 +723,16 @@ func testSSv1ItProcessEventWithCDR(t *testing.T) { Tenant: "cgrates.org", ID: "testSSv1ItProcessEventWithCDR", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testSSv1ItProcessEventWithCDR", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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: 10 * time.Minute, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testSSv1ItProcessEventWithCDR", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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: 10 * time.Minute, }, }, }, @@ -802,16 +802,16 @@ func testSSv1ItProcessEventWithCDRResourceError(t *testing.T) { Tenant: "cgrates.org", ID: "testSSv1ItProcessEventWithCDRResourceError", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testSSv1ItProcessEventWithCDRResourceError", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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: 10 * time.Minute, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testSSv1ItProcessEventWithCDRResourceError", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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: 10 * time.Minute, }, }, }, @@ -882,16 +882,16 @@ func testSSv1ItProcessEventWithCDRResourceErrorBlockError(t *testing.T) { Tenant: "cgrates.org", ID: "testSSv1ItProcessEventWithCDRResourceErrorBlockError", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testSSv1ItProcessEventWithCDRResourceErrorBlockError", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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: 10 * time.Minute, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testSSv1ItProcessEventWithCDRResourceErrorBlockError", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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: 10 * time.Minute, }, }, }, diff --git a/apier/v1/sessions_thresholds_it_test.go b/apier/v1/sessions_thresholds_it_test.go index a2eb8de12..09c5b9a7c 100755 --- a/apier/v1/sessions_thresholds_it_test.go +++ b/apier/v1/sessions_thresholds_it_test.go @@ -211,10 +211,10 @@ func testSessionSv1ItAuth(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItAuth", Event: map[string]interface{}{ - utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Destination: "1002", + utils.OriginID: "TestSSv1It1", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), }, @@ -274,13 +274,13 @@ func testSessionSv1ItInitiateSession(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItInitiateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Destination: "1002", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), utils.AnswerTime: time.Date(2018, @@ -338,13 +338,13 @@ func testSessionSv1ItTerminateSession(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItTerminateSession", Event: map[string]interface{}{ - utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Destination: "1002", - 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: 10 * time.Minute, + utils.OriginID: "TestSSv1It1", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Destination: "1002", + 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: 10 * time.Minute, }, }, }, @@ -397,10 +397,10 @@ func testSessionSv1ItAuthNotFoundThreshold(t *testing.T) { Tenant: "cgrates.org", ID: "TestSesssonSv1ItNotFoundThreshold", Event: map[string]interface{}{ - utils.OriginID: "TestSesssonSv1ItNotFoundThreshold", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1002", - utils.Destination: "1001", + utils.OriginID: "TestSesssonSv1ItNotFoundThreshold", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1002", + utils.Destination: "1001", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), }, @@ -432,14 +432,14 @@ func testSessionSv1ItInitNotFoundThreshold(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionSv1ItInitNotFoundThreshold", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.DATA, - utils.OriginID: "TestSessionSv1ItInitNotFoundThreshold", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1002", - utils.Subject: "RP_ANY2CNT", - utils.Destination: "1001", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.DATA, + utils.OriginID: "TestSessionSv1ItInitNotFoundThreshold", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1002", + utils.Subject: "RP_ANY2CNT", + utils.Destination: "1001", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), utils.AnswerTime: time.Date(2018, @@ -485,14 +485,14 @@ func testSessionSv1ItTerminateNotFoundThreshold(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionSv1ItTerminateNotFoundThreshold", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.DATA, - utils.OriginID: "TestSessionSv1ItInitNotFoundThreshold", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1002", - utils.Subject: "RP_ANY2CNT", - utils.Destination: "1001", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.DATA, + utils.OriginID: "TestSessionSv1ItInitNotFoundThreshold", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1002", + utils.Subject: "RP_ANY2CNT", + utils.Destination: "1001", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), utils.AnswerTime: time.Date(2018, @@ -535,10 +535,10 @@ func testSessionSv1ItAuthNotFoundThresholdAndStats(t *testing.T) { Tenant: "cgrates.org", ID: "TestSesssonSv1ItNotFoundThreshold", Event: map[string]interface{}{ - utils.OriginID: "TestSesssonSv1ItNotFoundThreshold", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1002", - utils.Destination: "1001", + utils.OriginID: "TestSesssonSv1ItNotFoundThreshold", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1002", + utils.Destination: "1001", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), }, @@ -571,14 +571,14 @@ func testSessionSv1ItInitNotFoundThresholdAndStats(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionSv1ItInitNotFoundThreshold", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.DATA, - utils.OriginID: "TestSessionSv1ItInitNotFoundThreshold", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1002", - utils.Subject: "RP_ANY2CNT", - utils.Destination: "1001", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.DATA, + utils.OriginID: "TestSessionSv1ItInitNotFoundThreshold", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1002", + utils.Subject: "RP_ANY2CNT", + utils.Destination: "1001", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), utils.AnswerTime: time.Date(2018, @@ -625,14 +625,14 @@ func testSessionSv1ItTerminateNotFoundThresholdAndStats(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionSv1ItTerminateNotFoundThreshold", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.DATA, - utils.OriginID: "TestSessionSv1ItInitNotFoundThreshold", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1002", - utils.Subject: "RP_ANY2CNT", - utils.Destination: "1001", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.DATA, + utils.OriginID: "TestSessionSv1ItInitNotFoundThreshold", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1002", + utils.Subject: "RP_ANY2CNT", + utils.Destination: "1001", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), utils.AnswerTime: time.Date(2018, diff --git a/apier/v1/sessionsv1_it_test.go b/apier/v1/sessionsv1_it_test.go index c20bb5b1d..c1c0b1981 100644 --- a/apier/v1/sessionsv1_it_test.go +++ b/apier/v1/sessionsv1_it_test.go @@ -211,15 +211,15 @@ func testSSv1ItAuth(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItAuth", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), - utils.Usage: authUsage, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), + utils.Usage: authUsage, }, }, }, @@ -265,17 +265,17 @@ func testSSv1ItAuth(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItAuth", Event: map[string]interface{}{ - utils.CGRID: "5668666d6b8e44eb949042f25ce0796ec3592ff9", - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - "OfficeGroup": "Marketing", - utils.OriginID: "TestSSv1It1", - utils.RequestType: sSV1RequestType, - utils.SetupTime: "2018-01-07T17:00:00Z", - utils.Usage: 300000000000.0, + utils.CGRID: "5668666d6b8e44eb949042f25ce0796ec3592ff9", + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + "OfficeGroup": "Marketing", + utils.OriginID: "TestSSv1It1", + utils.RequestType: sSV1RequestType, + utils.SetupTime: "2018-01-07T17:00:00Z", + utils.Usage: 300000000000.0, }, }, }, @@ -298,15 +298,15 @@ func testSSv1ItAuthWithDigest(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItAuth", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), - utils.Usage: authUsage, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), + utils.Usage: authUsage, }, }, }, @@ -344,16 +344,16 @@ func testSSv1ItInitiateSession(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItInitiateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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, }, }, }, @@ -381,18 +381,18 @@ func testSSv1ItInitiateSession(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItInitiateSession", Event: map[string]interface{}{ - utils.CGRID: "5668666d6b8e44eb949042f25ce0796ec3592ff9", - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - "OfficeGroup": "Marketing", - utils.OriginID: "TestSSv1It1", - utils.RequestType: sSV1RequestType, - utils.SetupTime: "2018-01-07T17:00:00Z", - utils.AnswerTime: "2018-01-07T17:00:10Z", - utils.Usage: 300000000000.0, + utils.CGRID: "5668666d6b8e44eb949042f25ce0796ec3592ff9", + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + "OfficeGroup": "Marketing", + utils.OriginID: "TestSSv1It1", + utils.RequestType: sSV1RequestType, + utils.SetupTime: "2018-01-07T17:00:00Z", + utils.AnswerTime: "2018-01-07T17:00:10Z", + utils.Usage: 300000000000.0, }, }, }, @@ -420,16 +420,16 @@ func testSSv1ItInitiateSessionWithDigest(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItInitiateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It2", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It2", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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, }, }, }, @@ -471,16 +471,16 @@ func testSSv1ItUpdateSession(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItUpdateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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: reqUsage, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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: reqUsage, }, }, }, @@ -499,18 +499,18 @@ func testSSv1ItUpdateSession(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItUpdateSession", Event: map[string]interface{}{ - utils.CGRID: "5668666d6b8e44eb949042f25ce0796ec3592ff9", - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - "OfficeGroup": "Marketing", - utils.OriginID: "TestSSv1It1", - utils.RequestType: sSV1RequestType, - utils.SetupTime: "2018-01-07T17:00:00Z", - utils.AnswerTime: "2018-01-07T17:00:10Z", - utils.Usage: 300000000000.0, + utils.CGRID: "5668666d6b8e44eb949042f25ce0796ec3592ff9", + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + "OfficeGroup": "Marketing", + utils.OriginID: "TestSSv1It1", + utils.RequestType: sSV1RequestType, + utils.SetupTime: "2018-01-07T17:00:00Z", + utils.AnswerTime: "2018-01-07T17:00:10Z", + utils.Usage: 300000000000.0, }, }, }, @@ -542,16 +542,16 @@ func testSSv1ItTerminateSession(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItUpdateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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: 10 * time.Minute, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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: 10 * time.Minute, }, }, }, @@ -577,16 +577,16 @@ func testSSv1ItProcessCDR(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItProcessCDR", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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: 10 * time.Minute, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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: 10 * time.Minute, }, }, } @@ -612,17 +612,17 @@ func testSSv1ItProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItProcessEvent", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It2", - utils.OriginHost: "TestSSv1It3", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It2", + utils.OriginHost: "TestSSv1It3", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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, }, }, }, @@ -650,19 +650,19 @@ func testSSv1ItProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItProcessEvent", Event: map[string]interface{}{ - utils.CGRID: "f7f5cf1029905f9b98be1a608e4bd975b8e51413", - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - "OfficeGroup": "Marketing", - utils.OriginID: "TestSSv1It2", - utils.OriginHost: "TestSSv1It3", - utils.RequestType: sSV1RequestType, - utils.SetupTime: "2018-01-07T17:00:00Z", - utils.AnswerTime: "2018-01-07T17:00:10Z", - utils.Usage: 300000000000.0, + utils.CGRID: "f7f5cf1029905f9b98be1a608e4bd975b8e51413", + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + "OfficeGroup": "Marketing", + utils.OriginID: "TestSSv1It2", + utils.OriginHost: "TestSSv1It3", + utils.RequestType: sSV1RequestType, + utils.SetupTime: "2018-01-07T17:00:00Z", + utils.AnswerTime: "2018-01-07T17:00:10Z", + utils.Usage: 300000000000.0, }, }, }, @@ -804,17 +804,17 @@ func testSSv1ItForceUpdateSession(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItUpdateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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: reqUsage, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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: reqUsage, }, }, }, @@ -833,19 +833,19 @@ func testSSv1ItForceUpdateSession(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItUpdateSession", Event: map[string]interface{}{ - utils.CGRID: "70876773b294f0e1476065f8d18bb9ec6bcb3d5f", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - "OfficeGroup": "Marketing", - utils.OriginID: "TestSSv1It", - utils.RequestType: sSV1RequestType, - utils.SetupTime: "2018-01-07T17:00:00Z", - utils.AnswerTime: "2018-01-07T17:00:10Z", - utils.Usage: 300000000000.0, + utils.CGRID: "70876773b294f0e1476065f8d18bb9ec6bcb3d5f", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + "OfficeGroup": "Marketing", + utils.OriginID: "TestSSv1It", + utils.RequestType: sSV1RequestType, + utils.SetupTime: "2018-01-07T17:00:00Z", + utils.AnswerTime: "2018-01-07T17:00:10Z", + utils.Usage: 300000000000.0, }, }, }, @@ -965,17 +965,17 @@ func testSSv1ItDynamicDebit(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItInitiateSession2", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestDynamicTDebit", - utils.RequestType: sSV1RequestType, - utils.Account: "TestDynamicDebit", - utils.Subject: "TEST", - utils.Destination: "TEST", - 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: 0, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestDynamicTDebit", + utils.RequestType: sSV1RequestType, + utils.AccountField: "TestDynamicDebit", + utils.Subject: "TEST", + utils.Destination: "TEST", + 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: 0, }, }, }, @@ -1061,16 +1061,16 @@ func testSSv1ItDeactivateSessions(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItInitiateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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, }, }, }, @@ -1113,15 +1113,15 @@ func testSSv1ItAuthNotFoundCharger(t *testing.T) { Tenant: "Unexist", ID: "testSSv1ItAuthNotFoundCharger", Event: map[string]interface{}{ - utils.Tenant: "Unexist", - utils.ToR: utils.VOICE, - utils.OriginID: "testSSv1ItAuthNotFoundCharger", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), - utils.Usage: authUsage, + utils.Tenant: "Unexist", + utils.ToR: utils.VOICE, + utils.OriginID: "testSSv1ItAuthNotFoundCharger", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), + utils.Usage: authUsage, }, }, }, @@ -1142,16 +1142,16 @@ func testSSv1ItInitiateSessionNotFoundCharger(t *testing.T) { Tenant: "Unexist", ID: "testSSv1ItInitiateSessionNotFoundCharger", Event: map[string]interface{}{ - utils.Tenant: "Unexist", - utils.ToR: utils.VOICE, - utils.OriginID: "testSSv1ItInitiateSessionNotFoundCharger", - utils.RequestType: sSV1RequestType, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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.Tenant: "Unexist", + utils.ToR: utils.VOICE, + utils.OriginID: "testSSv1ItInitiateSessionNotFoundCharger", + utils.RequestType: sSV1RequestType, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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, }, }, }, diff --git a/apier/v1/stats_it_test.go b/apier/v1/stats_it_test.go index 138442e5e..268456a55 100644 --- a/apier/v1/stats_it_test.go +++ b/apier/v1/stats_it_test.go @@ -45,24 +45,24 @@ var ( Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 135 * time.Second, - utils.COST: 123.0}}, + 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}}, { Tenant: "cgrates.org", ID: "event2", Event: map[string]interface{}{ - utils.Account: "1002", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 45 * time.Second}}, + utils.AccountField: "1002", + utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.Usage: 45 * time.Second}}, { Tenant: "cgrates.org", ID: "event3", Event: map[string]interface{}{ - utils.Account: "1002", - utils.SetupTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 0}}, + utils.AccountField: "1002", + utils.SetupTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.Usage: 0}}, } sTestsStatSV1 = []func(t *testing.T){ @@ -251,11 +251,11 @@ func testV1STSProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 135 * time.Second, - utils.COST: 123.0, - utils.PDD: 12 * time.Second, + 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.PDD: 12 * time.Second, }, }, }, @@ -309,10 +309,10 @@ func testV1STSProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "event2", Event: map[string]interface{}{ - utils.Account: "1002", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 45 * time.Second, - utils.Cost: 12.1, + utils.AccountField: "1002", + utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.Usage: 45 * time.Second, + utils.Cost: 12.1, }, }, }, @@ -328,10 +328,10 @@ func testV1STSProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "event3", Event: map[string]interface{}{ - utils.Account: "1002", - utils.SetupTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 0, - utils.Cost: 0, + utils.AccountField: "1002", + utils.SetupTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.Usage: 0, + utils.Cost: 0, }, }, }, @@ -467,7 +467,7 @@ func testV1STSSetStatQueueProfile(t *testing.T) { ID: "FLTR_1", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1001"}, }, @@ -525,7 +525,7 @@ func testV1STSUpdateStatQueueProfile(t *testing.T) { ID: "FLTR_2", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1001"}, }, @@ -1359,12 +1359,12 @@ func testV1STSV1GetStatQueuesForEventWithoutTenant(t *testing.T) { CGREvent: &utils.CGREvent{ ID: "GetStats", Event: map[string]interface{}{ - utils.Account: "1002", - 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.Destination: "1001", + utils.AccountField: "1002", + 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.Destination: "1001", }, }, Opts: map[string]interface{}{ diff --git a/apier/v1/thresholds_it_test.go b/apier/v1/thresholds_it_test.go index a75e40ed2..a19333174 100644 --- a/apier/v1/thresholds_it_test.go +++ b/apier/v1/thresholds_it_test.go @@ -47,7 +47,7 @@ var ( ID: "event1", Event: map[string]interface{}{ utils.EventType: utils.AccountUpdate, - utils.Account: "1002", + utils.AccountField: "1002", utils.AllowNegative: true, utils.Disabled: false, utils.Units: 12.3}, @@ -63,11 +63,11 @@ var ( Tenant: "cgrates.org", ID: "event2", Event: map[string]interface{}{ - utils.EventType: utils.BalanceUpdate, - utils.Account: "1002", - utils.BalanceID: utils.MetaDefault, - utils.Units: 12.3, - utils.ExpiryTime: time.Date(2009, 11, 10, 23, 00, 0, 0, time.UTC), + utils.EventType: utils.BalanceUpdate, + utils.AccountField: "1002", + utils.BalanceID: utils.MetaDefault, + utils.Units: 12.3, + utils.ExpiryTime: time.Date(2009, 11, 10, 23, 00, 0, 0, time.UTC), }, }, Opts: map[string]interface{}{ @@ -81,15 +81,15 @@ var ( Tenant: "cgrates.org", ID: "event3", Event: map[string]interface{}{ - utils.EventType: utils.StatUpdate, - utils.StatID: "Stats1", - utils.Account: "1002", - "ASR": 35.0, - "ACD": "2m45s", - "TCC": 12.7, - "TCD": "12m15s", - "ACC": 0.75, - "PDD": "2s", + utils.EventType: utils.StatUpdate, + utils.StatID: "Stats1", + utils.AccountField: "1002", + "ASR": 35.0, + "ACD": "2m45s", + "TCC": 12.7, + "TCD": "12m15s", + "ACC": 0.75, + "PDD": "2s", }, }, Opts: map[string]interface{}{ @@ -103,12 +103,12 @@ var ( Tenant: "cgrates.org", ID: "event4", Event: map[string]interface{}{ - utils.EventType: utils.StatUpdate, - utils.StatID: "STATS_HOURLY_DE", - utils.Account: "1002", - "ASR": 35.0, - "ACD": "2m45s", - "TCD": "1h", + utils.EventType: utils.StatUpdate, + utils.StatID: "STATS_HOURLY_DE", + utils.AccountField: "1002", + "ASR": 35.0, + "ACD": "2m45s", + "TCD": "1h", }, }, Opts: map[string]interface{}{ @@ -122,11 +122,11 @@ var ( Tenant: "cgrates.org", ID: "event5", Event: map[string]interface{}{ - utils.EventType: utils.StatUpdate, - utils.StatID: "STATS_DAILY_DE", - utils.Account: "1002", - "ACD": "2m45s", - "TCD": "3h1s", + utils.EventType: utils.StatUpdate, + utils.StatID: "STATS_DAILY_DE", + utils.AccountField: "1002", + "ACD": "2m45s", + "TCD": "3h1s", }, }, Opts: map[string]interface{}{ @@ -140,10 +140,10 @@ var ( Tenant: "cgrates.org", ID: "event6", Event: map[string]interface{}{ - utils.EventType: utils.ResourceUpdate, - utils.Account: "1002", - utils.ResourceID: "RES_GRP_1", - utils.Usage: 10.0, + utils.EventType: utils.ResourceUpdate, + utils.AccountField: "1002", + utils.ResourceID: "RES_GRP_1", + utils.Usage: 10.0, }, }, Opts: map[string]interface{}{ @@ -157,10 +157,10 @@ var ( Tenant: "cgrates.org", ID: "event6", Event: map[string]interface{}{ - utils.EventType: utils.ResourceUpdate, - utils.Account: "1002", - utils.ResourceID: "RES_GRP_1", - utils.Usage: 10.0, + utils.EventType: utils.ResourceUpdate, + utils.AccountField: "1002", + utils.ResourceID: "RES_GRP_1", + utils.Usage: 10.0, }, }, Opts: map[string]interface{}{ @@ -174,10 +174,10 @@ var ( Tenant: "cgrates.org", ID: "event6", Event: map[string]interface{}{ - utils.EventType: utils.ResourceUpdate, - utils.Account: "1002", - utils.ResourceID: "RES_GRP_1", - utils.Usage: 10.0, + utils.EventType: utils.ResourceUpdate, + utils.AccountField: "1002", + utils.ResourceID: "RES_GRP_1", + utils.Usage: 10.0, }, }, Opts: map[string]interface{}{ @@ -191,27 +191,27 @@ var ( Tenant: "cgrates.org", ID: "cdrev1", Event: map[string]interface{}{ - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", - utils.CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), - utils.RunID: utils.MetaRaw, - utils.OrderID: 123, - utils.OriginHost: "192.168.1.1", - utils.Source: utils.UNIT_TEST, - utils.OriginID: "dsafdsaf", - utils.ToR: utils.VOICE, - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1007", - utils.Subject: "1007", - utils.Destination: "+4986517174963", - utils.SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), - 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, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", + utils.CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), + utils.RunID: utils.MetaRaw, + utils.OrderID: 123, + utils.OriginHost: "192.168.1.1", + utils.Source: utils.UNIT_TEST, + utils.OriginID: "dsafdsaf", + utils.ToR: utils.VOICE, + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1007", + utils.Subject: "1007", + utils.Destination: "+4986517174963", + utils.SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), + 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, }, }, Opts: map[string]interface{}{ @@ -591,7 +591,7 @@ func testV1TSMaxHits(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1002", + utils.AccountField: "1002", }, }, }, diff --git a/apier/v1/tpaccountactions.go b/apier/v1/tpaccountactions.go index d5d22cfc3..e359e65c2 100644 --- a/apier/v1/tpaccountactions.go +++ b/apier/v1/tpaccountactions.go @@ -26,7 +26,7 @@ import ( // SetTPAccountActions creates a new AccountActions profile within a tariff plan func (apierSv1 *APIerSv1) SetTPAccountActions(attrs *utils.TPAccountActions, reply *string) error { if missing := utils.MissingStructFields(attrs, - []string{utils.TPid, utils.LoadId, utils.Account, utils.ActionPlanId}); len(missing) != 0 { + []string{utils.TPid, utils.LoadId, utils.AccountField, utils.ActionPlanId}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } if attrs.Tenant == utils.EmptyString { @@ -48,7 +48,7 @@ type AttrGetTPAccountActionsByLoadId struct { func (apierSv1 *APIerSv1) GetTPAccountActionsByLoadId(attrs *utils.TPAccountActions, reply *[]*utils.TPAccountActions) error { mndtryFlds := []string{utils.TPid, utils.LoadId} if len(attrs.Account) != 0 { // If account provided as filter, make all related fields mandatory - mndtryFlds = append(mndtryFlds, utils.Account) + mndtryFlds = append(mndtryFlds, utils.AccountField) } if missing := utils.MissingStructFields(attrs, mndtryFlds); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) diff --git a/apier/v1/triggers.go b/apier/v1/triggers.go index 7889853f6..4a85a8149 100644 --- a/apier/v1/triggers.go +++ b/apier/v1/triggers.go @@ -31,7 +31,7 @@ import ( // Returns a list of ActionTriggers on an account func (apierSv1 *APIerSv1) GetAccountActionTriggers(attrs *utils.TenantAccount, reply *engine.ActionTriggers) error { - if missing := utils.MissingStructFields(attrs, []string{utils.Account}); len(missing) != 0 { + if missing := utils.MissingStructFields(attrs, []string{utils.AccountField}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } tnt := attrs.Tenant @@ -60,7 +60,7 @@ type AttrAddAccountActionTriggers struct { } func (apierSv1 *APIerSv1) AddAccountActionTriggers(attr *AttrAddAccountActionTriggers, reply *string) (err error) { - if missing := utils.MissingStructFields(attr, []string{utils.Account}); len(missing) != 0 { + if missing := utils.MissingStructFields(attr, []string{utils.AccountField}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } tnt := attr.Tenant @@ -119,7 +119,7 @@ type AttrRemoveAccountActionTriggers struct { } func (apierSv1 *APIerSv1) RemoveAccountActionTriggers(attr AttrRemoveAccountActionTriggers, reply *string) error { - if missing := utils.MissingStructFields(&attr, []string{utils.Account}); len(missing) != 0 { + if missing := utils.MissingStructFields(&attr, []string{utils.AccountField}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } tnt := attr.Tenant @@ -165,7 +165,7 @@ type AttrResetAccountActionTriggers struct { func (apierSv1 *APIerSv1) ResetAccountActionTriggers(attr AttrResetAccountActionTriggers, reply *string) error { - if missing := utils.MissingStructFields(&attr, []string{utils.Account}); len(missing) != 0 { + if missing := utils.MissingStructFields(&attr, []string{utils.AccountField}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } tnt := attr.Tenant @@ -353,7 +353,7 @@ func (attr *AttrSetActionTrigger) UpdateActionTrigger(at *engine.ActionTrigger, // SetAccountActionTriggers updates or creates if not present the ActionTrigger for an Account func (apierSv1 *APIerSv1) SetAccountActionTriggers(attr AttrSetAccountActionTriggers, reply *string) error { - if missing := utils.MissingStructFields(&attr, []string{utils.Account}); len(missing) != 0 { + if missing := utils.MissingStructFields(&attr, []string{utils.AccountField}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } tnt := attr.Tenant @@ -547,7 +547,7 @@ type AttrAddActionTrigger struct { // Deprecated in rc8, replaced by AddAccountActionTriggers func (apierSv1 *APIerSv1) AddTriggeredAction(attr AttrAddActionTrigger, reply *string) error { - if missing := utils.MissingStructFields(&attr, []string{utils.Account}); len(missing) != 0 { + if missing := utils.MissingStructFields(&attr, []string{utils.AccountField}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } tnt := attr.Tenant diff --git a/apier/v2/accounts.go b/apier/v2/accounts.go index 206222b35..d1922b2c3 100644 --- a/apier/v2/accounts.go +++ b/apier/v2/accounts.go @@ -127,7 +127,7 @@ type AttrSetAccount struct { } func (apiv2 *APIerSv2) SetAccount(attr *AttrSetAccount, reply *string) error { - if missing := utils.MissingStructFields(attr, []string{utils.Account}); len(missing) != 0 { + if missing := utils.MissingStructFields(attr, []string{utils.AccountField}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } tnt := attr.Tenant diff --git a/apier/v2/cdrs_it_test.go b/apier/v2/cdrs_it_test.go index e36b7f1b8..1ba6095fe 100644 --- a/apier/v2/cdrs_it_test.go +++ b/apier/v2/cdrs_it_test.go @@ -158,13 +158,13 @@ func testV2CDRsProcessCDR(t *testing.T) { utils.Source: "testV2CDRsProcessCDR", utils.RequestType: utils.META_RATED, // utils.Category: "call", //it will be populated as default in MapEvent.AsCDR - utils.Account: "testV2CDRsProcessCDR", - utils.Subject: "ANY2CNT", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.AccountField: "testV2CDRsProcessCDR", + utils.Subject: "ANY2CNT", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, @@ -345,18 +345,18 @@ func testV2CDRsUsageNegative(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsUsageNegative", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsUsageNegative", - utils.RequestType: utils.META_RATED, - utils.Category: "call", - utils.Account: "testV2CDRsUsageNegative", - utils.Subject: "ANY2CNT", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: -time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testV2CDRsUsageNegative", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsUsageNegative", + utils.RequestType: utils.META_RATED, + utils.Category: "call", + utils.AccountField: "testV2CDRsUsageNegative", + utils.Subject: "ANY2CNT", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: -time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, @@ -498,18 +498,18 @@ func testV2CDRsDifferentTenants(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.com", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsDifferentTenants", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsDifferentTenants", - utils.RequestType: utils.META_RATED, - utils.Category: "call", - utils.Account: "testV2CDRsDifferentTenants", - utils.Destination: "+4986517174963", - utils.Tenant: "cgrates.com", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Second, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testV2CDRsDifferentTenants", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsDifferentTenants", + utils.RequestType: utils.META_RATED, + utils.Category: "call", + utils.AccountField: "testV2CDRsDifferentTenants", + utils.Destination: "+4986517174963", + utils.Tenant: "cgrates.com", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Second, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, @@ -559,17 +559,17 @@ func testV2CDRsProcessCDRNoRattingPlan(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsProcessCDR4", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsProcessCDR4", - utils.RequestType: utils.META_RATED, - utils.Account: "testV2CDRsProcessCDR4", - utils.Subject: "NoSubject", - utils.Destination: "+1234567", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testV2CDRsProcessCDR4", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsProcessCDR4", + utils.RequestType: utils.META_RATED, + utils.AccountField: "testV2CDRsProcessCDR4", + utils.Subject: "NoSubject", + utils.Destination: "+1234567", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, @@ -784,18 +784,18 @@ func testV2CDRsProcessCDRWithThreshold(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsProcessCDRWithThreshold", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsProcessCDRWithThreshold", - utils.RequestType: utils.META_POSTPAID, - utils.Category: "call", - utils.Account: "1005", - utils.Subject: "ANY2CNT", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: 100 * time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testV2CDRsProcessCDRWithThreshold", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsProcessCDRWithThreshold", + utils.RequestType: utils.META_POSTPAID, + utils.Category: "call", + utils.AccountField: "1005", + utils.Subject: "ANY2CNT", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: 100 * time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, @@ -825,19 +825,19 @@ func testv2CDRsGetCDRsDest(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.CGRID: "9b3cd5e698af94f8916220866c831a982ed16318", - utils.ToR: utils.VOICE, - utils.RunID: "raw", - utils.OriginID: "25160047719:0", - utils.OriginHost: "192.168.1.1", - utils.Source: "*sessions", - utils.RequestType: utils.META_NONE, - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "+4915117174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: 100 * time.Minute, + utils.CGRID: "9b3cd5e698af94f8916220866c831a982ed16318", + utils.ToR: utils.VOICE, + utils.RunID: "raw", + utils.OriginID: "25160047719:0", + utils.OriginHost: "192.168.1.1", + utils.Source: "*sessions", + utils.RequestType: utils.META_NONE, + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "+4915117174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: 100 * time.Minute, }, }, }, @@ -923,17 +923,17 @@ func testV2CDRsRerate(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsRerate", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsRerate", - utils.RequestType: utils.META_PSEUDOPREPAID, - utils.Account: "voiceAccount", - utils.Subject: "ANY2CNT", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: 2 * time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testV2CDRsRerate", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsRerate", + utils.RequestType: utils.META_PSEUDOPREPAID, + utils.AccountField: "voiceAccount", + utils.Subject: "ANY2CNT", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: 2 * time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, @@ -957,17 +957,17 @@ func testV2CDRsRerate(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsRerate", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsRerate", - utils.RequestType: utils.META_PSEUDOPREPAID, - utils.Account: "voiceAccount", - utils.Subject: "ANY2CNT", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testV2CDRsRerate", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsRerate", + utils.RequestType: utils.META_PSEUDOPREPAID, + utils.AccountField: "voiceAccount", + utils.Subject: "ANY2CNT", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, @@ -999,15 +999,15 @@ func testv2CDRsDynaPrepaid(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testv2CDRsDynaPrepaid", - utils.OriginHost: "192.168.1.1", - utils.Source: "testv2CDRsDynaPrepaid", - utils.RequestType: utils.MetaDynaprepaid, - utils.Account: "CreatedAccount", - utils.Subject: "NoSubject", - utils.Destination: "+1234567", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, + utils.OriginID: "testv2CDRsDynaPrepaid", + utils.OriginHost: "192.168.1.1", + utils.Source: "testv2CDRsDynaPrepaid", + utils.RequestType: utils.MetaDynaprepaid, + utils.AccountField: "CreatedAccount", + utils.Subject: "NoSubject", + utils.Destination: "+1234567", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, }, }, }, @@ -1093,17 +1093,17 @@ func testV2CDRsDuplicateCDRs(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsDuplicateCDRs", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsDuplicateCDRs", - utils.RequestType: utils.META_PSEUDOPREPAID, - utils.Account: "testV2CDRsDuplicateCDRs", - utils.Subject: "ANY2CNT", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: 2 * time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testV2CDRsDuplicateCDRs", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsDuplicateCDRs", + utils.RequestType: utils.META_PSEUDOPREPAID, + utils.AccountField: "testV2CDRsDuplicateCDRs", + utils.Subject: "ANY2CNT", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: 2 * time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, @@ -1132,17 +1132,17 @@ func testV2CDRsDuplicateCDRs(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsDuplicateCDRs", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsDuplicateCDRs", - utils.RequestType: utils.META_PSEUDOPREPAID, - utils.Account: "testV2CDRsDuplicateCDRs", - utils.Subject: "ANY2CNT", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testV2CDRsDuplicateCDRs", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsDuplicateCDRs", + utils.RequestType: utils.META_PSEUDOPREPAID, + utils.AccountField: "testV2CDRsDuplicateCDRs", + utils.Subject: "ANY2CNT", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, diff --git a/apier/v2/cdrs_offline_it_test.go b/apier/v2/cdrs_offline_it_test.go index e625cbbda..798de023b 100644 --- a/apier/v2/cdrs_offline_it_test.go +++ b/apier/v2/cdrs_offline_it_test.go @@ -188,16 +188,16 @@ func testV2CDRsOfflineBalanceUpdate(t *testing.T) { cgrEv := &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsOfflineProcessCDR2", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsOfflineProcessCDR", - utils.RequestType: utils.META_POSTPAID, - utils.Category: "call", - utils.Account: "test", - utils.Subject: "test", - utils.Destination: "1002", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, + utils.OriginID: "testV2CDRsOfflineProcessCDR2", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsOfflineProcessCDR", + utils.RequestType: utils.META_POSTPAID, + utils.Category: "call", + utils.AccountField: "test", + utils.Subject: "test", + utils.Destination: "1002", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, }, } mapEv := engine.NewMapEvent(cgrEv.Event) @@ -308,16 +308,16 @@ func testV2CDRsOfflineExpiryBalance(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsOfflineProcessCDR1", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsOfflineProcessCDR", - utils.RequestType: utils.META_POSTPAID, - utils.Category: "call", - utils.Account: "test2", - utils.Subject: "test2", - utils.Destination: "1002", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, + utils.OriginID: "testV2CDRsOfflineProcessCDR1", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsOfflineProcessCDR", + utils.RequestType: utils.META_POSTPAID, + utils.Category: "call", + utils.AccountField: "test2", + utils.Subject: "test2", + utils.Destination: "1002", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, }, }, }, @@ -361,16 +361,16 @@ func testV2CDRsBalancesWithSameWeight(t *testing.T) { cgrEv := &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsBalancesWithSameWeight", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsBalancesWithSameWeight", - utils.RequestType: utils.META_POSTPAID, - utils.Category: "call", - utils.Account: "specialTest", - utils.Subject: "specialTest", - utils.Destination: "1002", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, + utils.OriginID: "testV2CDRsBalancesWithSameWeight", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsBalancesWithSameWeight", + utils.RequestType: utils.META_POSTPAID, + utils.Category: "call", + utils.AccountField: "specialTest", + utils.Subject: "specialTest", + utils.Destination: "1002", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, }, } mapEv := engine.NewMapEvent(cgrEv.Event) diff --git a/config/config_it_test.go b/config/config_it_test.go index fa40bfc16..9ed27384c 100644 --- a/config/config_it_test.go +++ b/config/config_it_test.go @@ -149,7 +149,7 @@ func testCGRConfigReloadAttributeS(t *testing.T) { ApierSConns: []string{}, ResourceSConns: []string{}, StatSConns: []string{}, - StringIndexedFields: &[]string{utils.MetaReq + utils.NestingSep + utils.Account}, + StringIndexedFields: &[]string{utils.MetaReq + utils.NestingSep + utils.AccountField}, PrefixIndexedFields: &[]string{}, SuffixIndexedFields: &[]string{}, IndexedSelects: true, @@ -194,7 +194,7 @@ func testCGRConfigReloadChargerS(t *testing.T) { } expAttr := &ChargerSCfg{ Enabled: true, - StringIndexedFields: &[]string{utils.MetaReq + utils.NestingSep + utils.Account}, + StringIndexedFields: &[]string{utils.MetaReq + utils.NestingSep + utils.AccountField}, PrefixIndexedFields: &[]string{}, SuffixIndexedFields: &[]string{}, IndexedSelects: true, @@ -219,7 +219,7 @@ func testCGRConfigReloadThresholdS(t *testing.T) { } expAttr := &ThresholdSCfg{ Enabled: true, - StringIndexedFields: &[]string{utils.MetaReq + utils.NestingSep + utils.Account}, + StringIndexedFields: &[]string{utils.MetaReq + utils.NestingSep + utils.AccountField}, PrefixIndexedFields: &[]string{}, SuffixIndexedFields: &[]string{}, IndexedSelects: true, @@ -243,7 +243,7 @@ func testCGRConfigReloadStatS(t *testing.T) { } expAttr := &StatSCfg{ Enabled: true, - StringIndexedFields: &[]string{utils.MetaReq + utils.NestingSep + utils.Account}, + StringIndexedFields: &[]string{utils.MetaReq + utils.NestingSep + utils.AccountField}, PrefixIndexedFields: &[]string{}, SuffixIndexedFields: &[]string{}, IndexedSelects: true, @@ -268,7 +268,7 @@ func testCGRConfigReloadResourceS(t *testing.T) { } expAttr := &ResourceSConfig{ Enabled: true, - StringIndexedFields: &[]string{utils.MetaReq + utils.NestingSep + utils.Account}, + StringIndexedFields: &[]string{utils.MetaReq + utils.NestingSep + utils.AccountField}, PrefixIndexedFields: &[]string{}, SuffixIndexedFields: &[]string{}, IndexedSelects: true, @@ -513,7 +513,7 @@ func testCGRConfigReloadERs(t *testing.T) { {Tag: utils.RequestType, Path: utils.MetaCgreq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.4", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Tenant, Path: utils.MetaCgreq + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.Account, Path: utils.MetaCgreq + utils.NestingSep + utils.Account, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Destination, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.10", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.SetupTime, Path: utils.MetaCgreq + utils.NestingSep + utils.SetupTime, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.11", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, diff --git a/config/config_json_test.go b/config/config_json_test.go index c300ee5a3..fa9cec02e 100644 --- a/config/config_json_test.go +++ b/config/config_json_test.go @@ -1954,7 +1954,7 @@ func TestDfEventReaderCfg(t *testing.T) { Value: utils.StringPointer("~*req.6"), Mandatory: utils.BoolPointer(true)}, {Tag: utils.StringPointer(utils.Category), Path: utils.StringPointer(utils.MetaCgreq + utils.NestingSep + utils.Category), Type: utils.StringPointer(utils.MetaVariable), Value: utils.StringPointer("~*req.7"), Mandatory: utils.BoolPointer(true)}, - {Tag: utils.StringPointer(utils.Account), Path: utils.StringPointer(utils.MetaCgreq + utils.NestingSep + utils.Account), Type: utils.StringPointer(utils.MetaVariable), + {Tag: utils.StringPointer(utils.AccountField), Path: utils.StringPointer(utils.MetaCgreq + utils.NestingSep + utils.AccountField), Type: utils.StringPointer(utils.MetaVariable), Value: utils.StringPointer("~*req.8"), Mandatory: utils.BoolPointer(true)}, {Tag: utils.StringPointer(utils.Subject), Path: utils.StringPointer(utils.MetaCgreq + utils.NestingSep + utils.Subject), Type: utils.StringPointer(utils.MetaVariable), Value: utils.StringPointer("~*req.9"), Mandatory: utils.BoolPointer(true)}, diff --git a/config/config_test.go b/config/config_test.go index 25b5bebe4..384de60fc 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -5520,7 +5520,7 @@ func TestCgrCdfEventReader(t *testing.T) { Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.Account, Path: utils.MetaCgreq + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, @@ -5610,7 +5610,7 @@ func TestCgrCfgEventReaderDefault(t *testing.T) { Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.Account, Path: utils.MetaCgreq + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, diff --git a/config/erscfg_test.go b/config/erscfg_test.go index 9ff1a83cf..3a0895a63 100644 --- a/config/erscfg_test.go +++ b/config/erscfg_test.go @@ -89,7 +89,7 @@ func TestERSClone(t *testing.T) { Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.Account, Path: utils.MetaCgreq + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, @@ -240,7 +240,7 @@ func TestERSLoadFromjsonCfg(t *testing.T) { Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.Account, Path: utils.MetaCgreq + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, @@ -281,7 +281,7 @@ func TestERSLoadFromjsonCfg(t *testing.T) { Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.Account, Path: utils.MetaCgreq + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, @@ -461,7 +461,7 @@ func TestERSloadFromJsonCase3(t *testing.T) { Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.Account, Path: utils.MetaCgreq + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, @@ -592,7 +592,7 @@ func TestERSloadFromJsonCase4(t *testing.T) { Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.Account, Path: utils.MetaCgreq + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, @@ -711,7 +711,7 @@ func TestEventReaderSameID(t *testing.T) { Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.Account, Path: utils.MetaCgreq + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, @@ -1066,7 +1066,7 @@ func TestERsloadFromJsonCfg(t *testing.T) { Value: NewRSRParsersMustCompile("~*req.6", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.7", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, - {Tag: utils.Account, Path: utils.MetaCgreq + utils.NestingSep + utils.Account, Type: utils.MetaVariable, + {Tag: utils.AccountField, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.8", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, {Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.9", utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, diff --git a/config/migratorcfg_test.go b/config/migratorcfg_test.go index 9a4c9b2ea..e472415eb 100644 --- a/config/migratorcfg_test.go +++ b/config/migratorcfg_test.go @@ -230,7 +230,7 @@ func TestMigratorCgrCfgClone(t *testing.T) { OutStorDBName: utils.CGRATES, OutStorDBUser: utils.CGRATES, OutStorDBPassword: utils.EmptyString, - UsersFilters: []string{utils.Account}, + UsersFilters: []string{utils.AccountField}, OutDataDBOpts: map[string]interface{}{ utils.RedisSentinelNameCfg: utils.EmptyString, utils.RedisClusterCfg: true, @@ -249,7 +249,7 @@ func TestMigratorCgrCfgClone(t *testing.T) { if !reflect.DeepEqual(sa, rcv) { t.Errorf("Expected: %+v\nReceived: %+v", utils.ToJSON(sa), utils.ToJSON(rcv)) } - if rcv.UsersFilters[0] = ""; sa.UsersFilters[0] != utils.Account { + if rcv.UsersFilters[0] = ""; sa.UsersFilters[0] != utils.AccountField { t.Errorf("Expected clone to not modify the cloned") } if rcv.OutDataDBOpts[utils.RedisSentinelNameCfg] = "1"; sa.OutDataDBOpts[utils.RedisSentinelNameCfg] != "" { diff --git a/config/rsrparser_test.go b/config/rsrparser_test.go index 4d7ce73bb..9d29440ec 100644 --- a/config/rsrparser_test.go +++ b/config/rsrparser_test.go @@ -197,7 +197,7 @@ func TestNewRSRParsersParseDataProviderWithInterfaces(t *testing.T) { t.Error("Unexpected error: ", err.Error()) } else if out, err := rsrParsers.ParseDataProviderWithInterfaces( utils.MapStorage{ - utils.MetaReq: utils.MapStorage{utils.Account: "1001"}, + utils.MetaReq: utils.MapStorage{utils.AccountField: "1001"}, }); err != nil { t.Error(err) } else if expected := "~*accounts.1001"; out != expected { diff --git a/console/datacost.go b/console/datacost.go index fa7647951..df13f3e99 100644 --- a/console/datacost.go +++ b/console/datacost.go @@ -28,7 +28,7 @@ func init() { c := &CmdGetDataCost{ name: "datacost", rpcMethod: utils.APIerSv1GetDataCost, - clientArgs: []string{utils.Category, utils.Tenant, utils.Account, utils.Subject, utils.StartTime, utils.Usage}, + clientArgs: []string{utils.Category, utils.Tenant, utils.AccountField, utils.Subject, utils.StartTime, utils.Usage}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} diff --git a/console/debit.go b/console/debit.go index 06da7493a..f270a444c 100644 --- a/console/debit.go +++ b/console/debit.go @@ -27,7 +27,7 @@ func init() { c := &CmdDebit{ name: "debit", rpcMethod: utils.ResponderDebit, - clientArgs: []string{utils.Category, utils.ToR, utils.Tenant, utils.Subject, utils.Account, utils.Destination, utils.TimeStart, utils.TimeEnd, utils.CallDuration, utils.FallbackSubject, utils.DryRun}, + clientArgs: []string{utils.Category, utils.ToR, utils.Tenant, utils.Subject, utils.AccountField, utils.Destination, utils.TimeStart, utils.TimeEnd, utils.CallDuration, utils.FallbackSubject, utils.DryRun}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} diff --git a/console/debit_max.go b/console/debit_max.go index b39f507a6..ab55eda14 100644 --- a/console/debit_max.go +++ b/console/debit_max.go @@ -27,7 +27,7 @@ func init() { c := &CmdMaxDebit{ name: "debit_max", rpcMethod: utils.ResponderMaxDebit, - clientArgs: []string{utils.Category, utils.ToR, utils.Tenant, utils.Subject, utils.Account, utils.Destination, utils.TimeStart, utils.TimeEnd, utils.CallDuration, utils.FallbackSubject}, + clientArgs: []string{utils.Category, utils.ToR, utils.Tenant, utils.Subject, utils.AccountField, utils.Destination, utils.TimeStart, utils.TimeEnd, utils.CallDuration, utils.FallbackSubject}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} diff --git a/console/maxduration.go b/console/maxduration.go index a57bc9d14..090c7f0aa 100644 --- a/console/maxduration.go +++ b/console/maxduration.go @@ -31,7 +31,7 @@ func init() { c := &CmdGetMaxDuration{ name: "maxduration", rpcMethod: utils.ResponderGetMaxSessionTime, - clientArgs: []string{utils.Category, utils.ToR, utils.Tenant, utils.Subject, utils.Account, utils.Destination, utils.TimeStart, utils.TimeEnd, utils.CallDuration, utils.FallbackSubject}, + clientArgs: []string{utils.Category, utils.ToR, utils.Tenant, utils.Subject, utils.AccountField, utils.Destination, utils.TimeStart, utils.TimeEnd, utils.CallDuration, utils.FallbackSubject}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} diff --git a/console/maxusage.go b/console/maxusage.go index 0792607c8..6771165fc 100644 --- a/console/maxusage.go +++ b/console/maxusage.go @@ -28,7 +28,7 @@ func init() { name: "maxusage", rpcMethod: utils.APIerSv1GetMaxUsage, clientArgs: []string{utils.ToR, utils.RequestType, utils.Tenant, - utils.Category, utils.Account, utils.Subject, utils.Destination, + utils.Category, utils.AccountField, utils.Subject, utils.Destination, utils.SetupTime, utils.AnswerTime, utils.Usage, utils.ExtraFields}, } commands[c.Name()] = c diff --git a/dispatchers/attributes_it_test.go b/dispatchers/attributes_it_test.go index 381d2d2aa..ee9ee62b1 100755 --- a/dispatchers/attributes_it_test.go +++ b/dispatchers/attributes_it_test.go @@ -222,8 +222,8 @@ func testDspAttrGetAttrFailover(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ - utils.Account: "1002", - utils.EVENT_NAME: "Event1", + utils.AccountField: "1002", + utils.EVENT_NAME: "Event1", }, }, Opts: map[string]interface{}{ @@ -259,9 +259,9 @@ func testDspAttrGetAttrFailover(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ - utils.Account: "1002", - utils.EVENT_NAME: "Event1", - "Password": "CGRateS.org", + utils.AccountField: "1002", + utils.EVENT_NAME: "Event1", + "Password": "CGRateS.org", }, }, Opts: map[string]interface{}{ @@ -341,7 +341,7 @@ func testDspAttrTestMissingArgDispatcher(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", }, }, }, @@ -361,7 +361,7 @@ func testDspAttrTestMissingApiKey(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", }, }, }, @@ -381,7 +381,7 @@ func testDspAttrTestUnknownApiKey(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", }, }, Opts: map[string]interface{}{ @@ -404,7 +404,7 @@ func testDspAttrTestAuthKey(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", }, }, Opts: map[string]interface{}{ @@ -427,7 +427,7 @@ func testDspAttrTestAuthKey2(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", }, }, Opts: map[string]interface{}{ @@ -477,8 +477,8 @@ func testDspAttrTestAuthKey2(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ - utils.Account: "1001", - "Password": "CGRateS.org", + utils.AccountField: "1001", + "Password": "CGRateS.org", }, }, }, @@ -502,8 +502,8 @@ func testDspAttrTestAuthKey3(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ - utils.Account: "1001", - utils.EVENT_NAME: "Event1", + utils.AccountField: "1001", + utils.EVENT_NAME: "Event1", }, }, Opts: map[string]interface{}{ @@ -526,8 +526,8 @@ func testDspAttrGetAttrRoundRobin(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ - utils.Account: "1002", - utils.EVENT_NAME: "RoundRobin", + utils.AccountField: "1002", + utils.EVENT_NAME: "RoundRobin", }, }, Opts: map[string]interface{}{ @@ -563,9 +563,9 @@ func testDspAttrGetAttrRoundRobin(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ - utils.Account: "1002", - utils.EVENT_NAME: "RoundRobin", - "Password": "CGRateS.org", + utils.AccountField: "1002", + utils.EVENT_NAME: "RoundRobin", + "Password": "CGRateS.org", }, }, Opts: map[string]interface{}{ @@ -621,8 +621,8 @@ func testDspAttrGetAttrInternal(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ - utils.EVENT_NAME: "Internal", - utils.Account: "1003", + utils.EVENT_NAME: "Internal", + utils.AccountField: "1003", }, }, Opts: map[string]interface{}{ @@ -642,9 +642,9 @@ func testDspAttrGetAttrInternal(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSGetAttributeForEvent", Event: map[string]interface{}{ - utils.Account: "1003", - utils.EVENT_NAME: "Internal", - "Password": "CGRateS.com", + utils.AccountField: "1003", + utils.EVENT_NAME: "Internal", + "Password": "CGRateS.com", }, }, }, diff --git a/dispatchers/cdrs_it_test.go b/dispatchers/cdrs_it_test.go index b0c30b0eb..da0204027 100644 --- a/dispatchers/cdrs_it_test.go +++ b/dispatchers/cdrs_it_test.go @@ -124,17 +124,17 @@ func testDspCDRsProcessEvent(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testDspCDRsProcessEvent", - utils.OriginHost: "192.168.1.1", - utils.Source: "testDspCDRsProcessEvent", - utils.RequestType: utils.META_RATED, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testDspCDRsProcessEvent", + utils.OriginHost: "192.168.1.1", + utils.Source: "testDspCDRsProcessEvent", + utils.RequestType: utils.META_RATED, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, Opts: map[string]interface{}{ @@ -323,15 +323,15 @@ func testDspCDRsV2ProcessEvent(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testDspCDRsV2ProcessEvent", - utils.OriginHost: "192.168.1.1", - utils.Source: "testDspCDRsV2ProcessEvent", - utils.RequestType: utils.META_RATED, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, + utils.OriginID: "testDspCDRsV2ProcessEvent", + utils.OriginHost: "192.168.1.1", + utils.Source: "testDspCDRsV2ProcessEvent", + utils.RequestType: utils.META_RATED, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, }, }, Opts: map[string]interface{}{ @@ -415,17 +415,17 @@ func testDspCDRsProcessEventNoAuth(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testDspCDRsProcessEvent", - utils.OriginHost: "192.168.1.1", - utils.Source: "testDspCDRsProcessEvent", - utils.RequestType: utils.META_RATED, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testDspCDRsProcessEvent", + utils.OriginHost: "192.168.1.1", + utils.Source: "testDspCDRsProcessEvent", + utils.RequestType: utils.META_RATED, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, @@ -590,15 +590,15 @@ func testDspCDRsV2ProcessEventNoAuth(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testDspCDRsV2ProcessEventNoAuth", - utils.OriginHost: "192.168.1.1", - utils.Source: "testDspCDRsV2ProcessEventNoAuth", - utils.RequestType: utils.META_RATED, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, + utils.OriginID: "testDspCDRsV2ProcessEventNoAuth", + utils.OriginHost: "192.168.1.1", + utils.Source: "testDspCDRsV2ProcessEventNoAuth", + utils.RequestType: utils.META_RATED, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, }, }, }, diff --git a/dispatchers/chargers_it_test.go b/dispatchers/chargers_it_test.go index 0d8592d2f..89a589cd7 100755 --- a/dispatchers/chargers_it_test.go +++ b/dispatchers/chargers_it_test.go @@ -107,8 +107,8 @@ func testDspCppGetChtgFailover(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EVENT_NAME: "Event1", - utils.Account: "1001", + utils.EVENT_NAME: "Event1", + utils.AccountField: "1001", }, }, Opts: map[string]interface{}{ @@ -191,7 +191,7 @@ func testDspCppTestAuthKey(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", }, }, Opts: map[string]interface{}{ @@ -211,7 +211,7 @@ func testDspCppTestAuthKey2(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", }, }, Opts: map[string]interface{}{ @@ -259,8 +259,8 @@ func testDspCppGetChtgRoundRobin(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EVENT_NAME: "RoundRobin", - utils.Account: "1001", + utils.EVENT_NAME: "RoundRobin", + utils.AccountField: "1001", }, }, Opts: map[string]interface{}{ diff --git a/dispatchers/resources_it_test.go b/dispatchers/resources_it_test.go index 37e400cd4..e6f5869f4 100755 --- a/dispatchers/resources_it_test.go +++ b/dispatchers/resources_it_test.go @@ -127,8 +127,8 @@ func testDspResTestAuthKey(t *testing.T) { Tenant: "cgrates.org", ID: utils.UUIDSha1Prefix(), Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: "1002", + utils.AccountField: "1001", + utils.Destination: "1002", }, }, Opts: map[string]interface{}{ @@ -152,8 +152,8 @@ func testDspResTestAuthKey2(t *testing.T) { Tenant: "cgrates.org", ID: utils.UUIDSha1Prefix(), Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: "1002", + utils.AccountField: "1001", + utils.Destination: "1002", }, }, Opts: map[string]interface{}{ diff --git a/dispatchers/routes_it_test.go b/dispatchers/routes_it_test.go index ef1d11d93..f3116e86a 100755 --- a/dispatchers/routes_it_test.go +++ b/dispatchers/routes_it_test.go @@ -174,12 +174,12 @@ func testDspSupGetSupFailover(t *testing.T) { ID: utils.UUIDSha1Prefix(), Time: &nowTime, Event: map[string]interface{}{ - utils.EVENT_NAME: "Event1", - utils.Account: "1002", - utils.Subject: "1002", - utils.Destination: "1001", - utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), - utils.Usage: "1m20s", + utils.EVENT_NAME: "Event1", + utils.AccountField: "1002", + utils.Subject: "1002", + utils.Destination: "1001", + utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), + utils.Usage: "1m20s", }, }, Opts: map[string]interface{}{ @@ -211,11 +211,11 @@ func testDspSupTestAuthKey(t *testing.T) { ID: utils.UUIDSha1Prefix(), Time: &nowTime, Event: map[string]interface{}{ - utils.Account: "1002", - utils.Subject: "1002", - utils.Destination: "1001", - utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), - utils.Usage: "1m20s", + utils.AccountField: "1002", + utils.Subject: "1002", + utils.Destination: "1001", + utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), + utils.Usage: "1m20s", }, }, Opts: map[string]interface{}{ @@ -263,11 +263,11 @@ func testDspSupTestAuthKey2(t *testing.T) { ID: utils.UUIDSha1Prefix(), Time: &nowTime, Event: map[string]interface{}{ - utils.Account: "1002", - utils.Subject: "1002", - utils.Destination: "1001", - utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), - utils.Usage: "1m20s", + utils.AccountField: "1002", + utils.Subject: "1002", + utils.Destination: "1001", + utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), + utils.Usage: "1m20s", }, }, Opts: map[string]interface{}{ @@ -331,12 +331,12 @@ func testDspSupGetSupRoundRobin(t *testing.T) { ID: utils.UUIDSha1Prefix(), Time: &nowTime, Event: map[string]interface{}{ - utils.EVENT_NAME: "RoundRobin", - utils.Account: "1002", - utils.Subject: "1002", - utils.Destination: "1001", - utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), - utils.Usage: "1m20s", + utils.EVENT_NAME: "RoundRobin", + utils.AccountField: "1002", + utils.Subject: "1002", + utils.Destination: "1001", + utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), + utils.Usage: "1m20s", }, }, Opts: map[string]interface{}{ @@ -364,11 +364,11 @@ func testDspSupGetSupplierForEvent(t *testing.T) { Tenant: "cgrates.org", ID: "testV1SplSGetHighestCostSuppliers", Event: map[string]interface{}{ - utils.Account: "1002", - utils.Subject: "1002", - utils.Destination: "1001", - utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), - utils.Usage: "1m20s", + utils.AccountField: "1002", + utils.Subject: "1002", + utils.Destination: "1001", + utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), + utils.Usage: "1m20s", }, }, Opts: map[string]interface{}{ diff --git a/dispatchers/sessions_it_test.go b/dispatchers/sessions_it_test.go index b739867ad..6d5d75fae 100755 --- a/dispatchers/sessions_it_test.go +++ b/dispatchers/sessions_it_test.go @@ -198,15 +198,15 @@ func testDspSessionTestAuthKey(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItAuth", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), - utils.Usage: authUsage, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), + utils.Usage: authUsage, }, }, Opts: map[string]interface{}{ @@ -233,16 +233,16 @@ func testDspSessionAuthorize(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItAuth", Event: map[string]interface{}{ - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), - utils.Usage: authUsage, + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), + utils.Usage: authUsage, }, }, Opts: map[string]interface{}{ @@ -286,17 +286,17 @@ func testDspSessionInit(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItInitiateSession", Event: map[string]interface{}{ - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Destination: "1002", - 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.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Destination: "1002", + 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, }, }, Opts: map[string]interface{}{ @@ -363,17 +363,17 @@ func testDspSessionUpdate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItUpdateSession", Event: map[string]interface{}{ - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Destination: "1002", - 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: reqUsage, + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Destination: "1002", + 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: reqUsage, }, }, Opts: map[string]interface{}{ @@ -398,18 +398,18 @@ func testDspSessionUpdate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItUpdateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.Account: "1001", - utils.Destination: "1002", - "OfficeGroup": "Marketing", - utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: "2018-01-07T17:00:00Z", - utils.AnswerTime: "2018-01-07T17:00:10Z", - utils.Usage: float64(reqUsage), - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.AccountField: "1001", + utils.Destination: "1002", + "OfficeGroup": "Marketing", + utils.OriginID: "TestSSv1It1", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: "2018-01-07T17:00:00Z", + utils.AnswerTime: "2018-01-07T17:00:10Z", + utils.Usage: float64(reqUsage), + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", }, }, }, @@ -438,17 +438,17 @@ func testDspSessionUpdate2(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItUpdateSession", Event: map[string]interface{}{ - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Destination: "1002", - 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: reqUsage, + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Destination: "1002", + 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: reqUsage, }, }, Opts: map[string]interface{}{ @@ -473,20 +473,20 @@ func testDspSessionUpdate2(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItUpdateSession", Event: map[string]interface{}{ - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.Account: "1001", - utils.Destination: "1002", - "LCRProfile": "premium_cli", - "Password": "CGRateS.org", - "PaypalAccount": "cgrates@paypal.com", - utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: "2018-01-07T17:00:00Z", - utils.AnswerTime: "2018-01-07T17:00:10Z", - utils.Usage: float64(reqUsage), + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.AccountField: "1001", + utils.Destination: "1002", + "LCRProfile": "premium_cli", + "Password": "CGRateS.org", + "PaypalAccount": "cgrates@paypal.com", + utils.OriginID: "TestSSv1It1", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: "2018-01-07T17:00:00Z", + utils.AnswerTime: "2018-01-07T17:00:10Z", + utils.Usage: float64(reqUsage), }, }, }, @@ -518,17 +518,17 @@ func testDspSessionTerminate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItUpdateSession", Event: map[string]interface{}{ - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Destination: "1002", - 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: 10 * time.Minute, + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Destination: "1002", + 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: 10 * time.Minute, }, }, Opts: map[string]interface{}{ @@ -552,16 +552,16 @@ func testDspSessionProcessCDR(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItProcessCDR", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_POSTPAID, - utils.Account: "1001", - utils.Destination: "1002", - 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: 10 * time.Minute, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: utils.META_POSTPAID, + utils.AccountField: "1001", + utils.Destination: "1002", + 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: 10 * time.Minute, }, }, Opts: map[string]interface{}{ @@ -590,18 +590,18 @@ func testDspSessionProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItProcessEvent", Event: map[string]interface{}{ - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebac", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginHost: "disp", - utils.OriginID: "TestSSv1It2", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Destination: "1002", - 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.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebac", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginHost: "disp", + utils.OriginID: "TestSSv1It2", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Destination: "1002", + 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, }, }, Opts: map[string]interface{}{ @@ -632,19 +632,19 @@ func testDspSessionProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItProcessEvent", Event: map[string]interface{}{ - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebac", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.Account: "1001", - utils.Destination: "1002", - "OfficeGroup": "Marketing", - utils.OriginHost: "disp", - utils.OriginID: "TestSSv1It2", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: "2018-01-07T17:00:00Z", - utils.AnswerTime: "2018-01-07T17:00:10Z", - utils.Usage: 300000000000.0, + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebac", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.AccountField: "1001", + utils.Destination: "1002", + "OfficeGroup": "Marketing", + utils.OriginHost: "disp", + utils.OriginID: "TestSSv1It2", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: "2018-01-07T17:00:00Z", + utils.AnswerTime: "2018-01-07T17:00:10Z", + utils.Usage: 300000000000.0, }, }, }, @@ -671,18 +671,18 @@ func testDspSessionProcessEvent2(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItProcessEvent", Event: map[string]interface{}{ - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It2", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Destination: "1002", - 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.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It2", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Destination: "1002", + 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", }, }, Opts: map[string]interface{}{ @@ -713,18 +713,18 @@ func testDspSessionProcessEvent2(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItProcessEvent", Event: map[string]interface{}{ - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.Account: "1001", - utils.Destination: "1002", - "Password": "CGRateS.org", - utils.OriginID: "TestSSv1It2", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: "2018-01-07T17:00:00Z", - utils.AnswerTime: "2018-01-07T17:00:10Z", - utils.Usage: 300000000000.0, + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.AccountField: "1001", + utils.Destination: "1002", + "Password": "CGRateS.org", + utils.OriginID: "TestSSv1It2", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: "2018-01-07T17:00:00Z", + utils.AnswerTime: "2018-01-07T17:00:10Z", + utils.Usage: 300000000000.0, }, }, }, @@ -823,33 +823,33 @@ func testDspSessionPassive(t *testing.T) { Tenant: rply[0].Tenant, ResourceID: "TestSSv1It1", EventStart: engine.NewMapEvent(map[string]interface{}{ - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Destination: "1002", - 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: 5 * time.Minute, + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Destination: "1002", + 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: 5 * time.Minute, }), SRuns: []*sessions.SRun{ { Event: engine.NewMapEvent(map[string]interface{}{ - "RunID": "CustomerCharges", - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Destination: "1002", - 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: 5 * time.Minute, + "RunID": "CustomerCharges", + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Destination: "1002", + 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: 5 * time.Minute, }), CD: &engine.CallDescriptor{}, EventCost: &engine.EventCost{}, @@ -948,16 +948,16 @@ func testDspSessionProcessEvent3(t *testing.T) { Tenant: "cgrates.org", ID: "testSSv1ItProcessEventTerminateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It2", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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: 10 * time.Minute, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It2", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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: 10 * time.Minute, }, }, Opts: map[string]interface{}{ diff --git a/dispatchers/stats_it_test.go b/dispatchers/stats_it_test.go index 88f38942a..26db4ac28 100755 --- a/dispatchers/stats_it_test.go +++ b/dispatchers/stats_it_test.go @@ -111,13 +111,13 @@ func testDspStsGetStatFailover(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.EVENT_NAME: "Event1", - utils.Account: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 135 * time.Second, - utils.COST: 123.0, - utils.RunID: utils.MetaDefault, - utils.Destination: "1002"}, + utils.EVENT_NAME: "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.RunID: utils.MetaDefault, + utils.Destination: "1002"}, }, Opts: map[string]interface{}{ utils.OptsAPIKey: "stat12345", @@ -184,11 +184,11 @@ func testDspStsTestAuthKey(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 135 * time.Second, - utils.COST: 123.0, - utils.PDD: 12 * time.Second}, + 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.PDD: 12 * time.Second}, }, Opts: map[string]interface{}{ utils.OptsAPIKey: "12345", @@ -227,12 +227,12 @@ func testDspStsTestAuthKey2(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 135 * time.Second, - utils.COST: 123.0, - utils.RunID: utils.MetaDefault, - utils.Destination: "1002"}, + 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.RunID: utils.MetaDefault, + utils.Destination: "1002"}, }, Opts: map[string]interface{}{ utils.OptsAPIKey: "stat12345", @@ -272,12 +272,12 @@ func testDspStsTestAuthKey2(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1002", - 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.Destination: "1001", + utils.AccountField: "1002", + 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.Destination: "1001", }, }, Opts: map[string]interface{}{ @@ -352,12 +352,12 @@ func testDspStsTestAuthKey3(t *testing.T) { Tenant: "cgrates.org", ID: "GetStats", Event: map[string]interface{}{ - utils.Account: "1002", - 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.Destination: "1001", + utils.AccountField: "1002", + 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.Destination: "1001", }, }, Opts: map[string]interface{}{ diff --git a/dispatchers/thresholds_it_test.go b/dispatchers/thresholds_it_test.go index f6cf64979..bfac59287 100755 --- a/dispatchers/thresholds_it_test.go +++ b/dispatchers/thresholds_it_test.go @@ -112,8 +112,8 @@ func testDspThProcessEventFailover(t *testing.T) { ID: utils.UUIDSha1Prefix(), Time: &nowTime, Event: map[string]interface{}{ - utils.EVENT_NAME: "Event1", - utils.Account: "1001"}, + utils.EVENT_NAME: "Event1", + utils.AccountField: "1001"}, }, Opts: map[string]interface{}{ utils.OptsAPIKey: "thr12345", @@ -165,7 +165,7 @@ func testDspThTestAuthKey(t *testing.T) { ID: utils.UUIDSha1Prefix(), Time: &nowTime, Event: map[string]interface{}{ - utils.Account: "1002"}, + utils.AccountField: "1002"}, }, Opts: map[string]interface{}{ utils.OptsAPIKey: "12345", @@ -195,7 +195,7 @@ func testDspThTestAuthKey2(t *testing.T) { ID: utils.UUIDSha1Prefix(), Time: &nowTime, Event: map[string]interface{}{ - utils.Account: "1002"}, + utils.AccountField: "1002"}, }, Opts: map[string]interface{}{ utils.OptsAPIKey: "thr12345", diff --git a/ees/elastic_it_test.go b/ees/elastic_it_test.go index 8213783c3..96e0f6613 100644 --- a/ees/elastic_it_test.go +++ b/ees/elastic_it_test.go @@ -126,21 +126,21 @@ func testElasticExportEvents(t *testing.T) { ID: "voiceEvent", 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.OriginID: "dsafdsaf", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 10 * time.Second, - utils.RunID: utils.MetaDefault, - utils.Cost: 1.01, + utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.VOICE, + utils.OriginID: "dsafdsaf", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 10 * time.Second, + utils.RunID: utils.MetaDefault, + utils.Cost: 1.01, "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, @@ -156,21 +156,21 @@ func testElasticExportEvents(t *testing.T) { ID: "dataEvent", 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.OriginID: "abcdef", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "AnotherTenant", - utils.Category: "call", //for data CDR use different Tenant - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 10 * time.Nanosecond, - utils.RunID: utils.MetaDefault, - utils.Cost: 0.012, + utils.CGRID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.DATA, + utils.OriginID: "abcdef", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "AnotherTenant", + utils.Category: "call", //for data CDR use different Tenant + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 10 * time.Nanosecond, + utils.RunID: utils.MetaDefault, + utils.Cost: 0.012, "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, @@ -186,21 +186,21 @@ func testElasticExportEvents(t *testing.T) { ID: "SMSEvent", 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.OriginID: "sdfwer", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: time.Duration(1), - utils.RunID: utils.MetaDefault, - utils.Cost: 0.15, + utils.CGRID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.SMS, + utils.OriginID: "sdfwer", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: time.Duration(1), + utils.RunID: utils.MetaDefault, + utils.Cost: 0.15, "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, @@ -216,14 +216,14 @@ func testElasticExportEvents(t *testing.T) { ID: "SMSEvent", 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.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.RunID: utils.MetaDefault, + utils.CGRID: utils.Sha1("sms2", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.SMS, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.RunID: utils.MetaDefault, }, }, Opts: map[string]interface{}{ @@ -292,54 +292,54 @@ func testElasticVerifyExports(t *testing.T) { switch hit.(map[string]interface{})["_id"] { case "2478e9f18ebcd3c684f3c14596b8bfeab2b0d6d4:*default": eMp := map[string]interface{}{ - utils.Account: "1001", - utils.AnswerTime: "2013-11-07T08:42:26Z", - utils.CGRID: "2478e9f18ebcd3c684f3c14596b8bfeab2b0d6d4", - utils.Category: "call", - utils.Cost: "0.15", - utils.Destination: "1002", - utils.OriginID: "sdfwer", - utils.RequestType: "*rated", - utils.RunID: "*default", - utils.SetupTime: "2013-11-07T08:42:25Z", - utils.Subject: "1001", - utils.Tenant: "cgrates.org", - utils.ToR: "*sms", - utils.Usage: "1", + utils.AccountField: "1001", + utils.AnswerTime: "2013-11-07T08:42:26Z", + utils.CGRID: "2478e9f18ebcd3c684f3c14596b8bfeab2b0d6d4", + utils.Category: "call", + utils.Cost: "0.15", + utils.Destination: "1002", + utils.OriginID: "sdfwer", + utils.RequestType: "*rated", + utils.RunID: "*default", + utils.SetupTime: "2013-11-07T08:42:25Z", + utils.Subject: "1001", + utils.Tenant: "cgrates.org", + utils.ToR: "*sms", + utils.Usage: "1", } if !reflect.DeepEqual(eMp, hit.(map[string]interface{})["_source"]) { t.Errorf("Expected %+v, received: %+v", eMp, hit.(map[string]interface{})["_source"]) } case "dbafe9c8614c785a65aabd116dd3959c3c56f7f6:*default": eMp := map[string]interface{}{ - utils.Account: "1001", - utils.AnswerTime: "2013-11-07T08:42:26Z", - utils.CGRID: "dbafe9c8614c785a65aabd116dd3959c3c56f7f6", - utils.Category: "call", - utils.Cost: "1.01", - utils.Destination: "1002", - utils.OriginID: "dsafdsaf", - utils.RequestType: "*rated", - utils.RunID: "*default", - utils.SetupTime: "2013-11-07T08:42:25Z", - utils.Subject: "1001", - utils.Tenant: "cgrates.org", - utils.ToR: "*voice", - utils.Usage: "10000000000", + utils.AccountField: "1001", + utils.AnswerTime: "2013-11-07T08:42:26Z", + utils.CGRID: "dbafe9c8614c785a65aabd116dd3959c3c56f7f6", + utils.Category: "call", + utils.Cost: "1.01", + utils.Destination: "1002", + utils.OriginID: "dsafdsaf", + utils.RequestType: "*rated", + utils.RunID: "*default", + utils.SetupTime: "2013-11-07T08:42:25Z", + utils.Subject: "1001", + utils.Tenant: "cgrates.org", + utils.ToR: "*voice", + utils.Usage: "10000000000", } if !reflect.DeepEqual(eMp, hit.(map[string]interface{})["_source"]) { t.Errorf("Expected %+v, received: %+v", eMp, hit.(map[string]interface{})["_source"]) } 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.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.RunID: utils.MetaDefault, + utils.CGRID: utils.Sha1("sms2", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.SMS, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.RunID: utils.MetaDefault, } if !reflect.DeepEqual(eMp, hit.(map[string]interface{})["_source"]) { t.Errorf("Expected %+v, received: %+v", eMp, hit.(map[string]interface{})["_source"]) diff --git a/ees/filecsv_it_test.go b/ees/filecsv_it_test.go index 7318d0678..098458804 100644 --- a/ees/filecsv_it_test.go +++ b/ees/filecsv_it_test.go @@ -114,21 +114,21 @@ func testCsvExportEvent(t *testing.T) { ID: "voiceEvent", 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.OriginID: "dsafdsaf", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 10 * time.Second, - utils.RunID: utils.MetaDefault, - utils.Cost: 1.01, + utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.VOICE, + utils.OriginID: "dsafdsaf", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 10 * time.Second, + utils.RunID: utils.MetaDefault, + utils.Cost: 1.01, }, }, }, @@ -142,21 +142,21 @@ func testCsvExportEvent(t *testing.T) { ID: "dataEvent", 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.OriginID: "abcdef", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "AnotherTenant", - utils.Category: "call", //for data CDR use different Tenant - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 10 * time.Nanosecond, - utils.RunID: utils.MetaDefault, - utils.Cost: 0.012, + utils.CGRID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.DATA, + utils.OriginID: "abcdef", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "AnotherTenant", + utils.Category: "call", //for data CDR use different Tenant + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 10 * time.Nanosecond, + utils.RunID: utils.MetaDefault, + utils.Cost: 0.012, }, }, }, @@ -170,21 +170,21 @@ func testCsvExportEvent(t *testing.T) { ID: "SMSEvent", 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.OriginID: "sdfwer", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 1, - utils.RunID: utils.MetaDefault, - utils.Cost: 0.15, + utils.CGRID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.SMS, + utils.OriginID: "sdfwer", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 1, + utils.RunID: utils.MetaDefault, + utils.Cost: 0.15, }, }, }, @@ -247,7 +247,7 @@ func testCsvExportComposedEvent(t *testing.T) { utils.RequestType: utils.META_RATED, utils.Tenant: "cgrates.org", utils.Category: "call", - utils.Account: "1001", + utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1002", utils.SetupTime: time.Unix(1383813745, 0).UTC(), @@ -278,7 +278,7 @@ func testCsvExportComposedEvent(t *testing.T) { utils.RequestType: utils.META_RATED, utils.Tenant: "cgrates.org", utils.Category: "call", - utils.Account: "1001", + utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1002", utils.SetupTime: time.Unix(1383813745, 0).UTC(), @@ -345,21 +345,21 @@ func testCsvExportMaskedDestination(t *testing.T) { ID: "voiceEvent", 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.OriginID: "dsafdsaf", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "+4986517174963", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 10 * time.Second, - utils.RunID: utils.MetaDefault, - utils.Cost: 1.01, + utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.VOICE, + utils.OriginID: "dsafdsaf", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "+4986517174963", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 10 * time.Second, + utils.RunID: utils.MetaDefault, + utils.Cost: 1.01, }, }, }, @@ -402,21 +402,21 @@ func testCsvExportEventWithInflateTemplate(t *testing.T) { ID: "voiceEvent", 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.OriginID: "dsafdsaf", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 10 * time.Second, - utils.RunID: utils.MetaDefault, - utils.Cost: 1.01, + utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.VOICE, + utils.OriginID: "dsafdsaf", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 10 * time.Second, + utils.RunID: utils.MetaDefault, + utils.Cost: 1.01, "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, @@ -432,21 +432,21 @@ func testCsvExportEventWithInflateTemplate(t *testing.T) { ID: "dataEvent", 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.OriginID: "abcdef", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "AnotherTenant", - utils.Category: "call", //for data CDR use different Tenant - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 10 * time.Nanosecond, - utils.RunID: utils.MetaDefault, - utils.Cost: 0.012, + utils.CGRID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.DATA, + utils.OriginID: "abcdef", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "AnotherTenant", + utils.Category: "call", //for data CDR use different Tenant + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 10 * time.Nanosecond, + utils.RunID: utils.MetaDefault, + utils.Cost: 0.012, "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, @@ -462,21 +462,21 @@ func testCsvExportEventWithInflateTemplate(t *testing.T) { ID: "SMSEvent", 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.OriginID: "sdfwer", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 1, - utils.RunID: utils.MetaDefault, - utils.Cost: 0.15, + utils.CGRID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.SMS, + utils.OriginID: "sdfwer", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 1, + utils.RunID: utils.MetaDefault, + utils.Cost: 0.15, "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, @@ -532,21 +532,21 @@ func testCsvExportNotFoundExporter(t *testing.T) { ID: "voiceEvent", 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.OriginID: "dsafdsaf", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 10 * time.Second, - utils.RunID: utils.MetaDefault, - utils.Cost: 1.01, + utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.VOICE, + utils.OriginID: "dsafdsaf", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 10 * time.Second, + utils.RunID: utils.MetaDefault, + utils.Cost: 1.01, "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, diff --git a/ees/filefwv_it_test.go b/ees/filefwv_it_test.go index 210fcdc77..94320765e 100644 --- a/ees/filefwv_it_test.go +++ b/ees/filefwv_it_test.go @@ -105,23 +105,23 @@ func testFwvExportEvent(t *testing.T) { ID: "Event", Time: utils.TimePointer(time.Now()), 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.OriginID: "dsafdsaf", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), - utils.AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - utils.Usage: 10 * time.Second, - utils.RunID: utils.MetaDefault, - utils.Cost: 2.34567, - "ExtraFields": map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, + 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.OriginID: "dsafdsaf", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), + utils.AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), + utils.Usage: 10 * time.Second, + utils.RunID: utils.MetaDefault, + utils.Cost: 2.34567, + "ExtraFields": map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, }, }, }, diff --git a/ees/httppost_it_test.go b/ees/httppost_it_test.go index 642597208..73dbf193c 100644 --- a/ees/httppost_it_test.go +++ b/ees/httppost_it_test.go @@ -122,21 +122,21 @@ func testHTTPExportEvent(t *testing.T) { ID: "voiceEvent", 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.OriginID: "dsafdsaf", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 10 * time.Second, - utils.RunID: utils.MetaDefault, - utils.Cost: 1.01, + utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.VOICE, + utils.OriginID: "dsafdsaf", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 10 * time.Second, + utils.RunID: utils.MetaDefault, + utils.Cost: 1.01, "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, @@ -152,21 +152,21 @@ func testHTTPExportEvent(t *testing.T) { ID: "dataEvent", 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.OriginID: "abcdef", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "AnotherTenant", - utils.Category: "call", //for data CDR use different Tenant - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 10 * time.Nanosecond, - utils.RunID: utils.MetaDefault, - utils.Cost: 0.012, + utils.CGRID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.DATA, + utils.OriginID: "abcdef", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "AnotherTenant", + utils.Category: "call", //for data CDR use different Tenant + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 10 * time.Nanosecond, + utils.RunID: utils.MetaDefault, + utils.Cost: 0.012, "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, @@ -182,21 +182,21 @@ func testHTTPExportEvent(t *testing.T) { ID: "SMSEvent", 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.OriginID: "sdfwer", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 1, - utils.RunID: utils.MetaDefault, - utils.Cost: 0.15, + utils.CGRID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.SMS, + utils.OriginID: "sdfwer", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 1, + utils.RunID: utils.MetaDefault, + utils.Cost: 0.15, "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, @@ -212,16 +212,16 @@ func testHTTPExportEvent(t *testing.T) { ID: "SMSEvent", 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.OriginID: "sms2", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.RunID: utils.MetaDefault, + utils.CGRID: utils.Sha1("sms2", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.SMS, + utils.OriginID: "sms2", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.RunID: utils.MetaDefault, }, }, }, @@ -234,13 +234,13 @@ func testHTTPExportEvent(t *testing.T) { time.Sleep(10 * time.Millisecond) // verify HTTPValues for eventVoice for key, strVal := range map[string]string{ - utils.CGRID: utils.IfaceAsString(eventVoice.Event[utils.CGRID]), - utils.ToR: utils.IfaceAsString(eventVoice.Event[utils.ToR]), - utils.Category: utils.IfaceAsString(eventVoice.Event[utils.Category]), - utils.Account: utils.IfaceAsString(eventVoice.Event[utils.Account]), - utils.Subject: utils.IfaceAsString(eventVoice.Event[utils.Subject]), - utils.Destination: utils.IfaceAsString(eventVoice.Event[utils.Destination]), - utils.Cost: utils.IfaceAsString(eventVoice.Event[utils.Cost]), + utils.CGRID: utils.IfaceAsString(eventVoice.Event[utils.CGRID]), + utils.ToR: utils.IfaceAsString(eventVoice.Event[utils.ToR]), + utils.Category: utils.IfaceAsString(eventVoice.Event[utils.Category]), + utils.AccountField: utils.IfaceAsString(eventVoice.Event[utils.AccountField]), + utils.Subject: utils.IfaceAsString(eventVoice.Event[utils.Subject]), + utils.Destination: utils.IfaceAsString(eventVoice.Event[utils.Destination]), + utils.Cost: utils.IfaceAsString(eventVoice.Event[utils.Cost]), } { if rcv := httpValues.Get(key); rcv != strVal { t.Errorf("Expected %+v, received: %+v", strVal, rcv) @@ -257,13 +257,13 @@ func testHTTPExportEvent(t *testing.T) { time.Sleep(10 * time.Millisecond) // verify HTTPValues for eventData for key, strVal := range map[string]string{ - utils.CGRID: utils.IfaceAsString(eventData.Event[utils.CGRID]), - utils.ToR: utils.IfaceAsString(eventData.Event[utils.ToR]), - utils.Category: utils.IfaceAsString(eventData.Event[utils.Category]), - utils.Account: utils.IfaceAsString(eventData.Event[utils.Account]), - utils.Subject: utils.IfaceAsString(eventData.Event[utils.Subject]), - utils.Destination: utils.IfaceAsString(eventData.Event[utils.Destination]), - utils.Cost: utils.IfaceAsString(eventData.Event[utils.Cost]), + utils.CGRID: utils.IfaceAsString(eventData.Event[utils.CGRID]), + utils.ToR: utils.IfaceAsString(eventData.Event[utils.ToR]), + utils.Category: utils.IfaceAsString(eventData.Event[utils.Category]), + utils.AccountField: utils.IfaceAsString(eventData.Event[utils.AccountField]), + utils.Subject: utils.IfaceAsString(eventData.Event[utils.Subject]), + utils.Destination: utils.IfaceAsString(eventData.Event[utils.Destination]), + utils.Cost: utils.IfaceAsString(eventData.Event[utils.Cost]), } { if rcv := httpValues.Get(key); rcv != strVal { t.Errorf("Expected %+v, received: %+v", strVal, rcv) @@ -280,13 +280,13 @@ func testHTTPExportEvent(t *testing.T) { time.Sleep(10 * time.Millisecond) // verify HTTPValues for eventSMS for key, strVal := range map[string]string{ - utils.CGRID: utils.IfaceAsString(eventSMS.Event[utils.CGRID]), - utils.ToR: utils.IfaceAsString(eventSMS.Event[utils.ToR]), - utils.Category: utils.IfaceAsString(eventSMS.Event[utils.Category]), - utils.Account: utils.IfaceAsString(eventSMS.Event[utils.Account]), - utils.Subject: utils.IfaceAsString(eventSMS.Event[utils.Subject]), - utils.Destination: utils.IfaceAsString(eventSMS.Event[utils.Destination]), - utils.Cost: utils.IfaceAsString(eventSMS.Event[utils.Cost]), + utils.CGRID: utils.IfaceAsString(eventSMS.Event[utils.CGRID]), + utils.ToR: utils.IfaceAsString(eventSMS.Event[utils.ToR]), + utils.Category: utils.IfaceAsString(eventSMS.Event[utils.Category]), + utils.AccountField: utils.IfaceAsString(eventSMS.Event[utils.AccountField]), + utils.Subject: utils.IfaceAsString(eventSMS.Event[utils.Subject]), + utils.Destination: utils.IfaceAsString(eventSMS.Event[utils.Destination]), + utils.Cost: utils.IfaceAsString(eventSMS.Event[utils.Cost]), } { if rcv := httpValues.Get(key); rcv != strVal { t.Errorf("Expected %+v, received: %+v", strVal, rcv) diff --git a/ees/posterjsonmap_it_test.go b/ees/posterjsonmap_it_test.go index f362efcc1..76e99bf07 100644 --- a/ees/posterjsonmap_it_test.go +++ b/ees/posterjsonmap_it_test.go @@ -119,21 +119,21 @@ func testHTTPJsonMapExportEvent(t *testing.T) { ID: "voiceEvent", 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.OriginID: "dsafdsaf", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 10 * time.Second, - utils.RunID: utils.MetaDefault, - utils.Cost: 1.01, + utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.VOICE, + utils.OriginID: "dsafdsaf", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 10 * time.Second, + utils.RunID: utils.MetaDefault, + utils.Cost: 1.01, "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, @@ -152,21 +152,21 @@ func testHTTPJsonMapExportEvent(t *testing.T) { ID: "dataEvent", 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.OriginID: "abcdef", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "AnotherTenant", - utils.Category: "call", //for data CDR use different Tenant - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 10 * time.Nanosecond, - utils.RunID: utils.MetaDefault, - utils.Cost: 0.012, + utils.CGRID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.DATA, + utils.OriginID: "abcdef", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "AnotherTenant", + utils.Category: "call", //for data CDR use different Tenant + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 10 * time.Nanosecond, + utils.RunID: utils.MetaDefault, + utils.Cost: 0.012, "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, @@ -185,22 +185,22 @@ func testHTTPJsonMapExportEvent(t *testing.T) { ID: "SMSEvent", 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.OriginID: "sdfwer", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 1, - utils.RunID: utils.MetaDefault, - utils.Cost: 0.15, - utils.OrderID: 10, + utils.CGRID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.SMS, + utils.OriginID: "sdfwer", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 1, + utils.RunID: utils.MetaDefault, + utils.Cost: 0.15, + utils.OrderID: 10, "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, @@ -219,13 +219,13 @@ func testHTTPJsonMapExportEvent(t *testing.T) { ID: "SMSEvent", 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.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Destination: "1002", - utils.RunID: utils.MetaDefault, + utils.CGRID: utils.Sha1("sms2", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.SMS, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Destination: "1002", + utils.RunID: utils.MetaDefault, }, }, }, @@ -237,14 +237,14 @@ func testHTTPJsonMapExportEvent(t *testing.T) { time.Sleep(10 * time.Millisecond) // verify HTTPJsonMap for eventVoice for key, strVal := range map[string]string{ - utils.CGRID: utils.IfaceAsString(eventVoice.Event[utils.CGRID]), - utils.ToR: utils.IfaceAsString(eventVoice.Event[utils.ToR]), - utils.Category: utils.IfaceAsString(eventVoice.Event[utils.Category]), - utils.Account: utils.IfaceAsString(eventVoice.Event[utils.Account]), - utils.Subject: utils.IfaceAsString(eventVoice.Event[utils.Subject]), - utils.Destination: utils.IfaceAsString(eventVoice.Event[utils.Destination]), - utils.Cost: utils.IfaceAsString(eventVoice.Event[utils.Cost]), - utils.EventType: utils.CDR, + utils.CGRID: utils.IfaceAsString(eventVoice.Event[utils.CGRID]), + utils.ToR: utils.IfaceAsString(eventVoice.Event[utils.ToR]), + utils.Category: utils.IfaceAsString(eventVoice.Event[utils.Category]), + utils.AccountField: utils.IfaceAsString(eventVoice.Event[utils.AccountField]), + utils.Subject: utils.IfaceAsString(eventVoice.Event[utils.Subject]), + utils.Destination: utils.IfaceAsString(eventVoice.Event[utils.Destination]), + utils.Cost: utils.IfaceAsString(eventVoice.Event[utils.Cost]), + utils.EventType: utils.CDR, } { if rcv := httpJsonMap[key]; rcv != strVal { t.Errorf("Expected %+v, received: %+v", strVal, rcv) @@ -260,14 +260,14 @@ func testHTTPJsonMapExportEvent(t *testing.T) { time.Sleep(10 * time.Millisecond) // verify HTTPJsonMap for eventData for key, strVal := range map[string]string{ - utils.CGRID: utils.IfaceAsString(eventData.Event[utils.CGRID]), - utils.ToR: utils.IfaceAsString(eventData.Event[utils.ToR]), - utils.Category: utils.IfaceAsString(eventData.Event[utils.Category]), - utils.Account: utils.IfaceAsString(eventData.Event[utils.Account]), - utils.Subject: utils.IfaceAsString(eventData.Event[utils.Subject]), - utils.Destination: utils.IfaceAsString(eventData.Event[utils.Destination]), - utils.Cost: utils.IfaceAsString(eventData.Event[utils.Cost]), - utils.EventType: utils.CDR, + utils.CGRID: utils.IfaceAsString(eventData.Event[utils.CGRID]), + utils.ToR: utils.IfaceAsString(eventData.Event[utils.ToR]), + utils.Category: utils.IfaceAsString(eventData.Event[utils.Category]), + utils.AccountField: utils.IfaceAsString(eventData.Event[utils.AccountField]), + utils.Subject: utils.IfaceAsString(eventData.Event[utils.Subject]), + utils.Destination: utils.IfaceAsString(eventData.Event[utils.Destination]), + utils.Cost: utils.IfaceAsString(eventData.Event[utils.Cost]), + utils.EventType: utils.CDR, } { if rcv := httpJsonMap[key]; rcv != strVal { t.Errorf("Expected %+v, received: %+v", strVal, rcv) @@ -283,14 +283,14 @@ func testHTTPJsonMapExportEvent(t *testing.T) { time.Sleep(10 * time.Millisecond) // verify HTTPJsonMap for eventSMS for key, strVal := range map[string]string{ - utils.CGRID: utils.IfaceAsString(eventSMS.Event[utils.CGRID]), - utils.ToR: utils.IfaceAsString(eventSMS.Event[utils.ToR]), - utils.Category: utils.IfaceAsString(eventSMS.Event[utils.Category]), - utils.Account: utils.IfaceAsString(eventSMS.Event[utils.Account]), - utils.Subject: utils.IfaceAsString(eventSMS.Event[utils.Subject]), - utils.Destination: utils.IfaceAsString(eventSMS.Event[utils.Destination]), - utils.Cost: utils.IfaceAsString(eventSMS.Event[utils.Cost]), - utils.EventType: utils.CDR, + utils.CGRID: utils.IfaceAsString(eventSMS.Event[utils.CGRID]), + utils.ToR: utils.IfaceAsString(eventSMS.Event[utils.ToR]), + utils.Category: utils.IfaceAsString(eventSMS.Event[utils.Category]), + utils.AccountField: utils.IfaceAsString(eventSMS.Event[utils.AccountField]), + utils.Subject: utils.IfaceAsString(eventSMS.Event[utils.Subject]), + utils.Destination: utils.IfaceAsString(eventSMS.Event[utils.Destination]), + utils.Cost: utils.IfaceAsString(eventSMS.Event[utils.Cost]), + utils.EventType: utils.CDR, } { if rcv := httpJsonMap[key]; rcv != strVal { t.Errorf("Expected %+v, received: %+v", strVal, rcv) diff --git a/ees/sql_it_test.go b/ees/sql_it_test.go index 18ccab564..0c9e25f1a 100644 --- a/ees/sql_it_test.go +++ b/ees/sql_it_test.go @@ -148,21 +148,21 @@ func testSqlEeExportEventFull(t *testing.T) { ID: "voiceEvent", 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.OriginID: "dsafdsaf", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 10 * time.Second, - utils.RunID: utils.MetaDefault, - utils.Cost: 1.01, + utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.VOICE, + utils.OriginID: "dsafdsaf", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 10 * time.Second, + utils.RunID: utils.MetaDefault, + utils.Cost: 1.01, "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, @@ -186,21 +186,21 @@ func testSqlEeExportEventPartial(t *testing.T) { ID: "voiceEvent", 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.OriginID: "dsafdsaf", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 10 * time.Second, - utils.RunID: utils.MetaDefault, - utils.Cost: 123, + utils.CGRID: utils.Sha1("asd", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.VOICE, + utils.OriginID: "dsafdsaf", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 10 * time.Second, + utils.RunID: utils.MetaDefault, + utils.Cost: 123, "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, diff --git a/ees/virtual_ee_it_test.go b/ees/virtual_ee_it_test.go index ce1297707..e975879ad 100644 --- a/ees/virtual_ee_it_test.go +++ b/ees/virtual_ee_it_test.go @@ -107,21 +107,21 @@ func testVirtExportSupplierEvent(t *testing.T) { ID: "supplierEvent", 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.OriginID: "dsafdsaf", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 10 * time.Second, - utils.RunID: "SupplierRun", - utils.Cost: 1.23, + utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.VOICE, + utils.OriginID: "dsafdsaf", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 10 * time.Second, + utils.RunID: "SupplierRun", + utils.Cost: 1.23, }, }, }, @@ -143,21 +143,21 @@ func testVirtExportEvents(t *testing.T) { ID: "voiceEvent", 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.OriginID: "dsafdsaf", - utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Unix(1383813745, 0).UTC(), - utils.AnswerTime: time.Unix(1383813746, 0).UTC(), - utils.Usage: 10 * time.Second, - utils.RunID: "SupplierRun", - utils.Cost: 1.01, + utils.CGRID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()), + utils.ToR: utils.VOICE, + utils.OriginID: "dsafdsaf", + utils.OriginHost: "192.168.1.1", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Unix(1383813745, 0).UTC(), + utils.AnswerTime: time.Unix(1383813746, 0).UTC(), + utils.Usage: 10 * time.Second, + utils.RunID: "SupplierRun", + utils.Cost: 1.01, }, }, }, diff --git a/engine/account.go b/engine/account.go index 94aa025db..bea61d5ec 100644 --- a/engine/account.go +++ b/engine/account.go @@ -555,11 +555,11 @@ func (acc *Account) debitCreditBalance(cd *CallDescriptor, count bool, dryRun bo Tenant: acntTnt.Tenant, ID: utils.GenUUID(), Event: map[string]interface{}{ - utils.EventType: utils.BalanceUpdate, - utils.EventSource: utils.AccountService, - utils.Account: acntTnt.ID, - utils.BalanceID: defaultBalance.ID, - utils.Units: defaultBalance.Value, + utils.EventType: utils.BalanceUpdate, + utils.EventSource: utils.AccountService, + utils.AccountField: acntTnt.ID, + utils.BalanceID: defaultBalance.ID, + utils.Units: defaultBalance.Value, }, }, Opts: map[string]interface{}{ diff --git a/engine/action.go b/engine/action.go index 8d55920f3..2b7cb2010 100644 --- a/engine/action.go +++ b/engine/action.go @@ -129,13 +129,13 @@ func cdrLogAction(acc *Account, a *Action, acs Actions, extraData interface{}) ( return fmt.Errorf("No connection with CDR Server") } defaultTemplate := map[string]config.RSRParsers{ - utils.ToR: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAcnt+utils.NestingSep+utils.BalanceType, utils.INFIELD_SEP), - utils.OriginHost: config.NewRSRParsersMustCompile("127.0.0.1", utils.INFIELD_SEP), - utils.RequestType: config.NewRSRParsersMustCompile(utils.META_NONE, utils.INFIELD_SEP), - utils.Tenant: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAcnt+utils.NestingSep+utils.Tenant, utils.INFIELD_SEP), - utils.Account: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAcnt+utils.NestingSep+utils.Account, utils.INFIELD_SEP), - utils.Subject: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAcnt+utils.NestingSep+utils.Account, utils.INFIELD_SEP), - utils.COST: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAct+utils.NestingSep+utils.ActionValue, utils.INFIELD_SEP), + utils.ToR: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAcnt+utils.NestingSep+utils.BalanceType, utils.INFIELD_SEP), + utils.OriginHost: config.NewRSRParsersMustCompile("127.0.0.1", utils.INFIELD_SEP), + utils.RequestType: config.NewRSRParsersMustCompile(utils.META_NONE, utils.INFIELD_SEP), + utils.Tenant: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAcnt+utils.NestingSep+utils.Tenant, utils.INFIELD_SEP), + utils.AccountField: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAcnt+utils.NestingSep+utils.AccountField, utils.INFIELD_SEP), + utils.Subject: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAcnt+utils.NestingSep+utils.AccountField, utils.INFIELD_SEP), + utils.COST: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.MetaAct+utils.NestingSep+utils.ActionValue, utils.INFIELD_SEP), } template := make(map[string]string) // overwrite default template @@ -838,7 +838,7 @@ func (cdrP *cdrLogProvider) FieldAsInterface(fldPath []string) (data interface{} } } data = tntAcnt.Tenant - case utils.Account: + case utils.AccountField: tntAcnt := new(utils.TenantAccount) // Init with empty values if cdrP.acnt != nil { if tntAcnt, err = utils.NewTAFromAccountKey(cdrP.acnt.ID); err != nil { @@ -1020,7 +1020,7 @@ func export(ub *Account, a *Action, acs Actions, extraData interface{}) (err err Tenant: utils.NewTenantID(ub.ID).Tenant, ID: utils.GenUUID(), Event: map[string]interface{}{ - utils.Account: ub.ID, + utils.AccountField: ub.ID, utils.EventType: utils.AccountUpdate, utils.EventSource: utils.AccountService, utils.AllowNegative: ub.AllowNegative, diff --git a/engine/calldesc.go b/engine/calldesc.go index 6714ab37c..71998806e 100644 --- a/engine/calldesc.go +++ b/engine/calldesc.go @@ -73,7 +73,7 @@ func NewCallDescriptorFromCGREvent(cgrEv *utils.CGREvent, return nil, err } } - if cd.Account, err = cgrEv.FieldAsString(utils.Account); err != nil { + if cd.Account, err = cgrEv.FieldAsString(utils.AccountField); err != nil { return } if cd.Subject, err = cgrEv.FieldAsString(utils.Subject); err != nil { @@ -155,7 +155,7 @@ func (cd *CallDescriptor) AsCGREvent() *utils.CGREvent { cgrEv.Event[utils.ToR] = cd.ToR cgrEv.Event[utils.Tenant] = cd.Tenant cgrEv.Event[utils.Category] = cd.Category - cgrEv.Event[utils.Account] = cd.Account + cgrEv.Event[utils.AccountField] = cd.Account cgrEv.Event[utils.Subject] = cd.Subject cgrEv.Event[utils.Destination] = cd.Destination cgrEv.Event[utils.AnswerTime] = cd.TimeStart @@ -181,7 +181,7 @@ func (cd *CallDescriptor) UpdateFromCGREvent(cgrEv *utils.CGREvent, fields []str if cd.Category, err = cgrEv.FieldAsString(fldName); err != nil { return } - case utils.Account: + case utils.AccountField: if cd.Account, err = cgrEv.FieldAsString(fldName); err != nil { return } diff --git a/engine/calldesc_test.go b/engine/calldesc_test.go index 8086b5582..6bf02569b 100644 --- a/engine/calldesc_test.go +++ b/engine/calldesc_test.go @@ -1879,7 +1879,7 @@ func TestCallDescriptorUpdateFromCGREvent(t *testing.T) { TimeEnd: time.Date(2015, 3, 23, 6, 30, 0, 0, time.UTC), MaxCostSoFar: 0, } - if err := cd.UpdateFromCGREvent(cgrEv, []string{utils.Account, utils.Subject}); err != nil { + if err := cd.UpdateFromCGREvent(cgrEv, []string{utils.AccountField, utils.Subject}); err != nil { t.Error(err) } else { if !reflect.DeepEqual(cd, cdExpected) { @@ -1900,7 +1900,7 @@ func TestCallDescriptorUpdateFromCGREvent(t *testing.T) { "Usage": 40 * time.Minute, }, } - if err := cd.UpdateFromCGREvent(cgrEv, []string{utils.Account, utils.Subject}); err != nil { + if err := cd.UpdateFromCGREvent(cgrEv, []string{utils.AccountField, utils.Subject}); err != nil { t.Error(err) } else { if !reflect.DeepEqual(cd, cdExpected) { diff --git a/engine/cdr.go b/engine/cdr.go index 7d3104d03..64d27330e 100644 --- a/engine/cdr.go +++ b/engine/cdr.go @@ -220,7 +220,7 @@ func (cdr *CDR) AsMapStringIface() (mp map[string]interface{}) { mp[utils.RequestType] = cdr.RequestType mp[utils.Tenant] = cdr.Tenant mp[utils.Category] = cdr.Category - mp[utils.Account] = cdr.Account + mp[utils.AccountField] = cdr.Account mp[utils.Subject] = cdr.Subject mp[utils.Destination] = cdr.Destination mp[utils.SetupTime] = cdr.SetupTime diff --git a/engine/cdr_test.go b/engine/cdr_test.go index c6024b94f..9bd89d271 100644 --- a/engine/cdr_test.go +++ b/engine/cdr_test.go @@ -136,7 +136,7 @@ func TestFieldAsString(t *testing.T) { } else if fldVal != eFldVal { t.Errorf("field: <%v>, expected: <%v>, received: <%v>", prsr, eFldVal, fldVal) } - prsr = config.NewRSRParserMustCompile(utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account) + prsr = config.NewRSRParserMustCompile(utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField) eFldVal = cdr.Account if fldVal, err := cdr.FieldAsString(prsr); err != nil { t.Error(err) @@ -358,8 +358,8 @@ func TestCDRAsHttpForm(t *testing.T) { if cdrForm.Get(utils.Category) != "call" { t.Errorf("Expected: %s, received: %s", "call", cdrForm.Get(utils.Category)) } - if cdrForm.Get(utils.ACCOUNT) != "1001" { - t.Errorf("Expected: %s, received: %s", "1001", cdrForm.Get(utils.ACCOUNT)) + if cdrForm.Get(utils.AccountField) != "1001" { + t.Errorf("Expected: %s, received: %s", "1001", cdrForm.Get(utils.AccountField)) } if cdrForm.Get(utils.Subject) != "1001" { t.Errorf("Expected: %s, received: %s", "1001", cdrForm.Get(utils.Subject)) @@ -498,29 +498,29 @@ func TestCDRAsMapStringIface(t *testing.T) { } mp := map[string]interface{}{ - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", - utils.CGRID: cdr.CGRID, - utils.RunID: utils.MetaDefault, - utils.OrderID: cdr.OrderID, - utils.OriginHost: "192.168.1.1", - utils.Source: utils.UNIT_TEST, - utils.OriginID: "dsafdsaf", - utils.ToR: utils.VOICE, - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1002", - utils.Subject: "1001", - utils.Destination: "+4986517174963", - utils.SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), - utils.AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - utils.Usage: 10 * time.Second, - utils.CostSource: cdr.CostSource, - utils.Cost: 1.01, - utils.PreRated: false, - utils.Partial: false, - utils.ExtraInfo: cdr.ExtraInfo, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", + utils.CGRID: cdr.CGRID, + utils.RunID: utils.MetaDefault, + utils.OrderID: cdr.OrderID, + utils.OriginHost: "192.168.1.1", + utils.Source: utils.UNIT_TEST, + utils.OriginID: "dsafdsaf", + utils.ToR: utils.VOICE, + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1002", + utils.Subject: "1001", + utils.Destination: "+4986517174963", + utils.SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), + utils.AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), + utils.Usage: 10 * time.Second, + utils.CostSource: cdr.CostSource, + utils.Cost: 1.01, + utils.PreRated: false, + utils.Partial: false, + utils.ExtraInfo: cdr.ExtraInfo, } if cdrMp := cdr.AsMapStringIface(); !reflect.DeepEqual(mp, cdrMp) { t.Errorf("Expecting: %+v, received: %+v", mp, cdrMp) @@ -561,30 +561,30 @@ func TestCDRTestCDRAsMapStringIface2(t *testing.T) { } mp := map[string]interface{}{ - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", - utils.CGRID: cdr.CGRID, - utils.RunID: utils.MetaDefault, - utils.OrderID: cdr.OrderID, - utils.OriginHost: "192.168.1.1", - utils.Source: utils.UNIT_TEST, - utils.OriginID: "dsafdsaf", - utils.ToR: utils.VOICE, - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1002", - utils.Subject: "1001", - utils.Destination: "+4986517174963", - utils.SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), - utils.AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - utils.Usage: 10 * time.Second, - utils.CostSource: cdr.CostSource, - utils.Cost: 1.01, - utils.PreRated: false, - utils.Partial: false, - utils.ExtraInfo: cdr.ExtraInfo, - utils.CostDetails: cdr.CostDetails, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", + utils.CGRID: cdr.CGRID, + utils.RunID: utils.MetaDefault, + utils.OrderID: cdr.OrderID, + utils.OriginHost: "192.168.1.1", + utils.Source: utils.UNIT_TEST, + utils.OriginID: "dsafdsaf", + utils.ToR: utils.VOICE, + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1002", + utils.Subject: "1001", + utils.Destination: "+4986517174963", + utils.SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), + utils.AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), + utils.Usage: 10 * time.Second, + utils.CostSource: cdr.CostSource, + utils.Cost: 1.01, + utils.PreRated: false, + utils.Partial: false, + utils.ExtraInfo: cdr.ExtraInfo, + utils.CostDetails: cdr.CostDetails, } if cdrMp := cdr.AsMapStringIface(); !reflect.DeepEqual(mp, cdrMp) { t.Errorf("Expecting: %+v, received: %+v", mp, cdrMp) diff --git a/engine/eventcost.go b/engine/eventcost.go index eb858cbab..96f434395 100644 --- a/engine/eventcost.go +++ b/engine/eventcost.go @@ -1108,7 +1108,7 @@ func (ec *EventCost) getAcountingForPath(fldPath []string, bc *BalanceCharge) (v return bc, nil } - if fldPath[0] == utils.Balance { + if fldPath[0] == utils.BalanceField { bl := ec.AccountSummary.BalanceSummaries.BalanceSummaryWithUUD(bc.BalanceUUID) if bl == nil { return nil, utils.ErrNotFound diff --git a/engine/eventcost_test.go b/engine/eventcost_test.go index e0e3c8f98..15ce34b11 100644 --- a/engine/eventcost_test.go +++ b/engine/eventcost_test.go @@ -3242,14 +3242,14 @@ func TestEventCostgetAcountingForPath(t *testing.T) { ID: "ID", } //len(fldPath) == 1 - if rcv, err := eventCost.getAcountingForPath([]string{utils.Balance}, balanceCharge); err != nil { + if rcv, err := eventCost.getAcountingForPath([]string{utils.BalanceField}, balanceCharge); err != nil { t.Errorf("Expecting: nil, received: %+v", err) } else if !reflect.DeepEqual(eBalanceSummaries, rcv) { t.Errorf("Expecting: %+v, received: %+v", eBalanceSummaries, rcv) } // bl == nil eventCost = &EventCost{AccountSummary: &AccountSummary{}} - if rcv, err := eventCost.getAcountingForPath([]string{utils.Balance}, balanceCharge); err == nil || err != utils.ErrNotFound { + if rcv, err := eventCost.getAcountingForPath([]string{utils.BalanceField}, balanceCharge); err == nil || err != utils.ErrNotFound { t.Errorf("Expecting: %+v, received: %+v", utils.ErrNotFound, err) } else if rcv != nil { t.Errorf("Expecting: nil, received: %+v", rcv) @@ -3264,7 +3264,7 @@ func TestEventCostgetAcountingForPath(t *testing.T) { }, }, } - if rcv, err := eventCost.getAcountingForPath([]string{utils.Balance, "ID"}, balanceCharge); err != nil { + if rcv, err := eventCost.getAcountingForPath([]string{utils.BalanceField, "ID"}, balanceCharge); err != nil { t.Errorf("Expecting: nil, received: %+v", err) } else if !reflect.DeepEqual("ID", rcv) { t.Errorf("Expecting: \"ID\", received: %+v", rcv) diff --git a/engine/filters_test.go b/engine/filters_test.go index 4aae1d3b4..322d064aa 100644 --- a/engine/filters_test.go +++ b/engine/filters_test.go @@ -875,16 +875,16 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) { dm: dmFilterPass, } passEvent1 := map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Account: "1010", - utils.Destination: "+49", - utils.Weight: 10, + utils.Tenant: "cgrates.org", + utils.AccountField: "1010", + utils.Destination: "+49", + utils.Weight: 10, } passEvent2 := map[string]interface{}{ - utils.Tenant: "itsyscom.com", - utils.Account: "dan", - utils.Destination: "+4986517174963", - utils.Weight: 20, + utils.Tenant: "itsyscom.com", + utils.AccountField: "dan", + utils.Destination: "+4986517174963", + utils.Weight: 20, } pEv1 := utils.MapStorage{} pEv1.Set([]string{utils.MetaReq}, passEvent1) @@ -953,11 +953,11 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) { } ev = map[string]interface{}{ - utils.Account: "1003", - utils.Subject: "1003", - utils.Destination: "1002", - utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), - utils.Usage: "1m20s", + utils.AccountField: "1003", + utils.Subject: "1003", + utils.Destination: "1002", + utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), + utils.Usage: "1m20s", } pEv = utils.MapStorage{} pEv.Set([]string{utils.MetaReq}, ev) diff --git a/engine/loader_csv_test.go b/engine/loader_csv_test.go index d89cb8faa..8b084cde1 100644 --- a/engine/loader_csv_test.go +++ b/engine/loader_csv_test.go @@ -1135,7 +1135,7 @@ func TestLoadFilters(t *testing.T) { ID: "FLTR_1", Filters: []*utils.TPFilter{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1001", "1002"}, }, @@ -1165,7 +1165,7 @@ func TestLoadFilters(t *testing.T) { ID: "FLTR_ACNT_dan", Filters: []*utils.TPFilter{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"dan"}, }, diff --git a/engine/mapevent.go b/engine/mapevent.go index 7632bff85..3b1f3a8d4 100644 --- a/engine/mapevent.go +++ b/engine/mapevent.go @@ -230,7 +230,7 @@ func (me MapEvent) AsCDR(cfg *config.CGRConfig, tnt, tmz string) (cdr *CDR, err cdr.Tenant = utils.IfaceAsString(v) case utils.Category: cdr.Category = utils.IfaceAsString(v) - case utils.Account: + case utils.AccountField: cdr.Account = utils.IfaceAsString(v) case utils.Subject: cdr.Subject = utils.IfaceAsString(v) diff --git a/engine/mapevent_test.go b/engine/mapevent_test.go index 52a6de600..76f212518 100644 --- a/engine/mapevent_test.go +++ b/engine/mapevent_test.go @@ -408,22 +408,22 @@ func TestMapEventAsCDR(t *testing.T) { t.Errorf("Expecting %+v, received: %+v", expected, rply) } me = MapEvent{ - utils.CGRID: "da39a3ee5e6b4b0d3255bfef95601890afd80709", - utils.RunID: utils.MetaDefault, - utils.OriginHost: utils.FreeSWITCHAgent, - utils.OriginID: "127.0.0.1", - utils.ToR: utils.VOICE, - utils.RequestType: utils.META_PREPAID, - utils.Tenant: "cgrates.org", - utils.Category: utils.CALL, - utils.Account: "10010", - utils.Subject: "10010", - utils.Destination: "10012", - "ExtraField1": 5, - "Source": 1001, - "CostSource": "1002", - "ExtraField2": "extra", - "ExtraInfo": "ACCOUNT_NOT_FOUND", + utils.CGRID: "da39a3ee5e6b4b0d3255bfef95601890afd80709", + utils.RunID: utils.MetaDefault, + utils.OriginHost: utils.FreeSWITCHAgent, + utils.OriginID: "127.0.0.1", + utils.ToR: utils.VOICE, + utils.RequestType: utils.META_PREPAID, + utils.Tenant: "cgrates.org", + utils.Category: utils.CALL, + utils.AccountField: "10010", + utils.Subject: "10010", + utils.Destination: "10012", + "ExtraField1": 5, + "Source": 1001, + "CostSource": "1002", + "ExtraField2": "extra", + "ExtraInfo": "ACCOUNT_NOT_FOUND", } expected = &CDR{ CGRID: "da39a3ee5e6b4b0d3255bfef95601890afd80709", diff --git a/engine/responder.go b/engine/responder.go index 9d2534d4a..fa2652653 100644 --- a/engine/responder.go +++ b/engine/responder.go @@ -356,9 +356,9 @@ func (rs *Responder) GetMaxSessionTimeOnAccounts(arg *utils.GetMaxSessionTimeOnA utils.Responder, anctID, err.Error())) } else { *reply = map[string]interface{}{ - utils.CapMaxUsage: maxDur, - utils.Cost: 0.0, - utils.Account: anctID, + utils.CapMaxUsage: maxDur, + utils.Cost: 0.0, + utils.AccountField: anctID, } return nil } diff --git a/engine/routes.go b/engine/routes.go index f876ffc34..f068536a4 100644 --- a/engine/routes.go +++ b/engine/routes.go @@ -211,12 +211,12 @@ func (rpS *RouteService) matchingRouteProfilesForEvent(tnt string, ev *utils.CGR func (rpS *RouteService) costForEvent(ev *utils.CGREvent, acntIDs, rpIDs, rtPrfIDs []string) (costData map[string]interface{}, err error) { costData = make(map[string]interface{}) - if err = ev.CheckMandatoryFields([]string{utils.Account, + if err = ev.CheckMandatoryFields([]string{utils.AccountField, utils.Destination, utils.SetupTime}); err != nil { return } var acnt, subj, dst string - if acnt, err = ev.FieldAsString(utils.Account); err != nil { + if acnt, err = ev.FieldAsString(utils.AccountField); err != nil { return } if subj, err = ev.FieldAsString(utils.Subject); err != nil { @@ -618,7 +618,7 @@ func (attr *ArgsGetRoutes) Clone() *ArgsGetRoutes { func (attr *ArgsGetRoutes) asOptsGetRoutes() (opts *optsGetRoutes, err error) { opts = &optsGetRoutes{ignoreErrors: attr.IgnoreErrors} if attr.MaxCost == utils.MetaEventCost { // dynamic cost needs to be calculated from event - if err = attr.CGREvent.CheckMandatoryFields([]string{utils.Account, + if err = attr.CGREvent.CheckMandatoryFields([]string{utils.AccountField, utils.Destination, utils.SetupTime, utils.Usage}); err != nil { return } diff --git a/engine/storage_interface.go b/engine/storage_interface.go index 26052d9b6..1e8d0bceb 100644 --- a/engine/storage_interface.go +++ b/engine/storage_interface.go @@ -135,6 +135,12 @@ type DataDB interface { GetActionProfileDrv(string, string) (*ActionProfile, error) SetActionProfileDrv(*ActionProfile) error RemoveActionProfileDrv(string, string) error + GetAccountProfileDrv(string, string) (*utils.AccountProfile, error) + SetAccountProfileDrv(profile *utils.AccountProfile) error + RemoveAccountProfileDrv(string, string) error + GetAccount2Drv(string, string) (*utils.Account, error) + SetAccount2Drv(*utils.Account) error + RemoveAccount2Drv(string, string) error } type StorDB interface { diff --git a/engine/storage_internal_datadb.go b/engine/storage_internal_datadb.go index afe53e695..2bb8a91db 100644 --- a/engine/storage_internal_datadb.go +++ b/engine/storage_internal_datadb.go @@ -935,3 +935,43 @@ func (iDB *InternalDB) RemoveIndexesDrv(idxItmType, tntCtx, idxKey string) (err Cache.RemoveWithoutReplicate(idxItmType, utils.ConcatenatedKey(tntCtx, idxKey), cacheCommit(utils.NonTransactional), utils.NonTransactional) return } + +func (iDB *InternalDB) GetAccountProfileDrv(tenant, id string) (ap *utils.AccountProfile, err error) { + x, ok := Cache.Get(utils.CacheAccountProfiles, utils.ConcatenatedKey(tenant, id)) + if !ok || x == nil { + return nil, utils.ErrNotFound + } + return x.(*utils.AccountProfile), nil +} + +func (iDB *InternalDB) SetAccountProfileDrv(ap *utils.AccountProfile) (err error) { + Cache.SetWithoutReplicate(utils.CacheAccountProfiles, ap.TenantID(), ap, nil, + cacheCommit(utils.NonTransactional), utils.NonTransactional) + return +} + +func (iDB *InternalDB) RemoveAccountProfileDrv(tenant, id string) (err error) { + Cache.RemoveWithoutReplicate(utils.CacheAccountProfiles, utils.ConcatenatedKey(tenant, id), + cacheCommit(utils.NonTransactional), utils.NonTransactional) + return +} + +func (iDB *InternalDB) GetAccount2Drv(tenant, id string) (ap *utils.Account, err error) { + x, ok := Cache.Get(utils.CacheAccounts2, utils.ConcatenatedKey(tenant, id)) + if !ok || x == nil { + return nil, utils.ErrNotFound + } + return x.(*utils.Account), nil +} + +func (iDB *InternalDB) SetAccount2Drv(ap *utils.Account) (err error) { + Cache.SetWithoutReplicate(utils.CacheAccounts2, ap.TenantID(), ap, nil, + cacheCommit(utils.NonTransactional), utils.NonTransactional) + return +} + +func (iDB *InternalDB) RemoveAccount2Drv(tenant, id string) (err error) { + Cache.RemoveWithoutReplicate(utils.CacheAccounts2, utils.ConcatenatedKey(tenant, id), + cacheCommit(utils.NonTransactional), utils.NonTransactional) + return +} diff --git a/engine/storage_internal_stordb.go b/engine/storage_internal_stordb.go index db3789d8f..96434e901 100644 --- a/engine/storage_internal_stordb.go +++ b/engine/storage_internal_stordb.go @@ -903,7 +903,7 @@ func (iDB *InternalDB) SetCDR(cdr *CDR, allowUpdate bool) (err error) { idxs.Add(utils.ConcatenatedKey(utils.RequestType, cdr.RequestType)) idxs.Add(utils.ConcatenatedKey(utils.Tenant, cdr.Tenant)) idxs.Add(utils.ConcatenatedKey(utils.Category, cdr.Category)) - idxs.Add(utils.ConcatenatedKey(utils.Account, cdr.Account)) + idxs.Add(utils.ConcatenatedKey(utils.AccountField, cdr.Account)) idxs.Add(utils.ConcatenatedKey(utils.Subject, cdr.Subject)) idxs.Add(utils.ConcatenatedKey(utils.Destination, cdr.Destination)) // include the whole Destination for i := len(cdr.Destination) - 1; i > 0; i-- { // add destination as prefix @@ -1076,9 +1076,9 @@ func (iDB *InternalDB) GetCDRs(filter *utils.CDRsFilter, remove bool) (cdrs []*C notPairSlice = append(notPairSlice, filterPair{utils.Category, filter.NotCategories}) filter.NotCategories = nil filter.Categories = nil - case utils.Account: - pairSlice = append(pairSlice, filterPair{utils.Account, filter.Accounts}) - notPairSlice = append(notPairSlice, filterPair{utils.Account, filter.NotAccounts}) + case utils.AccountField: + pairSlice = append(pairSlice, filterPair{utils.AccountField, filter.Accounts}) + notPairSlice = append(notPairSlice, filterPair{utils.AccountField, filter.NotAccounts}) filter.NotAccounts = nil filter.Accounts = nil case utils.Subject: @@ -1126,7 +1126,7 @@ func (iDB *InternalDB) GetCDRs(filter *utils.CDRsFilter, remove bool) (cdrs []*C {utils.RequestType, filter.RequestTypes}, {utils.Tenant, filter.Tenants}, {utils.Category, filter.Categories}, - {utils.Account, filter.Accounts}, + {utils.AccountField, filter.Accounts}, {utils.Subject, filter.Subjects}, {utils.Destination, filter.DestinationPrefixes}, } @@ -1140,7 +1140,7 @@ func (iDB *InternalDB) GetCDRs(filter *utils.CDRsFilter, remove bool) (cdrs []*C {utils.RequestType, filter.NotRequestTypes}, {utils.Tenant, filter.NotTenants}, {utils.Category, filter.NotCategories}, - {utils.Account, filter.NotAccounts}, + {utils.AccountField, filter.NotAccounts}, {utils.Subject, filter.NotSubjects}, {utils.Destination, filter.NotDestinationPrefixes}, } diff --git a/engine/storage_mongo_datadb.go b/engine/storage_mongo_datadb.go index 7037e924c..0e7f5c288 100644 --- a/engine/storage_mongo_datadb.go +++ b/engine/storage_mongo_datadb.go @@ -77,33 +77,32 @@ const ( ColRpp = "rate_profiles" ColApp = "action_profiles" ColLID = "load_ids" + ColAnp = "account_profiles" + colAnt = "accounts2" ) var ( - CGRIDLow = strings.ToLower(utils.CGRID) - RunIDLow = strings.ToLower(utils.RunID) - OrderIDLow = strings.ToLower(utils.OrderID) - OriginHostLow = strings.ToLower(utils.OriginHost) - OriginIDLow = strings.ToLower(utils.OriginID) - ToRLow = strings.ToLower(utils.ToR) - CDRHostLow = strings.ToLower(utils.OriginHost) - CDRSourceLow = strings.ToLower(utils.Source) - RequestTypeLow = strings.ToLower(utils.RequestType) - TenantLow = strings.ToLower(utils.Tenant) - CategoryLow = strings.ToLower(utils.Category) - AccountLow = strings.ToLower(utils.Account) - SubjectLow = strings.ToLower(utils.Subject) - DisconnectCauseLow = strings.ToLower(utils.DISCONNECT_CAUSE) - SetupTimeLow = strings.ToLower(utils.SetupTime) - AnswerTimeLow = strings.ToLower(utils.AnswerTime) - CreatedAtLow = strings.ToLower(utils.CreatedAt) - UpdatedAtLow = strings.ToLower(utils.UpdatedAt) - UsageLow = strings.ToLower(utils.Usage) - PDDLow = strings.ToLower(utils.PDD) - CostDetailsLow = strings.ToLower(utils.CostDetails) - DestinationLow = strings.ToLower(utils.Destination) - CostLow = strings.ToLower(utils.COST) - CostSourceLow = strings.ToLower(utils.CostSource) + CGRIDLow = strings.ToLower(utils.CGRID) + RunIDLow = strings.ToLower(utils.RunID) + OrderIDLow = strings.ToLower(utils.OrderID) + OriginHostLow = strings.ToLower(utils.OriginHost) + OriginIDLow = strings.ToLower(utils.OriginID) + ToRLow = strings.ToLower(utils.ToR) + CDRHostLow = strings.ToLower(utils.OriginHost) + CDRSourceLow = strings.ToLower(utils.Source) + RequestTypeLow = strings.ToLower(utils.RequestType) + TenantLow = strings.ToLower(utils.Tenant) + CategoryLow = strings.ToLower(utils.Category) + AccountLow = strings.ToLower(utils.AccountField) + SubjectLow = strings.ToLower(utils.Subject) + SetupTimeLow = strings.ToLower(utils.SetupTime) + AnswerTimeLow = strings.ToLower(utils.AnswerTime) + CreatedAtLow = strings.ToLower(utils.CreatedAt) + UpdatedAtLow = strings.ToLower(utils.UpdatedAt) + UsageLow = strings.ToLower(utils.Usage) + DestinationLow = strings.ToLower(utils.Destination) + CostLow = strings.ToLower(utils.COST) + CostSourceLow = strings.ToLower(utils.CostSource) tTime = reflect.TypeOf(time.Time{}) ) @@ -2164,3 +2163,75 @@ func (ms *MongoStorage) RemoveIndexesDrv(idxItmType, tntCtx, idxKey string) (err return err }) } + +func (ms *MongoStorage) GetAccountProfileDrv(tenant, id string) (ap *utils.AccountProfile, err error) { + ap = new(utils.AccountProfile) + err = ms.query(func(sctx mongo.SessionContext) (err error) { + cur := ms.getCol(ColAnp).FindOne(sctx, bson.M{"tenant": tenant, "id": id}) + if err := cur.Decode(ap); err != nil { + ap = nil + if err == mongo.ErrNoDocuments { + return utils.ErrNotFound + } + return err + } + return nil + }) + return +} + +func (ms *MongoStorage) SetAccountProfileDrv(ap *utils.AccountProfile) (err error) { + return ms.query(func(sctx mongo.SessionContext) (err error) { + _, err = ms.getCol(ColAnp).UpdateOne(sctx, bson.M{"tenant": ap.Tenant, "id": ap.ID}, + bson.M{"$set": ap}, + options.Update().SetUpsert(true), + ) + return err + }) +} + +func (ms *MongoStorage) RemoveAccountProfileDrv(tenant, id string) (err error) { + return ms.query(func(sctx mongo.SessionContext) (err error) { + dr, err := ms.getCol(ColAnp).DeleteOne(sctx, bson.M{"tenant": tenant, "id": id}) + if dr.DeletedCount == 0 { + return utils.ErrNotFound + } + return err + }) +} + +func (ms *MongoStorage) GetAccount2Drv(tenant, id string) (ap *utils.Account, err error) { + ap = new(utils.Account) + err = ms.query(func(sctx mongo.SessionContext) (err error) { + cur := ms.getCol(colAnt).FindOne(sctx, bson.M{"tenant": tenant, "id": id}) + if err := cur.Decode(ap); err != nil { + ap = nil + if err == mongo.ErrNoDocuments { + return utils.ErrNotFound + } + return err + } + return nil + }) + return +} + +func (ms *MongoStorage) SetAccount2Drv(ap *utils.Account) (err error) { + return ms.query(func(sctx mongo.SessionContext) (err error) { + _, err = ms.getCol(colAnt).UpdateOne(sctx, bson.M{"tenant": ap.Tenant, "id": ap.ID}, + bson.M{"$set": ap}, + options.Update().SetUpsert(true), + ) + return err + }) +} + +func (ms *MongoStorage) RemoveAccount2Drv(tenant, id string) (err error) { + return ms.query(func(sctx mongo.SessionContext) (err error) { + dr, err := ms.getCol(colAnt).DeleteOne(sctx, bson.M{"tenant": tenant, "id": id}) + if dr.DeletedCount == 0 { + return utils.ErrNotFound + } + return err + }) +} diff --git a/engine/storage_redis.go b/engine/storage_redis.go index 05c58cfba..5081de8a4 100644 --- a/engine/storage_redis.go +++ b/engine/storage_redis.go @@ -1359,3 +1359,51 @@ func (rs *RedisStorage) RemoveIndexesDrv(idxItmType, tntCtx, idxKey string) (err } return rs.Cmd(nil, redis_HDEL, utils.CacheInstanceToPrefix[idxItmType]+tntCtx, idxKey) } + +func (rs *RedisStorage) GetAccountProfileDrv(tenant, id string) (ap *utils.AccountProfile, err error) { + var values []byte + if err = rs.Cmd(&values, redis_GET, utils.AccountProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { + return + } else if len(values) == 0 { + err = utils.ErrNotFound + return + } + err = rs.ms.Unmarshal(values, &ap) + return +} + +func (rs *RedisStorage) SetAccountProfileDrv(ap *utils.AccountProfile) (err error) { + var result []byte + if result, err = rs.ms.Marshal(ap); err != nil { + return + } + return rs.Cmd(nil, redis_SET, utils.AccountProfilePrefix+utils.ConcatenatedKey(ap.Tenant, ap.ID), string(result)) +} + +func (rs *RedisStorage) RemoveAccountProfileDrv(tenant, id string) (err error) { + return rs.Cmd(nil, redis_DEL, utils.AccountProfilePrefix+utils.ConcatenatedKey(tenant, id)) +} + +func (rs *RedisStorage) GetAccount2Drv(tenant, id string) (ap *utils.Account, err error) { + var values []byte + if err = rs.Cmd(&values, redis_GET, utils.Account2Prefix+utils.ConcatenatedKey(tenant, id)); err != nil { + return + } else if len(values) == 0 { + err = utils.ErrNotFound + return + } + err = rs.ms.Unmarshal(values, &ap) + return +} + +func (rs *RedisStorage) SetAccount2Drv(ap *utils.Account) (err error) { + var result []byte + if result, err = rs.ms.Marshal(ap); err != nil { + return + } + return rs.Cmd(nil, redis_SET, utils.Account2Prefix+utils.ConcatenatedKey(ap.Tenant, ap.ID), string(result)) +} + +func (rs *RedisStorage) RemoveAccount2Drv(tenant, id string) (err error) { + return rs.Cmd(nil, redis_DEL, utils.Account2Prefix+utils.ConcatenatedKey(tenant, id)) +} diff --git a/engine/thresholds.go b/engine/thresholds.go index bdec14988..6f02e90ca 100644 --- a/engine/thresholds.go +++ b/engine/thresholds.go @@ -98,7 +98,7 @@ func (t *Threshold) ProcessEvent(args *ThresholdsArgsProcessEvent, dm *DataManag if utils.IfaceAsString(args.Opts[utils.MetaEventType]) == utils.AccountUpdate { acnt, _ = args.FieldAsString(utils.ID) } else { - acnt, _ = args.FieldAsString(utils.Account) + acnt, _ = args.FieldAsString(utils.AccountField) } if acnt != utils.EmptyString { tntAcnt = utils.ConcatenatedKey(args.Tenant, acnt) diff --git a/engine/z_actions_it_test.go b/engine/z_actions_it_test.go index fa14a588b..ed1f68cac 100644 --- a/engine/z_actions_it_test.go +++ b/engine/z_actions_it_test.go @@ -373,28 +373,28 @@ func testActionsitThresholdCDrLog(t *testing.T) { Tenant: "cgrates.org", ID: "cdrev1", Event: map[string]interface{}{ - utils.EventType: utils.CDR, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", - utils.CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), - utils.RunID: utils.MetaRaw, - utils.OrderID: 123, - utils.OriginHost: "192.168.1.1", - utils.Source: utils.UNIT_TEST, - utils.OriginID: "dsafdsaf", - utils.ToR: utils.VOICE, - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "th_acc", - utils.Subject: "th_acc", - utils.Destination: "+4986517174963", - utils.SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), - 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.EventType: utils.CDR, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", + utils.CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), + utils.RunID: utils.MetaRaw, + utils.OrderID: 123, + utils.OriginHost: "192.168.1.1", + utils.Source: utils.UNIT_TEST, + utils.OriginID: "dsafdsaf", + utils.ToR: utils.VOICE, + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "th_acc", + utils.Subject: "th_acc", + utils.Destination: "+4986517174963", + utils.SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), + 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, }, }, Opts: map[string]interface{}{ diff --git a/engine/z_attributes_test.go b/engine/z_attributes_test.go index 8e291e7b8..46875a4f4 100644 --- a/engine/z_attributes_test.go +++ b/engine/z_attributes_test.go @@ -96,7 +96,7 @@ var ( }, Attributes: []*Attribute{ { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("1010", utils.INFIELD_SEP), }, }, @@ -113,7 +113,7 @@ var ( }, Attributes: []*Attribute{ { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("1010", utils.INFIELD_SEP), }, }, @@ -130,7 +130,7 @@ var ( }, Attributes: []*Attribute{ { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("1010", utils.INFIELD_SEP), }, }, @@ -147,7 +147,7 @@ var ( }, Attributes: []*Attribute{ { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("1010", utils.INFIELD_SEP), }, }, @@ -355,13 +355,13 @@ func TestAttributeProcessEventWithIDs(t *testing.T) { func TestAttributeEventReplyDigest(t *testing.T) { eRpl := &AttrSProcessEventReply{ MatchedProfiles: []string{"ATTR_1"}, - AlteredFields: []string{utils.Account, utils.Subject}, + AlteredFields: []string{utils.AccountField, utils.Subject}, CGREventWithOpts: &utils.CGREventWithOpts{ CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", ID: "testAttributeSProcessEvent", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", utils.Subject: "1001", utils.Destinations: "+491511231234", }, @@ -384,7 +384,7 @@ func TestAttributeEventReplyDigest2(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSProcessEvent", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", utils.Subject: "1001", utils.Destinations: "+491511231234", }, @@ -407,7 +407,7 @@ func TestAttributeEventReplyDigest3(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSProcessEvent", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", utils.Subject: "1001", utils.Destinations: "+491511231234", }, @@ -430,7 +430,7 @@ func TestAttributeEventReplyDigest4(t *testing.T) { Tenant: "cgrates.org", ID: "testAttributeSProcessEvent", Event: map[string]interface{}{ - utils.Account: "1001", + utils.AccountField: "1001", utils.Destinations: "+491511231234", }, }, @@ -464,7 +464,7 @@ func TestAttributeIndexer(t *testing.T) { }, Attributes: []*Attribute{ { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("1010", utils.INFIELD_SEP), }, }, @@ -2785,7 +2785,7 @@ func TestAttributeIndexSelectsFalse(t *testing.T) { }, Attributes: []*Attribute{ { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Value: config.NewRSRParsersMustCompile("1010", utils.INFIELD_SEP), }, }, diff --git a/engine/z_filterindexer_it_test.go b/engine/z_filterindexer_it_test.go index becce4b19..fe0ad04ee 100644 --- a/engine/z_filterindexer_it_test.go +++ b/engine/z_filterindexer_it_test.go @@ -1194,7 +1194,7 @@ func testITTestIndexingThresholds(t *testing.T) { } if rcvMp, err := dataManager.GetIndexes( utils.CacheThresholdFilterIndexes, th.Tenant, - utils.ConcatenatedKey(utils.MetaString, utils.MetaReq+utils.NestingSep+utils.Account, "1001"), + utils.ConcatenatedKey(utils.MetaString, utils.MetaReq+utils.NestingSep+utils.AccountField, "1001"), true, true); err != nil { t.Error(err) } else if !reflect.DeepEqual(eMp, rcvMp) { @@ -1254,7 +1254,7 @@ func testITTestIndexingMetaNot(t *testing.T) { } if rcvMp, err := dataManager.GetIndexes( utils.CacheThresholdFilterIndexes, th.Tenant, - utils.ConcatenatedKey(utils.MetaString, utils.MetaReq+utils.NestingSep+utils.Account, "1001"), + utils.ConcatenatedKey(utils.MetaString, utils.MetaReq+utils.NestingSep+utils.AccountField, "1001"), true, true); err != nil { t.Error(err) } else if !reflect.DeepEqual(eMp, rcvMp) { diff --git a/engine/z_storage_cdrs_it_test.go b/engine/z_storage_cdrs_it_test.go index 8f93d278b..3cbc5071b 100644 --- a/engine/z_storage_cdrs_it_test.go +++ b/engine/z_storage_cdrs_it_test.go @@ -229,7 +229,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { cfg.StorDbCfg().StringIndexedFields = []string{utils.CGRID, utils.RunID, utils.OriginHost, utils.Source, utils.OriginID, utils.ToR, utils.RequestType, utils.Tenant, - utils.Category, utils.Account, utils.Subject, + utils.Category, utils.AccountField, utils.Subject, "Service-Context-Id", } cfg.StorDbCfg().PrefixIndexedFields = []string{ diff --git a/engine/z_stordb_it_test.go b/engine/z_stordb_it_test.go index 5d101116e..f6f16895d 100644 --- a/engine/z_stordb_it_test.go +++ b/engine/z_stordb_it_test.go @@ -692,13 +692,13 @@ func testStorDBitCRUDTPAttributes(t *testing.T) { Attributes: []*utils.TPAttribute{ { Type: utils.MetaString, - Path: utils.MetaReq + utils.Account + utils.InInFieldSep, + Path: utils.MetaReq + utils.AccountField + utils.InInFieldSep, Value: "102", FilterIDs: []string{"*string:~*req.Account:102"}, }, { Type: utils.MetaString, - Path: utils.MetaReq + utils.Account + utils.InInFieldSep, + Path: utils.MetaReq + utils.AccountField + utils.InInFieldSep, Value: "101", FilterIDs: []string{"*string:~*req.Account:101"}, }, diff --git a/general_tests/a1_it_test.go b/general_tests/a1_it_test.go index e5d816f76..f42bbc49b 100644 --- a/general_tests/a1_it_test.go +++ b/general_tests/a1_it_test.go @@ -195,18 +195,18 @@ func testA1itDataSession1(t *testing.T) { Tenant: "cgrates.org", ID: "TestA1itDataSession1", Event: map[string]interface{}{ - utils.EVENT_NAME: "INITIATE_SESSION", - utils.ToR: utils.DATA, - utils.OriginID: "504966119", - utils.Account: "rpdata1", - utils.Subject: "rpdata1", - utils.Destination: "data", - utils.Category: "data1", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: "2017-03-03 11:39:32 +0100 CET", - utils.AnswerTime: "2017-03-03 11:39:32 +0100 CET", - utils.Usage: "10240", + utils.EVENT_NAME: "INITIATE_SESSION", + utils.ToR: utils.DATA, + utils.OriginID: "504966119", + utils.AccountField: "rpdata1", + utils.Subject: "rpdata1", + utils.Destination: "data", + utils.Category: "data1", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: "2017-03-03 11:39:32 +0100 CET", + utils.AnswerTime: "2017-03-03 11:39:32 +0100 CET", + utils.Usage: "10240", }, }, }, @@ -234,7 +234,7 @@ func testA1itDataSession1(t *testing.T) { ID: "TestSessionsVoiceLastUsed", Event: map[string]interface{}{ utils.EVENT_NAME: "UPDATE_SESSION", - utils.Account: "rpdata1", + utils.AccountField: "rpdata1", utils.Category: "data1", utils.Destination: "data", utils.InitialOriginID: "504966119", @@ -270,7 +270,7 @@ func testA1itDataSession1(t *testing.T) { ID: "TestSessionsVoiceLastUsed", Event: map[string]interface{}{ utils.EVENT_NAME: "TERMINATE_SESSION", - utils.Account: "rpdata1", + utils.AccountField: "rpdata1", utils.Category: "data1", utils.Destination: "data", utils.LastUsed: "2202800", diff --git a/general_tests/attributes_it_test.go b/general_tests/attributes_it_test.go index 6e5606bdf..162ce967a 100644 --- a/general_tests/attributes_it_test.go +++ b/general_tests/attributes_it_test.go @@ -360,10 +360,10 @@ func testAttributeSProcessEventWithStat(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 11 * time.Second, - utils.COST: 10.0, + 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, }, }, }, @@ -379,10 +379,10 @@ func testAttributeSProcessEventWithStat(t *testing.T) { Tenant: "cgrates.org", ID: "event2", Event: map[string]interface{}{ - utils.Account: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 11 * time.Second, - utils.COST: 10.5, + 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, }, } if err := attrRPC.Call(utils.StatSv1ProcessEvent, &ev1, &reply); err != nil { diff --git a/general_tests/broadcast_client_it_test.go b/general_tests/broadcast_client_it_test.go index d4aaf85a8..bab5f346f 100644 --- a/general_tests/broadcast_client_it_test.go +++ b/general_tests/broadcast_client_it_test.go @@ -138,16 +138,16 @@ func testbrodcastItProccessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItProcessCDR", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Category: utils.CALL, - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1Brodcast", - utils.RequestType: utils.META_POSTPAID, - utils.Account: "1001", - utils.Destination: "1002", - 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: 10 * time.Minute, + utils.Tenant: "cgrates.org", + utils.Category: utils.CALL, + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1Brodcast", + utils.RequestType: utils.META_POSTPAID, + utils.AccountField: "1001", + utils.Destination: "1002", + 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: 10 * time.Minute, }, }, } diff --git a/general_tests/cacherpl_it_test.go b/general_tests/cacherpl_it_test.go index ad3dce0e2..fbf654689 100644 --- a/general_tests/cacherpl_it_test.go +++ b/general_tests/cacherpl_it_test.go @@ -471,9 +471,9 @@ func testCacheRplAACheckLoadReplication(t *testing.T) { Tenant: "cgrates.org", ID: "testCacheRplAACheckLoadReplication", Event: map[string]interface{}{ - utils.Account: "1007", - utils.Destination: "+491511231234", - "EventName": "TestLoad", + utils.AccountField: "1007", + utils.Destination: "+491511231234", + "EventName": "TestLoad", }, }, Opts: map[string]interface{}{ @@ -493,9 +493,9 @@ func testCacheRplAACheckLoadReplication(t *testing.T) { Tenant: "cgrates.org", ID: "testCacheRplAACheckLoadReplication", Event: map[string]interface{}{ - utils.Account: "1007", - utils.Destination: "+491511231234", - "EventName": "TestLoad", + utils.AccountField: "1007", + utils.Destination: "+491511231234", + "EventName": "TestLoad", }, }, Opts: map[string]interface{}{ @@ -584,9 +584,9 @@ func testCacheRplCheckLoadReplication(t *testing.T) { Tenant: "cgrates.org", ID: "testCacheRplCheckLoadReplication", Event: map[string]interface{}{ - utils.Account: "1007", - utils.Destination: "+491511231234", - "EventName": "TestLoad", + utils.AccountField: "1007", + utils.Destination: "+491511231234", + "EventName": "TestLoad", }, }, Opts: map[string]interface{}{ diff --git a/general_tests/cdrs_exp_it_test.go b/general_tests/cdrs_exp_it_test.go index d58075810..6d78fbbc9 100644 --- a/general_tests/cdrs_exp_it_test.go +++ b/general_tests/cdrs_exp_it_test.go @@ -62,36 +62,36 @@ var ( ID: "Export", Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.CGRID: "TestCGRID", - utils.ToR: utils.VOICE, - utils.OriginID: "TestCDRsExp", - utils.OriginHost: "192.168.1.0", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC), - utils.AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), - utils.Usage: 10 * time.Second, - utils.Cost: 1.201, + utils.CGRID: "TestCGRID", + utils.ToR: utils.VOICE, + utils.OriginID: "TestCDRsExp", + utils.OriginHost: "192.168.1.0", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC), + utils.AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), + utils.Usage: 10 * time.Second, + utils.Cost: 1.201, }, }, } cdrsExpEvExp = map[string]interface{}{ - utils.CGRID: "TestCGRID", - utils.ToR: utils.VOICE, - utils.OriginID: "TestCDRsExp", - utils.RequestType: utils.META_RATED, - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.RunID: utils.MetaRaw, - utils.OrderID: "0", + utils.CGRID: "TestCGRID", + utils.ToR: utils.VOICE, + utils.OriginID: "TestCDRsExp", + utils.RequestType: utils.META_RATED, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.RunID: utils.MetaRaw, + utils.OrderID: "0", } cdrsExpTests = []func(t *testing.T){ diff --git a/general_tests/cdrs_internal_it_test.go b/general_tests/cdrs_internal_it_test.go index a3362010d..48a236400 100644 --- a/general_tests/cdrs_internal_it_test.go +++ b/general_tests/cdrs_internal_it_test.go @@ -98,16 +98,16 @@ func testCdrsIntTestTTL(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testCdrsIntTestTTL", - utils.OriginHost: "192.168.1.1", - utils.Source: "testCdrsIntTestTTL", - utils.RequestType: utils.META_NONE, - utils.Category: "call", - utils.Account: "testCdrsIntTestTTL", - utils.Subject: "ANY2CNT2", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, + utils.OriginID: "testCdrsIntTestTTL", + utils.OriginHost: "192.168.1.1", + utils.Source: "testCdrsIntTestTTL", + utils.RequestType: utils.META_NONE, + utils.Category: "call", + utils.AccountField: "testCdrsIntTestTTL", + utils.Subject: "ANY2CNT2", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, }, }, }, diff --git a/general_tests/cdrs_it_test.go b/general_tests/cdrs_it_test.go index dad89eb5c..c92283fdb 100644 --- a/general_tests/cdrs_it_test.go +++ b/general_tests/cdrs_it_test.go @@ -164,18 +164,18 @@ func testV2CDRsProcessCDR(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsProcessCDR1", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsProcessCDR", - utils.RequestType: utils.META_RATED, - utils.Category: "call", - utils.Account: "testV2CDRsProcessCDR", - utils.Subject: "ANY2CNT", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testV2CDRsProcessCDR1", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsProcessCDR", + utils.RequestType: utils.META_RATED, + utils.Category: "call", + utils.AccountField: "testV2CDRsProcessCDR", + utils.Subject: "ANY2CNT", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, @@ -236,18 +236,18 @@ func testV2CDRsProcessCDR2(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsProcessCDR2", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsProcessCDR2", - utils.RequestType: utils.META_RATED, - utils.Category: "call", - utils.Account: "testV2CDRsProcessCDR2", - utils.Subject: "ANY2CNT", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testV2CDRsProcessCDR2", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsProcessCDR2", + utils.RequestType: utils.META_RATED, + utils.Category: "call", + utils.AccountField: "testV2CDRsProcessCDR2", + utils.Subject: "ANY2CNT", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, @@ -310,18 +310,18 @@ func testV2CDRsProcessCDR3(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsProcessCDR3", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsProcessCDR3", - utils.RequestType: utils.META_RATED, - utils.Category: "call", - utils.Account: "testV2CDRsProcessCDR3", - utils.Subject: "ANY2CNT", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testV2CDRsProcessCDR3", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsProcessCDR3", + utils.RequestType: utils.META_RATED, + utils.Category: "call", + utils.AccountField: "testV2CDRsProcessCDR3", + utils.Subject: "ANY2CNT", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, @@ -373,18 +373,18 @@ func testV2CDRsProcessCDR4(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsProcessCDR4", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsProcessCDR4", - utils.RequestType: utils.META_RATED, - utils.Category: "call", - utils.Account: "testV2CDRsProcessCDR4", - utils.Subject: "ANY2CNT", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testV2CDRsProcessCDR4", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsProcessCDR4", + utils.RequestType: utils.META_RATED, + utils.Category: "call", + utils.AccountField: "testV2CDRsProcessCDR4", + utils.Subject: "ANY2CNT", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, @@ -564,18 +564,18 @@ func testV2CDRsProcessCDR5(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsProcessCDR5", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsProcessCDR5", - utils.RequestType: utils.META_RATED, - utils.Category: "call", - utils.Account: "testV2CDRsProcessCDR5", - utils.Subject: "ANY2CNT2", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testV2CDRsProcessCDR5", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsProcessCDR5", + utils.RequestType: utils.META_RATED, + utils.Category: "call", + utils.AccountField: "testV2CDRsProcessCDR5", + utils.Subject: "ANY2CNT2", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, @@ -632,18 +632,18 @@ func testV2CDRsProcessCDR6(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsProcessCDR5", - utils.OriginHost: "192.168.1.2", - utils.Source: "testV2CDRsProcessCDR6", - utils.RequestType: utils.META_RATED, - utils.Category: "call", - utils.Account: "testV2CDRsProcessCDR6", - utils.Subject: "ANY2CNT", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testV2CDRsProcessCDR5", + utils.OriginHost: "192.168.1.2", + utils.Source: "testV2CDRsProcessCDR6", + utils.RequestType: utils.META_RATED, + utils.Category: "call", + utils.AccountField: "testV2CDRsProcessCDR6", + utils.Subject: "ANY2CNT", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, @@ -692,18 +692,18 @@ func testV2CDRsProcessCDR7(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsProcessCDR7", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsProcessCDR7", - utils.RequestType: utils.META_RATED, - utils.Category: "call", - utils.Account: "testV2CDRsProcessCDR7", - utils.Subject: "ANY2CNT", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testV2CDRsProcessCDR7", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsProcessCDR7", + utils.RequestType: utils.META_RATED, + utils.Category: "call", + utils.AccountField: "testV2CDRsProcessCDR7", + utils.Subject: "ANY2CNT", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, diff --git a/general_tests/cdrs_post_failover_it_test.go b/general_tests/cdrs_post_failover_it_test.go index f0fcc98a8..a6e7828b6 100644 --- a/general_tests/cdrs_post_failover_it_test.go +++ b/general_tests/cdrs_post_failover_it_test.go @@ -146,18 +146,18 @@ func testCDRsPostFailoverProcessCDR(t *testing.T) { ID: "1", Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testCDRsPostFailoverProcessCDR", - utils.OriginHost: "192.168.1.1", - utils.Source: "testCDRsPostFailoverProcessCDR", - utils.RequestType: utils.META_RATED, - utils.Category: "call", - utils.Account: "testCDRsPostFailoverProcessCDR", - utils.Subject: "ANY2CNT", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testCDRsPostFailoverProcessCDR", + utils.OriginHost: "192.168.1.1", + utils.Source: "testCDRsPostFailoverProcessCDR", + utils.RequestType: utils.META_RATED, + utils.Category: "call", + utils.AccountField: "testCDRsPostFailoverProcessCDR", + utils.Subject: "ANY2CNT", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, diff --git a/general_tests/cdrs_processevent_it_test.go b/general_tests/cdrs_processevent_it_test.go index ba8394189..03494e524 100644 --- a/general_tests/cdrs_processevent_it_test.go +++ b/general_tests/cdrs_processevent_it_test.go @@ -161,14 +161,14 @@ func testV1CDRsProcessEventAttrS(t *testing.T) { Tenant: "cgrates.org", ID: "test1", Event: map[string]interface{}{ - utils.RunID: "testv1", - utils.OriginID: "test1_processEvent", - utils.OriginHost: "OriginHost1", - utils.RequestType: utils.META_PSEUDOPREPAID, - utils.Account: "1001", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), - utils.Usage: 2 * time.Minute, + utils.RunID: "testv1", + utils.OriginID: "test1_processEvent", + utils.OriginHost: "OriginHost1", + utils.RequestType: utils.META_PSEUDOPREPAID, + utils.AccountField: "1001", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), + utils.Usage: 2 * time.Minute, }, }, }, @@ -248,14 +248,14 @@ func testV1CDRsProcessEventChrgS(t *testing.T) { Tenant: "cgrates.org", ID: "test2", Event: map[string]interface{}{ - utils.RunID: "testv1", - utils.OriginID: "test2_processEvent", - utils.OriginHost: "OriginHost2", - utils.RequestType: utils.META_PSEUDOPREPAID, - utils.Account: "1001", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), - utils.Usage: 2 * time.Minute, + utils.RunID: "testv1", + utils.OriginID: "test2_processEvent", + utils.OriginHost: "OriginHost2", + utils.RequestType: utils.META_PSEUDOPREPAID, + utils.AccountField: "1001", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), + utils.Usage: 2 * time.Minute, }, }, }, @@ -293,14 +293,14 @@ func testV1CDRsProcessEventRalS(t *testing.T) { Tenant: "cgrates.org", ID: "test3", Event: map[string]interface{}{ - utils.RunID: "testv1", - utils.OriginID: "test3_processEvent", - utils.OriginHost: "OriginHost3", - utils.RequestType: utils.META_PSEUDOPREPAID, - utils.Account: "1001", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), - utils.Usage: 2 * time.Minute, + utils.RunID: "testv1", + utils.OriginID: "test3_processEvent", + utils.OriginHost: "OriginHost3", + utils.RequestType: utils.META_PSEUDOPREPAID, + utils.AccountField: "1001", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), + utils.Usage: 2 * time.Minute, }, }, }, @@ -330,19 +330,19 @@ func testV1CDRsProcessEventSts(t *testing.T) { Tenant: "cgrates.org", ID: "test4", Event: map[string]interface{}{ - utils.RunID: "testv1", - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "test4_processEvent", - utils.OriginHost: "OriginHost4", - utils.RequestType: utils.META_PSEUDOPREPAID, - utils.Account: "1001", - utils.Destination: "+4986517174963", - 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: 5 * time.Minute, + utils.RunID: "testv1", + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "test4_processEvent", + utils.OriginHost: "OriginHost4", + utils.RequestType: utils.META_PSEUDOPREPAID, + utils.AccountField: "1001", + utils.Destination: "+4986517174963", + 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: 5 * time.Minute, }, }, }, @@ -417,14 +417,14 @@ func testV1CDRsProcessEventStore(t *testing.T) { Tenant: "cgrates.org", ID: "test5", Event: map[string]interface{}{ - utils.RunID: "testv1", - utils.OriginID: "test5_processEvent", - utils.OriginHost: "OriginHost5", - utils.RequestType: utils.META_PSEUDOPREPAID, - utils.Account: "1001", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), - utils.Usage: 2 * time.Minute, + utils.RunID: "testv1", + utils.OriginID: "test5_processEvent", + utils.OriginHost: "OriginHost5", + utils.RequestType: utils.META_PSEUDOPREPAID, + utils.AccountField: "1001", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), + utils.Usage: 2 * time.Minute, }, }, }, @@ -509,18 +509,18 @@ func testV1CDRsProcessEventThreshold(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsProcessCDRWithThreshold", - utils.OriginHost: "OriginHost6", - utils.Source: "testV2CDRsProcessCDRWithThreshold", - utils.RequestType: utils.META_PSEUDOPREPAID, - utils.Category: "call", - utils.Account: "1005", - utils.Subject: "ANY2CNT", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: 100 * time.Minute, - "field_extr1": "val_extr1", - "fieldextr2": "valextr2", + utils.OriginID: "testV2CDRsProcessCDRWithThreshold", + utils.OriginHost: "OriginHost6", + utils.Source: "testV2CDRsProcessCDRWithThreshold", + utils.RequestType: utils.META_PSEUDOPREPAID, + utils.Category: "call", + utils.AccountField: "1005", + utils.Subject: "ANY2CNT", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: 100 * time.Minute, + "field_extr1": "val_extr1", + "fieldextr2": "valextr2", }, }, }, @@ -566,14 +566,14 @@ func testV1CDRsProcessEventExport(t *testing.T) { Tenant: "cgrates.org", ID: "test7", Event: map[string]interface{}{ - utils.RunID: "testv1", - utils.OriginID: "test7_processEvent", - utils.OriginHost: "OriginHost7", - utils.RequestType: utils.META_PSEUDOPREPAID, - utils.Account: "1001", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), - utils.Usage: 2 * time.Minute, + utils.RunID: "testv1", + utils.OriginID: "test7_processEvent", + utils.OriginHost: "OriginHost7", + utils.RequestType: utils.META_PSEUDOPREPAID, + utils.AccountField: "1001", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), + utils.Usage: 2 * time.Minute, }, }, }, @@ -621,14 +621,14 @@ func testV1CDRsV2ProcessEventRalS(t *testing.T) { Tenant: "cgrates.org", ID: "test101", Event: map[string]interface{}{ - utils.RunID: "testv1", - utils.OriginID: "test3_v2processEvent", - utils.OriginHost: "OriginHost101", - utils.RequestType: utils.META_PSEUDOPREPAID, - utils.Account: "1001", - utils.Destination: "+4986517174963", - utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), - utils.Usage: 2 * time.Minute, + utils.RunID: "testv1", + utils.OriginID: "test3_v2processEvent", + utils.OriginHost: "OriginHost101", + utils.RequestType: utils.META_PSEUDOPREPAID, + utils.AccountField: "1001", + utils.Destination: "+4986517174963", + utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), + utils.Usage: 2 * time.Minute, }, }, }, diff --git a/general_tests/data_it_test.go b/general_tests/data_it_test.go index 2467abd76..ce7dd5123 100644 --- a/general_tests/data_it_test.go +++ b/general_tests/data_it_test.go @@ -455,17 +455,17 @@ func testV1DataInitSession(t *testing.T) { Tenant: "cgrates.org", ID: "testV1DataInitSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.DATA, - utils.Category: "data", - utils.OriginID: "781512335", - utils.RequestType: utils.META_PREPAID, - utils.Account: "testV1DataInitSession", - utils.Subject: "10kilo", - utils.Destination: "*any", - utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), - utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), - utils.Usage: initUsage, + utils.Tenant: "cgrates.org", + utils.ToR: utils.DATA, + utils.Category: "data", + utils.OriginID: "781512335", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "testV1DataInitSession", + utils.Subject: "10kilo", + utils.Destination: "*any", + utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), + utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), + utils.Usage: initUsage, }, }, }, @@ -500,19 +500,19 @@ func testV1DataUpdateWith1Mo(t *testing.T) { Tenant: "cgrates.org", ID: "testV1DataUpdateWith1Mo", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.DATA, - utils.Category: "data", - "InitialOriginID": "781512335", - "LastUsed": 0, - "OriginID": "781512335-11", - utils.RequestType: utils.META_PREPAID, - utils.Account: "testV1DataInitSession", - utils.Subject: "10kilo", - utils.Destination: "*any", - utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), - utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), - utils.Usage: reqUsage, + utils.Tenant: "cgrates.org", + utils.ToR: utils.DATA, + utils.Category: "data", + "InitialOriginID": "781512335", + "LastUsed": 0, + "OriginID": "781512335-11", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "testV1DataInitSession", + utils.Subject: "10kilo", + utils.Destination: "*any", + utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), + utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), + utils.Usage: reqUsage, }, }, }, @@ -546,19 +546,19 @@ func testV1DataUpdateWith1Go(t *testing.T) { Tenant: "cgrates.org", ID: "testV1DataUpdateWith1Go", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.DATA, - utils.Category: "data", - "InitialOriginID": "781512335", - "LastUsed": 946405, - "OriginID": "781512335-11", - utils.RequestType: utils.META_PREPAID, - utils.Account: "testV1DataInitSession", - utils.Subject: "10kilo", - utils.Destination: "*any", - utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), - utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), - utils.Usage: reqUsage, + utils.Tenant: "cgrates.org", + utils.ToR: utils.DATA, + utils.Category: "data", + "InitialOriginID": "781512335", + "LastUsed": 946405, + "OriginID": "781512335-11", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "testV1DataInitSession", + utils.Subject: "10kilo", + utils.Destination: "*any", + utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), + utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), + utils.Usage: reqUsage, }, }, }, diff --git a/general_tests/filters_it_test.go b/general_tests/filters_it_test.go index 0b2cf14be..7619b1766 100644 --- a/general_tests/filters_it_test.go +++ b/general_tests/filters_it_test.go @@ -139,10 +139,10 @@ func testV1FltrAddStats(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 11 * time.Second, - utils.COST: 10.0, + 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, }, }, }, @@ -158,10 +158,10 @@ func testV1FltrAddStats(t *testing.T) { Tenant: "cgrates.org", ID: "event2", Event: map[string]interface{}{ - utils.Account: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 11 * time.Second, - utils.COST: 10.5, + 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, }, } if err := fltrRpc.Call(utils.StatSv1ProcessEvent, &ev1, &reply); err != nil { @@ -175,10 +175,10 @@ func testV1FltrAddStats(t *testing.T) { Tenant: "cgrates.org", ID: "event2", Event: map[string]interface{}{ - utils.Account: "1002", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 5 * time.Second, - utils.COST: 12.5, + 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, }, } if err := fltrRpc.Call(utils.StatSv1ProcessEvent, &ev1, &reply); err != nil { @@ -192,10 +192,10 @@ func testV1FltrAddStats(t *testing.T) { Tenant: "cgrates.org", ID: "event2", Event: map[string]interface{}{ - utils.Account: "1002", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 6 * time.Second, - utils.COST: 17.5, + 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, }, } if err := fltrRpc.Call(utils.StatSv1ProcessEvent, &ev1, &reply); err != nil { @@ -209,10 +209,10 @@ func testV1FltrAddStats(t *testing.T) { Tenant: "cgrates.org", ID: "event3", Event: map[string]interface{}{ - utils.Account: "1003", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 11 * time.Second, - utils.COST: 12.5, + 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, }, } if err := fltrRpc.Call(utils.StatSv1ProcessEvent, &ev1, &reply); err != nil { @@ -331,7 +331,7 @@ func testV1FltrGetThresholdForEvent(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1010"}, + utils.AccountField: "1010"}, }, }, } @@ -396,7 +396,7 @@ func testV1FltrGetThresholdForEvent2(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1010"}, + utils.AccountField: "1010"}, }, }, } @@ -508,7 +508,7 @@ func testV1FltrPopulateResources(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "2020"}, + utils.AccountField: "2020"}, }, }, } @@ -627,7 +627,7 @@ func testV1FltrAccounts(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1001"}, + utils.AccountField: "1001"}, }, }, } @@ -717,7 +717,7 @@ func testV1FltrAccountsExistsDynamicaly(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1001"}, + utils.AccountField: "1001"}, }, }, } @@ -734,7 +734,7 @@ func testV1FltrAccountsExistsDynamicaly(t *testing.T) { Tenant: "cgrates.org", ID: "event2", Event: map[string]interface{}{ - utils.Account: "non"}, + utils.AccountField: "non"}, }, }, } @@ -798,10 +798,10 @@ func testV1FltrChargerSuffix(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1010", - utils.Subject: "intraState", - utils.RunID: "Intra", - utils.Destination: "999", + utils.AccountField: "1010", + utils.Subject: "intraState", + utils.RunID: "Intra", + utils.Destination: "999", }, }, }, @@ -811,9 +811,9 @@ func testV1FltrChargerSuffix(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1010", - utils.Subject: "Something_intra", - utils.Destination: "999", + utils.AccountField: "1010", + utils.Subject: "Something_intra", + utils.Destination: "999", }, }, } @@ -836,10 +836,10 @@ func testV1FltrChargerSuffix(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1010", - utils.Subject: "interState", - utils.RunID: "Inter", - utils.Destination: "999", + utils.AccountField: "1010", + utils.Subject: "interState", + utils.RunID: "Inter", + utils.Destination: "999", }, }, }, @@ -849,9 +849,9 @@ func testV1FltrChargerSuffix(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Account: "1010", - utils.Subject: "Something_inter", - utils.Destination: "999", + utils.AccountField: "1010", + utils.Subject: "Something_inter", + utils.Destination: "999", }, }, } diff --git a/general_tests/gocs_it_test.go b/general_tests/gocs_it_test.go index ccb1f00b8..bcee851cb 100644 --- a/general_tests/gocs_it_test.go +++ b/general_tests/gocs_it_test.go @@ -227,16 +227,16 @@ func testGOCSAuthSession(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItAuth", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testGOCS", - utils.Category: "call", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), - utils.Usage: authUsage, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testGOCS", + utils.Category: "call", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), + utils.Usage: authUsage, }, }, }, @@ -259,17 +259,17 @@ func testGOCSInitSession(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItInitiateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testGOCS", - utils.Category: "call", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - 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.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testGOCS", + utils.Category: "call", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + 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, }, }, }, @@ -337,17 +337,17 @@ func testGOCSUpdateSession(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItUpdateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testGOCS", - utils.Category: "call", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - 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: reqUsage, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testGOCS", + utils.Category: "call", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + 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: reqUsage, }, }, }, @@ -416,17 +416,17 @@ func testGOCSUpdateSession2(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItUpdateSession2", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testGOCS", - utils.Category: "call", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - 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: reqUsage, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testGOCS", + utils.Category: "call", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + 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: reqUsage, }, }, }, @@ -489,17 +489,17 @@ func testGOCSTerminateSession(t *testing.T) { Tenant: "cgrates.org", ID: "testGOCSTerminateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testGOCS", - utils.Category: "call", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - 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: 15 * time.Minute, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testGOCS", + utils.Category: "call", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + 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: 15 * time.Minute, }, }, }, @@ -549,17 +549,17 @@ func testGOCSProcessCDR(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItProcessCDR", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testGOCS", - utils.Category: "call", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - 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: 15 * time.Minute, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testGOCS", + utils.Category: "call", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + 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: 15 * time.Minute, }, }, } diff --git a/general_tests/poster_it_test.go b/general_tests/poster_it_test.go index 6cb3a5053..fff691085 100644 --- a/general_tests/poster_it_test.go +++ b/general_tests/poster_it_test.go @@ -175,8 +175,8 @@ func testPosterITAMQP(t *testing.T) { if err := json.Unmarshal(body, &acc); err != nil { t.Fatal(err) } - if acc[utils.Account] != utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account) { - t.Errorf("Expected %q ,received %q", utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account), acc[utils.Account]) + if acc[utils.AccountField] != utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account) { + t.Errorf("Expected %q ,received %q", utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account), acc[utils.AccountField]) } } @@ -213,8 +213,8 @@ func testPosterITAMQPv1(t *testing.T) { if err := json.Unmarshal(body, &acc); err != nil { t.Fatal(err) } - if acc[utils.Account] != utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account) { - t.Errorf("Expected %q ,received %q", utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account), acc[utils.Account]) + if acc[utils.AccountField] != utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account) { + t.Errorf("Expected %q ,received %q", utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account), acc[utils.AccountField]) } } @@ -251,8 +251,8 @@ func testPosterITSQS(t *testing.T) { if err := json.Unmarshal(body, &acc); err != nil { t.Fatal(err) } - if acc[utils.Account] != utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account) { - t.Errorf("Expected %q ,received %q", utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account), acc[utils.Account]) + if acc[utils.AccountField] != utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account) { + t.Errorf("Expected %q ,received %q", utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account), acc[utils.AccountField]) } } @@ -289,8 +289,8 @@ func testPosterITS3(t *testing.T) { if err := json.Unmarshal(body, &acc); err != nil { t.Fatal(err) } - if acc[utils.Account] != utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account) { - t.Errorf("Expected %q ,received %q", utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account), acc[utils.Account]) + if acc[utils.AccountField] != utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account) { + t.Errorf("Expected %q ,received %q", utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account), acc[utils.AccountField]) } } @@ -327,8 +327,8 @@ func testPosterITKafka(t *testing.T) { if err := json.Unmarshal(body, &acc); err != nil { t.Fatal(err) } - if acc[utils.Account] != utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account) { - t.Errorf("Expected %q ,received %q", utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account), acc[utils.Account]) + if acc[utils.AccountField] != utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account) { + t.Errorf("Expected %q ,received %q", utils.ConcatenatedKey(pstrAccount.Tenant, pstrAccount.Account), acc[utils.AccountField]) } } diff --git a/general_tests/route_it_test.go b/general_tests/route_it_test.go index c5ff2a08d..2ab4f44b4 100644 --- a/general_tests/route_it_test.go +++ b/general_tests/route_it_test.go @@ -167,11 +167,11 @@ func testV1SplSSetSupplierProfilesWithoutRatingPlanIDs(t *testing.T) { Tenant: "cgrates.org", ID: "testV1SplSGetLeastCostSuppliers", Event: map[string]interface{}{ - utils.Account: "accc", - utils.Subject: "1003", - utils.Destination: "1002", - utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), - utils.Usage: "1m20s", + utils.AccountField: "accc", + utils.Subject: "1003", + utils.Destination: "1002", + utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), + utils.Usage: "1m20s", }, }, }, diff --git a/general_tests/rpccaching_it_test.go b/general_tests/rpccaching_it_test.go index 1fd9d34e0..8eee380ec 100644 --- a/general_tests/rpccaching_it_test.go +++ b/general_tests/rpccaching_it_test.go @@ -207,15 +207,15 @@ func testRPCMethodsAuthorizeSession(t *testing.T) { Tenant: "cgrates.org", ID: "testRPCMethodsAuthorizeSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testRPCMethodsAuthorizeSession", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), - utils.Usage: authUsage, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testRPCMethodsAuthorizeSession", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), + utils.Usage: authUsage, }, }, }, @@ -237,8 +237,8 @@ func testRPCMethodsAuthorizeSession(t *testing.T) { Tenant: "cgrates.org", ID: "DisableAccount", Event: map[string]interface{}{ - utils.Account: "1001", - "DisableAction": "DisableAction", + utils.AccountField: "1001", + "DisableAction": "DisableAction", }, }, }, @@ -284,8 +284,8 @@ func testRPCMethodsAuthorizeSession(t *testing.T) { Tenant: "cgrates.org", ID: "EnableAccount", Event: map[string]interface{}{ - utils.Account: "1001", - "EnableAction": "EnableAction", + utils.AccountField: "1001", + "EnableAction": "EnableAction", }, } //process event @@ -305,16 +305,16 @@ func testRPCMethodsInitSession(t *testing.T) { Tenant: "cgrates.org", ID: "testRPCMethodsInitSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testRPCMethodsInitSession", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testRPCMethodsInitSession", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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, }, }, }, @@ -336,8 +336,8 @@ func testRPCMethodsInitSession(t *testing.T) { Tenant: "cgrates.org", ID: "DisableAccount", Event: map[string]interface{}{ - utils.Account: "1001", - "DisableAction": "DisableAction", + utils.AccountField: "1001", + "DisableAction": "DisableAction", }, }, }, @@ -384,8 +384,8 @@ func testRPCMethodsInitSession(t *testing.T) { Tenant: "cgrates.org", ID: "EnableAccount", Event: map[string]interface{}{ - utils.Account: "1001", - "EnableAction": "EnableAction", + utils.AccountField: "1001", + "EnableAction": "EnableAction", }, } //process event @@ -405,16 +405,16 @@ func testRPCMethodsUpdateSession(t *testing.T) { Tenant: "cgrates.org", ID: "testRPCMethodsUpdateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testRPCMethodsUpdateSession", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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: reqUsage, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testRPCMethodsUpdateSession", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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: reqUsage, }, }, }, @@ -436,8 +436,8 @@ func testRPCMethodsUpdateSession(t *testing.T) { Tenant: "cgrates.org", ID: "DisableAccount", Event: map[string]interface{}{ - utils.Account: "1001", - "DisableAction": "DisableAction", + utils.AccountField: "1001", + "DisableAction": "DisableAction", }, }, }, @@ -483,8 +483,8 @@ func testRPCMethodsUpdateSession(t *testing.T) { Tenant: "cgrates.org", ID: "EnableAccount", Event: map[string]interface{}{ - utils.Account: "1001", - "EnableAction": "EnableAction", + utils.AccountField: "1001", + "EnableAction": "EnableAction", }, } //process event @@ -503,16 +503,16 @@ func testRPCMethodsTerminateSession(t *testing.T) { Tenant: "cgrates.org", ID: "testRPCMethodsTerminateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testRPCMethodsTerminateSession", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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: 10 * time.Minute, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testRPCMethodsTerminateSession", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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: 10 * time.Minute, }, }, }, @@ -551,16 +551,16 @@ func testRPCMethodsProcessCDR(t *testing.T) { Tenant: "cgrates.org", ID: "testRPCMethodsProcessCDR", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testRPCMethodsProcessCDR", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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: 10 * time.Minute, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testRPCMethodsProcessCDR", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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: 10 * time.Minute, }, }, } @@ -626,16 +626,16 @@ func testRPCMethodsProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "testRPCMethodsProcessEvent", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testRPCMethodsProcessEvent", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - 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.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testRPCMethodsProcessEvent", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + 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, }, }, }, @@ -656,8 +656,8 @@ func testRPCMethodsProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "DisableAccount", Event: map[string]interface{}{ - utils.Account: "1001", - "DisableAction": "DisableAction", + utils.AccountField: "1001", + "DisableAction": "DisableAction", }, }, }, @@ -704,8 +704,8 @@ func testRPCMethodsProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "EnableAccount", Event: map[string]interface{}{ - utils.Account: "1001", - "EnableAction": "EnableAction", + utils.AccountField: "1001", + "EnableAction": "EnableAction", }, } //process event @@ -723,17 +723,17 @@ func testRPCMethodsCdrsProcessCDR(t *testing.T) { Tenant: "cgrates.org", ID: "testRPCMethodsCdrsProcessCDR", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginHost: "host", - utils.OriginID: "testRPCMethodsCdrsProcessCDR", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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: 10 * time.Minute, + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginHost: "host", + utils.OriginID: "testRPCMethodsCdrsProcessCDR", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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: 10 * time.Minute, }, }, }, diff --git a/general_tests/session2_it_test.go b/general_tests/session2_it_test.go index f32cc7a54..053c29e07 100644 --- a/general_tests/session2_it_test.go +++ b/general_tests/session2_it_test.go @@ -140,16 +140,16 @@ func testSes2ItInitSession(t *testing.T) { Tenant: "cgrates.org", ID: utils.UUIDSha1Prefix(), Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.OriginID: utils.UUIDSha1Prefix(), - utils.ToR: utils.VOICE, - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.RequestType: utils.META_PREPAID, - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.EVENT_NAME: "TEST_EVENT", + utils.OriginID: utils.UUIDSha1Prefix(), + utils.ToR: utils.VOICE, + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.RequestType: utils.META_PREPAID, + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), }, }, }, @@ -197,13 +197,13 @@ func testSes2StirAuthenticate(t *testing.T) { Tenant: "cgrates.org", ID: "testSes2StirAuthorize", Event: map[string]interface{}{ - utils.ToR: utils.VOICE, - utils.OriginID: "testSes2StirAuthorize", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - utils.Usage: 10 * time.Minute, + utils.ToR: utils.VOICE, + utils.OriginID: "testSes2StirAuthorize", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + utils.Usage: 10 * time.Minute, }, }, }, @@ -240,13 +240,13 @@ func testSes2StirInit(t *testing.T) { Tenant: "cgrates.org", ID: "testSes2StirInit", Event: map[string]interface{}{ - utils.ToR: utils.VOICE, - utils.OriginID: "testSes2StirInit", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - utils.Usage: 10 * time.Minute, + utils.ToR: utils.VOICE, + utils.OriginID: "testSes2StirInit", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + utils.Usage: 10 * time.Minute, }, }, }, diff --git a/general_tests/session3_it_test.go b/general_tests/session3_it_test.go index aeaf9440c..9bb4a9116 100644 --- a/general_tests/session3_it_test.go +++ b/general_tests/session3_it_test.go @@ -135,17 +135,17 @@ func testSes3ItProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItProcessEvent", Event: map[string]interface{}{ - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It2", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Destination: "1002", - 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.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It2", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Destination: "1002", + 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, }, }, Opts: map[string]interface{}{ @@ -177,18 +177,18 @@ func testSes3ItProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItProcessEvent", Event: map[string]interface{}{ - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.Account: "1001", - utils.Destination: "1002", - "OfficeGroup": "Marketing", - utils.OriginID: "TestSSv1It2", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: "2018-01-07T17:00:00Z", - utils.AnswerTime: "2018-01-07T17:00:10Z", - utils.Usage: 300000000000.0, + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.AccountField: "1001", + utils.Destination: "1002", + "OfficeGroup": "Marketing", + utils.OriginID: "TestSSv1It2", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: "2018-01-07T17:00:00Z", + utils.AnswerTime: "2018-01-07T17:00:10Z", + utils.Usage: 300000000000.0, }, }, }, @@ -308,17 +308,17 @@ func testSes3ItTerminatWithoutInit(t *testing.T) { Tenant: "cgrates.org", ID: "TestSesItUpdateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestTerminate", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1002", - utils.Subject: "1001", - utils.Destination: "1001", - 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: 2 * time.Second, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestTerminate", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1002", + utils.Subject: "1001", + utils.Destination: "1001", + 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: 2 * time.Second, }, }, }, @@ -344,17 +344,17 @@ func testSes3ItTerminatWithoutInit(t *testing.T) { Tenant: "cgrates.org", ID: "TestSesItInitiateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestTerminate", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1002", - utils.Subject: "1001", - utils.Destination: "1001", - 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: 5 * time.Second, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestTerminate", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1002", + utils.Subject: "1001", + utils.Destination: "1001", + 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: 5 * time.Second, }, }, }, @@ -396,17 +396,17 @@ func testSes3ItCDRs(t *testing.T) { Tenant: "cgrates.org", ID: "TestSesItProccesCDR", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestTerminate", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1002", - utils.Subject: "1001", - utils.Destination: "1001", - 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: 2 * time.Second, + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestTerminate", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1002", + utils.Subject: "1001", + utils.Destination: "1001", + 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: 2 * time.Second, }, }, }, &reply); err != nil { diff --git a/general_tests/session4_it_test.go b/general_tests/session4_it_test.go index 7a1187ecb..5ba8a0293 100644 --- a/general_tests/session4_it_test.go +++ b/general_tests/session4_it_test.go @@ -133,16 +133,16 @@ func testSes4CDRsProcessCDR(t *testing.T) { CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", Event: map[string]interface{}{ - utils.OriginID: "testV2CDRsProcessCDR1", - utils.OriginHost: "192.168.1.1", - utils.Source: "testV2CDRsProcessCDR", - utils.RequestType: utils.META_POSTPAID, - utils.Category: "free", - utils.Account: "dan7", - utils.Subject: "RP_FREE", - utils.Destination: "0775692", - utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), - utils.Usage: time.Minute, + utils.OriginID: "testV2CDRsProcessCDR1", + utils.OriginHost: "192.168.1.1", + utils.Source: "testV2CDRsProcessCDR", + utils.RequestType: utils.META_POSTPAID, + utils.Category: "free", + utils.AccountField: "dan7", + utils.Subject: "RP_FREE", + utils.Destination: "0775692", + utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), + utils.Usage: time.Minute, }, }, }, diff --git a/general_tests/session_it_test.go b/general_tests/session_it_test.go index 2b10963c6..c86082a4b 100644 --- a/general_tests/session_it_test.go +++ b/general_tests/session_it_test.go @@ -156,17 +156,17 @@ func testSesItInitSession(t *testing.T) { Tenant: sesTenant, ID: "TestSesItInitiateSession", Event: map[string]interface{}{ - utils.Tenant: sesTenant, - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestRefund", - utils.RequestType: utils.META_PREPAID, - utils.Account: sesAccount, - utils.Subject: "TEST", - utils.Destination: "TEST", - 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: 5 * time.Second, + utils.Tenant: sesTenant, + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestRefund", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: sesAccount, + utils.Subject: "TEST", + utils.Destination: "TEST", + 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: 5 * time.Second, }, }, }, @@ -190,17 +190,17 @@ func testSesItTerminateSession(t *testing.T) { Tenant: sesTenant, ID: "TestSesItUpdateSession", Event: map[string]interface{}{ - utils.Tenant: sesTenant, - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestRefund", - utils.RequestType: utils.META_PREPAID, - utils.Account: sesAccount, - utils.Subject: "TEST", - utils.Destination: "TEST", - 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: time.Second, + utils.Tenant: sesTenant, + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestRefund", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: sesAccount, + utils.Subject: "TEST", + utils.Destination: "TEST", + 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: time.Second, }, }, }, diff --git a/general_tests/session_replications_automaticdebit_it_test.go b/general_tests/session_replications_automaticdebit_it_test.go index 7b2620084..4f1512043 100644 --- a/general_tests/session_replications_automaticdebit_it_test.go +++ b/general_tests/session_replications_automaticdebit_it_test.go @@ -179,18 +179,18 @@ func testSessionSRplInitiate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionSRplInitiate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.Tenant: "cgrates.org", - utils.OriginID: "123451", - utils.ToR: utils.VOICE, - utils.RequestType: utils.META_PREPAID, - utils.Account: "1005", - utils.Subject: "1005", - utils.Destination: "1004", - utils.Category: "call", - 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: 0, + utils.EVENT_NAME: "TEST_EVENT", + utils.Tenant: "cgrates.org", + utils.OriginID: "123451", + utils.ToR: utils.VOICE, + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1005", + utils.Subject: "1005", + utils.Destination: "1004", + utils.Category: "call", + 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: 0, }, }, }, @@ -358,18 +358,18 @@ func testSessionSRplTerminate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionSRplTerminate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.Tenant: "cgrates.org", - utils.OriginID: "123451", - utils.ToR: utils.VOICE, - utils.RequestType: utils.META_PREPAID, - utils.Account: "1005", - utils.Subject: "1005", - utils.Destination: "1004", - utils.Category: "call", - 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: 2 * time.Second, + utils.EVENT_NAME: "TEST_EVENT", + utils.Tenant: "cgrates.org", + utils.OriginID: "123451", + utils.ToR: utils.VOICE, + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1005", + utils.Subject: "1005", + utils.Destination: "1004", + utils.Category: "call", + 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: 2 * time.Second, }, }, }, diff --git a/general_tests/sessionrefund_it_test.go b/general_tests/sessionrefund_it_test.go index 502230c56..78698baca 100644 --- a/general_tests/sessionrefund_it_test.go +++ b/general_tests/sessionrefund_it_test.go @@ -158,17 +158,17 @@ func testSrItInitSession(t *testing.T) { Tenant: srtenant, ID: "TestSrItInitiateSession", Event: map[string]interface{}{ - utils.Tenant: srtenant, - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestRefund", - utils.RequestType: utils.META_PREPAID, - utils.Account: sraccount, - utils.Subject: "TEST", - utils.Destination: "TEST", - 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: 2 * time.Second, + utils.Tenant: srtenant, + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestRefund", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: sraccount, + utils.Subject: "TEST", + utils.Destination: "TEST", + 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: 2 * time.Second, }, }, }, @@ -192,17 +192,17 @@ func testSrItTerminateSession(t *testing.T) { Tenant: srtenant, ID: "TestSrItUpdateSession", Event: map[string]interface{}{ - utils.Tenant: srtenant, - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestRefund", - utils.RequestType: utils.META_PREPAID, - utils.Account: sraccount, - utils.Subject: "TEST", - utils.Destination: "TEST", - 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: 0, + utils.Tenant: srtenant, + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestRefund", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: sraccount, + utils.Subject: "TEST", + utils.Destination: "TEST", + 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: 0, }, }, }, @@ -251,17 +251,17 @@ func testSrItInitSession2(t *testing.T) { Tenant: srtenant, ID: "TestSrItInitiateSession1", Event: map[string]interface{}{ - utils.Tenant: srtenant, - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestRefund", - utils.RequestType: utils.META_PREPAID, - utils.Account: sraccount, - utils.Subject: "TEST", - utils.Destination: "1001", - 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: 2 * time.Minute, + utils.Tenant: srtenant, + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestRefund", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: sraccount, + utils.Subject: "TEST", + utils.Destination: "1001", + 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: 2 * time.Minute, }, }, }, @@ -285,17 +285,17 @@ func testSrItTerminateSession2(t *testing.T) { Tenant: srtenant, ID: "TestSrItUpdateSession", Event: map[string]interface{}{ - utils.Tenant: srtenant, - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestRefund", - utils.RequestType: utils.META_PREPAID, - utils.Account: sraccount, - utils.Subject: "TEST", - utils.Destination: "1001", - 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: 0, + utils.Tenant: srtenant, + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestRefund", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: sraccount, + utils.Subject: "TEST", + utils.Destination: "1001", + 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: 0, }, }, }, diff --git a/general_tests/sessions_concur_test.go b/general_tests/sessions_concur_test.go index 62fba678b..892a76d9a 100644 --- a/general_tests/sessions_concur_test.go +++ b/general_tests/sessions_concur_test.go @@ -231,13 +231,13 @@ func testRunSession(t *testing.T) { Tenant: "cgrates.org", ID: fmt.Sprintf("TestSCncrAuth%s", originID), Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.OriginID: originID, - utils.RequestType: utils.META_PREPAID, - utils.Account: acntID, - utils.Destination: fmt.Sprintf("%s%s", acntID, acntID), - utils.SetupTime: time.Now(), - utils.Usage: authDur, + utils.Tenant: "cgrates.org", + utils.OriginID: originID, + utils.RequestType: utils.META_PREPAID, + utils.AccountField: acntID, + utils.Destination: fmt.Sprintf("%s%s", acntID, acntID), + utils.SetupTime: time.Now(), + utils.Usage: authDur, }, }, } @@ -257,12 +257,12 @@ func testRunSession(t *testing.T) { Tenant: "cgrates.org", ID: fmt.Sprintf("TestSCncrInit%s", originID), Event: map[string]interface{}{ - utils.OriginID: originID, - utils.RequestType: utils.META_PREPAID, - utils.Account: acntID, - utils.Destination: fmt.Sprintf("%s%s", acntID, acntID), - utils.AnswerTime: time.Now(), - utils.Usage: initUsage, + utils.OriginID: originID, + utils.RequestType: utils.META_PREPAID, + utils.AccountField: acntID, + utils.Destination: fmt.Sprintf("%s%s", acntID, acntID), + utils.AnswerTime: time.Now(), + utils.Usage: initUsage, }, }, } diff --git a/general_tests/sessions_race_test.go b/general_tests/sessions_race_test.go index 8b3e87764..6ee08608f 100644 --- a/general_tests/sessions_race_test.go +++ b/general_tests/sessions_race_test.go @@ -139,11 +139,11 @@ func TestSessionSRace(t *testing.T) { Tenant: "cgrates.org", ID: "testSSv1ItProcessEventInitiateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testSSv1ItProcessEvent", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testSSv1ItProcessEvent", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", // utils.RatingSubject: "*zero1ms", utils.CGRDebitInterval: 10, utils.Destination: "1002", @@ -166,11 +166,11 @@ func TestSessionSRace(t *testing.T) { Tenant: "cgrates.org", ID: "testSSv1ItProcessEventInitiateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.ToR: utils.VOICE, - utils.OriginID: "testSSv1ItProcessEvent", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", + utils.Tenant: "cgrates.org", + utils.ToR: utils.VOICE, + utils.OriginID: "testSSv1ItProcessEvent", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", // utils.RatingSubject: "*zero1ms", utils.CGRDebitInterval: 10, utils.Destination: "1002", diff --git a/general_tests/tls_it_test.go b/general_tests/tls_it_test.go index 1ea30c36a..6f7fb1896 100755 --- a/general_tests/tls_it_test.go +++ b/general_tests/tls_it_test.go @@ -144,17 +144,17 @@ func testTLSPing(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItInitiateSession", Event: map[string]interface{}{ - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - 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.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.OriginID: "TestSSv1It1", + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + 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, }, }, }, diff --git a/general_tests/tutorial_calls_test.go b/general_tests/tutorial_calls_test.go index bc87dffe5..53e5c6d02 100755 --- a/general_tests/tutorial_calls_test.go +++ b/general_tests/tutorial_calls_test.go @@ -312,9 +312,9 @@ func testCallCheckResourceBeforeAllocation(t *testing.T) { Tenant: "cgrates.org", ID: "ResourceEvent", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", }, }, }, @@ -465,9 +465,9 @@ func testCallCheckResourceAllocation(t *testing.T) { Tenant: "cgrates.org", ID: "ResourceAllocation", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", }, }, }, @@ -657,9 +657,9 @@ func testCallCheckResourceRelease(t *testing.T) { Tenant: "cgrates.org", ID: "ResourceRelease", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", }, }, }, @@ -736,9 +736,9 @@ func testCallSyncSessions(t *testing.T) { Tenant: "cgrates.org", ID: "AllocateResource", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", }, }, }, diff --git a/loaders/loader_test.go b/loaders/loader_test.go index 9eef8679d..17ac730d3 100644 --- a/loaders/loader_test.go +++ b/loaders/loader_test.go @@ -443,7 +443,7 @@ func TestLoaderProcessFilters(t *testing.T) { Rules: []*engine.FilterRule{ { Type: utils.MetaString, - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Values: []string{"1001", "1002"}, }, { diff --git a/migrator/alias.go b/migrator/alias.go index d848e6ee0..632ff8649 100644 --- a/migrator/alias.go +++ b/migrator/alias.go @@ -92,7 +92,7 @@ func alias2AtttributeProfile(alias *v1Alias, defaultTenant string) *engine.Attri } if len(alias.Account) != 0 && alias.Account != utils.META_ANY { out.FilterIDs = append(out.FilterIDs, - fmt.Sprintf("%s:~%s:%s", utils.MetaString, utils.MetaReq+utils.NestingSep+utils.Account, alias.Account)) + fmt.Sprintf("%s:~%s:%s", utils.MetaString, utils.MetaReq+utils.NestingSep+utils.AccountField, alias.Account)) } if len(alias.Subject) != 0 && alias.Subject != utils.META_ANY { out.FilterIDs = append(out.FilterIDs, @@ -130,7 +130,7 @@ func alias2AtttributeProfile(alias *v1Alias, defaultTenant string) *engine.Attri if fieldName == utils.Category && alias.Category == initial { continue } - if fieldName == utils.Account && alias.Account == initial { + if fieldName == utils.AccountField && alias.Account == initial { continue } if fieldName == utils.Subject && alias.Subject == initial { diff --git a/migrator/derived_chargers.go b/migrator/derived_chargers.go index 1db5ee390..b074e4d8c 100644 --- a/migrator/derived_chargers.go +++ b/migrator/derived_chargers.go @@ -109,7 +109,7 @@ func derivedChargers2AttributeProfile(dc *v1DerivedCharger, tenant, key string, attr.Attributes = fieldinfo2Attribute(attr.Attributes, utils.Direction, dc.DirectionField) //still in use? attr.Attributes = fieldinfo2Attribute(attr.Attributes, utils.Tenant, dc.TenantField) attr.Attributes = fieldinfo2Attribute(attr.Attributes, utils.Category, dc.CategoryField) - attr.Attributes = fieldinfo2Attribute(attr.Attributes, utils.Account, dc.AccountField) + attr.Attributes = fieldinfo2Attribute(attr.Attributes, utils.AccountField, dc.AccountField) attr.Attributes = fieldinfo2Attribute(attr.Attributes, utils.Subject, dc.SubjectField) attr.Attributes = fieldinfo2Attribute(attr.Attributes, utils.Destination, dc.DestinationField) attr.Attributes = fieldinfo2Attribute(attr.Attributes, utils.SetupTime, dc.SetupTimeField) @@ -169,7 +169,7 @@ func (m *Migrator) derivedChargers2Chargers(dck *v1DerivedChargersWithKey) (err filter = append(filter, fmt.Sprintf("%s:~%s:%s", utils.MetaString, utils.MetaReq+utils.NestingSep+utils.Category, skey[2])) } if len(skey[3]) != 0 && skey[3] != utils.META_ANY { - filter = append(filter, fmt.Sprintf("%s:~%s:%s", utils.MetaString, utils.MetaReq+utils.NestingSep+utils.Account, skey[3])) + filter = append(filter, fmt.Sprintf("%s:~%s:%s", utils.MetaString, utils.MetaReq+utils.NestingSep+utils.AccountField, skey[3])) } if len(skey[4]) != 0 && skey[4] != utils.META_ANY { filter = append(filter, fmt.Sprintf("%s:~%s:%s", utils.MetaString, utils.MetaReq+utils.NestingSep+utils.Subject, skey[4])) diff --git a/migrator/derived_chargers_it_test.go b/migrator/derived_chargers_it_test.go index 0bb668cd3..c29995504 100644 --- a/migrator/derived_chargers_it_test.go +++ b/migrator/derived_chargers_it_test.go @@ -156,7 +156,7 @@ func testDCITMigrateAndMove(t *testing.T) { ActivationInterval: nil, Attributes: []*engine.Attribute{ { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("1004", utils.INFIELD_SEP), }, diff --git a/migrator/derived_chargers_test.go b/migrator/derived_chargers_test.go index 77ae648d4..da6c7b40b 100644 --- a/migrator/derived_chargers_test.go +++ b/migrator/derived_chargers_test.go @@ -36,24 +36,24 @@ func TestFieldinfo2Attribute(t *testing.T) { } tests := []testA{ { - Path: utils.Account, + Path: utils.AccountField, FieldInfo: utils.MetaDefault, Initial: make([]*engine.Attribute, 0), Expected: make([]*engine.Attribute, 0), }, { - Path: utils.Account, + Path: utils.AccountField, FieldInfo: "", Initial: make([]*engine.Attribute, 0), Expected: make([]*engine.Attribute, 0), }, { - Path: utils.Account, + Path: utils.AccountField, FieldInfo: "^1003", Initial: make([]*engine.Attribute, 0), Expected: []*engine.Attribute{ { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("1003", utils.INFIELD_SEP), }, @@ -76,14 +76,14 @@ func TestFieldinfo2Attribute(t *testing.T) { FieldInfo: "^call_1003", Initial: []*engine.Attribute{ { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("1003", utils.INFIELD_SEP), }, }, Expected: []*engine.Attribute{ { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("1003", utils.INFIELD_SEP), }, @@ -133,7 +133,7 @@ func TestDerivedChargers2AttributeProfile(t *testing.T) { Value: config.NewRSRParsersMustCompile("*voice", utils.INFIELD_SEP), }, { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("1003", utils.INFIELD_SEP), }, @@ -166,7 +166,7 @@ func TestDerivedChargers2AttributeProfile(t *testing.T) { Value: config.NewRSRParsersMustCompile("*voice", utils.INFIELD_SEP), }, { - Path: utils.MetaReq + utils.NestingSep + utils.Account, + Path: utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaVariable, Value: config.NewRSRParsersMustCompile("1003", utils.INFIELD_SEP), }, diff --git a/migrator/filters_it_test.go b/migrator/filters_it_test.go index f2a6abdb6..668e14659 100644 --- a/migrator/filters_it_test.go +++ b/migrator/filters_it_test.go @@ -154,7 +154,7 @@ func testFltrITMigrateAndMove(t *testing.T) { ID: "FLTR_2", Rules: []*engine.FilterRule{{ Type: utils.MetaPrefix, - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Values: []string{"1001"}, }}, } @@ -339,7 +339,7 @@ func testFltrITMigratev2(t *testing.T) { Rules: []*engine.FilterRule{ { Type: utils.MetaString, - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Values: []string{"1001"}, }, { @@ -508,7 +508,7 @@ func testFltrITMigratev3(t *testing.T) { Rules: []*engine.FilterRule{ { Type: utils.MetaString, - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Values: []string{"1001"}, }, { diff --git a/migrator/filters_test.go b/migrator/filters_test.go index c0f819429..c81447dff 100644 --- a/migrator/filters_test.go +++ b/migrator/filters_test.go @@ -80,7 +80,7 @@ func TestFiltersMigrate(t *testing.T) { Rules: []*engine.FilterRule{ { Type: utils.MetaString, - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Values: []string{}, }, }, @@ -141,7 +141,7 @@ func TestFiltersMigrateV2(t *testing.T) { Rules: []*engine.FilterRule{ { Type: utils.MetaString, - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Values: []string{}, }, }, @@ -165,7 +165,7 @@ func TestFiltersMigrateV2(t *testing.T) { Rules: []*engine.FilterRule{ { Type: utils.MetaPrefix, - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Values: []string{}, }, }, diff --git a/rates/rates_test.go b/rates/rates_test.go index 483ff20a4..ded0766ee 100644 --- a/rates/rates_test.go +++ b/rates/rates_test.go @@ -101,9 +101,9 @@ func TestMatchingRateProfileForEventActivationInterval(t *testing.T) { ID: "CACHE1", Time: utils.TimePointer(time.Date(2020, 7, 21, 11, 0, 0, 0, time.UTC)), Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: 1002, - utils.AnswerTime: rPrf.ActivationInterval.ExpiryTime.Add(-10 * time.Second), + utils.AccountField: "1001", + utils.Destination: 1002, + utils.AnswerTime: rPrf.ActivationInterval.ExpiryTime.Add(-10 * time.Second), }, }, }, @@ -153,7 +153,7 @@ func TestRateProfileCostForEvent(t *testing.T) { Tenant: "cgrates.org", ID: "RATE_1", Event: map[string]interface{}{ - utils.Account: "1001"}}}}, rateS.cfg.RateSCfg().Verbosity); err == nil || err != utils.ErrNotFound { + utils.AccountField: "1001"}}}}, rateS.cfg.RateSCfg().Verbosity); err == nil || err != utils.ErrNotFound { t.Error(err) } @@ -188,7 +188,7 @@ func TestRateProfileCostForEvent(t *testing.T) { Tenant: "cgrates.org", ID: "RATE_1", Event: map[string]interface{}{ - utils.Account: "1001"}}}}, rateS.cfg.RateSCfg().Verbosity); err != nil { + utils.AccountField: "1001"}}}}, rateS.cfg.RateSCfg().Verbosity); err != nil { t.Error(err) } else if !reflect.DeepEqual(rcv, expectedRPCost) { t.Errorf("Expected %+v\n, received %+v", utils.ToJSON(expectedRPCost), utils.ToJSON(rcv)) @@ -201,7 +201,7 @@ func TestRateProfileCostForEvent(t *testing.T) { Tenant: "cgrates.org", ID: "RATE_1", Event: map[string]interface{}{ - utils.Account: "1001"}}}}, expectedRPCost); err != nil { + utils.AccountField: "1001"}}}}, expectedRPCost); err != nil { t.Error(err) } else if !reflect.DeepEqual(expectedRPCost, expRpCostAfterV1) { t.Errorf("Expected %+v, received %+v", utils.ToJSON(expRpCostAfterV1), utils.ToJSON(expectedRPCost)) @@ -269,9 +269,9 @@ func TestRateProfileCostForEventUnmatchEvent(t *testing.T) { Tenant: "cgrates.org", ID: "RATE_1", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: "10", - utils.Cost: 1002, + utils.AccountField: "1001", + utils.Destination: "10", + utils.Cost: 1002, }}}}, rateS.cfg.RateSCfg().Verbosity); err == nil || err.Error() != expectedErr { t.Errorf("Expected %+v, receied %+v", expectedErr, err) } @@ -283,9 +283,9 @@ func TestRateProfileCostForEventUnmatchEvent(t *testing.T) { Tenant: "cgrates.org", ID: "RATE_1", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: "10", - utils.Cost: 1002, + utils.AccountField: "1001", + utils.Destination: "10", + utils.Cost: 1002, }}}}, rateS.cfg.RateSCfg().Verbosity); err != nil { t.Error(err) } @@ -327,9 +327,9 @@ func TestMatchingRateProfileEvent(t *testing.T) { Tenant: "cgrates.org", ID: "CACHE1", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: 1002, - utils.AnswerTime: t1.Add(-10 * time.Second), + utils.AccountField: "1001", + utils.Destination: 1002, + utils.AnswerTime: t1.Add(-10 * time.Second), }, }, }, @@ -346,9 +346,9 @@ func TestMatchingRateProfileEvent(t *testing.T) { Tenant: "cgrates.org", ID: "CACHE1", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: 2002, - utils.AnswerTime: t1.Add(-10 * time.Second), + utils.AccountField: "1001", + utils.Destination: 2002, + utils.AnswerTime: t1.Add(-10 * time.Second), }, }, }, @@ -362,9 +362,9 @@ func TestMatchingRateProfileEvent(t *testing.T) { Tenant: "cgrates.org", ID: "CACHE1", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: 2002, - utils.AnswerTime: t1.Add(10 * time.Second), + utils.AccountField: "1001", + utils.Destination: 2002, + utils.AnswerTime: t1.Add(10 * time.Second), }, }, }, @@ -378,9 +378,9 @@ func TestMatchingRateProfileEvent(t *testing.T) { Tenant: "cgrates.org", ID: "CACHE1", Event: map[string]interface{}{ - utils.Account: "1007", - utils.Destination: 1002, - utils.AnswerTime: t1.Add(-10 * time.Second), + utils.AccountField: "1007", + utils.Destination: 1002, + utils.AnswerTime: t1.Add(-10 * time.Second), }, }, }, @@ -395,9 +395,9 @@ func TestMatchingRateProfileEvent(t *testing.T) { Tenant: "cgrates.org", ID: "CACHE1", Event: map[string]interface{}{ - utils.Account: "1007", - utils.Destination: 1002, - utils.AnswerTime: t1.Add(-10 * time.Second), + utils.AccountField: "1007", + utils.Destination: 1002, + utils.AnswerTime: t1.Add(-10 * time.Second), }, }, }, @@ -412,9 +412,9 @@ func TestMatchingRateProfileEvent(t *testing.T) { Tenant: "cgrates.org", ID: "CACHE1", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Cost: 1002, - utils.AnswerTime: t1.Add(-10 * time.Second), + utils.AccountField: "1001", + utils.Cost: 1002, + utils.AnswerTime: t1.Add(-10 * time.Second), }, }, }, @@ -431,9 +431,9 @@ func TestMatchingRateProfileEvent(t *testing.T) { Tenant: "cgrates.org", ID: "CACHE1", Event: map[string]interface{}{ - utils.Account: "1007", - utils.Destination: 1002, - utils.AnswerTime: t1.Add(-10 * time.Second), + utils.AccountField: "1007", + utils.Destination: 1002, + utils.AnswerTime: t1.Add(-10 * time.Second), }, }, }, @@ -485,7 +485,7 @@ func TestV1CostForEventError(t *testing.T) { Tenant: "cgrates.org", ID: "RATE_1", Event: map[string]interface{}{ - utils.Account: "1001"}}}}, rateS.cfg.RateSCfg().Verbosity) + utils.AccountField: "1001"}}}}, rateS.cfg.RateSCfg().Verbosity) if err != nil { t.Error(err) } @@ -498,7 +498,7 @@ func TestV1CostForEventError(t *testing.T) { Tenant: "cgrates.org", ID: "RATE_1", Event: map[string]interface{}{ - utils.Account: "1001"}}}, + utils.AccountField: "1001"}}}, RateProfileIDs: []string{"RATE_1"}}, rcv); err == nil || err.Error() != expectedErr { t.Errorf("Expected %+v, received %+v", expectedErr, err) } @@ -736,7 +736,7 @@ func TestRateProfileCostForEventInvalidUsage(t *testing.T) { Tenant: "cgrates.org", ID: "RATE_1", Event: map[string]interface{}{ - utils.Account: "1001"}}, + utils.AccountField: "1001"}}, Opts: map[string]interface{}{ utils.OptsRatesUsage: "invalidUsageFormat", }}}, rateS.cfg.RateSCfg().Verbosity); err == nil || err.Error() != expected { @@ -750,7 +750,7 @@ func TestRateProfileCostForEventInvalidUsage(t *testing.T) { Tenant: "cgrates.org", ID: "RATE_1", Event: map[string]interface{}{ - utils.Account: "1001"}}, + utils.AccountField: "1001"}}, Opts: map[string]interface{}{ utils.OptsRatesStartTime: "invalidStartTimeFormat", }}}, rateS.cfg.RateSCfg().Verbosity); err == nil || err.Error() != expected { @@ -804,7 +804,7 @@ func TestRateProfileCostForEventZeroIncrement(t *testing.T) { Tenant: "cgrates.org", ID: "RATE_1", Event: map[string]interface{}{ - utils.Account: "1001"}}, + utils.AccountField: "1001"}}, Opts: map[string]interface{}{ utils.OptsRatesUsage: "100m", }}}, rateS.cfg.RateSCfg().Verbosity); err == nil || err.Error() != expected { @@ -858,7 +858,7 @@ func TestRateProfileCostForEventMaximumIterations(t *testing.T) { Tenant: "cgrates.org", ID: "RATE_1", Event: map[string]interface{}{ - utils.Account: "1001"}}, + utils.AccountField: "1001"}}, Opts: map[string]interface{}{ utils.OptsRatesUsage: "10000m", }}}, rateS.cfg.RateSCfg().Verbosity); err == nil || err.Error() != expected { diff --git a/sessions/libsessions_test.go b/sessions/libsessions_test.go index 16e68f728..083ae45f9 100644 --- a/sessions/libsessions_test.go +++ b/sessions/libsessions_test.go @@ -25,7 +25,7 @@ import ( "github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/utils" - "github.com/dgrijalva/jwt-go" + jwt "github.com/dgrijalva/jwt-go" ) func TestLibSessionSGetSetCGRID(t *testing.T) { @@ -33,7 +33,7 @@ func TestLibSessionSGetSetCGRID(t *testing.T) { utils.EVENT_NAME: "TEST_EVENT", utils.ToR: "*voice", utils.OriginID: "12345", - utils.Account: "account1", + utils.AccountField: "account1", utils.Subject: "subject1", utils.Destination: "+4986517174963", utils.Category: "call", diff --git a/sessions/session.go b/sessions/session.go index b4bcbcda5..f6b64dd8a 100644 --- a/sessions/session.go +++ b/sessions/session.go @@ -146,7 +146,7 @@ func (s *Session) AsExternalSessions(tmz, nodeID string) (aSs []*ExternalSession RequestType: sr.Event.GetStringIgnoreErrors(utils.RequestType), Tenant: s.Tenant, Category: sr.Event.GetStringIgnoreErrors(utils.Category), - Account: sr.Event.GetStringIgnoreErrors(utils.Account), + Account: sr.Event.GetStringIgnoreErrors(utils.AccountField), Subject: sr.Event.GetStringIgnoreErrors(utils.Subject), Destination: sr.Event.GetStringIgnoreErrors(utils.Destination), SetupTime: sr.Event.GetTimeIgnoreErrors(utils.SetupTime, tmz), @@ -183,7 +183,7 @@ func (s *Session) AsExternalSession(sr *SRun, tmz, nodeID string) (aS *ExternalS RequestType: sr.Event.GetStringIgnoreErrors(utils.RequestType), Tenant: s.Tenant, Category: sr.Event.GetStringIgnoreErrors(utils.Category), - Account: sr.Event.GetStringIgnoreErrors(utils.Account), + Account: sr.Event.GetStringIgnoreErrors(utils.AccountField), Subject: sr.Event.GetStringIgnoreErrors(utils.Subject), Destination: sr.Event.GetStringIgnoreErrors(utils.Destination), SetupTime: sr.Event.GetTimeIgnoreErrors(utils.SetupTime, tmz), diff --git a/sessions/session_test.go b/sessions/session_test.go index 6ddd9062c..4420d6188 100644 --- a/sessions/session_test.go +++ b/sessions/session_test.go @@ -300,19 +300,19 @@ func TestSRunDebitReserve6(t *testing.T) { func TestSessionAsCGREventsRawEvent(t *testing.T) { ev := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "123451", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: 2 * time.Second, - utils.Cost: 12.12, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "123451", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: 2 * time.Second, + utils.Cost: 12.12, } s := &Session{ CGRID: "RandomCGRID", @@ -327,35 +327,35 @@ func TestSessionAsCGREventsRawEvent(t *testing.T) { func TestSessionAsCGREvents(t *testing.T) { startEv := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "123451", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: 2 * time.Second, - utils.Cost: 12.12, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "123451", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: 2 * time.Second, + utils.Cost: 12.12, } ev := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT2", - utils.ToR: utils.VOICE, - utils.OriginID: "123451", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - utils.RunID: utils.MetaDefault, - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: 2 * time.Second, - utils.Cost: 12.13, + utils.EVENT_NAME: "TEST_EVENT2", + utils.ToR: utils.VOICE, + utils.OriginID: "123451", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + utils.RunID: utils.MetaDefault, + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: 2 * time.Second, + utils.Cost: 12.13, } s := &Session{ CGRID: "RandomCGRID", @@ -382,35 +382,35 @@ func TestSessionAsCGREvents(t *testing.T) { func TestSessionAsExternalSessions(t *testing.T) { startEv := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "123451", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: 2 * time.Second, - utils.Cost: 12.12, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "123451", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: 2 * time.Second, + utils.Cost: 12.12, } ev := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT2", - utils.ToR: utils.VOICE, - utils.OriginID: "123451", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - utils.RunID: utils.MetaDefault, - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: 2 * time.Second, - utils.Cost: 12.13, + utils.EVENT_NAME: "TEST_EVENT2", + utils.ToR: utils.VOICE, + utils.OriginID: "123451", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + utils.RunID: utils.MetaDefault, + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: 2 * time.Second, + utils.Cost: 12.13, } tTime := time.Date(2020, time.April, 18, 23, 0, 0, 0, time.UTC) s := &Session{ @@ -462,35 +462,35 @@ func TestSessionAsExternalSessions(t *testing.T) { func TestSessionAsExternalSessions2(t *testing.T) { startEv := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "123451", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: 2 * time.Second, - utils.Cost: 12.12, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "123451", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: 2 * time.Second, + utils.Cost: 12.12, } ev := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT2", - utils.ToR: utils.VOICE, - utils.OriginID: "123451", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - utils.RunID: utils.MetaDefault, - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: 2 * time.Second, - utils.Cost: 12.13, + utils.EVENT_NAME: "TEST_EVENT2", + utils.ToR: utils.VOICE, + utils.OriginID: "123451", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + utils.RunID: utils.MetaDefault, + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: 2 * time.Second, + utils.Cost: 12.13, } s := &Session{ CGRID: "RandomCGRID", @@ -546,35 +546,35 @@ func TestSessionAsExternalSessions2(t *testing.T) { func TestSessionAsExternalSessions3(t *testing.T) { startEv := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "123451", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: 2 * time.Second, - utils.Cost: 12.12, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "123451", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: 2 * time.Second, + utils.Cost: 12.12, } ev := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT2", - utils.ToR: utils.VOICE, - utils.OriginID: "123451", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - utils.RunID: utils.MetaDefault, - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: 2 * time.Second, - utils.Cost: 12.13, + utils.EVENT_NAME: "TEST_EVENT2", + utils.ToR: utils.VOICE, + utils.OriginID: "123451", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + utils.RunID: utils.MetaDefault, + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: 2 * time.Second, + utils.Cost: 12.13, } tTime := time.Date(2020, time.April, 18, 23, 0, 0, 0, time.UTC) @@ -708,35 +708,35 @@ func TestSessionstopDebitLoops(t *testing.T) { func TestUpdateSRuns(t *testing.T) { startEv := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "123451", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: 2 * time.Second, - utils.Cost: 12.12, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "123451", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: 2 * time.Second, + utils.Cost: 12.12, } ev := map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT2", - utils.ToR: utils.VOICE, - utils.OriginID: "123451", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - utils.RunID: utils.MetaDefault, - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: 2 * time.Second, - utils.Cost: 12.13, + utils.EVENT_NAME: "TEST_EVENT2", + utils.ToR: utils.VOICE, + utils.OriginID: "123451", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + utils.RunID: utils.MetaDefault, + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: 2 * time.Second, + utils.Cost: 12.13, } s := &Session{ CGRID: "RandomCGRID", diff --git a/sessions/sessions.go b/sessions/sessions.go index 05229bba1..89d36743b 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -1153,7 +1153,7 @@ func (sS *SessionS) newSession(cgrEv *utils.CGREventWithOpts, resID, clntConnID } subject := me.GetStringIgnoreErrors(utils.Subject) if len(subject) == 0 { - subject = me.GetStringIgnoreErrors(utils.Account) + subject = me.GetStringIgnoreErrors(utils.AccountField) } s.SRuns[i] = &SRun{ Event: me, @@ -1164,7 +1164,7 @@ func (sS *SessionS) newSession(cgrEv *utils.CGREventWithOpts, resID, clntConnID Tenant: s.Tenant, Category: category, Subject: subject, - Account: me.GetStringIgnoreErrors(utils.Account), + Account: me.GetStringIgnoreErrors(utils.AccountField), Destination: me.GetStringIgnoreErrors(utils.Destination), TimeStart: startTime, TimeEnd: startTime.Add(s.EventStart.GetDurationIgnoreErrors(utils.Usage)), @@ -3234,7 +3234,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, stirMaxDur = sS.cgrCfg.SessionSCfg().STIRCfg.PayloadMaxduration } if err = AuthStirShaken(opts.GetStringIgnoreErrors(utils.OptsStirIdentity), - utils.FirstNonEmpty(opts.GetStringIgnoreErrors(utils.OptsStirOriginatorTn), ev.GetStringIgnoreErrors(utils.Account)), + utils.FirstNonEmpty(opts.GetStringIgnoreErrors(utils.OptsStirOriginatorTn), ev.GetStringIgnoreErrors(utils.AccountField)), opts.GetStringIgnoreErrors(utils.OptsStirOriginatorURI), utils.FirstNonEmpty(opts.GetStringIgnoreErrors(utils.OptsStirDestinationTn), ev.GetStringIgnoreErrors(utils.Destination)), opts.GetStringIgnoreErrors(utils.OptsStirDestinationURI), @@ -3263,7 +3263,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, } else { orig = utils.NewPASSporTOriginsIdentity( utils.FirstNonEmpty(opts.GetStringIgnoreErrors(utils.OptsStirOriginatorTn), - ev.GetStringIgnoreErrors(utils.Account)), + ev.GetStringIgnoreErrors(utils.AccountField)), utils.EmptyString) } pubkeyPath := utils.FirstNonEmpty(opts.GetStringIgnoreErrors(utils.OptsStirPublicKeyPath), sS.cgrCfg.SessionSCfg().STIRCfg.PublicKeyPath) @@ -3365,7 +3365,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, } subject := ev.GetStringIgnoreErrors(utils.Subject) if len(subject) == 0 { - subject = ev.GetStringIgnoreErrors(utils.Account) + subject = ev.GetStringIgnoreErrors(utils.AccountField) } cd := &engine.CallDescriptor{ @@ -3375,7 +3375,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, Tenant: cgrEv.CGREvent.Tenant, Category: category, Subject: subject, - Account: ev.GetStringIgnoreErrors(utils.Account), + Account: ev.GetStringIgnoreErrors(utils.AccountField), Destination: ev.GetStringIgnoreErrors(utils.Destination), TimeStart: startTime, TimeEnd: startTime.Add(ev.GetDurationIgnoreErrors(utils.Usage)), @@ -3582,7 +3582,7 @@ func (sS *SessionS) BiRPCv1GetCost(clnt rpcclient.ClientConnector, } subject := me.GetStringIgnoreErrors(utils.Subject) if len(subject) == 0 { - subject = me.GetStringIgnoreErrors(utils.Account) + subject = me.GetStringIgnoreErrors(utils.AccountField) } cd := &engine.CallDescriptor{ @@ -3592,7 +3592,7 @@ func (sS *SessionS) BiRPCv1GetCost(clnt rpcclient.ClientConnector, Tenant: args.CGREvent.Tenant, Category: category, Subject: subject, - Account: me.GetStringIgnoreErrors(utils.Account), + Account: me.GetStringIgnoreErrors(utils.AccountField), Destination: me.GetStringIgnoreErrors(utils.Destination), TimeStart: startTime, TimeEnd: startTime.Add(me.GetDurationIgnoreErrors(utils.Usage)), diff --git a/sessions/sessions_bench_test.go b/sessions/sessions_bench_test.go index 2683c2678..91a74a55e 100644 --- a/sessions/sessions_bench_test.go +++ b/sessions/sessions_bench_test.go @@ -125,8 +125,8 @@ func initSession(i int) { } initArgs.ID = utils.UUIDSha1Prefix() initArgs.Event[utils.OriginID] = utils.UUIDSha1Prefix() - initArgs.Event[utils.Account] = fmt.Sprintf("1001%v", i) - initArgs.Event[utils.Subject] = "1001" //initArgs.Event[utils.Account] + initArgs.Event[utils.AccountField] = fmt.Sprintf("1001%v", i) + initArgs.Event[utils.Subject] = "1001" //initArgs.Event[utils.AccountField] initArgs.Event[utils.Destination] = fmt.Sprintf("1002%v", i) var initRpl *V1InitSessionReply diff --git a/sessions/sessions_birpc_it_test.go b/sessions/sessions_birpc_it_test.go index 772c0f7f6..448c17683 100644 --- a/sessions/sessions_birpc_it_test.go +++ b/sessions/sessions_birpc_it_test.go @@ -172,18 +172,18 @@ func testSessionsBiRPCSessionAutomaticDisconnects(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsBiRPCSessionAutomaticDisconnects", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "123451", - utils.Account: attrSetBalance.Account, - utils.Subject: attrSetBalance.Account, - utils.Destination: "1004", - utils.Category: "call", - utils.Tenant: attrSetBalance.Tenant, - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: 200 * time.Millisecond, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "123451", + utils.AccountField: attrSetBalance.Account, + utils.Subject: attrSetBalance.Account, + utils.Destination: "1004", + utils.Category: "call", + utils.Tenant: attrSetBalance.Tenant, + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: 200 * time.Millisecond, }, }, }, @@ -216,18 +216,18 @@ func testSessionsBiRPCSessionAutomaticDisconnects(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedData", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "123451", - utils.Account: attrSetBalance.Account, - utils.Subject: attrSetBalance.Account, - utils.Destination: "1004", - utils.Category: "call", - utils.Tenant: attrSetBalance.Tenant, - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: initArgs.CGREvent.Event[utils.Usage], + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "123451", + utils.AccountField: attrSetBalance.Account, + utils.Subject: attrSetBalance.Account, + utils.Destination: "1004", + utils.Category: "call", + utils.Tenant: attrSetBalance.Tenant, + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: initArgs.CGREvent.Event[utils.Usage], }, }, }, @@ -298,18 +298,18 @@ func testSessionsBiRPCSessionOriginatorTerminate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsBiRPCSessionOriginatorTerminate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "123452", - utils.Account: attrSetBalance.Account, - utils.Subject: attrSetBalance.Account, - utils.Destination: "1005", - utils.Category: "call", - utils.Tenant: attrSetBalance.Tenant, - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: 200 * time.Millisecond, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "123452", + utils.AccountField: attrSetBalance.Account, + utils.Subject: attrSetBalance.Account, + utils.Destination: "1005", + utils.Category: "call", + utils.Tenant: attrSetBalance.Tenant, + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: 200 * time.Millisecond, }, }, }, @@ -335,18 +335,18 @@ func testSessionsBiRPCSessionOriginatorTerminate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsBiRPCSessionOriginatorTerminate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "123452", - utils.Account: attrSetBalance.Account, - utils.Subject: attrSetBalance.Account, - utils.Destination: "1005", - utils.Category: "call", - utils.Tenant: attrSetBalance.Tenant, - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: 7 * time.Millisecond, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "123452", + utils.AccountField: attrSetBalance.Account, + utils.Subject: attrSetBalance.Account, + utils.Destination: "1005", + utils.Category: "call", + utils.Tenant: attrSetBalance.Tenant, + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: 7 * time.Millisecond, }, }, }, diff --git a/sessions/sessions_data_it_test.go b/sessions/sessions_data_it_test.go index 66d6cf86b..26e3f5948 100644 --- a/sessions/sessions_data_it_test.go +++ b/sessions/sessions_data_it_test.go @@ -159,18 +159,18 @@ func testSessionsDataLastUsedData(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedData", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, - utils.OriginID: "123491", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: "5120", // 5MB + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.DATA, + utils.OriginID: "123491", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: "5120", // 5MB }, }, }, @@ -200,19 +200,19 @@ func testSessionsDataLastUsedData(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedData", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, - utils.OriginID: "123491", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: "5120", - utils.LastUsed: "4096", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.DATA, + utils.OriginID: "123491", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: "5120", + utils.LastUsed: "4096", }, }, }, @@ -240,18 +240,18 @@ func testSessionsDataLastUsedData(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedData", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, - utils.OriginID: "123491", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.LastUsed: "0", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.DATA, + utils.OriginID: "123491", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.LastUsed: "0", }, }, }, @@ -303,18 +303,18 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedMultipleUpdates", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, - utils.OriginID: "123492", - utils.Account: acntAttrs.Account, - utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: acntAttrs.Tenant, - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: "6144", // 5MB + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.DATA, + utils.OriginID: "123492", + utils.AccountField: acntAttrs.Account, + utils.Subject: acntAttrs.Account, + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: acntAttrs.Tenant, + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: "6144", // 5MB }, }, }, @@ -351,20 +351,20 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedMultipleUpdates", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, - utils.OriginID: "123492", - utils.Account: acntAttrs.Account, - utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: acntAttrs.Tenant, - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: "8192", // 8 MB - utils.LastUsed: "7168", - "Extra1": "other", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.DATA, + utils.OriginID: "123492", + utils.AccountField: acntAttrs.Account, + utils.Subject: acntAttrs.Account, + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: acntAttrs.Tenant, + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: "8192", // 8 MB + utils.LastUsed: "7168", + "Extra1": "other", }, }, }, @@ -401,21 +401,21 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedMultipleUpdates", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, - utils.OriginID: "123492", - utils.Account: acntAttrs.Account, - utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: acntAttrs.Tenant, - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: "1024", // 8 MB - utils.LastUsed: "5120", // 5 MB - "Extra1": "other2", - "Extra2": "other", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.DATA, + utils.OriginID: "123492", + utils.AccountField: acntAttrs.Account, + utils.Subject: acntAttrs.Account, + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: acntAttrs.Tenant, + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: "1024", // 8 MB + utils.LastUsed: "5120", // 5 MB + "Extra1": "other2", + "Extra2": "other", }, }, }, @@ -453,18 +453,18 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedMultipleUpdates", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, - utils.OriginID: "123492", - utils.Account: acntAttrs.Account, - utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: acntAttrs.Tenant, - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: "1024", // 8 MB + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.DATA, + utils.OriginID: "123492", + utils.AccountField: acntAttrs.Account, + utils.Subject: acntAttrs.Account, + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: acntAttrs.Tenant, + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: "1024", // 8 MB }, }, }, @@ -497,19 +497,19 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedMultipleUpdates", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, - utils.OriginID: "123492", - utils.Account: acntAttrs.Account, - utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: acntAttrs.Tenant, - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.LastUsed: "0", // refund 1024 (extra used) + 1024 (extra reserved) - "Extra1": "done", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.DATA, + utils.OriginID: "123492", + utils.AccountField: acntAttrs.Account, + utils.Subject: acntAttrs.Account, + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: acntAttrs.Tenant, + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.LastUsed: "0", // refund 1024 (extra used) + 1024 (extra reserved) + "Extra1": "done", }, }, }, @@ -591,18 +591,18 @@ func testSessionsDataTTLExpired(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataTTLExpired", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, - utils.OriginID: "TestSessionsDataTTLExpired", - utils.Account: acntAttrs.Account, - utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: "1024", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.DATA, + utils.OriginID: "TestSessionsDataTTLExpired", + utils.AccountField: acntAttrs.Account, + utils.Subject: acntAttrs.Account, + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: "1024", }, }, }, @@ -682,18 +682,18 @@ func testSessionsDataTTLExpMultiUpdates(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataTTLExpMultiUpdates", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, - utils.OriginID: "123495", - utils.Account: acntAttrs.Account, - utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: "4096", // 4MB + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.DATA, + utils.OriginID: "123495", + utils.AccountField: acntAttrs.Account, + utils.Subject: acntAttrs.Account, + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: "4096", // 4MB }, }, }, @@ -735,19 +735,19 @@ func testSessionsDataTTLExpMultiUpdates(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataTTLExpMultiUpdates", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, - utils.OriginID: "123495", - utils.Account: acntAttrs.Account, - utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.LastUsed: "1024", - utils.Usage: "4096", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.DATA, + utils.OriginID: "123495", + utils.AccountField: acntAttrs.Account, + utils.Subject: acntAttrs.Account, + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.LastUsed: "1024", + utils.Usage: "4096", }, }, }, @@ -827,18 +827,18 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataMultipleDataNoUsage", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, - utils.OriginID: "123495", - utils.Account: acntAttrs.Account, - utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: "2048", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.DATA, + utils.OriginID: "123495", + utils.AccountField: acntAttrs.Account, + utils.Subject: acntAttrs.Account, + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: "2048", }, }, }, @@ -878,19 +878,19 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataMultipleDataNoUsage", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, - utils.OriginID: "123495", - utils.Account: acntAttrs.Account, - utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: "1024", - utils.LastUsed: "1024", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.DATA, + utils.OriginID: "123495", + utils.AccountField: acntAttrs.Account, + utils.Subject: acntAttrs.Account, + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: "1024", + utils.LastUsed: "1024", }, }, }, @@ -929,19 +929,19 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataMultipleDataNoUsage", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, - utils.OriginID: "123495", - utils.Account: acntAttrs.Account, - utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: "0", - utils.LastUsed: "0", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.DATA, + utils.OriginID: "123495", + utils.AccountField: acntAttrs.Account, + utils.Subject: acntAttrs.Account, + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: "0", + utils.LastUsed: "0", }, }, }, @@ -982,18 +982,18 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataMultipleDataNoUsage", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, - utils.OriginID: "123495", - utils.Account: acntAttrs.Account, - utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.LastUsed: "0", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.DATA, + utils.OriginID: "123495", + utils.AccountField: acntAttrs.Account, + utils.Subject: acntAttrs.Account, + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.LastUsed: "0", }, }, }, @@ -1053,18 +1053,18 @@ func testSessionsDataTTLUsageProtection(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataTTLUsageProtection", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.DATA, - utils.OriginID: "123495", - utils.Account: acntAttrs.Account, - utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 53, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: "2048", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.DATA, + utils.OriginID: "123495", + utils.AccountField: acntAttrs.Account, + utils.Subject: acntAttrs.Account, + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 53, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: "2048", }, }, }, @@ -1135,18 +1135,18 @@ func testSessionsDataTTLLastUsage(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataTTLLastUsage", Event: map[string]interface{}{ - utils.EVENT_NAME: "testSessionsDataTTLLastUsage", - utils.ToR: utils.DATA, - utils.OriginID: "testSessionsDataTTLLastUsage", - utils.Account: acntAttrs.Account, - utils.Subject: acntAttrs.Account, - utils.Destination: utils.DATA, - utils.Category: "data", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: "1024", + utils.EVENT_NAME: "testSessionsDataTTLLastUsage", + utils.ToR: utils.DATA, + utils.OriginID: "testSessionsDataTTLLastUsage", + utils.AccountField: acntAttrs.Account, + utils.Subject: acntAttrs.Account, + utils.Destination: utils.DATA, + utils.Category: "data", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: "1024", }, }, }, diff --git a/sessions/sessions_it_test.go b/sessions/sessions_it_test.go index 093926a91..303d7fca2 100644 --- a/sessions/sessions_it_test.go +++ b/sessions/sessions_it_test.go @@ -141,18 +141,18 @@ func testSessionsItTerminatNonexist(t *testing.T) { Tenant: "cgrates.org", ID: "testSessionsItTerminatNonexist", Event: map[string]interface{}{ - utils.EVENT_NAME: "TerminateEvent", - utils.ToR: utils.VOICE, - utils.OriginID: "123451", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, + utils.EVENT_NAME: "TerminateEvent", + utils.ToR: utils.VOICE, + utils.OriginID: "123451", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, }, }, }, @@ -218,18 +218,18 @@ func testSessionsItUpdateNonexist(t *testing.T) { Tenant: "cgrates.org", ID: "testSessionsItUpdateNonexist", Event: map[string]interface{}{ - utils.EVENT_NAME: "UpdateEvent", - utils.ToR: utils.VOICE, - utils.OriginID: "123789", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, + utils.EVENT_NAME: "UpdateEvent", + utils.ToR: utils.VOICE, + utils.OriginID: "123789", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, }, }, }, @@ -259,18 +259,18 @@ func testSessionsItUpdateNonexist(t *testing.T) { Tenant: "cgrates.org", ID: "testSessionsItTerminatNonexist", Event: map[string]interface{}{ - utils.EVENT_NAME: "TerminateEvent", - utils.ToR: utils.VOICE, - utils.OriginID: "123789", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, + utils.EVENT_NAME: "TerminateEvent", + utils.ToR: utils.VOICE, + utils.OriginID: "123789", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, }, }, }, @@ -284,18 +284,18 @@ 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.OriginID: "123789", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: time.Minute, + utils.EVENT_NAME: "UpdateEvent", + utils.ToR: utils.VOICE, + utils.OriginID: "123789", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: time.Minute, }) cgrID := GetSetCGRID(sEv) @@ -341,18 +341,18 @@ func testSessionsItTerminatePassive(t *testing.T) { Tenant: "cgrates.org", ID: "testSessionsItTerminatNonexist", Event: map[string]interface{}{ - utils.EVENT_NAME: "TerminateEvent", - utils.ToR: utils.VOICE, - utils.OriginID: "123789", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: time.Minute, + utils.EVENT_NAME: "TerminateEvent", + utils.ToR: utils.VOICE, + utils.OriginID: "123789", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: time.Minute, }, }, }, @@ -402,12 +402,12 @@ func testSessionsItEventCostCompressing(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsItEventCostCompressing", Event: map[string]interface{}{ - utils.OriginID: "TestSessionsItEventCostCompressing", - utils.Account: "TestSessionsItEventCostCompressing", - utils.Destination: "1002", - utils.RequestType: utils.META_PREPAID, - utils.AnswerTime: time.Date(2019, time.March, 1, 13, 57, 05, 0, time.UTC), - utils.Usage: "1s", + utils.OriginID: "TestSessionsItEventCostCompressing", + utils.AccountField: "TestSessionsItEventCostCompressing", + utils.Destination: "1002", + utils.RequestType: utils.META_PREPAID, + utils.AnswerTime: time.Date(2019, time.March, 1, 13, 57, 05, 0, time.UTC), + utils.Usage: "1s", }, }, }, @@ -453,12 +453,12 @@ func testSessionsItEventCostCompressing(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsDataLastUsedData", Event: map[string]interface{}{ - utils.OriginID: "TestSessionsItEventCostCompressing", - utils.Account: "TestSessionsItEventCostCompressing", - utils.Destination: "1002", - utils.RequestType: utils.META_PREPAID, - utils.AnswerTime: time.Date(2019, time.March, 1, 13, 57, 05, 0, time.UTC), - utils.Usage: "4s", + utils.OriginID: "TestSessionsItEventCostCompressing", + utils.AccountField: "TestSessionsItEventCostCompressing", + utils.Destination: "1002", + utils.RequestType: utils.META_PREPAID, + utils.AnswerTime: time.Date(2019, time.March, 1, 13, 57, 05, 0, time.UTC), + utils.Usage: "4s", }, }, }, diff --git a/sessions/sessions_rpl_it_test.go b/sessions/sessions_rpl_it_test.go index cc6f0c96b..14984d7ba 100644 --- a/sessions/sessions_rpl_it_test.go +++ b/sessions/sessions_rpl_it_test.go @@ -147,18 +147,18 @@ func testSessionSRplInitiate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionSRplInitiate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.Tenant: "cgrates.org", - utils.OriginID: "123451", - utils.ToR: utils.VOICE, - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - 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: usage, + utils.EVENT_NAME: "TEST_EVENT", + utils.Tenant: "cgrates.org", + utils.OriginID: "123451", + utils.ToR: utils.VOICE, + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + 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: usage, }, }, }, @@ -215,18 +215,18 @@ func testSessionSRplUpdate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionSRplUpdate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.Tenant: "cgrates.org", - utils.OriginID: "123451", - utils.ToR: utils.VOICE, - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - 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: usage, + utils.EVENT_NAME: "TEST_EVENT", + utils.Tenant: "cgrates.org", + utils.OriginID: "123451", + utils.ToR: utils.VOICE, + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + 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: usage, }, }, }, @@ -295,18 +295,18 @@ func testSessionSRplTerminate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionSRplTerminate", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.Tenant: "cgrates.org", - utils.OriginID: "123451", - utils.ToR: utils.VOICE, - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - 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: 2*time.Minute + 30*time.Second, + utils.EVENT_NAME: "TEST_EVENT", + utils.Tenant: "cgrates.org", + utils.OriginID: "123451", + utils.ToR: utils.VOICE, + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + 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: 2*time.Minute + 30*time.Second, }, }, }, @@ -360,18 +360,18 @@ func testSessionSRplManualReplicate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItAuth", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.Tenant: "cgrates.org", - utils.OriginID: "123451", - utils.ToR: utils.VOICE, - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - 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: time.Minute + 30*time.Second, + utils.EVENT_NAME: "TEST_EVENT", + utils.Tenant: "cgrates.org", + utils.OriginID: "123451", + utils.ToR: utils.VOICE, + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + 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: time.Minute + 30*time.Second, }, }, }, @@ -384,18 +384,18 @@ func testSessionSRplManualReplicate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItAuth2", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.Tenant: "cgrates.org", - utils.OriginID: "123481", - utils.ToR: utils.VOICE, - utils.RequestType: utils.META_PREPAID, - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1005", - utils.Category: "call", - 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: time.Minute + 30*time.Second, + utils.EVENT_NAME: "TEST_EVENT", + utils.Tenant: "cgrates.org", + utils.OriginID: "123481", + utils.ToR: utils.VOICE, + utils.RequestType: utils.META_PREPAID, + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1005", + utils.Category: "call", + 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: time.Minute + 30*time.Second, }, }, }, diff --git a/sessions/sessions_test.go b/sessions/sessions_test.go index 584126193..fa339f8d7 100644 --- a/sessions/sessions_test.go +++ b/sessions/sessions_test.go @@ -30,7 +30,7 @@ import ( "github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/utils" "github.com/cgrates/rpcclient" - "github.com/dgrijalva/jwt-go" + jwt "github.com/dgrijalva/jwt-go" ) var attrs = &engine.AttrSProcessEventReply{ @@ -41,18 +41,18 @@ var attrs = &engine.AttrSProcessEventReply{ Tenant: "cgrates.org", ID: "TestSSv1ItAuth", Event: map[string]interface{}{ - utils.CGRID: "5668666d6b8e44eb949042f25ce0796ec3592ff9", - utils.Tenant: "cgrates.org", - utils.Category: "call", - utils.ToR: utils.VOICE, - utils.Account: "1001", - utils.Subject: "ANY2CNT", - utils.Destination: "1002", - "OfficeGroup": "Marketing", - utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: "2018-01-07T17:00:00Z", - utils.Usage: 300000000000.0, + utils.CGRID: "5668666d6b8e44eb949042f25ce0796ec3592ff9", + utils.Tenant: "cgrates.org", + utils.Category: "call", + utils.ToR: utils.VOICE, + utils.AccountField: "1001", + utils.Subject: "ANY2CNT", + utils.Destination: "1002", + "OfficeGroup": "Marketing", + utils.OriginID: "TestSSv1It1", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: "2018-01-07T17:00:00Z", + utils.Usage: 300000000000.0, }, }, }, @@ -100,7 +100,7 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { utils.EVENT_NAME: "TEST_EVENT", utils.ToR: "*voice", utils.OriginID: "12345", - utils.Account: "account1", + utils.AccountField: "account1", utils.Subject: "subject1", utils.Destination: "+4986517174963", utils.Category: "call", @@ -179,13 +179,13 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { } // Index second session sSEv2 := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT2", - utils.OriginID: "12346", - utils.Account: "account2", - utils.Destination: "+4986517174964", - utils.Tenant: "itsyscom.com", - "Extra3": "", - "Extra4": "info2", + utils.EVENT_NAME: "TEST_EVENT2", + utils.OriginID: "12346", + utils.AccountField: "account2", + utils.Destination: "+4986517174964", + utils.Tenant: "itsyscom.com", + "Extra3": "", + "Extra4": "info2", }) cgrID2 := GetSetCGRID(sSEv2) session2 := &Session{ @@ -202,11 +202,11 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { } sS.indexSession(session2, false) sSEv3 := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT3", - utils.Tenant: "cgrates.org", - utils.OriginID: "12347", - utils.Account: "account2", - "Extra5": "info5", + utils.EVENT_NAME: "TEST_EVENT3", + utils.Tenant: "cgrates.org", + utils.OriginID: "12347", + utils.AccountField: "account2", + "Extra5": "info5", }) cgrID3 := GetSetCGRID(sSEv3) session3 := &Session{ @@ -417,22 +417,22 @@ 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.ToR: "*voice", - utils.OriginID: "111", - utils.Account: "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.OriginHost: "127.0.0.1", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: "*voice", + utils.OriginID: "111", + 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.OriginHost: "127.0.0.1", }) s := &Session{ CGRID: "session1", @@ -477,20 +477,20 @@ func TestSessionSRegisterAndUnregisterASessions(t *testing.T) { } sSEv2 := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: "*voice", - utils.OriginID: "222", - utils.Account: "account2", - 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.OriginHost: "127.0.0.1", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: "*voice", + utils.OriginID: "222", + utils.AccountField: "account2", + 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.OriginHost: "127.0.0.1", }) s2 := &Session{ CGRID: "session2", @@ -546,7 +546,7 @@ func TestSessionSRegisterAndUnregisterASessions(t *testing.T) { utils.EVENT_NAME: "TEST_EVENT", utils.ToR: "*voice", utils.OriginID: "111", - utils.Account: "account3", + utils.AccountField: "account3", utils.Destination: "+4986517174963", utils.Category: "call", utils.Tenant: "itsyscom.com", @@ -635,22 +635,22 @@ 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.ToR: "*voice", - utils.OriginID: "111", - utils.Account: "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.OriginHost: "127.0.0.1", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: "*voice", + utils.OriginID: "111", + 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.OriginHost: "127.0.0.1", }) s := &Session{ CGRID: "session1", @@ -698,20 +698,20 @@ func TestSessionSRegisterAndUnregisterPSessions(t *testing.T) { } sSEv2 := engine.NewMapEvent(map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: "*voice", - utils.OriginID: "222", - utils.Account: "account2", - 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.OriginHost: "127.0.0.1", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: "*voice", + utils.OriginID: "222", + utils.AccountField: "account2", + 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.OriginHost: "127.0.0.1", }) s2 := &Session{ CGRID: "session2", @@ -767,7 +767,7 @@ func TestSessionSRegisterAndUnregisterPSessions(t *testing.T) { utils.EVENT_NAME: "TEST_EVENT", utils.ToR: "*voice", utils.OriginID: "111", - utils.Account: "account3", + utils.AccountField: "account3", utils.Destination: "+4986517174963", utils.Category: "call", utils.Tenant: "itsyscom.com", @@ -850,8 +850,8 @@ func TestSessionSNewV1AuthorizeArgs(t *testing.T) { Tenant: "cgrates.org", ID: "Event", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: "1002", + utils.AccountField: "1001", + utils.Destination: "1002", }, } expected := &V1AuthorizeArgs{ @@ -977,8 +977,8 @@ func TestSessionSNewV1UpdateSessionArgs(t *testing.T) { Tenant: "cgrates.org", ID: "Event", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: "1002", + utils.AccountField: "1001", + utils.Destination: "1002", }, } expected := &V1UpdateSessionArgs{ @@ -1019,8 +1019,8 @@ func TestSessionSNewV1TerminateSessionArgs(t *testing.T) { Tenant: "cgrates.org", ID: "Event", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: "1002", + utils.AccountField: "1001", + utils.Destination: "1002", }, } expected := &V1TerminateSessionArgs{ @@ -1068,8 +1068,8 @@ func TestSessionSNewV1ProcessMessageArgs(t *testing.T) { Tenant: "cgrates.org", ID: "Event", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: "1002", + utils.AccountField: "1001", + utils.Destination: "1002", }, } expected := &V1ProcessMessageArgs{ @@ -1136,8 +1136,8 @@ func TestSessionSNewV1InitSessionArgs(t *testing.T) { Tenant: "cgrates.org", ID: "Event", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: "1002", + utils.AccountField: "1001", + utils.Destination: "1002", }, } attributeIDs := []string{"ATTR1", "ATTR2"} @@ -1167,8 +1167,8 @@ func TestSessionSNewV1InitSessionArgs(t *testing.T) { Tenant: "cgrates.org", ID: "Event", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: "1002", + utils.AccountField: "1001", + utils.Destination: "1002", }, } expected = &V1InitSessionArgs{ @@ -1419,22 +1419,22 @@ 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.ToR: "*voice", - utils.OriginID: "111", - utils.Account: "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.OriginHost: "127.0.0.1", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: "*voice", + utils.OriginID: "111", + 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.OriginHost: "127.0.0.1", }) s := &Session{ CGRID: "session1", @@ -1465,22 +1465,22 @@ 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.ToR: "*voice", - utils.OriginID: "111", - utils.Account: "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.OriginHost: "127.0.0.1", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: "*voice", + utils.OriginID: "111", + 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.OriginHost: "127.0.0.1", }) initialCGRID := GetSetCGRID(sSEv) s := &Session{ @@ -1521,8 +1521,8 @@ func TestSessionSNewV1AuthorizeArgsWithOpts(t *testing.T) { Tenant: "cgrates.org", ID: "Event", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: "1002", + utils.AccountField: "1001", + utils.Destination: "1002", }, } expected := &V1AuthorizeArgs{ @@ -1570,8 +1570,8 @@ func TestSessionSNewV1AuthorizeArgsWithOpts2(t *testing.T) { Tenant: "cgrates.org", ID: "Event", Event: map[string]interface{}{ - utils.Account: "1001", - utils.Destination: "1002", + utils.AccountField: "1001", + utils.Destination: "1002", }, } expected := &V1AuthorizeArgs{ @@ -1674,7 +1674,7 @@ func TestSessionSgetSessionIDsMatchingIndexes(t *testing.T) { utils.EVENT_NAME: "TEST_EVENT", utils.ToR: "*voice", utils.OriginID: "12345", - utils.Account: "account1", + utils.AccountField: "account1", utils.Subject: "subject1", utils.Destination: "+4986517174963", utils.Category: "call", @@ -1947,22 +1947,22 @@ 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.ToR: "*voice", - utils.OriginID: "111", - utils.Account: "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.OriginHost: "127.0.0.1", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: "*voice", + utils.OriginID: "111", + 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.OriginHost: "127.0.0.1", }) s := &Session{ CGRID: "session1", @@ -1997,7 +1997,7 @@ func TestSessionSfilterSessions(t *testing.T) { utils.EVENT_NAME: "TEST_EVENT", utils.ToR: "*voice", utils.OriginID: "12345", - utils.Account: "account1", + utils.AccountField: "account1", utils.Subject: "subject1", utils.Destination: "+4986517174963", utils.Category: "call", @@ -2173,7 +2173,7 @@ func TestSessionSfilterSessionsCount(t *testing.T) { utils.EVENT_NAME: "TEST_EVENT", utils.ToR: "*voice", utils.OriginID: "12345", - utils.Account: "account1", + utils.AccountField: "account1", utils.Subject: "subject1", utils.Destination: "+4986517174963", utils.Category: "call", diff --git a/sessions/sessions_voice_it_test.go b/sessions/sessions_voice_it_test.go index 50a4d0ebe..3669633c4 100644 --- a/sessions/sessions_voice_it_test.go +++ b/sessions/sessions_voice_it_test.go @@ -134,18 +134,18 @@ func testSessionsVoiceMonetaryRefund(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceMonetaryRefund", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "123451", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "123451", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, }, }, }, @@ -176,18 +176,18 @@ func testSessionsVoiceMonetaryRefund(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceMonetaryRefund", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "123451", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1004", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "123451", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1004", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, }, }, }, @@ -215,18 +215,18 @@ func testSessionsVoiceVoiceRefund(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceVoiceRefund", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "123452", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1003", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "123452", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1003", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, }, }, }, @@ -259,18 +259,18 @@ func testSessionsVoiceVoiceRefund(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceVoiceRefund", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "123452", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1003", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "123452", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1003", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, }, }, }, @@ -304,18 +304,18 @@ func testSessionsVoiceMixedRefund(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceMixedRefund", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "123453", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "123453", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, }, }, }, @@ -351,18 +351,18 @@ func testSessionsVoiceMixedRefund(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceMixedRefund", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "123453", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1002", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "123453", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1002", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, }, }, }, @@ -405,18 +405,18 @@ func testSessionsVoiceLastUsed(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsed", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "12350", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1006", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "12350", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1006", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, }, }, }, @@ -446,17 +446,17 @@ func testSessionsVoiceLastUsed(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsed", Event: map[string]interface{}{ - utils.EVENT_NAME: "Update1", - utils.ToR: utils.VOICE, - utils.OriginID: "12350", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1006", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.Usage: usage, - utils.LastUsed: lastUsage, + utils.EVENT_NAME: "Update1", + utils.ToR: utils.VOICE, + utils.OriginID: "12350", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1006", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.Usage: usage, + utils.LastUsed: lastUsage, }, }, }, @@ -485,19 +485,19 @@ func testSessionsVoiceLastUsed(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsed", Event: map[string]interface{}{ - utils.EVENT_NAME: "Update2", - utils.ToR: utils.VOICE, - utils.OriginID: "12350", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1006", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, - utils.LastUsed: lastUsage, + utils.EVENT_NAME: "Update2", + utils.ToR: utils.VOICE, + utils.OriginID: "12350", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1006", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, + utils.LastUsed: lastUsage, }, }, }, @@ -525,18 +525,18 @@ func testSessionsVoiceLastUsed(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsed", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "12350", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1006", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "12350", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1006", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, }, }, }, @@ -574,18 +574,18 @@ func testSessionsVoiceLastUsedEnd(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsedEnd", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "1234911", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1006", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "1234911", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1006", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, }, }, }, @@ -615,17 +615,17 @@ func testSessionsVoiceLastUsedEnd(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsedEnd", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "1234911", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1006", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.Usage: usage, - utils.LastUsed: lastUsage, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "1234911", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1006", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.Usage: usage, + utils.LastUsed: lastUsage, }, }, }, @@ -655,16 +655,16 @@ func testSessionsVoiceLastUsedEnd(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsedEnd", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "1234911", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1006", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.LastUsed: "0s", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "1234911", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1006", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.LastUsed: "0s", }, }, }, @@ -702,18 +702,18 @@ func testSessionsVoiceLastUsedNotFixed(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsedNotFixed", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "1234922", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1006", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "1234922", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1006", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, }, }, }, @@ -744,17 +744,17 @@ func testSessionsVoiceLastUsedNotFixed(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsedNotFixed", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "1234922", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1006", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.Usage: usage, - utils.LastUsed: lastUsage, + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "1234922", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1006", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.Usage: usage, + utils.LastUsed: lastUsage, }, }, }, @@ -783,16 +783,16 @@ func testSessionsVoiceLastUsedNotFixed(t *testing.T) { Tenant: "cgrates.org", ID: "TestSessionsVoiceLastUsedNotFixed", Event: map[string]interface{}{ - utils.EVENT_NAME: "TEST_EVENT", - utils.ToR: utils.VOICE, - utils.OriginID: "1234922", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1006", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.LastUsed: "0s", + utils.EVENT_NAME: "TEST_EVENT", + utils.ToR: utils.VOICE, + utils.OriginID: "1234922", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1006", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.LastUsed: "0s", }, }, }, @@ -831,18 +831,18 @@ 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.OriginID: "12360", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1008", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, + utils.EVENT_NAME: "TEST_EVENT_SESSION_TTL", + utils.ToR: utils.VOICE, + utils.OriginID: "12360", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1008", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, }, }, }, @@ -901,17 +901,17 @@ 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.OriginID: "12360", - utils.Account: "1001", - utils.Subject: "1001", - utils.Destination: "1008", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.Usage: usage, - utils.LastUsed: lastUsage, + utils.EVENT_NAME: "TEST_EVENT_SESSION_TTL", + utils.ToR: utils.VOICE, + utils.OriginID: "12360", + utils.AccountField: "1001", + utils.Subject: "1001", + utils.Destination: "1008", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.Usage: usage, + utils.LastUsed: lastUsage, }, }, }, @@ -1008,18 +1008,18 @@ 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.OriginID: "12361", - utils.Account: "TestTTLWithRelocate", - utils.Subject: "TestTTLWithRelocate", - utils.Destination: "1009", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, + utils.EVENT_NAME: "TEST_EVENT_SESSION_TTL_RELOCATE", + utils.ToR: utils.VOICE, + utils.OriginID: "12361", + utils.AccountField: "TestTTLWithRelocate", + utils.Subject: "TestTTLWithRelocate", + utils.Destination: "1009", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, }, }, }, @@ -1070,7 +1070,7 @@ func testSessionsVoiceSessionTTLWithRelocate(t *testing.T) { utils.ToR: utils.VOICE, utils.InitialOriginID: "12361", //take the initial originID from init utils.OriginID: "12362", - utils.Account: "TestTTLWithRelocate", + utils.AccountField: "TestTTLWithRelocate", utils.Subject: "TestTTLWithRelocate", utils.Destination: "1009", utils.Category: "call", @@ -1185,18 +1185,18 @@ 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.OriginID: "12371", - utils.Account: attrSetBalance.Account, - utils.Subject: attrSetBalance.Account, - utils.Destination: "12371", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: usage, + utils.EVENT_NAME: "TEST_EVENT_RELOCATE_ORIGPREFIX", + utils.ToR: utils.VOICE, + utils.OriginID: "12371", + utils.AccountField: attrSetBalance.Account, + utils.Subject: attrSetBalance.Account, + utils.Destination: "12371", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: usage, }, }, }, @@ -1247,7 +1247,7 @@ func testSessionsVoiceRelocateWithOriginIDPrefix(t *testing.T) { utils.ToR: utils.VOICE, utils.InitialOriginID: "12371", utils.OriginID: "12372-1", - utils.Account: attrSetBalance.Account, + utils.AccountField: attrSetBalance.Account, utils.Subject: attrSetBalance.Account, utils.Destination: "12371", utils.Category: "call", @@ -1300,18 +1300,18 @@ 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.OriginID: "12372-1", - utils.Account: attrSetBalance.Account, - utils.Subject: attrSetBalance.Account, - utils.Destination: "12371", - utils.Category: "call", - utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, - utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), - utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), - utils.Usage: time.Minute, + utils.EVENT_NAME: "TEST_EVENT_RELOCATE_ORIGPREFIX", + utils.ToR: utils.VOICE, + utils.OriginID: "12372-1", + utils.AccountField: attrSetBalance.Account, + utils.Subject: attrSetBalance.Account, + utils.Destination: "12371", + utils.Category: "call", + utils.Tenant: "cgrates.org", + utils.RequestType: utils.META_PREPAID, + utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), + utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), + utils.Usage: time.Minute, }, }, }, @@ -1378,7 +1378,7 @@ func TestSMGDataDerivedChargingNoCredit(t *testing.T) { utils.EVENT_NAME: "TEST_EVENT", utils.ToR: utils.VOICE, utils.OriginID: "1234967", - utils.Account: "1011", + utils.AccountField: "1011", utils.Subject: "1011", utils.Destination: "+49", utils.Category: "call", diff --git a/utils/accountprofile.go b/utils/accountprofile.go new file mode 100644 index 000000000..26e268ae0 --- /dev/null +++ b/utils/accountprofile.go @@ -0,0 +1,68 @@ +/* +Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments +Copyright (C) ITsysCOM GmbH + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see +*/ + +package utils + +import "sort" + +type AccountProfile struct { + Tenant string + ID string + FilterIDs []string + ActivationInterval *ActivationInterval + Weight float64 + + Balances []*Balance +} + +type Balance struct { + ID string + FilterIDs []string + Weight float64 + Blocker bool + Type string + Opts map[string]interface{} + Value float64 +} + +func (aP *AccountProfile) TenantID() string { + return ConcatenatedKey(aP.Tenant, aP.ID) +} + +// ActionProfiles is a sortable list of ActionProfiles +type AccountProfiles []*AccountProfile + +// Sort is part of sort interface, sort based on Weight +func (aps AccountProfiles) Sort() { + sort.Slice(aps, func(i, j int) bool { return aps[i].Weight > aps[j].Weight }) +} + +// AccountProfileWithOpts is used in API calls +type AccountProfileWithOpts struct { + *AccountProfile + Opts map[string]interface{} +} + +type Account struct { + Tenant string + ID string +} + +func (ac *Account) TenantID() string { + return ConcatenatedKey(ac.Tenant, ac.ID) +} diff --git a/utils/cgrevent_test.go b/utils/cgrevent_test.go index d459d792e..38c946ef2 100644 --- a/utils/cgrevent_test.go +++ b/utils/cgrevent_test.go @@ -231,7 +231,7 @@ func TestCGREventFieldAsFloat64(t *testing.T) { if _, err := se.FieldAsFloat64(AnswerTime); err == nil || !strings.HasPrefix(err.Error(), "cannot convert field") { t.Errorf("Unexpected error : %+v", err) } - if _, err := se.FieldAsFloat64(Account); err == nil || err.Error() != ErrNotFound.Error() { + if _, err := se.FieldAsFloat64(AccountField); err == nil || err.Error() != ErrNotFound.Error() { t.Errorf("Expected %s, received %s", ErrNotFound, err) } // } @@ -457,7 +457,7 @@ func TestCGREventFieldAsInt64(t *testing.T) { if _, err := se.FieldAsInt64(AnswerTime); err == nil || !strings.HasPrefix(err.Error(), "cannot convert field") { t.Errorf("Unexpected error : %+v", err) } - if _, err := se.FieldAsInt64(Account); err == nil || err.Error() != ErrNotFound.Error() { + if _, err := se.FieldAsInt64(AccountField); err == nil || err.Error() != ErrNotFound.Error() { t.Errorf("Expected %s, received %s", ErrNotFound, err) } // } diff --git a/utils/consts.go b/utils/consts.go index eb7d45310..0baa6d0f2 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, - Account, 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{META_POSTPAID, META_RATED} @@ -304,7 +304,7 @@ const ( Tenant = "Tenant" Category = "Category" Contexts = "Contexts" - Account = "Account" + AccountField = "Account" Balances = "Balances" Subject = "Subject" Destination = "Destination" @@ -391,6 +391,8 @@ const ( DispatcherProfilePrefix = "dpp_" RateProfilePrefix = "rtp_" ActionProfilePrefix = "acp_" + AccountProfilePrefix = "anp_" + Account2Prefix = "ant_" DispatcherHostPrefix = "dph_" ThresholdProfilePrefix = "thp_" StatQueuePrefix = "stq_" @@ -653,7 +655,7 @@ const ( Charges = "Charges" CompressFactor = "CompressFactor" Increments = "Increments" - Balance = "Balance" + BalanceField = "Balance" BalanceSummaries = "BalanceSummaries" Type = "Type" Element = "Element" @@ -1880,6 +1882,8 @@ const ( CacheDispatcherLoads = "*dispatcher_loads" CacheRateProfiles = "*rate_profiles" CacheActionProfiles = "*action_profiles" + CacheAccountProfiles = "*account_profiles" + CacheAccounts2 = "*accounts2" CacheResourceFilterIndexes = "*resource_filter_indexes" CacheStatFilterIndexes = "*stat_filter_indexes" CacheThresholdFilterIndexes = "*threshold_filter_indexes" @@ -1947,6 +1951,7 @@ const ( RateProfilesFilterIndexPrfx = "rpi_" RateFilterIndexPrfx = "rri_" ActionProfilesFilterIndexPrfx = "aci_" + AccountProfileFilterIndexPrfx = "ani_" FilterIndexPrfx = "fii_" ) diff --git a/utils/pathitem_test.go b/utils/pathitem_test.go index 676582418..12987343b 100644 --- a/utils/pathitem_test.go +++ b/utils/pathitem_test.go @@ -56,7 +56,7 @@ func TestStripIdxFromLastPathElm(t *testing.T) { func TestNewPathItems(t *testing.T) { pathSlice := strings.Split("*req.Field1[0].Account", NestingSep) - expected := PathItems{{Field: MetaReq}, {Field: "Field1", Index: StringPointer("0")}, {Field: Account}} + expected := PathItems{{Field: MetaReq}, {Field: "Field1", Index: StringPointer("0")}, {Field: AccountField}} if rply := NewPathItems(pathSlice); !reflect.DeepEqual(expected, rply) { t.Errorf("Expected: %s, received: %s", ToJSON(expected), ToJSON(rply)) } diff --git a/utils/struct_test.go b/utils/struct_test.go index e0b919624..3ac6a8131 100644 --- a/utils/struct_test.go +++ b/utils/struct_test.go @@ -82,7 +82,7 @@ func TestUpdateStructWithIfaceMap(t *testing.T) { func TestMissingMapFields(t *testing.T) { var attr = map[string]interface{}{ Tenant: "cgrates.org", - Account: "1001", + AccountField: "1001", "Type": META_PREPAID, "ActionTimingsID": "*asap", }