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

Radius processorVars with *cgrReply support to retrieve values in templates

Browse Source
This commit is contained in:
DanB
2018-02-02 17:19:44 +01:00
parent a3e14effc3
commit a230f032d8
3 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
agents/librad.go
View File

@@ -50,6 +50,29 @@ func (pv processorVars) hasVar(k string) (has bool) {
return
}
// valAsString returns the string value for fldName
// returns empty if fldName not found
func (pv processorVars) valAsString(fldPath string) (val string, err error) {
fldName := fldPath
if strings.HasPrefix(fldPath, utils.MetaCGRReply) {
fldName = utils.MetaCGRReply
}
if !pv.hasVar(fldName) {
return "", errors.New("not found")
}
if fldName == utils.MetaCGRReply {
cgrRply := pv[utils.MetaCGRReply].(*utils.CGRReply)
return cgrRply.GetFieldAsString(fldPath, utils.HIERARCHY_SEP)
}
if valIface, hasIt := pv[fldName]; hasIt { // ProcessorVars have priority
var canCast bool
if val, canCast = utils.CastFieldIfToString(valIface); !canCast {
return "", fmt.Errorf("cannot cast field <%s> to string", fldPath)
}
}
return
}
// radAttrVendorFromPath returns AttributenName and VendorName from path
// path should be the form attributeName or vendorName/attributeName
func attrVendorFromPath(path string) (attrName, vendorName string) {
@@ -98,15 +121,15 @@ func radComposedFieldValue(pkt *radigo.Packet,
outVal += rsrTpl.ParseValue("")
continue
}
if valIface, hasIt := processorVars[rsrTpl.Id]; hasIt { // ProcessorVars have priority
if val, canCast := utils.CastFieldIfToString(valIface); !canCast {
if val, err := processorVars.valAsString(rsrTpl.Id); err != nil {
if err.Error() != "not found" {
utils.Logger.Warning(
fmt.Sprintf("<%s> cannot cast field <%s> to string",
utils.RadiusAgent, rsrTpl.Id))
} else {
outVal += rsrTpl.ParseValue(val)
fmt.Sprintf("<%s> %s",
utils.RadiusAgent, err.Error()))
continue
}
continue
} else {
outVal += rsrTpl.ParseValue(val)
}
for _, avp := range pkt.AttributesWithName(
attrVendorFromPath(rsrTpl.Id)) {

3
agents/librad_test.go
View File

@@ -137,7 +137,8 @@ func TestRadComposedFieldValue(t *testing.T) {
}
eOut := fmt.Sprintf("%s|flopsy|CGR1", MetaRadAcctStart)
if out := radComposedFieldValue(pkt, processorVars{MetaRadReqType: MetaRadAcctStart},
utils.ParseRSRFieldsMustCompile(fmt.Sprintf("%s;^|;User-Name;^|;Cisco/Cisco-NAS-Port", MetaRadReqType), utils.INFIELD_SEP)); out != eOut {
utils.ParseRSRFieldsMustCompile(fmt.Sprintf("%s;^|;User-Name;^|;Cisco/Cisco-NAS-Port",
MetaRadReqType), utils.INFIELD_SEP)); out != eOut {
t.Errorf("Expecting: <%s>, received: <%s>", eOut, out)
}
}

2
data/conf/samples/radagent/cgrates.json
View File

@@ -116,7 +116,7 @@
],
"reply_fields":[
{"tag": "MaxUsage", "field_id": "SIP-AVP", "type": "*composed",
"value": "^session_max_time#;~*cgrMaxUsage:s/(\\d*)\\d{9}$/$1/", "mandatory": true},
"value": "^session_max_time#;~*cgrReply>MaxUsage:s/(\\d*)\\d{9}$/$1/", "mandatory": true},
],
},
{