From ff8bcd7d570a9acf94150323fd380eb5c5c1cdc2 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Fri, 13 Dec 2019 08:50:16 +0200 Subject: [PATCH 1/5] Updated dispatcher configuration --- .../samples/dispatchers/dispatchers/cgrates.json | 13 ++++++++++--- .../dispatchers/dispatchers_mongo/cgrates.json | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/data/conf/samples/dispatchers/dispatchers/cgrates.json b/data/conf/samples/dispatchers/dispatchers/cgrates.json index 3627a21d8..8de2caf22 100755 --- a/data/conf/samples/dispatchers/dispatchers/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers/cgrates.json @@ -44,12 +44,19 @@ "enabled": true, }, +"rpc_conns": { + "conn1": { + "strategy": "*first", + "conns": [{"address": "127.0.0.1:2012", "transport":"*json"}], + }, +}, "sessions": { "enabled": true, - "attributes_conns": ["*internal"], - "rals_conns": ["*internal"], - "chargers_conns": ["*internal"], + "attributes_conns": ["conn1"], + "rals_conns": ["conn1"], + "resources_conns": ["conn1"], + "chargers_conns": ["conn1"], "listen_bijson": ":3014", }, diff --git a/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json b/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json index c7431e477..3410051cb 100644 --- a/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json @@ -53,12 +53,19 @@ "enabled": true, }, +"rpc_conns": { + "conn1": { + "strategy": "*first", + "conns": [{"address": "127.0.0.1:2012", "transport":"*json"}], + }, +}, "sessions": { "enabled": true, - "attributes_conns": ["*internal"], - "rals_conns": ["*internal"], - "chargers_conns": ["*internal"], + "attributes_conns": ["conn1"], + "rals_conns": ["conn1"], + "resources_conns": ["conn1"], + "chargers_conns": ["conn1"], "listen_bijson": ":3014", }, From 4ea310ca709c65d9ffa620c849708186f21216f8 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Fri, 13 Dec 2019 08:50:55 +0200 Subject: [PATCH 2/5] Updated dnsAgent service integration tests --- services/dnsagent_it_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/dnsagent_it_test.go b/services/dnsagent_it_test.go index f3b1908cf..d4769ae0e 100644 --- a/services/dnsagent_it_test.go +++ b/services/dnsagent_it_test.go @@ -52,11 +52,11 @@ func TestDNSAgentReload(t *testing.T) { db := NewDataDBService(cfg) sS := NewSessionService(cfg, db, server, make(chan rpcclient.ClientConnector, 1), engineShutdown, nil) - srv := NewDNSAgent(cfg, nil, engineShutdown, nil) + srv := NewDNSAgent(cfg, filterSChan, engineShutdown, nil) srvMngr.AddServices(NewConnManagerService(cfg, nil), srv, sS, NewLoaderService(cfg, db, filterSChan, server, engineShutdown, make(chan rpcclient.ClientConnector, 1), nil), db) if err = srvMngr.StartServices(); err != nil { - t.Error(err) + t.Fatal(err) } if srv.IsRunning() { t.Errorf("Expected service to be down") @@ -66,7 +66,7 @@ func TestDNSAgentReload(t *testing.T) { Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "dnsagent_reload"), Section: config.DNSAgentJson, }, &reply); err != nil { - t.Error(err) + t.Fatal(err) } else if reply != utils.OK { t.Errorf("Expecting OK ,received %s", reply) } From 1df6f3be463f0ea2ea6356ec3f62c8a9090b514a Mon Sep 17 00:00:00 2001 From: Trial97 Date: Fri, 13 Dec 2019 10:09:02 +0200 Subject: [PATCH 3/5] Replaced DEFAULT_RUNID with META_DEFAULT --- agents/fsevent.go | 2 +- agents/fsevent_test.go | 2 +- apier/v1/apier_it_test.go | 4 +- apier/v1/cdre_it_test.go | 8 +-- console/cost_details.go | 2 +- dispatchers/stats_it_test.go | 8 +-- engine/action.go | 4 +- engine/cdr_it_test.go | 2 +- engine/cdr_test.go | 40 +++++------ engine/cdrecsv_test.go | 22 +++--- engine/cdrefwv_test.go | 8 +-- engine/storage_cdrs_it_test.go | 2 +- engine/suretax_test.go | 2 +- general_tests/cdrs_onlexp_it_test.go | 6 +- general_tests/oldtutorial_it_test.go | 2 +- migrator/cdrs_it_test.go | 2 +- migrator/session_costs_it_test.go | 4 +- sessions/sessions_test.go | 104 +++++++++++++-------------- utils/consts.go | 1 - 19 files changed, 112 insertions(+), 113 deletions(-) diff --git a/agents/fsevent.go b/agents/fsevent.go index 0bea355f7..668ad818a 100644 --- a/agents/fsevent.go +++ b/agents/fsevent.go @@ -350,7 +350,7 @@ func (fsev FSEvent) ParseEventValue(rsrFld *config.RSRParser, timezone string) ( case utils.DISCONNECT_CAUSE: return rsrFld.ParseValue(fsev.GetDisconnectCause("")) case utils.RunID: - return rsrFld.ParseValue(utils.DEFAULT_RUNID) + return rsrFld.ParseValue(utils.META_DEFAULT) case utils.Cost: return rsrFld.ParseValue(strconv.FormatFloat(-1, 'f', -1, 64)) // Recommended to use FormatCost default: diff --git a/agents/fsevent_test.go b/agents/fsevent_test.go index afb94a6e4..53098b977 100644 --- a/agents/fsevent_test.go +++ b/agents/fsevent_test.go @@ -548,7 +548,7 @@ func TestParseEventValue(t *testing.T) { if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.REGEXP_PREFIX+utils.SUPPLIER, true), ""); parsed != "supplier1" { t.Error("Unexpected result parsed", parsed) } - if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.REGEXP_PREFIX+utils.RunID, true), ""); parsed != utils.DEFAULT_RUNID { + if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.REGEXP_PREFIX+utils.RunID, true), ""); parsed != utils.META_DEFAULT { t.Error("Unexpected result parsed", parsed) } if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.REGEXP_PREFIX+utils.COST, true), ""); parsed != "-1" { diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index f41062d55..bff1f8b6b 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -1508,7 +1508,7 @@ func TestApierITProcessCdr(t *testing.T) { CDR: &engine.CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: "test", RequestType: utils.META_RATED, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", - SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), RunID: utils.DEFAULT_RUNID, + SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), RunID: utils.META_DEFAULT, Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, }, } @@ -1556,7 +1556,7 @@ func TestApierGetCallCostLog(t *testing.T) { Destination: "+4986517174963", SetupTime: tm, AnswerTime: tm, - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, Usage: time.Duration(0), ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, diff --git a/apier/v1/cdre_it_test.go b/apier/v1/cdre_it_test.go index 57769efc2..2657a51d0 100755 --- a/apier/v1/cdre_it_test.go +++ b/apier/v1/cdre_it_test.go @@ -119,28 +119,28 @@ func testCDReAddCDRs(t *testing.T) { OrderID: 123, ToR: utils.VOICE, OriginID: "OriginCDR1", OriginHost: "192.168.1.1", Source: "test", RequestType: utils.META_RATED, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "+4986517174963", SetupTime: time.Now(), - AnswerTime: time.Now(), RunID: utils.DEFAULT_RUNID, Usage: time.Duration(10) * time.Second, + AnswerTime: time.Now(), RunID: utils.META_DEFAULT, Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, }, {CGRID: "Cdr2", OrderID: 123, ToR: utils.VOICE, OriginID: "OriginCDR2", OriginHost: "192.168.1.1", Source: "test2", RequestType: utils.META_RATED, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "+4986517174963", SetupTime: time.Now(), - AnswerTime: time.Now(), RunID: utils.DEFAULT_RUNID, Usage: time.Duration(5) * time.Second, + AnswerTime: time.Now(), RunID: utils.META_DEFAULT, Usage: time.Duration(5) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, }, {CGRID: "Cdr3", OrderID: 123, ToR: utils.VOICE, OriginID: "OriginCDR3", OriginHost: "192.168.1.1", Source: "test2", RequestType: utils.META_RATED, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "+4986517174963", SetupTime: time.Now(), - AnswerTime: time.Now(), RunID: utils.DEFAULT_RUNID, Usage: time.Duration(30) * time.Second, + AnswerTime: time.Now(), RunID: utils.META_DEFAULT, Usage: time.Duration(30) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, }, {CGRID: "Cdr4", OrderID: 123, ToR: utils.VOICE, OriginID: "OriginCDR4", OriginHost: "192.168.1.1", Source: "test3", RequestType: utils.META_RATED, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "+4986517174963", SetupTime: time.Now(), - AnswerTime: time.Time{}, RunID: utils.DEFAULT_RUNID, Usage: time.Duration(0) * time.Second, + AnswerTime: time.Time{}, RunID: utils.META_DEFAULT, Usage: time.Duration(0) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, }, } diff --git a/console/cost_details.go b/console/cost_details.go index 41ec7797e..bc66ebc9d 100644 --- a/console/cost_details.go +++ b/console/cost_details.go @@ -51,7 +51,7 @@ func (self *CmdGetCostDetails) RpcMethod() string { func (self *CmdGetCostDetails) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.AttrGetCallCost{RunId: utils.DEFAULT_RUNID} + self.rpcParams = &utils.AttrGetCallCost{RunId: utils.META_DEFAULT} } return self.rpcParams } diff --git a/dispatchers/stats_it_test.go b/dispatchers/stats_it_test.go index 9f0e134f2..f604d22d5 100755 --- a/dispatchers/stats_it_test.go +++ b/dispatchers/stats_it_test.go @@ -105,7 +105,7 @@ func testDspStsGetStatFailover(t *testing.T) { utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: time.Duration(135 * time.Second), utils.COST: 123.0, - utils.RunID: utils.DEFAULT_RUNID, + utils.RunID: utils.META_DEFAULT, utils.Destination: "1002"}, }, ArgDispatcher: &utils.ArgDispatcher{ @@ -216,7 +216,7 @@ func testDspStsTestAuthKey2(t *testing.T) { utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: time.Duration(135 * time.Second), utils.COST: 123.0, - utils.RunID: utils.DEFAULT_RUNID, + utils.RunID: utils.META_DEFAULT, utils.Destination: "1002"}, }, ArgDispatcher: &utils.ArgDispatcher{ @@ -258,7 +258,7 @@ func testDspStsTestAuthKey2(t *testing.T) { utils.Account: "1002", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: time.Duration(45 * time.Second), - utils.RunID: utils.DEFAULT_RUNID, + utils.RunID: utils.META_DEFAULT, utils.COST: 10.0, utils.Destination: "1001", }, @@ -338,7 +338,7 @@ func testDspStsTestAuthKey3(t *testing.T) { utils.Account: "1002", utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.Usage: time.Duration(45 * time.Second), - utils.RunID: utils.DEFAULT_RUNID, + utils.RunID: utils.META_DEFAULT, utils.COST: 10.0, utils.Destination: "1001", }, diff --git a/engine/action.go b/engine/action.go index 1dc63ba9d..cd49ba9a9 100644 --- a/engine/action.go +++ b/engine/action.go @@ -207,8 +207,8 @@ func cdrLogAction(acc *Account, a *Action, acs Actions, extraData interface{}) ( if err := connMgr.Call(config.CgrConfig().SchedulerCfg().CDRsConns, nil, utils.CDRsV1ProcessEvent, &ArgV1ProcessEvent{ - Flags: []string{utils.ConcatenatedKey(utils.MetaChargers, "false")}, // do not try to get the chargers for cdrlog - CGREvent: *cdr.AsCGREvent()}, &rply); err != nil { + Flags: []string{utils.ConcatenatedKey(utils.MetaChargers, "false")}, // do not try to get the chargers for cdrlog + CGREvent: *cdr.AsCGREvent()}, &rply); err != nil { return err } } diff --git a/engine/cdr_it_test.go b/engine/cdr_it_test.go index 825a1a2b0..01a871070 100644 --- a/engine/cdr_it_test.go +++ b/engine/cdr_it_test.go @@ -39,7 +39,7 @@ func TestHttpJsonPost(t *testing.T) { Source: utils.UNIT_TEST, RequestType: utils.META_RATED, Tenant: "cgrates.org", Category: "call", Account: "account1", Subject: "tgooiscs0014", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String(), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String(), - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, Usage: "0.00000001", ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, } jsn, _ := json.Marshal(cdrOut) diff --git a/engine/cdr_test.go b/engine/cdr_test.go index b5f6d1106..6f0b147f5 100644 --- a/engine/cdr_test.go +++ b/engine/cdr_test.go @@ -34,13 +34,13 @@ func TestNewCDRFromExternalCDR(t *testing.T) { OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.META_RATED, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", - SetupTime: "2013-11-07T08:42:20Z", AnswerTime: "2013-11-07T08:42:26Z", RunID: utils.DEFAULT_RUNID, + SetupTime: "2013-11-07T08:42:20Z", AnswerTime: "2013-11-07T08:42:26Z", RunID: utils.META_DEFAULT, Usage: "10", Cost: 1.01, PreRated: true, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, } eStorCdr := &CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, RequestType: utils.META_RATED, RunID: utils.DEFAULT_RUNID, + Source: utils.UNIT_TEST, RequestType: utils.META_RATED, RunID: utils.META_DEFAULT, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), @@ -62,7 +62,7 @@ func TestCDRClone(t *testing.T) { Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - RunID: utils.DEFAULT_RUNID, Usage: time.Duration(10), + RunID: utils.META_DEFAULT, Usage: time.Duration(10), ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, PreRated: true, } @@ -77,7 +77,7 @@ func TestFieldAsString(t *testing.T) { OriginHost: "192.168.1.1", Source: "test", RequestType: utils.META_RATED, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), RunID: utils.DEFAULT_RUNID, + AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), RunID: utils.META_DEFAULT, Usage: time.Duration(10) * time.Second, Cost: 1.01, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, } @@ -222,7 +222,7 @@ func TestFieldsAsString(t *testing.T) { Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - RunID: utils.DEFAULT_RUNID, Usage: time.Duration(10) * time.Second, + RunID: utils.META_DEFAULT, Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, } eVal := "call_from_1001" @@ -333,7 +333,7 @@ func TestCDRAsHttpForm(t *testing.T) { storCdr := CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.META_RATED, Direction: "*out", Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", - SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), RunID: utils.DEFAULT_RUNID, + SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), RunID: utils.META_DEFAULT, Usage: time.Duration(10) * time.Second, Supplier: "SUPPL1", ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, } @@ -399,14 +399,14 @@ func TestCDRAsExternalCDR(t *testing.T) { Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - RunID: utils.DEFAULT_RUNID, Usage: time.Duration(10 * time.Second), Cost: 1.01, + RunID: utils.META_DEFAULT, Usage: time.Duration(10 * time.Second), Cost: 1.01, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}} expectOutCdr := &ExternalCDR{ CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.META_RATED, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", - SetupTime: "2013-11-07T08:42:20Z", AnswerTime: "2013-11-07T08:42:26Z", RunID: utils.DEFAULT_RUNID, + SetupTime: "2013-11-07T08:42:20Z", AnswerTime: "2013-11-07T08:42:26Z", RunID: utils.META_DEFAULT, Usage: "10s", Cost: 1.01, CostDetails: "null", ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}} if cdrOut := storCdr.AsExternalCDR(); !reflect.DeepEqual(expectOutCdr, cdrOut) { @@ -532,7 +532,7 @@ func TestCDRAsMapStringIface(t *testing.T) { Destination: "+4986517174963", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, @@ -542,7 +542,7 @@ func TestCDRAsMapStringIface(t *testing.T) { "field_extr1": "val_extr1", "fieldextr2": "valextr2", utils.CGRID: cdr.CGRID, - utils.RunID: utils.DEFAULT_RUNID, + utils.RunID: utils.META_DEFAULT, utils.OrderID: cdr.OrderID, utils.OriginHost: "192.168.1.1", utils.Source: utils.UNIT_TEST, @@ -594,7 +594,7 @@ func TestCDRTestCDRAsMapStringIface2(t *testing.T) { Destination: "+4986517174963", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, @@ -607,7 +607,7 @@ func TestCDRTestCDRAsMapStringIface2(t *testing.T) { "field_extr1": "val_extr1", "fieldextr2": "valextr2", utils.CGRID: cdr.CGRID, - utils.RunID: utils.DEFAULT_RUNID, + utils.RunID: utils.META_DEFAULT, utils.OrderID: cdr.OrderID, utils.OriginHost: "192.168.1.1", utils.Source: utils.UNIT_TEST, @@ -671,7 +671,7 @@ func TestCDRAsExportRecord(t *testing.T) { SetupTime: time.Unix(1383813745, 0).UTC(), AnswerTime: time.Unix(1383813746, 0).UTC(), Usage: time.Duration(10) * time.Second, - RunID: utils.DEFAULT_RUNID, Cost: 1.01, + RunID: utils.META_DEFAULT, Cost: 1.01, ExtraFields: map[string]string{"stop_time": "2014-06-11 19:19:00 +0000 UTC", "fieldextr2": "valextr2"}, CostDetails: eventCost, } @@ -795,7 +795,7 @@ func TestCDRAsExportMap(t *testing.T) { Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "+4986517174963", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), - AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), RunID: utils.DEFAULT_RUNID, + AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), RunID: utils.META_DEFAULT, Usage: time.Duration(10) * time.Second, Cost: 1.01, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, } @@ -834,7 +834,7 @@ func TestCDRAsCDRsql(t *testing.T) { Destination: "+4986517174963", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, Usage: time.Duration(10) * time.Second, Cost: 1.01, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, @@ -904,7 +904,7 @@ func TestCDRNewCDRFromSQL(t *testing.T) { Destination: "+4986517174963", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, Usage: time.Duration(10) * time.Second, Cost: 1.01, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, @@ -934,7 +934,7 @@ func TestCDRAsCGREvent(t *testing.T) { Destination: "+4986517174963", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, Usage: time.Duration(10) * time.Second, Cost: 1.01, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, @@ -998,7 +998,7 @@ func TestCDRUpdateFromCGREvent(t *testing.T) { Destination: "+4986517174963", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, Usage: time.Duration(10) * time.Second, Cost: 1.01, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, @@ -1049,7 +1049,7 @@ func TestCDRUpdateFromCGREvent(t *testing.T) { Destination: "+4986517174963", SetupTime: time.Date(2013, 11, 7, 8, 42, 23, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, Usage: time.Duration(13) * time.Second, Cost: 1.01, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, @@ -1124,7 +1124,7 @@ func TestCDRexportFieldValue(t *testing.T) { Destination: "+4986517174963", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, Usage: time.Duration(10) * time.Second, Cost: 1.01, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, diff --git a/engine/cdrecsv_test.go b/engine/cdrecsv_test.go index 9cda96d46..4aebd158f 100644 --- a/engine/cdrecsv_test.go +++ b/engine/cdrecsv_test.go @@ -39,7 +39,7 @@ func TestCsvCdrWriter(t *testing.T) { SetupTime: time.Unix(1383813745, 0).UTC(), AnswerTime: time.Unix(1383813746, 0).UTC(), Usage: time.Duration(10) * time.Second, - RunID: utils.DEFAULT_RUNID, Cost: 1.01, + RunID: utils.META_DEFAULT, Cost: 1.01, ExtraFields: map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, } @@ -77,7 +77,7 @@ func TestAlternativeFieldSeparator(t *testing.T) { SetupTime: time.Unix(1383813745, 0).UTC(), AnswerTime: time.Unix(1383813746, 0).UTC(), Usage: time.Duration(10) * time.Second, - RunID: utils.DEFAULT_RUNID, Cost: 1.01, + RunID: utils.META_DEFAULT, Cost: 1.01, ExtraFields: map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, } @@ -147,7 +147,7 @@ func TestExportVoiceWithConvert(t *testing.T) { SetupTime: time.Unix(1383813745, 0).UTC(), AnswerTime: time.Unix(1383813746, 0).UTC(), Usage: time.Duration(10) * time.Second, - RunID: utils.DEFAULT_RUNID, Cost: 1.01, + RunID: utils.META_DEFAULT, Cost: 1.01, ExtraFields: map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, } @@ -159,7 +159,7 @@ func TestExportVoiceWithConvert(t *testing.T) { SetupTime: time.Unix(1383813745, 0).UTC(), AnswerTime: time.Unix(1383813746, 0).UTC(), Usage: time.Duration(10) * time.Nanosecond, - RunID: utils.DEFAULT_RUNID, Cost: 0.012, + RunID: utils.META_DEFAULT, Cost: 0.012, ExtraFields: map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, } @@ -171,7 +171,7 @@ func TestExportVoiceWithConvert(t *testing.T) { SetupTime: time.Unix(1383813745, 0).UTC(), AnswerTime: time.Unix(1383813746, 0).UTC(), Usage: time.Duration(1), - RunID: utils.DEFAULT_RUNID, Cost: 0.15, + RunID: utils.META_DEFAULT, Cost: 0.15, ExtraFields: map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, } @@ -244,7 +244,7 @@ func TestExportWithFilter(t *testing.T) { SetupTime: time.Unix(1383813745, 0).UTC(), AnswerTime: time.Unix(1383813746, 0).UTC(), Usage: time.Duration(10) * time.Second, - RunID: utils.DEFAULT_RUNID, Cost: 1.01, + RunID: utils.META_DEFAULT, Cost: 1.01, ExtraFields: map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, } @@ -256,7 +256,7 @@ func TestExportWithFilter(t *testing.T) { SetupTime: time.Unix(1383813745, 0).UTC(), AnswerTime: time.Unix(1383813746, 0).UTC(), Usage: time.Duration(10) * time.Nanosecond, - RunID: utils.DEFAULT_RUNID, Cost: 0.012, + RunID: utils.META_DEFAULT, Cost: 0.012, ExtraFields: map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, } @@ -268,7 +268,7 @@ func TestExportWithFilter(t *testing.T) { SetupTime: time.Unix(1383813745, 0).UTC(), AnswerTime: time.Unix(1383813746, 0).UTC(), Usage: time.Duration(1), - RunID: utils.DEFAULT_RUNID, Cost: 0.15, + RunID: utils.META_DEFAULT, Cost: 0.15, ExtraFields: map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, } @@ -340,7 +340,7 @@ func TestExportWithFilter2(t *testing.T) { SetupTime: time.Unix(1383813745, 0).UTC(), AnswerTime: time.Unix(1383813746, 0).UTC(), Usage: time.Duration(10) * time.Second, - RunID: utils.DEFAULT_RUNID, Cost: 1.01, + RunID: utils.META_DEFAULT, Cost: 1.01, ExtraFields: map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, } @@ -352,7 +352,7 @@ func TestExportWithFilter2(t *testing.T) { SetupTime: time.Unix(1383813745, 0).UTC(), AnswerTime: time.Unix(1383813746, 0).UTC(), Usage: time.Duration(10) * time.Nanosecond, - RunID: utils.DEFAULT_RUNID, Cost: 0.012, + RunID: utils.META_DEFAULT, Cost: 0.012, ExtraFields: map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, } @@ -364,7 +364,7 @@ func TestExportWithFilter2(t *testing.T) { SetupTime: time.Unix(1383813745, 0).UTC(), AnswerTime: time.Unix(1383813746, 0).UTC(), Usage: time.Duration(1), - RunID: utils.DEFAULT_RUNID, Cost: 0.15, + RunID: utils.META_DEFAULT, Cost: 0.15, ExtraFields: map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, } diff --git a/engine/cdrefwv_test.go b/engine/cdrefwv_test.go index dece400dd..da80afd58 100644 --- a/engine/cdrefwv_test.go +++ b/engine/cdrefwv_test.go @@ -278,7 +278,7 @@ func TestWriteCdr(t *testing.T) { SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), Usage: time.Duration(10) * time.Second, - RunID: utils.DEFAULT_RUNID, Cost: 2.34567, + RunID: utils.META_DEFAULT, Cost: 2.34567, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, } @@ -343,7 +343,7 @@ func TestWriteCdrs(t *testing.T) { Category: "call", Account: "1001", Subject: "1001", Destination: "1010", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - Usage: time.Duration(10) * time.Second, RunID: utils.DEFAULT_RUNID, Cost: 2.25, + Usage: time.Duration(10) * time.Second, RunID: utils.META_DEFAULT, Cost: 2.25, ExtraFields: map[string]string{"productnumber": "12341", "fieldextr2": "valextr2"}, } cdr2 := &CDR{CGRID: utils.Sha1("aaa2", time.Date(2013, 11, 7, 7, 42, 20, 0, time.UTC).String()), @@ -353,7 +353,7 @@ func TestWriteCdrs(t *testing.T) { SetupTime: time.Date(2013, 11, 7, 7, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 7, 42, 26, 0, time.UTC), Usage: time.Duration(5) * time.Minute, - RunID: utils.DEFAULT_RUNID, Cost: 1.40001, + RunID: utils.META_DEFAULT, Cost: 1.40001, ExtraFields: map[string]string{"productnumber": "12342", "fieldextr2": "valextr2"}, } cdr3 := &CDR{} @@ -364,7 +364,7 @@ func TestWriteCdrs(t *testing.T) { SetupTime: time.Date(2013, 11, 7, 9, 42, 18, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 9, 42, 26, 0, time.UTC), Usage: time.Duration(20) * time.Second, - RunID: utils.DEFAULT_RUNID, Cost: 2.34567, + RunID: utils.META_DEFAULT, Cost: 2.34567, ExtraFields: map[string]string{"productnumber": "12344", "fieldextr2": "valextr2"}, } cfg, _ := config.NewDefaultCGRConfig() diff --git a/engine/storage_cdrs_it_test.go b/engine/storage_cdrs_it_test.go index 0bb785c5f..bddc3ec1c 100644 --- a/engine/storage_cdrs_it_test.go +++ b/engine/storage_cdrs_it_test.go @@ -562,7 +562,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { return fmt.Errorf("testGetCDRs #21, unexpected count of CDRs returned: %d", count) } // Filter on RunID - if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{RunIDs: []string{utils.DEFAULT_RUNID}}, false); err != nil { + if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{RunIDs: []string{utils.META_DEFAULT}}, false); err != nil { return fmt.Errorf("testGetCDRs #22 err: %v", err) } else if len(CDRs) != 5 { return fmt.Errorf("testGetCDRs #23, unexpected number of CDRs returned: %+v", CDRs) diff --git a/engine/suretax_test.go b/engine/suretax_test.go index e7bdbd208..f781978a3 100644 --- a/engine/suretax_test.go +++ b/engine/suretax_test.go @@ -36,7 +36,7 @@ func TestNewSureTaxRequest(t *testing.T) { Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, Usage: time.Duration(12) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, PreRated: true, diff --git a/general_tests/cdrs_onlexp_it_test.go b/general_tests/cdrs_onlexp_it_test.go index 17dd08a54..4630425fc 100644 --- a/general_tests/cdrs_onlexp_it_test.go +++ b/general_tests/cdrs_onlexp_it_test.go @@ -195,7 +195,7 @@ func testCDRsOnExpDisableOnlineExport(t *testing.T) { AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, Cost: 1.201, PreRated: true, } @@ -238,7 +238,7 @@ func testCDRsOnExpHttpCdrReplication(t *testing.T) { AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, Cost: 1.201, PreRated: true, } @@ -366,7 +366,7 @@ func testCDRsOnExpAMQPReplication(t *testing.T) { AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, Cost: 1.201, PreRated: true, } diff --git a/general_tests/oldtutorial_it_test.go b/general_tests/oldtutorial_it_test.go index b8de93987..d4f33f0af 100644 --- a/general_tests/oldtutorial_it_test.go +++ b/general_tests/oldtutorial_it_test.go @@ -601,7 +601,7 @@ package general_tests // SetupTime: time.Date(2014, 8, 4, 13, 0, 0, 0, time.UTC).Local().Format(time.RFC3339), // AnswerTime: time.Date(2014, 8, 4, 13, 0, 7, 0, time.UTC).Local().Format(time.RFC3339), Usage: "2s", // ExtraFields: map[string]string{"Cli": "+4986517174964", "fieldextr2": "valextr2", "SysUserName": "danb4"}, -// RunID: utils.DEFAULT_RUNID, Cost: 1} +// RunID: utils.META_DEFAULT, Cost: 1} // var cdrs []*engine.ExternalCDR // req := utils.RPCCDRsFilter{RunIDs: []string{utils.META_DEFAULT}, // Accounts: []string{"1004"}, DestinationPrefixes: []string{"1001"}} diff --git a/migrator/cdrs_it_test.go b/migrator/cdrs_it_test.go index 41e43a02c..ef18f9ba8 100755 --- a/migrator/cdrs_it_test.go +++ b/migrator/cdrs_it_test.go @@ -147,7 +147,7 @@ func testCdrITMigrateAndMove(t *testing.T) { Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, Usage: time.Duration(10), ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, diff --git a/migrator/session_costs_it_test.go b/migrator/session_costs_it_test.go index ff9084e98..9a9c8b091 100755 --- a/migrator/session_costs_it_test.go +++ b/migrator/session_costs_it_test.go @@ -175,7 +175,7 @@ func testSessionCostITMigrate(t *testing.T) { CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, Usage: time.Duration(10), CostSource: utils.MetaSessionS, CostDetails: cc, @@ -200,7 +200,7 @@ func testSessionCostITMigrate(t *testing.T) { if err != nil { t.Error("Error when migrating SessionsCosts ", err.Error()) } - if rcvCosts, err := sCostMigrator.storDBOut.StorDB().GetSMCosts("", utils.DEFAULT_RUNID, "", ""); err != nil { + if rcvCosts, err := sCostMigrator.storDBOut.StorDB().GetSMCosts("", utils.META_DEFAULT, "", ""); err != nil { t.Error(err) } else if len(rcvCosts) != 1 { t.Errorf("Unexpected number of SessionsCosts returned: %d", len(rcvCosts)) diff --git a/sessions/sessions_test.go b/sessions/sessions_test.go index 3cd098a12..c39a9c3e1 100644 --- a/sessions/sessions_test.go +++ b/sessions/sessions_test.go @@ -92,7 +92,7 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { &SRun{ Event: sEv, CD: &engine.CallDescriptor{ - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, }, }, }, @@ -102,27 +102,27 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { eIndexes := map[string]map[string]map[string]utils.StringMap{ "OriginID": map[string]map[string]utils.StringMap{ "12345": map[string]utils.StringMap{ - cgrID: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID: utils.StringMap{utils.META_DEFAULT: true}, }, }, "Tenant": map[string]map[string]utils.StringMap{ "cgrates.org": map[string]utils.StringMap{ - cgrID: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID: utils.StringMap{utils.META_DEFAULT: true}, }, }, "Account": map[string]map[string]utils.StringMap{ "account1": map[string]utils.StringMap{ - cgrID: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID: utils.StringMap{utils.META_DEFAULT: true}, }, }, "Extra3": map[string]map[string]utils.StringMap{ utils.MetaEmpty: map[string]utils.StringMap{ - cgrID: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID: utils.StringMap{utils.META_DEFAULT: true}, }, }, "Extra4": map[string]map[string]utils.StringMap{ utils.NOT_AVAILABLE: map[string]utils.StringMap{ - cgrID: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID: utils.StringMap{utils.META_DEFAULT: true}, }, }, } @@ -162,7 +162,7 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { &SRun{ Event: sSEv2, CD: &engine.CallDescriptor{ - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, }, }, }, @@ -183,7 +183,7 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { &SRun{ Event: sSEv3, CD: &engine.CallDescriptor{ - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, }, }, }, @@ -192,49 +192,49 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { eIndexes = map[string]map[string]map[string]utils.StringMap{ "OriginID": map[string]map[string]utils.StringMap{ "12345": map[string]utils.StringMap{ - cgrID: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID: utils.StringMap{utils.META_DEFAULT: true}, }, "12346": map[string]utils.StringMap{ - cgrID2: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID2: utils.StringMap{utils.META_DEFAULT: true}, }, "12347": map[string]utils.StringMap{ - cgrID3: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID3: utils.StringMap{utils.META_DEFAULT: true}, }, }, "Tenant": map[string]map[string]utils.StringMap{ "cgrates.org": map[string]utils.StringMap{ - cgrID: utils.StringMap{utils.DEFAULT_RUNID: true}, - cgrID3: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID: utils.StringMap{utils.META_DEFAULT: true}, + cgrID3: utils.StringMap{utils.META_DEFAULT: true}, }, "itsyscom.com": map[string]utils.StringMap{ - cgrID2: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID2: utils.StringMap{utils.META_DEFAULT: true}, }, }, "Account": map[string]map[string]utils.StringMap{ "account1": map[string]utils.StringMap{ - cgrID: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID: utils.StringMap{utils.META_DEFAULT: true}, }, "account2": map[string]utils.StringMap{ - cgrID2: utils.StringMap{utils.DEFAULT_RUNID: true}, - cgrID3: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID2: utils.StringMap{utils.META_DEFAULT: true}, + cgrID3: utils.StringMap{utils.META_DEFAULT: true}, }, }, "Extra3": map[string]map[string]utils.StringMap{ utils.MetaEmpty: map[string]utils.StringMap{ - cgrID: utils.StringMap{utils.DEFAULT_RUNID: true}, - cgrID2: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID: utils.StringMap{utils.META_DEFAULT: true}, + cgrID2: utils.StringMap{utils.META_DEFAULT: true}, }, utils.NOT_AVAILABLE: map[string]utils.StringMap{ - cgrID3: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID3: utils.StringMap{utils.META_DEFAULT: true}, }, }, "Extra4": map[string]map[string]utils.StringMap{ utils.NOT_AVAILABLE: map[string]utils.StringMap{ - cgrID: utils.StringMap{utils.DEFAULT_RUNID: true}, - cgrID3: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID: utils.StringMap{utils.META_DEFAULT: true}, + cgrID3: utils.StringMap{utils.META_DEFAULT: true}, }, "info2": map[string]utils.StringMap{ - cgrID2: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID2: utils.StringMap{utils.META_DEFAULT: true}, }, }, } @@ -274,40 +274,40 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { eIndexes = map[string]map[string]map[string]utils.StringMap{ "OriginID": map[string]map[string]utils.StringMap{ "12346": map[string]utils.StringMap{ - cgrID2: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID2: utils.StringMap{utils.META_DEFAULT: true}, }, "12347": map[string]utils.StringMap{ - cgrID3: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID3: utils.StringMap{utils.META_DEFAULT: true}, }, }, "Tenant": map[string]map[string]utils.StringMap{ "cgrates.org": map[string]utils.StringMap{ - cgrID3: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID3: utils.StringMap{utils.META_DEFAULT: true}, }, "itsyscom.com": map[string]utils.StringMap{ - cgrID2: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID2: utils.StringMap{utils.META_DEFAULT: true}, }, }, "Account": map[string]map[string]utils.StringMap{ "account2": map[string]utils.StringMap{ - cgrID2: utils.StringMap{utils.DEFAULT_RUNID: true}, - cgrID3: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID2: utils.StringMap{utils.META_DEFAULT: true}, + cgrID3: utils.StringMap{utils.META_DEFAULT: true}, }, }, "Extra3": map[string]map[string]utils.StringMap{ utils.MetaEmpty: map[string]utils.StringMap{ - cgrID2: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID2: utils.StringMap{utils.META_DEFAULT: true}, }, utils.NOT_AVAILABLE: map[string]utils.StringMap{ - cgrID3: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID3: utils.StringMap{utils.META_DEFAULT: true}, }, }, "Extra4": map[string]map[string]utils.StringMap{ "info2": map[string]utils.StringMap{ - cgrID2: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID2: utils.StringMap{utils.META_DEFAULT: true}, }, utils.NOT_AVAILABLE: map[string]utils.StringMap{ - cgrID3: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID3: utils.StringMap{utils.META_DEFAULT: true}, }, }, } @@ -338,27 +338,27 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { eIndexes = map[string]map[string]map[string]utils.StringMap{ "OriginID": map[string]map[string]utils.StringMap{ "12346": map[string]utils.StringMap{ - cgrID2: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID2: utils.StringMap{utils.META_DEFAULT: true}, }, }, "Tenant": map[string]map[string]utils.StringMap{ "itsyscom.com": map[string]utils.StringMap{ - cgrID2: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID2: utils.StringMap{utils.META_DEFAULT: true}, }, }, "Account": map[string]map[string]utils.StringMap{ "account2": map[string]utils.StringMap{ - cgrID2: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID2: utils.StringMap{utils.META_DEFAULT: true}, }, }, "Extra3": map[string]map[string]utils.StringMap{ utils.MetaEmpty: map[string]utils.StringMap{ - cgrID2: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID2: utils.StringMap{utils.META_DEFAULT: true}, }, }, "Extra4": map[string]map[string]utils.StringMap{ "info2": map[string]utils.StringMap{ - cgrID2: utils.StringMap{utils.DEFAULT_RUNID: true}, + cgrID2: utils.StringMap{utils.META_DEFAULT: true}, }, }, } @@ -409,7 +409,7 @@ func TestSessionSRegisterAndUnregisterASessions(t *testing.T) { &SRun{ Event: sSEv, CD: &engine.CallDescriptor{ - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, }, }, }, @@ -426,7 +426,7 @@ func TestSessionSRegisterAndUnregisterASessions(t *testing.T) { eIndexes := map[string]map[string]map[string]utils.StringMap{ "OriginID": map[string]map[string]utils.StringMap{ "111": map[string]utils.StringMap{ - "session1": utils.StringMap{utils.DEFAULT_RUNID: true}, + "session1": utils.StringMap{utils.META_DEFAULT: true}, }, }, } @@ -468,7 +468,7 @@ func TestSessionSRegisterAndUnregisterASessions(t *testing.T) { &SRun{ Event: sSEv2, CD: &engine.CallDescriptor{ - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, }, }, }, @@ -484,10 +484,10 @@ func TestSessionSRegisterAndUnregisterASessions(t *testing.T) { eIndexes = map[string]map[string]map[string]utils.StringMap{ "OriginID": map[string]map[string]utils.StringMap{ "111": map[string]utils.StringMap{ - "session1": utils.StringMap{utils.DEFAULT_RUNID: true}, + "session1": utils.StringMap{utils.META_DEFAULT: true}, }, "222": map[string]utils.StringMap{ - "session2": utils.StringMap{utils.DEFAULT_RUNID: true}, + "session2": utils.StringMap{utils.META_DEFAULT: true}, }, }, } @@ -536,7 +536,7 @@ func TestSessionSRegisterAndUnregisterASessions(t *testing.T) { &SRun{ Event: sSEv3, CD: &engine.CallDescriptor{ - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, }, }, }, @@ -561,7 +561,7 @@ func TestSessionSRegisterAndUnregisterASessions(t *testing.T) { eIndexes = map[string]map[string]map[string]utils.StringMap{ "OriginID": map[string]map[string]utils.StringMap{ "222": map[string]utils.StringMap{ - "session2": utils.StringMap{utils.DEFAULT_RUNID: true}, + "session2": utils.StringMap{utils.META_DEFAULT: true}, }, }, } @@ -630,7 +630,7 @@ func TestSessionSRegisterAndUnregisterPSessions(t *testing.T) { &SRun{ Event: sSEv, CD: &engine.CallDescriptor{ - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, }, }, }, @@ -647,7 +647,7 @@ func TestSessionSRegisterAndUnregisterPSessions(t *testing.T) { eIndexes := map[string]map[string]map[string]utils.StringMap{ "OriginID": map[string]map[string]utils.StringMap{ "111": map[string]utils.StringMap{ - "session1": utils.StringMap{utils.DEFAULT_RUNID: true}, + "session1": utils.StringMap{utils.META_DEFAULT: true}, }, }, } @@ -692,7 +692,7 @@ func TestSessionSRegisterAndUnregisterPSessions(t *testing.T) { &SRun{ Event: sSEv2, CD: &engine.CallDescriptor{ - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, }, }, }, @@ -708,10 +708,10 @@ func TestSessionSRegisterAndUnregisterPSessions(t *testing.T) { eIndexes = map[string]map[string]map[string]utils.StringMap{ "OriginID": map[string]map[string]utils.StringMap{ "111": map[string]utils.StringMap{ - "session1": utils.StringMap{utils.DEFAULT_RUNID: true}, + "session1": utils.StringMap{utils.META_DEFAULT: true}, }, "222": map[string]utils.StringMap{ - "session2": utils.StringMap{utils.DEFAULT_RUNID: true}, + "session2": utils.StringMap{utils.META_DEFAULT: true}, }, }, } @@ -778,7 +778,7 @@ func TestSessionSRegisterAndUnregisterPSessions(t *testing.T) { eIndexes = map[string]map[string]map[string]utils.StringMap{ "OriginID": map[string]map[string]utils.StringMap{ "222": map[string]utils.StringMap{ - "session2": utils.StringMap{utils.DEFAULT_RUNID: true}, + "session2": utils.StringMap{utils.META_DEFAULT: true}, }, }, } @@ -1932,7 +1932,7 @@ func TestSessionSgetSession(t *testing.T) { &SRun{ Event: sSEv, CD: &engine.CallDescriptor{ - RunID: utils.DEFAULT_RUNID, + RunID: utils.META_DEFAULT, }, }, }, diff --git a/utils/consts.go b/utils/consts.go index 33a431d89..c8a981cc1 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -223,7 +223,6 @@ const ( RATED = "rated" Partial = "Partial" PreRated = "PreRated" - DEFAULT_RUNID = "*default" META_DEFAULT = "*default" STATIC_VALUE_PREFIX = "^" CSV = "csv" From ae5f0319a167cabc3268778211892578d1e01164 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Fri, 13 Dec 2019 10:37:27 +0200 Subject: [PATCH 4/5] Updated kafka integration tests --- ers/kafka_it_test.go | 11 ++++++----- general_tests/cdrs_onlexp_it_test.go | 20 +++++++++----------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/ers/kafka_it_test.go b/ers/kafka_it_test.go index 56462c6a5..565f4e51c 100644 --- a/ers/kafka_it_test.go +++ b/ers/kafka_it_test.go @@ -22,6 +22,7 @@ package ers import ( "context" + "fmt" "reflect" "testing" "time" @@ -80,11 +81,11 @@ func TestKafkaER(t *testing.T) { Brokers: []string{"localhost:9092"}, Topic: defaultTopic, }) - + randomCGRID := utils.UUIDSha1Prefix() w.WriteMessages(context.Background(), kafka.Message{ - Key: []byte("TestKey"), // for the momment we do not proccess the key - Value: []byte(`{"CGRID": "RandomCGRID"}`), + Key: []byte(randomCGRID), // for the momment we do not proccess the key + Value: []byte(fmt.Sprintf(`{"CGRID": "%s"}`, randomCGRID)), }, ) @@ -101,14 +102,14 @@ func TestKafkaER(t *testing.T) { ID: ev.cgrEvent.ID, Time: ev.cgrEvent.Time, Event: map[string]interface{}{ - "CGRID": "RandomCGRID", + "CGRID": randomCGRID, }, } if !reflect.DeepEqual(ev.cgrEvent, expected) { t.Errorf("Expected %s ,received %s", utils.ToJSON(expected), utils.ToJSON(ev.cgrEvent)) } case <-time.After(10 * time.Second): - t.Errorf("Timeout") + t.Fatal("Timeout") } rdrExit <- struct{}{} } diff --git a/general_tests/cdrs_onlexp_it_test.go b/general_tests/cdrs_onlexp_it_test.go index 4630425fc..9376e5e06 100644 --- a/general_tests/cdrs_onlexp_it_test.go +++ b/general_tests/cdrs_onlexp_it_test.go @@ -23,6 +23,7 @@ package general_tests import ( "context" "encoding/json" + "fmt" "io/ioutil" "os" "os/exec" @@ -44,6 +45,9 @@ var ( cdrsMasterCfgPath, cdrsSlaveCfgPath string cdrsMasterCfg, cdrsSlaveCfg *config.CGRConfig cdrsMasterRpc *rpcclient.RPCClient + httpCGRID = utils.UUIDSha1Prefix() + amqpCGRID = utils.UUIDSha1Prefix() + failoverContent = [][]byte{[]byte(fmt.Sprintf(`{"CGRID":"%s"}`, httpCGRID)), []byte(fmt.Sprintf(`{"CGRID":"%s"}`, amqpCGRID))} sTestsCDRsOnExp = []func(t *testing.T){ testCDRsOnExpInitConfig, @@ -223,7 +227,7 @@ func testCDRsOnExpDisableOnlineExport(t *testing.T) { func testCDRsOnExpHttpCdrReplication(t *testing.T) { testCdr1 := &engine.CDR{ - CGRID: utils.Sha1("httpjsonrpc1", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()), + CGRID: httpCGRID, ToR: utils.VOICE, OriginID: "httpjsonrpc1", OriginHost: "192.168.1.1", @@ -321,7 +325,7 @@ func testCDRsOnExpAMQPReplication(t *testing.T) { if err := json.Unmarshal(d.Body, &rcvCDR); err != nil { t.Error(err) } - if rcvCDR[utils.CGRID] != utils.Sha1("httpjsonrpc1", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()) { + if rcvCDR[utils.CGRID] != httpCGRID { t.Errorf("Unexpected CDR received: %+v", rcvCDR) } case <-time.After(time.Duration(100 * time.Millisecond)): @@ -337,7 +341,7 @@ func testCDRsOnExpAMQPReplication(t *testing.T) { if err := json.Unmarshal(d.Body, &rcvCDR); err != nil { t.Error(err) } - if rcvCDR[utils.CGRID] != utils.Sha1("httpjsonrpc1", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()) { + if rcvCDR[utils.CGRID] != httpCGRID { t.Errorf("Unexpected CDR received: %+v", rcvCDR) } case <-time.After(time.Duration(100 * time.Millisecond)): @@ -351,7 +355,7 @@ func testCDRsOnExpAMQPReplication(t *testing.T) { } time.Sleep(time.Duration(5 * time.Second)) testCdr := &engine.CDR{ - CGRID: utils.Sha1("amqpreconnect", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()), + CGRID: amqpCGRID, ToR: utils.VOICE, OriginID: "amqpreconnect", OriginHost: "192.168.1.1", @@ -456,7 +460,6 @@ func testCDRsOnExpHTTPPosterFileFailover(t *testing.T) { func testCDRsOnExpAMQPPosterFileFailover(t *testing.T) { time.Sleep(time.Duration(5 * time.Second)) - failoverContent := [][]byte{[]byte(`{"CGRID":"57548d485d61ebcba55afbe5d939c82a8e9ff670"}`), []byte(`{"CGRID":"88ed9c38005f07576a1e1af293063833b60edcc6"}`)} filesInDir, _ := ioutil.ReadDir(cdrsMasterCfg.GeneralCfg().FailedPostsDir) if len(filesInDir) == 0 { t.Fatalf("No files in directory: %s", cdrsMasterCfg.GeneralCfg().FailedPostsDir) @@ -485,7 +488,6 @@ func testCDRsOnExpAMQPPosterFileFailover(t *testing.T) { func testCDRsOnExpAWSAMQPPosterFileFailover(t *testing.T) { time.Sleep(time.Duration(10 * time.Second)) - failoverContent := [][]byte{[]byte(`{"CGRID":"57548d485d61ebcba55afbe5d939c82a8e9ff670"}`), []byte(`{"CGRID":"88ed9c38005f07576a1e1af293063833b60edcc6"}`)} filesInDir, _ := ioutil.ReadDir(cdrsMasterCfg.GeneralCfg().FailedPostsDir) if len(filesInDir) == 0 { t.Fatalf("No files in directory: %s", cdrsMasterCfg.GeneralCfg().FailedPostsDir) @@ -513,8 +515,6 @@ func testCDRsOnExpAWSAMQPPosterFileFailover(t *testing.T) { } func testCDRsOnExpKafkaPosterFileFailover(t *testing.T) { - failoverContent := [][]byte{[]byte(`{"CGRID":"57548d485d61ebcba55afbe5d939c82a8e9ff670"}`), []byte(`{"CGRID":"88ed9c38005f07576a1e1af293063833b60edcc6"}`)} - reader := kafka.NewReader(kafka.ReaderConfig{ Brokers: []string{"localhost:9092"}, Topic: "cgrates_cdrs", @@ -524,7 +524,7 @@ func testCDRsOnExpKafkaPosterFileFailover(t *testing.T) { defer reader.Close() - for i := 0; i < 4; i++ { + for i := 0; i < 2; i++ { // no raw CDR ctx, _ := context.WithTimeout(context.Background(), 10*time.Second) if m, err := reader.ReadMessage(ctx); err != nil { t.Fatal(err) @@ -536,7 +536,6 @@ func testCDRsOnExpKafkaPosterFileFailover(t *testing.T) { func testCDRsOnExpSQSPosterFileFailover(t *testing.T) { time.Sleep(time.Duration(10 * time.Second)) - failoverContent := [][]byte{[]byte(`{"CGRID":"57548d485d61ebcba55afbe5d939c82a8e9ff670"}`), []byte(`{"CGRID":"88ed9c38005f07576a1e1af293063833b60edcc6"}`)} filesInDir, _ := ioutil.ReadDir(cdrsMasterCfg.GeneralCfg().FailedPostsDir) if len(filesInDir) == 0 { t.Fatalf("No files in directory: %s", cdrsMasterCfg.GeneralCfg().FailedPostsDir) @@ -565,7 +564,6 @@ func testCDRsOnExpSQSPosterFileFailover(t *testing.T) { func testCDRsOnExpS3PosterFileFailover(t *testing.T) { time.Sleep(time.Duration(10 * time.Second)) - failoverContent := [][]byte{[]byte(`{"CGRID":"57548d485d61ebcba55afbe5d939c82a8e9ff670"}`), []byte(`{"CGRID":"88ed9c38005f07576a1e1af293063833b60edcc6"}`)} filesInDir, _ := ioutil.ReadDir(cdrsMasterCfg.GeneralCfg().FailedPostsDir) if len(filesInDir) == 0 { t.Fatalf("No files in directory: %s", cdrsMasterCfg.GeneralCfg().FailedPostsDir) From 03f0d4bec1aecaf6a52b07f702e5fe32485593ef Mon Sep 17 00:00:00 2001 From: Trial97 Date: Fri, 13 Dec 2019 11:56:13 +0200 Subject: [PATCH 5/5] Updated cgr-loader. Fixes #1817 --- cmd/cgr-loader/cgr-loader.go | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index 0514a90c8..cd6b4985f 100755 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -101,6 +101,7 @@ var ( cacheSAddress = cgrLoaderFlags.String("caches_address", dfltCfg.LoaderCgrCfg().CachesConns[0], "CacheS component to contact for cache reloads, empty to disable automatic cache reloads") schedulerAddress = cgrLoaderFlags.String("scheduler_address", dfltCfg.LoaderCgrCfg().SchedulerConns[0], "") + rpcEncoding = cgrLoaderFlags.String("rpc_encoding", rpcclient.JSONrpc, "RPC encoding used <*gob|*json>") ) func main() { @@ -196,18 +197,36 @@ func main() { } if *cacheSAddress != dfltCfg.LoaderCgrCfg().CachesConns[0] { - ldrCfg.LoaderCgrCfg().CachesConns = make([]string, 0) - if *cacheSAddress != "" { - ldrCfg.LoaderCgrCfg().CachesConns = append(ldrCfg.LoaderCgrCfg().CachesConns, - *cacheSAddress) + if *cacheSAddress == utils.EmptyString { + ldrCfg.LoaderCgrCfg().CachesConns = []string{} + } else { + ldrCfg.LoaderCgrCfg().CachesConns = []string{*cacheSAddress} + if _, has := ldrCfg.RPCConns()[*cacheSAddress]; !has { + ldrCfg.RPCConns()[*cacheSAddress] = &config.RPCConn{ + Strategy: rpcclient.PoolFirst, + Conns: []*config.RemoteHost{{ + Address: *cacheSAddress, + Transport: *rpcEncoding, + }}, + } + } } } if *schedulerAddress != dfltCfg.LoaderCgrCfg().SchedulerConns[0] { - ldrCfg.LoaderCgrCfg().SchedulerConns = make([]string, 0) - if *schedulerAddress != "" { - ldrCfg.LoaderCgrCfg().SchedulerConns = append(ldrCfg.LoaderCgrCfg().SchedulerConns, - *schedulerAddress) + if *schedulerAddress == utils.EmptyString { + ldrCfg.LoaderCgrCfg().SchedulerConns = []string{} + } else { + ldrCfg.LoaderCgrCfg().SchedulerConns = []string{*schedulerAddress} + if _, has := ldrCfg.RPCConns()[*schedulerAddress]; !has { + ldrCfg.RPCConns()[*schedulerAddress] = &config.RPCConn{ + Strategy: rpcclient.PoolFirst, + Conns: []*config.RemoteHost{{ + Address: *schedulerAddress, + Transport: *rpcEncoding, + }}, + } + } } }