aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2020-01-16 17:00:14 +0100
committerPau Espin Pedrol <pespin@sysmocom.de>2020-01-17 17:25:46 +0100
commitc64d7269b22b9990db329e690715011de2ed6bdf (patch)
tree853ea72c586a5b994d87094db08c6a2e0464f368
parent2d3f846572bf29784b7831da994b586515fa8c4e (diff)
sccp: Modify SCCP_tests to be run against sccp_demo_user in srv mode
It's easier to handle several tests if they are the ones connecting to the program under tests. Forthcoming SCCP_Tests_RAW require use of this mode too. Take the chance to tweak other values which were wrong, in order to have CR answered correctly with a CC later on. Related: OS#4343 Change-Id: Ibf99b1546411b9a9b4375b82f1003d93d3c1645d
-rw-r--r--sccp/SCCP_Tests.cfg1
-rw-r--r--sccp/SCCP_Tests.default24
-rw-r--r--sccp/SCCP_Tests.ttcn3
3 files changed, 12 insertions, 16 deletions
diff --git a/sccp/SCCP_Tests.cfg b/sccp/SCCP_Tests.cfg
index 4b7e7425..ab69a2db 100644
--- a/sccp/SCCP_Tests.cfg
+++ b/sccp/SCCP_Tests.cfg
@@ -16,4 +16,3 @@
[EXECUTE]
SCCP_Tests.control
-#SCCP_Tests.TC_routing_global_title_crash
diff --git a/sccp/SCCP_Tests.default b/sccp/SCCP_Tests.default
index f837664b..a051517f 100644
--- a/sccp/SCCP_Tests.default
+++ b/sccp/SCCP_Tests.default
@@ -1,16 +1,10 @@
[LOGGING]
FileMask := LOG_ALL | TTCN_MATCHING | DEBUG_ENCDEC;
-BSSAP.FileMask := LOG_NOTHING;
-"SCCP_Test_M3UA".FileMask := ERROR | WARNING;
-"SCCP_Test_SCCP".FileMask := ERROR | WARNING;
-"IPA-CTRL-IPA".FileMask := ERROR | WARNING;
-mtc.FileMask := ERROR | WARNING;
-
[TESTPORT_PARAMETERS]
*.SCCP_DEMO_USER_VTY.CTRL_MODE := "client"
-*.SCCP_DEMO_USER_VTY.CTRL_HOSTNAME := "127.0.0.1"
-*.SCCP_DEMO_USER_VTY.CTRL_PORTNUM := "2325"
+*.SCCP_DEMO_USER_VTY.CTRL_HOSTNAME := "127.0.0.2"
+*.SCCP_DEMO_USER_VTY.CTRL_PORTNUM := "2324"
*.SCCP_DEMO_USER_VTY.CTRL_LOGIN_SKIPPED := "yes"
*.SCCP_DEMO_USER_VTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes"
*.SCCP_DEMO_USER_VTY.CTRL_READMODE := "buffered"
@@ -20,17 +14,17 @@ mtc.FileMask := ERROR | WARNING;
[MODULE_PARAMETERS]
M3UA_Emulation.tsp_logVerbose := true;
-M3UA_Emulation.tsp_SCTP_Server_Mode := true;
-M3UA_Emulation.tsp_M3UA_Server_Mode := true;
+M3UA_Emulation.tsp_SCTP_Server_Mode := false;
+M3UA_Emulation.tsp_M3UA_Server_Mode := false;
SCCP_Tests.sccp_cfg := {
{
sccp_service_type := "mtp3_itu",
sctp_addr := { 2905, "127.0.0.1", 2905, "127.0.0.2" },
- own_pc := 185,
- own_ssn := 254,
- peer_pc := 23,
- peer_ssn := 254,
- sio := '83'O,
+ own_pc := 23,
+ own_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */
+ peer_pc := 1,
+ peer_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */
+ sio := '03'O, /* NI=Internal, SCCP */
rctx := 0
}
};
diff --git a/sccp/SCCP_Tests.ttcn b/sccp/SCCP_Tests.ttcn
index e76e9ac5..835c9347 100644
--- a/sccp/SCCP_Tests.ttcn
+++ b/sccp/SCCP_Tests.ttcn
@@ -2,6 +2,9 @@
* Author: Stefan Sperling <ssperling@sysmocom.de>
* All Rights Reserved
*
+ * The idea is that these tests are executed against sccp_demo_user from
+ * libosmo-sccp.git in server mode.
+ *
* Released under the terms of GNU General Public License, Version 2 or
* (at your option) any later version.
*