Skip to content
This repository was archived by the owner on Jun 6, 2023. It is now read-only.

Commit 1d0a814

Browse files
andronachedanbogos
andronache
authored and
danbogos
committed
Changed consts in utils
1 parent 36da1a6 commit 1d0a814

File tree

255 files changed

+3895
-3889
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

255 files changed

+3895
-3889
lines changed

‎actions/libactions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func newActionersFromActions(cfg *config.CGRConfig, fltrS *engine.FilterS, dm *e
9797
func newActioner(cfg *config.CGRConfig, fltrS *engine.FilterS, dm *engine.DataManager,
9898
aCfg *engine.APAction) (act actioner, err error) {
9999
switch aCfg.Type {
100-
case utils.LOG:
100+
case utils.MetaLog:
101101
return &actLog{aCfg}, nil
102102
default:
103103
return nil, fmt.Errorf("unsupported action type: <%s>", aCfg.Type)

‎agents/agentreq.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func NewAgentRequest(req utils.DataProvider,
6868
}
6969
if tntTpl != nil {
7070
if tntIf, err := ar.ParseField(
71-
&config.FCTemplate{Type: utils.META_COMPOSED,
71+
&config.FCTemplate{Type: utils.MetaComposed,
7272
Value: tntTpl}); err == nil && tntIf.(string) != "" {
7373
ar.Tenant = tntIf.(string)
7474
}
@@ -230,7 +230,7 @@ func (ar *AgentRequest) SetFields(tplFlds []*config.FCTemplate) (err error) {
230230

231231
nMItm := &config.NMItem{Data: out, Path: itmPath, Config: tplFld}
232232
switch tplFld.Type {
233-
case utils.META_COMPOSED:
233+
case utils.MetaComposed:
234234
err = utils.ComposeNavMapVal(ar, fullPath, nMItm)
235235
case utils.MetaGroup: // in case of *group type simply append to valSet
236236
err = utils.AppendNavMapVal(ar, fullPath, nMItm)
@@ -355,23 +355,23 @@ func (ar *AgentRequest) ParseField(
355355
return utils.EmptyString, fmt.Errorf("unsupported type: <%s>", cfgFld.Type)
356356
case utils.MetaNone:
357357
return
358-
case utils.META_FILLER:
358+
case utils.MetaFiller:
359359
out, err = cfgFld.Value.ParseValue(utils.EmptyString)
360360
cfgFld.Padding = utils.MetaRight
361361
isString = true
362-
case utils.META_CONSTANT:
362+
case utils.MetaConstant:
363363
out, err = cfgFld.Value.ParseValue(utils.EmptyString)
364364
isString = true
365365
case utils.MetaRemoteHost:
366366
out = ar.RemoteHost().String()
367367
isString = true
368-
case utils.MetaVariable, utils.META_COMPOSED, utils.MetaGroup:
368+
case utils.MetaVariable, utils.MetaComposed, utils.MetaGroup:
369369
out, err = cfgFld.Value.ParseDataProvider(ar)
370370
isString = true
371-
case utils.META_USAGE_DIFFERENCE:
371+
case utils.MetaUsageDifference:
372372
if len(cfgFld.Value) != 2 {
373373
return nil, fmt.Errorf("invalid arguments <%s> to %s",
374-
utils.ToJSON(cfgFld.Value), utils.META_USAGE_DIFFERENCE)
374+
utils.ToJSON(cfgFld.Value), utils.MetaUsageDifference)
375375
}
376376
var strVal1 string
377377
if strVal1, err = cfgFld.Value[0].ParseDataProvider(ar); err != nil {

‎agents/agentreq_test.go

Lines changed: 46 additions & 46 deletions
Large diffs are not rendered by default.

‎agents/asterisk_event.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,11 @@ func (smaEv *SMAsteriskEvent) UpdateCGREvent(cgrEv *utils.CGREventWithOpts) erro
205205
resCGREv := *cgrEv
206206
switch smaEv.EventType() {
207207
case ARIChannelStateChange:
208-
resCGREv.Event[utils.EVENT_NAME] = SMASessionStart
208+
resCGREv.Event[utils.EventName] = SMASessionStart
209209
resCGREv.Event[utils.AnswerTime] = smaEv.Timestamp()
210210
case ARIChannelDestroyed:
211-
resCGREv.Event[utils.EVENT_NAME] = SMASessionTerminate
212-
resCGREv.Event[utils.DISCONNECT_CAUSE] = smaEv.DisconnectCause()
211+
resCGREv.Event[utils.EventName] = SMASessionTerminate
212+
resCGREv.Event[utils.DisconnectCause] = smaEv.DisconnectCause()
213213
if _, hasIt := resCGREv.Event[utils.AnswerTime]; !hasIt {
214214
resCGREv.Event[utils.Usage] = "0s"
215215
} else if aTime, err := utils.IfaceAsTime(resCGREv.Event[utils.AnswerTime],
@@ -236,11 +236,11 @@ func (smaEv *SMAsteriskEvent) AsMapStringInterface() (mp map[string]interface{})
236236
mp = make(map[string]interface{})
237237
switch smaEv.EventType() {
238238
case ARIStasisStart:
239-
mp[utils.EVENT_NAME] = SMAAuthorization
239+
mp[utils.EventName] = SMAAuthorization
240240
case ARIChannelStateChange:
241-
mp[utils.EVENT_NAME] = SMASessionStart
241+
mp[utils.EventName] = SMASessionStart
242242
case ARIChannelDestroyed:
243-
mp[utils.EVENT_NAME] = SMASessionTerminate
243+
mp[utils.EventName] = SMASessionTerminate
244244
}
245245
mp[utils.OriginID] = smaEv.ChannelID()
246246
if smaEv.RequestType() != "" {
@@ -260,7 +260,7 @@ func (smaEv *SMAsteriskEvent) AsMapStringInterface() (mp map[string]interface{})
260260
mp[utils.Destination] = smaEv.Destination()
261261
mp[utils.SetupTime] = smaEv.SetupTime()
262262
if smaEv.Route() != "" {
263-
mp[utils.ROUTE] = smaEv.Route()
263+
mp[utils.Route] = smaEv.Route()
264264
}
265265
for extraKey, extraVal := range smaEv.ExtraParameters() { // Append extraParameters
266266
mp[extraKey] = extraVal

‎agents/diam_it_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ func testDiamItCCRSMS(t *testing.T) {
977977
diamClnt.ReceivedMessage(rplyTimeout)
978978

979979
var cdrs []*engine.CDR
980-
args := &utils.RPCCDRsFilterWithOpts{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, ToRs: []string{utils.SMS}}}
980+
args := &utils.RPCCDRsFilterWithOpts{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, ToRs: []string{utils.MetaSMS}}}
981981
if err := apierRpc.Call(utils.CDRsV1GetCDRs, args, &cdrs); err != nil {
982982
t.Error("Unexpected error: ", err.Error())
983983
} else if len(cdrs) != 1 {
@@ -1056,7 +1056,7 @@ func testDiamItCCRMMS(t *testing.T) {
10561056
diamClnt.ReceivedMessage(rplyTimeout)
10571057

10581058
var cdrs []*engine.CDR
1059-
args := &utils.RPCCDRsFilterWithOpts{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, ToRs: []string{utils.MMS}}}
1059+
args := &utils.RPCCDRsFilterWithOpts{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, ToRs: []string{utils.MetaMMS}}}
10601060
if err := apierRpc.Call(utils.CDRsV1GetCDRs, args, &cdrs); err != nil {
10611061
t.Error("Unexpected error: ", err.Error())
10621062
} else if len(cdrs) != 1 {
@@ -1069,7 +1069,7 @@ func testDiamItCCRMMS(t *testing.T) {
10691069
func testDiamInitWithSessionDisconnect(t *testing.T) {
10701070
attrSetBalance := utils.AttrSetBalance{Tenant: "cgrates.org",
10711071
Account: "testDiamInitWithSessionDisconnect",
1072-
BalanceType: utils.VOICE,
1072+
BalanceType: utils.MetaVoice,
10731073
Value: float64(time.Second),
10741074
Balance: map[string]interface{}{
10751075
utils.ID: "testDiamInitWithSessionDisconnect",
@@ -1470,7 +1470,7 @@ func testDiamItEmulateTerminate(t *testing.T) {
14701470
Tenant: "cgrates.com",
14711471
Account: "testDiamItEmulateTerminate",
14721472
Value: float64(1) * float64(time.Hour),
1473-
BalanceType: utils.VOICE,
1473+
BalanceType: utils.MetaVoice,
14741474
Balance: map[string]interface{}{
14751475
utils.ID: "testDiamItEmulateTerminate",
14761476
utils.Categories: "custom_charger",
@@ -1486,8 +1486,8 @@ func testDiamItEmulateTerminate(t *testing.T) {
14861486
attrs := &utils.AttrGetAccount{Tenant: "cgrates.com", Account: "testDiamItEmulateTerminate"}
14871487
if err := apierRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil {
14881488
t.Error(err)
1489-
} else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != float64(time.Hour) {
1490-
t.Errorf("Expected: %f, received: %f", float64(time.Hour), acnt.BalanceMap[utils.VOICE].GetTotalValue())
1489+
} else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != float64(time.Hour) {
1490+
t.Errorf("Expected: %f, received: %f", float64(time.Hour), acnt.BalanceMap[utils.MetaVoice].GetTotalValue())
14911491
}
14921492

14931493
m := diam.NewRequest(diam.CreditControl, 4, nil)
@@ -1578,7 +1578,7 @@ func testDiamItEmulateTerminate(t *testing.T) {
15781578

15791579
if err := apierRpc.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil {
15801580
t.Error(err)
1581-
} else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != float64(time.Hour) {
1582-
t.Errorf("Expected: %f, received: %f", float64(time.Hour), acnt.BalanceMap[utils.VOICE].GetTotalValue())
1581+
} else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != float64(time.Hour) {
1582+
t.Errorf("Expected: %f, received: %f", float64(time.Hour), acnt.BalanceMap[utils.MetaVoice].GetTotalValue())
15831583
}
15841584
}

‎agents/diamagent.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func (da *DiameterAgent) handlers() diam.Handler {
144144
continue
145145
}
146146
for _, iAddr := range addrs {
147-
hosts = append(hosts, net.ParseIP(strings.Split(iAddr.String(), utils.HDR_VAL_SEP)[0])) // address came in form x.y.z.t/24
147+
hosts = append(hosts, net.ParseIP(strings.Split(iAddr.String(), utils.HDRValSep)[0])) // address came in form x.y.z.t/24
148148
}
149149
}
150150
}
@@ -657,7 +657,7 @@ func (da *DiameterAgent) handleRAA(c diam.Conn, m *diam.Message) {
657657
func (da *DiameterAgent) handleConns(peers <-chan diam.Conn) {
658658
for c := range peers {
659659
meta, _ := smpeer.FromContext(c.Context())
660-
key := string(meta.OriginHost + utils.CONCATENATED_KEY_SEP + meta.OriginRealm)
660+
key := string(meta.OriginHost + utils.ConcatenatedKeySep + meta.OriginRealm)
661661
da.peersLck.Lock()
662662
da.peers[key] = c // store in peers table
663663
da.peersLck.Unlock()
@@ -674,7 +674,7 @@ func (da *DiameterAgent) handleConns(peers <-chan diam.Conn) {
674674
// handleDPA is used to handle all DisconnectPeer Answers that are received
675675
func (da *DiameterAgent) handleDPA(c diam.Conn, m *diam.Message) {
676676
meta, _ := smpeer.FromContext(c.Context())
677-
key := string(meta.OriginHost + utils.CONCATENATED_KEY_SEP + meta.OriginRealm)
677+
key := string(meta.OriginHost + utils.ConcatenatedKeySep + meta.OriginRealm)
678678

679679
da.dpaLck.Lock()
680680
ch, has := da.dpa[key]
@@ -704,7 +704,7 @@ func (da *DiameterAgent) V1DisconnectPeer(args *utils.DPRArgs, reply *string) (e
704704
m.NewAVP(avp.OriginRealm, avp.Mbit, 0, datatype.DiameterIdentity(args.OriginRealm))
705705
m.NewAVP(avp.DisconnectCause, avp.Mbit, 0, datatype.Enumerated(args.DisconnectCause))
706706

707-
key := args.OriginHost + utils.CONCATENATED_KEY_SEP + args.OriginRealm
707+
key := args.OriginHost + utils.ConcatenatedKeySep + args.OriginRealm
708708

709709
dpaCh := make(chan *diam.Message, 1)
710710
da.dpaLck.Lock()

‎agents/diamagent_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,29 +73,29 @@ func TestProcessRequest(t *testing.T) {
7373
Filters: []string{},
7474
RequestFields: []*config.FCTemplate{
7575
{Tag: utils.ToR,
76-
Type: utils.META_CONSTANT, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR,
77-
Value: config.NewRSRParsersMustCompile(utils.VOICE, utils.InfieldSep)},
76+
Type: utils.MetaConstant, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR,
77+
Value: config.NewRSRParsersMustCompile(utils.MetaVoice, utils.InfieldSep)},
7878
{Tag: utils.OriginID,
79-
Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID,
79+
Type: utils.MetaComposed, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID,
8080
Value: config.NewRSRParsersMustCompile("~*req.SessionId", utils.InfieldSep), Mandatory: true},
8181
{Tag: utils.OriginHost,
8282
Type: utils.MetaRemoteHost, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginHost, Mandatory: true},
8383
{Tag: utils.Category,
84-
Type: utils.META_CONSTANT, Path: utils.MetaCgreq + utils.NestingSep + utils.Category,
85-
Value: config.NewRSRParsersMustCompile(utils.CALL, utils.InfieldSep)},
84+
Type: utils.MetaConstant, Path: utils.MetaCgreq + utils.NestingSep + utils.Category,
85+
Value: config.NewRSRParsersMustCompile(utils.Call, utils.InfieldSep)},
8686
{Tag: utils.AccountField,
87-
Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField,
87+
Type: utils.MetaComposed, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField,
8888
Value: config.NewRSRParsersMustCompile("~*req.Account", utils.InfieldSep), Mandatory: true},
8989
{Tag: utils.Destination,
90-
Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination,
90+
Type: utils.MetaComposed, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination,
9191
Value: config.NewRSRParsersMustCompile("~*req.Destination", utils.InfieldSep), Mandatory: true},
9292
{Tag: utils.Usage,
93-
Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage,
93+
Type: utils.MetaComposed, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage,
9494
Value: config.NewRSRParsersMustCompile("~*req.Usage", utils.InfieldSep), Mandatory: true},
9595
},
9696
ReplyFields: []*config.FCTemplate{
9797
{Tag: "ResultCode",
98-
Type: utils.META_CONSTANT, Path: utils.MetaRep + utils.NestingSep + "ResultCode",
98+
Type: utils.MetaConstant, Path: utils.MetaRep + utils.NestingSep + "ResultCode",
9999
Value: config.NewRSRParsersMustCompile("2001", utils.InfieldSep)},
100100
{Tag: "GrantedUnits",
101101
Type: utils.MetaVariable, Path: utils.MetaRep + utils.NestingSep + "Granted-Service-Unit.CC-Time",
@@ -515,7 +515,7 @@ func TestProcessRequest(t *testing.T) {
515515

516516
reqProcessor.Flags = utils.FlagsWithParamsFromSlice([]string{utils.MetaTerminate, utils.MetaAccounts, utils.MetaAttributes, utils.MetaCDRs})
517517
reqProcessor.ReplyFields = []*config.FCTemplate{{Tag: "ResultCode",
518-
Type: utils.META_CONSTANT, Path: utils.MetaRep + utils.NestingSep + "ResultCode",
518+
Type: utils.MetaConstant, Path: utils.MetaRep + utils.NestingSep + "ResultCode",
519519
Value: config.NewRSRParsersMustCompile("2001", utils.InfieldSep)}}
520520
for _, v := range reqProcessor.ReplyFields {
521521
v.ComputePath()

‎agents/diamclient.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func NewDiameterClient(addr, originHost, originRealm string, vendorId int, produ
5656
}
5757
for _, iAddr := range addrs {
5858
cfg.HostIPAddresses = append(cfg.HostIPAddresses, datatype.Address(
59-
net.ParseIP(strings.Split(iAddr.String(), utils.HDR_VAL_SEP)[0]))) // address came in form x.y.z.t/24
59+
net.ParseIP(strings.Split(iAddr.String(), utils.HDRValSep)[0]))) // address came in form x.y.z.t/24
6060
}
6161
}
6262
dSM := sm.New(cfg)

‎agents/fsevent.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const (
7272
VAR_CGR_CMPUTELCR = varPrefix + utils.CGR_COMPUTELCR
7373
FsConnID = "FsConnID" // used to share connID info in event for remote disconnects
7474
VarAnswerEpoch = "variable_answer_epoch"
75-
VarCGRACD = varPrefix + utils.CGR_ACD
75+
VarCGRACD = varPrefix + utils.CgrAcd
7676
VarCGROriginHost = varPrefix + utils.CGROriginHost
7777
)
7878

@@ -302,7 +302,7 @@ func (fsev FSEvent) GetExtraFields() map[string]string {
302302
func (fsev FSEvent) ParseEventValue(rsrFld *config.RSRParser, timezone string) (parsed string, err error) {
303303
switch rsrFld.AttrName() {
304304
case utils.ToR:
305-
return rsrFld.ParseValue(utils.VOICE)
305+
return rsrFld.ParseValue(utils.MetaVoice)
306306
case utils.OriginID:
307307
return rsrFld.ParseValue(fsev.GetUUID())
308308
case utils.OriginHost:
@@ -333,9 +333,9 @@ func (fsev FSEvent) ParseEventValue(rsrFld *config.RSRParser, timezone string) (
333333
case utils.PDD:
334334
PDD, _ := fsev.GetPdd(utils.MetaDefault)
335335
return rsrFld.ParseValue(strconv.FormatFloat(PDD.Seconds(), 'f', -1, 64))
336-
case utils.ROUTE:
336+
case utils.Route:
337337
return rsrFld.ParseValue(fsev.GetRoute(""))
338-
case utils.DISCONNECT_CAUSE:
338+
case utils.DisconnectCause:
339339
return rsrFld.ParseValue(fsev.GetDisconnectCause(""))
340340
case utils.RunID:
341341
return rsrFld.ParseValue(utils.MetaDefault)
@@ -370,7 +370,7 @@ func (fsev FSEvent) AsMapStringInterface(timezone string) map[string]interface{}
370370
for fld, val := range fsev.GetExtraFields() {
371371
mp[fld] = val
372372
}
373-
mp[utils.ToR] = utils.VOICE
373+
mp[utils.ToR] = utils.MetaVoice
374374
mp[utils.OriginID] = fsev.GetUUID()
375375
mp[utils.OriginHost] = fsev.GetOriginHost()
376376
mp[utils.Source] = "FS_" + fsev.GetName()
@@ -385,9 +385,9 @@ func (fsev FSEvent) AsMapStringInterface(timezone string) map[string]interface{}
385385
mp[utils.Usage], _ = fsev.GetDuration(utils.MetaDefault)
386386
mp[utils.PDD], _ = fsev.GetPdd(utils.MetaDefault)
387387
mp[utils.ACD], _ = fsev.GetADC(utils.MetaDefault)
388-
mp[utils.COST] = -1.0
389-
mp[utils.ROUTE] = fsev.GetRoute(utils.MetaDefault)
390-
mp[utils.DISCONNECT_CAUSE] = fsev.GetDisconnectCause(utils.MetaDefault)
388+
mp[utils.Cost] = -1.0
389+
mp[utils.Route] = fsev.GetRoute(utils.MetaDefault)
390+
mp[utils.DisconnectCause] = fsev.GetDisconnectCause(utils.MetaDefault)
391391
return mp
392392
}
393393

@@ -474,7 +474,7 @@ func (fsev FSEvent) GetOptions() (mp map[string]interface{}) {
474474
if !has {
475475
return
476476
}
477-
for _, opt := range strings.Split(opts, utils.FIELDS_SEP) {
477+
for _, opt := range strings.Split(opts, utils.FieldsSep) {
478478
spltOpt := strings.SplitN(opt, utils.InInFieldSep, 2)
479479
if len(spltOpt) != 2 {
480480
continue

‎agents/fsevent_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ func TestParseEventValue(t *testing.T) {
492492
cfg := config.NewDefaultCGRConfig()
493493
config.SetCgrConfig(cfg)
494494
ev := NewFSEvent(hangupEv)
495-
if tor, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.ToR), ""); tor != utils.VOICE {
495+
if tor, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.ToR), ""); tor != utils.MetaVoice {
496496
t.Errorf("Unexpected tor parsed %q", tor)
497497
}
498498
if accid, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.OriginID), ""); accid != "e3133bf7-dcde-4daf-9663-9a79ffcef5ad" {
@@ -536,13 +536,13 @@ func TestParseEventValue(t *testing.T) {
536536
if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.PDD), ""); parsed != "0.028" {
537537
t.Error("Unexpected result parsed", parsed)
538538
}
539-
if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.ROUTE), ""); parsed != "supplier1" {
539+
if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.Route), ""); parsed != "supplier1" {
540540
t.Error("Unexpected result parsed", parsed)
541541
}
542542
if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.RunID), ""); parsed != utils.MetaDefault {
543543
t.Error("Unexpected result parsed", parsed)
544544
}
545-
if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.COST), ""); parsed != "-1" {
545+
if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.Cost), ""); parsed != "-1" {
546546
t.Error("Unexpected result parsed", parsed)
547547
}
548548
if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+"Hangup-Cause"), ""); parsed != "NORMAL_CLEARING" {
@@ -581,7 +581,7 @@ func TestFsEvAsMapStringInterface(t *testing.T) {
581581
setupTime, _ := utils.ParseTimeDetectLayout("1436280728", "")
582582
aTime, _ := utils.ParseTimeDetectLayout("1436280728", "")
583583
expectedMap := make(map[string]interface{})
584-
expectedMap[utils.ToR] = utils.VOICE
584+
expectedMap[utils.ToR] = utils.MetaVoice
585585
expectedMap[utils.OriginID] = "e3133bf7-dcde-4daf-9663-9a79ffcef5ad"
586586
expectedMap[utils.OriginHost] = "10.0.3.15"
587587
expectedMap[utils.Source] = "FS_CHANNEL_HANGUP_COMPLETE"
@@ -597,8 +597,8 @@ func TestFsEvAsMapStringInterface(t *testing.T) {
597597
expectedMap[utils.Cost] = -1.0
598598
expectedMap[utils.PDD] = 28 * time.Millisecond
599599
expectedMap[utils.ACD] = 30 * time.Second
600-
expectedMap[utils.DISCONNECT_CAUSE] = "NORMAL_CLEARING"
601-
expectedMap[utils.ROUTE] = "supplier1"
600+
expectedMap[utils.DisconnectCause] = "NORMAL_CLEARING"
601+
expectedMap[utils.Route] = "supplier1"
602602
if storedMap := ev.AsMapStringInterface(""); !reflect.DeepEqual(expectedMap, storedMap) {
603603
t.Errorf("Expecting: %s, received: %s", utils.ToJSON(expectedMap), utils.ToJSON(storedMap))
604604
}

0 commit comments

Comments
 (0)