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

Solve indexing for calls that share methods + tests

Browse Source
This commit is contained in:
ionutboangiu
2022-08-05 13:46:41 +03:00
committed by Dan Christian Bogos
parent 09c6261903
commit b8fee3f007
2 changed files with 120 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
analyzers/analyzers.go
View File

@@ -23,7 +23,6 @@ import (
"fmt"
"os"
"path"
"strconv"
"strings"
"time"
@@ -133,7 +132,7 @@ func (aS *AnalyzerS) logTrafic(id uint64, method string,
if strings.HasPrefix(method, utils.AnalyzerSv1) {
return nil
}
return aS.db.Index(utils.ConcatenatedKey(enc, from, to, method, strconv.FormatInt(sTime.Unix(), 10)),
return aS.db.Index(utils.ConcatenatedKey(enc, from, to, method, utils.GenUUID()),
NewInfoRPC(id, method, params, result, err, enc, from, to, sTime, eTime))
}

121
analyzers/analyzers_it_test.go
View File

@@ -62,6 +62,7 @@ var (
testAnalyzerSV1Search2,
testAnalyzerSV1SearchWithContentFilters,
testAnalyzerSV1BirPCSession,
testAnalyzerSv1MultipleQuery,
testAnalyzerSKillEngine,
}
)
@@ -231,7 +232,7 @@ func testAnalyzerSChargerSv1ProcessEvent(t *testing.T) {
func testAnalyzerSV1Search(t *testing.T) {
// need to wait in order for the log gorutine to execute
time.Sleep(10 * time.Millisecond)
time.Sleep(50 * time.Millisecond)
var result []map[string]interface{}
if err := anzRPC.Call(utils.AnalyzerSv1StringQuery, &QueryArgs{HeaderFilters: `+RequestEncoding:\*internal +RequestMethod:AttributeSv1\.ProcessEvent`}, &result); err != nil {
t.Error(err)
@@ -269,7 +270,7 @@ func testAnalyzerSV1BirPCSession(t *testing.T) {
err.Error() != utils.ErrPartiallyExecuted.Error() {
t.Fatal(err)
}
time.Sleep(10 * time.Second)
time.Sleep(50 * time.Millisecond)
var result []map[string]interface{}
if err := anzRPC.Call(utils.AnalyzerSv1StringQuery, &QueryArgs{HeaderFilters: `+RequestEncoding:\*birpc_json +RequestMethod:"SessionSv1.DisconnectPeer"`}, &result); err != nil {
t.Error(err)
@@ -277,6 +278,122 @@ func testAnalyzerSV1BirPCSession(t *testing.T) {
t.Errorf("Unexpected result: %s", utils.ToJSON(result))
}
}
func testAnalyzerSv1MultipleQuery(t *testing.T) {
filterProfiles := []*engine.FilterWithAPIOpts{
{
Filter: &engine.Filter{
ID: "TestA_FILTER1",
Tenant: "cgrates.org",
Rules: []*engine.FilterRule{
{
Type: utils.MetaString,
Element: "~*req.Account",
Values: []string{"1001"},
},
{
Type: utils.MetaPrefix,
Element: "~*req.Destination",
Values: []string{"10"},
},
},
},
},
{
Filter: &engine.Filter{
ID: "TestA_FILTER2",
Tenant: "cgrates.org",
Rules: []*engine.FilterRule{
{
Type: utils.MetaString,
Element: "~*req.Account",
Values: []string{"1002"},
},
{
Type: utils.MetaPrefix,
Element: "~*req.Destination",
Values: []string{"10"},
},
},
},
},
{
Filter: &engine.Filter{
ID: "TestA_FILTER3",
Tenant: "cgrates.org",
Rules: []*engine.FilterRule{
{
Type: utils.MetaString,
Element: "~*req.Account",
Values: []string{"1003"},
},
{
Type: utils.MetaPrefix,
Element: "~*req.Destination",
Values: []string{"10"},
},
},
},
},
{
Filter: &engine.Filter{
ID: "TestB_FILTER1",
Tenant: "cgrates.org",
Rules: []*engine.FilterRule{
{
Type: utils.MetaString,
Element: "~*req.Account",
Values: []string{"2001"},
},
{
Type: utils.MetaPrefix,
Element: "~*req.Destination",
Values: []string{"20"},
},
},
},
},
{
Filter: &engine.Filter{
ID: "TestB_FILTER2",
Tenant: "cgrates.org",
Rules: []*engine.FilterRule{
{
Type: utils.MetaString,
Element: "~*req.Account",
Values: []string{"2002"},
},
{
Type: utils.MetaPrefix,
Element: "~*req.Destination",
Values: []string{"20"},
},
},
},
},
}
var reply string
for _, filterProfile := range filterProfiles {
if err := anzRPC.Call(utils.AdminSv1SetFilter,
filterProfile, &reply); err != nil {
t.Error(err)
} else if reply != utils.OK {
t.Error(err)
}
}
time.Sleep(50 * time.Millisecond)
var result []map[string]interface{}
if err := anzRPC.Call(utils.AnalyzerSv1StringQuery, &QueryArgs{
HeaderFilters: `+RequestMethod:"AdminSv1.SetFilter"`,
ContentFilters: []string{"*prefix:~*req.ID:TestA"},
}, &result); err != nil {
t.Error(err)
} else if len(result) != 3 {
t.Errorf("Unexpected result: %s", utils.ToJSON(result))
}
}
func testAnalyzerSKillEngine(t *testing.T) {
if err := engine.KillEngine(100); err != nil {
t.Error(err)