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

Repair tests failing after adding back APIAttributeProfile

Browse Source
This commit is contained in:
ionutboangiu
2022-02-18 10:11:12 +02:00
committed by Dan Christian Bogos
parent c6ca3573ae
commit 0f414405b4
1 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
dispatchers/attributes_it_test.go
View File

@@ -26,7 +26,6 @@ import (
"sort"
"testing"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
@@ -224,21 +223,17 @@ func testDspAttrGetAttrFailover(t *testing.T) {
utils.OptsContext: "simpleauth",
},
}
eAttrPrf := &engine.AttributeProfile{
eAttrPrf := &engine.APIAttributeProfile{
Tenant: ev.Tenant,
ID: "ATTR_1002_SIMPLEAUTH",
FilterIDs: []string{"*string:~*req.Account:1002", "*string:~*opts.*context:simpleauth"},
Attributes: []*engine.Attribute{{
Attributes: []*engine.ExternalAttribute{{
FilterIDs: []string{},
Path: utils.MetaReq + utils.NestingSep + "Password",
Type: utils.MetaConstant,
Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep),
Value: "CGRateS.org",
}},
Weights: utils.DynamicWeights{
{
Weight: 20,
},
},
Weights: ";20",
}
if *encoding == utils.MetaGOB {
eAttrPrf.Attributes[0].FilterIDs = nil // empty slice are nil in gob
@@ -262,7 +257,7 @@ func testDspAttrGetAttrFailover(t *testing.T) {
},
}
var attrReply engine.AttributeProfile
var attrReply engine.APIAttributeProfile
var rplyEv engine.AttrSProcessEventReply
if err := dispEngine.RPC.Call(utils.AttributeSv1GetAttributeForEvent,
ev, &attrReply); err == nil || err.Error() != utils.ErrNotFound.Error() {
@@ -283,7 +278,6 @@ func testDspAttrGetAttrFailover(t *testing.T) {
ev, &attrReply); err != nil {
t.Error(err)
}
attrReply.Compile()
sort.Strings(eAttrPrf.FilterIDs)
sort.Strings(attrReply.FilterIDs)
if !reflect.DeepEqual(*eAttrPrf, attrReply) {
@@ -408,31 +402,26 @@ func testDspAttrTestAuthKey2(t *testing.T) {
utils.OptsContext: "simpleauth",
},
}
eAttrPrf := &engine.AttributeProfile{
eAttrPrf := &engine.APIAttributeProfile{
Tenant: ev.Tenant,
ID: "ATTR_1001_SIMPLEAUTH",
FilterIDs: []string{"*string:~*req.Account:1001", "*string:~*opts.*context:simpleauth"},
Attributes: []*engine.Attribute{{
Attributes: []*engine.ExternalAttribute{{
FilterIDs: []string{},
Path: utils.MetaReq + utils.NestingSep + "Password",
Type: utils.MetaConstant,
Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep),
Value: "CGRateS.org",
}},
Weights: utils.DynamicWeights{
{
Weight: 20,
},
},
Weights: ";20",
}
if *encoding == utils.MetaGOB {
eAttrPrf.Attributes[0].FilterIDs = nil // empty slice are nil in gob
}
var attrReply engine.AttributeProfile
var attrReply engine.APIAttributeProfile
if err := dispEngine.RPC.Call(utils.AttributeSv1GetAttributeForEvent,
ev, &attrReply); err != nil {
t.Error(err)
}
attrReply.Compile()
sort.Strings(eAttrPrf.FilterIDs)
sort.Strings(attrReply.FilterIDs)
if !reflect.DeepEqual(*eAttrPrf, attrReply) {
@@ -500,21 +489,17 @@ func testDspAttrGetAttrRoundRobin(t *testing.T) {
utils.OptsContext: "simpleauth",
},
}
eAttrPrf := &engine.AttributeProfile{
eAttrPrf := &engine.APIAttributeProfile{
Tenant: ev.Tenant,
ID: "ATTR_1002_SIMPLEAUTH",
FilterIDs: []string{"*string:~*req.Account:1002", "*string:~*opts.*context:simpleauth"},
Attributes: []*engine.Attribute{{
Attributes: []*engine.ExternalAttribute{{
FilterIDs: []string{},
Path: utils.MetaReq + utils.NestingSep + "Password",
Type: utils.MetaConstant,
Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep),
Value: "CGRateS.org",
}},
Weights: utils.DynamicWeights{
{
Weight: 20,
},
},
Weights: ";20",
}
if *encoding == utils.MetaGOB {
eAttrPrf.Attributes[0].FilterIDs = nil // empty slice are nil in gob
@@ -538,7 +523,7 @@ func testDspAttrGetAttrRoundRobin(t *testing.T) {
},
}
var attrReply engine.AttributeProfile
var attrReply engine.APIAttributeProfile
var rplyEv engine.AttrSProcessEventReply
// To ALL2
if err := dispEngine.RPC.Call(utils.AttributeSv1GetAttributeForEvent,
@@ -552,7 +537,6 @@ func testDspAttrGetAttrRoundRobin(t *testing.T) {
t.Error(err)
}
attrReply.Compile()
sort.Strings(eAttrPrf.FilterIDs)
sort.Strings(attrReply.FilterIDs)
if !reflect.DeepEqual(*eAttrPrf, attrReply) {