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 - use > as separator within Vendor attribute selection, so we can be consistent

Browse Source
This commit is contained in:
DanB
2018-04-17 13:49:28 +02:00
parent 35ae3e937f
commit 02c93a248c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agents/librad.go
View File

@@ -94,7 +94,7 @@ func (pv processorVars) valAsString(fldPath string) (val string, err error) {
// radAttrVendorFromPath returns AttributenName and VendorName from path
// path should be the form attributeName or vendorName/attributeName
func attrVendorFromPath(path string) (attrName, vendorName string) {
splt := strings.Split(path, "/")
splt := strings.Split(path, utils.HIERARCHY_SEP)
if len(splt) > 1 {
vendorName, attrName = splt[0], splt[1]
} else {

10
agents/librad_test.go
View File

@@ -83,7 +83,7 @@ func TestAttrVendorFromPath(t *testing.T) {
vendorName != "" {
t.Error("failed")
}
if attrName, vendorName := attrVendorFromPath("Cisco/Cisco-NAS-Port"); attrName != "Cisco-NAS-Port" ||
if attrName, vendorName := attrVendorFromPath("Cisco>Cisco-NAS-Port"); attrName != "Cisco-NAS-Port" ||
vendorName != "Cisco" {
t.Error("failed")
}
@@ -109,11 +109,11 @@ func TestRadPassesFieldFilter(t *testing.T) {
t.Error("passing invalid filter value")
}
if !radPassesFieldFilter(pkt, nil,
utils.NewRSRFieldMustCompile("Cisco/Cisco-NAS-Port(CGR1)")) {
utils.NewRSRFieldMustCompile("Cisco>Cisco-NAS-Port(CGR1)")) {
t.Error("not passing valid filter")
}
if radPassesFieldFilter(pkt, nil,
utils.NewRSRFieldMustCompile("Cisco/Cisco-NAS-Port(notmatching)")) {
utils.NewRSRFieldMustCompile("Cisco>Cisco-NAS-Port(notmatching)")) {
t.Error("passing invalid filter value")
}
if !radPassesFieldFilter(pkt, processorVars{MetaRadReqType: MetaRadAuth},
@@ -140,7 +140,7 @@ 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",
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)
}
@@ -156,7 +156,7 @@ func TestRadFieldOutVal(t *testing.T) {
}
eOut := fmt.Sprintf("%s|flopsy|CGR1", MetaRadAcctStart)
cfgFld := &config.CfgCdrField{Tag: "ComposedTest", Type: utils.META_COMPOSED, FieldId: utils.Destination,
Value: utils.ParseRSRFieldsMustCompile(fmt.Sprintf("%s;^|;User-Name;^|;Cisco/Cisco-NAS-Port", MetaRadReqType), utils.INFIELD_SEP), Mandatory: true}
Value: utils.ParseRSRFieldsMustCompile(fmt.Sprintf("%s;^|;User-Name;^|;Cisco>Cisco-NAS-Port", MetaRadReqType), utils.INFIELD_SEP), Mandatory: true}
if outVal, err := radFieldOutVal(pkt, processorVars{MetaRadReqType: MetaRadAcctStart}, cfgFld); err != nil {
t.Error(err)
} else if outVal != eOut {