From facbb6575e31b0249590ffc6a4b3090daee9963a Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 6 Feb 2018 17:41:33 +0100 Subject: [PATCH] move every 'test network' to its own IP address space Ideally we would want to launch a group of containers with their own private network segment and use the same static IP addresses in those isolated networks. The stupidity of docker is requiring unique IPv4 addresses even on isolated (!) networks. This means we have to manually give each of our test setups a different subnet, and then we can at least run one instance that test in parallel to at most one instance of each other test. If this weird reestriction about unique IPv4 addresses didn't exist, we could start any number of test runs in parallel. --- ggsn-test/GGSN_Tests.cfg | 8 ++-- ggsn-test/Makefile | 2 +- ggsn-test/jenkins.sh | 13 +++++- m3ua-test/Makefile | 2 +- m3ua-test/jenkins.sh | 43 +++++++++-------- m3ua-test/m3ua-param-testtool.scm | 4 +- m3ua-test/osmo-stp.cfg | 71 +++++++++++++++++++++++++++++ mgw-test/MGCP_Test.cfg | 4 +- mgw-test/Makefile | 2 +- mgw-test/jenkins.sh | 14 ++++-- mgw-test/osmo-mgw.cfg | 52 +++++++++++++++++++++ setup.sh | 3 -- sua-test/Makefile | 2 +- sua-test/jenkins.sh | 43 +++++++++-------- sua-test/osmo-stp.cfg | 71 +++++++++++++++++++++++++++++ sua-test/sua-param-testtool-sgp.scm | 4 +- ttcn3-bsc-test/BSC_Tests.cfg | 4 +- ttcn3-bsc-test/Makefile | 2 +- ttcn3-bsc-test/jenkins.sh | 19 ++++++-- ttcn3-bsc-test/osmo-bsc.cfg | 2 +- ttcn3-bsc-test/osmo-stp.cfg | 4 +- ttcn3-msc-test/MSC_Tests.cfg | 10 ++-- ttcn3-msc-test/Makefile | 2 +- ttcn3-msc-test/jenkins.sh | 16 +++++-- ttcn3-msc-test/osmo-msc.cfg | 6 +-- ttcn3-msc-test/osmo-stp.cfg | 4 +- ttcn3-nitb-sysinfo/Makefile | 2 +- ttcn3-nitb-sysinfo/Test.cfg | 2 +- ttcn3-nitb-sysinfo/jenkins.sh | 14 ++++-- 29 files changed, 335 insertions(+), 90 deletions(-) create mode 100644 m3ua-test/osmo-stp.cfg create mode 100644 mgw-test/osmo-mgw.cfg delete mode 100755 setup.sh create mode 100644 sua-test/osmo-stp.cfg diff --git a/ggsn-test/GGSN_Tests.cfg b/ggsn-test/GGSN_Tests.cfg index f4202447..4b34ce1a 100644 --- a/ggsn-test/GGSN_Tests.cfg +++ b/ggsn-test/GGSN_Tests.cfg @@ -13,11 +13,11 @@ system.*.lazy_conn_id_handling := "YES" [MODULE_PARAMETERS] # our Own IP address -GGSN_Tests.m_bind_ip_gtpc := "172.18.0.202" -GGSN_Tests.m_bind_ip_gtpu := "172.18.0.202" +GGSN_Tests.m_bind_ip_gtpc := "172.18.3.202" +GGSN_Tests.m_bind_ip_gtpu := "172.18.3.202" # GGSN IP address -GGSN_Tests.m_ggsn_ip_gtpc := "172.18.0.201" -GGSN_Tests.m_ggsn_ip_gtpu := "172.18.0.201" +GGSN_Tests.m_ggsn_ip_gtpc := "172.18.3.201" +GGSN_Tests.m_ggsn_ip_gtpu := "172.18.3.201" [EXECUTE] #GGSN_Tests.TC_dummy diff --git a/ggsn-test/Makefile b/ggsn-test/Makefile index 42de2104..c4999f8a 100644 --- a/ggsn-test/Makefile +++ b/ggsn-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.0.202 -v ggsn-test-vol:/data +RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.3.202 -v ggsn-test-vol:/data include ../make/Makefile diff --git a/ggsn-test/jenkins.sh b/ggsn-test/jenkins.sh index 8c70bbd6..726fe80f 100755 --- a/ggsn-test/jenkins.sh +++ b/ggsn-test/jenkins.sh @@ -10,6 +10,11 @@ if [ "x$WORKSPACE" = "x" ]; then WORKSPACE=/tmp fi +NET_NAME="ggsn-tester" + +echo Creating network $NET_NAME +docker network create --internal --subnet 172.18.3.0/24 $NET_NAME + VOL_BASE_DIR=`mktemp -d` mkdir $VOL_BASE_DIR/ggsn-tester cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ @@ -22,7 +27,7 @@ docker run --cap-add=NET_ADMIN \ --device /dev/net/tun:/dev/net/tun \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ --rm \ - --network sigtran --ip 172.18.0.201 \ + --network $NET_NAME --ip 172.18.3.201 \ -v $VOL_BASE_DIR/ggsn:/data \ --name ggsn -d \ $REPO_USER/osmo-ggsn-master @@ -30,13 +35,17 @@ docker run --cap-add=NET_ADMIN \ # start docker container with testsuite in foreground docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ - --network sigtran --ip 172.18.0.202 \ + --network $NET_NAME --ip 172.18.3.202 \ -v $VOL_BASE_DIR/ggsn-tester:/data \ $REPO_USER/ggsn-test # stop GGSN after test has completed docker container stop ggsn +echo Removing network $NET_NAME +docker network remove $NET_NAME + + rm -rf $WORKSPACE/logs mkdir -p $WORKSPACE/logs cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/ diff --git a/m3ua-test/Makefile b/m3ua-test/Makefile index 7de0218f..0631fd34 100644 --- a/m3ua-test/Makefile +++ b/m3ua-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.2 +RUN_ARGS?=--rm --network sigtran --ip 172.18.7.2 include ../make/Makefile diff --git a/m3ua-test/jenkins.sh b/m3ua-test/jenkins.sh index c84434b3..42b5c3fc 100755 --- a/m3ua-test/jenkins.sh +++ b/m3ua-test/jenkins.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -x + # non-jenkins execution: assume local user name if [ "x$REPO_USER" = "x" ]; then REPO_USER=$USER @@ -10,35 +12,38 @@ if [ "x$WORKSPACE" = "x" ]; then WORKSPACE=/tmp fi -LOGDIR=$WORKSPACE/logs +NET_NAME="m3ua-tester" -rm -rf $LOGDIR || /bin/true -mkdir -p $LOGDIR +VOL_BASE_DIR=`mktemp -d` +mkdir $VOL_BASE_DIR/m3ua-tester +cp m3ua-param-testtool.scm all-sgp-tests.txt $VOL_BASE_DIR/m3ua-tester/ + +mkdir $VOL_BASE_DIR/stp +cp osmo-stp.cfg $VOL_BASE_DIR/stp/ + +echo Creating network $NET_NAME +docker network create --internal --subnet 172.18.7.0/24 $NET_NAME + +rm -rf $WORKSPACE/logs || /bin/true +mkdir -p $WORKSPACE/logs # start container with STP in background -docker volume rm stp-vol || /bin/true docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ - --network sigtran --ip 172.18.0.200 \ - -v stp-vol:/data \ + --network $NET_NAME --ip 172.18.7.200 \ + -v $VOL_BASE_DIR/stp:/data \ --name stp \ -d $REPO_USER/osmo-stp-master # start docker container with tests -docker volume rm m3ua-test-vol || /bin/true docker run --rm \ - --network sigtran --ip 172.18.0.2 \ - -v m3ua-test-vol:/data \ - $REPO_USER/m3ua-test > $LOGDIR/junit-xml-m3ua.log + --network $NET_NAME --ip 172.18.7.2 \ + -v $VOL_BASE_DIR/m3ua-tester:/data \ + $REPO_USER/m3ua-test > $WORKSPACE/logs/junit-xml-m3ua.log docker container stop -t 1 stp -# start some stupid helper container so we can access the volume -docker run --rm \ - -v m3ua-test-vol:/m3ua-test \ - -v stp-vol:/stp \ - --name helper \ - -d busybox /bin/sh -c 'sleep 1000 & wait' -docker cp helper:/m3ua-test $LOGDIR -docker cp helper:/stp $LOGDIR -docker container stop -t 0 helper +echo Removing network $NET_NAME +docker network remove $NET_NAME + +cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/ diff --git a/m3ua-test/m3ua-param-testtool.scm b/m3ua-test/m3ua-param-testtool.scm index a7850d64..10ca653c 100644 --- a/m3ua-test/m3ua-param-testtool.scm +++ b/m3ua-test/m3ua-param-testtool.scm @@ -36,13 +36,13 @@ ;;; $Id: m3ua-param-testtool.scm,v 1.5 2012/08/28 19:56:13 tuexen Exp $ ;;; Define a transport address of the system under test (osmo-stp) -(define sut-addr "172.18.0.200") +(define sut-addr "172.18.7.200") (define sut-port m3ua-port) (define sut-port-1 m3ua-port) (define sut-port-2 m3ua-port) ;;; Define the transport address of the tester -(define tester-addr "172.18.0.2") +(define tester-addr "172.18.7.2") (define tester-port 3333) (define tester-port-1 3000) (define tester-port-2 3001) diff --git a/m3ua-test/osmo-stp.cfg b/m3ua-test/osmo-stp.cfg new file mode 100644 index 00000000..db16ad3b --- /dev/null +++ b/m3ua-test/osmo-stp.cfg @@ -0,0 +1,71 @@ +! +! osmo-stp (0.0.6.3.179-b248) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug +log file /data/osmo-stp.log + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug +! +line vty + no login + bind 0.0.0.0 +! +cs7 instance 0 + asp asp0 0 2905 m3ua + remote-ip 172.18.7.2 + asp asp-s-0 0 14001 sua + remote-ip 172.18.7.3 + as as0 m3ua + asp asp0 + routing-key 23 0.2.7 + as as-s-0 sua + asp asp-s-0 + routing-key 24 0.3.0 + route-table system + update route 0.2.7 0.2.7 linkset as0 + update route 0.3.0 0.3.0 linkset as-s-0 + listen m3ua 2905 + local-ip 172.18.7.200 + listen sua 14001 + local-ip 172.18.7.200 diff --git a/mgw-test/MGCP_Test.cfg b/mgw-test/MGCP_Test.cfg index 93ad889d..a74d0f82 100644 --- a/mgw-test/MGCP_Test.cfg +++ b/mgw-test/MGCP_Test.cfg @@ -14,9 +14,9 @@ LoggerPlugins := { JUnitLogger := "libjunitlogger2" } [MODULE_PARAMETERS] mp_local_udp_port := 2727; -mp_local_ip:= "172.18.0.181"; +mp_local_ip:= "172.18.4.181"; mp_remote_udp_port := 2427; -mp_remote_ip:= "172.18.0.180"; +mp_remote_ip:= "172.18.4.180"; [MAIN_CONTROLLER] diff --git a/mgw-test/Makefile b/mgw-test/Makefile index 50893c6d..a70d1f14 100644 --- a/mgw-test/Makefile +++ b/mgw-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.0.181 -v mgw-test-vol:/data +RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.4.181 -v mgw-test-vol:/data include ../make/Makefile diff --git a/mgw-test/jenkins.sh b/mgw-test/jenkins.sh index a6126f63..d324d782 100755 --- a/mgw-test/jenkins.sh +++ b/mgw-test/jenkins.sh @@ -10,29 +10,37 @@ if [ "x$WORKSPACE" = "x" ]; then WORKSPACE=/tmp fi +NET_NAME="mgw-tester" + VOL_BASE_DIR=`mktemp -d` mkdir $VOL_BASE_DIR/mgw-tester cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/ mkdir $VOL_BASE_DIR/mgw -cp ../osmo-mgw-master/osmo-mgw.cfg $VOL_BASE_DIR/mgw/ +cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/ + +echo Creating network $NET_NAME +docker network create --internal --subnet 172.18.4.0/24 $NET_NAME # start container with mgw in background docker run --rm \ - --network sigtran --ip 172.18.0.180 \ + --network $NET_NAME --ip 172.18.4.180 \ -v $VOL_BASE_DIR/mgw:/data \ --name mgw -d \ $REPO_USER/osmo-mgw-master # start docker container with testsuite in foreground docker run --rm \ - --network sigtran --ip 172.18.0.181 \ + --network $NET_NAME --ip 172.18.4.181 \ -v $VOL_BASE_DIR/mgw-tester:/data \ $REPO_USER/mgw-test # stop mgw after test has completed docker container stop mgw +echo Removing network $NET_NAME +docker network remove $NET_NAME + rm -rf $WORKSPACE/logs mkdir -p $WORKSPACE/logs cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/ diff --git a/mgw-test/osmo-mgw.cfg b/mgw-test/osmo-mgw.cfg new file mode 100644 index 00000000..acf7e313 --- /dev/null +++ b/mgw-test/osmo-mgw.cfg @@ -0,0 +1,52 @@ +! +! OsmoMGW (1.2.0.17-52e3) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level rtp notice + 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 notice + 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 +! +mgcp + bind ip 172.18.4.180 + bind port 2427 + rtp port-range 4002 16000 + rtp bind-ip 172.18.4.180 + rtp ip-probing + rtp ip-dscp 184 + no rtp keep-alive + no rtcp-omit + no rtp-patch + sdp audio-payload number 98 + sdp audio-payload name GSM + sdp audio-payload send-ptime + sdp audio-payload send-name + loop 0 + number endpoints 31 + allow-transcoding + osmux off diff --git a/setup.sh b/setup.sh deleted file mode 100755 index 55e36203..00000000 --- a/setup.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -docker network create --internal --subnet 172.18.0.0/16 sigtran -docker network create --internal --subnet 172.20.0.0/24 --ipv6 --subnet fd10:5741:8e20::0/64 pdn diff --git a/sua-test/Makefile b/sua-test/Makefile index b7a6cb84..273a334b 100644 --- a/sua-test/Makefile +++ b/sua-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.3 +RUN_ARGS?=--rm --network sigtran --ip 172.18.6.3 include ../make/Makefile diff --git a/sua-test/jenkins.sh b/sua-test/jenkins.sh index d87159f2..11cb37ac 100755 --- a/sua-test/jenkins.sh +++ b/sua-test/jenkins.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -x + # non-jenkins execution: assume local user name if [ "x$REPO_USER" = "x" ]; then REPO_USER=$USER @@ -10,35 +12,38 @@ if [ "x$WORKSPACE" = "x" ]; then WORKSPACE=/tmp fi -LOGDIR=$WORKSPACE/logs +NET_NAME="sua-tester" -rm -rf $LOGDIR || /bin/true -mkdir -p $LOGDIR +VOL_BASE_DIR=`mktemp -d` +mkdir $VOL_BASE_DIR/sua-tester +cp sua-param-testtool-sgp.scm some-sua-sgp-tests.txt $VOL_BASE_DIR/sua-tester/ + +mkdir $VOL_BASE_DIR/stp +cp osmo-stp.cfg $VOL_BASE_DIR/stp/ + +echo Creating network $NET_NAME +docker network create --internal --subnet 172.18.6.0/24 $NET_NAME + +rm -rf $WORKSPACE/logs || /bin/true +mkdir -p $WORKSPACE/logs # start container with STP in background -docker volume rm stp-vol || /bin/true docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ - --network sigtran --ip 172.18.0.200 \ - -v stp-vol:/data \ + --network $NET_NAME --ip 172.18.6.200 \ + -v $VOL_BASE_DIR/stp:/data \ --name stp \ -d $REPO_USER/osmo-stp-master # start docker container with tests -docker volume rm sua-test-vol || /bin/true docker run --rm \ - --network sigtran --ip 172.18.0.3 \ - -v sua-test-vol:/data \ - $REPO_USER/sua-test > $LOGDIR/junit-xml-sua.log + --network $NET_NAME --ip 172.18.6.3 \ + -v $VOL_BASE_DIR/sua-tester:/data \ + $REPO_USER/sua-test > $WORKSPACE/logs/junit-xml-sua.log docker container stop -t 1 stp -# start some stupid helper container so we can access the volume -docker run --rm \ - -v sua-test-vol:/sua-test \ - -v stp-vol:/stp \ - --name helper \ - -d busybox /bin/sh -c 'sleep 1000 & wait' -docker cp helper:/sua-test $LOGDIR -docker cp helper:/stp $LOGDIR -docker container stop -t 0 helper +echo Removing network $NET_NAME +docker network remove $NET_NAME + +cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/ diff --git a/sua-test/osmo-stp.cfg b/sua-test/osmo-stp.cfg new file mode 100644 index 00000000..23a3eb15 --- /dev/null +++ b/sua-test/osmo-stp.cfg @@ -0,0 +1,71 @@ +! +! osmo-stp (0.0.6.3.179-b248) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug +log file /data/osmo-stp.log + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug +! +line vty + no login + bind 0.0.0.0 +! +cs7 instance 0 + asp asp0 0 2905 m3ua + remote-ip 172.18.6.2 + asp asp-s-0 0 14001 sua + remote-ip 172.18.6.3 + as as0 m3ua + asp asp0 + routing-key 23 0.2.7 + as as-s-0 sua + asp asp-s-0 + routing-key 24 0.3.0 + route-table system + update route 0.2.7 0.2.7 linkset as0 + update route 0.3.0 0.3.0 linkset as-s-0 + listen m3ua 2905 + local-ip 172.18.6.200 + listen sua 14001 + local-ip 172.18.6.200 diff --git a/sua-test/sua-param-testtool-sgp.scm b/sua-test/sua-param-testtool-sgp.scm index 486b0982..87a34280 100644 --- a/sua-test/sua-param-testtool-sgp.scm +++ b/sua-test/sua-param-testtool-sgp.scm @@ -26,13 +26,13 @@ ;;; $Id: sua-param-testtool-sgp.scm,v 1.2 2011/03/21 22:18:29 tuexen Exp $ ;;; Define a transport address of the system under test -(define sut-addr "172.18.0.200") +(define sut-addr "172.18.6.200") (define sut-port sua-port) (define sut-port-1 sua-port) (define sut-port-2 (1+ sua-port)) ;;; Define the transport address of the tester -(define tester-addr "172.18.0.3") +(define tester-addr "172.18.6.3") (define tester-port 0) (define tester-port-1 3000) diff --git a/ttcn3-bsc-test/BSC_Tests.cfg b/ttcn3-bsc-test/BSC_Tests.cfg index f6196651..3dc7b140 100644 --- a/ttcn3-bsc-test/BSC_Tests.cfg +++ b/ttcn3-bsc-test/BSC_Tests.cfg @@ -19,10 +19,10 @@ LoggerPlugins := { JUnitLogger := "libjunitlogger2" } #*.*.udpReuseAddress := "yes"; [MODULE_PARAMETERS] -BSC_Tests.mp_bsc_ip := "172.18.0.20"; +BSC_Tests.mp_bsc_ip := "172.18.2.20"; #BSC_Tests.mp_bsc_rsl_port := 3003; #BSC_Tests.mp_bsc_ctrl_port := 3003; -BSSAP_Adapter.mp_sctp_addr := { 23905, "172.18.0.203", 2905, "172.18.0.200" }; +BSSAP_Adapter.mp_sctp_addr := { 23905, "172.18.2.203", 2905, "172.18.2.200" }; #mp_ipa_mgcp_uses_osmo_ext := true; diff --git a/ttcn3-bsc-test/Makefile b/ttcn3-bsc-test/Makefile index 42de2104..cbcd5445 100644 --- a/ttcn3-bsc-test/Makefile +++ b/ttcn3-bsc-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.0.202 -v ggsn-test-vol:/data +RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data include ../make/Makefile diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 03be9fe1..4c9cc4af 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -10,6 +10,8 @@ if [ "x$WORKSPACE" = "x" ]; then WORKSPACE=/tmp fi +NET_NAME="bsc-tester" + VOL_BASE_DIR=`mktemp -d` mkdir $VOL_BASE_DIR/bsc-tester cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ @@ -20,16 +22,19 @@ cp osmo-stp.cfg $VOL_BASE_DIR/stp/ mkdir $VOL_BASE_DIR/bsc cp osmo-bsc.cfg $VOL_BASE_DIR/bsc/ +echo Creating network $NET_NAME +docker network create --internal --subnet 172.18.2.0/24 $NET_NAME + echo Starting container with STP docker run --rm \ - --network sigtran --ip 172.18.0.200 \ + --network $NET_NAME --ip 172.18.2.200 \ -v $VOL_BASE_DIR/stp:/data \ --name stp -d \ $REPO_USER/osmo-stp-master echo Starting container with BSC docker run --rm \ - --network sigtran --ip 172.18.0.20 \ + --network $NET_NAME --ip 172.18.2.20 \ -v $VOL_BASE_DIR/bsc:/data \ --name bsc -d \ $REPO_USER/osmo-bsc-master @@ -37,14 +42,14 @@ docker run --rm \ for i in `seq 0 2`; do echo Starting container with OML for BTS$i docker run --rm \ - --network sigtran --ip 172.18.0.10$i \ + --network $NET_NAME --ip 172.18.2.10$i \ --name bts$i -d \ - $REPO_USER/osmo-bts-omldummy ./respawn.sh 172.18.0.20 $((i + 1234)) + $REPO_USER/osmo-bts-omldummy ./respawn.sh 172.18.2.20 $((i + 1234)) done echo Starting container with BSC testsuite docker run --rm \ - --network sigtran --ip 172.18.0.203 \ + --network $NET_NAME --ip 172.18.2.203 \ -v $VOL_BASE_DIR/bsc-tester:/data \ --name ttcn3-bsc-test \ $REPO_USER/ttcn3-bsc-test @@ -56,6 +61,10 @@ done docker container kill bsc docker container kill stp +echo Removing network $NET_NAME +docker network remove $NET_NAME + + rm -rf $WORKSPACE/logs mkdir -p $WORKSPACE/logs cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/ diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 7d7bd53a..e024d73f 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -68,7 +68,7 @@ e1_input no e1_line 0 keepalive cs7 instance 0 asp asp-clnt-msc-0 2905 2905 m3ua - remote-ip 172.18.0.200 + remote-ip 172.18.2.200 network network country code 1 mobile network code 1 diff --git a/ttcn3-bsc-test/osmo-stp.cfg b/ttcn3-bsc-test/osmo-stp.cfg index 2649a225..da0956a7 100644 --- a/ttcn3-bsc-test/osmo-stp.cfg +++ b/ttcn3-bsc-test/osmo-stp.cfg @@ -32,8 +32,8 @@ line vty cs7 instance 0 xua rkm routing-key-allocation dynamic-permitted asp virt-msc0-0 23905 2905 m3ua - local-ip 172.18.0.200 - remote-ip 172.18.0.203 + local-ip 172.18.2.200 + remote-ip 172.18.2.203 as mahlzeit ipa routing-key 1 0.23.4 point-code override dpc 0.23.1 diff --git a/ttcn3-msc-test/MSC_Tests.cfg b/ttcn3-msc-test/MSC_Tests.cfg index f885fcc9..9a78a1b6 100644 --- a/ttcn3-msc-test/MSC_Tests.cfg +++ b/ttcn3-msc-test/MSC_Tests.cfg @@ -20,7 +20,7 @@ LoggerPlugins := { JUnitLogger := "libjunitlogger2" } #*.*.udpReuseAddress := "yes"; "MSC_Test-MNCC".MNCC.socket_type := "SEQPACKET"; *.MSCVTY.CTRL_MODE := "client" -*.MSCVTY.CTRL_HOSTNAME := "172.18.0.10" +*.MSCVTY.CTRL_HOSTNAME := "172.18.1.10" *.MSCVTY.CTRL_PORTNUM := "4254" *.MSCVTY.CTRL_LOGIN_SKIPPED := "yes" *.MSCVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" @@ -34,15 +34,15 @@ M3UA_Emulation.tsp_logVerbose := true; # connection to STP BSSAP_Adapter.mp_own_pc := 193; /* 0.23.3 */ BSSAP_Adapter.mp_peer_pc := 185; /* 0.23.1 */ -BSSAP_Adapter.mp_sctp_addr := { 23906, "172.18.0.103", 2905, "172.18.0.200" }; +BSSAP_Adapter.mp_sctp_addr := { 23906, "172.18.1.103", 2905, "172.18.1.200" }; # 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.0.10"; +MSC_Tests.mp_msc_ip := "172.18.1.10"; # local (emulation) side) -MSC_Tests.mp_hlr_ip := "172.18.0.103"; -MSC_Tests.mp_mgw_ip := "172.18.0.103"; +MSC_Tests.mp_hlr_ip := "172.18.1.103"; +MSC_Tests.mp_mgw_ip := "172.18.1.103"; [MAIN_CONTROLLER] diff --git a/ttcn3-msc-test/Makefile b/ttcn3-msc-test/Makefile index 42de2104..fe1be7ca 100644 --- a/ttcn3-msc-test/Makefile +++ b/ttcn3-msc-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.0.202 -v ggsn-test-vol:/data +RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.1.202 -v ggsn-test-vol:/data include ../make/Makefile diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 16645804..5be838d7 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -x + # non-jenkins execution: assume local user name if [ "x$REPO_USER" = "x" ]; then REPO_USER=$USER @@ -10,6 +12,11 @@ if [ "x$WORKSPACE" = "x" ]; then WORKSPACE=/tmp fi +NET_NAME="msc-tester" + +echo Creating network $NET_NAME +docker network create --internal --subnet 172.18.1.0/24 $NET_NAME + VOL_BASE_DIR=`mktemp -d` mkdir $VOL_BASE_DIR/msc-tester mkdir $VOL_BASE_DIR/msc-tester/unix @@ -26,14 +33,14 @@ mkdir $VOL_BASE_DIR/unix echo Starting container with STP docker run --rm \ - --network sigtran --ip 172.18.0.200 \ + --network $NET_NAME --ip 172.18.1.200 \ -v $VOL_BASE_DIR/stp:/data \ --name stp -d \ $REPO_USER/osmo-stp-master echo Starting container with MSC docker run --rm \ - --network sigtran --ip 172.18.0.10 \ + --network $NET_NAME --ip 172.18.1.10 \ -v $VOL_BASE_DIR/msc:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name msc -d \ @@ -42,7 +49,7 @@ docker run --rm \ echo Starting container with MSC testsuite docker run --rm \ - --network sigtran --ip 172.18.0.103 \ + --network $NET_NAME --ip 172.18.1.103 \ -v $VOL_BASE_DIR/msc-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ttcn3-msc-test \ @@ -52,6 +59,9 @@ echo Stopping containers docker container kill msc docker container kill stp +echo Deleting network $NET_NAME +docker network rm $NET_NAME + rm -rf $WORKSPACE/logs mkdir -p $WORKSPACE/logs cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/ diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg index 39ad2142..2b7fbfd5 100644 --- a/ttcn3-msc-test/osmo-msc.cfg +++ b/ttcn3-msc-test/osmo-msc.cfg @@ -53,7 +53,7 @@ ctrl cs7 instance 0 point-code 0.23.1 asp asp-clnt-OsmoMSC-A 2905 0 m3ua - remote-ip 172.18.0.200 + remote-ip 172.18.1.200 as as-clnt-OsmoMSC-A m3ua asp asp-clnt-OsmoMSC-A routing-key 2 0.23.1 @@ -73,10 +73,10 @@ msc assign-tmsi cs7-instance-a 0 cs7-instance-iu 0 - mgw remote-ip 172.18.0.103 + mgw remote-ip 172.18.1.103 mncc-int default-codec tch-f fr default-codec tch-h hr hlr - remote-ip 172.18.0.103 + remote-ip 172.18.1.103 remote-port 4222 diff --git a/ttcn3-msc-test/osmo-stp.cfg b/ttcn3-msc-test/osmo-stp.cfg index ec6e7cbb..6939b921 100644 --- a/ttcn3-msc-test/osmo-stp.cfg +++ b/ttcn3-msc-test/osmo-stp.cfg @@ -32,8 +32,8 @@ line vty cs7 instance 0 xua rkm routing-key-allocation dynamic-permitted asp virt-bsc0-0 23906 2905 m3ua - local-ip 172.18.0.200 - remote-ip 172.18.0.103 + local-ip 172.18.1.200 + remote-ip 172.18.1.103 as virt-bsc0 m3ua asp virt-bsc0-0 routing-key 0 0.24.1 diff --git a/ttcn3-nitb-sysinfo/Makefile b/ttcn3-nitb-sysinfo/Makefile index a9aefeec..7b2593b6 100644 --- a/ttcn3-nitb-sysinfo/Makefile +++ b/ttcn3-nitb-sysinfo/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.0.230 -v ttcn3-nitb-sysinfo-vol:/data +RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.5.230 -v ttcn3-nitb-sysinfo-vol:/data include ../make/Makefile diff --git a/ttcn3-nitb-sysinfo/Test.cfg b/ttcn3-nitb-sysinfo/Test.cfg index 6ee7fca2..077fa25d 100644 --- a/ttcn3-nitb-sysinfo/Test.cfg +++ b/ttcn3-nitb-sysinfo/Test.cfg @@ -8,7 +8,7 @@ LoggerPlugins := { JUnitLogger := "libjunitlogger2" } [TESTPORT_PARAMETERS] *.BSCVTY.CTRL_MODE := "client" -*.BSCVTY.CTRL_HOSTNAME := "172.18.0.20" +*.BSCVTY.CTRL_HOSTNAME := "172.18.5.20" *.BSCVTY.CTRL_PORTNUM := "4242" *.BSCVTY.CTRL_LOGIN_SKIPPED := "yes" *.BSCVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh index ab6f4b04..a52c16e8 100755 --- a/ttcn3-nitb-sysinfo/jenkins.sh +++ b/ttcn3-nitb-sysinfo/jenkins.sh @@ -10,11 +10,16 @@ if [ "x$WORKSPACE" = "x" ]; then WORKSPACE=/tmp fi +NET_NAME="nitb-sysinfo-tester" + +echo Creating network $NET_NAME +docker network create --internal --subnet 172.18.5.0/24 $NET_NAME + # start container with nitb in background docker volume rm nitb-vol docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ - --network sigtran --ip 172.18.0.20 \ + --network sigtran --ip 172.18.5.20 \ -v nitb-vol:/data \ --name nitb -d \ $REPO_USER/osmo-nitb-master @@ -23,7 +28,7 @@ docker run --rm \ docker volume rm bts-vol docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ - --network sigtran --ip 172.18.0.210 \ + --network sigtran --ip 172.18.5.210 \ -v bts-vol:/data \ --name bts -d \ $REPO_USER/osmo-bts-master @@ -33,7 +38,7 @@ docker run --rm \ docker volume rm ttcn3-nitb-sysinfo-vol docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ - --network sigtran --ip 172.18.0.230 \ + --network sigtran --ip 172.18.5.230 \ -v ttcn3-nitb-sysinfo-vol:/data \ $REPO_USER/ttcn3-nitb-sysinfo @@ -54,3 +59,6 @@ docker cp sysinfo-helper:/ttcn3-nitb-sysinfo $WORKSPACE/logs docker cp sysinfo-helper:/nitb $WORKSPACE/logs docker cp sysinfo-helper:/bts $WORKSPACE/logs docker container stop -t 0 sysinfo-helper + +echo Removing network $NET_NAME +docker network remove $NET_NAME