<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10596">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">use non-overlapping IP networks for bsc-sccplite and HLR tests<br><br>The HLR test is already using 172.18.11.x, let's migrate sccplite<br>to 172.18.12.x to prevent any conflicts when running both tests<br>on the same build slave (docker instance).<br><br>Change-Id: I96beed1f5e01bdb8e77e20f77a459aa006de10fe<br>---<br>M ttcn3-bsc-test/jenkins-sccplite.sh<br>M ttcn3-bsc-test/sccplite/BSC_Tests.cfg<br>M ttcn3-bsc-test/sccplite/osmo-bsc.cfg<br>3 files changed, 11 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/96/10596/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>index 2bf29f6..a0e9e0c 100755</span><br><span>--- a/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>+++ b/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>@@ -8,11 +8,11 @@</span><br><span> mkdir $VOL_BASE_DIR/bsc</span><br><span> cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/</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.12.0/24</span><br><span> </span><br><span> echo Starting container with BSC</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.12.20 \</span><br><span> -v $VOL_BASE_DIR/bsc:/data \</span><br><span> --name ${BUILD_TAG}-bsc -d \</span><br><span> $REPO_USER/osmo-bsc-master</span><br><span>@@ -20,14 +20,14 @@</span><br><span> for i in `seq 0 2`; do</span><br><span> echo Starting container with OML for BTS$i</span><br><span> docker run --rm \</span><br><span style="color: hsl(0, 100%, 40%);">- --network $NET_NAME --ip 172.18.11.10$i \</span><br><span style="color: hsl(120, 100%, 40%);">+ --network $NET_NAME --ip 172.18.12.10$i \</span><br><span> --name ${BUILD_TAG}-bts$i -d \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.11.20 $((i + 1234)) 1</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.12.20 $((i + 1234)) 1</span><br><span> done</span><br><span> </span><br><span> echo Starting container with BSC 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.12.203 \</span><br><span> -e "TTCN3_PCAP_PATH=/data" \</span><br><span> -v $VOL_BASE_DIR/bsc-tester:/data \</span><br><span> --name ${BUILD_TAG}-ttcn3-bsc-test \</span><br><span>diff --git a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg</span><br><span>index b1e3ae7..adb126c 100644</span><br><span>--- a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg</span><br><span>+++ b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg</span><br><span>@@ -6,15 +6,15 @@</span><br><span> *.JUnitLogger.testsuite_name := "BSC_Tests"</span><br><span> </span><br><span> [TESTPORT_PARAMETERS]</span><br><span style="color: hsl(0, 100%, 40%);">-*.BSCVTY.CTRL_HOSTNAME := "172.18.11.20"</span><br><span style="color: hsl(120, 100%, 40%);">+*.BSCVTY.CTRL_HOSTNAME := "172.18.12.20"</span><br><span> </span><br><span> [MODULE_PARAMETERS]</span><br><span style="color: hsl(0, 100%, 40%);">-BSC_Tests.mp_bsc_ip := "172.18.11.20";</span><br><span style="color: hsl(0, 100%, 40%);">-BSC_Tests.mp_test_ip := "172.18.11.203";</span><br><span style="color: hsl(120, 100%, 40%);">+BSC_Tests.mp_bsc_ip := "172.18.12.20";</span><br><span style="color: hsl(120, 100%, 40%);">+BSC_Tests.mp_test_ip := "172.18.12.203";</span><br><span> BSC_Tests.mp_bssap_cfg := {</span><br><span> transport := BSSAP_TRANSPORT_SCCPlite_SERVER,</span><br><span> sccp_service_type := "mtp3_itu",</span><br><span style="color: hsl(0, 100%, 40%);">- sctp_addr := { 5000, "172.18.11.203", -1, "" },</span><br><span style="color: hsl(120, 100%, 40%);">+ sctp_addr := { 5000, "172.18.12.203", -1, "" },</span><br><span> own_pc := 185,</span><br><span> own_ssn := 254,</span><br><span> peer_pc := 187,</span><br><span>diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg</span><br><span>index 5fb8710..858aa50 100644</span><br><span>--- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg</span><br><span>+++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg</span><br><span>@@ -56,7 +56,7 @@</span><br><span> cs7 instance 0</span><br><span> point-code 0.23.3</span><br><span> asp asp-clnt-msc-0 5000 0 ipa</span><br><span style="color: hsl(0, 100%, 40%);">- remote-ip 172.18.11.203</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip 172.18.12.203</span><br><span> as as-clnt-msc-0 ipa</span><br><span> asp asp-clnt-msc-0</span><br><span> routing-key 0 0.23.3</span><br><span>@@ -363,7 +363,7 @@</span><br><span> amr-config 5_15k forbidden</span><br><span> amr-config 4_75k forbidden</span><br><span> codec-list fr1 fr2 fr3 hr1 hr3</span><br><span style="color: hsl(0, 100%, 40%);">- mgw remote-ip 172.18.11.203</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw remote-ip 172.18.12.203</span><br><span> asp-protocol ipa</span><br><span> bsc</span><br><span> mid-call-timeout 0</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10596">change 10596</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/10596"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I96beed1f5e01bdb8e77e20f77a459aa006de10fe </div>
<div style="display:none"> Gerrit-Change-Number: 10596 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>