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

Clone function for CGREvent initialize the Opts map

Browse Source
This commit is contained in:
TeoV
2021-01-14 11:09:54 +02:00
committed by Dan Christian Bogos
parent 906baa051a
commit 0e8dadaf69
27 changed files with 1899 additions and 2323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
engine/actions_test.go
View File

@@ -2698,6 +2698,7 @@ func TestCdrLogAction(t *testing.T) {
"ToR": "*monetary",
"Usage": mock.args.CGREvent.Event["Usage"],
},
Opts: map[string]interface{}{},
}
if !reflect.DeepEqual(expCgrEv, mock.args.CGREvent) {
t.Errorf("Expected: %+v \n,received: %+v", expCgrEv, mock.args.CGREvent)

1
engine/cdr.go
View File

@@ -448,6 +448,7 @@ func (cdr *CDR) AsCGREvent() *utils.CGREvent {
Tenant: cdr.Tenant,
ID: utils.UUIDSha1Prefix(),
Event: cdr.AsMapStringIface(),
Opts: map[string]interface{}{},
}
}

6
engine/chargers.go
View File

@@ -108,11 +108,6 @@ type ChrgSProcessEventReply struct {
func (cS *ChargerService) processEvent(tnt string, cgrEv *utils.CGREvent) (rply []*ChrgSProcessEventReply, err error) {
var cPs ChargerProfiles
cgrEv.Opts = MapEvent(cgrEv.Opts).Clone()
if cgrEv.Opts == nil {
cgrEv.Opts = make(map[string]interface{})
}
cgrEv.Opts[utils.Subsys] = utils.MetaChargers
var processRuns *int
if val, has := cgrEv.Opts[utils.OptsAttributesProcessRuns]; has {
if v, err := utils.IfaceAsTInt64(val); err == nil {
@@ -127,6 +122,7 @@ func (cS *ChargerService) processEvent(tnt string, cgrEv *utils.CGREvent) (rply
clonedEv := cgrEv.Clone()
clonedEv.Tenant = tnt
clonedEv.Event[utils.RunID] = cP.RunID
clonedEv.Opts[utils.Subsys] = utils.MetaChargers
rply[i] = &ChrgSProcessEventReply{
ChargerSProfile: cP.ID,
CGREvent: clonedEv,

11
engine/z_attributes_test.go
View File

@@ -1989,6 +1989,7 @@ func TestProcessAttributeVariable(t *testing.T) {
"RandomField": "Val2",
utils.Weight: "20.0",
},
Opts: map[string]interface{}{},
},
}
eNM := utils.MapStorage{
@@ -2055,6 +2056,7 @@ func TestProcessAttributeComposed(t *testing.T) {
"RandomField2": "Concatenated",
utils.Weight: "20.0",
},
Opts: map[string]interface{}{},
},
}
eNM := utils.MapStorage{
@@ -2116,6 +2118,7 @@ func TestProcessAttributeUsageDifference(t *testing.T) {
"RandomField2": "1514804400",
utils.Weight: "20.0",
},
Opts: map[string]interface{}{},
},
}
eNM := utils.MapStorage{
@@ -2177,6 +2180,7 @@ func TestProcessAttributeSum(t *testing.T) {
"RandomField2": "5",
utils.Weight: "20.0",
},
Opts: map[string]interface{}{},
},
}
eNM := utils.MapStorage{
@@ -2238,6 +2242,7 @@ func TestProcessAttributeDiff(t *testing.T) {
"RandomField2": "5",
utils.Weight: "20.0",
},
Opts: map[string]interface{}{},
},
}
eNM := utils.MapStorage{
@@ -2299,6 +2304,7 @@ func TestProcessAttributeMultiply(t *testing.T) {
"RandomField2": "5",
utils.Weight: "20.0",
},
Opts: map[string]interface{}{},
},
}
eNM := utils.MapStorage{
@@ -2360,6 +2366,7 @@ func TestProcessAttributeDivide(t *testing.T) {
"RandomField2": "5",
utils.Weight: "20.0",
},
Opts: map[string]interface{}{},
},
}
eNM := utils.MapStorage{
@@ -2421,6 +2428,7 @@ func TestProcessAttributeValueExponent(t *testing.T) {
"RandomField2": "5",
utils.Weight: "20.0",
},
Opts: map[string]interface{}{},
},
}
eNM := utils.MapStorage{
@@ -2482,6 +2490,7 @@ func TestProcessAttributeUnixTimeStamp(t *testing.T) {
"RandomField2": "2013-12-30T15:00:01Z",
utils.Weight: "20.0",
},
Opts: map[string]interface{}{},
},
}
eNM := utils.MapStorage{
@@ -2542,6 +2551,7 @@ func TestProcessAttributePrefix(t *testing.T) {
"Field2": "Val2",
utils.Weight: "20.0",
},
Opts: map[string]interface{}{},
},
}
eNM := utils.MapStorage{
@@ -2602,6 +2612,7 @@ func TestProcessAttributeSuffix(t *testing.T) {
"Field2": "Val2",
utils.Weight: "20.0",
},
Opts: map[string]interface{}{},
},
}
eNM := utils.MapStorage{