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

Update call test for freeswitch and kamailio

Browse Source
This commit is contained in:
TeoV
2018-11-14 10:41:27 -05:00
committed by Dan Christian Bogos
parent 88749338af
commit 1b371419db
4 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
agents/asterisk_event.go
View File

@@ -245,6 +245,7 @@ func (smaEv *SMAsteriskEvent) AsMapStringInterface() (mp map[string]interface{})
for extraKey, extraVal := range smaEv.ExtraParameters() { // Append extraParameters
mp[extraKey] = extraVal
}
mp[utils.Source] = utils.KamailioAgent
return
}

2
data/tariffplans/tutorial/Filters.csv
View File

@@ -4,7 +4,7 @@ cgrates.org,FLTR_DST_FS,*string,Account,1001,2014-07-29T15:00:00Z
cgrates.org,FLTR_DST_FS,*destinations,Destination,DST_FS,
cgrates.org,FLTR_ACNT_1001_1002,*string,Account,1001;1002,2014-07-29T15:00:00Z
cgrates.org,FLTR_ACNT_1001_1002,*string,RunID,*default,
cgrates.org,FLTR_ACNT_1001_1003,*string,Destination,1001;1002,
cgrates.org,FLTR_ACNT_1001_1002,*string,Destination,1001;1002;1003,
cgrates.org,FLTR_ACNT_1001,*string,Account,1001,2014-07-29T15:00:00Z
cgrates.org,FLTR_ACNT_1002,*string,Account,1002,2014-07-29T15:00:00Z
cgrates.org,FLTR_ACNT_1003,*string,Account,1003,2014-07-29T15:00:00Z
1 #Tenant[0] ID[1] FilterType[2] FilterFieldName[3] FilterFieldValues[4] ActivationInterval[5]
4 cgrates.org FLTR_DST_FS *destinations Destination DST_FS
5 cgrates.org FLTR_ACNT_1001_1002 *string Account 1001;1002 2014-07-29T15:00:00Z
6 cgrates.org FLTR_ACNT_1001_1002 *string RunID *default
7 cgrates.org FLTR_ACNT_1001_1003 FLTR_ACNT_1001_1002 *string Destination 1001;1002 1001;1002;1003
8 cgrates.org FLTR_ACNT_1001 *string Account 1001 2014-07-29T15:00:00Z
9 cgrates.org FLTR_ACNT_1002 *string Account 1002 2014-07-29T15:00:00Z
10 cgrates.org FLTR_ACNT_1003 *string Account 1003 2014-07-29T15:00:00Z

1
data/tutorials/asterisk_ari/asterisk/etc/asterisk/pjsip.conf
View File

@@ -36,6 +36,7 @@ auth = 1002
[1002]
type = aor
max_contacts = 5
qualify_frequency = 0
[1002]
type=auth

25
general_tests/tutorial_calls_test.go
View File

@@ -77,7 +77,7 @@ var sTestsCalls = []func(t *testing.T){
testCallCheckResourceRelease,
testCallCheckThreshold1001After,
testCallCheckThreshold1002After,
//testCallSyncSessions,
testCallSyncSessions,
testCallStopPjsuaListener,
testCallStopCgrEngine,
testCallStopFS,
@@ -424,11 +424,6 @@ func testCallCall1001To1003(t *testing.T) {
}
}
// 1001 -> 1002 67s
// 1002 -> 1001 65s
// 1001 -> 1003 12s
// here we have 3 units of resource allocation
// Call from 1003 (prepaid) to 1001 for 20 seconds
func testCallCall1003To1001(t *testing.T) {
if err := engine.PjsuaCallUri(
@@ -439,11 +434,6 @@ func testCallCall1003To1001(t *testing.T) {
// after this call from 1001 to 1003 and call from 1003 to 1001 should be done
}
// 1001 -> 1002 45s
// 1002 -> 1001 43s
// 1003 -> 1001 20s
// 1 unit was release and 1 units was accolated (now we have 3 units allocated )
// Call from 1003 (prepaid) to 1001 for 15 seconds
func testCallCall1003To1001SecondTime(t *testing.T) {
time.Sleep(22 * time.Second)
@@ -455,11 +445,6 @@ func testCallCall1003To1001SecondTime(t *testing.T) {
time.Sleep(time.Second)
}
// 1001 -> 1002 22s
// 1002 -> 1001 20s
// 1003 -> 1001 15s (new call)
// 3 units allocated
// Check if the resource was Allocated
func testCallCheckResourceAllocation(t *testing.T) {
var rs *engine.Resources
@@ -483,7 +468,7 @@ func testCallCheckResourceAllocation(t *testing.T) {
}
}
// Allow calls to finish before start querying the results
time.Sleep(time.Duration(30) * time.Second)
time.Sleep(time.Duration(50) * time.Second)
}
// Make sure account was debited properly
@@ -699,7 +684,7 @@ func testCallSyncSessions(t *testing.T) {
t.Errorf("Resources: %+v", utils.ToJSON(rs))
}
for _, r := range *rs {
if r.ID == "ResGroup1" && (len(r.Usages) != 2 || len(r.TTLIdx) != 2) {
if r.ID == "ResGroup1" && len(r.Usages) != 2 {
t.Errorf("Unexpected resource: %+v", utils.ToJSON(r))
}
}
@@ -727,7 +712,7 @@ func testCallSyncSessions(t *testing.T) {
// activeSessions shouldn't be active
if err := tutorialCallsRpc.Call(utils.SessionSv1GetActiveSessions,
&map[string]string{}, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
&map[string]string{}, &reply); err != nil && err.Error() != utils.ErrNotFound.Error() {
t.Error("Got error on SessionSv1.GetActiveSessions: ", err)
}
@@ -741,7 +726,7 @@ func testCallSyncSessions(t *testing.T) {
sourceForCDR = utils.KamailioAgent
numberOfCDR = 3
case utils.Asterisk:
sourceForCDR = ""
sourceForCDR = utils.AsteriskAgent
numberOfCDR = 3
}
// verify cdr