Update call tests

This commit is contained in:
TeoV
2019-12-12 12:53:02 +02:00
parent 261816f99b
commit 041320644e
9 changed files with 116 additions and 332 deletions

View File

@@ -29,23 +29,16 @@
"rals": {
"enabled": true,
"thresholds_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"thresholds_conns": ["*localhost"],
"stats_conns": ["*localhost"],
},
"cdrs": {
"enabled": true,
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"chargers_conns": [
{"address": "*internal"}
],
"stats_conns": ["*localhost"],
"chargers_conns": ["*internal"],
"rals_conns": ["*localhost"],
"sessions_cost_retries": 5,
},
@@ -58,30 +51,14 @@
"sessions": {
"enabled": true,
"rals_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"cdrs_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"resources_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"suppliers_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"attributes_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"thresholds_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"chargers_conns": [
{"address": "*internal"}
],
"rals_conns": ["*localhost"],
"cdrs_conns": ["*localhost"],
"resources_conns": ["*localhost"],
"suppliers_conns": ["*localhost"],
"attributes_conns": ["*localhost"],
"stats_conns": ["*localhost"],
"thresholds_conns": ["*localhost"],
"chargers_conns": ["*internal"],
"store_session_costs": true,
"debit_interval": "5s",
"channel_sync_interval":"7s",
@@ -94,9 +71,7 @@
{"address": "127.0.0.1:8088", "user": "cgrates",
"password": "CGRateS.org", "connect_attempts": 3,"reconnects": 10}
],
"sessions_conns": [
{"address": "*internal"},
],
"sessions_conns": ["*internal"],
"create_cdr": true,
},
@@ -134,8 +109,6 @@
"apier": {
"scheduler_conns": [ // connections to SchedulerS for reloads
{"address": "*internal"},
],
"scheduler_conns": ["*internal"],
},
}

View File

@@ -28,23 +28,16 @@
"rals": {
"enabled": true,
"thresholds_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"thresholds_conns": ["*localhost"],
"stats_conns": ["*localhost"],
},
"cdrs": {
"enabled": true,
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"chargers_conns": [
{"address": "*internal"}
],
"stats_conns": ["*localhost"],
"chargers_conns": ["*internal"],
"rals_conns": ["*localhost"],
"sessions_cost_retries": 5,
},
@@ -57,30 +50,14 @@
"sessions": {
"enabled": true,
"rals_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"cdrs_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"resources_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"suppliers_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"attributes_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"thresholds_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"chargers_conns": [
{"address": "*internal"}
],
"rals_conns": ["*localhost"],
"cdrs_conns": ["*localhost"],
"resources_conns": ["*localhost"],
"suppliers_conns": ["*localhost"],
"attributes_conns": ["*localhost"],
"stats_conns": ["*localhost"],
"thresholds_conns": ["*localhost"],
"chargers_conns": ["*internal"],
"store_session_costs": true,
"debit_interval": "5s",
"channel_sync_interval":"7s",
@@ -92,9 +69,7 @@
"event_socket_conns":[
{"address": "127.0.0.1:8021", "password": "ClueCon", "reconnects": -1,"alias":""}
],
"sessions_conns": [
{"address": "*internal"},
],
"sessions_conns": ["*internal"],
},
@@ -131,9 +106,7 @@
"apier": {
"scheduler_conns": [ // connections to SchedulerS for reloads
{"address": "*internal"},
],
"scheduler_conns": ["*internal"],
},

View File

@@ -29,20 +29,15 @@
"rals": {
"enabled": true,
"thresholds_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"thresholds_conns": ["*localhost"],
"stats_conns": ["*localhost"],
},
"cdrs": {
"enabled": true,
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"stats_conns": ["*localhost"],
"rals_conns": ["*localhost"],
"sessions_cost_retries": 5,
},
@@ -55,30 +50,14 @@
"sessions": {
"enabled": true,
"rals_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"cdrs_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"resources_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"suppliers_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"attributes_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"thresholds_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"chargers_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"rals_conns": ["*localhost"],
"cdrs_conns": ["*localhost"],
"resources_conns": ["*localhost"],
"suppliers_conns": ["*localhost"],
"attributes_conns": ["*localhost"],
"stats_conns": ["*localhost"],
"thresholds_conns": ["*localhost"],
"chargers_conns": ["*localhost"],
"store_session_costs": true,
"debit_interval": "5s",
"channel_sync_interval":"7s",
@@ -90,9 +69,7 @@
"evapi_conns":[
{"address": "127.0.0.1:8448", "reconnects": 5}
],
"sessions_conns": [
{"address": "*internal"},
],
"sessions_conns": ["*internal"],
"create_cdr": true,
},
@@ -130,9 +107,7 @@
"apier": {
"scheduler_conns": [ // connections to SchedulerS for reloads
{"address": "*internal"},
],
"scheduler_conns": ["*internal"],
},

