April 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: bsc: Add missing tests in expected-results.xml
by pespin 03 Apr '23

03 Apr '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32192 ) Change subject: bsc: Add missing tests in expected-results.xml ...................................................................... bsc: Add missing tests in expected-results.xml Change-Id: I09d503f6d61d4f4d09d83357dd1b79315803584c --- M bsc/expected-results.xml 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 223800b..a9ce59b 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -105,7 +105,9 @@ <testcase classname='BSC_Tests' name='TC_assignment_sdcch_exhausted_req_signalling' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_assignment_sdcch_exhausted_req_signalling_tch_forbidden' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_assignment_sdcch_exhausted_req_voice_tch_forbidden' time='MASKED'/> + <testcase classname='BSC_Tests' name='TC_assignment_codec_hr_osmux_on' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_assignment_osmux' time='MASKED'/> + <testcase classname='BSC_Tests' name='TC_assignment_osmux_cn' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_assignment_osmux_bts' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_rll_est_ind_inact_lchan' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_rll_est_ind_inval_sapi1' time='MASKED'/> @@ -140,6 +142,7 @@ <testcase classname='BSC_Tests' name='TC_paging_resp_unsol' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_paging_500req' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_paging_450req_no_paging_load_ind' time='MASKED'/> + <testcase classname='BSC_Tests' name='TC_paging_imsi_nochan_ci_resp_invalid_mi' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_rsl_drop_counter' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_rsl_unknown_unit_id' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_oml_unknown_unit_id' time='MASKED'/> @@ -178,6 +181,8 @@ <testcase classname='BSC_Tests' name='TC_ho_in_fail_msc_clears_after_ho_detect' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_ho_in_fail_no_detect' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_ho_in_fail_no_detect2' time='MASKED'/> + <testcase classname='BSC_Tests' name='TC_ho_in_fail_mgw_mdcx_timeout' time='MASKED'/> + <testcase classname='BSC_Tests' name='TC_ho_in_fail_ipa_crcx_timeout' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_ho_into_this_bsc_sccp_cr_without_bssap' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_ho_neighbor_config_1' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_ho_neighbor_config_2' time='MASKED'/> @@ -218,6 +223,7 @@ <testcase classname='BSC_Tests' name='TC_late_conn_fail' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_stats_conn_fail' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_assignment_emerg_setup_allow' time='MASKED'/> + <testcase classname='BSC_Tests' name='TC_assignment_emerg_setup_allow_imei' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_assignment_emerg_setup_deny_msc' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_assignment_emerg_setup_deny_bts' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_emerg_premption' time='MASKED'/> @@ -253,6 +259,13 @@ <testcase classname='BSC_Tests' name='TC_ratectr_all_available_allocated_dyn' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_cm_serv_rej' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_lost_sdcch_during_assignment' time='MASKED'/> + <testcase classname='BSC_Tests' name='TC_chan_alloc_algo_ascending' time='MASKED'/> + <testcase classname='BSC_Tests' name='TC_chan_alloc_algo_descending' time='MASKED'/> + <testcase classname='BSC_Tests' name='TC_chan_alloc_algo_ass_dynamic' time='MASKED'/> + <testcase classname='BSC_Tests' name='TC_mgwpool_all_used' time='MASKED'/> + <testcase classname='BSC_Tests' name='TC_mgwpool_blocked_not_used' time='MASKED'/> + <testcase classname='BSC_Tests' name='TC_mgwpool_pin_bts' time='MASKED'/> + <testcase classname='BSC_Tests' name='TC_ho_meas_rep_multi_band' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_ho_out_of_this_bsc' time='MASKED'/> <testcase classname='BSC_Tests_LCLS' name='TC_lcls_gcr_only' time='MASKED'/> <testcase classname='BSC_Tests_LCLS' name='TC_lcls_gcr_bway_connect' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I09d503f6d61d4f4d09d83357dd1b79315803584c Gerrit-Change-Number: 32192 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts: oml: Start OML IPA_Emulation component as alive-type
by fixeria 03 Apr '23

03 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32193 ) Change subject: bts: oml: Start OML IPA_Emulation component as alive-type ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I53c065016e88a5b253eff496560fa6e371fe491b Gerrit-Change-Number: 32193 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Apr 2023 17:29:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: Add missing tests in expected-results.xml
by fixeria 03 Apr '23

03 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32192 ) Change subject: bsc: Add missing tests in expected-results.xml ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: We should definitely add some logic to `jenkins.sh` checking if newly added tests are also added to `expected-results.xml`. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I09d503f6d61d4f4d09d83357dd1b79315803584c Gerrit-Change-Number: 32192 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Apr 2023 17:28:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: nm: Apply BTS/TRX/TS OML Attributes through NM FSMs
by pespin 03 Apr '23

