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

AgentRequest.AsNavigableMap operational with test

Browse Source
This commit is contained in:
DanB
2018-06-21 12:18:48 +02:00
parent cea2bbc3c3
commit 3478b74c7e
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
agents/agentreq.go
View File

@@ -112,11 +112,12 @@ func (ar *AgentRequest) AsNavigableMap(tplFlds []*config.CfgCdrField) (
} else if !pass {
continue
}
if out, err := ar.ParseField(tplFld); err != nil {
out, err := ar.ParseField(tplFld)
if err != nil {
return nil, err
} else {
nM.Set(strings.Split(tplFld.FieldId, utils.HIERARCHY_SEP), out, true)
}
nM.Set(strings.Split(tplFld.FieldId,
utils.HIERARCHY_SEP), out, true)
}
return
}
@@ -159,7 +160,7 @@ func (ar *AgentRequest) composedField(outTpl utils.RSRFields) (outVal string) {
}
continue
}
valStr, err := ar.FieldAsString(strings.Split(rsrTpl.Id, utils.CONCATENATED_KEY_SEP))
valStr, err := ar.FieldAsString(strings.Split(rsrTpl.Id, utils.HIERARCHY_SEP))
if err != nil {
utils.Logger.Warning(
fmt.Sprintf("<%s> %s",

23
agents/agentreq_test.go
View File

@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package agents
import (
"fmt"
"reflect"
"testing"
"time"
@@ -85,19 +85,30 @@ func TestAgReqAsNavigableMap(t *testing.T) {
&config.CfgCdrField{Tag: "AttrPaypalAccount",
FieldId: "PaypalAccount", Type: utils.META_COMPOSED,
Filters: []string{"*string:*cgrReply>Error:"},
Value: utils.ParseRSRFieldsMustCompile("*cgrReply>Attributes>PaypalAccount", utils.INFIELD_SEP)},
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)},
Value: utils.ParseRSRFieldsMustCompile(
"*cgrReply>MaxUsage{*duration_seconds}", 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)},
Value: utils.ParseRSRFieldsMustCompile(
"*cgrReply>Error", utils.INFIELD_SEP)},
}
eMp := engine.NewNavigableMap(nil)
eMp.Set([]string{utils.Tenant}, "cgrates.org", true)
eMp.Set([]string{utils.Account}, "1001", true)
eMp.Set([]string{utils.Destination}, "1002", true)
eMp.Set([]string{"RequestedUsage"}, "180", true)
eMp.Set([]string{"PaypalAccount"}, "cgrates@paypal.com", true)
eMp.Set([]string{"MaxUsage"}, "120", true)
if mpOut, err := agReq.AsNavigableMap(tplFlds); err != nil {
t.Error(err)
} else {
fmt.Printf("mpOut: %+v\n", mpOut.AsMapStringInterface())
} else if !reflect.DeepEqual(eMp, mpOut) {
t.Errorf("expecting: %+v, received: %+v",
eMp.AsMapStringInterface(), mpOut.AsMapStringInterface())
}
}