View File

@@ -24,26 +24,17 @@
"rals": {
"enabled": true,
"thresholds_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"}
],
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"}
],
"attributes_conns": [
{"address": "*internal"}
],
"thresholds_conns": ["*localhost"],
"stats_conns": ["*localhost"],
"attributes_conns": ["*internal"],
},
"cdrs": {
"enabled": true,
"stats_conns": [
{"address": "*internal"}
],
"chargers_conns": [
{"address": "*internal"}
],
"stats_conns": ["*internal"],
"chargers_conns": ["*internal"],
"rals_conns": ["*localhost"],
"sessions_cost_retries": 5,
},
@@ -57,30 +48,14 @@
"sessions": {
"enabled": true,
"listen_bijson": "127.0.0.1:2014", // address where to listen for bidirectional JSON-RPC requests
"chargers_conns": [
{"address": "*internal"}
],
"rals_conns": [
{"address": "*internal"}
],
"cdrs_conns": [
{"address": "*internal"}
],
"resources_conns": [
{"address": "*internal"}
],
"suppliers_conns": [
{"address": "*internal"}
],
"attributes_conns": [
{"address": "*internal"}
],
"stats_conns": [
{"address": "*internal"}
],
"thresholds_conns": [
{"address": "*internal"}
],
"chargers_conns": ["*internal"],
"rals_conns": ["*internal"],
"cdrs_conns": ["*internal"],
"resources_conns": ["*internal"],
"suppliers_conns": ["*internal"],
"attributes_conns": ["*internal"],
"stats_conns": ["*internal"],
"thresholds_conns": ["*internal"],
"debit_interval": "5s",
"channel_sync_interval":"7s",
},
@@ -124,9 +99,7 @@
"apier": {
"scheduler_conns": [ // connections to SchedulerS for reloads
{"address": "*internal"},
],
"scheduler_conns": ["*internal"],
},

View File

@@ -29,23 +29,15 @@
"rals": {
"enabled": true,
"thresholds_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"thresholds_conns": ["*localhost"],
"stats_conns": ["*localhost"],
},
"cdrs": {
"enabled": true,
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"chargers_conns": [
{"address": "*internal"}
],
"stats_conns": ["*localhost"],
"chargers_conns": ["*internal"],
"sessions_cost_retries": 5,
},
@@ -58,30 +50,14 @@
"sessions": {
"enabled": true,
"rals_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"cdrs_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"resources_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"suppliers_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"attributes_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"thresholds_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"chargers_conns": [
{"address": "*internal"}
],
"rals_conns": ["*localhost"],
"cdrs_conns": ["*localhost"],
"resources_conns": ["*localhost"],
"suppliers_conns": ["*localhost"],
"attributes_conns": ["*localhost"],
"stats_conns": ["*localhost"],
"thresholds_conns": ["*localhost"],
"chargers_conns": ["*internal"],
"store_session_costs": true,
"debit_interval": "5s",
"channel_sync_interval":"7s",
@@ -94,9 +70,7 @@
{"address": "127.0.0.1:8088", "user": "cgrates",
"password": "CGRateS.org", "connect_attempts": 3,"reconnects": 10}
],
"sessions_conns": [
{"address": "*internal"},
],
"sessions_conns": ["*internal"],
"create_cdr": true,
},
@@ -134,9 +108,7 @@
"apier": {
"scheduler_conns": [ // connections to SchedulerS for reloads
{"address": "*internal"},
],
"scheduler_conns": ["*internal"],
},

View File

@@ -28,23 +28,15 @@
"rals": {
"enabled": true,
"thresholds_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"thresholds_conns": ["*localhost"],
"stats_conns": ["*localhost"],
},
"cdrs": {
"enabled": true,
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"chargers_conns": [
{"address": "*internal"}
],
"stats_conns": ["*localhost"],
"chargers_conns": ["*internal"],
"sessions_cost_retries": 5,
},
@@ -57,30 +49,14 @@
"sessions": {
"enabled": true,
"rals_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"cdrs_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"resources_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"suppliers_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"attributes_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"thresholds_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"chargers_conns": [
{"address": "*internal"}
],
"rals_conns": ["*localhost"],
"cdrs_conns": ["*localhost"],
"resources_conns": ["*localhost"],
"suppliers_conns": ["*localhost"],
"attributes_conns": ["*localhost"],
"stats_conns": ["*localhost"],
"thresholds_conns": ["*localhost"],
"chargers_conns": ["*internal"],
"store_session_costs": true,
"debit_interval": "5s",
"channel_sync_interval":"7s",
@@ -92,9 +68,7 @@
"event_socket_conns":[
{"address": "127.0.0.1:8021", "password": "ClueCon", "reconnects": -1,"alias":""}
],
"sessions_conns": [
{"address": "*internal"},
],
"sessions_conns": ["*internal"],
},
@@ -131,9 +105,7 @@
"apier": {
"scheduler_conns": [ // connections to SchedulerS for reloads
{"address": "*internal"},
],
"scheduler_conns": ["*internal"],
},