03 Apr '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32194 ) Change subject: nm: Apply BTS/TRX/TS OML Attributes through NM FSMs ...................................................................... nm: Apply BTS/TRX/TS OML Attributes through NM FSMs This way we have further control on how to handle the SetAttr meessages received. For instance, NACK them if the NM object FSMs are not at the expected correct state. Related: OS#5992 Change-Id: Id68868e25bbf96227ab6459fcd3c9181852ed28e --- M include/osmo-bts/nm_common_fsm.h M src/common/nm_bts_fsm.c M src/common/nm_channel_fsm.c M src/common/nm_common_fsm.c M src/common/nm_radio_carrier_fsm.c M src/common/oml.c 6 files changed, 83 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/94/32194/1 diff --git a/include/osmo-bts/nm_common_fsm.h b/include/osmo-bts/nm_common_fsm.h index 1f0accc..b1b779e 100644 --- a/include/osmo-bts/nm_common_fsm.h +++ b/include/osmo-bts/nm_common_fsm.h @@ -30,6 +30,7 @@ /* Common */ enum nm_fsm_events { NM_EV_SW_ACT, + NM_EV_RX_SETATTR, /* data: struct nm_fsm_ev_setattr_data */ NM_EV_SETATTR_ACK, /* data: struct nm_fsm_ev_setattr_data */ NM_EV_SETATTR_NACK, /* data: struct nm_fsm_ev_setattr_data */ NM_EV_OPSTART_ACK, @@ -51,7 +52,8 @@ struct nm_fsm_ev_setattr_data { struct msgb *msg; /* msgb ownership is transferred to FSM */ - int cause; + struct tlv_parsed *tp; + int cause; /* set in NM_EV_SETATTR_(N)ACK */ }; diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index ea3a6c3..47b91e4 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -111,8 +111,15 @@ { struct gsm_bts *bts = (struct gsm_bts *)fi->priv; struct nm_fsm_ev_setattr_data *setattr_data; + int rc; switch (event) { + case NM_EV_RX_SETATTR: + setattr_data = (struct nm_fsm_ev_setattr_data *)data; + rc = bts_model_apply_oml(bts, setattr_data->msg, setattr_data->tp, + NM_OC_BTS, bts); + (void)rc; + break; case NM_EV_SETATTR_ACK: case NM_EV_SETATTR_NACK: setattr_data = (struct nm_fsm_ev_setattr_data *)data; @@ -178,6 +185,7 @@ }, [NM_BTS_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_RX_SETATTR) | X(NM_EV_SETATTR_ACK) | X(NM_EV_SETATTR_NACK) | X(NM_EV_OPSTART_ACK) | diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c index 503ddfb..3abf941 100644 --- a/src/common/nm_channel_fsm.c +++ b/src/common/nm_channel_fsm.c @@ -94,8 +94,15 @@ { struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; struct nm_fsm_ev_setattr_data *setattr_data; + int rc; switch (event) { + case NM_EV_RX_SETATTR: + setattr_data = (struct nm_fsm_ev_setattr_data *)data; + rc = bts_model_apply_oml(ts->trx->bts, setattr_data->msg, setattr_data->tp, + NM_OC_CHANNEL, ts); + (void)rc; + break; case NM_EV_SETATTR_ACK: case NM_EV_SETATTR_NACK: setattr_data = (struct nm_fsm_ev_setattr_data *)data; @@ -138,8 +145,15 @@ { struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; struct nm_fsm_ev_setattr_data *setattr_data; + int rc; switch (event) { + case NM_EV_RX_SETATTR: + setattr_data = (struct nm_fsm_ev_setattr_data *)data; + rc = bts_model_apply_oml(ts->trx->bts, setattr_data->msg, setattr_data->tp, + NM_OC_CHANNEL, ts); + (void)rc; + break; case NM_EV_SETATTR_ACK: case NM_EV_SETATTR_NACK: setattr_data = (struct nm_fsm_ev_setattr_data *)data; @@ -220,6 +234,7 @@ }, [NM_CHAN_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_RX_SETATTR) | X(NM_EV_SETATTR_ACK) | X(NM_EV_SETATTR_NACK) | X(NM_EV_OPSTART_ACK) | /* backward compatibility, buggy BSC */ @@ -238,6 +253,7 @@ }, [NM_CHAN_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_RX_SETATTR) | X(NM_EV_SETATTR_ACK) | X(NM_EV_SETATTR_NACK) | X(NM_EV_OPSTART_ACK) | diff --git a/src/common/nm_common_fsm.c b/src/common/nm_common_fsm.c index be11bef..6a8d3d1 100644 --- a/src/common/nm_common_fsm.c +++ b/src/common/nm_common_fsm.c @@ -25,6 +25,7 @@ const struct value_string nm_fsm_event_names[] = { { NM_EV_SW_ACT, "SW_ACT" }, + { NM_EV_SETATTR_ACK, "RX_SETATTR" }, { NM_EV_SETATTR_ACK, "SETATTR_ACK" }, { NM_EV_SETATTR_NACK, "SETATTR_NACK" }, { NM_EV_OPSTART_ACK, "OPSTART_ACK" }, diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c index 88930dd..4513d6c 100644 --- a/src/common/nm_radio_carrier_fsm.c +++ b/src/common/nm_radio_carrier_fsm.c @@ -103,8 +103,15 @@ struct nm_fsm_ev_setattr_data *setattr_data; bool phy_state_connected; bool rsl_link_connected; + int rc; switch (event) { + case NM_EV_RX_SETATTR: + setattr_data = (struct nm_fsm_ev_setattr_data *)data; + rc = bts_model_apply_oml(trx->bts, setattr_data->msg, setattr_data->tp, + NM_OC_RADIO_CARRIER, trx); + (void)rc; + break; case NM_EV_SETATTR_ACK: case NM_EV_SETATTR_NACK: setattr_data = (struct nm_fsm_ev_setattr_data *)data; @@ -219,6 +226,7 @@ }, [NM_RCARRIER_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_RX_SETATTR) | X(NM_EV_SETATTR_ACK) | X(NM_EV_SETATTR_NACK) | X(NM_EV_OPSTART_ACK) | diff --git a/src/common/oml.c b/src/common/oml.c index 5ffb6ff..b552e96 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -48,6 +48,7 @@ #include <osmo-bts/bts.h> #include <osmo-bts/signal.h> #include <osmo-bts/phy_link.h> +#include <osmo-bts/nm_common_fsm.h> #define LOGPFOH(ss, lvl, foh, fmt, args ...) LOGP(ss, lvl, "%s: " fmt, abis_nm_dump_foh(foh), ## args) #define DEBUGPFOH(ss, foh, fmt, args ...) LOGPFOH(ss, LOGL_DEBUG, foh, fmt, ## args) @@ -549,6 +550,7 @@ struct tlv_parsed tp, *tp_merged; int rc, i; const uint8_t *payload; + struct nm_fsm_ev_setattr_data ev_data; DEBUGPFOH(DOML, foh, "Rx SET BTS ATTR\n"); @@ -742,8 +744,15 @@ } } - /* call into BTS driver to apply new attributes to hardware */ - return bts_model_apply_oml(bts, msg, tp_merged, NM_OC_BTS, bts); + ev_data = (struct nm_fsm_ev_setattr_data){ + .msg = msg, + .tp = tp_merged, + }; + + rc = osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_RX_SETATTR, &ev_data); + if (rc < 0) + return oml_fom_ack_nack(msg, NM_NACK_CANT_PERFORM); + return rc; } /* 8.6.2 Set Radio Attributes has been received */ @@ -752,6 +761,7 @@ struct abis_om_fom_hdr *foh = msgb_l3(msg); struct tlv_parsed tp, *tp_merged; int rc; + struct nm_fsm_ev_setattr_data ev_data; DEBUGPFOH(DOML, foh, "Rx SET RADIO CARRIER ATTR\n"); @@ -830,8 +840,17 @@ trx->arfcn = arfcn; } #endif - /* call into BTS driver to apply new attributes to hardware */ - return bts_model_apply_oml(trx->bts, msg, tp_merged, NM_OC_RADIO_CARRIER, trx); + + ev_data = (struct nm_fsm_ev_setattr_data){ + .msg = msg, + .tp = tp_merged, + }; + + rc = osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_RX_SETATTR, &ev_data); + if (rc < 0) + return oml_fom_ack_nack(msg, NM_NACK_CANT_PERFORM); + return rc; + } static int handle_chan_comb(struct gsm_bts_trx_ts *ts, const uint8_t comb) @@ -927,6 +946,7 @@ struct gsm_bts *bts = ts->trx->bts; struct tlv_parsed tp, *tp_merged; int rc, i; + struct nm_fsm_ev_setattr_data ev_data; DEBUGPFOH(DOML, foh, "Rx SET CHAN ATTR\n"); @@ -1035,8 +1055,15 @@ ts->hopping.hsn, ts->hopping.maio, ts->hopping.arfcn_num); LOGPC(DOML, LOGL_INFO, ")\n"); - /* call into BTS driver to apply new attributes to hardware */ - return bts_model_apply_oml(bts, msg, tp_merged, NM_OC_CHANNEL, ts); + ev_data = (struct nm_fsm_ev_setattr_data){ + .msg = msg, + .tp = tp_merged, + }; + + rc = osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_RX_SETATTR, &ev_data); + if (rc < 0) + return oml_fom_ack_nack(msg, NM_NACK_CANT_PERFORM); + return rc; } /* 8.9.2 Opstart has been received */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id68868e25bbf96227ab6459fcd3c9181852ed28e Gerrit-Change-Number: 32194 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bts[master]: bts_model_apply_oml(): Drop unneded code
by pespin 03 Apr '23

