<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11322">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ttcn3: Support running tests without PCU socket avail<br><br>Change-Id: I902af460b798ffdba09d77d457bac672db606368<br>---<br>M src/osmo_gsm_tester/bts.py<br>A ttcn3/scenarios/sysmo.conf<br>M ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl<br>M ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh<br>M ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py<br>5 files changed, 23 insertions(+), 3 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/22/11322/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py</span><br><span>index 041b2bc..f05a1ba 100644</span><br><span>--- a/src/osmo_gsm_tester/bts.py</span><br><span>+++ b/src/osmo_gsm_tester/bts.py</span><br><span>@@ -157,6 +157,10 @@</span><br><span>         'Get the Pcu object associated with the BTS'</span><br><span>         pass</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    def bts_type(self):</span><br><span style="color: hsl(120, 100%, 40%);">+        'Get the type of BTS'</span><br><span style="color: hsl(120, 100%, 40%);">+        return self.conf.get('type')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     def set_bsc(self, bsc):</span><br><span>         self.bsc = bsc</span><br><span> </span><br><span>diff --git a/ttcn3/scenarios/sysmo.conf b/ttcn3/scenarios/sysmo.conf</span><br><span>new file mode 120000</span><br><span>index 0000000..5374081</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3/scenarios/sysmo.conf</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+../../example/scenarios/sysmo.conf</span><br><span>\ No newline at end of file</span><br><span>diff --git a/ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl b/ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl</span><br><span>index 7379528..03d2721 100644</span><br><span>--- a/ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl</span><br><span>+++ b/ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl</span><br><span>@@ -10,7 +10,11 @@</span><br><span> [MODULE_PARAMETERS]</span><br><span> BTS_Tests.mp_rsl_ip := "172.18.9.10"</span><br><span> BTS_Tests.mp_bb_trxc_ip := "127.0.0.1"</span><br><span style="color: hsl(120, 100%, 40%);">+%if pcu_available:</span><br><span> BTS_Tests.mp_pcu_socket := "/data/unix_pcu/pcu_bts"</span><br><span style="color: hsl(120, 100%, 40%);">+%else:</span><br><span style="color: hsl(120, 100%, 40%);">+BTS_Tests.mp_pcu_socket := ""</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> BTS_Tests.mp_bb_trxc_port := -1</span><br><span> L1CTL_PortType.m_l1ctl_sock_path := "/data/unix_l2/osmocom_l2"</span><br><span> BTS_Tests.mp_ctrl_ip   := "${btsvty_ctrl_hostname}"</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 64987b3..d583f90 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>@@ -63,12 +63,17 @@</span><br><span> </span><br><span> echo Starting container with BTS testsuite</span><br><span> docker kill ${DOCKER_NAME}</span><br><span style="color: hsl(120, 100%, 40%);">+if [ "x$PCU_SOCKET_PATH" != "x" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+   MOUNT_PCU_SOCKET_OPT="--mount type=bind,source=\"$(dirname "$PCU_SOCKET_PATH")\",destination=/data/unix_pcu"</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+      MOUNT_PCU_SOCKET_OPT=""</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span> docker run     --rm \</span><br><span>               --network $NET_NAME --ip 172.18.9.10 \</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 style="color: hsl(0, 100%, 40%);">-         --mount type=bind,source="$(dirname "$PCU_SOCKET_PATH")",destination=/data/unix_pcu \</span><br><span style="color: hsl(120, 100%, 40%);">+             $MOUNT_PCU_SOCKET_OPT \</span><br><span>              --name ${DOCKER_NAME} \</span><br><span>              $REPO_USER/${SUITE_NAME} &</span><br><span> child_ps=$!</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 b3ca946..f36b023 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>@@ -46,11 +46,17 @@</span><br><span> script_run_dir = test.get_run_dir().new_dir('ttcn3')</span><br><span> bts_cfg_file = os.path.join(str(script_run_dir), 'BTS_Tests.cfg')</span><br><span> junit_ttcn3_dst_file = os.path.join(str(suite.trial.get_run_dir()), 'trial-') + suite.name() + '.xml'</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(), bts.pcu_socket_path())</span><br><span style="color: hsl(120, 100%, 40%);">+if bts.bts_type() == 'osmo-bts-trx':</span><br><span style="color: hsl(120, 100%, 40%);">+    pcu_available = True</span><br><span style="color: hsl(120, 100%, 40%);">+    pcu_sk = bts.pcu_socket_path()</span><br><span style="color: hsl(120, 100%, 40%);">+else: # PCU unix socket not available locally</span><br><span style="color: hsl(120, 100%, 40%);">+    pcu_available = False</span><br><span style="color: hsl(120, 100%, 40%);">+    pcu_sk = ''</span><br><span style="color: hsl(120, 100%, 40%);">+docker_cmd = (script_file, str(script_run_dir), junit_ttcn3_dst_file, 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 style="color: hsl(0, 100%, 40%);">-r = mytemplate.render(btsvty_ctrl_hostname=bts.remote_addr())</span><br><span style="color: hsl(120, 100%, 40%);">+r = mytemplate.render(btsvty_ctrl_hostname=bts.remote_addr(), pcu_available=pcu_available)</span><br><span> with open(bts_cfg_file, 'w') as f:</span><br><span>     f.write(r)</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11322">change 11322</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/11322"/><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: I902af460b798ffdba09d77d457bac672db606368 </div>
<div style="display:none"> Gerrit-Change-Number: 11322 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>