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

Add test for counting NotFound supplier and the first supplier selected

Browse Source
This commit is contained in:
TeoV
2020-05-21 15:56:15 +03:00
committed by Dan Christian Bogos
parent bb576a24ea
commit 3635f5ba36
8 changed files with 241 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
agents/dnsagent_it_test.go
View File

@@ -23,6 +23,7 @@ package agents
import (
"net/rpc"
"path"
"reflect"
"testing"
"time"
@@ -49,6 +50,7 @@ var (
testDNSitClntNAPTRDryRun,
testDNSitClntNAPTRAttributes,
testDNSitClntNAPTRSuppliers,
testDNSitClntNAPTRNotFoundSuppliers,
testDNSitStopEngine,
}
)
@@ -213,6 +215,105 @@ func testDNSitClntNAPTRSuppliers(t *testing.T) {
if answr2.Regexp != "!^(.*)$!sip:1@172.16.1.12!" {
t.Errorf("received: <%q>", answr2.Regexp)
}
//get stats metrics after restart
expectedMetrics := map[string]string{
"*sum:1": "1",
}
var metrics2 map[string]string
if err := dnsRPC.Call(utils.StatSv1GetQueueStringMetrics,
&utils.TenantIDWithArgDispatcher{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "StatSupplierOne"}}, &metrics2); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expectedMetrics, metrics2) {
t.Errorf("After restat expecting: %+v, received reply: %s", expectedMetrics, metrics2)
}
for i := 0; i < 5; i++ { // send again the same request to check if the stats counter it
if err := dnsClnt.WriteMsg(m); err != nil {
t.Error(err)
}
rply, err := dnsClnt.ReadMsg()
if err != nil {
t.Error(err)
} else if len(rply.Answer) != 2 {
t.Errorf("wrong number of records: %s", utils.ToIJSON(rply.Answer))
}
if rply.Rcode != dns.RcodeSuccess {
t.Errorf("failed to get an valid answer\n%v", rply)
}
answr := rply.Answer[0].(*dns.NAPTR)
if answr.Order != 100 {
t.Errorf("received: <%v>", answr.Order)
}
if answr.Regexp != "!^(.*)$!sip:1@172.16.1.11!" {
t.Errorf("received: <%q>", answr.Regexp)
}
answr2 := rply.Answer[1].(*dns.NAPTR)
if answr2.Regexp != "!^(.*)$!sip:1@172.16.1.12!" {
t.Errorf("received: <%q>", answr2.Regexp)
}
}
expectedMetrics = map[string]string{
"*sum:1": "6",
}
if err := dnsRPC.Call(utils.StatSv1GetQueueStringMetrics,
&utils.TenantIDWithArgDispatcher{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "StatSupplierOne"}}, &metrics2); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expectedMetrics, metrics2) {
t.Errorf("After restat expecting: %+v, received reply: %s", expectedMetrics, metrics2)
}
}
func testDNSitClntNAPTRNotFoundSuppliers(t *testing.T) {
m := new(dns.Msg)
m.SetQuestion("5.6.9.4.7.1.7.1.5.6.8.9.5.e164.arpa.", dns.TypeNAPTR)
if err := dnsClnt.WriteMsg(m); err != nil {
t.Error(err)
}
rply, err := dnsClnt.ReadMsg()
if err != nil {
t.Error(err)
} else if len(rply.Answer) != 0 {
t.Errorf("wrong number of records: %s", utils.ToIJSON(rply.Answer))
}
if rply.Rcode != dns.RcodeSuccess {
t.Errorf("failed to get an valid answer\n%v", rply)
}
//get stats metrics after restart
expectedMetrics := map[string]string{
"*sum:1": "1",
}
var metrics2 map[string]string
if err := dnsRPC.Call(utils.StatSv1GetQueueStringMetrics,
&utils.TenantIDWithArgDispatcher{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "StatNotFound"}}, &metrics2); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expectedMetrics, metrics2) {
t.Errorf("After restat expecting: %+v, received reply: %s", expectedMetrics, metrics2)
}
for i := 0; i < 5; i++ { // send again the same request to check if the stats counter it
if err := dnsClnt.WriteMsg(m); err != nil {
t.Error(err)
}
rply, err := dnsClnt.ReadMsg()
if err != nil {
t.Error(err)
} else if len(rply.Answer) != 0 {
t.Errorf("wrong number of records: %s", utils.ToIJSON(rply.Answer))
}
if rply.Rcode != dns.RcodeSuccess {
t.Errorf("failed to get an valid answer\n%v", rply)
}
}
expectedMetrics = map[string]string{
"*sum:1": "6",
}
if err := dnsRPC.Call(utils.StatSv1GetQueueStringMetrics,
&utils.TenantIDWithArgDispatcher{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "StatNotFound"}}, &metrics2); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expectedMetrics, metrics2) {
t.Errorf("After restat expecting: %+v, received reply: %s", expectedMetrics, metrics2)
}
}
func testDNSitStopEngine(t *testing.T) {

8
data/conf/samples/dnsagent_internal/cgrates.json
View File

@@ -32,6 +32,7 @@
"attributes_conns": ["*localhost"],
"rals_conns": ["*internal"],
"cdrs_conns": ["*internal"],
"stats_conns": ["*localhost"],
"chargers_conns": ["*internal"],
"suppliers_conns": ["*localhost"],
},
@@ -63,6 +64,13 @@
},
"stats": {
"enabled": true,
"indexed_selects": false,
"store_interval": "-1",
},
"dns_agent": {
"enabled": true,
"listen": ":2053",

42
data/conf/samples/dnsagent_internal/suppliers.json
View File

@@ -6,13 +6,32 @@
"id": "NAPTRSuppliersQuery",
"filters": ["*string:~*vars.QueryType:NAPTR",
"*string:~*vars.E164Address:4986517174965"],
"flags": ["*message", "*suppliers","*continue"],
"flags": ["*event", "*suppliers","*continue"],
"request_fields":[
{"tag": "ToR", "path": "*cgreq.Account", "type": "*constant", "value": "1001"}, // so we can match the supplier profile
],
"reply_fields":[
{"tag": "DispatchReply", "type": "*none",
"blocker": true}, // enforces continue_on_success so we can check answer with filters
},
{
"id": "NAPTRRoutesQuery2", // this processor will add Account 1002 in event to test the NotFound StatQueue
"filters": ["*string:~*vars.QueryType:NAPTR",
"*string:~*vars.E164Address:5986517174965"],
"flags": ["*event", "*suppliers","*continue"],
"request_fields":[
{"tag": "ToR", "path": "*cgreq.Account", "type": "*constant", "value": "1002"},
],
},
{
"id": "NAPTRStatSupplierNotFound",
"filters": ["*string:~*vars.QueryType:NAPTR",
"*string:~*cgrep.Error:SUPPLIERS_ERROR:NOT_FOUND"],
"flags": ["*event", "*stats"],
"request_fields":[
{
"tag": "ErrSupplierNotFound",
"path": "*cgreq.ErrSupplierNotFound",
"type": "*constant",
"value": "NotFoundSuppliers",
}
],
},
{
@@ -57,6 +76,21 @@
"type": "*group", "value": "."},
],
},
{
"id": "NAPTRStatSupplier", // this process will pick the first supplier and will send a ProcessEvent to StatQueue
"filters": ["*string:~*vars.QueryType:NAPTR",
"*string:~*vars.E164Address:4986517174965",
"*gte:~*cgrep.Suppliers.Count:1"],
"flags": ["*event", "*stats", "*continue"],
"request_fields":[
{
"tag": "FirstSupplier",
"path": "*cgreq.FirstSupplier",
"type": "*variable",
"value": "~*cgrep.Suppliers.SortedSuppliers[0].SupplierID",
}
],
}
],
},

