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

Fixed *originID being in Event instead of APIOpts

Browse Source
This commit is contained in:
andronache98
2022-01-31 19:41:17 +02:00
committed by Dan Christian Bogos
parent aaada9da07
commit f09cf65f9f
11 changed files with 85 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
agents/agentreq_test.go
View File

@@ -44,7 +44,7 @@ func TestAgReqSetFields(t *testing.T) {
filterS := engine.NewFilterS(cfg, nil, dm)
agReq := NewAgentRequest(nil, nil, nil, nil, nil, nil, "cgrates.org", "", filterS, nil)
// populate request, emulating the way will be done in HTTPAgent
agReq.CGRRequest.Set(&utils.FullPath{Path: utils.MetaOriginID, PathSlice: []string{utils.MetaOriginID}},
agReq.Opts.Set([]string{utils.MetaOriginID},
utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()))
agReq.CGRRequest.Set(&utils.FullPath{Path: utils.ToR, PathSlice: []string{utils.ToR}}, utils.MetaVoice)
agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AccountField, PathSlice: []string{utils.AccountField}}, "1001")
@@ -1115,17 +1115,18 @@ func TestAgReqFieldAsInterfaceForOneFldPathReq(t *testing.T) {
config.CgrConfig().CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, dm)
dP := &utils.MapStorage{
utils.MetaOriginID: "CGRATES_ID1",
utils.AccountField: "1002",
utils.AnswerTime: time.Date(2013, 12, 30, 14, 59, 31, 0, time.UTC),
}
aqReq := NewAgentRequest(dP, nil, nil, nil, nil, nil,
opts := utils.MapStorage{
utils.MetaOriginID: "CGRATES_ID1",
}
aqReq := NewAgentRequest(dP, nil, nil, nil, opts, nil,
"cgrates.org", utils.EmptyString, filterS, nil)
path := []string{utils.MetaReq}
expVal := &utils.MapStorage{
utils.MetaOriginID: "CGRATES_ID1",
utils.AccountField: "1002",
utils.AnswerTime: time.Date(2013, 12, 30, 14, 59, 31, 0, time.UTC),
}

6
agents/diamagent_test.go
View File

@@ -215,7 +215,7 @@ func TestProcessRequest(t *testing.T) {
"Usage": "10s",
},
APIOpts: map[string]interface{}{
"CGRID": "1133dc80896edf5049b46aa911cb9085eeb27f4c",
"originID": "1133dc80896edf5049b46aa911cb9085eeb27f4c",
},
},
},
@@ -279,7 +279,7 @@ func TestProcessRequest(t *testing.T) {
"Usage": "10s",
},
APIOpts: map[string]interface{}{
"CGRID": "1133dc80896edf5049b46aa911cb9085eeb27f4c",
"originID": "1133dc80896edf5049b46aa911cb9085eeb27f4c",
},
},
},
@@ -415,7 +415,7 @@ func TestProcessRequest(t *testing.T) {
"Usage": "10s",
},
APIOpts: map[string]interface{}{
"CGRID": "1133dc80896edf5049b46aa911cb9085eeb27f4c",
"originID": "1133dc80896edf5049b46aa911cb9085eeb27f4c",
},
},
},

5
apis/ees_test.go
View File

@@ -51,7 +51,7 @@ func TestEeSProcessEvent(t *testing.T) {
Tenant: "cgrates.org",
ID: "voiceEvent",
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
utils.ToR: utils.MetaVoice,
utils.OriginID: "dsafdsaf",
utils.OriginHost: "192.168.1.1",
@@ -69,6 +69,9 @@ func TestEeSProcessEvent(t *testing.T) {
"ExtraFields": map[string]string{"extra1": "val_extra1",
"extra2": "val_extra2", "extra3": "val_extra3"},
},
APIOpts: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
},
},
}
var reply map[string]map[string]interface{}

2
config/config_defaults.go
View File