03 Apr '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32195 ) Change subject: bts_model_apply_oml(): Drop unneded code ...................................................................... bts_model_apply_oml(): Drop unneded code Only calls to bts_model_apply_oml() are done from BTS, RCARRIER and RCHANNEL NM Objects only in their respective FSMs. This function is never called with any of the GPRS NM objects. These NM Objectes have the NM_MT_IPACC_SET_ATTR msg ACKED/NACKED in its own path: oml_ipa_set_attr() rc = oml_ipa_mo_set_attr() return oml_fom_ack_nack(msg, rc); Change-Id: I1a0d38a122f50ffe749ebc4f1cc11235ca516586 --- M src/osmo-bts-lc15/oml.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/bts_model.c 7 files changed, 19 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/95/32195/1 diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c index d702da7..1842008 100644 --- a/src/osmo-bts-lc15/oml.c +++ b/src/osmo-bts-lc15/oml.c @@ -1814,14 +1814,6 @@ struct gsm_bts_trx *trx; struct lc15l1_hdl *fl1h; - /* TODO: NM Object without FSM: */ - switch (foh->obj_class) { - case NM_OC_GPRS_NSE: - case NM_OC_GPRS_CELL: - case NM_OC_GPRS_NSVC: - return oml_fom_ack_nack(ev_data.msg, ev_data.cause); - } - switch (foh->msg_type) { case NM_MT_SET_RADIO_ATTR: trx = obj; diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c index dfcb4a6..98c2fbc 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -1824,14 +1824,6 @@ struct oc2gl1_hdl *fl1h; uint8_t cell_size; - /* TODO: NM Object without FSM: */ - switch (foh->obj_class) { - case NM_OC_GPRS_NSE: - case NM_OC_GPRS_CELL: - case NM_OC_GPRS_NSVC: - return oml_fom_ack_nack(ev_data.msg, ev_data.cause); - } - switch (foh->msg_type) { case NM_MT_SET_RADIO_ATTR: trx = obj; diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c index 1e64e8d..01e3d56 100644 --- a/src/osmo-bts-octphy/l1_oml.c +++ b/src/osmo-bts-octphy/l1_oml.c @@ -1754,14 +1754,6 @@ int rc; struct gsm_bts_trx *trx; - /* TODO: NM Object without FSM: */ - switch (foh->obj_class) { - case NM_OC_GPRS_NSE: - case NM_OC_GPRS_CELL: - case NM_OC_GPRS_NSVC: - return oml_fom_ack_nack(ev_data.msg, ev_data.cause); - } - switch (foh->msg_type) { case NM_MT_SET_RADIO_ATTR: trx = obj; diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c index 46fa84b..7fb58f7 100644 --- a/src/osmo-bts-omldummy/bts_model.c +++ b/src/osmo-bts-omldummy/bts_model.c @@ -104,14 +104,6 @@ }; int rc; - /* TODO: NM Object without FSM: */ - switch (foh->obj_class) { - case NM_OC_GPRS_NSE: - case NM_OC_GPRS_CELL: - case NM_OC_GPRS_NSVC: - return oml_fom_ack_nack(ev_data.msg, ev_data.cause); - } - switch (foh->msg_type) { case NM_MT_SET_BTS_ATTR: ev_data.cause = vbts_set_bts(obj); diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index 4be222c..67e1275 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -1727,14 +1727,6 @@ struct gsm_bts_trx *trx; struct femtol1_hdl *fl1h; - /* TODO: NM Object without FSM: */ - switch (foh->obj_class) { - case NM_OC_GPRS_NSE: - case NM_OC_GPRS_CELL: - case NM_OC_GPRS_NSVC: - return oml_fom_ack_nack(ev_data.msg, ev_data.cause); - } - switch (foh->msg_type) { case NM_MT_SET_RADIO_ATTR: trx = obj; diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 2ed1868..57a4c41 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -559,14 +559,6 @@ }; int rc; - /* TODO: NM Object without FSM: */ - switch (foh->obj_class) { - case NM_OC_GPRS_NSE: - case NM_OC_GPRS_CELL: - case NM_OC_GPRS_NSVC: - return oml_fom_ack_nack(ev_data.msg, ev_data.cause); - } - switch (foh->msg_type) { case NM_MT_SET_BTS_ATTR: ev_data.cause = trx_set_bts(obj, new_attr); diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c index 64e2f8d..57e5304 100644 --- a/src/osmo-bts-virtual/bts_model.c +++ b/src/osmo-bts-virtual/bts_model.c @@ -139,14 +139,6 @@ }; int rc; - /* TODO: NM Object without FSM: */ - switch (foh->obj_class) { - case NM_OC_GPRS_NSE: - case NM_OC_GPRS_CELL: - case NM_OC_GPRS_NSVC: - return oml_fom_ack_nack(ev_data.msg, ev_data.cause); - } - switch (foh->msg_type) { case NM_MT_SET_BTS_ATTR: ev_data.cause = vbts_set_bts(obj); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1a0d38a122f50ffe749ebc4f1cc11235ca516586 Gerrit-Change-Number: 32195 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bts[master]: nm: Drop NM_EV_SETATTR_{ACK/NACK}
by pespin 03 Apr '23

