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

Adding CGRRequest in AgentRequest struct

Browse Source
This commit is contained in:
DanB
2018-06-20 14:05:06 +02:00
parent 57e4aef1ce
commit fd14eb6b93
4 changed files with 84 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
agents/agentreq.go
View File

@@ -30,11 +30,12 @@ import (
func newAgentRequest(req engine.DataProvider, tntTpl utils.RSRFields,
dfltTenant string, filterS *engine.FilterS) (ar *AgentRequest) {
ar = &AgentRequest{
Request: req,
Vars: engine.NewNavigableMap(nil),
CGRReply: engine.NewNavigableMap(nil),
Reply: engine.NewNavigableMap(nil),
filterS: filterS,
Request: req,
Vars: engine.NewNavigableMap(nil),
CGRRequest: engine.NewNavigableMap(nil),
CGRReply: engine.NewNavigableMap(nil),
Reply: engine.NewNavigableMap(nil),
filterS: filterS,
}
// populate tenant
if tntIf, err := ar.ParseField(
@@ -50,12 +51,13 @@ func newAgentRequest(req engine.DataProvider, tntTpl utils.RSRFields,
// AgentRequest represents data related to one request towards agent
// implements engine.DataProvider so we can pass it to filters
type AgentRequest struct {
Tenant string
Request engine.DataProvider // request
Vars *engine.NavigableMap // shared data
CGRReply *engine.NavigableMap
Reply *engine.NavigableMap
filterS *engine.FilterS
Tenant string
Request engine.DataProvider // request
Vars *engine.NavigableMap // shared data
CGRRequest *engine.NavigableMap
CGRReply *engine.NavigableMap
Reply *engine.NavigableMap
filterS *engine.FilterS
}
// String implements engine.DataProvider
@@ -72,6 +74,8 @@ func (ar *AgentRequest) FieldAsInterface(fldPath []string) (val interface{}, err
return ar.Request.FieldAsInterface(fldPath[1:])
case utils.MetaVars:
return ar.Vars.FieldAsInterface(fldPath[1:])
case utils.MetaCGRRequest:
return ar.CGRRequest.FieldAsInterface(fldPath[1:])
case utils.MetaCGRReply:
return ar.CGRReply.FieldAsInterface(fldPath[1:])
case utils.MetaReply:
@@ -88,6 +92,8 @@ func (ar *AgentRequest) FieldAsString(fldPath []string) (val string, err error)
return ar.Request.FieldAsString(fldPath[1:])
case utils.MetaVars:
return ar.Vars.FieldAsString(fldPath[1:])
case utils.MetaCGRRequest:
return ar.CGRRequest.FieldAsString(fldPath[1:])
case utils.MetaCGRReply:
return ar.CGRReply.FieldAsString(fldPath[1:])
case utils.MetaReply:

72
agents/agentreq_test.go
View File

@@ -35,15 +35,69 @@ func TestAgReqAsNavigableMap(t *testing.T) {
filterS := engine.NewFilterS(cfg, nil, dm)
agReq := newAgentRequest(nil, nil,
"cgrates.org", filterS)
agReq.CGRReply.Set([]string{utils.CGRID}, utils.Sha1("dsafdsaf",
// populate request, emulating the way will be done in HTTPAgent
agReq.CGRRequest.Set([]string{utils.CGRID}, utils.Sha1("dsafdsaf",
time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), false)
agReq.CGRReply.Set([]string{utils.Account}, "1001", false)
agReq.CGRReply.Set([]string{utils.Destination}, "1002", false)
agReq.CGRReply.Set([]string{utils.AnswerTime},
agReq.CGRRequest.Set([]string{utils.ToR}, utils.VOICE, false)
agReq.CGRRequest.Set([]string{utils.Account}, "1001", false)
agReq.CGRRequest.Set([]string{utils.Destination}, "1002", false)
agReq.CGRRequest.Set([]string{utils.AnswerTime},
time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC), false)
agReq.CGRReply.Set([]string{utils.RequestType}, utils.META_PREPAID, false)
agReq.CGRReply.Set([]string{utils.Usage}, time.Duration(2*time.Minute), false)
agReq.CGRReply.Set([]string{utils.Cost}, 1.2, false)
fmt.Printf("CGRReply: %+v\n", agReq.CGRReply.AsMapStringInterface())
fmt.Printf("agReq: %+v\n", agReq)
agReq.CGRRequest.Set([]string{utils.RequestType}, utils.META_PREPAID, false)
agReq.CGRRequest.Set([]string{utils.Usage}, time.Duration(3*time.Minute), false)
cgrRply := map[string]interface{}{
utils.CapAttributes: map[string]interface{}{
"PaypalAccount": "cgrates@paypal.com",
},
utils.CapMaxUsage: time.Duration(120 * time.Second),
utils.Error: "",
}
agReq.CGRReply = engine.NewNavigableMap(cgrRply)
tplFlds := []*config.CfgCdrField{
&config.CfgCdrField{Tag: "Tenant",
FieldId: utils.Tenant, Type: utils.META_COMPOSED,
Value: utils.ParseRSRFieldsMustCompile("^cgrates.org", utils.INFIELD_SEP)},
&config.CfgCdrField{Tag: "Account",
FieldId: utils.Account, Type: utils.META_COMPOSED,
Value: utils.ParseRSRFieldsMustCompile("*cgrRequest>Account", utils.INFIELD_SEP)},
&config.CfgCdrField{Tag: "Destination",
FieldId: utils.Destination, Type: utils.META_COMPOSED,
Value: utils.ParseRSRFieldsMustCompile("*cgrRequest>Destination", utils.INFIELD_SEP)},
&config.CfgCdrField{Tag: "RequestedUsageVoice",
FieldId: "RequestedUsage", Type: utils.META_COMPOSED,
Filters: []string{"*string:*cgrRequest>ToR:*voice"},
Value: utils.ParseRSRFieldsMustCompile(
"*cgrRequest>Usage{*duration_seconds}", utils.INFIELD_SEP)},
&config.CfgCdrField{Tag: "RequestedUsageData",
FieldId: "RequestedUsage", Type: utils.META_COMPOSED,
Filters: []string{"*string:*cgrRequest>ToR:*data"},
Value: utils.ParseRSRFieldsMustCompile(
"*cgrRequest>Usage{*duration_nanoseconds}", utils.INFIELD_SEP)},
&config.CfgCdrField{Tag: "RequestedUsageSMS",
FieldId: "RequestedUsage", Type: utils.META_COMPOSED,
Filters: []string{"*string:*cgrRequest>ToR:*sms"},
Value: utils.ParseRSRFieldsMustCompile(
"*cgrRequest>Usage{*duration_nanoseconds}", utils.INFIELD_SEP)},
&config.CfgCdrField{Tag: "AttrPaypalAccount",
FieldId: "PaypalAccount", Type: utils.META_COMPOSED,
Filters: []string{"*string:*cgrReply>Error:"},
Value: utils.ParseRSRFieldsMustCompile("*cgrReply>Attributes>PaypalAccount", utils.INFIELD_SEP)},
&config.CfgCdrField{Tag: "MaxUsage",
FieldId: "MaxUsage", Type: utils.META_COMPOSED,
Filters: []string{"*string:*cgrReply>Error:"},
Value: utils.ParseRSRFieldsMustCompile("*cgrReply>MaxUsage", utils.INFIELD_SEP)},
&config.CfgCdrField{Tag: "Error",
FieldId: "Error", Type: utils.META_COMPOSED,
Filters: []string{"*rsr::*cgrReply>Error(!^$)"},
Value: utils.ParseRSRFieldsMustCompile("*cgrReply>Error", utils.INFIELD_SEP)},
}
if mpOut, err := agReq.AsNavigableMap(tplFlds); err != nil {
t.Error(err)
} else {
fmt.Printf("mpOut: %+v\n", mpOut.AsMapStringInterface())
}
}

7
agents/httpagent.go
View File

@@ -109,15 +109,14 @@ func (ha *HTTPAgent) processRequest(reqProcessor *config.HttpAgntProcCfg,
reqProcessor.Filters, agReq); err != nil || !pass {
return pass, err
}
reqEv, err := agReq.AsNavigableMap(reqProcessor.RequestFields)
if err != nil {
return false, err
if agReq.CGRRequest, err = agReq.AsNavigableMap(reqProcessor.RequestFields); err != nil {
return
}
cgrEv := &utils.CGREvent{
Tenant: agReq.Tenant,
ID: utils.UUIDSha1Prefix(),
Time: utils.TimePointer(time.Now()),
Event: reqEv.AsMapStringInterface(),
Event: agReq.CGRRequest.AsMapStringInterface(),
}
var reqType string
for _, typ := range []string{

1
utils/consts.go
View File

@@ -520,6 +520,7 @@ const (
MetaSessionS = "*sessions"
MetaDefault = "*default"
Error = "Error"
MetaCGRRequest = "*cgrRequest"
MetaCGRReply = "*cgrReply"
CacheS = "CacheS"
CGR_ACD = "cgr_acd"