7
data/conf/samples/dnsagent_mongo/cgrates.json
View File

@@ -37,6 +37,7 @@
"attributes_conns": ["*localhost"],
"rals_conns": ["*internal"],
"cdrs_conns": ["*internal"],
"stats_conns": ["*localhost"],
"chargers_conns": ["*internal"],
"suppliers_conns": ["*localhost"],
},
@@ -68,6 +69,12 @@
},
"stats": {
"enabled": true,
"indexed_selects": false
},
"dns_agent": {
"enabled": true,
"listen": ":2053",

38
data/conf/samples/dnsagent_mongo/suppliers.json
View File

@@ -15,6 +15,29 @@
"blocker": true}, // enforces continue_on_success so we can check answer with filters
],
},
{
"id": "NAPTRRoutesQuery2", // this processor will add Account 1002 in event to test the NotFound StatQueue
"filters": ["*string:~*vars.QueryType:NAPTR",
"*string:~*vars.E164Address:5986517174965"],
"flags": ["*event", "*suppliers","*continue"],
"request_fields":[
{"tag": "ToR", "path": "*cgreq.Account", "type": "*constant", "value": "1002"},
],
},
{
"id": "NAPTRStatSupplierNotFound",
"filters": ["*string:~*vars.QueryType:NAPTR",
"*string:~*cgrep.Error:SUPPLIERS_ERROR:NOT_FOUND"],
"flags": ["*event", "*stats"],
"request_fields":[
{
"tag": "ErrSupplierNotFound",
"path": "*cgreq.ErrSupplierNotFound",
"type": "*constant",
"value": "NotFoundRoutes",
}
],
},
{
"id": "NAPTRSuppliersOneSupplier",
"filters": ["*string:~*vars.QueryType:NAPTR",
@@ -57,6 +80,21 @@
"type": "*group", "value": "."},
],
},
{
"id": "NAPTRStatSupplier", // this process will pick the first supplier and will send a ProcessEvent to StatQueue
"filters": ["*string:~*vars.QueryType:NAPTR",
"*string:~*vars.E164Address:4986517174965",
"*gte:~*cgrep.Suppliers.Count:1"],
"flags": ["*event", "*stats", "*continue"],
"request_fields":[
{
"tag": "FirstSupplier",
"path": "*cgreq.FirstSupplier",
"type": "*variable",
"value": "~*cgrep.Suppliers.SortedSuppliers[0].SupplierID",
}
],
}
],
},