03 Apr '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32196 ) Change subject: nm: Drop NM_EV_SETATTR_{ACK/NACK} ...................................................................... nm: Drop NM_EV_SETATTR_{ACK/NACK} Simply return error codes from lower layer implementations, and do the OML handling in the common NM TS 12.21 FSMs. As a result, we simplify the logic in the lower layers. Change-Id: I281c07bb5ad88ee03542f092141cebe036d10aee --- M include/osmo-bts/nm_common_fsm.h M src/common/nm_bb_transc_fsm.c M src/common/nm_bts_fsm.c M src/common/nm_bts_sm_fsm.c M src/common/nm_channel_fsm.c M src/common/nm_common_fsm.c M src/common/nm_radio_carrier_fsm.c M src/osmo-bts-lc15/oml.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/bts_model.c 14 files changed, 78 insertions(+), 135 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/32196/1 diff --git a/include/osmo-bts/nm_common_fsm.h b/include/osmo-bts/nm_common_fsm.h index b1b779e..b2aaa89 100644 --- a/include/osmo-bts/nm_common_fsm.h +++ b/include/osmo-bts/nm_common_fsm.h @@ -31,8 +31,6 @@ enum nm_fsm_events { NM_EV_SW_ACT, NM_EV_RX_SETATTR, /* data: struct nm_fsm_ev_setattr_data */ - NM_EV_SETATTR_ACK, /* data: struct nm_fsm_ev_setattr_data */ - NM_EV_SETATTR_NACK, /* data: struct nm_fsm_ev_setattr_data */ NM_EV_OPSTART_ACK, NM_EV_OPSTART_NACK, NM_EV_SHUTDOWN_START, @@ -53,7 +51,6 @@ struct nm_fsm_ev_setattr_data { struct msgb *msg; /* msgb ownership is transferred to FSM */ struct tlv_parsed *tp; - int cause; /* set in NM_EV_SETATTR_(N)ACK */ }; diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c index ca78256..bc79f17 100644 --- a/src/common/nm_bb_transc_fsm.c +++ b/src/common/nm_bb_transc_fsm.c @@ -122,13 +122,15 @@ struct nm_fsm_ev_setattr_data *setattr_data; bool phy_state_connected; bool rsl_link_connected; + int rc; switch (event) { - case NM_EV_SETATTR_ACK: - case NM_EV_SETATTR_NACK: + case NM_EV_RX_SETATTR: setattr_data = (struct nm_fsm_ev_setattr_data *)data; - bb_transc->mo.setattr_success = setattr_data->cause == 0; - oml_fom_ack_nack(setattr_data->msg, setattr_data->cause); + rc = bts_model_apply_oml(trx->bts, setattr_data->msg, setattr_data->tp, + NM_OC_BASEB_TRANSC, bb_transc); + bb_transc->mo.setattr_success = rc == 0; + oml_fom_ack_nack(setattr_data->msg, rc); break; case NM_EV_OPSTART_ACK: bb_transc->mo.opstart_success = true; @@ -245,8 +247,7 @@ }, [NM_BBTRANSC_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = - X(NM_EV_SETATTR_ACK) | - X(NM_EV_SETATTR_NACK) | + X(NM_EV_RX_SETATTR) | X(NM_EV_OPSTART_ACK) | X(NM_EV_OPSTART_NACK) | X(NM_EV_RSL_UP) | diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index 47b91e4..a51c9a7 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -118,13 +118,8 @@ setattr_data = (struct nm_fsm_ev_setattr_data *)data; rc = bts_model_apply_oml(bts, setattr_data->msg, setattr_data->tp, NM_OC_BTS, bts); - (void)rc; - break; - case NM_EV_SETATTR_ACK: - case NM_EV_SETATTR_NACK: - setattr_data = (struct nm_fsm_ev_setattr_data *)data; - bts->mo.setattr_success = setattr_data->cause == 0; - oml_fom_ack_nack(setattr_data->msg, setattr_data->cause); + bts->mo.setattr_success = rc == 0; + oml_fom_ack_nack(setattr_data->msg, rc); break; case NM_EV_OPSTART_ACK: bts->mo.opstart_success = true; @@ -186,8 +181,6 @@ [NM_BTS_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = X(NM_EV_RX_SETATTR) | - X(NM_EV_SETATTR_ACK) | - X(NM_EV_SETATTR_NACK) | X(NM_EV_OPSTART_ACK) | X(NM_EV_OPSTART_NACK), .out_state_mask = diff --git a/src/common/nm_bts_sm_fsm.c b/src/common/nm_bts_sm_fsm.c index 2d43315..939bc43 100644 --- a/src/common/nm_bts_sm_fsm.c +++ b/src/common/nm_bts_sm_fsm.c @@ -86,13 +86,15 @@ { struct gsm_bts_sm *site_mgr = (struct gsm_bts_sm *)fi->priv; struct nm_fsm_ev_setattr_data *setattr_data; + int rc; switch (event) { - case NM_EV_SETATTR_ACK: - case NM_EV_SETATTR_NACK: + case NM_EV_RX_SETATTR: setattr_data = (struct nm_fsm_ev_setattr_data *)data; - site_mgr->mo.setattr_success = setattr_data->cause == 0; - oml_fom_ack_nack(setattr_data->msg, setattr_data->cause); + /* No bts_model_apply_oml() needed yet for site_mgr obj yet: */ + rc = 0; + site_mgr->mo.setattr_success = rc == 0; + oml_fom_ack_nack(setattr_data->msg, rc); break; case NM_EV_OPSTART_ACK: site_mgr->mo.opstart_success = true; @@ -153,8 +155,7 @@ }, [NM_BTS_SM_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = - X(NM_EV_SETATTR_ACK) | - X(NM_EV_SETATTR_NACK) | + X(NM_EV_RX_SETATTR) | X(NM_EV_OPSTART_ACK) | X(NM_EV_OPSTART_NACK), .out_state_mask = diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c index 3abf941..632d58c 100644 --- a/src/common/nm_channel_fsm.c +++ b/src/common/nm_channel_fsm.c @@ -101,13 +101,8 @@ setattr_data = (struct nm_fsm_ev_setattr_data *)data; rc = bts_model_apply_oml(ts->trx->bts, setattr_data->msg, setattr_data->tp, NM_OC_CHANNEL, ts); - (void)rc; - break; - case NM_EV_SETATTR_ACK: - case NM_EV_SETATTR_NACK: - setattr_data = (struct nm_fsm_ev_setattr_data *)data; - ts->mo.setattr_success = setattr_data->cause == 0; - oml_fom_ack_nack(setattr_data->msg, setattr_data->cause); + ts->mo.setattr_success = rc == 0; + oml_fom_ack_nack(setattr_data->msg, rc); break; case NM_EV_OPSTART_ACK: LOGPFSML(fi, LOGL_NOTICE, "BSC trying to activate TS while still in avail=dependency. " @@ -151,14 +146,9 @@ case NM_EV_RX_SETATTR: setattr_data = (struct nm_fsm_ev_setattr_data *)data; rc = bts_model_apply_oml(ts->trx->bts, setattr_data->msg, setattr_data->tp, - NM_OC_CHANNEL, ts); - (void)rc; - break; - case NM_EV_SETATTR_ACK: - case NM_EV_SETATTR_NACK: - setattr_data = (struct nm_fsm_ev_setattr_data *)data; - ts->mo.setattr_success = setattr_data->cause == 0; - oml_fom_ack_nack(setattr_data->msg, setattr_data->cause); + NM_OC_CHANNEL, ts); + ts->mo.setattr_success = rc == 0; + oml_fom_ack_nack(setattr_data->msg, rc); break; case NM_EV_OPSTART_ACK: ts->mo.opstart_success = true; @@ -235,8 +225,6 @@ [NM_CHAN_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = X(NM_EV_RX_SETATTR) | - X(NM_EV_SETATTR_ACK) | - X(NM_EV_SETATTR_NACK) | X(NM_EV_OPSTART_ACK) | /* backward compatibility, buggy BSC */ X(NM_EV_OPSTART_NACK) | X(NM_EV_BBTRANSC_ENABLED) | @@ -254,8 +242,6 @@ [NM_CHAN_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = X(NM_EV_RX_SETATTR) | - X(NM_EV_SETATTR_ACK) | - X(NM_EV_SETATTR_NACK) | X(NM_EV_OPSTART_ACK) | X(NM_EV_OPSTART_NACK) | X(NM_EV_BBTRANSC_DISABLED) | diff --git a/src/common/nm_common_fsm.c b/src/common/nm_common_fsm.c index 6a8d3d1..5298e4d 100644 --- a/src/common/nm_common_fsm.c +++ b/src/common/nm_common_fsm.c @@ -25,9 +25,7 @@ const struct value_string nm_fsm_event_names[] = { { NM_EV_SW_ACT, "SW_ACT" }, - { NM_EV_SETATTR_ACK, "RX_SETATTR" }, - { NM_EV_SETATTR_ACK, "SETATTR_ACK" }, - { NM_EV_SETATTR_NACK, "SETATTR_NACK" }, + { NM_EV_RX_SETATTR, "RX_SETATTR" }, { NM_EV_OPSTART_ACK, "OPSTART_ACK" }, { NM_EV_OPSTART_NACK, "OPSTART_NACK" }, { NM_EV_SHUTDOWN_START, "SHUTDOWN_START" }, diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c index 4513d6c..0cb4fbb 100644 --- a/src/common/nm_radio_carrier_fsm.c +++ b/src/common/nm_radio_carrier_fsm.c @@ -110,13 +110,8 @@ setattr_data = (struct nm_fsm_ev_setattr_data *)data; rc = bts_model_apply_oml(trx->bts, setattr_data->msg, setattr_data->tp, NM_OC_RADIO_CARRIER, trx); - (void)rc; - break; - case NM_EV_SETATTR_ACK: - case NM_EV_SETATTR_NACK: - setattr_data = (struct nm_fsm_ev_setattr_data *)data; - trx->mo.setattr_success = setattr_data->cause == 0; - oml_fom_ack_nack(setattr_data->msg, setattr_data->cause); + trx->mo.setattr_success = rc == 0; + oml_fom_ack_nack(setattr_data->msg, rc); break; case NM_EV_OPSTART_ACK: trx->mo.opstart_success = true; @@ -227,8 +222,6 @@ [NM_RCARRIER_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = X(NM_EV_RX_SETATTR) | - X(NM_EV_SETATTR_ACK) | - X(NM_EV_SETATTR_NACK) | X(NM_EV_OPSTART_ACK) | X(NM_EV_OPSTART_NACK) | X(NM_EV_RSL_UP) | diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c index 1842008..9370738 100644 --- a/src/osmo-bts-lc15/oml.c +++ b/src/osmo-bts-lc15/oml.c @@ -1805,11 +1805,6 @@ struct tlv_parsed *new_attr, int kind, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); - struct gsm_abis_mo *mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); - struct nm_fsm_ev_setattr_data ev_data = { - .msg = msg, - .cause = 0, - }; int rc; struct gsm_bts_trx *trx; struct lc15l1_hdl *fl1h; @@ -1853,14 +1848,14 @@ } #endif } + rc = 0; + break; + default: + rc = 0; break; } - rc = osmo_fsm_inst_dispatch(mo->fi, - ev_data.cause == 0 ? NM_EV_SETATTR_ACK : NM_EV_SETATTR_NACK, - &ev_data); - /* msgb ownership is transferred to FSM if it received ev: */ - return rc == 0 ? 1 : 0; + return rc; } /* callback from OML */ diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c index 98c2fbc..4de93b4 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -1814,11 +1814,6 @@ struct tlv_parsed *new_attr, int kind, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); - struct gsm_abis_mo *mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); - struct nm_fsm_ev_setattr_data ev_data = { - .msg = msg, - .cause = 0, - }; int rc; struct gsm_bts_trx *trx; struct oc2gl1_hdl *fl1h; @@ -1858,14 +1853,14 @@ l1if_set_txpower_c0_idle_pwr_red(fl1h, fl1h->phy_inst->u.oc2g.tx_c0_idle_pwr_red); } } + rc = 0; + break; + default: + rc = 0; break; } - rc = osmo_fsm_inst_dispatch(mo->fi, - ev_data.cause == 0 ? NM_EV_SETATTR_ACK : NM_EV_SETATTR_NACK, - &ev_data); - /* msgb ownsership is transferred to FSM if it received ev: */ - return rc == 0 ? 1 : 0; + return rc; } /* callback from OML */ diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c index 01e3d56..28281f8 100644 --- a/src/osmo-bts-octphy/l1_oml.c +++ b/src/osmo-bts-octphy/l1_oml.c @@ -1746,27 +1746,21 @@ struct tlv_parsed *new_attr, int kind, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); - struct gsm_abis_mo *mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); - struct nm_fsm_ev_setattr_data ev_data = { - .msg = msg, - .cause = 0, - }; int rc; struct gsm_bts_trx *trx; switch (foh->msg_type) { case NM_MT_SET_RADIO_ATTR: trx = obj; - /*struct octphy_hdl *fl1h = trx_octphy_hdl(trx); */ power_ramp_start(trx, get_p_target_mdBm(trx, 0), 0, NULL); + rc = 0; + break; + default: + rc = 0; break; } - rc = osmo_fsm_inst_dispatch(mo->fi, - ev_data.cause == 0 ? NM_EV_SETATTR_ACK : NM_EV_SETATTR_NACK, - &ev_data); - /* msgb ownsership is transferred to FSM if it received ev: */ - return rc == 0 ? 1 : 0; + return rc; } diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c index 7fb58f7..c010508 100644 --- a/src/osmo-bts-omldummy/bts_model.c +++ b/src/osmo-bts-omldummy/bts_model.c @@ -97,30 +97,24 @@ struct tlv_parsed *new_attr, int kind, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); - struct gsm_abis_mo *mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); - struct nm_fsm_ev_setattr_data ev_data = { - .msg = msg, - .cause = 0, - }; int rc; switch (foh->msg_type) { case NM_MT_SET_BTS_ATTR: - ev_data.cause = vbts_set_bts(obj); + rc = vbts_set_bts(obj); break; case NM_MT_SET_RADIO_ATTR: - ev_data.cause = vbts_set_trx(obj); + rc = vbts_set_trx(obj); break; case NM_MT_SET_CHAN_ATTR: - ev_data.cause = vbts_set_ts(obj); + rc = vbts_set_ts(obj); + break; + default: + rc = 0; break; } - rc = osmo_fsm_inst_dispatch(mo->fi, - ev_data.cause == 0 ? NM_EV_SETATTR_ACK : NM_EV_SETATTR_NACK, - &ev_data); - /* msgb ownsership is transferred to FSM if it received ev: */ - return rc == 0 ? 1 : 0; + return rc; } /* MO: TS 12.21 Managed Object */ diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index 67e1275..1d5b18c 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -1718,11 +1718,6 @@ struct tlv_parsed *new_attr, int kind, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); - struct gsm_abis_mo *mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); - struct nm_fsm_ev_setattr_data ev_data = { - .msg = msg, - .cause = 0, - }; int rc; struct gsm_bts_trx *trx; struct femtol1_hdl *fl1h; @@ -1736,13 +1731,12 @@ if (fl1h->hLayer1) power_ramp_start(trx, get_p_target_mdBm(trx, 0), 0, NULL); break; + default: + rc = 0; + break; } - rc = osmo_fsm_inst_dispatch(mo->fi, - ev_data.cause == 0 ? NM_EV_SETATTR_ACK : NM_EV_SETATTR_NACK, - &ev_data); - /* msgb ownsership is transferred to FSM if it received ev: */ - return rc == 0 ? 1 : 0; + return rc; } /* callback from OML */ diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 57a4c41..9e9dd64 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -552,30 +552,24 @@ struct tlv_parsed *new_attr, int kind, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); - struct gsm_abis_mo *mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); - struct nm_fsm_ev_setattr_data ev_data = { - .msg = msg, - .cause = 0, - }; int rc; switch (foh->msg_type) { case NM_MT_SET_BTS_ATTR: - ev_data.cause = trx_set_bts(obj, new_attr); + rc = trx_set_bts(obj, new_attr); break; case NM_MT_SET_RADIO_ATTR: - ev_data.cause = trx_set_trx(obj); + rc = trx_set_trx(obj); break; case NM_MT_SET_CHAN_ATTR: - ev_data.cause = trx_set_ts(obj); + rc = trx_set_ts(obj); + break; + default: + rc = 0; break; } - rc = osmo_fsm_inst_dispatch(mo->fi, - ev_data.cause == 0 ? NM_EV_SETATTR_ACK : NM_EV_SETATTR_NACK, - &ev_data); - /* msgb ownsership is transferred to FSM if it received ev: */ - return rc == 0 ? 1 : 0; + return rc; } /* callback from OML */ diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c index 57e5304..bcf66be 100644 --- a/src/osmo-bts-virtual/bts_model.c +++ b/src/osmo-bts-virtual/bts_model.c @@ -132,30 +132,24 @@ struct tlv_parsed *new_attr, int kind, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); - struct gsm_abis_mo *mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); - struct nm_fsm_ev_setattr_data ev_data = { - .msg = msg, - .cause = 0, - }; int rc; switch (foh->msg_type) { case NM_MT_SET_BTS_ATTR: - ev_data.cause = vbts_set_bts(obj); + rc = vbts_set_bts(obj); break; case NM_MT_SET_RADIO_ATTR: - ev_data.cause = vbts_set_trx(obj); + rc = vbts_set_trx(obj); break; case NM_MT_SET_CHAN_ATTR: - ev_data.cause = vbts_set_ts(obj); + rc = vbts_set_ts(obj); + break; + default: + rc = 0; break; } - rc = osmo_fsm_inst_dispatch(mo->fi, - ev_data.cause == 0 ? NM_EV_SETATTR_ACK : NM_EV_SETATTR_NACK, - &ev_data); - /* msgb ownsership is transferred to FSM if it received ev: */ - return rc == 0 ? 1 : 0; + return rc; } /* MO: TS 12.21 Managed Object */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I281c07bb5ad88ee03542f092141cebe036d10aee Gerrit-Change-Number: 32196 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmocore[master]: codec: add SID classification functions per GSM 06.31 & 06.81
by pespin 03 Apr '23

