This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20403 ) Change subject: Introduce NM RadioCarrier FSM ...................................................................... Introduce NM RadioCarrier FSM Change-Id: Ieed61d1fb1e896db42545c2c3421b20cb41ad549 --- M include/osmocom/bsc/Makefile.am M include/osmocom/bsc/bts_trx.h A include/osmocom/bsc/nm_rcarrier_fsm.h M src/ipaccess/Makefile.am M src/osmo-bsc/Makefile.am M src/osmo-bsc/abis_om2000.c M src/osmo-bsc/acc.c M src/osmo-bsc/bsc_ctrl_commands.c M src/osmo-bsc/bsc_rf_ctrl.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_nokia_site.c M src/osmo-bsc/bts_trx.c M src/osmo-bsc/e1_config.c M src/osmo-bsc/gsm_data.c A src/osmo-bsc/nm_rcarrier_fsm.c M src/utils/Makefile.am M tests/abis/Makefile.am M tests/acc/Makefile.am M tests/acc/acc_test.ok M tests/bsc/Makefile.am M tests/gsm0408/Makefile.am M tests/handover/Makefile.am M tests/handover/handover_test.c M tests/nanobts_omlattr/Makefile.am 26 files changed, 548 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/20403/1 diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index cf25b21..0da6f8e 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -38,6 +38,7 @@ nm_bb_transc_fsm.h \ nm_bts_sm_fsm.h \ nm_bts_fsm.h \ + nm_rcarrier_fsm.h \ openbscdefines.h \ osmo_bsc.h \ osmo_bsc_grace.h \ diff --git a/include/osmocom/bsc/bts_trx.h b/include/osmocom/bsc/bts_trx.h index 12f397a..d592915 100644 --- a/include/osmocom/bsc/bts_trx.h +++ b/include/osmocom/bsc/bts_trx.h @@ -39,8 +39,16 @@ /* Some BTS (specifically Ericsson RBS) have a per-TRX OML Link */ struct e1inp_sign_link *oml_link; - struct gsm_abis_mo mo; - struct tlv_parsed nm_attr; + struct { + struct osmo_fsm_inst *fi; + bool set_radio_attr_sent; + bool set_radio_attr_ack_received; + bool adm_unlock_sent; + bool opstart_sent; + bool force_rf_lock; + struct gsm_abis_mo mo; + struct tlv_parsed nm_attr; + } nm; struct { struct osmo_fsm_inst *fi; bool adm_unlock_sent; diff --git a/include/osmocom/bsc/nm_rcarrier_fsm.h b/include/osmocom/bsc/nm_rcarrier_fsm.h new file mode 100644 index 0000000..6e073a6 --- /dev/null +++ b/include/osmocom/bsc/nm_rcarrier_fsm.h @@ -0,0 +1,45 @@ +/* NM Radio Carrier FSM. Following 3GPP TS 12.21 Figure 2/GSM 12.21: + GSM 12.21 Objects' Operational state and availability status behaviour during initialization */ + +/* (C) 2020 by sysmocom - s.m.f.c. GmbH <info at sysmocom.de> + * Author: Pau Espin Pedrol <pespin at sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#pragma once + +#include <osmocom/core/fsm.h> + +enum nm_rcarrier_op_fsm_states { + NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED, + NM_RCARRIER_ST_OP_DISABLED_DEPENDENCY, + NM_RCARRIER_ST_OP_DISABLED_OFFLINE, + NM_RCARRIER_ST_OP_ENABLED, +}; + +enum nm_rcarrier_op_fsm_events { + NM_RCARRIER_EV_SW_ACT_REP, + NM_RCARRIER_EV_STATE_CHG_REP, + NM_RCARRIER_EV_SET_ATTR_ACK, + NM_RCARRIER_EV_OPSTART_ACK, + NM_RCARRIER_EV_OPSTART_NACK, + NM_RCARRIER_EV_FORCE_LOCK, + NM_RCARRIER_EV_OML_DOWN, +}; + +extern struct osmo_fsm nm_rcarrier_fsm; diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index 729173d..8c20722 100644 --- a/src/ipaccess/Makefile.am +++ b/src/ipaccess/Makefile.am @@ -57,6 +57,7 @@ $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(OSMO_LIBS) \ $(NULL) @@ -75,5 +76,6 @@ $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(OSMO_LIBS) \ $(NULL) diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index c4fe6f0..4b2a013 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -75,6 +75,7 @@ nm_bb_transc_fsm.c \ nm_bts_sm_fsm.c \ nm_bts_fsm.c \ + nm_rcarrier_fsm.c \ gsm_08_08.c \ osmo_bsc_bssap.c \ osmo_bsc_ctrl.c \ diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index b8c71e8..2c8ba21 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -872,7 +872,7 @@ trx = gsm_bts_trx_num(bts, mo->inst); if (!trx) return NULL; - nm_state = &trx->mo.nm_state; + nm_state = &trx->nm.mo.nm_state; break; case OM2K_MO_CLS_TS: trx = gsm_bts_trx_num(bts, mo->assoc_so); diff --git a/src/osmo-bsc/acc.c b/src/osmo-bsc/acc.c index 06f96c6..60035cc 100644 --- a/src/osmo-bsc/acc.c +++ b/src/osmo-bsc/acc.c @@ -503,12 +503,12 @@ * Administrative state has not changed. * Trigger ramping only if TRX 0 is already unlocked. */ - if (trx->mo.nm_state.administrative == NM_STATE_UNLOCKED) + if (trx->nm.mo.nm_state.administrative == NM_STATE_UNLOCKED) trigger_ramping = true; else LOG_TRX(trx, DRSL, LOGL_DEBUG, "ACC RAMP: ignoring state change " "because TRX is in administrative state '%s'\n", - get_value_string(abis_nm_adm_state_names, trx->mo.nm_state.administrative)); + get_value_string(abis_nm_adm_state_names, trx->nm.mo.nm_state.administrative)); } break; case NM_OPSTATE_DISABLED: diff --git a/src/osmo-bsc/bsc_ctrl_commands.c b/src/osmo-bsc/bsc_ctrl_commands.c index 9383167..e0dadec 100644 --- a/src/osmo-bsc/bsc_ctrl_commands.c +++ b/src/osmo-bsc/bsc_ctrl_commands.c @@ -360,8 +360,8 @@ continue; llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->mo.nm_state.availability == NM_AVSTATE_OK && - trx->mo.nm_state.operational != NM_OPSTATE_DISABLED) { + if (trx->nm.mo.nm_state.availability == NM_AVSTATE_OK && + trx->nm.mo.nm_state.operational != NM_OPSTATE_DISABLED) { cmd->reply = talloc_asprintf(cmd, "state=on,policy=%s,bts=%u,trx=%u", policy_name, bts->nr, trx->nr); diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c index 1e04f21..8dc267f 100644 --- a/src/osmo-bsc/bsc_rf_ctrl.c +++ b/src/osmo-bsc/bsc_rf_ctrl.c @@ -84,7 +84,7 @@ struct gsm_bts_trx *trx; llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->mo.nm_state.operational == NM_OPSTATE_ENABLED) + if (trx->nm.mo.nm_state.operational == NM_OPSTATE_ENABLED) return OSMO_BSC_RF_OPSTATE_OPERATIONAL; } @@ -97,7 +97,7 @@ struct gsm_bts_trx *trx; llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->mo.nm_state.administrative == NM_STATE_UNLOCKED) + if (trx->nm.mo.nm_state.administrative == NM_STATE_UNLOCKED) return OSMO_BSC_RF_ADMINSTATE_UNLOCKED; } @@ -193,8 +193,8 @@ continue; } llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->mo.nm_state.availability == NM_AVSTATE_OK && - trx->mo.nm_state.operational != NM_OPSTATE_DISABLED) { + if (trx->nm.mo.nm_state.availability == NM_AVSTATE_OK && + trx->nm.mo.nm_state.operational != NM_OPSTATE_DISABLED) { send = RF_CMD_ON; break; } @@ -224,9 +224,9 @@ } llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->mo.nm_state.availability != NM_AVSTATE_OK || - trx->mo.nm_state.operational != NM_OPSTATE_ENABLED || - trx->mo.nm_state.administrative != NM_STATE_UNLOCKED) { + if (trx->nm.mo.nm_state.availability != NM_AVSTATE_OK || + trx->nm.mo.nm_state.operational != NM_OPSTATE_ENABLED || + trx->nm.mo.nm_state.administrative != NM_STATE_UNLOCKED) { LOGP(DNM, LOGL_ERROR, "RF activation failed. Starting again.\n"); ipaccess_drop_oml(bts, "rf check"); break; diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 1d35dc2..8490e77 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -718,7 +718,7 @@ vty_out(vty, " description %s%s", trx->description, VTY_NEWLINE); vty_out(vty, " rf_locked %u%s", - trx->mo.nm_state.administrative == NM_STATE_LOCKED ? 1 : 0, + trx->nm.force_rf_lock ? 1 : 0, VTY_NEWLINE); vty_out(vty, " arfcn %u%s", trx->arfcn, VTY_NEWLINE); vty_out(vty, " nominal power %u%s", trx->nominal_power, VTY_NEWLINE); @@ -1200,7 +1200,7 @@ trx->nominal_power, trx->max_power_red, trx->nominal_power - trx->max_power_red, VTY_NEWLINE); vty_out(vty, " Radio Carrier NM State: "); - net_dump_nmstate(vty, &trx->mo.nm_state); + net_dump_nmstate(vty, &trx->nm.mo.nm_state); if (print_rsl) vty_out(vty, " RSL State: %s%s", trx->rsl_link? "connected" : "disconnected", VTY_NEWLINE); vty_out(vty, " Baseband Transceiver NM State: "); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 7396117..5f30f67 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -597,7 +597,7 @@ gsm_abis_mo_reset(&bts->gprs.cell.mo); llist_for_each_entry(trx, &bts->trx_list, list) { - gsm_abis_mo_reset(&trx->mo); + gsm_abis_mo_reset(&trx->nm.mo); gsm_abis_mo_reset(&trx->bb_transc.mo); for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index fdd50f4..cf7d17d 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -49,6 +49,7 @@ #include <osmocom/bsc/nm_bts_sm_fsm.h> #include <osmocom/bsc/nm_bts_fsm.h> #include <osmocom/bsc/nm_bb_transc_fsm.h> +#include <osmocom/bsc/nm_rcarrier_fsm.h> static int bts_model_nanobts_start(struct gsm_network *net); static void bts_model_nanobts_e1line_bind_ops(struct e1inp_line *line); @@ -146,6 +147,7 @@ * endless loop */ if (obj_class != NM_OC_BTS && obj_class != NM_OC_BASEB_TRANSC && + obj_class != NM_OC_RADIO_CARRIER && evt != S_NM_STATECHG_OPER) return 0; @@ -181,7 +183,8 @@ } break; case NM_OC_RADIO_CARRIER: - /* OPSTART done after Set Radio Carrier Attributes ACK is received */ + trx = obj; + osmo_fsm_inst_dispatch(trx->nm.fi, NM_RCARRIER_EV_STATE_CHG_REP, nsd); break; case NM_OC_GPRS_NSE: bts = container_of(obj, struct gsm_bts, gprs.nse); @@ -265,27 +268,11 @@ return -EINVAL; osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BB_TRANSC_EV_SW_ACT_REP, NULL); break; - case NM_OC_RADIO_CARRIER: { + case NM_OC_RADIO_CARRIER: if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr))) return -EINVAL; - /* - * Locking the radio carrier will make it go - * offline again and we would come here. The - * framework should determine that there was - * no change and avoid recursion. - * - * This code is here to make sure that on start - * a TRX remains locked. - */ - /* Patch ARFCN into radio attribute */ - struct msgb *msgb = nanobts_attr_radio_get(trx->bts, trx); - abis_nm_set_radio_attr(trx, msgb->data, msgb->len); - msgb_free(msgb); - abis_nm_chg_adm_state(trx->bts, foh->obj_class, - trx->bts->bts_nr, trx->nr, 0xff, - trx->mo.nm_state.administrative); + osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_RCARRIER_EV_SW_ACT_REP, NULL); break; - } } return 0; } @@ -319,6 +306,11 @@ case NM_OC_BTS: osmo_fsm_inst_dispatch(bts->nm.fi, NM_BTS_EV_OPSTART_ACK, NULL); break; + case NM_OC_RADIO_CARRIER: + if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr))) + return; + osmo_fsm_inst_dispatch(trx->nm.fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); + break; case NM_OC_BASEB_TRANSC: if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr))) return; @@ -346,6 +338,11 @@ case NM_OC_BTS: osmo_fsm_inst_dispatch(bts->nm.fi, NM_BTS_EV_OPSTART_ACK, NULL); break; + case NM_OC_RADIO_CARRIER: + if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr))) + return; + osmo_fsm_inst_dispatch(trx->nm.fi, NM_RCARRIER_EV_OPSTART_NACK, NULL); + break; case NM_OC_BASEB_TRANSC: if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr))) return; @@ -377,12 +374,11 @@ struct gsm_bts *bts = sign_link->trx->bts; struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr); - if (foh->obj_class != NM_OC_RADIO_CARRIER) { + if (!trx || foh->obj_class != NM_OC_RADIO_CARRIER) { LOG_TRX(trx, DNM, LOGL_ERROR, "Set Radio Carrier Attr Ack received on non Radio Carrier object!\n"); return; } - abis_nm_opstart(trx->bts, foh->obj_class, trx->bts->bts_nr, - trx->nr, 0xff); + osmo_fsm_inst_dispatch(trx->nm.fi, NM_RCARRIER_EV_SET_ATTR_ACK, NULL); } /* Callback function to be called every time we receive a signal from NM */ @@ -491,6 +487,7 @@ llist_for_each_entry(trx, &bts->trx_list, list) { ipaccess_drop_rsl(trx, "OML link drop"); osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BB_TRANSC_EV_OML_DOWN, NULL); + osmo_fsm_inst_dispatch(trx->nm.fi, NM_RCARRIER_EV_OML_DOWN, NULL); } osmo_fsm_inst_dispatch(bts->site_mgr.fi, NM_BTS_SM_EV_OML_DOWN, NULL); @@ -682,7 +679,7 @@ if (bts == NULL) bts = link->trx->bts; /* Cancel RSL connection timeout in case are still waiting for an RSL connection. */ - if (link->trx->mo.nm_state.administrative == NM_STATE_UNLOCKED) + if (link->trx->nm.mo.nm_state.administrative == NM_STATE_UNLOCKED) osmo_timer_del(&link->trx->rsl_connect_timeout); } if (bts != NULL) diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 35a252b..9557a28 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -1457,7 +1457,7 @@ llist_for_each_entry(trx, &bts->trx_list, list) { int i; - mo_ok(&trx->mo); + mo_ok(&trx->nm.mo); mo_ok(&trx->bb_transc.mo); for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c index 78fec9f..63645bd 100644 --- a/src/osmo-bsc/bts_trx.c +++ b/src/osmo-bsc/bts_trx.c @@ -31,6 +31,7 @@ #include <osmocom/bsc/pcu_if.h> #include <osmocom/bsc/debug.h> #include <osmocom/bsc/nm_bb_transc_fsm.h> +#include <osmocom/bsc/nm_rcarrier_fsm.h> static int gsm_bts_trx_talloc_destructor(struct gsm_bts_trx *trx) { @@ -38,6 +39,10 @@ osmo_fsm_inst_free(trx->bb_transc.fi); trx->bb_transc.fi = NULL; } + if (trx->nm.fi) { + osmo_fsm_inst_free(trx->nm.fi); + trx->nm.fi = NULL; + } return 0; } @@ -53,9 +58,11 @@ trx->bts = bts; trx->nr = bts->num_trx++; - trx->mo.nm_state.administrative = NM_STATE_UNLOCKED; - gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER, + trx->nm.fi = osmo_fsm_inst_alloc(&nm_rcarrier_fsm, trx, trx, + LOGL_INFO, NULL); + osmo_fsm_inst_update_id_f(trx->nm.fi, "bts%d-trx%d", bts->nr, trx->nr); + gsm_mo_init(&trx->nm.mo, bts, NM_OC_RADIO_CARRIER, bts->nr, trx->nr, 0xff); trx->bb_transc.fi = osmo_fsm_inst_alloc(&nm_bb_transc_fsm, trx, trx, @@ -165,32 +172,29 @@ { uint8_t new_state = locked ? NM_STATE_LOCKED : NM_STATE_UNLOCKED; + trx->nm.force_rf_lock = locked; - if (!trx->bts || !trx->bts->oml_link) { - /* Set initial state which will be sent when BTS connects. */ - trx->mo.nm_state.administrative = new_state; + /* State will be sent when BTS connects. */ + if (!trx->bts || !trx->bts->oml_link) return; - } LOG_TRX(trx, DNM, LOGL_NOTICE, "Requesting administrative state change %s -> %s [%s]\n", - get_value_string(abis_nm_adm_state_names, trx->mo.nm_state.administrative), + get_value_string(abis_nm_adm_state_names, trx->nm.mo.nm_state.administrative), get_value_string(abis_nm_adm_state_names, new_state), reason); - abis_nm_chg_adm_state(trx->bts, NM_OC_RADIO_CARRIER, - trx->bts->bts_nr, trx->nr, 0xff, - new_state); + osmo_fsm_inst_dispatch(trx->nm.fi, NM_RCARRIER_EV_FORCE_LOCK, (void*)(intptr_t)locked); } bool trx_is_usable(const struct gsm_bts_trx *trx) { /* FIXME: How does this behave for BS-11 ? */ if (is_ipaccess_bts(trx->bts)) { - if (!nm_is_running(&trx->mo.nm_state) || + if (!nm_is_running(&trx->nm.mo.nm_state) || !nm_is_running(&trx->bb_transc.mo.nm_state)) return false; } else if (is_ericsson_bts(trx->bts)) { /* The OM2000 -> 12.21 mapping we do doesn't have separate bb_transc MO */ - if (!nm_is_running(&trx->mo.nm_state)) + if (!nm_is_running(&trx->nm.mo.nm_state)) return false; } diff --git a/src/osmo-bsc/e1_config.c b/src/osmo-bsc/e1_config.c index 9ccbbfd..7f408c3 100644 --- a/src/osmo-bsc/e1_config.c +++ b/src/osmo-bsc/e1_config.c @@ -128,7 +128,7 @@ ret = bts->model->oml_rcvmsg(msg); break; case E1INP_SIGN_RSL: - if (link->trx->mo.nm_state.administrative == NM_STATE_LOCKED) { + if (link->trx->nm.mo.nm_state.administrative == NM_STATE_LOCKED) { LOG_TRX(link->trx, DLMI, LOGL_ERROR, "discarding RSL message received " "in locked administrative state\n"); msgb_free(msg); diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 5a83c9d..86ed5af 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -358,7 +358,7 @@ return NULL; } trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - mo = &trx->mo; + mo = &trx->nm.mo; break; case NM_OC_BASEB_TRANSC: if (obj_inst->trx_nr >= bts->num_trx) { diff --git a/src/osmo-bsc/nm_rcarrier_fsm.c b/src/osmo-bsc/nm_rcarrier_fsm.c new file mode 100644 index 0000000..68cc9ea --- /dev/null +++ b/src/osmo-bsc/nm_rcarrier_fsm.c @@ -0,0 +1,366 @@ +/* NM Radio Carrier FSM */ + +/* (C) 2020 by sysmocom - s.m.f.c. GmbH <info at sysmocom.de> + * Author: Pau Espin Pedrol <pespin at sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <errno.h> +#include <unistd.h> +#include <inttypes.h> + +#include <osmocom/core/fsm.h> +#include <osmocom/core/tdef.h> +#include <osmocom/gsm/protocol/gsm_12_21.h> + +#include <osmocom/bsc/bts.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/bts_ipaccess_nanobts_omlattr.h> +#include <osmocom/bsc/nm_rcarrier_fsm.h> +#include <osmocom/bsc/debug.h> + +#define X(s) (1 << (s)) + +#define nm_rcarrier_fsm_state_chg(fi, NEXT_STATE) \ + osmo_fsm_inst_state_chg(fi, NEXT_STATE, 0, 0) + +////////////////////////// +// FSM STATE ACTIONS +////////////////////////// + +static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + + trx->nm.set_radio_attr_sent = false; + trx->nm.set_radio_attr_ack_received = false; + trx->nm.adm_unlock_sent = false; + trx->nm.opstart_sent = false; +} + +static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct nm_statechg_signal_data *nsd; + struct gsm_nm_state *new_state; + + switch (event) { + case NM_RCARRIER_EV_SW_ACT_REP: + break; + case NM_RCARRIER_EV_STATE_CHG_REP: + nsd = (struct nm_statechg_signal_data *)data; + new_state = nsd->new_state; + if (new_state->operational == NM_OPSTATE_ENABLED) { + /*should not happen... */ + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_ENABLED); + return; + } + switch (new_state->availability) { /* operational = DISABLED */ + case NM_AVSTATE_DEPENDENCY: + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_DEPENDENCY); + return; + case NM_AVSTATE_OFF_LINE: + case NM_AVSTATE_OK: + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_OFFLINE); + return; + default: + return; + } + default: + OSMO_ASSERT(0); + } +} + +static void configure_loop(struct gsm_bts_trx *trx, struct gsm_nm_state *state, bool allow_opstart) +{ + struct msgb *msgb; + + if (!trx->nm.set_radio_attr_sent && !trx->nm.set_radio_attr_ack_received) { + trx->nm.set_radio_attr_sent = true; + msgb = nanobts_attr_radio_get(trx->bts, trx); + abis_nm_set_radio_attr(trx, msgb->data, msgb->len); + msgb_free(msgb); + } + + if (!trx->nm.force_rf_lock && state->administrative != NM_STATE_UNLOCKED && + !trx->nm.adm_unlock_sent) { + trx->nm.adm_unlock_sent = true; + abis_nm_chg_adm_state(trx->bts, NM_OC_RADIO_CARRIER, + trx->bts->bts_nr, trx->nr, 0xff, + NM_STATE_UNLOCKED); + } + + if (allow_opstart && state->administrative == NM_STATE_UNLOCKED && + trx->nm.set_radio_attr_ack_received && !trx->nm.opstart_sent) { + trx->nm.opstart_sent = true; + abis_nm_opstart(trx->bts, NM_OC_RADIO_CARRIER, trx->bts->bts_nr, trx->nr, 0xff); + } +} + +static void st_op_disabled_dependency_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + + /* In general nanoBTS is broken, doesn't follow TS 12.21. Opstart MUST + * be sent during Dependency, so we simply move to OFFLINE state here to + * avoid duplicating code. However, RadioCarrier seems to be implemented + * correctly and goes to Offline state during startup. If some HW + * version is found with the aboev estated bug, this code needs to be + * enabled, similar to what we do in nm_bb_transc_fsm: + */ + /*if (trx->bts->type == GSM_BTS_TYPE_NANOBTS) { + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_OFFLINE); + return; + }*/ + configure_loop(trx, &trx->nm.mo.nm_state, false); +} + +static void st_op_disabled_dependency(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + struct nm_statechg_signal_data *nsd; + struct gsm_nm_state *new_state; + + switch (event) { + case NM_RCARRIER_EV_SET_ATTR_ACK: + trx->nm.set_radio_attr_ack_received = true; + trx->nm.set_radio_attr_sent = false; + configure_loop(trx, &trx->nm.mo.nm_state, false); + return; + case NM_RCARRIER_EV_STATE_CHG_REP: + nsd = (struct nm_statechg_signal_data *)data; + new_state = nsd->new_state; + if (new_state->operational == NM_OPSTATE_ENABLED) { + /* should not happen... */ + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_ENABLED); + return; + } + switch (new_state->availability) { /* operational = DISABLED */ + case NM_AVSTATE_NOT_INSTALLED: + case NM_AVSTATE_POWER_OFF: + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED); + return; + case NM_AVSTATE_OFF_LINE: + case NM_AVSTATE_OK: + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_OFFLINE); + return; + case NM_AVSTATE_DEPENDENCY: + configure_loop(trx, new_state, false); + return; + default: + return; + } + default: + OSMO_ASSERT(0); + } +} + +static void st_op_disabled_offline_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + + /* Warning: In here we may be acessing an state older than new_state + from prev (syncrhonous) FSM state */ + configure_loop(trx, &trx->nm.mo.nm_state, true); +} + +static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + struct nm_statechg_signal_data *nsd; + struct gsm_nm_state *new_state; + + switch (event) { + case NM_RCARRIER_EV_SET_ATTR_ACK: + trx->nm.set_radio_attr_ack_received = true; + trx->nm.set_radio_attr_sent = false; + configure_loop(trx, &trx->nm.mo.nm_state, true); + return; + case NM_RCARRIER_EV_STATE_CHG_REP: + nsd = (struct nm_statechg_signal_data *)data; + new_state = nsd->new_state; + if (new_state->operational == NM_OPSTATE_ENABLED) { + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_ENABLED); + return; + } + switch (new_state->availability) { /* operational = DISABLED */ + case NM_AVSTATE_NOT_INSTALLED: + case NM_AVSTATE_POWER_OFF: + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED); + return; + case NM_AVSTATE_DEPENDENCY: + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_DEPENDENCY); + return; + case NM_AVSTATE_OFF_LINE: + case NM_AVSTATE_OK: + configure_loop(trx, new_state, true); + return; + default: + return; + } + default: + OSMO_ASSERT(0); + } +} + +static void st_op_enabled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + + /* Reset state, we don't need it in this state and it will need to be + reused as soon as we move back to Disabled */ + trx->nm.opstart_sent = false; + trx->nm.adm_unlock_sent = false; + trx->nm.set_radio_attr_ack_received = false; + trx->nm.set_radio_attr_sent = false; +} + +static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct nm_statechg_signal_data *nsd; + struct gsm_nm_state *new_state; + + switch (event) { + case NM_RCARRIER_EV_STATE_CHG_REP: + nsd = (struct nm_statechg_signal_data *)data; + new_state = nsd->new_state; + if (new_state->operational == NM_OPSTATE_ENABLED) + return; + switch (new_state->availability) { /* operational = DISABLED */ + case NM_AVSTATE_NOT_INSTALLED: + case NM_AVSTATE_POWER_OFF: + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED); + return; + case NM_AVSTATE_DEPENDENCY: + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_DEPENDENCY); + return; + case NM_AVSTATE_OFF_LINE: + case NM_AVSTATE_OK: + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_OFFLINE); + return; + default: + return; + } + default: + OSMO_ASSERT(0); + } +} + +static void st_op_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + + switch (event) { + case NM_RCARRIER_EV_OPSTART_ACK: + case NM_RCARRIER_EV_OPSTART_NACK: + /* TODO: if on state OFFLINE and rx NACK, try again? */ + trx->nm.opstart_sent = false; + break; + case NM_RCARRIER_EV_FORCE_LOCK: + trx->nm.force_rf_lock = (bool)(intptr_t)data; + abis_nm_chg_adm_state(trx->bts, NM_OC_RADIO_CARRIER, + trx->bts->bts_nr, trx->nr, 0xff, + trx->nm.force_rf_lock ? NM_STATE_LOCKED : NM_STATE_UNLOCKED); + break; + case NM_RCARRIER_EV_OML_DOWN: + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED); + break; + default: + OSMO_ASSERT(0); + } +} + +static struct osmo_fsm_state nm_rcarrier_fsm_states[] = { + [NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED] = { + .in_event_mask = + X(NM_RCARRIER_EV_SW_ACT_REP) | + X(NM_RCARRIER_EV_STATE_CHG_REP), + .out_state_mask = + X(NM_RCARRIER_ST_OP_DISABLED_DEPENDENCY) | + X(NM_RCARRIER_ST_OP_DISABLED_OFFLINE) | + X(NM_RCARRIER_ST_OP_ENABLED), + .name = "DISABLED_NOTINSTALLED", + .onenter = st_op_disabled_notinstalled_on_enter, + .action = st_op_disabled_notinstalled, + }, + [NM_RCARRIER_ST_OP_DISABLED_DEPENDENCY] = { + .in_event_mask = + X(NM_RCARRIER_EV_STATE_CHG_REP) | + X(NM_RCARRIER_EV_SET_ATTR_ACK), + .out_state_mask = + X(NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED) | + X(NM_RCARRIER_ST_OP_DISABLED_OFFLINE) | + X(NM_RCARRIER_ST_OP_ENABLED), + .name = "DISABLED_DEPENDENCY", + .onenter = st_op_disabled_dependency_on_enter, + .action = st_op_disabled_dependency, + }, + [NM_RCARRIER_ST_OP_DISABLED_OFFLINE] = { + .in_event_mask = + X(NM_RCARRIER_EV_STATE_CHG_REP) | + X(NM_RCARRIER_EV_SET_ATTR_ACK), + .out_state_mask = + X(NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED) | + X(NM_RCARRIER_ST_OP_DISABLED_DEPENDENCY) | + X(NM_RCARRIER_ST_OP_ENABLED), + .name = "DISABLED_OFFLINE", + .onenter = st_op_disabled_offline_on_enter, + .action = st_op_disabled_offline, + }, + [NM_RCARRIER_ST_OP_ENABLED] = { + .in_event_mask = + X(NM_RCARRIER_EV_STATE_CHG_REP), + .out_state_mask = + X(NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED) | + X(NM_RCARRIER_ST_OP_DISABLED_DEPENDENCY) | + X(NM_RCARRIER_ST_OP_DISABLED_OFFLINE), + .name = "ENABLED", + .onenter = st_op_enabled_on_enter, + .action = st_op_enabled, + }, +}; + +const struct value_string nm_rcarrier_fsm_event_names[] = { + { NM_RCARRIER_EV_SW_ACT_REP, "SW_ACT_REP" }, + { NM_RCARRIER_EV_STATE_CHG_REP, "STATE_CHG_REP" }, + { NM_RCARRIER_EV_SET_ATTR_ACK, "SET_ATTR_ACK" }, + { NM_RCARRIER_EV_OPSTART_ACK, "OPSTART_ACK" }, + { NM_RCARRIER_EV_OPSTART_NACK, "OPSTART_NACK" }, + { NM_RCARRIER_EV_FORCE_LOCK, "FORCE_LOCK_CHG" }, + { NM_RCARRIER_EV_OML_DOWN, "OML_DOWN" }, + { 0, NULL } +}; + +struct osmo_fsm nm_rcarrier_fsm = { + .name = "NM_RCARRIER_OP", + .states = nm_rcarrier_fsm_states, + .num_states = ARRAY_SIZE(nm_rcarrier_fsm_states), + .allstate_event_mask = + X(NM_RCARRIER_EV_OPSTART_ACK) | + X(NM_RCARRIER_EV_OPSTART_NACK) | + X(NM_RCARRIER_EV_FORCE_LOCK) | + X(NM_RCARRIER_EV_OML_DOWN), + .allstate_action = st_op_allstate, + .event_names = nm_rcarrier_fsm_event_names, + .log_subsys = DNM, +}; + +static __attribute__((constructor)) void nm_rcarrier_fsm_init(void) +{ + OSMO_ASSERT(osmo_fsm_register(&nm_rcarrier_fsm) == 0); +} diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index f7349a1..8026320 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -59,6 +59,7 @@ $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOABIS_LIBS) \ @@ -133,6 +134,7 @@ $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOABIS_LIBS) \ diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am index 1027e4a..1a2420b 100644 --- a/tests/abis/Makefile.am +++ b/tests/abis/Makefile.am @@ -35,6 +35,7 @@ $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/acc/Makefile.am b/tests/acc/Makefile.am index 5ab48e5..5591fc4 100644 --- a/tests/acc/Makefile.am +++ b/tests/acc/Makefile.am @@ -35,6 +35,7 @@ $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/acc/acc_test.ok b/tests/acc/acc_test.ok index 1060505..5a5ddf6 100644 --- a/tests/acc/acc_test.ok +++ b/tests/acc/acc_test.ok @@ -1,6 +1,7 @@ ===test_acc_mgr_no_ramp=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_no_ramp() @@ -111,10 +112,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_no_ramp() ===test_acc_mgr_manual_ramp=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_manual_ramp() @@ -355,10 +358,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_manual_ramp() ===test_acc_mgr_rotate(true, 1)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -430,10 +435,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_mgr_rotate(false, 1)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -502,10 +509,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_mgr_rotate(true, 2)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -577,10 +586,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_mgr_rotate(false, 2)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -649,10 +660,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_mgr_rotate(true, 3)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -724,10 +737,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_mgr_rotate(false, 3)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -796,10 +811,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_mgr_rotate(true, 4)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -871,10 +888,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_mgr_rotate(false, 4)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -943,10 +962,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_mgr_rotate(true, 5)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -1018,10 +1039,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_mgr_rotate(false, 5)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -1090,10 +1113,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_mgr_rotate(true, 6)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -1165,10 +1190,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_mgr_rotate(false, 6)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -1237,10 +1264,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_mgr_rotate(true, 7)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -1312,10 +1341,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_mgr_rotate(false, 7)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -1384,10 +1415,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_mgr_rotate(true, 8)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -1459,10 +1492,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_mgr_rotate(false, 8)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -1531,10 +1566,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_mgr_rotate(false, 9)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_mgr_rotate() @@ -1603,10 +1640,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_mgr_rotate() ===test_acc_ramp=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_ramp() @@ -1644,10 +1683,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_ramp() ===test_acc_ramp2=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_ramp2() @@ -1667,10 +1708,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_ramp2() ===test_acc_ramp3=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_ramp3() @@ -1706,10 +1749,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_ramp3() ===test_acc_ramp_up_rotate(0, 100, 100)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_ramp_up_rotate() @@ -1801,10 +1846,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_ramp_up_rotate() ===test_acc_ramp_up_rotate(0, 20, 50)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_ramp_up_rotate() @@ -1896,10 +1943,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_ramp_up_rotate() ===test_acc_ramp_up_rotate(70, 80, 90)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_ramp_up_rotate() @@ -1991,10 +2040,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_ramp_up_rotate() ===test_acc_ramp_updown_rotate(80, 90, 0, 100, 15)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_ramp_updown_rotate() @@ -2116,10 +2167,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_ramp_updown_rotate() ===test_acc_ramp_updown_rotate(30, 50, 10, 100, 15)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_ramp_updown_rotate() @@ -2265,10 +2318,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_ramp_updown_rotate() ===test_acc_ramp_updown_rotate(50, 49, 0, 100, 10)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_ramp_updown_rotate() @@ -2424,10 +2479,12 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_ramp_updown_rotate() ===test_acc_ramp_updown_rotate(30, 80, 30, 80, 5)=== NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated +NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_ramp_updown_rotate() @@ -2489,4 +2546,5 @@ NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated BTS deallocated OK in test_acc_ramp_updown_rotate() diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am index a0157d9..dd5de46 100644 --- a/tests/bsc/Makefile.am +++ b/tests/bsc/Makefile.am @@ -49,6 +49,7 @@ $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index 5b265f0..b49a396 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -38,6 +38,7 @@ $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOABIS_LIBS) \ diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index abd1e14..ddf4429 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -83,6 +83,7 @@ $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(top_builddir)/src/osmo-bsc/osmo_bsc_ctrl.o \ $(top_builddir)/src/osmo-bsc/osmo_bsc_lcls.o \ $(top_builddir)/src/osmo-bsc/osmo_bsc_mgcp.o \ diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 78e8daf..77d8244 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -196,9 +196,9 @@ rsl_link->trx = bts->c0; bts->c0->rsl_link = rsl_link; - bts->c0->mo.nm_state.operational = NM_OPSTATE_ENABLED; - bts->c0->mo.nm_state.availability = NM_AVSTATE_OK; - bts->c0->mo.nm_state.administrative = NM_STATE_UNLOCKED; + bts->c0->nm.mo.nm_state.operational = NM_OPSTATE_ENABLED; + bts->c0->nm.mo.nm_state.availability = NM_AVSTATE_OK; + bts->c0->nm.mo.nm_state.administrative = NM_STATE_UNLOCKED; bts->c0->bb_transc.mo.nm_state.operational = NM_OPSTATE_ENABLED; bts->c0->bb_transc.mo.nm_state.availability = NM_AVSTATE_OK; bts->c0->bb_transc.mo.nm_state.administrative = NM_STATE_UNLOCKED; diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am index 52ded6b..f57b942 100644 --- a/tests/nanobts_omlattr/Makefile.am +++ b/tests/nanobts_omlattr/Makefile.am @@ -32,6 +32,7 @@ $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOABIS_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ieed61d1fb1e896db42545c2c3421b20cb41ad549 Gerrit-Change-Number: 20403 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201002/2a889469/attachment.htm>