7
data/conf/samples/dnsagent_mysql/cgrates.json
View File

@@ -28,6 +28,7 @@
"attributes_conns": ["*localhost"],
"rals_conns": ["*internal"],
"cdrs_conns": ["*internal"],
"stats_conns": ["*localhost"],
"chargers_conns": ["*internal"],
"suppliers_conns": ["*localhost"],
},
@@ -59,6 +60,12 @@
},
"stats": {
"enabled": true,
"indexed_selects": false
},
"dns_agent": {
"enabled": true,
"listen": ":2053",

38
data/conf/samples/dnsagent_mysql/suppliers.json
View File

@@ -15,6 +15,29 @@
"blocker": true}, // enforces continue_on_success so we can check answer with filters
],
},
{
"id": "NAPTRRoutesQuery2", // this processor will add Account 1002 in event to test the NotFound StatQueue
"filters": ["*string:~*vars.QueryType:NAPTR",
"*string:~*vars.E164Address:5986517174965"],
"flags": ["*event", "*suppliers","*continue"],
"request_fields":[
{"tag": "ToR", "path": "*cgreq.Account", "type": "*constant", "value": "1002"},
],
},
{
"id": "NAPTRStatSupplierNotFound",
"filters": ["*string:~*vars.QueryType:NAPTR",
"*string:~*cgrep.Error:SUPPLIERS_ERROR:NOT_FOUND"],
"flags": ["*event", "*stats"],
"request_fields":[
{
"tag": "ErrSupplierNotFound",
"path": "*cgreq.ErrSupplierNotFound",
"type": "*constant",
"value": "NotFoundRoutes",
}
],
},
{
"id": "NAPTRSuppliersOneSupplier",
"filters": ["*string:~*vars.QueryType:NAPTR",
@@ -57,6 +80,21 @@
"type": "*group", "value": "."},
],
},
{
"id": "NAPTRStatSupplier", // this process will pick the first supplier and will send a ProcessEvent to StatQueue
"filters": ["*string:~*vars.QueryType:NAPTR",
"*string:~*vars.E164Address:4986517174965",
"*gte:~*cgrep.Suppliers.Count:1"],
"flags": ["*event", "*stats", "*continue"],
"request_fields":[
{
"tag": "FirstSupplier",
"path": "*cgreq.FirstSupplier",
"type": "*variable",
"value": "~*cgrep.Suppliers.SortedSuppliers[0].SupplierID",
}
],
}
],
},

4
data/tariffplans/dnsagent/Stats.csv Normal file
View File

@@ -0,0 +1,4 @@
#Tenant[0],Id[1],FilterIDs[2],ActivationInterval[3],QueueLength[4],TTL[5],MinItems[6],Metrics[7],MetricFilterIDs[8],Stored[9],Blocker[10],Weight[11],ThresholdIDs[12]
cgrates.org,StatNotFound,*exists:~*req.ErrSupplierNotFound:,,-1,-1,0,*sum:1,,true,false,30,*none
cgrates.org,StatSupplierOne,*string:~*req.FirstSupplier:supplier1,,-1,-1,0,*sum:1,,true,false,30,*none
cgrates.org,StatSupplierTwo,*string:~*req.FirstSupplier:supplier2,,-1,-1,0,*sum:1,,true,false,30,*none
1 #Tenant[0] Id[1] FilterIDs[2] ActivationInterval[3] QueueLength[4] TTL[5] MinItems[6] Metrics[7] MetricFilterIDs[8] Stored[9] Blocker[10] Weight[11] ThresholdIDs[12]
2 cgrates.org StatNotFound *exists:~*req.ErrSupplierNotFound: -1 -1 0 *sum:1 true false 30 *none
3 cgrates.org StatSupplierOne *string:~*req.FirstSupplier:supplier1 -1 -1 0 *sum:1 true false 30 *none
4 cgrates.org StatSupplierTwo *string:~*req.FirstSupplier:supplier2 -1 -1 0 *sum:1 true false 30 *none