From c1694826e4234144e35991c7b2c7623412583f0f Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 14 Feb 2018 19:04:17 +0000 Subject: [PATCH] Use new split config file + tcpdump support of osmo-ttcn3-hacks This uses osmo-ttcn3-hacks Change-Id I3db452e24e5238aa05254d903739c64d202e61db, which introduces some shared/common config file as well as per-testcase pcap file generation. --- mgw-test/Dockerfile | 7 +++++-- mgw-test/MGCP_Test.cfg | 17 ++++----------- mgw-test/jenkins.sh | 1 + ttcn3-bsc-test/BSC_Tests.cfg | 40 ++++-------------------------------- ttcn3-bsc-test/Dockerfile | 3 +++ ttcn3-bsc-test/jenkins.sh | 1 + ttcn3-msc-test/Dockerfile | 3 +++ ttcn3-msc-test/MSC_Tests.cfg | 34 ++++-------------------------- ttcn3-msc-test/jenkins.sh | 1 + ttcn3-msc-test/osmo-msc.cfg | 1 + 10 files changed, 27 insertions(+), 81 deletions(-) diff --git a/mgw-test/Dockerfile b/mgw-test/Dockerfile index 2c904761..e9a6f561 100644 --- a/mgw-test/Dockerfile +++ b/mgw-test/Dockerfile @@ -7,14 +7,17 @@ RUN cd osmo-ttcn3-hacks && \ git checkout -f -B master origin/master && \ make deps -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch /tmp/commit +ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=laforge/cfg /tmp/commit RUN cd osmo-ttcn3-hacks && \ git fetch && \ - git checkout -f -B master origin/master && \ + git checkout -f -B master origin/laforge/cfg && \ make mgw VOLUME /data +RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ + ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / + COPY MGCP_Test.cfg /data/MGCP_Test.cfg CMD cd /data && \ diff --git a/mgw-test/MGCP_Test.cfg b/mgw-test/MGCP_Test.cfg index a74d0f82..3fb3589a 100644 --- a/mgw-test/MGCP_Test.cfg +++ b/mgw-test/MGCP_Test.cfg @@ -1,27 +1,18 @@ -[LOGGING] -#FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; -#ConsoleMask := ERROR | WARNING | TESTCASE | TTCN_MATCHING | DEBUG_ENCDEC -FileMask := LOG_ALL | TTCN_MATCHING; +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/mgw/MGCP_Test.default" -LogSourceInfo := Yes -SourceInfoFormat := Single -LoggerPlugins := { JUnitLogger := "libjunitlogger2" } -#*.JUnitLogger.filename_stem := "MyJunitLogFile" -*.JUnitLogger.testsuite_name := "myJUnitTest" +[LOGGING] [TESTPORT_PARAMETERS] -#*.*.udpReuseAddress := "yes"; [MODULE_PARAMETERS] -mp_local_udp_port := 2727; mp_local_ip:= "172.18.4.181"; -mp_remote_udp_port := 2427; mp_remote_ip:= "172.18.4.180"; [MAIN_CONTROLLER] [EXECUTE] -#MGCP_Test.TC_selftest MGCP_Test.TC_crcx MGCP_Test.TC_crcx_unsupp_mode MGCP_Test.TC_crcx_early_bidir_mode diff --git a/mgw-test/jenkins.sh b/mgw-test/jenkins.sh index 1cd05427..4bde54d3 100755 --- a/mgw-test/jenkins.sh +++ b/mgw-test/jenkins.sh @@ -22,6 +22,7 @@ docker run --rm \ docker run --rm \ --network $NET_NAME --ip 172.18.4.181 \ -v $VOL_BASE_DIR/mgw-tester:/data \ + -e "TTCN3_PCAP_PATH=/data" \ --name ${BUILD_TAG}-ttcn3-mgw-test \ $REPO_USER/mgw-test diff --git a/ttcn3-bsc-test/BSC_Tests.cfg b/ttcn3-bsc-test/BSC_Tests.cfg index 12e53ef3..7efc89a4 100644 --- a/ttcn3-bsc-test/BSC_Tests.cfg +++ b/ttcn3-bsc-test/BSC_Tests.cfg @@ -1,36 +1,15 @@ -[LOGGING] -#FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; -#ConsoleMask := ERROR | WARNING | TESTCASE | TTCN_MATCHING | DEBUG_ENCDEC -#FileMask := LOG_ALL | TTCN_MATCHING; -BSSAP.FileMask := LOG_NOTHING; -"VirtMSC-M3UA".FileMask := ERROR | WARNING; -"VirtMSC-SCCP".FileMask := ERROR | WARNING; -"IPA0-RSL-IPA".FileMask := ERROR | WARNING; -"IPA0-CTRL-IPA".FileMask := ERROR | WARNING; -mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/bsc/BSC_Tests.default" -LogSourceInfo := Yes -SourceInfoFormat := Single -LoggerPlugins := { JUnitLogger := "libjunitlogger2" } -#*.JUnitLogger.filename_stem := "MyJunitLogFile" +[LOGGING] *.JUnitLogger.testsuite_name := "BSC_Tests" [TESTPORT_PARAMETERS] -#*.*.udpReuseAddress := "yes"; -*.BSCVTY.CTRL_MODE := "client" *.BSCVTY.CTRL_HOSTNAME := "172.18.2.20" -*.BSCVTY.CTRL_PORTNUM := "4242" -*.BSCVTY.CTRL_LOGIN_SKIPPED := "yes" -*.BSCVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" -*.BSCVTY.CTRL_READMODE := "buffered" -*.BSCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" -*.BSCVTY.PROMPT1 := "OsmoBSC> " - [MODULE_PARAMETERS] BSC_Tests.mp_bsc_ip := "172.18.2.20"; -#BSC_Tests.mp_bsc_rsl_port := 3003; -#BSC_Tests.mp_bsc_ctrl_port := 3003; BSC_Tests.mp_bssap_cfg := { sccp_service_type := "mtp3_itu", sctp_addr := { 23905, "172.18.2.203", 2905, "172.18.2.200" }, @@ -41,17 +20,6 @@ BSC_Tests.mp_bssap_cfg := { sio := '83'O }; - -#mp_ipa_mgcp_uses_osmo_ext := true; -Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoBSC"; - -#mp_mgcp_uses_udp := true; -#mp_callagent_ip := "127.0.0.1"; -#mp_callagent_udp_port := 2727; -#mp_mgw_ip := "127.0.0.1"; -#mp_mgw_udp_port := 2427; - [MAIN_CONTROLLER] [EXECUTE] -BSC_Tests.control diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index e1ffea51..acb38ce1 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -19,6 +19,9 @@ RUN cd osmo-ttcn3-hacks && \ VOLUME /data +RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ + ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / + COPY BSC_Tests.cfg /data/BSC_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index aa74baf9..e816371f 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -38,6 +38,7 @@ done echo Starting container with BSC testsuite docker run --rm \ --network $NET_NAME --ip 172.18.2.203 \ + -e "TTCN3_PCAP_PATH=/data" \ -v $VOL_BASE_DIR/bsc-tester:/data \ --name ${BUILD_TAG}-ttcn3-bsc-test \ $REPO_USER/ttcn3-bsc-test diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index 4b1bbb3b..7252443e 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -19,6 +19,9 @@ RUN cd osmo-ttcn3-hacks && \ VOLUME /data +RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ + ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / + COPY MSC_Tests.cfg /data/MSC_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-msc-test/MSC_Tests.cfg b/ttcn3-msc-test/MSC_Tests.cfg index e899df98..0979f5ce 100644 --- a/ttcn3-msc-test/MSC_Tests.cfg +++ b/ttcn3-msc-test/MSC_Tests.cfg @@ -1,36 +1,13 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/msc/MSC_Tests.default" + [LOGGING] -SourceInfoFormat := Single; -#FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; -#ConsoleMask := ERROR | WARNING | TESTCASE | TTCN_MATCHING | DEBUG_ENCDEC -FileMask := LOG_ALL | TTCN_MATCHING; - -BSSAP.FileMask := LOG_NOTHING; -"MSC_Test-M3UA".FileMask := ERROR | WARNING; -"MSC_Test-SCCP".FileMask := ERROR | WARNING; -"MSC_Test-GSUP-IPA".FileMask := ERROR | WARNING; -"MSC_Test-GSUP".FileMask := ERROR | WARNING; -"IPA-CTRL-IPA".FileMask := ERROR | WARNING; -mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; - -LogSourceInfo := Yes -LoggerPlugins := { JUnitLogger := "libjunitlogger2" } -*.JUnitLogger.testsuite_name := "MSC_Tests" [TESTPORT_PARAMETERS] -#*.*.udpReuseAddress := "yes"; -"MSC_Test-MNCC".MNCC.socket_type := "SEQPACKET"; -*.MSCVTY.CTRL_MODE := "client" *.MSCVTY.CTRL_HOSTNAME := "172.18.1.10" -*.MSCVTY.CTRL_PORTNUM := "4254" -*.MSCVTY.CTRL_LOGIN_SKIPPED := "yes" -*.MSCVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" -*.MSCVTY.CTRL_READMODE := "buffered" -*.MSCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" -*.MSCVTY.PROMPT1 := "OsmoMSC> " - [MODULE_PARAMETERS] -M3UA_Emulation.tsp_logVerbose := true; # connection to STP MSC_Tests.mp_bssap_cfg := { sccp_service_type := "mtp3_itu", @@ -41,8 +18,6 @@ MSC_Tests.mp_bssap_cfg := { peer_ssn := 254, sio := '83'O }; -# VTY prompt prefix -Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoMSC"; # remote (IUT) side MSC_Tests.mp_msc_mncc := "/data/unix/mncc"; MSC_Tests.mp_msc_ip := "172.18.1.10"; @@ -53,4 +28,3 @@ MSC_Tests.mp_mgw_ip := "172.18.1.103"; [MAIN_CONTROLLER] [EXECUTE] -MSC_Tests.control diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index f8637cea..097ff76a 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -36,6 +36,7 @@ docker run --rm \ echo Starting container with MSC testsuite docker run --rm \ --network $NET_NAME --ip 172.18.1.103 \ + -e "TTCN3_PCAP_PATH=/data" \ -v $VOL_BASE_DIR/msc-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-ttcn3-msc-test \ diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg index c308a68f..507044c3 100644 --- a/ttcn3-msc-test/osmo-msc.cfg +++ b/ttcn3-msc-test/osmo-msc.cfg @@ -72,6 +72,7 @@ msc cs7-instance-a 0 cs7-instance-iu 0 mgw remote-ip 172.18.1.103 + emergency-call route-to-msisdn 112 mncc-int default-codec tch-f fr default-codec tch-h hr