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