<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25225">View Change</a></p><div style="white-space:pre-wrap">Approvals:
neels: Looks good to me, approved
dexter: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: add "msc N bssmap reset" command<br><br>Allow resetting the BSSMAP link from VTY, for BSC_Tests.ttcn.<br><br>In the field, detecting that an MSC is lost is done by getting three<br>connection failures in a row. For the BSC_Tests, it is easier to just<br>provide a VTY command to reset an MSC's link status.<br><br>I want to add tests that verify the stat items reflecting the MSC<br>connection status. To be able to run a test expecting fewer connected<br>MSC after a test that launched more MSCs requires the links to be reset.<br><br>Related: SYS#5542<br>Related: Ice3056dc46c94f9399f8379db7aeb7193782f2f2 (osmo-ttcn3-hacks)<br>Change-Id: I1975941b790d2b30d0904d41e456220cba26ecff<br>---<br>M include/osmocom/bsc/bssmap_reset.h<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/bssmap_reset.c<br>M tests/handover/handover_test.c<br>4 files changed, 31 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bssmap_reset.h b/include/osmocom/bsc/bssmap_reset.h</span><br><span>index f90f5ec..fcd850b 100644</span><br><span>--- a/include/osmocom/bsc/bssmap_reset.h</span><br><span>+++ b/include/osmocom/bsc/bssmap_reset.h</span><br><span>@@ -27,4 +27,5 @@</span><br><span> </span><br><span> struct bssmap_reset *bssmap_reset_alloc(void *ctx, const char *label, const struct bssmap_reset_cfg *cfg);</span><br><span> bool bssmap_reset_is_conn_ready(const struct bssmap_reset *bssmap_reset);</span><br><span style="color: hsl(120, 100%, 40%);">+void bssmap_reset_resend_reset(struct bssmap_reset *bssmap_reset);</span><br><span> void bssmap_reset_term_and_free(struct bssmap_reset *bssmap_reset);</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 6d10426..5ce1d69 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -62,6 +62,7 @@</span><br><span> #include <osmocom/bsc/bts.h></span><br><span> #include <osmocom/bsc/bsc_subscr_conn_fsm.h></span><br><span> #include <osmocom/bsc/assignment_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/bssmap_reset.h></span><br><span> </span><br><span> #include <inttypes.h></span><br><span> </span><br><span>@@ -3324,6 +3325,28 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(msc_bssmap_reset, msc_bssmap_reset_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "msc " MSC_NR_RANGE " bssmap reset",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Query or manipulate a specific A-interface link\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "MSC nr\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Query or manipulate BSSMAP layer of A-interface\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Flip this MSC to disconnected state and re-send BSSMAP RESET\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int msc_nr = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *msc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msc = osmo_msc_data_find(bsc_gsmnet, msc_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% No such MSC: nr %d\n", msc_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_NOTICE, "(msc%d) VTY requests BSSMAP RESET\n", msc_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ bssmap_reset_resend_reset(msc->a.bssmap_reset);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int bsc_vty_init(struct gsm_network *network)</span><br><span> {</span><br><span> OSMO_ASSERT(vty_global_gsm_network == NULL);</span><br><span>@@ -3477,6 +3500,7 @@</span><br><span> </span><br><span> install_element(ENABLE_NODE, &gen_position_trap_cmd);</span><br><span> install_element(ENABLE_NODE, &mscpool_roundrobin_next_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(ENABLE_NODE, &msc_bssmap_reset_cmd);</span><br><span> </span><br><span> install_element(CFG_LOG_NODE, &logging_fltr_imsi_cmd);</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/bssmap_reset.c b/src/osmo-bsc/bssmap_reset.c</span><br><span>index 6c54560..beb8968 100644</span><br><span>--- a/src/osmo-bsc/bssmap_reset.c</span><br><span>+++ b/src/osmo-bsc/bssmap_reset.c</span><br><span>@@ -243,6 +243,12 @@</span><br><span> return bssmap_reset->fi->state == BSSMAP_RESET_ST_CONN;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void bssmap_reset_resend_reset(struct bssmap_reset *bssmap_reset)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Immediately (1ms) kick off reset sending mechanism */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_chg_ms(bssmap_reset->fi, BSSMAP_RESET_ST_DISC, 1, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static __attribute__((constructor)) void bssmap_reset_fsm_init()</span><br><span> {</span><br><span> OSMO_ASSERT(osmo_fsm_register(&bssmap_reset_fsm) == 0);</span><br><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index 315fc10..f76a700 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -1703,9 +1703,6 @@</span><br><span> void osmo_bsc_sigtran_tx_reset(void) {}</span><br><span> void osmo_bsc_sigtran_tx_reset_ack(void) {}</span><br><span> void osmo_bsc_sigtran_reset(void) {}</span><br><span style="color: hsl(0, 100%, 40%);">-void bssmap_reset_alloc(void) {}</span><br><span style="color: hsl(0, 100%, 40%);">-void bssmap_reset_is_conn_ready(void) {}</span><br><span style="color: hsl(0, 100%, 40%);">-void bssmap_reset_term_and_free(void) {}</span><br><span> const char *osmo_mgcpc_ep_name(const struct osmo_mgcpc_ep *ep)</span><br><span> {</span><br><span> return "fake-ep";</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25225">change 25225</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-bsc/+/25225"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1975941b790d2b30d0904d41e456220cba26ecff </div>
<div style="display:none"> Gerrit-Change-Number: 25225 </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: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>