uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-23 08:08:45 +05:00
Code Issues Packages Projects Releases Wiki Activity

Renaming utils.DIRECTION -> utils.Direction

Browse Source
This commit is contained in:
TeoV
2018-01-08 16:22:24 +02:00
committed by Dan Christian Bogos
parent 6269ec20fc
commit 40f027495e
16 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
agents/librad_test.go
View File

@@ -217,7 +217,7 @@ func TestRadReqAsSMGEvent(t *testing.T) {
Value: utils.ParseRSRFieldsMustCompile("NAS-IP-Address", utils.INFIELD_SEP)},
&config.CfgCdrField{Tag: "RequestType", FieldId: utils.RequestType, Type: utils.META_CONSTANT,
Value: utils.ParseRSRFieldsMustCompile(utils.META_PREPAID, utils.INFIELD_SEP)},
&config.CfgCdrField{Tag: "Direction", FieldId: utils.DIRECTION, Type: utils.META_CONSTANT,
&config.CfgCdrField{Tag: "Direction", FieldId: utils.Direction, Type: utils.META_CONSTANT,
Value: utils.ParseRSRFieldsMustCompile(utils.OUT, utils.INFIELD_SEP)},
&config.CfgCdrField{Tag: "Tenant", FieldId: utils.Tenant, Type: utils.META_CONSTANT,
Value: utils.ParseRSRFieldsMustCompile("cgrates.org", utils.INFIELD_SEP)},
@@ -240,7 +240,7 @@ func TestRadReqAsSMGEvent(t *testing.T) {
utils.TOR: utils.VOICE,
utils.ACCID: "e4921177ab0e3586c37f6a185864b71a@0:0:0:0:0:0:0:0-75c2f57b-51585361",
utils.RequestType: utils.META_PREPAID,
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.Account: "1001",

2
apier/v1/thresholds_it_test.go
View File

@@ -134,7 +134,7 @@ var tEvs = []*utils.CGREvent{
utils.ACCID: "dsafdsaf",
utils.TOR: utils.VOICE,
utils.RequestType: utils.META_RATED,
utils.DIRECTION: "*out",
utils.Direction: "*out",
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.Account: "1007",

2
engine/cgrcdr_test.go
View File

@@ -61,7 +61,7 @@ func TestCgrCdrAsCDR(t *testing.T) {
func TestReplicatedCgrCdrAsCDR(t *testing.T) {
cgrCdr := CgrCdr{utils.CGRID: "164b0422fdc6a5117031b427439482c6a4f90e41", utils.TOR: utils.VOICE, utils.ACCID: "dsafdsaf", utils.OriginHost: "192.168.1.1",
utils.Source: "internal_test", utils.RequestType: utils.META_RATED,
utils.DIRECTION: utils.OUT, utils.Tenant: "cgrates.org", utils.Category: "call",
utils.Direction: utils.OUT, utils.Tenant: "cgrates.org", utils.Category: "call",
utils.Account: "1001", utils.Subject: "1001", utils.Destination: "1002", utils.SetupTime: "2013-11-07T08:42:20Z", utils.PDD: "0.200", utils.AnswerTime: "2013-11-07T08:42:26Z",
utils.Usage: "10s", utils.SUPPLIER: "SUPPL1", utils.DISCONNECT_CAUSE: "NORMAL_CLEARING", utils.COST: "0.12", utils.RATED: "true", "field_extr1": "val_extr1", "fieldextr2": "valextr2"}
expctRtCdr := &CDR{CGRID: cgrCdr[utils.CGRID],

2
engine/storage_mongo_datadb.go
View File

@@ -80,7 +80,7 @@ var (
CDRHostLow = strings.ToLower(utils.OriginHost)
CDRSourceLow = strings.ToLower(utils.Source)
RequestTypeLow = strings.ToLower(utils.RequestType)
DirectionLow = strings.ToLower(utils.DIRECTION)
DirectionLow = strings.ToLower(utils.Direction)
TenantLow = strings.ToLower(utils.Tenant)
CategoryLow = strings.ToLower(utils.Category)
AccountLow = strings.ToLower(utils.Account)

6
general_tests/a1_it_test.go
View File

@@ -131,7 +131,7 @@ func TestA1itDataSession1(t *testing.T) {
utils.EVENT_NAME: "INITIATE_SESSION",
utils.TOR: utils.DATA,
utils.ACCID: "504966119",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "rpdata1",
utils.Subject: "rpdata1",
utils.Destination: "data",
@@ -156,7 +156,7 @@ func TestA1itDataSession1(t *testing.T) {
utils.Account: "rpdata1",
utils.Category: "data1",
utils.Destination: "data",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.InitialOriginID: "504966119",
utils.LastUsed: "0s",
utils.ACCID: "504966119-1",
@@ -182,7 +182,7 @@ func TestA1itDataSession1(t *testing.T) {
utils.Account: "rpdata1",
utils.Category: "data1",
utils.Destination: "data",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.LastUsed: "2202800",
utils.ACCID: "504966119-1",
utils.OriginIDPrefix: "504966119-1",

32
sessionmanager/data_it_test.go
View File

@@ -115,7 +115,7 @@ func TestSMGDataLastUsedData(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.DATA,
utils.ACCID: "123491",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: utils.DATA,
@@ -144,7 +144,7 @@ func TestSMGDataLastUsedData(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.DATA,
utils.ACCID: "123491",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: utils.DATA,
@@ -172,7 +172,7 @@ func TestSMGDataLastUsedData(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.DATA,
utils.ACCID: "123491",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: utils.DATA,
@@ -222,7 +222,7 @@ func TestSMGDataLastUsedMultipleUpdates(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.DATA,
utils.ACCID: "123492",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: acntAttrs.Account,
utils.Subject: acntAttrs.Account,
utils.Destination: utils.DATA,
@@ -257,7 +257,7 @@ func TestSMGDataLastUsedMultipleUpdates(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.DATA,
utils.ACCID: "123492",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: acntAttrs.Account,
utils.Subject: acntAttrs.Account,
utils.Destination: utils.DATA,
@@ -291,7 +291,7 @@ func TestSMGDataLastUsedMultipleUpdates(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.DATA,
utils.ACCID: "123492",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: acntAttrs.Account,
utils.Subject: acntAttrs.Account,
utils.Destination: utils.DATA,
@@ -325,7 +325,7 @@ func TestSMGDataLastUsedMultipleUpdates(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.DATA,
utils.ACCID: "123492",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: acntAttrs.Account,
utils.Subject: acntAttrs.Account,
utils.Destination: utils.DATA,
@@ -358,7 +358,7 @@ func TestSMGDataLastUsedMultipleUpdates(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.DATA,
utils.ACCID: "123492",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: acntAttrs.Account,
utils.Subject: acntAttrs.Account,
utils.Destination: utils.DATA,
@@ -428,7 +428,7 @@ func TestSMGDataTTLExpired(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.DATA,
utils.ACCID: "TestSMGDataTTLExpired",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: acntAttrs.Account,
utils.Subject: acntAttrs.Account,
utils.Destination: utils.DATA,
@@ -487,7 +487,7 @@ func TestSMGDataTTLExpMultiUpdates(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.DATA,
utils.ACCID: "123495",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: acntAttrs.Account,
utils.Subject: acntAttrs.Account,
utils.Destination: utils.DATA,
@@ -522,7 +522,7 @@ func TestSMGDataTTLExpMultiUpdates(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.DATA,
utils.ACCID: "123495",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: acntAttrs.Account,
utils.Subject: acntAttrs.Account,
utils.Destination: utils.DATA,
@@ -585,7 +585,7 @@ func TestSMGDataMultipleDataNoUsage(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.DATA,
utils.ACCID: "123495",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: acntAttrs.Account,
utils.Subject: acntAttrs.Account,
utils.Destination: utils.DATA,
@@ -620,7 +620,7 @@ func TestSMGDataMultipleDataNoUsage(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.DATA,
utils.ACCID: "123495",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: acntAttrs.Account,
utils.Subject: acntAttrs.Account,
utils.Destination: utils.DATA,
@@ -657,7 +657,7 @@ func TestSMGDataMultipleDataNoUsage(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.DATA,
utils.ACCID: "123495",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: acntAttrs.Account,
utils.Subject: acntAttrs.Account,
utils.Destination: utils.DATA,
@@ -693,7 +693,7 @@ func TestSMGDataMultipleDataNoUsage(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.DATA,
utils.ACCID: "123495",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: acntAttrs.Account,
utils.Subject: acntAttrs.Account,
utils.Destination: utils.DATA,
@@ -747,7 +747,7 @@ func TestSMGDataTTLUsageProtection(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.DATA,
utils.ACCID: "123495",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: acntAttrs.Account,
utils.Subject: acntAttrs.Account,
utils.Destination: utils.DATA,

4
sessionmanager/fsevent.go
View File

@@ -275,7 +275,7 @@ func (fsev FSEvent) ParseEventValue(rsrFld *utils.RSRField, timezone string) str
return rsrFld.ParseValue("FS_EVENT")
case utils.RequestType:
return rsrFld.ParseValue(fsev.GetReqType(""))
case utils.DIRECTION:
case utils.Direction:
return rsrFld.ParseValue(fsev.GetDirection(""))
case utils.Tenant:
return rsrFld.ParseValue(fsev.GetTenant(""))
@@ -377,7 +377,7 @@ func (fsev FSEvent) AsMapStringInterface(timezone string) map[string]interface{}
mp[utils.OriginHost] = fsev.GetOriginatorIP(utils.META_DEFAULT)
mp[utils.Source] = "FS_" + fsev.GetName()
mp[utils.RequestType] = fsev.GetReqType(utils.META_DEFAULT)
mp[utils.DIRECTION] = fsev.GetDirection(utils.META_DEFAULT)
mp[utils.Direction] = fsev.GetDirection(utils.META_DEFAULT)
mp[utils.Tenant] = fsev.GetTenant(utils.META_DEFAULT)
mp[utils.Category] = fsev.GetCategory(utils.META_DEFAULT)
mp[utils.Account] = fsev.GetAccount(utils.META_DEFAULT)

2
sessionmanager/fsevent_test.go
View File

@@ -513,7 +513,7 @@ func TestParseEventValue(t *testing.T) {
if parsed := ev.ParseEventValue(&utils.RSRField{Id: utils.RequestType}, ""); parsed != utils.META_PREPAID {
t.Error("Unexpected result parsed", parsed)
}
if parsed := ev.ParseEventValue(&utils.RSRField{Id: utils.DIRECTION}, ""); parsed != utils.OUT {
if parsed := ev.ParseEventValue(&utils.RSRField{Id: utils.Direction}, ""); parsed != utils.OUT {
t.Error("Unexpected result parsed", parsed)
}
if parsed := ev.ParseEventValue(&utils.RSRField{Id: utils.Tenant}, ""); parsed != "cgrates.org" {

2
sessionmanager/kamevent.go
View File

@@ -284,7 +284,7 @@ func (kev KamEvent) ParseEventValue(rsrFld *utils.RSRField, timezone string) str
return rsrFld.ParseValue(kev.GetCdrSource())
case utils.RequestType:
return rsrFld.ParseValue(kev.GetReqType(utils.META_DEFAULT))
case utils.DIRECTION:
case utils.Direction:
return rsrFld.ParseValue(kev.GetDirection(utils.META_DEFAULT))
case utils.Tenant:
return rsrFld.ParseValue(kev.GetTenant(utils.META_DEFAULT))

4
sessionmanager/smg_event.go
View File

@@ -75,7 +75,7 @@ func (self SMGenericEvent) GetSessionIds() []string {
func (self SMGenericEvent) GetDirection(fieldName string) string {
if fieldName == utils.META_DEFAULT {
fieldName = utils.DIRECTION
fieldName = utils.Direction
}
result, _ := utils.CastFieldIfToString(self[fieldName])
return result
@@ -375,7 +375,7 @@ func (self SMGenericEvent) ParseEventValue(rsrFld *utils.RSRField, timezone stri
return rsrFld.ParseValue(self.GetName())
case utils.RequestType:
return rsrFld.ParseValue(self.GetReqType(utils.META_DEFAULT))
case utils.DIRECTION:
case utils.Direction:
return rsrFld.ParseValue(self.GetDirection(utils.META_DEFAULT))
case utils.Tenant:
return rsrFld.ParseValue(self.GetTenant(utils.META_DEFAULT))

8
sessionmanager/smg_event_test.go
View File

@@ -35,7 +35,7 @@ func TestSMGenericEventParseFields(t *testing.T) {
smGev[utils.EVENT_NAME] = "TEST_EVENT"
smGev[utils.TOR] = "*voice"
smGev[utils.ACCID] = "12345"
smGev[utils.DIRECTION] = "*out"
smGev[utils.Direction] = "*out"
smGev[utils.Account] = "account1"
smGev[utils.Subject] = "subject1"
smGev[utils.Destination] = "+4986517174963"
@@ -155,7 +155,7 @@ func TestSMGenericEventAsCDR(t *testing.T) {
smGev[utils.EVENT_NAME] = "TEST_EVENT"
smGev[utils.TOR] = utils.SMS
smGev[utils.ACCID] = "12345"
smGev[utils.DIRECTION] = utils.OUT
smGev[utils.Direction] = utils.OUT
smGev[utils.Account] = "account1"
smGev[utils.Subject] = "subject1"
smGev[utils.Destination] = "+4986517174963"
@@ -189,7 +189,7 @@ func TestSMGenericEventAsLcrRequest(t *testing.T) {
smGev[utils.EVENT_NAME] = "TEST_EVENT"
smGev[utils.TOR] = utils.VOICE
smGev[utils.ACCID] = "12345"
smGev[utils.DIRECTION] = utils.OUT
smGev[utils.Direction] = utils.OUT
smGev[utils.Account] = "account1"
smGev[utils.Subject] = "subject1"
smGev[utils.Destination] = "+4986517174963"
@@ -217,7 +217,7 @@ func TestSMGenericEventGetFieldAsString(t *testing.T) {
smGev[utils.EVENT_NAME] = "TEST_EVENT"
smGev[utils.TOR] = utils.VOICE
smGev[utils.ACCID] = "12345"
smGev[utils.DIRECTION] = utils.OUT
smGev[utils.Direction] = utils.OUT
smGev[utils.Account] = "account1"
smGev[utils.Subject] = "subject1"
eFldVal := utils.VOICE

48
sessionmanager/smg_it_test.go
View File

@@ -96,7 +96,7 @@ func TestSMGVoiceMonetaryRefund(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "123451",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1004",
@@ -127,7 +127,7 @@ func TestSMGVoiceMonetaryRefund(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "123451",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1004",
@@ -155,7 +155,7 @@ func TestSMGVoiceVoiceRefund(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "123452",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1003",
@@ -187,7 +187,7 @@ func TestSMGVoiceVoiceRefund(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "123452",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1003",
@@ -222,7 +222,7 @@ func TestSMGVoiceMixedRefund(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "123453",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1002",
@@ -254,7 +254,7 @@ func TestSMGVoiceMixedRefund(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "123453",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1002",
@@ -294,7 +294,7 @@ func TestSMGVoiceLastUsed(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "12350",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1006",
@@ -322,7 +322,7 @@ func TestSMGVoiceLastUsed(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "12350",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1006",
@@ -348,7 +348,7 @@ func TestSMGVoiceLastUsed(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "12350",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1006",
@@ -374,7 +374,7 @@ func TestSMGVoiceLastUsed(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "12350",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1006",
@@ -408,7 +408,7 @@ func TestSMGVoiceLastUsedEnd(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "1234911",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1006",
@@ -436,7 +436,7 @@ func TestSMGVoiceLastUsedEnd(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "1234911",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1006",
@@ -462,7 +462,7 @@ func TestSMGVoiceLastUsedEnd(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "1234911",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1006",
@@ -496,7 +496,7 @@ func TestSMGVoiceLastUsedNotFixed(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "1234922",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1006",
@@ -524,7 +524,7 @@ func TestSMGVoiceLastUsedNotFixed(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "1234922",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1006",
@@ -550,7 +550,7 @@ func TestSMGVoiceLastUsedNotFixed(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "1234922",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1006",
@@ -584,7 +584,7 @@ func TestSMGVoiceSessionTTL(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT_SESSION_TTL",
utils.TOR: utils.VOICE,
utils.ACCID: "12360",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1008",
@@ -622,7 +622,7 @@ func TestSMGVoiceSessionTTL(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT_SESSION_TTL",
utils.TOR: utils.VOICE,
utils.ACCID: "12360",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1008",
@@ -696,7 +696,7 @@ func TestSMGVoiceSessionTTLWithRelocate(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT_SESSION_TTL_RELOCATE",
utils.TOR: utils.VOICE,
utils.ACCID: "12361",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "TestTTLWithRelocate",
utils.Subject: "TestTTLWithRelocate",
utils.Destination: "1009",
@@ -735,7 +735,7 @@ func TestSMGVoiceSessionTTLWithRelocate(t *testing.T) {
utils.TOR: smgEv[utils.TOR],
utils.InitialOriginID: smgEv[utils.ACCID],
utils.ACCID: "12362",
utils.DIRECTION: smgEv[utils.DIRECTION],
utils.Direction: smgEv[utils.Direction],
utils.Account: smgEv[utils.Account],
utils.Subject: smgEv[utils.Subject],
utils.Destination: smgEv[utils.Destination],
@@ -821,7 +821,7 @@ func TestSMGVoiceRelocateWithOriginIDPrefix(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT_RELOCATE_ORIGPREFIX",
utils.TOR: utils.VOICE,
utils.ACCID: "12371",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: attrSetBalance.Account,
utils.Subject: attrSetBalance.Account,
utils.Destination: "12371",
@@ -860,7 +860,7 @@ func TestSMGVoiceRelocateWithOriginIDPrefix(t *testing.T) {
utils.TOR: smgEv[utils.TOR],
utils.InitialOriginID: smgEv[utils.ACCID],
utils.ACCID: "12372-1",
utils.DIRECTION: smgEv[utils.DIRECTION],
utils.Direction: smgEv[utils.Direction],
utils.Account: smgEv[utils.Account],
utils.Subject: smgEv[utils.Subject],
utils.Destination: smgEv[utils.Destination],
@@ -895,7 +895,7 @@ func TestSMGVoiceRelocateWithOriginIDPrefix(t *testing.T) {
utils.EVENT_NAME: smgEv[utils.EVENT_NAME],
utils.TOR: smgEv[utils.TOR],
utils.OriginIDPrefix: "12372",
utils.DIRECTION: smgEv[utils.DIRECTION],
utils.Direction: smgEv[utils.Direction],
utils.Account: smgEv[utils.Account],
utils.Subject: smgEv[utils.Subject],
utils.Destination: smgEv[utils.Destination],
@@ -953,7 +953,7 @@ func TestSMGDataDerivedChargingNoCredit(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "1234967",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1011",
utils.Subject: "1011",
utils.Destination: "+49",

4
sessionmanager/smgbirpc_it_test.go
View File

@@ -133,7 +133,7 @@ func TestSMGBiRPCSessionAutomaticDisconnects(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "123451",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: attrSetBalance.Account,
utils.Subject: attrSetBalance.Account,
utils.Destination: "1004",
@@ -214,7 +214,7 @@ func TestSMGBiRPCSessionOriginatorTerminate(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "123452",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: attrSetBalance.Account,
utils.Subject: attrSetBalance.Account,
utils.Destination: "1005",

12
sessionmanager/smgeneric_test.go
View File

@@ -39,7 +39,7 @@ func TestSMGSessionIndexing(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: "*voice",
utils.ACCID: "12345",
utils.DIRECTION: "*out",
utils.Direction: "*out",
utils.Account: "account1",
utils.Subject: "subject1",
utils.Destination: "+4986517174963",
@@ -119,7 +119,7 @@ func TestSMGSessionIndexing(t *testing.T) {
smGev2 := SMGenericEvent{
utils.EVENT_NAME: "TEST_EVENT2",
utils.ACCID: "12346",
utils.DIRECTION: "*out",
utils.Direction: "*out",
utils.Account: "account2",
utils.Destination: "+4986517174964",
utils.Tenant: "itsyscom.com",
@@ -394,7 +394,7 @@ func TestSMGActiveSessions(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: "*voice",
utils.ACCID: "111",
utils.DIRECTION: "*out",
utils.Direction: "*out",
utils.Account: "account1",
utils.Subject: "subject1",
utils.Destination: "+4986517174963",
@@ -418,7 +418,7 @@ func TestSMGActiveSessions(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: "*voice",
utils.ACCID: "222",
utils.DIRECTION: "*out",
utils.Direction: "*out",
utils.Account: "account2",
utils.Destination: "+4986517174963",
utils.Category: "call",
@@ -471,7 +471,7 @@ func TestGetPassiveSessions(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: "*voice",
utils.ACCID: "12345",
utils.DIRECTION: "*out",
utils.Direction: "*out",
utils.Account: "account1",
utils.Subject: "subject1",
utils.Destination: "+4986517174963",
@@ -498,7 +498,7 @@ func TestGetPassiveSessions(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: "*voice",
utils.ACCID: "23456",
utils.DIRECTION: "*out",
utils.Direction: "*out",
utils.Account: "account1",
utils.Subject: "subject1",
utils.Destination: "+4986517174963",

6
sessionmanager/smgreplc_it_test.go
View File

@@ -99,7 +99,7 @@ func TestSMGRplcInitiate(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "123451",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1004",
@@ -229,7 +229,7 @@ func TestSMGRplcManualReplicate(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "123451",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1001",
utils.Subject: "1001",
utils.Destination: "1004",
@@ -244,7 +244,7 @@ func TestSMGRplcManualReplicate(t *testing.T) {
utils.EVENT_NAME: "TEST_EVENT",
utils.TOR: utils.VOICE,
utils.ACCID: "123481",
utils.DIRECTION: utils.OUT,
utils.Direction: utils.OUT,
utils.Account: "1002",
utils.Subject: "1002",
utils.Destination: "1005",

4
utils/consts.go
View File

@@ -20,7 +20,7 @@ package utils
var (
CDRExportFormats = []string{DRYRUN, MetaFileCSV, MetaFileFWV, MetaHTTPjsonCDR, MetaHTTPjsonMap, MetaHTTPjson, META_HTTP_POST, MetaAMQPjsonCDR, MetaAMQPjsonMap}
PrimaryCdrFields = []string{CGRID, Source, OriginHost, ACCID, TOR, RequestType, DIRECTION, Tenant, Category, Account, Subject, Destination, SetupTime, PDD, AnswerTime, Usage,
PrimaryCdrFields = []string{CGRID, Source, OriginHost, ACCID, TOR, RequestType, Direction, Tenant, Category, Account, Subject, Destination, SetupTime, PDD, AnswerTime, Usage,
SUPPLIER, DISCONNECT_CAUSE, COST, RATED, PartialField, MEDI_RUNID}
GitLastLog string // If set, it will be processed as part of versioning
PosterTransportContentTypes = map[string]string{
@@ -136,7 +136,7 @@ const (
Source = "Source"
OriginHost = "OriginHost"
RequestType = "RequestType"
DIRECTION = "Direction"
Direction = "Direction"
Tenant = "Tenant"
Category = "Category"
Context = "Context"