<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11358">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ttcn3: Allow remote hosts (sysmobts) to access RSL srv inside TTCN3 docker<br><br>And extra IP address is required/requested on the docker host because<br>the BSC handling the OML instance is binding to it's address, so we<br>cannot ask docker to use that one because it fails binding to it.<br><br>Change-Id: I734fba91db535d7b183ddc7f51d324a6cd2eaf6f<br>---<br>M ttcn3/default-suites.conf<br>M ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh<br>M ttcn3/suites/ttcn3_bts_tests/suite.conf<br>M ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py<br>4 files changed, 10 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/58/11358/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3/default-suites.conf b/ttcn3/default-suites.conf</span><br><span>index 80f14e6..cfa46b4 100644</span><br><span>--- a/ttcn3/default-suites.conf</span><br><span>+++ b/ttcn3/default-suites.conf</span><br><span>@@ -1 +1,2 @@</span><br><span> - ttcn3_bts_tests:trx</span><br><span style="color: hsl(120, 100%, 40%);">+- ttcn3_bts_tests:sysmo</span><br><span>diff --git a/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh b/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh</span><br><span>index df8dcb2..daac3e0 100755</span><br><span>--- a/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh</span><br><span>+++ b/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh</span><br><span>@@ -3,8 +3,9 @@</span><br><span> </span><br><span> RUNDIR="$1"</span><br><span> JUNIT_TTCN3_DST_FILE="$2"</span><br><span style="color: hsl(0, 100%, 40%);">-L2_SOCKET_PATH="$3"</span><br><span style="color: hsl(0, 100%, 40%);">-PCU_SOCKET_PATH="$4"</span><br><span style="color: hsl(120, 100%, 40%);">+BSC_RSL_ADDR="$3"</span><br><span style="color: hsl(120, 100%, 40%);">+L2_SOCKET_PATH="$4"</span><br><span style="color: hsl(120, 100%, 40%);">+PCU_SOCKET_PATH="$5"</span><br><span> </span><br><span> # Absolute path to this script</span><br><span> SCRIPT=$(readlink -f "$0")</span><br><span>@@ -27,7 +28,7 @@</span><br><span> network_create() {</span><br><span>    NET=$1</span><br><span>       echo Creating network $NET_NAME</span><br><span style="color: hsl(0, 100%, 40%);">- docker network create --internal --subnet $NET $NET_NAME</span><br><span style="color: hsl(120, 100%, 40%);">+      docker network create --subnet $NET $NET_NAME</span><br><span> }</span><br><span> </span><br><span> network_remove() {</span><br><span>@@ -70,6 +71,7 @@</span><br><span> fi</span><br><span> docker run    --rm \</span><br><span>               --network $NET_NAME --ip 172.18.9.10 \</span><br><span style="color: hsl(120, 100%, 40%);">+                -p ${BSC_RSL_ADDR}:3003:3003 \</span><br><span>               -e "TTCN3_PCAP_PATH=/data" \</span><br><span>               --mount type=bind,source=$VOL_BASE_DIR/bts-tester,destination=/data \</span><br><span>                --mount type=bind,source="$(dirname "$L2_SOCKET_PATH")",destination=/data/unix_l2 \</span><br><span>diff --git a/ttcn3/suites/ttcn3_bts_tests/suite.conf b/ttcn3/suites/ttcn3_bts_tests/suite.conf</span><br><span>index 1eb0a02..2bb0cac 100644</span><br><span>--- a/ttcn3/suites/ttcn3_bts_tests/suite.conf</span><br><span>+++ b/ttcn3/suites/ttcn3_bts_tests/suite.conf</span><br><span>@@ -1,6 +1,6 @@</span><br><span> resources:</span><br><span>   ip_address:</span><br><span style="color: hsl(0, 100%, 40%);">-  - times: 7 # msc, bsc, hlr, stp, mgw, sgsn, ggsn</span><br><span style="color: hsl(120, 100%, 40%);">+  - times: 8 # msc, bsc, hlr, stp, mgw, sgsn, ggsn</span><br><span>   bts:</span><br><span>   - times: 1</span><br><span>   osmocon_phone:</span><br><span>diff --git a/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py b/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py</span><br><span>index f36b023..2684bf7 100755</span><br><span>--- a/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py</span><br><span>+++ b/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py</span><br><span>@@ -30,7 +30,8 @@</span><br><span> msc_dummy.start()</span><br><span> mgw_dummy.start()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bsc.set_rsl_ip('172.18.9.10')</span><br><span style="color: hsl(120, 100%, 40%);">+nat_rsl_ip = suite.ip_address().get('addr')</span><br><span style="color: hsl(120, 100%, 40%);">+bsc.set_rsl_ip(nat_rsl_ip)</span><br><span> bsc.bts_add(bts)</span><br><span> sgsn_dummy.bts_add(bts)</span><br><span> </span><br><span>@@ -52,7 +53,7 @@</span><br><span> else: # PCU unix socket not available locally</span><br><span>     pcu_available = False</span><br><span>     pcu_sk = ''</span><br><span style="color: hsl(0, 100%, 40%);">-docker_cmd = (script_file, str(script_run_dir), junit_ttcn3_dst_file, osmocon.l2_socket_path(), pcu_sk)</span><br><span style="color: hsl(120, 100%, 40%);">+docker_cmd = (script_file, str(script_run_dir), junit_ttcn3_dst_file, nat_rsl_ip, osmocon.l2_socket_path(), pcu_sk)</span><br><span> </span><br><span> print('Creating template')</span><br><span> mytemplate = Template(filename=bts_tmpl_file)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11358">change 11358</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/11358"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I734fba91db535d7b183ddc7f51d324a6cd2eaf6f </div>
<div style="display:none"> Gerrit-Change-Number: 11358 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>