jenkins-common.sh: Add function to print docker network related parameters

Change-Id: Ie00561de7a4494065156a124565e2190151e6019
2020-08-24 16:15:40 +02:00 · 2020-08-24 16:15:40 +02:00 · 1f45fb08ff
parent 8d4a97a3fc
commit 1f45fb08ff
20 changed files with 100 additions and 73 deletions
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@ -98,6 +98,15 @@ network_remove() {
 	docker network remove $NET_NAME
 }

+# Generates list of params to pass to "docker run" to configure IP addresses
+# $1: SUBNET to use, same as passed to network_create()
+# $2: Address suffix from SUBNET to apply to the container
+docker_network_params() {
+	NET=$1
+	ADDR_SUFIX=$2
+	echo --network $NET_NAME --ip "172.18.$NET.$ADDR_SUFIX" --ip6 "fd02:db8:$NET::$ADDR_SUFIX"
+}
+
 fix_perms() {
 	if ! docker_image_exists "debian-stretch-build"; then
 		docker_images_require "debian-stretch-build"
--- a/nplab-m3ua-test/jenkins.sh
+++ b/nplab-m3ua-test/jenkins.sh
@ -15,12 +15,13 @@ 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/

-network_create 7
+SUBNET=7
+network_create $SUBNET

 # start container with STP in background
 docker run	--rm \
 		--sysctl net.ipv6.conf.all.disable_ipv6=0 \
-		--network $NET_NAME --ip 172.18.7.200 \
+		$(docker_network_params $SUBNET 200) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/stp:/data \
 		--name ${BUILD_TAG}-stp \
@ -28,7 +29,7 @@ docker run	--rm \

 # start docker container with tests
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.7.2 \
+		$(docker_network_params $SUBNET 2) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/m3ua-tester:/data \
 		--name ${BUILD_TAG}-m3ua-test \
--- a/nplab-sua-test/jenkins.sh
+++ b/nplab-sua-test/jenkins.sh
@ -15,12 +15,13 @@ 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/

-network_create 6
+SUBNET=6
+network_create $SUBNET

 # start container with STP in background
 docker run	--rm \
 		--sysctl net.ipv6.conf.all.disable_ipv6=0 \
-		--network $NET_NAME --ip 172.18.6.200 \
+		$(docker_network_params $SUBNET 200) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/stp:/data \
 		--name ${BUILD_TAG}-stp \
@ -28,7 +29,7 @@ docker run	--rm \

 # start docker container with tests
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.6.3 \
+		$(docker_network_params $SUBNET 3) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/sua-tester:/data \
 		--name ${BUILD_TAG}-sua-test \
--- a/osmo-gsm-tester/jenkins.sh
+++ b/osmo-gsm-tester/jenkins.sh
@ -58,7 +58,8 @@ docker_images_require \
 	"debian-stretch-jenkins" \
 	"osmo-gsm-tester"

-network_create 50
+SUBNET=50
+network_create $SUBNET

 mkdir $VOL_BASE_DIR/ogt-slave
 cp osmo-gsm-tester-slave.sh $VOL_BASE_DIR/ogt-slave/
@ -72,8 +73,7 @@ docker run	--rm \
 		--cap-add=SYS_ADMIN \
 		--ulimit rtprio=99 \
 		--device /dev/net/tun:/dev/net/tun \
-		--network $NET_NAME \
-		--ip 172.18.50.100 \
+		$(docker_network_params $SUBNET 100) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/ogt-slave:/data \
 		--name ${BUILD_TAG}-ogt-slave -d \
@ -88,8 +88,7 @@ docker run	--rm \
 		--cap-add=SYS_ADMIN \
 		--ulimit rtprio=99 \
 		--device /dev/net/tun:/dev/net/tun \
-		--network $NET_NAME \
-		--ip 172.18.50.2 \
+		$(docker_network_params $SUBNET 2) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/ogt-master:/data \
 		-v "${TRIAL_DIR}:/tmp/trial" \
--- a/ttcn3-bsc-test/jenkins-sccplite.sh
+++ b/ttcn3-bsc-test/jenkins-sccplite.sh
@ -16,7 +16,8 @@ cp sccplite/BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/
 mkdir $VOL_BASE_DIR/bsc
 cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/

-network_create 12
+SUBNET=12
+network_create $SUBNET

 # Disable stats testing until libosmocore release > 1.4.0
 if [ "$IMAGE_SUFFIX" = "latest" ]; then
@ -27,7 +28,7 @@ fi

 echo Starting container with BSC
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.12.20 \
+		$(docker_network_params $SUBNET 20) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/bsc:/data \
 		--name ${BUILD_TAG}-bsc -d \
@ -37,7 +38,7 @@ docker run	--rm \
 for i in `seq 0 2`; do
 	echo Starting container with OML for BTS$i
 	docker run	--rm \
-			--network $NET_NAME --ip 172.18.12.10$i \
+			$(docker_network_params $SUBNET 10$i) \
 			--ulimit core=-1 \
 			--name ${BUILD_TAG}-bts$i -d \
 			$DOCKER_ARGS \
@ -47,7 +48,7 @@ done

 echo Starting container with BSC testsuite
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.12.203 \
+		$(docker_network_params $SUBNET 203) \
 		--ulimit core=-1 \
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/bsc-tester:/data \
--- a/ttcn3-bsc-test/jenkins.sh
+++ b/ttcn3-bsc-test/jenkins.sh
@ -31,11 +31,12 @@ if [ "$IMAGE_SUFFIX" = "latest" ]; then
 	sed -i "s/flush-period 1//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg
 fi

-network_create 2
+SUBNET=2
+network_create $SUBNET

 echo Starting container with STP
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.2.200 \
+		$(docker_network_params $SUBNET 200) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/stp:/data \
 		--name ${BUILD_TAG}-stp -d \
@ -45,7 +46,7 @@ docker run	--rm \

 echo Starting container with BSC
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.2.20 \
+		$(docker_network_params $SUBNET 20) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/bsc:/data \
 		--name ${BUILD_TAG}-bsc -d \
@ -55,7 +56,7 @@ docker run	--rm \
 for i in `seq 0 2`; do
 	echo Starting container with OML for BTS$i
 	docker run	--rm \
-			--network $NET_NAME --ip 172.18.2.10$i \
+			$(docker_network_params $SUBNET 10$i) \
 			--ulimit core=-1 \
 			-v $VOL_BASE_DIR/bts-omldummy:/data \
 			--name ${BUILD_TAG}-bts$i -d \
@ -66,7 +67,7 @@ done

 echo Starting container with BSC testsuite
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.2.203 \
+		$(docker_network_params $SUBNET 203) \
 		--ulimit core=-1 \
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/bsc-tester:/data \
--- a/ttcn3-bscnat-test/jenkins.sh
+++ b/ttcn3-bscnat-test/jenkins.sh
@ -14,11 +14,12 @@ mkdir $VOL_BASE_DIR/bscnat
 cp osmo-bsc-nat.cfg $VOL_BASE_DIR/bscnat/
 cp bscs.config $VOL_BASE_DIR/bscnat/

-network_create 15
+SUBNET=15
+network_create $SUBNET

 echo Starting container with BSCNAT
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.15.20 \
+		$(docker_network_params $SUBNET 20) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/bscnat:/data \
 		--name ${BUILD_TAG}-bscnat -d \
@ -28,7 +29,7 @@ docker run	--rm \

 echo Starting container with BSCNAT testsuite
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.15.203 \
+		$(docker_network_params $SUBNET 203) \
 		--ulimit core=-1 \
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/bscnat-tester:/data \
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@ -12,7 +12,7 @@ docker_images_require \
 start_bsc() {
 	echo Starting container with BSC
 	docker run	--rm \
-			--network $NET_NAME --ip 172.18.9.11 \
+			$(docker_network_params $SUBNET 11) \
 			--ulimit core=-1 \
 			-v $VOL_BASE_DIR/bsc:/data \
 			--name ${BUILD_TAG}-bsc -d \
@ -31,7 +31,7 @@ start_bts() {
 		exit 23
 	fi
 	docker run	--rm \
-			--network $NET_NAME --ip 172.18.9.20 \
+			$(docker_network_params $SUBNET 20) \
 			--ulimit core=-1 \
 			-v $VOL_BASE_DIR/bts:/data \
 			-v $VOL_BASE_DIR/unix:/data/unix \
@ -45,7 +45,7 @@ start_bts() {
 start_fake_trx() {
 	echo Starting container with fake_trx
 	docker run	--rm \
-			--network $NET_NAME --ip 172.18.9.21 \
+			$(docker_network_params $SUBNET 21) \
 			--ulimit core=-1 \
 			-v $VOL_BASE_DIR/fake_trx:/data \
 			--name ${BUILD_TAG}-fake_trx -d \
@ -65,7 +65,7 @@ start_fake_trx() {
 start_trxcon() {
 	echo Starting container with trxcon
 	docker run	--rm \
-			--network $NET_NAME --ip 172.18.9.22 \
+			$(docker_network_params $SUBNET 22) \
 			--ulimit core=-1 \
 			-v $VOL_BASE_DIR/trxcon:/data \
 			-v $VOL_BASE_DIR/unix:/data/unix \
@ -78,7 +78,7 @@ start_trxcon() {
 start_virtphy() {
 	echo Starting container with virtphy
 	docker run	--rm \
-			--network $NET_NAME --ip 172.18.9.22 \
+			$(docker_network_params $SUBNET 22) \
 			--ulimit core=-1 \
 			-v $VOL_BASE_DIR/virtphy:/data \
 			-v $VOL_BASE_DIR/unix:/data/unix \
@ -92,7 +92,7 @@ start_testsuite() {
 	echo Starting container with BTS testsuite
 	variant=$1 # e.g 'generic', 'oml', 'hopping'
 	docker run	--rm \
-			--network $NET_NAME --ip 172.18.9.10 \
+			$(docker_network_params $SUBNET 10) \
 			--ulimit core=-1 \
 			-e "TTCN3_PCAP_PATH=/data" \
 			-v $VOL_BASE_DIR/bts-tester-${variant}:/data \
@ -102,7 +102,8 @@ start_testsuite() {
 			$REPO_USER/ttcn3-bts-test
 }

-network_create 9
+SUBNET=9
+network_create $SUBNET

 mkdir $VOL_BASE_DIR/bts-tester-generic
 cp BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/
@ -160,6 +161,7 @@ docker container kill ${BUILD_TAG}-bsc
 # switch back from virtphy + osmo-bts-virtual to osmo-bts-trx
 docker container kill ${BUILD_TAG}-virtphy
 docker container kill ${BUILD_TAG}-bts
+
 cp oml/osmo-bts.cfg $VOL_BASE_DIR/bts/
 start_bts trx 1
 start_fake_trx
@ -187,7 +189,7 @@ docker container kill ${BUILD_TAG}-trxcon
 docker container kill ${BUILD_TAG}-fake_trx
 docker container kill ${BUILD_TAG}-bsc
 docker container kill ${BUILD_TAG}-bts
-
+docker container kill ${BUILD_TAG}-bsc

 network_remove
 rm -rf $VOL_BASE_DIR/unix
--- a/ttcn3-ggsn-test/jenkins.sh
+++ b/ttcn3-ggsn-test/jenkins.sh
@ -12,14 +12,15 @@ cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/
 mkdir $VOL_BASE_DIR/ggsn
 cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/

-network_create 3
+SUBNET=3
+network_create $SUBNET

 # start container with ggsn in background
 docker run	--cap-add=NET_ADMIN \
 		--device /dev/net/tun:/dev/net/tun \
 		--sysctl net.ipv6.conf.all.disable_ipv6=0 \
 		--rm \
-		--network $NET_NAME --ip 172.18.3.201 --ip6 fd02:db8:3::201 \
+		$(docker_network_params $SUBNET 201) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/ggsn:/data \
 		--name ${BUILD_TAG}-ggsn -d \
@ -30,7 +31,7 @@ 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 $NET_NAME --ip 172.18.3.202 --ip6 fd02:db8:3::202 \
+		$(docker_network_params $SUBNET 202) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/ggsn-tester:/data \
 		-e "TTCN3_PCAP_PATH=/data" \
--- a/ttcn3-hlr-test/jenkins.sh
+++ b/ttcn3-hlr-test/jenkins.sh
@ -6,7 +6,8 @@ docker_images_require \
 	"osmo-hlr-$IMAGE_SUFFIX" \
 	"ttcn3-hlr-test"

-network_create 10
+SUBNET=10
+network_create $SUBNET

 mkdir $VOL_BASE_DIR/hlr-tester
 cp HLR_Tests.cfg $VOL_BASE_DIR/hlr-tester/
@ -22,7 +23,7 @@ cp osmo-hlr.cfg $VOL_BASE_DIR/hlr/

 echo Starting container with HLR
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.10.20 \
+		$(docker_network_params $SUBNET 20) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/hlr:/data \
 		--name ${BUILD_TAG}-hlr -d \
@ -32,7 +33,7 @@ docker run	--rm \

 echo Starting container with HLR testsuite
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.10.103 \
+		$(docker_network_params $SUBNET 103) \
 		--ulimit core=-1 \
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/hlr-tester:/data \
--- a/ttcn3-mgw-test/jenkins.sh
+++ b/ttcn3-mgw-test/jenkins.sh
@ -12,7 +12,8 @@ cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/
 mkdir $VOL_BASE_DIR/mgw
 cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/

-network_create 4
+SUBNET=4
+network_create $SUBNET

 # Disable e1 config options until osmo-mgw >= 1.8.0 release
 if [ "$IMAGE_SUFFIX" = "latest" ]; then
@ -23,7 +24,7 @@ fi

 # start container with mgw in background
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.4.180 \
+		$(docker_network_params $SUBNET 180) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/mgw:/data \
 		--name ${BUILD_TAG}-mgw -d \
@ -32,7 +33,7 @@ docker run	--rm \

 # start docker container with testsuite in foreground
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.4.181 \
+		$(docker_network_params $SUBNET 181) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/mgw-tester:/data \
 		-e "TTCN3_PCAP_PATH=/data" \
--- a/ttcn3-msc-test/jenkins.sh
+++ b/ttcn3-msc-test/jenkins.sh
@ -7,7 +7,8 @@ docker_images_require \
 	"osmo-msc-$IMAGE_SUFFIX" \
 	"ttcn3-msc-test"

-network_create 20
+SUBNET=20
+network_create $SUBNET

 mkdir $VOL_BASE_DIR/msc-tester
 mkdir $VOL_BASE_DIR/msc-tester/unix
@ -32,7 +33,7 @@ mkdir $VOL_BASE_DIR/unix

 echo Starting container with STP
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.20.200 \
+		$(docker_network_params $SUBNET 200) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/stp:/data \
 		--name ${BUILD_TAG}-stp -d \
@ -40,7 +41,7 @@ docker run	--rm \

 echo Starting container with MSC
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.20.10 \
+		$(docker_network_params $SUBNET 10) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/msc:/data \
 		-v $VOL_BASE_DIR/unix:/data/unix \
@ -51,7 +52,7 @@ docker run	--rm \

 echo Starting container with MSC testsuite
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.20.103 \
+		$(docker_network_params $SUBNET 103) \
 		--ulimit core=-1 \
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/msc-tester:/data \
--- a/ttcn3-nitb-sysinfo/jenkins.sh
+++ b/ttcn3-nitb-sysinfo/jenkins.sh
@ -2,13 +2,14 @@

 . ../jenkins-common.sh

-network_create 5
+SUBNET=5
+network_create $SUBNET

 # start container with nitb in background
 docker volume rm nitb-vol
 docker run	--rm \
 		--sysctl net.ipv6.conf.all.disable_ipv6=0 \
-		--network $NET_NAME --ip 172.18.5.20 \
+		$(docker_network_params $SUBNET 20) \
 		--ulimit core=-1 \
 		-v nitb-vol:/data \
 		--name ${BUILD_TAG}-nitb -d \
@ -18,7 +19,7 @@ docker run	--rm \
 docker volume rm bts-vol
 docker run	--rm \
 		--sysctl net.ipv6.conf.all.disable_ipv6=0 \
-		--network $NET_NAME --ip 172.18.5.210 \
+		$(docker_network_params $SUBNET 210) \
 		--ulimit core=-1 \
 		-v bts-vol:/data \
 		--name ${BUILD_TAG}-bts -d \
@ -29,7 +30,7 @@ docker run	--rm \
 docker volume rm ttcn3-nitb-sysinfo-vol
 docker run	--rm \
 		--sysctl net.ipv6.conf.all.disable_ipv6=0 \
-		--network $NET_NAME --ip 172.18.5.230 \
+		$(docker_network_params $SUBNET 230) \
 		--ulimit core=-1 \
 		-v ttcn3-nitb-sysinfo-vol:/data \
 		--name ${BUILD_TAG}-ttcn3-nitb-sysinfo \
--- a/ttcn3-pcu-test/jenkins-sns.sh
+++ b/ttcn3-pcu-test/jenkins-sns.sh
@ -6,7 +6,8 @@ docker_images_require \
 	"osmo-pcu-$IMAGE_SUFFIX" \
 	"ttcn3-pcu-test"

-network_create 14
+SUBNET=14
+network_create $SUBNET

 mkdir $VOL_BASE_DIR/pcu-tester
 mkdir $VOL_BASE_DIR/pcu-tester/unix
@ -20,7 +21,7 @@ mkdir $VOL_BASE_DIR/unix

 echo Starting container with PCU
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.14.101 \
+		$(docker_network_params $SUBNET 101) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/pcu:/data \
 		-v $VOL_BASE_DIR/unix:/data/unix \
@ -31,7 +32,7 @@ docker run	--rm \

 echo Starting container with PCU testsuite
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.14.10 \
+		$(docker_network_params $SUBNET 10) \
 		--ulimit core=-1 \
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/pcu-tester:/data \
--- a/ttcn3-pcu-test/jenkins.sh
+++ b/ttcn3-pcu-test/jenkins.sh
@ -6,7 +6,8 @@ docker_images_require \
 	"osmo-pcu-$IMAGE_SUFFIX" \
 	"ttcn3-pcu-test"

-network_create 13
+SUBNET=13
+network_create $SUBNET

 mkdir $VOL_BASE_DIR/pcu-tester
 mkdir $VOL_BASE_DIR/pcu-tester/unix
@ -20,7 +21,7 @@ mkdir $VOL_BASE_DIR/unix

 echo Starting container with PCU
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.13.101 \
+		$(docker_network_params $SUBNET 101) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/pcu:/data \
 		-v $VOL_BASE_DIR/unix:/data/unix \
@ -31,7 +32,7 @@ docker run	--rm \

 echo Starting container with PCU testsuite
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.13.10 \
+		$(docker_network_params $SUBNET 10) \
 		--ulimit core=-1 \
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/pcu-tester:/data \
--- a/ttcn3-remsim-test/jenkins.sh
+++ b/ttcn3-remsim-test/jenkins.sh
@ -9,7 +9,7 @@ docker_images_require \
 start_server() {
 	echo Starting container with osmo-remsim-server
 	docker run	--rm \
-			--network $NET_NAME --ip 172.18.17.20 \
+			$(docker_network_params $SUBNET 20) \
 			--ulimit core=-1 \
 			-v $VOL_BASE_DIR/server:/data \
 			--name ${BUILD_TAG}-server -d \
@ -21,7 +21,7 @@ start_server() {
 start_bankd() {
 	echo Starting container with osmo-remsim-bankd
 	docker run	--rm \
-			--network $NET_NAME --ip 172.18.17.30 \
+			$(docker_network_params $SUBNET 30) \
 			--ulimit core=-1 \
 			-v $VOL_BASE_DIR/bankd:/data \
 			--name ${BUILD_TAG}-bankd -d \
@ -33,7 +33,7 @@ start_bankd() {
 start_client() {
 	echo Starting container with osmo-remsim-client
 	docker run	--rm \
-			--network $NET_NAME --ip 172.18.17.40 \
+			$(docker_network_params $SUBNET 40) \
 			--ulimit core=-1 \
 			-v $VOL_BASE_DIR/client:/data \
 			--name ${BUILD_TAG}-client-d \
@ -47,7 +47,7 @@ start_client() {
 start_testsuite() {
 	echo Starting container with REMSIM testsuite
 	docker run	--rm \
-			--network $NET_NAME --ip 172.18.17.10 \
+			$(docker_network_params $SUBNET 10) \
 			--ulimit core=-1 \
 			-e "TTCN3_PCAP_PATH=/data" \
 			-v $VOL_BASE_DIR/remsim-tester:/data \
@ -56,7 +56,8 @@ start_testsuite() {
 			$REPO_USER/ttcn3-remsim-test
 }

-network_create 17
+SUBNET=17
+network_create $SUBNET

 mkdir $VOL_BASE_DIR/remsim-tester

--- a/ttcn3-sccp-test/jenkins.sh
+++ b/ttcn3-sccp-test/jenkins.sh
@ -13,11 +13,12 @@ cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/
 mkdir $VOL_BASE_DIR/sccp
 cp sccp_demo_user.cfg $VOL_BASE_DIR/sccp/

-network_create 22
+SUBNET=22
+network_create $SUBNET

 echo Starting container with sccp_demo_user
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.22.200 \
+		$(docker_network_params $SUBNET 200) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/sccp:/data \
 		--name ${BUILD_TAG}-stp -d \
@ -28,7 +29,7 @@ docker run	--rm \

 echo Starting container with SCCP testsuite
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.22.203 \
+		$(docker_network_params $SUBNET 203) \
 		--ulimit core=-1 \
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/sccp-tester:/data \
--- a/ttcn3-sgsn-test/jenkins.sh
+++ b/ttcn3-sgsn-test/jenkins.sh
@ -7,7 +7,8 @@ docker_images_require \
 	"osmo-sgsn-$IMAGE_SUFFIX" \
 	"ttcn3-sgsn-test"

-network_create 8
+SUBNET=8
+network_create $SUBNET

 mkdir $VOL_BASE_DIR/sgsn-tester
 cp SGSN_Tests.cfg $VOL_BASE_DIR/sgsn-tester/
@ -22,7 +23,7 @@ mkdir $VOL_BASE_DIR/unix

 echo Starting container with STP
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.8.200 \
+		$(docker_network_params $SUBNET 200) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/stp:/data \
 		--name ${BUILD_TAG}-stp -d \
@ -31,7 +32,7 @@ docker run	--rm \

 echo Starting container with SGSN
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.8.10 \
+		$(docker_network_params $SUBNET 10) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/sgsn:/data \
 		--name ${BUILD_TAG}-sgsn -d \
@ -41,7 +42,7 @@ docker run	--rm \

 echo Starting container with SGSN testsuite
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.8.103 \
+		$(docker_network_params $SUBNET 103) \
 		--ulimit core=-1 \
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/sgsn-tester:/data \
@ -51,7 +52,7 @@ docker run	--rm \

 echo Starting container to merge logs
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.8.103 \
+		$(docker_network_params $SUBNET 103) \
 		--ulimit core=-1 \
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/sgsn-tester:/data \
--- a/ttcn3-sip-test/jenkins.sh
+++ b/ttcn3-sip-test/jenkins.sh
@ -6,7 +6,8 @@ docker_images_require \
 	"osmo-sip-$IMAGE_SUFFIX" \
 	"ttcn3-sip-test"

-network_create 11
+SUBNET=11
+network_create $SUBNET

 mkdir $VOL_BASE_DIR/sip-tester
 mkdir $VOL_BASE_DIR/sip-tester/unix
@ -20,7 +21,7 @@ mkdir $VOL_BASE_DIR/unix

 echo Starting container with osmo-sip-connector
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.11.10 \
+		$(docker_network_params $SUBNET 10) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/sip:/data \
 		-v $VOL_BASE_DIR/unix:/data/unix \
@ -31,7 +32,7 @@ docker run	--rm \

 echo Starting container with SIP testsuite
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.11.103 \
+		$(docker_network_params $SUBNET 103) \
 		--ulimit core=-1 \
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/sip-tester:/data \
--- a/ttcn3-stp-test/jenkins.sh
+++ b/ttcn3-stp-test/jenkins.sh
@ -19,11 +19,12 @@ if [ "$IMAGE_SUFFIX" = "latest" ]; then
 	sed 's/, "fd02:db8:19::200"//g' -i "$VOL_BASE_DIR/stp-tester/STP_Tests.cfg"
 fi

-network_create 19
+SUBNET=19
+network_create $SUBNET

 echo Starting container with STP
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.19.200 --ip6 fd02:db8:19::200 \
+		$(docker_network_params $SUBNET 200) \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/stp:/data \
 		--name ${BUILD_TAG}-stp -d \
@ -32,7 +33,7 @@ docker run	--rm \

 echo Starting container with STP testsuite
 docker run	--rm \
-		--network $NET_NAME --ip 172.18.19.203 --ip6 fd02:db8:19::203 \
+		$(docker_network_params $SUBNET 203) \
 		--ulimit core=-1 \
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/stp-tester:/data \