Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/14145 )
Change subject: ttcn3-bscnat-test: Use unique sub-network 172.18.15.0/24
......................................................................
ttcn3-bscnat-test: Use unique sub-network 172.18.15.0/24
For some reason, the bscnat tests were using the same subnet as the
sip-connector tests, causing address clashes when trying to execute
both test suites simultaneously:
+ echo Creating network ttcn3-sip-test
Creating network ttcn3-sip-test
+ docker network create --internal --subnet 172.18.11.0/24 ttcn3-sip-test
Error response from daemon: Pool overlaps with other one on this address space
Change-Id: I62b01b4b291ed9d729139fcf9b0102459e7f5a6a
---
M ttcn3-bscnat-test/BSCNAT_Tests.cfg
M ttcn3-bscnat-test/jenkins.sh
M ttcn3-bscnat-test/osmo-bsc-nat.cfg
3 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
Harald Welte: Looks good to me, but someone else must approve; Verified
Pau Espin Pedrol: Looks good to me, approved
diff --git a/ttcn3-bscnat-test/BSCNAT_Tests.cfg
b/ttcn3-bscnat-test/BSCNAT_Tests.cfg
index e45061d..d23178f 100644
--- a/ttcn3-bscnat-test/BSCNAT_Tests.cfg
+++ b/ttcn3-bscnat-test/BSCNAT_Tests.cfg
@@ -9,18 +9,18 @@
[MODULE_PARAMETERS]
mp_bsc_port := 49999;
-mp_bsc_ip := "172.18.11.203";
+mp_bsc_ip := "172.18.15.203";
mp_msc_port := 5100;
-mp_msc_ip := "172.18.11.203";
+mp_msc_ip := "172.18.15.203";
mp_nat_port := 5000;
-mp_nat_ip := "172.18.11.20";
+mp_nat_ip := "172.18.15.20";
#mp_ipa_mgcp_uses_osmo_ext := true;
mp_mgcp_uses_udp := true;
-mp_callagent_ip := "172.18.11.203";
+mp_callagent_ip := "172.18.15.203";
mp_callagent_udp_port := 2727;
-mp_mgw_ip := "172.18.11.20";
+mp_mgw_ip := "172.18.15.20";
mp_mgw_udp_port := 2427;
[MAIN_CONTROLLER]
diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh
index 10d7d62..61ea89b 100755
--- a/ttcn3-bscnat-test/jenkins.sh
+++ b/ttcn3-bscnat-test/jenkins.sh
@@ -16,18 +16,18 @@
cp osmo-bsc-nat.cfg $VOL_BASE_DIR/bscnat/
cp bscs.config $VOL_BASE_DIR/bscnat/
-network_create 172.18.11.0/24
+network_create 172.18.15.0/24
echo Starting container with BSCNAT
docker run --rm \
- --network $NET_NAME --ip 172.18.11.20 \
+ --network $NET_NAME --ip 172.18.15.20 \
-v $VOL_BASE_DIR/bscnat:/data \
--name ${BUILD_TAG}-bscnat -d \
$REPO_USER/osmo-nitb-$IMAGE_SUFFIX osmo-bsc_nat -c
/data/osmo-bsc-nat.cfg
echo Starting container with BSCNAT testsuite
docker run --rm \
- --network $NET_NAME --ip 172.18.11.203 \
+ --network $NET_NAME --ip 172.18.15.203 \
-e "TTCN3_PCAP_PATH=/data" \
-v $VOL_BASE_DIR/bscnat-tester:/data \
--name ${BUILD_TAG}-ttcn3-bscnat-test \
diff --git a/ttcn3-bscnat-test/osmo-bsc-nat.cfg
b/ttcn3-bscnat-test/osmo-bsc-nat.cfg
index e3398b9..bca4628 100644
--- a/ttcn3-bscnat-test/osmo-bsc-nat.cfg
+++ b/ttcn3-bscnat-test/osmo-bsc-nat.cfg
@@ -13,7 +13,7 @@
no login
!
mgcp
- bind ip 172.18.11.20
+ bind ip 172.18.15.20
bind port 2427
rtp bts-base 4000
rtp net-base 16000
@@ -23,11 +23,11 @@
sdp audio-payload name AMR/8000
loop 0
number endpoints 32
- call-agent ip 172.18.11.203
+ call-agent ip 172.18.15.203
rtp transcoder-base 0
transcoder-remote-base 4000
nat
- msc ip 172.18.11.203
+ msc ip 172.18.15.203
msc port 5100
token foo
timeout auth 2
--
To view, visit https://gerrit.osmocom.org/14145
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I62b01b4b291ed9d729139fcf9b0102459e7f5a6a
Gerrit-Change-Number: 14145
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Daniel Willmann <dwillm...@sysmocom.de>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Pau Espin Pedrol <pes...@sysmocom.de>
