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

Add Test correlation between FsEvent->SMGEvent.CgrID and FsCdr

Browse Source
This commit is contained in:
TeoV
2018-03-14 06:17:51 -04:00
committed by Dan Christian Bogos
parent 2cd6877915
commit dcbfd518d4
5 changed files with 333 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
agents/fsevent.go
View File

@@ -41,7 +41,6 @@ const (
REQTYPE = "variable_" + utils.CGR_REQTYPE //prepaid or postpaid
CATEGORY = "variable_" + utils.CGR_CATEGORY
VAR_CGR_SUPPLIER = "variable_" + utils.CGR_SUPPLIER
VarCGRHost = "variable_" + utils.CGRHost
UUID = "Unique-ID" // -Unique ID for this call leg
CSTMID = "variable_" + utils.CGR_TENANT
CALL_DEST_NR = "Caller-Destination-Number"
@@ -283,7 +282,7 @@ func (fsev FSEvent) GetOriginatorIP(fieldName string) string {
if strings.HasPrefix(fieldName, utils.STATIC_VALUE_PREFIX) { // Static value
return fieldName[len(utils.STATIC_VALUE_PREFIX):]
}
return utils.FirstNonEmpty(fsev[fieldName], fsev[VarCGRHost], fsev[FS_IPv4])
return utils.FirstNonEmpty(fsev[fieldName], fsev[FS_IPv4])
}
func (fsev FSEvent) GetExtraFields() map[string]string {

329
agents/fsevent_test.go
View File

File diff suppressed because one or more lines are too long

6
engine/fscdr.go
View File

@@ -41,7 +41,6 @@ const (
FS_HANGUP_TIME = "end_epoch"
FS_DURATION = "billsec"
FS_USERNAME = "user_name"
FS_IP = "sip_local_network_addr"
FS_CDR_SOURCE = "freeswitch_json"
FS_SIP_REQUSER = "sip_req_user" // Apps like FusionPBX do not set dialed_extension, alternative being destination_number but that comes in customer profile, not in vars
FS_PROGRESS_MEDIAMSEC = "progress_mediamsec"
@@ -73,8 +72,7 @@ type FSCdr struct {
}
func (fsCdr FSCdr) getCGRID() string {
return utils.Sha1(fsCdr.vars[FS_UUID],
utils.FirstNonEmpty(fsCdr.vars[utils.CGRHost], fsCdr.vars[FsIPv4]))
return utils.Sha1(fsCdr.vars[FS_UUID], fsCdr.vars[FsIPv4])
}
func (fsCdr FSCdr) getExtraFields() map[string]string {
@@ -140,7 +138,7 @@ func (fsCdr FSCdr) AsCDR(timezone string) *CDR {
storCdr.CGRID = fsCdr.getCGRID()
storCdr.ToR = utils.VOICE
storCdr.OriginID = fsCdr.vars[FS_UUID]
storCdr.OriginHost = utils.FirstNonEmpty(fsCdr.vars[utils.CGRHost], fsCdr.vars[FS_IP])
storCdr.OriginHost = fsCdr.vars[FsIPv4]
storCdr.Source = FS_CDR_SOURCE
storCdr.RequestType = utils.FirstNonEmpty(fsCdr.vars[utils.CGR_REQTYPE], fsCdr.cgrCfg.DefaultReqType)
storCdr.Tenant = utils.FirstNonEmpty(fsCdr.vars[utils.CGR_TENANT], fsCdr.cgrCfg.DefaultTenant)

2
engine/fscdr_test.go
View File

@@ -391,6 +391,7 @@ var body = []byte(`{
}
}]
}`)
var fsCdrCfg *config.CGRConfig
func TestFsCdrInterfaces(t *testing.T) {
@@ -536,5 +537,4 @@ func TestFsCdrFirstDefined(t *testing.T) {
if value != "1001" {
t.Errorf("Expecting: 1001, received: %s", value)
}
}

1
utils/consts.go
View File

@@ -293,7 +293,6 @@ const (
CGR_COMPUTELCR = "cgr_computelcr"
CGR_SUPPLIERS = "cgr_suppliers"
CGRFlags = "cgr_flags"
CGRHost = "cgr_host"
KAM_FLATSTORE = "kamailio_flatstore"
OSIPS_FLATSTORE = "opensips_flatstore"
MAX_DEBIT_CACHE_PREFIX = "MAX_DEBIT_"