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

Replaced DEFAULT_RUNID with META_DEFAULT

Browse Source
This commit is contained in:
Trial97
2019-12-13 10:09:02 +02:00
parent 4ea310ca70
commit 1df6f3be46
19 changed files with 112 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agents/fsevent.go
View File

@@ -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:

2
agents/fsevent_test.go
View File

@@ -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" {

4
apier/v1/apier_it_test.go
View File

@@ -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,

8
apier/v1/cdre_it_test.go
View File

@@ -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,
},
}

2
console/cost_details.go
View File

@@ -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
}

8
dispatchers/stats_it_test.go
View File

@@ -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",
},

4
engine/action.go
View File

@@ -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
}
}

2
engine/cdr_it_test.go
View File

@@ -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)

40
engine/cdr_test.go
View File

@@ -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"},

22
engine/cdrecsv_test.go
View File

@@ -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"},
}

8
engine/cdrefwv_test.go
View File

@@ -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()

2
engine/storage_cdrs_it_test.go
View File

@@ -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)

2
engine/suretax_test.go
View File

@@ -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,

6
general_tests/cdrs_onlexp_it_test.go
View File

@@ -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,
}

2
general_tests/oldtutorial_it_test.go
View File

@@ -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"}}

2
migrator/cdrs_it_test.go
View File

@@ -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,

4
migrator/session_costs_it_test.go
View File

@@ -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))

104
sessions/sessions_test.go
View File

@@ -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,
},
},
},

1
utils/consts.go
View File

@@ -223,7 +223,6 @@ const (
RATED = "rated"
Partial = "Partial"
PreRated = "PreRated"
DEFAULT_RUNID = "*default"
META_DEFAULT = "*default"
STATIC_VALUE_PREFIX = "^"
CSV = "csv"