osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/40022?usp=email )
Change subject: Remove ttcn3 testsuites ported to testenv, part 3 ......................................................................
Remove ttcn3 testsuites ported to testenv, part 3
Related: OS#6494 Change-Id: Ic07793fb7d8889684fd89b00860ebd0b17561a9e --- D ttcn3-msc-test/Dockerfile D ttcn3-msc-test/MSC_Tests.cfg D ttcn3-msc-test/Makefile D ttcn3-msc-test/jenkins.sh D ttcn3-msc-test/osmo-msc.cfg D ttcn3-msc-test/osmo-stp.cfg D ttcn3-sccp-test/Dockerfile D ttcn3-sccp-test/Makefile D ttcn3-sccp-test/SCCP_Tests.cfg D ttcn3-sccp-test/jenkins.sh D ttcn3-sccp-test/sccp_demo_user.cfg 11 files changed, 0 insertions(+), 405 deletions(-)
Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified
diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile deleted file mode 100644 index 6fe48d4..0000000 --- a/ttcn3-msc-test/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -ARG REGISTRY -ARG USER -FROM $REGISTRY/$USER/debian-bookworm-titan -ARG OSMO_TTCN3_BRANCH="master" - -ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit -RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" msc - -VOLUME /data - -COPY MSC_Tests.cfg /data/MSC_Tests.cfg - -CMD ttcn3-docker-run msc MSC_Tests diff --git a/ttcn3-msc-test/MSC_Tests.cfg b/ttcn3-msc-test/MSC_Tests.cfg deleted file mode 100644 index 66ad4d1..0000000 --- a/ttcn3-msc-test/MSC_Tests.cfg +++ /dev/null @@ -1,60 +0,0 @@ -[ORDERED_INCLUDE] -"/osmo-ttcn3-hacks/Common.cfg" -"/osmo-ttcn3-hacks/msc/MSC_Tests.default" - -[LOGGING] - -[TESTPORT_PARAMETERS] -*.MSCVTY.CTRL_HOSTNAME := "172.18.20.10" - -[MODULE_PARAMETERS] -# connection to STP -MSC_Tests.mp_bssap_cfg := { - { - transport := BSSAP_TRANSPORT_AoIP, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23906, "172.18.20.103", 2905, "172.18.20.200" }, - own_pc := 193, /* 0.24.1 BSC emulation [0] */ - own_ssn := 254, - peer_pc := 185, /* 0.23.1 osmo-msc */ - peer_ssn := 254, - sio := '83'O, - rctx := 0 - }, - { - transport := BSSAP_TRANSPORT_AoIP, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23907, "172.18.20.103", 2905, "172.18.20.200" }, - own_pc := 194, /* 0.24.2 BSC emulation [1] */ - own_ssn := 254, - peer_pc := 185, /* 0.23.1 osmo-msc */ - peer_ssn := 254, - sio := '83'O, - rctx := 1 - }, - { - transport := RANAP_TRANSPORT_IuCS, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23908, "172.18.20.103", 2905, "172.18.20.200" }, - own_pc := 195, /* 0.24.3 BSC emulation [2] */ - own_ssn := 142, - peer_pc := 185, /* 0.23.1 osmo-msc */ - peer_ssn := 142, - sio := '83'O, - rctx := 2 - } -}; - -# remote (IUT) side -MSC_Tests.mp_msc_mncc := "/data/unix/mncc"; -MSC_Tests.mp_msc_ip := "172.18.20.10"; -# local (emulation) side) -MSC_Tests.mp_hlr_ip := "172.18.20.103"; -MSC_Tests.mp_mgw_ip := "172.18.20.103"; - -[MAIN_CONTROLLER] - -[EXECUTE] -MSC_Tests.control -MSC_Tests_Iu.control -MSC_Tests_ASCI.control diff --git a/ttcn3-msc-test/Makefile b/ttcn3-msc-test/Makefile deleted file mode 100644 index 6eb2c78..0000000 --- a/ttcn3-msc-test/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.20.202 -v ggsn-test-vol:/data - -include ../make/Makefile diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh deleted file mode 100755 index 46844d5..0000000 --- a/ttcn3-msc-test/jenkins.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -. ../jenkins-common.sh -IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" -docker_images_require \ - "osmo-stp-$IMAGE_SUFFIX" \ - "osmo-msc-$IMAGE_SUFFIX" \ - "ttcn3-msc-test" - -set_clean_up_trap -set -e - -mkdir $VOL_BASE_DIR/msc-tester -mkdir $VOL_BASE_DIR/msc-tester/unix -cp MSC_Tests.cfg $VOL_BASE_DIR/msc-tester/ -write_mp_osmo_repo "$VOL_BASE_DIR/msc-tester/MSC_Tests.cfg" - -mkdir $VOL_BASE_DIR/stp -cp osmo-stp.cfg $VOL_BASE_DIR/stp/ - -mkdir $VOL_BASE_DIR/msc -mkdir $VOL_BASE_DIR/msc/unix -cp osmo-msc.cfg $VOL_BASE_DIR/msc/ - -mkdir $VOL_BASE_DIR/unix - -network_create -network_replace_subnet_in_configs - -echo Starting container with STP -docker run --rm \ - $(docker_network_params $SUBNET 200) \ - --ulimit core=-1 \ - -v $VOL_BASE_DIR/stp:/data \ - --name ${BUILD_TAG}-stp -d \ - $REPO_USER/osmo-stp-$IMAGE_SUFFIX - -echo Starting container with MSC -docker run --rm \ - $(docker_network_params $SUBNET 10) \ - --ulimit core=-1 \ - -v $VOL_BASE_DIR/msc:/data \ - -v $VOL_BASE_DIR/unix:/data/unix \ - --name ${BUILD_TAG}-msc -d \ - $DOCKER_ARGS \ - $REPO_USER/osmo-msc-$IMAGE_SUFFIX \ - /bin/sh -c "osmo-msc -c /data/osmo-msc.cfg >>/data/osmo-msc.log 2>&1" - -echo Starting container with MSC testsuite -docker run --rm \ - $(docker_network_params $SUBNET 103) \ - --ulimit core=-1 \ - -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.10" \ - -e "OSMO_SUT_PORT=4254" \ - -v $VOL_BASE_DIR/msc-tester:/data \ - -v $VOL_BASE_DIR/unix:/data/unix \ - --name ${BUILD_TAG}-ttcn3-msc-test \ - $DOCKER_ARGS \ - $REPO_USER/ttcn3-msc-test diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg deleted file mode 100644 index b7b39f9..0000000 --- a/ttcn3-msc-test/osmo-msc.cfg +++ /dev/null @@ -1,98 +0,0 @@ -! -! OsmoMSC (1.1.2.66-629c4-dirty) configuration saved from vty -!! -! -log gsmtap 172.18.20.103 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level rll notice - logging level cc debug - logging level mm debug - logging level rr notice - logging level mncc debug - logging level pag notice - logging level msc notice - logging level mgcp debug - logging level ho notice - logging level db notice - logging level ref notice - logging level ctrl notice - logging level smpp debug - logging level ranap debug - logging level vlr debug - logging level iucs debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl info - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp debug -! -stats interval 5 -! -line vty - no login - bind 0.0.0.0 -ctrl - bind 0.0.0.0 -! -cs7 instance 0 - point-code 0.23.1 - asp asp-clnt-OsmoMSC-A 2905 0 m3ua - local-ip 172.18.20.10 - local-ip fd02:db8:20::10 - remote-ip 172.18.20.200 - remote-ip fd02:db8:20::200 - role asp - sctp-role client - as as-clnt-OsmoMSC-A m3ua - asp asp-clnt-OsmoMSC-A - routing-key 3 0.23.1 -network - network country code 262 - mobile network code 42 - short name OsmoMSC - long name OsmoMSC - encryption a5 0 - encryption uea 0 - authentication optional - rrlp mode none - mm info 0 -msc - assign-tmsi - cs7-instance-a 0 - cs7-instance-iu 0 - mgw remote-ip 172.18.20.103 - emergency-call route-to-msisdn 112 - mncc external /data/unix/mncc -mncc-int - default-codec tch-f fr - default-codec tch-h hr -smpp - local-tcp-port 2775 - policy closed - no smpp-first - esme msc_tester - password osmocom1 -hlr - remote-ip 172.18.20.103 - remote-port 4222 - ipa-name test-MSC diff --git a/ttcn3-msc-test/osmo-stp.cfg b/ttcn3-msc-test/osmo-stp.cfg deleted file mode 100644 index a893f4b..0000000 --- a/ttcn3-msc-test/osmo-stp.cfg +++ /dev/null @@ -1,62 +0,0 @@ -! -! OsmoSTP (0.8.1) configuration saved from vty -!! -! -log gsmtap 172.18.20.103 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level set-all debug -! -line vty - no login -! -cs7 instance 0 - xua rkm routing-key-allocation dynamic-permitted - asp virt-bsc0-0 23906 2905 m3ua - local-ip 172.18.20.200 - local-ip fd02:db8:20::200 - remote-ip 172.18.20.103 - remote-ip fd02:db8:20::103 - role sg - sctp-role server - as virt-bsc0 m3ua - asp virt-bsc0-0 - routing-key 0 0.24.1 - asp virt-bsc1-0 23907 2905 m3ua - local-ip 172.18.20.200 - local-ip fd02:db8:20::200 - remote-ip 172.18.20.103 - remote-ip fd02:db8:20::103 - role sg - sctp-role server - as virt-bsc1 m3ua - asp virt-bsc1-0 - routing-key 1 0.24.2 - asp virt-rnc0-0 23908 2905 m3ua - local-ip 172.18.20.200 - local-ip fd02:db8:20::200 - remote-ip 172.18.20.103 - remote-ip fd02:db8:20::103 - role sg - sctp-role server - as virt-rnc0 m3ua - asp virt-rnc0-0 - routing-key 2 0.24.3 - route-table system - update route 0.24.1 7.255.7 linkset virt-bsc0 - update route 0.24.2 7.255.7 linkset virt-bsc1 - update route 0.24.3 7.255.7 linkset virt-rnc0 - listen m3ua 2905 - accept-asp-connections dynamic-permitted - local-ip 172.18.20.200 - local-ip fd02:db8:20::200 - listen ipa 5000 - accept-asp-connections dynamic-permitted - local-ip 172.18.20.200 diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile deleted file mode 100644 index 8d52787..0000000 --- a/ttcn3-sccp-test/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -ARG REGISTRY -ARG USER -FROM $REGISTRY/$USER/debian-bookworm-titan -ARG OSMO_TTCN3_BRANCH="master" - -ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit -RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sccp - -VOLUME /data - -COPY SCCP_Tests.cfg /data/SCCP_Tests.cfg - -CMD ttcn3-docker-run sccp SCCP_Tests diff --git a/ttcn3-sccp-test/Makefile b/ttcn3-sccp-test/Makefile deleted file mode 100644 index 4848603..0000000 --- a/ttcn3-sccp-test/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data - -include ../make/Makefile diff --git a/ttcn3-sccp-test/SCCP_Tests.cfg b/ttcn3-sccp-test/SCCP_Tests.cfg deleted file mode 100644 index 0d6a91b..0000000 --- a/ttcn3-sccp-test/SCCP_Tests.cfg +++ /dev/null @@ -1,30 +0,0 @@ -[ORDERED_INCLUDE] -"/osmo-ttcn3-hacks/Common.cfg" -"/osmo-ttcn3-hacks/sccp/SCCP_Tests.default" - -[LOGGING] -*.JUnitLogger.testsuite_name := "SCCP_Tests" - -[TESTPORT_PARAMETERS] -*.SCCP_DEMO_USER_VTY.CTRL_HOSTNAME := "172.18.22.200" -*.SCCP_DEMO_USER_VTY.CTRL_PORTNUM := "2324" - -[MODULE_PARAMETERS] -SCCP_Tests.mp_sccp_cfg := { - { - sccp_service_type := "mtp3_itu", - sctp_addr := { 2905, "172.18.22.203", 2905, "172.18.22.200" }, - 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 - } -}; - -[MAIN_CONTROLLER] - -[EXECUTE] -SCCP_Tests.control -SCCP_Tests_RAW.control diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh deleted file mode 100755 index 03a630c..0000000 --- a/ttcn3-sccp-test/jenkins.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -. ../jenkins-common.sh -IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" -# Always require osmo-stp-master since is the only with sccp_demo_user installed -docker_images_require \ - "osmo-stp-master" \ - "ttcn3-sccp-test" - -set_clean_up_trap -set -e - -mkdir $VOL_BASE_DIR/sccp-tester -cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/ -write_mp_osmo_repo "$VOL_BASE_DIR/sccp-tester/SCCP_Tests.cfg" - -mkdir $VOL_BASE_DIR/sccp -cp sccp_demo_user.cfg $VOL_BASE_DIR/sccp/ - -network_create -network_replace_subnet_in_configs - -echo Starting container with sccp_demo_user -docker run --rm \ - $(docker_network_params $SUBNET 200) \ - --ulimit core=-1 \ - -v $VOL_BASE_DIR/sccp:/data \ - --name ${BUILD_TAG}-stp -d \ - $DOCKER_ARGS \ - $REPO_USER/osmo-stp-master \ - /bin/sh -c "sccp_demo_user \ - -l $SUB4_PREFIX.$SUBNET.200 \ - -r $SUB4_PREFIX.$SUBNET.203 \ - -C /data/sccp_demo_user.cfg \ - >>/data/sccp_demo_user.log 2>&1" - - -echo Starting container with SCCP testsuite -docker run --rm \ - $(docker_network_params $SUBNET 203) \ - --ulimit core=-1 \ - -e "TTCN3_PCAP_PATH=/data" \ - -v $VOL_BASE_DIR/sccp-tester:/data \ - --name ${BUILD_TAG}-ttcn3-sccp-test \ - $DOCKER_ARGS \ - $REPO_USER/ttcn3-sccp-test diff --git a/ttcn3-sccp-test/sccp_demo_user.cfg b/ttcn3-sccp-test/sccp_demo_user.cfg deleted file mode 100644 index 59c0867..0000000 --- a/ttcn3-sccp-test/sccp_demo_user.cfg +++ /dev/null @@ -1,17 +0,0 @@ -log gsmtap 172.18.22.203 - logging level set-all debug - logging filter all 1 - -log stderr - logging filter all 1 - logging color 1 - logging print level 1 - logging print category 1 - logging print category-hex 0 - logging print file basename last - logging print extended-timestamp 1 - logging level set-all debug - -line vty - no login - bind 172.18.22.200