aboutsummaryrefslogtreecommitdiffstats
path: root/ttcn3-bsc-test
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2018-08-24 08:31:12 +0200
committerHarald Welte <laforge@gnumonks.org>2018-08-24 08:32:59 +0200
commit060d47f07192c71b3e95def8a4697b6f3dc899bd (patch)
tree8adbd15e92f6cfdfe2cc9380a8712a88bc6f2034 /ttcn3-bsc-test
parent37dd6497bdea9febfe2b16525fd9e29b1b1a67dc (diff)
use non-overlapping IP networks for bsc-sccplite and SIP tests
The osmo-sip-connector test is already using 172.18.11.x, let's migrate sccplite to 172.18.12.x to prevent any conflicts when running both tests on the same build slave (docker instance). Change-Id: I96beed1f5e01bdb8e77e20f77a459aa006de10fe
Diffstat (limited to 'ttcn3-bsc-test')
-rwxr-xr-xttcn3-bsc-test/jenkins-sccplite.sh10
-rw-r--r--ttcn3-bsc-test/sccplite/BSC_Tests.cfg8
-rw-r--r--ttcn3-bsc-test/sccplite/osmo-bsc.cfg4
3 files changed, 11 insertions, 11 deletions
diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh
index 2bf29f6..a0e9e0c 100755
--- a/ttcn3-bsc-test/jenkins-sccplite.sh
+++ b/ttcn3-bsc-test/jenkins-sccplite.sh
@@ -8,11 +8,11 @@ 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 172.18.11.0/24
+network_create 172.18.12.0/24
echo Starting container with BSC
docker run --rm \
- --network $NET_NAME --ip 172.18.11.20 \
+ --network $NET_NAME --ip 172.18.12.20 \
-v $VOL_BASE_DIR/bsc:/data \
--name ${BUILD_TAG}-bsc -d \
$REPO_USER/osmo-bsc-master
@@ -20,14 +20,14 @@ 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.11.10$i \
+ --network $NET_NAME --ip 172.18.12.10$i \
--name ${BUILD_TAG}-bts$i -d \
- $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.11.20 $((i + 1234)) 1
+ $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.12.20 $((i + 1234)) 1
done
echo Starting container with BSC testsuite
docker run --rm \
- --network $NET_NAME --ip 172.18.11.203 \
+ --network $NET_NAME --ip 172.18.12.203 \
-e "TTCN3_PCAP_PATH=/data" \
-v $VOL_BASE_DIR/bsc-tester:/data \
--name ${BUILD_TAG}-ttcn3-bsc-test \
diff --git a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg
index b1e3ae7..adb126c 100644
--- a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg
+++ b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg
@@ -6,15 +6,15 @@
*.JUnitLogger.testsuite_name := "BSC_Tests"
[TESTPORT_PARAMETERS]
-*.BSCVTY.CTRL_HOSTNAME := "172.18.11.20"
+*.BSCVTY.CTRL_HOSTNAME := "172.18.12.20"
[MODULE_PARAMETERS]
-BSC_Tests.mp_bsc_ip := "172.18.11.20";
-BSC_Tests.mp_test_ip := "172.18.11.203";
+BSC_Tests.mp_bsc_ip := "172.18.12.20";
+BSC_Tests.mp_test_ip := "172.18.12.203";
BSC_Tests.mp_bssap_cfg := {
transport := BSSAP_TRANSPORT_SCCPlite_SERVER,
sccp_service_type := "mtp3_itu",
- sctp_addr := { 5000, "172.18.11.203", -1, "" },
+ sctp_addr := { 5000, "172.18.12.203", -1, "" },
own_pc := 185,
own_ssn := 254,
peer_pc := 187,
diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
index 5fb8710..858aa50 100644
--- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
+++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
@@ -56,7 +56,7 @@ e1_input
cs7 instance 0
point-code 0.23.3
asp asp-clnt-msc-0 5000 0 ipa
- remote-ip 172.18.11.203
+ remote-ip 172.18.12.203
as as-clnt-msc-0 ipa
asp asp-clnt-msc-0
routing-key 0 0.23.3
@@ -363,7 +363,7 @@ msc 0
amr-config 5_15k forbidden
amr-config 4_75k forbidden
codec-list fr1 fr2 fr3 hr1 hr3
- mgw remote-ip 172.18.11.203
+ mgw remote-ip 172.18.12.203
asp-protocol ipa
bsc
mid-call-timeout 0