View File

@@ -29,20 +29,14 @@
"rals": {
"enabled": true,
"thresholds_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"thresholds_conns": ["*localhost"],
"stats_conns": ["*localhost"],
},
"cdrs": {
"enabled": true,
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"stats_conns": ["*localhost"],
"sessions_cost_retries": 5,
},
@@ -55,30 +49,14 @@
"sessions": {
"enabled": true,
"rals_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"cdrs_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"resources_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"suppliers_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"attributes_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"thresholds_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"chargers_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"},
],
"rals_conns": ["*localhost"],
"cdrs_conns": ["*localhost"],
"resources_conns": ["*localhost"],
"suppliers_conns": ["*localhost"],
"attributes_conns": ["*localhost"],
"stats_conns": ["*localhost"],
"thresholds_conns": ["*localhost"],
"chargers_conns": ["*localhost"],
"store_session_costs": true,
"debit_interval": "5s",
"channel_sync_interval":"5m",
@@ -90,9 +68,7 @@
"evapi_conns":[
{"address": "127.0.0.1:8448", "reconnects": 5}
],
"sessions_conns": [
{"address": "*internal"},
],
"sessions_conns": ["*internal"],
"create_cdr": true,
},
@@ -130,9 +106,7 @@
"apier": {
"scheduler_conns": [ // connections to SchedulerS for reloads
{"address": "*internal"},
],
"scheduler_conns": ["*internal"],
},

View File

@@ -24,26 +24,16 @@
"rals": {
"enabled": true,
"thresholds_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"}
],
"stats_conns": [
{"address": "127.0.0.1:2012", "transport": "*json"}
],
"attributes_conns": [
{"address": "*internal"}
],
"thresholds_conns": ["*localhost"],
"stats_conns": ["*localhost"],
"attributes_conns": ["*internal"],
},
"cdrs": {
"enabled": true,
"stats_conns": [
{"address": "*internal"}
],
"chargers_conns": [
{"address": "*internal"}
],
"stats_conns": ["*internal"],
"chargers_conns": ["*internal"],
"sessions_cost_retries": 5,
},
@@ -57,30 +47,14 @@
"sessions": {
"enabled": true,
"listen_bijson": "127.0.0.1:2014", // address where to listen for bidirectional JSON-RPC requests
"chargers_conns": [
{"address": "*internal"}
],
"rals_conns": [
{"address": "*internal"}
],
"cdrs_conns": [
{"address": "*internal"}
],
"resources_conns": [
{"address": "*internal"}
],
"suppliers_conns": [
{"address": "*internal"}
],
"attributes_conns": [
{"address": "*internal"}
],
"stats_conns": [
{"address": "*internal"}
],
"thresholds_conns": [
{"address": "*internal"}
],
"chargers_conns": ["*internal"],
"rals_conns": ["*internal"],
"cdrs_conns": ["*internal"],
"resources_conns": ["*internal"],
"suppliers_conns": ["*internal"],
"attributes_conns": ["*internal"],
"stats_conns": ["*internal"],
"thresholds_conns": ["*internal"],
"debit_interval": "10s",
"channel_sync_interval":"30s",
},
@@ -124,9 +98,7 @@
"apier": {
"scheduler_conns": [ // connections to SchedulerS for reloads
{"address": "*internal"},
],
"scheduler_conns": ["*internal"],
},

View File

@@ -708,8 +708,8 @@ func testCallSyncSessions(t *testing.T) {
if err := tutorialCallsRpc.Call(utils.SessionSv1GetActiveSessions,
nil, &reply); err != nil {
t.Error("Got error on SessionSv1.GetActiveSessions: ", err.Error())
} else if len(*reply) != 2 {
t.Errorf("expecting 2 active sessions, received: %+v", utils.ToJSON(reply))
} else if len(*reply) != 4 { // expect to have 4 sessions ( two for 1001 to 1003 *raw and *default and two from 1001 to 1002 *raw and *default)
t.Errorf("expecting 4 active sessions, received: %+v", utils.ToJSON(reply))
}
//check if resource was allocated for 2 calls(1001->1002;1001->1003)
var rs *engine.Resources