03 Apr '23

Attention is currently required from: falconia, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32183 ) Change subject: codec: add SID classification functions per GSM 06.31 & 06.81 ...................................................................... Patch Set 1: (1 comment) File include/osmocom/codec/codec.h: https://gerrit.osmocom.org/c/libosmocore/+/32183/comment/3f867d8f_ab0f6f20 PS1, Line 85: etsi_sid_class > Here I used etsi_ and ETSI_ naming prefixes for the enum and its items, as opposed to osmo_ and OSMO […] @falconia that's not really the rationale behind name prefixes. The osmo_* prefix is used to denote a namespace (C doesn't support namespaces explicitly) in order to avoid collision with other libraries. Imagine your program wants to use another library/header which also defines/implements something from etsi, and it also names it etsi_*, you may end up with type collisions. Hence, all public symbols/defines should start with osmo_* -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie91a52c6f04689082d8004311517d8ce0c544916 Gerrit-Change-Number: 32183 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Apr 2023 15:23:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: bts-{lc15,oc2g,sysmo}: support EFR in repeat_last_sid()
by falconia 03 Apr '23

03 Apr '23

falconia has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32182 ) Change subject: bts-{lc15,oc2g,sysmo}: support EFR in repeat_last_sid() ...................................................................... bts-{lc15,oc2g,sysmo}: support EFR in repeat_last_sid() The function repeat_last_sid() is implemented in the common part, but is only used by osmo-bts-{lc15,oc2g,sysmo} models. These BTS models call this function when they are looking to see if a previously cached SID frame needs to retransmitted on the DL because it is that time according to the SACCH multiframe. Out of non-AMR codecs, this function previously supported only FR1 and HR1, but failed to support EFR. Fix that omission. Change-Id: Iebcd28e65af889254740757eed9c579392eb1c33 --- M src/common/msg_utils.c 1 file changed, 23 insertions(+), 6 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/msg_utils.c b/src/common/msg_utils.c index bd2c4b7..3a9611d 100644 --- a/src/common/msg_utils.c +++ b/src/common/msg_utils.c @@ -380,15 +380,19 @@ static const uint8_t f[] = { 52, 53, 54, 55, 56, 57, 58, 59 }, h0[] = { 0, 2, 4, 6, 52, 54, 56, 58 }, h1[] = { 14, 16, 18, 20, 66, 68, 70, 72 }; - if (lchan->tch_mode == GSM48_CMODE_SPEECH_V1) { + switch (lchan->tch_mode) { + case GSM48_CMODE_SPEECH_V1: if (lchan->type == GSM_LCHAN_TCH_F) return fn_chk(f, fn, ARRAY_SIZE(f)); else return fn_chk(lchan->nr ? h1 : h0, fn, lchan->nr ? ARRAY_SIZE(h1) : ARRAY_SIZE(h0)); + case GSM48_CMODE_SPEECH_EFR: + return fn_chk(f, fn, ARRAY_SIZE(f)); + default: + return false; } - return false; } /*! \brief Check if DTX DL AMR is enabled for a given lchan (it have proper type, @@ -466,10 +470,6 @@ */ uint8_t repeat_last_sid(struct gsm_lchan *lchan, uint8_t *dst, uint32_t fn) { - /* FIXME: add EFR support */ - if (lchan->tch_mode == GSM48_CMODE_SPEECH_EFR) - return 0; - if (lchan->tch_mode != GSM48_CMODE_SPEECH_AMR) { if (dtx_sched_optional(lchan, fn)) return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iebcd28e65af889254740757eed9c579392eb1c33 Gerrit-Change-Number: 32182 Gerrit-PatchSet: 3 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in libosmocore[master]: codec: add SID classification functions per GSM 06.31 & 06.81
by falconia 03 Apr '23

03 Apr '23

Attention is currently required from: fixeria. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32183 ) Change subject: codec: add SID classification functions per GSM 06.31 & 06.81 ...................................................................... Patch Set 1: (1 comment) File include/osmocom/codec/codec.h: https://gerrit.osmocom.org/c/libosmocore/+/32183/comment/31596d60_61d95a77 PS1, Line 85: etsi_sid_class > I know it's not strictly followed here in this file, but generally it's a good idea to prepend `osmo […] Here I used etsi_ and ETSI_ naming prefixes for the enum and its items, as opposed to osmo_ and OSMO_, to denote the fact that these constants are rigidly defined by ETSI rather than us. To my perhaps naive intuitive mind, if something is named osmo_xxx, then the implication is that the "thing" is Osmo-defined and hence future Osmocom developers are free to change and extend the thing being defined - but the constants in the present case *cannot* be changed by us, they appear exactly with these numeric values in external interfaces such as TRAU-UL frame bits C13 & C14 and a_dd[0] bits [4:3] in TI DSPs. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie91a52c6f04689082d8004311517d8ce0c544916 Gerrit-Change-Number: 32183 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Apr 2023 15:14:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts: oml: Start OML IPA_Emulation component as alive-type
by pespin 03 Apr '23

03 Apr '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32193 ) Change subject: bts: oml: Start OML IPA_Emulation component as alive-type ...................................................................... bts: oml: Start OML IPA_Emulation component as alive-type This will hopefully help fix sporadic errors while tearing down the test after successful run: mtc BTS_Tests_OML.ttcn:625 Removing unterminated connection between port IPA_OSMO_PCU and TC_ts_opstart-OML-IPA(15):IPA_OSMO_PCU_PORT. IPA_Emulation.ttcnpp:774 setverdict(error): none -> error Related: OS#5965 Change-Id: I53c065016e88a5b253eff496560fa6e371fe491b --- M bts/BTS_Tests_OML.ttcn 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/32193/1 diff --git a/bts/BTS_Tests_OML.ttcn b/bts/BTS_Tests_OML.ttcn index b76a0ac..ac66c02 100644 --- a/bts/BTS_Tests_OML.ttcn +++ b/bts/BTS_Tests_OML.ttcn @@ -114,7 +114,7 @@ } function f_init_oml(charstring id) runs on BSC_OML_CT { - vc_IPA_OML := IPA_Emulation_CT.create(id & "-OML-IPA"); + vc_IPA_OML := IPA_Emulation_CT.create(id & "-OML-IPA") alive; map(vc_IPA_OML:IPA_PORT, system:IPA_CODEC_PT); connect(vc_IPA_OML:IPA_OML_PORT, self:OML); connect(vc_IPA_OML:IPA_OSMO_PCU_PORT, self:IPA_OSMO_PCU); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I53c065016e88a5b253eff496560fa6e371fe491b Gerrit-Change-Number: 32193 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0