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

Updated call tests

Browse Source
This commit is contained in:
Tripon Alexandru-Ionut
2019-06-06 17:01:41 +03:00
committed by Dan Christian Bogos
parent e7b9996a00
commit 8c8238b444
5 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agents/kamagent.go
View File

@@ -329,7 +329,7 @@ func (ka *KamailioAgent) V1DisconnectSession(args utils.AttrDisconnectSession, r
KamHashEntry, hEntry, KamHashID, hID))
return
}
connIdx, err := utils.IfaceAsInt64(connIdxIface)
connIdx, err := utils.IfaceAsTInt64(connIdxIface)
if err != nil {
return err
}

6
calls_test.sh
View File

@@ -1,9 +1,9 @@
#! /usr/bin/env sh
./local_test.sh
# ./local_test.sh
lcl=$?
echo 'go test github.com/cgrates/cgrates/general_tests -calls'
go test github.com/cgrates/cgrates/general_tests -calls
echo 'go test github.com/cgrates/cgrates/general_tests -tags=call'
go test github.com/cgrates/cgrates/general_tests -tags=call -timeout=10h
gnr=$?
exit $gen && $gnr

3
data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json
View File

@@ -78,6 +78,9 @@
"thresholds_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"chargers_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"store_session_costs": true,
"debit_interval": "5s",
"channel_sync_interval":"5m",

2
engine/mapevent.go
View File

@@ -86,7 +86,7 @@ func (me MapEvent) GetInt64(fldName string) (out int64, err error) {
if !has {
return 0, utils.ErrNotFound
}
return utils.IfaceAsInt64(fldIface)
return utils.IfaceAsTInt64(fldIface)
}
func (me MapEvent) GetStringIgnoreErrors(fldName string) (out string) {

34
general_tests/tutorial_calls_test.go
View File

@@ -307,7 +307,8 @@ func testCallStatMetricsBefore(t *testing.T) {
func testCallCheckResourceBeforeAllocation(t *testing.T) {
var rs *engine.Resources
args := &utils.ArgRSv1ResourceUsage{
CGREvent: utils.CGREvent{
UsageID: "OriginID",
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "ResourceEvent",
Event: map[string]interface{}{
@@ -316,9 +317,9 @@ func testCallCheckResourceBeforeAllocation(t *testing.T) {
utils.Destination: "1002"},
}}
if err := tutorialCallsRpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &rs); err != nil {
t.Error(err)
t.Fatal(err)
} else if len(*rs) != 1 {
t.Errorf("Resources: %+v", utils.ToJSON(rs))
t.Fatalf("Resources: %+v", utils.ToJSON(rs))
}
for _, r := range *rs {
if r.ID == "ResGroup1" &&
@@ -450,7 +451,8 @@ func testCallCall1003To1001SecondTime(t *testing.T) {
func testCallCheckResourceAllocation(t *testing.T) {
var rs *engine.Resources
args := &utils.ArgRSv1ResourceUsage{
CGREvent: utils.CGREvent{
UsageID: "OriginID1",
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "ResourceAllocation",
Event: map[string]interface{}{
@@ -459,9 +461,9 @@ func testCallCheckResourceAllocation(t *testing.T) {
utils.Destination: "1002"},
}}
if err := tutorialCallsRpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &rs); err != nil {
t.Error(err)
t.Fatal(err)
} else if len(*rs) != 1 {
t.Errorf("Resources: %+v", utils.ToJSON(rs))
t.Fatalf("Resources: %+v", utils.ToJSON(rs))
}
for _, r := range *rs {
if r.ID == "ResGroup1" && len(r.Usages) != 3 {
@@ -637,7 +639,8 @@ func testCallStatMetrics(t *testing.T) {
func testCallCheckResourceRelease(t *testing.T) {
var rs *engine.Resources
args := &utils.ArgRSv1ResourceUsage{
CGREvent: utils.CGREvent{
UsageID: "OriginID2",
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "ResourceRelease",
Event: map[string]interface{}{
@@ -646,9 +649,9 @@ func testCallCheckResourceRelease(t *testing.T) {
utils.Destination: "1002"},
}}
if err := tutorialCallsRpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &rs); err != nil {
t.Error(err)
t.Fatal(err)
} else if len(*rs) != 1 {
t.Errorf("Resources: %+v", rs)
t.Fatalf("Resources: %+v", rs)
}
for _, r := range *rs {
if r.ID == "ResGroup1" && len(r.Usages) != 0 {
@@ -711,7 +714,8 @@ func testCallSyncSessions(t *testing.T) {
//check if resource was allocated for 2 calls(1001->1002;1001->1003)
var rs *engine.Resources
args := &utils.ArgRSv1ResourceUsage{
CGREvent: utils.CGREvent{
UsageID: "OriginID3",
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "AllocateResource",
Event: map[string]interface{}{
@@ -720,9 +724,9 @@ func testCallSyncSessions(t *testing.T) {
utils.Destination: "1002"},
}}
if err := tutorialCallsRpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &rs); err != nil {
t.Error(err)
t.Fatal(err)
} else if len(*rs) != 1 {
t.Errorf("Resources: %+v", utils.ToJSON(rs))
t.Fatalf("Resources: %+v", utils.ToJSON(rs))
}
for _, r := range *rs {
if r.ID == "ResGroup1" && len(r.Usages) != 2 {
@@ -777,7 +781,7 @@ func testCallSyncSessions(t *testing.T) {
if err := tutorialCallsRpc.Call(utils.ApierV2GetCDRs, req, &rplCdrs); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if len(rplCdrs) != numberOfCDR { // cdr from sync session + cdr from before
t.Error("Unexpected number of CDRs returned: ", len(rplCdrs))
t.Fatal("Unexpected number of CDRs returned: ", len(rplCdrs))
} else if time1, err := utils.ParseDurationWithSecs(rplCdrs[0].Usage); err != nil {
t.Error(err)
} else if time1 > time.Duration(15*time.Second) {
@@ -797,9 +801,9 @@ func testCallSyncSessions(t *testing.T) {
//check if resource was released
var rsAfter *engine.Resources
if err := tutorialCallsRpc.Call(utils.ResourceSv1GetResourcesForEvent, args, &rsAfter); err != nil {
t.Error(err)
t.Fatal(err)
} else if len(*rsAfter) != 1 {
t.Errorf("Resources: %+v", rsAfter)
t.Fatalf("Resources: %+v", rsAfter)
}
for _, r := range *rsAfter {
if r.ID == "ResGroup1" && len(r.Usages) != 0 {