@@ -1448,7 +1448,7 @@ const CGRATES_CFG_JSON = `
"response_group": "03", // determines how taxes are grouped for the response <03|13>
"response_type": "D4", // determines the granularity of taxes and (optionally) the decimal precision for the tax calculations and amounts in the response
"regulatory_code": "03", // provider type
"client_tracking": "~*req.*originID", // template extracting client information out of StoredCdr; <RSRParsers>
"client_tracking": "~*opts.*originID", // template extracting client information out of StoredCdr; <RSRParsers>
"customer_number": "~*req.Subject", // template extracting customer number out of StoredCdr; <RSRParsers>
"orig_number": "~*req.Subject", // template extracting origination number out of StoredCdr; <RSRParsers>
"term_number": "~*req.Destination", // template extracting termination number out of StoredCdr; <RSRParsers>

2
config/config_json_test.go
View File

@@ -1869,7 +1869,7 @@ func TestDfSureTaxJsonCfg(t *testing.T) {
Response_group: utils.StringPointer("03"),
Response_type: utils.StringPointer("D4"),
Regulatory_code: utils.StringPointer("03"),
Client_tracking: utils.StringPointer(utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.MetaOriginID),
Client_tracking: utils.StringPointer(utils.DynamicDataPrefix + utils.MetaOpts + utils.NestingSep + utils.MetaOriginID),
Customer_number: utils.StringPointer("~*req.Subject"),
Orig_number: utils.StringPointer("~*req.Subject"),
Term_number: utils.StringPointer("~*req.Destination"),

12
config/config_test.go
View File

File diff suppressed because one or more lines are too long

85
ees/filecsv_it_test.go
View File

@@ -117,7 +117,6 @@ func testCsvExportEvent(t *testing.T) {
Tenant: "cgrates.org",
ID: "voiceEvent",
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
utils.ToR: utils.MetaVoice,
utils.OriginID: "dsafdsaf",
utils.OriginHost: "192.168.1.1",
@@ -133,6 +132,9 @@ func testCsvExportEvent(t *testing.T) {
utils.RunID: utils.MetaDefault,
utils.Cost: 1.01,
},
APIOpts: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
},
},
}
@@ -142,7 +144,7 @@ func testCsvExportEvent(t *testing.T) {
Tenant: "cgrates.org",
ID: "dataEvent",
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
utils.ToR: utils.MetaData,
utils.OriginID: "abcdef",
utils.OriginHost: "192.168.1.1",
@@ -158,6 +160,9 @@ func testCsvExportEvent(t *testing.T) {
utils.RunID: utils.MetaDefault,
utils.Cost: 0.012,
},
APIOpts: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
},
},
}
@@ -167,7 +172,6 @@ func testCsvExportEvent(t *testing.T) {
Tenant: "cgrates.org",
ID: "SMSEvent",
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
utils.ToR: utils.MetaSMS,
utils.OriginID: "sdfwer",
utils.OriginHost: "192.168.1.1",
@@ -183,6 +187,9 @@ func testCsvExportEvent(t *testing.T) {
utils.RunID: utils.MetaDefault,
utils.Cost: 0.15,
},
APIOpts: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
},
},
}
var reply map[string]utils.MapStorage
@@ -212,11 +219,11 @@ func testCsvVerifyExports(t *testing.T) {
if len(files) != 1 {
t.Fatalf("Expected %+v, received: %+v", 1, len(files))
}
eCnt := "dbafe9c8614c785a65aabd116dd3959c3c56f7f6,192.168.1.1,*default,*voice,dsafdsaf,*rated,cgrates.org,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,10000000000,1.01" +
eCnt := "192.168.1.1,*default,*voice,dsafdsaf,*rated,cgrates.org,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,10000000000,1.01" +
"\n" +
"ea1f1968cc207859672c332364fc7614c86b04c5,192.168.1.1,*default,*data,abcdef,*rated,AnotherTenant,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,10,0.012" +
"192.168.1.1,*default,*data,abcdef,*rated,AnotherTenant,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,10,0.012" +
"\n" +
"2478e9f18ebcd3c684f3c14596b8bfeab2b0d6d4,192.168.1.1,*default,*sms,sdfwer,*rated,cgrates.org,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,1,0.15" +
"192.168.1.1,*default,*sms,sdfwer,*rated,cgrates.org,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,1,0.15" +
"\n"
if outContent1, err := os.ReadFile(files[0]); err != nil {
t.Error(err)
@@ -233,7 +240,7 @@ func testCsvExportComposedEvent(t *testing.T) {
Tenant: "cgrates.org",
ID: "voiceEvent",
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
utils.ToR: utils.MetaVoice,
"ComposedOriginID1": "dsaf",
"ComposedOriginID2": "dsaf",
@@ -252,6 +259,9 @@ func testCsvExportComposedEvent(t *testing.T) {
"ExtraFields": map[string]string{"extra1": "val_extra1",
"extra2": "val_extra2", "extra3": "val_extra3"},
},
APIOpts: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
},
},
}
@@ -261,7 +271,7 @@ func testCsvExportComposedEvent(t *testing.T) {
Tenant: "cgrates.org",
ID: "SMSEvent",
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
utils.ToR: utils.MetaSMS,
"ComposedOriginID1": "sdf",
"ComposedOriginID2": "wer",
@@ -280,6 +290,9 @@ func testCsvExportComposedEvent(t *testing.T) {
"ExtraFields": map[string]string{"extra1": "val_extra1",
"extra2": "val_extra2", "extra3": "val_extra3"},
},
APIOpts: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
},
},
}
var reply map[string]utils.MapStorage
@@ -306,9 +319,9 @@ func testCsvVerifyComposedExports(t *testing.T) {
if len(files) != 1 {
t.Errorf("Expected %+v, received: %+v", 1, len(files))
}
eCnt := "NumberOfEvent,CGRID,RunID,ToR,OriginID,RequestType,Tenant,Category,Account,Subject,Destination,SetupTime,AnswerTime,Usage,Cost" + "\n" +
"1,dbafe9c8614c785a65aabd116dd3959c3c56f7f6,*default,*voice,dsafdsaf,*rated,cgrates.org,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,10000000000,1.0164" + "\n" +
"2,2478e9f18ebcd3c684f3c14596b8bfeab2b0d6d4,*default,*sms,sdfwer,*rated,cgrates.org,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,1,0.1555" + "\n" +
eCnt := "NumberOfEvent,RunID,ToR,OriginID,RequestType,Tenant,Category,Account,Subject,Destination,SetupTime,AnswerTime,Usage,Cost" + "\n" +
"1,*default,*voice,dsafdsaf,*rated,cgrates.org,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,10000000000,1.0164" + "\n" +
"2,2*default,*sms,sdfwer,*rated,cgrates.org,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,1,0.1555" + "\n" +
"2,10s,1ns,1.1718" + "\n"
if outContent1, err := os.ReadFile(files[0]); err != nil {
t.Error(err)
@@ -327,7 +340,7 @@ func testCsvExportBufferedEvent(t *testing.T) {
Events: []*utils.EventsWithOpts{
{
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
//utils.MetaOriginID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
utils.ToR: utils.MetaVoice,
"ComposedOriginID1": "dsaf",
"ComposedOriginID2": "dsaf",
@@ -353,7 +366,7 @@ func testCsvExportBufferedEvent(t *testing.T) {
},
{
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
//utils.MetaOriginID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
utils.ToR: utils.MetaData,
utils.OriginHost: "192.168.1.1",
utils.RequestType: utils.MetaRated,
@@ -377,7 +390,7 @@ func testCsvExportBufferedEvent(t *testing.T) {
// this one will not match, because opts got another another ExporterID and it will be changed from the initial opt
{
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("qwertyiopuu", time.Unix(1383813745, 0).UTC().String()),
//utils.MetaOriginID: utils.Sha1("qwertyiopuu", time.Unix(1383813745, 0).UTC().String()),
utils.AccountField: "1005",
utils.Subject: "1005",
utils.Destination: "103",
@@ -391,7 +404,7 @@ func testCsvExportBufferedEvent(t *testing.T) {
},
{
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("nlllo", time.Unix(1383813745, 0).UTC().String()),
//utils.MetaOriginID: utils.Sha1("nlllo", time.Unix(1383813745, 0).UTC().String()),
utils.ToR: utils.MetaData,
"ComposedOriginID1": "abcdefghh",
utils.RequestType: utils.MetaNone,
@@ -414,7 +427,7 @@ func testCsvExportBufferedEvent(t *testing.T) {
},
{
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("qwert", time.Unix(1383813745, 0).UTC().String()),
//utils.MetaOriginID: utils.Sha1("qwert", time.Unix(1383813745, 0).UTC().String()),
utils.OriginHost: "127.0.0.1",
utils.RequestType: utils.MetaPrepaid,
utils.Tenant: "dispatchers.org",
@@ -460,11 +473,11 @@ func testCsvExportBufferedEvent(t *testing.T) {
}
expected := [][]string{
{"NumberOfEvent", "CGRID", "RunID", "ToR", "OriginID", "RequestType", "Tenant", "Category", "Account", "Subject", "Destination", "SetupTime", "AnswerTime", "Usage", "Cost"},
{"1", "dbafe9c8614c785a65aabd116dd3959c3c56f7f6", "*default", "*voice", "dsafdsaf", "*rated", "cgrates.org", "call", "1005", "1001", "1002", "2013-11-07T08:42:25Z", "2013-11-07T08:42:26Z", "10000000000", "1.0164"},
{"2", "ea1f1968cc207859672c332364fc7614c86b04c5", "*default", "*data", "", "*rated", "AnotherTenant", "call", "1005", "1001", "1002", "2013-11-07T08:42:25Z", "2013-11-07T08:42:26Z", "10", "0.012"},
{"3", "9e0b2a4b23e0843efe522e8a611b092a16ecfba1", "raw", "*data", "abcdefghh", "*none", "phone.org", "sms", "1005", "User2001", "User2002", "2013-11-07T08:42:25Z", "2013-11-07T08:42:26Z", "10", "44.5"},
{"4", "cd8112998c2abb0e4a7cd3a94c74817cd5fe67d3", "Default_charging_id", "", "", "*prepaid", "dispatchers.org", "photo", "1005", "1005", "1000", "2679-04-25T22:02:25Z", "2679-04-25T22:02:40Z", "10", "1.4422"},
{"NumberOfEvent", "RunID", "ToR", "OriginID", "RequestType", "Tenant", "Category", "Account", "Subject", "Destination", "SetupTime", "AnswerTime", "Usage", "Cost"},
{"1", "*default", "*voice", "dsafdsaf", "*rated", "cgrates.org", "call", "1005", "1001", "1002", "2013-11-07T08:42:25Z", "2013-11-07T08:42:26Z", "10000000000", "1.0164"},
{"2", "*default", "*data", "", "*rated", "AnotherTenant", "call", "1005", "1001", "1002", "2013-11-07T08:42:25Z", "2013-11-07T08:42:26Z", "10", "0.012"},
{"3", "raw", "*data", "abcdefghh", "*none", "phone.org", "sms", "1005", "User2001", "User2002", "2013-11-07T08:42:25Z", "2013-11-07T08:42:26Z", "10", "44.5"},
{"4", "Default_charging_id", "", "", "*prepaid", "dispatchers.org", "photo", "1005", "1005", "1000", "2679-04-25T22:02:25Z", "2679-04-25T22:02:40Z", "10", "1.4422"},
{"4", "10s", "46.9706"},
}
if !reflect.DeepEqual(expected, csvRply) {
@@ -505,7 +518,7 @@ func testCsvExportBufferedEventNoExports(t *testing.T) {
Events: []*utils.EventsWithOpts{
{
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
//utils.MetaOriginID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
utils.ToR: utils.MetaVoice,
"ComposedOriginID1": "dsaf",
"ComposedOriginID2": "dsaf",
@@ -518,7 +531,7 @@ func testCsvExportBufferedEventNoExports(t *testing.T) {
},
{
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
//utils.MetaOriginID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
utils.ToR: utils.MetaData,
utils.OriginHost: "192.168.1.1",
utils.RequestType: utils.MetaRated,
@@ -543,7 +556,7 @@ func testCsvExportEventWithInflateTemplate(t *testing.T) {
Tenant: "cgrates.org",
ID: "voiceEvent",
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
utils.ToR: utils.MetaVoice,
utils.OriginID: "dsafdsaf",
utils.OriginHost: "192.168.1.1",
@@ -561,6 +574,9 @@ func testCsvExportEventWithInflateTemplate(t *testing.T) {
"ExtraFields": map[string]string{"extra1": "val_extra1",
"extra2": "val_extra2", "extra3": "val_extra3"},
},
APIOpts: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
},
},
}
@@ -570,7 +586,7 @@ func testCsvExportEventWithInflateTemplate(t *testing.T) {
Tenant: "cgrates.org",
ID: "dataEvent",
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
utils.ToR: utils.MetaData,
utils.OriginID: "abcdef",
utils.OriginHost: "192.168.1.1",
@@ -588,6 +604,9 @@ func testCsvExportEventWithInflateTemplate(t *testing.T) {
"ExtraFields": map[string]string{"extra1": "val_extra1",
"extra2": "val_extra2", "extra3": "val_extra3"},
},
APIOpts: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
},
},
}
@@ -597,7 +616,7 @@ func testCsvExportEventWithInflateTemplate(t *testing.T) {
Tenant: "cgrates.org",
ID: "SMSEvent",
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
utils.ToR: utils.MetaSMS,
utils.OriginID: "sdfwer",
utils.OriginHost: "192.168.1.1",
@@ -615,6 +634,9 @@ func testCsvExportEventWithInflateTemplate(t *testing.T) {
"ExtraFields": map[string]string{"extra1": "val_extra1",
"extra2": "val_extra2", "extra3": "val_extra3"},
},
APIOpts: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
},
},
}
var reply map[string]utils.MapStorage
@@ -644,11 +666,11 @@ func testCsvVerifyExportsWithInflateTemplate(t *testing.T) {
if len(files) != 1 {
t.Errorf("Expected %+v, received: %+v", 1, len(files))
}
eCnt := "dbafe9c8614c785a65aabd116dd3959c3c56f7f6,*default,*voice,dsafdsaf,*rated,cgrates.org,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,10000000000,1.01" +
eCnt := "*default,*voice,dsafdsaf,*rated,cgrates.org,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,10000000000,1.01" +
"\n" +
"ea1f1968cc207859672c332364fc7614c86b04c5,*default,*data,abcdef,*rated,AnotherTenant,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,10,0.012" +
"*default,*data,abcdef,*rated,AnotherTenant,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,10,0.012" +
"\n" +
"2478e9f18ebcd3c684f3c14596b8bfeab2b0d6d4,*default,*sms,sdfwer,*rated,cgrates.org,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,1,0.15" +
"*default,*sms,sdfwer,*rated,cgrates.org,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,1,0.15" +
"\n"
if outContent1, err := os.ReadFile(files[0]); err != nil {
t.Error(err)
@@ -664,7 +686,7 @@ func testCsvExportNotFoundExporter(t *testing.T) {
Tenant: "cgrates.org",
ID: "voiceEvent",
Event: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
utils.ToR: utils.MetaVoice,
utils.OriginID: "dsafdsaf",
utils.OriginHost: "192.168.1.1",
@@ -682,6 +704,9 @@ func testCsvExportNotFoundExporter(t *testing.T) {
"ExtraFields": map[string]string{"extra1": "val_extra1",
"extra2": "val_extra2", "extra3": "val_extra3"},
},
APIOpts: map[string]interface{}{
utils.MetaOriginID: utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
},
},
}

2
ees/virtual_ee_it_test.go
View File

@@ -178,7 +178,7 @@ func testVirtVerifyExports(t *testing.T) {
if len(files) != 1 {
t.Errorf("Expected %+v, received: %+v", 1, len(files))
}
eCnt := "dbafe9c8614c785a65aabd116dd3959c3c56f7f6,SupplierRun,dsafdsaf,cgrates.org,1001,1.01,CustomValue,1.23,SupplierRun\n"
eCnt := "SupplierRun,dsafdsaf,cgrates.org,1001,1.01,CustomValue,1.23,SupplierRun\n"
if outContent1, err := os.ReadFile(files[0]); err != nil {
t.Error(err)
} else if eCnt != string(outContent1) {

2
general_tests/all_sections_cfg_rld_it_test.go
View File

File diff suppressed because one or more lines are too long

2
loaders/loader_it_test.go
View File

@@ -243,7 +243,7 @@ func testLoaderCheckAttributes(t *testing.T) {
Value: "Sub2",
}},
Blocker: true,
Weight: 20,
Weights: ";20",
}
if *encoding == utils.MetaGOB { // gob threats empty slices as nil values
eAttrPrf.Attributes[1].FilterIDs = nil

14
sessions/sessions_test.go
View File

@@ -1334,11 +1334,11 @@ func TestSessionSrelocateSessionS(t *testing.T) {
utils.OriginHost: "127.0.0.1",
})
opt := make(map[string]interface{})
initialCGRID := GetSetOptsOriginID(sSEv, opt)
initialOriginID := GetSetOptsOriginID(sSEv, opt)
s := &Session{
EventStart: sSEv,
OptsStart: map[string]interface{}{
utils.MetaOriginID: initialCGRID,
utils.MetaOriginID: initialOriginID,
},
}
//register the session as active
@@ -1350,8 +1350,8 @@ func TestSessionSrelocateSessionS(t *testing.T) {
}
//relocate the session
sS.relocateSession(context.Background(), "111", "222", "127.0.0.1")
//check if the session exist with old CGRID
rcvS = sS.getSessions(initialCGRID, false)
//check if the session exist with old originID
rcvS = sS.getSessions(initialOriginID, false)
if len(rcvS) != 0 {
t.Errorf("Expecting 0, received: %+v", len(rcvS))
}
@@ -1359,9 +1359,9 @@ func TestSessionSrelocateSessionS(t *testing.T) {
utils.OriginID: "222",
utils.OriginHost: "127.0.0.1"})
opt2 := make(map[string]interface{})
cgrID := GetSetOptsOriginID(ev, opt2)
//check the session with new CGRID
rcvS = sS.getSessions(cgrID, false)
originID := GetSetOptsOriginID(ev, opt2)
//check the session with new originID
rcvS = sS.getSessions(originID, false)
if !reflect.DeepEqual(rcvS[0], s) {
t.Errorf("Expecting %+v, received: %+v", s, rcvS[0])
}