<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19831">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BSC CBSP: apply changes to 'cbc' vty section, switch server<->client modes<br><br>With Icaa2775cc20a99227dabe38a775ff808b374cf98, osmo-bsc no longer allows<br>configuring CBSP as both server and client at the same time, and the 'cbc' VTY<br>section has a different structure.<br><br>Adjust the 'cbc' section in osmo-bsc.cfg.<br><br>For each CBSP test init, switch osmo-bsc's CBSP link to server or client mode<br>by new vty command 'cbc' / 'mode (server|client|disabled)'.<br><br>Related: Icaa2775cc20a99227dabe38a775ff808b374cf98 (osmo-bsc)<br>Related: I9e9760121265b3661f1c179610e975cf7a0873f1 (docker-playground)<br>Related: OS#4702<br>Change-Id: I7eea0dd39de50ed80af79e0f10c836b8685d8644<br>---<br>M bsc/BSC_Tests_CBSP.ttcn<br>M bsc/osmo-bsc.cfg<br>2 files changed, 23 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn</span><br><span>index 498f484..3dd6f02 100644</span><br><span>--- a/bsc/BSC_Tests_CBSP.ttcn</span><br><span>+++ b/bsc/BSC_Tests_CBSP.ttcn</span><br><span>@@ -37,6 +37,9 @@</span><br><span> import from CBSP_Adapter all;</span><br><span> import from CBSP_CodecPort all;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+import from Osmocom_VTY_Functions all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from TELNETasp_PortType all;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> modulepar {</span><br><span> charstring mp_cbc_ip := "0.0.0.0";</span><br><span> integer mp_cbc_port := 48049;</span><br><span>@@ -102,6 +105,14 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private function f_vty_set_cbsp_mode(TELNETasp_PT pt, charstring mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_enter_config(pt);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_transceive(pt, "cbc");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_transceive(pt, "mode " & mode);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_transceive(pt, "exit");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_transceive(pt, "exit");</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> private function f_init(float guard_timeout := 30.0) runs on cbsp_test_CT {</span><br><span> BSC_Tests.f_init(guard_timeout := guard_timeout);</span><br><span> activate(as_IgnRSL((tr_RSL_BCCH_INFO, tr_RSL_SACCH_FILL,</span><br><span>@@ -111,9 +122,9 @@</span><br><span> }</span><br><span> private function f_cbsp_init_client() runs on cbsp_test_CT {</span><br><span> f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_set_cbsp_mode(BSCVTY, "server");</span><br><span> CBSP_Adapter.f_connect(mp_bsc_ip, mp_bsc_cbsp_port, "", -1);</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: osmo-bsc should probably still send a CBSP RESTART, but to get the current tests running, let's first</span><br><span style="color: hsl(0, 100%, 40%);">- * ignore this aspect */</span><br><span style="color: hsl(120, 100%, 40%);">+ CBSP[0].receive(tr_CBSP_Recv(?, tr_CBSP_RESTART(?, CBSP_BC_MSGT_CBS, ?)));</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span>@@ -122,6 +133,9 @@</span><br><span> timer T := 10.0;</span><br><span> </span><br><span> f_init(guard_timeout := guard_timeout);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_set_cbsp_mode(BSCVTY, "client");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> CBSP_Adapter.f_bind(mp_cbc_ip, mp_cbc_port);</span><br><span> </span><br><span> T.start;</span><br><span>diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg</span><br><span>index f8be2cd..8dd6655 100644</span><br><span>--- a/bsc/osmo-bsc.cfg</span><br><span>+++ b/bsc/osmo-bsc.cfg</span><br><span>@@ -424,6 +424,10 @@</span><br><span> ctrl</span><br><span> bind 127.0.0.1</span><br><span> cbc</span><br><span style="color: hsl(0, 100%, 40%);">- remote-ip 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">- remote-port 48049</span><br><span style="color: hsl(0, 100%, 40%);">- listen-port 48050</span><br><span style="color: hsl(120, 100%, 40%);">+ mode disabled</span><br><span style="color: hsl(120, 100%, 40%);">+ client</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-port 48049</span><br><span style="color: hsl(120, 100%, 40%);">+ server</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ local-port 48050</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19831">change 19831</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/c/osmo-ttcn3-hacks/+/19831"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7eea0dd39de50ed80af79e0f10c836b8685d8644 </div>
<div style="display:none"> Gerrit-Change-Number: 19831 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>