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/+/20404 ) Change subject: Introduce Radio Channel FSM ...................................................................... Introduce Radio Channel FSM Change-Id: Iddc008c5737afb2fddd32c628bc5278056a64d89 --- M include/osmocom/bsc/Makefile.am M include/osmocom/bsc/gsm_data.h A include/osmocom/bsc/nm_channel_fsm.h M include/osmocom/bsc/signal.h M src/ipaccess/Makefile.am M src/osmo-bsc/Makefile.am M src/osmo-bsc/abis_nm.c M src/osmo-bsc/abis_om2000.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/chan_alloc.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/handover_logic.c A src/osmo-bsc/nm_channel_fsm.c M src/osmo-bsc/pcu_sock.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 27 files changed, 974 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/04/20404/1 diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index 0da6f8e..278b5aa 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_channel_fsm.h \ nm_rcarrier_fsm.h \ openbscdefines.h \ osmo_bsc.h \ diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 90ab8ea..e441a0a 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -682,7 +682,15 @@ /* Whether TS_EV_RSL_READY was received */ bool is_rsl_ready; - struct gsm_abis_mo mo; + struct { + struct osmo_fsm_inst *fi; + bool set_chan_attr_sent; + bool set_chan_attr_ack_received; + bool adm_unlock_sent; + bool opstart_sent; + struct gsm_abis_mo mo; + struct tlv_parsed nm_attr; + } nm; struct tlv_parsed nm_attr; uint8_t nm_chan_comb; int tsc; /* -1 == use BTS TSC */ diff --git a/include/osmocom/bsc/nm_channel_fsm.h b/include/osmocom/bsc/nm_channel_fsm.h new file mode 100644 index 0000000..218e900 --- /dev/null +++ b/include/osmocom/bsc/nm_channel_fsm.h @@ -0,0 +1,44 @@ +/* NM Radio Channel 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_chan_op_fsm_states { + NM_CHAN_ST_OP_DISABLED_NOTINSTALLED, + NM_CHAN_ST_OP_DISABLED_DEPENDENCY, + NM_CHAN_ST_OP_DISABLED_OFFLINE, + NM_CHAN_ST_OP_ENABLED, +}; + +enum nm_chan_op_fsm_events { + NM_CHAN_EV_SW_ACT_REP, + NM_CHAN_EV_STATE_CHG_REP, + NM_CHAN_EV_SET_ATTR_ACK, + NM_CHAN_EV_OPSTART_ACK, + NM_CHAN_EV_OPSTART_NACK, + NM_CHAN_EV_OML_DOWN, +}; + +extern struct osmo_fsm nm_chan_fsm; diff --git a/include/osmocom/bsc/signal.h b/include/osmocom/bsc/signal.h index 4922ac8..088d4f2 100644 --- a/include/osmocom/bsc/signal.h +++ b/include/osmocom/bsc/signal.h @@ -75,6 +75,7 @@ S_NM_OPSTART_NACK, /* Received OPSTART NACK, arg is struct msgb *oml_msg */ S_NM_GET_ATTR_REP, /* Received Get Attributes Response, arg is struct msgb *oml_msg */ S_NM_SET_RADIO_ATTR_ACK, /* Received Set Radio Carrier Attributes Ack, arg is struct msgb *oml_msg */ + S_NM_SET_CHAN_ATTR_ACK, /* Received Set Radio Channel Attributes Ack, arg is struct msgb *oml_msg */ S_NM_SET_BTS_ATTR_ACK, /* Received Set BTS Attributes Ack, arg is struct msgb *oml_msg */ }; diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index 8c20722..367e57c 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_channel_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(OSMO_LIBS) \ $(NULL) @@ -76,6 +77,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_channel_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 4b2a013..f348198 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_channel_fsm.c \ nm_rcarrier_fsm.c \ gsm_08_08.c \ osmo_bsc_bssap.c \ diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 0ff1a88..fc4eee4 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -842,6 +842,14 @@ return 0; } +static int abis_nm_rx_set_channel_attr_ack(struct msgb *mb) +{ + struct abis_om_fom_hdr *foh = msgb_l3(mb); + DEBUGPFOH(DNM, foh, "Set Channel Attributes ACK\n"); + osmo_signal_dispatch(SS_NM, S_NM_SET_CHAN_ATTR_ACK, mb); + return 0; +} + static int abis_nm_rx_set_bts_attr_ack(struct msgb *mb) { struct abis_om_fom_hdr *foh = msgb_l3(mb); @@ -969,7 +977,7 @@ ret = abis_nm_rx_opstart_nack(mb); break; case NM_MT_SET_CHAN_ATTR_ACK: - DEBUGPFOH(DNM, foh, "Set Channel Attributes ACK\n"); + abis_nm_rx_set_channel_attr_ack(mb); break; case NM_MT_SET_RADIO_ATTR_ACK: abis_nm_rx_set_radio_attr_ack(mb); diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index 2c8ba21..a2f9d86 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -880,7 +880,7 @@ return NULL; if (mo->inst >= ARRAY_SIZE(trx->ts)) return NULL; - nm_state = &trx->ts[mo->inst].mo.nm_state; + nm_state = &trx->ts[mo->inst].nm.mo.nm_state; break; case OM2K_MO_CLS_MCTR: nm_state = &bts->rbs2000.mctr.mo.nm_state; diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 8490e77..c4a1395 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1313,7 +1313,7 @@ vty_out(vty, " (%s mode)", gsm_pchan_name(ts->pchan_is)); vty_out(vty, ", TSC %u%s NM State: ", gsm_ts_tsc(ts), VTY_NEWLINE); vty_out_dyn_ts_details(vty, ts); - net_dump_nmstate(vty, &ts->mo.nm_state); + net_dump_nmstate(vty, &ts->nm.mo.nm_state); if (!is_ipaccess_bts(ts->trx->bts)) vty_out(vty, " E1 Line %u, Timeslot %u, Subslot %u%s", ts->e1_link.e1_nr, ts->e1_link.e1_ts, diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 5f30f67..6d06949 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -602,7 +602,7 @@ for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { struct gsm_bts_trx_ts *ts = &trx->ts[i]; - gsm_abis_mo_reset(&ts->mo); + gsm_abis_mo_reset(&ts->nm.mo); } } } diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index cf7d17d..ebc445b 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -50,6 +50,7 @@ #include <osmocom/bsc/nm_bts_fsm.h> #include <osmocom/bsc/nm_bb_transc_fsm.h> #include <osmocom/bsc/nm_rcarrier_fsm.h> +#include <osmocom/bsc/nm_channel_fsm.h> static int bts_model_nanobts_start(struct gsm_network *net); static void bts_model_nanobts_e1line_bind_ops(struct e1inp_line *line); @@ -148,6 +149,7 @@ if (obj_class != NM_OC_BTS && obj_class != NM_OC_BASEB_TRANSC && obj_class != NM_OC_RADIO_CARRIER && + obj_class != NM_OC_CHANNEL && evt != S_NM_STATECHG_OPER) return 0; @@ -167,20 +169,7 @@ case NM_OC_CHANNEL: ts = obj; trx = ts->trx; - if (new_state->operational == NM_OPSTATE_DISABLED && - new_state->availability == NM_AVSTATE_DEPENDENCY) { - enum abis_nm_chan_comb ccomb = - abis_nm_chcomb4pchan(ts->pchan_from_config); - if (abis_nm_set_channel_attr(ts, ccomb) == -EINVAL) { - ipaccess_drop_oml_deferred(trx->bts); - return -1; - } - abis_nm_chg_adm_state(trx->bts, obj_class, - trx->bts->bts_nr, trx->nr, ts->nr, - NM_STATE_UNLOCKED); - abis_nm_opstart(trx->bts, obj_class, - trx->bts->bts_nr, trx->nr, ts->nr); - } + osmo_fsm_inst_dispatch(ts->nm.fi, NM_CHAN_EV_STATE_CHG_REP, nsd); break; case NM_OC_RADIO_CARRIER: trx = obj; @@ -252,6 +241,7 @@ struct e1inp_sign_link *sign_link = mb->dst; struct gsm_bts *bts = sign_link->trx->bts; struct gsm_bts_trx *trx; + struct gsm_bts_trx_ts *ts; if (!is_ipaccess_bts(bts)) return 0; @@ -273,6 +263,11 @@ return -EINVAL; osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_RCARRIER_EV_SW_ACT_REP, NULL); break; + case NM_OC_CHANNEL: + if (!(ts = abis_nm_get_ts(mb))) + return -EINVAL; + osmo_fsm_inst_dispatch(ts->nm.fi, NM_CHAN_EV_SW_ACT_REP, NULL); + break; } return 0; } @@ -288,7 +283,7 @@ LOG_TS(ts, LOGL_ERROR, "Channel OPSTART ACK for uninitialized TS\n"); return; } - + osmo_fsm_inst_dispatch(ts->nm.fi, NM_CHAN_EV_OPSTART_ACK, NULL); osmo_fsm_inst_dispatch(ts->fi, TS_EV_OML_READY, NULL); } @@ -330,6 +325,7 @@ struct e1inp_sign_link *sign_link = oml_msg->dst; struct gsm_bts *bts = sign_link->trx->bts; struct gsm_bts_trx *trx; + struct gsm_bts_trx_ts *ts; switch (foh->obj_class) { case NM_OC_SITE_MANAGER: @@ -348,6 +344,11 @@ return; osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BB_TRANSC_EV_OPSTART_NACK, NULL); break; + case NM_OC_CHANNEL: + if (!(ts = abis_nm_get_ts(oml_msg))) + return; + osmo_fsm_inst_dispatch(ts->nm.fi, NM_CHAN_EV_OPSTART_NACK, NULL); + break; default: break; } @@ -381,6 +382,18 @@ osmo_fsm_inst_dispatch(trx->nm.fi, NM_RCARRIER_EV_SET_ATTR_ACK, NULL); } +static void nm_rx_set_chan_attr_ack(struct msgb *oml_msg) +{ + struct abis_om_fom_hdr *foh = msgb_l3(oml_msg); + struct gsm_bts_trx_ts *ts = abis_nm_get_ts(oml_msg); + + if (!ts || foh->obj_class != NM_OC_CHANNEL) { + LOG_TS(ts, LOGL_ERROR, "Set Channel Attr Ack received on non Radio Channel object!\n"); + return; + } + osmo_fsm_inst_dispatch(ts->nm.fi, NM_CHAN_EV_SET_ATTR_ACK, NULL); +} + /* Callback function to be called every time we receive a signal from NM */ static int bts_ipa_nm_sig_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) @@ -406,6 +419,9 @@ case S_NM_SET_RADIO_ATTR_ACK: nm_rx_set_radio_attr_ack(signal_data); return 0; + case S_NM_SET_CHAN_ATTR_ACK: + nm_rx_set_chan_attr_ack(signal_data); + return 0; default: break; } @@ -470,6 +486,8 @@ { struct gsm_bts *rdep_bts; struct gsm_bts_trx *trx; + struct gsm_bts_trx_ts *ts ; + uint8_t tn; /* First of all, remove deferred drop if enabled */ osmo_timer_del(&bts->oml_drop_link_timer); @@ -488,6 +506,10 @@ 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); + for (tn = 0; tn < TRX_NR_TS; tn++) { + ts = &trx->ts[tn]; + osmo_fsm_inst_dispatch(ts->nm.fi, NM_CHAN_EV_OML_DOWN, NULL); + } } osmo_fsm_inst_dispatch(bts->site_mgr.fi, NM_BTS_SM_EV_OML_DOWN, NULL); diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 9557a28..f8b5262 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -1462,7 +1462,7 @@ for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { struct gsm_bts_trx_ts *ts = &trx->ts[i]; - mo_ok(&ts->mo); + mo_ok(&ts->nm.mo); } } } diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c index 63645bd..5638bcf 100644 --- a/src/osmo-bsc/bts_trx.c +++ b/src/osmo-bsc/bts_trx.c @@ -32,9 +32,11 @@ #include <osmocom/bsc/debug.h> #include <osmocom/bsc/nm_bb_transc_fsm.h> #include <osmocom/bsc/nm_rcarrier_fsm.h> +#include <osmocom/bsc/nm_channel_fsm.h> static int gsm_bts_trx_talloc_destructor(struct gsm_bts_trx *trx) { + int i; if (trx->bb_transc.fi) { osmo_fsm_inst_free(trx->bb_transc.fi); trx->bb_transc.fi = NULL; @@ -43,6 +45,13 @@ osmo_fsm_inst_free(trx->nm.fi); trx->nm.fi = NULL; } + for (i = 0; i < TRX_NR_TS; i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + if (ts->nm.fi) { + osmo_fsm_inst_free(ts->nm.fi); + ts->nm.fi = NULL; + } + } return 0; } @@ -83,7 +92,11 @@ ts_fsm_alloc(ts); - gsm_mo_init(&ts->mo, bts, NM_OC_CHANNEL, + ts->nm.fi = osmo_fsm_inst_alloc(&nm_chan_fsm, trx, ts, + LOGL_INFO, NULL); + osmo_fsm_inst_update_id_f(ts->nm.fi, "bts%d-trx%d-ts%d", + bts->nr, trx->nr, ts->nr); + gsm_mo_init(&ts->nm.mo, bts, NM_OC_CHANNEL, bts->nr, trx->nr, ts->nr); ts->hopping.arfcns.data_len = sizeof(ts->hopping.arfcns_data); diff --git a/src/osmo-bsc/chan_alloc.c b/src/osmo-bsc/chan_alloc.c index 3569d4e..ac0c0a4 100644 --- a/src/osmo-bsc/chan_alloc.c +++ b/src/osmo-bsc/chan_alloc.c @@ -56,7 +56,7 @@ struct gsm_lchan *lchan; /* skip administratively deactivated timeslots */ - if (!nm_is_running(&ts->mo.nm_state)) + if (!nm_is_running(&ts->nm.mo.nm_state)) continue; /* Dynamic timeslots have to be counted separately diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 86ed5af..1414193 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -374,7 +374,7 @@ trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); if (obj_inst->ts_nr >= TRX_NR_TS) return NULL; - mo = &trx->ts[obj_inst->ts_nr].mo; + mo = &trx->ts[obj_inst->ts_nr].nm.mo; break; case NM_OC_SITE_MANAGER: mo = &bts->site_mgr.mo; diff --git a/src/osmo-bsc/handover_logic.c b/src/osmo-bsc/handover_logic.c index ade330d..516153d 100644 --- a/src/osmo-bsc/handover_logic.c +++ b/src/osmo-bsc/handover_logic.c @@ -109,7 +109,7 @@ struct gsm_lchan *lchan; /* skip administratively deactivated timeslots */ - if (!nm_is_running(&ts->mo.nm_state)) + if (!nm_is_running(&ts->nm.mo.nm_state)) continue; ts_for_each_lchan(lchan, ts) { diff --git a/src/osmo-bsc/nm_channel_fsm.c b/src/osmo-bsc/nm_channel_fsm.c new file mode 100644 index 0000000..4520a14 --- /dev/null +++ b/src/osmo-bsc/nm_channel_fsm.c @@ -0,0 +1,372 @@ +/* NM Radio Channel 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/ipaccess.h> +#include <osmocom/bsc/nm_channel_fsm.h> +#include <osmocom/bsc/debug.h> + +#define X(s) (1 << (s)) + +#define nm_chan_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_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; + + ts->nm.set_chan_attr_sent = false; + ts->nm.set_chan_attr_ack_received = false; + ts->nm.adm_unlock_sent = false; + ts->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_CHAN_EV_SW_ACT_REP: + break; + case NM_CHAN_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_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_ENABLED); + return; + } + switch (new_state->availability) { /* operational = DISABLED */ + case NM_AVSTATE_DEPENDENCY: + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_DEPENDENCY); + return; + case NM_AVSTATE_OFF_LINE: + case NM_AVSTATE_OK: + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_OFFLINE); + return; + default: + return; + } + default: + OSMO_ASSERT(0); + } +} + +static void configure_loop(struct gsm_bts_trx_ts *ts, struct gsm_nm_state *state, bool allow_opstart) +{ + enum abis_nm_chan_comb ccomb; + struct gsm_bts_trx *trx = ts->trx; + + if (!ts->nm.set_chan_attr_sent && !ts->nm.set_chan_attr_ack_received) { + ts->nm.set_chan_attr_sent = true; + ccomb = abis_nm_chcomb4pchan(ts->pchan_from_config); + if (abis_nm_set_channel_attr(ts, ccomb) == -EINVAL) { + /* FIXME: using this here makes crazy lots of .o + dependencies be fulled in, ending up in + osmo_bsc_main.o which conficts due to containing its + own main() */ + LOGPFSML(ts->nm.fi, LOGL_ERROR, + "FIXME: Here OML link should br dropped, " + "something is wrong in your setup!\n"); + //ipaccess_drop_oml_deferred(trx->bts); + } + } + + if (state->administrative != NM_STATE_UNLOCKED && !ts->nm.adm_unlock_sent) { + ts->nm.adm_unlock_sent = true; + abis_nm_chg_adm_state(trx->bts, NM_OC_CHANNEL, + trx->bts->bts_nr, trx->nr, ts->nr, + NM_STATE_UNLOCKED); + } + + if (allow_opstart && state->administrative == NM_STATE_UNLOCKED && + ts->nm.set_chan_attr_ack_received && !ts->nm.opstart_sent) { + ts->nm.opstart_sent = true; + abis_nm_opstart(trx->bts, NM_OC_CHANNEL, trx->bts->bts_nr, trx->nr, ts->nr); + } +} + +static void st_op_disabled_dependency_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; + + /* 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 */ + if (ts->trx->bts->type == GSM_BTS_TYPE_NANOBTS) { + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_OFFLINE); + return; + } + configure_loop(ts, &ts->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_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; + struct nm_statechg_signal_data *nsd; + struct gsm_nm_state *new_state; + + switch (event) { + case NM_CHAN_EV_SET_ATTR_ACK: + ts->nm.set_chan_attr_ack_received = true; + ts->nm.set_chan_attr_sent = false; + configure_loop(ts, &ts->nm.mo.nm_state, false); + return; + case NM_CHAN_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_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_ENABLED); + return; + } + switch (new_state->availability) { /* operational = DISABLED */ + case NM_AVSTATE_NOT_INSTALLED: + case NM_AVSTATE_POWER_OFF: + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_NOTINSTALLED); + return; + case NM_AVSTATE_OFF_LINE: + case NM_AVSTATE_OK: + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_OFFLINE); + return; + case NM_AVSTATE_DEPENDENCY: + configure_loop(ts, 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_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; + + /* Warning: In here we may be acessing an state older than new_state + from prev (syncrhonous) FSM state */ + configure_loop(ts, &ts->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_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; + struct nm_statechg_signal_data *nsd; + struct gsm_nm_state *new_state; + + switch (event) { + case NM_CHAN_EV_SET_ATTR_ACK: + ts->nm.set_chan_attr_ack_received = true; + ts->nm.set_chan_attr_sent = false; + configure_loop(ts, &ts->nm.mo.nm_state, true); + return; + case NM_CHAN_EV_STATE_CHG_REP: + nsd = (struct nm_statechg_signal_data *)data; + new_state = nsd->new_state; + if (new_state->operational == NM_OPSTATE_ENABLED) { + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_ENABLED); + return; + } + switch (new_state->availability) { /* operational = DISABLED */ + case NM_AVSTATE_NOT_INSTALLED: + case NM_AVSTATE_POWER_OFF: + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_NOTINSTALLED); + return; + case NM_AVSTATE_DEPENDENCY: + /* There's no point in moving back to Dependency in nanoBTS, since it's broken + and it acts actually as if it was in Offline state */ + if (ts->trx->bts->type != GSM_BTS_TYPE_NANOBTS) { + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_DEPENDENCY); + } else { + /* Moreover, in nanoBTS we need to check here for tx + Opstart since we may have gone Unlocked state + in this event, which means Opstart may be txed here. */ + configure_loop(ts, new_state, true); + } + return; + case NM_AVSTATE_OFF_LINE: + case NM_AVSTATE_OK: + configure_loop(ts, 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_ts *ts = (struct gsm_bts_trx_ts *)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 */ + ts->nm.opstart_sent = false; + ts->nm.adm_unlock_sent = false; + ts->nm.set_chan_attr_ack_received = false; + ts->nm.set_chan_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_CHAN_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_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_NOTINSTALLED); + return; + case NM_AVSTATE_DEPENDENCY: + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_DEPENDENCY); + return; + case NM_AVSTATE_OFF_LINE: + case NM_AVSTATE_OK: + nm_chan_fsm_state_chg(fi, NM_CHAN_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_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; + + switch (event) { + case NM_CHAN_EV_OPSTART_ACK: + case NM_CHAN_EV_OPSTART_NACK: + /* TODO: if on state OFFLINE and rx NACK, try again? */ + ts->nm.opstart_sent = false; + break; + case NM_CHAN_EV_OML_DOWN: + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_NOTINSTALLED); + break; + default: + OSMO_ASSERT(0); + } +} + +static struct osmo_fsm_state nm_chan_fsm_states[] = { + [NM_CHAN_ST_OP_DISABLED_NOTINSTALLED] = { + .in_event_mask = + X(NM_CHAN_EV_SW_ACT_REP) | + X(NM_CHAN_EV_STATE_CHG_REP), + .out_state_mask = + X(NM_CHAN_ST_OP_DISABLED_DEPENDENCY) | + X(NM_CHAN_ST_OP_DISABLED_OFFLINE) | + X(NM_CHAN_ST_OP_ENABLED), + .name = "DISABLED_NOTINSTALLED", + .onenter = st_op_disabled_notinstalled_on_enter, + .action = st_op_disabled_notinstalled, + }, + [NM_CHAN_ST_OP_DISABLED_DEPENDENCY] = { + .in_event_mask = + X(NM_CHAN_EV_STATE_CHG_REP) | + X(NM_CHAN_EV_SET_ATTR_ACK), + .out_state_mask = + X(NM_CHAN_ST_OP_DISABLED_NOTINSTALLED) | + X(NM_CHAN_ST_OP_DISABLED_OFFLINE) | + X(NM_CHAN_ST_OP_ENABLED), + .name = "DISABLED_DEPENDENCY", + .onenter = st_op_disabled_dependency_on_enter, + .action = st_op_disabled_dependency, + }, + [NM_CHAN_ST_OP_DISABLED_OFFLINE] = { + .in_event_mask = + X(NM_CHAN_EV_STATE_CHG_REP) | + X(NM_CHAN_EV_SET_ATTR_ACK), + .out_state_mask = + X(NM_CHAN_ST_OP_DISABLED_NOTINSTALLED) | + X(NM_CHAN_ST_OP_DISABLED_DEPENDENCY) | + X(NM_CHAN_ST_OP_ENABLED), + .name = "DISABLED_OFFLINE", + .onenter = st_op_disabled_offline_on_enter, + .action = st_op_disabled_offline, + }, + [NM_CHAN_ST_OP_ENABLED] = { + .in_event_mask = + X(NM_CHAN_EV_STATE_CHG_REP), + .out_state_mask = + X(NM_CHAN_ST_OP_DISABLED_NOTINSTALLED) | + X(NM_CHAN_ST_OP_DISABLED_DEPENDENCY) | + X(NM_CHAN_ST_OP_DISABLED_OFFLINE), + .name = "ENABLED", + .onenter = st_op_enabled_on_enter, + .action = st_op_enabled, + }, +}; + +const struct value_string nm_chan_fsm_event_names[] = { + { NM_CHAN_EV_SW_ACT_REP, "SW_ACT_REP" }, + { NM_CHAN_EV_STATE_CHG_REP, "STATE_CHG_REP" }, + { NM_CHAN_EV_SET_ATTR_ACK, "SET_ATTR_ACK" }, + { NM_CHAN_EV_OPSTART_ACK, "OPSTART_ACK" }, + { NM_CHAN_EV_OPSTART_NACK, "OPSTART_NACK" }, + { NM_CHAN_EV_OML_DOWN, "OML_DOWN" }, + { 0, NULL } +}; + +struct osmo_fsm nm_chan_fsm = { + .name = "NM_CHAN_OP", + .states = nm_chan_fsm_states, + .num_states = ARRAY_SIZE(nm_chan_fsm_states), + .allstate_event_mask = + X(NM_CHAN_EV_OPSTART_ACK) | + X(NM_CHAN_EV_OPSTART_NACK) | + X(NM_CHAN_EV_OML_DOWN), + .allstate_action = st_op_allstate, + .event_names = nm_chan_fsm_event_names, + .log_subsys = DNM, +}; + +static __attribute__((constructor)) void nm_chan_fsm_init(void) +{ + OSMO_ASSERT(osmo_fsm_register(&nm_chan_fsm) == 0); +} diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index ae4ac8a..0fd5ef4 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -205,7 +205,7 @@ info_ind->trx[i].arfcn = trx->arfcn; for (j = 0; j < ARRAY_SIZE(trx->ts); j++) { ts = &trx->ts[j]; - if (ts->mo.nm_state.operational == NM_OPSTATE_ENABLED + if (ts->nm.mo.nm_state.operational == NM_OPSTATE_ENABLED && ts->pchan_is == GSM_PCHAN_PDCH) { info_ind->trx[i].pdch_mask |= (1 << j); info_ind->trx[i].tsc[j] = @@ -497,7 +497,7 @@ break; for (j = 0; j < 8; j++) { ts = &trx->ts[j]; - if (ts->mo.nm_state.operational == NM_OPSTATE_ENABLED + if (ts->nm.mo.nm_state.operational == NM_OPSTATE_ENABLED && ts->pchan_is == GSM_PCHAN_PDCH) { printf("l1sap_chan_rel(trx,gsm_lchan2chan_nr(ts->lchan));\n"); } diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 8026320..b31f2f0 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_channel_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ @@ -134,6 +135,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_channel_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am index 1a2420b..880467a 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_channel_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOABIS_LIBS) \ diff --git a/tests/acc/Makefile.am b/tests/acc/Makefile.am index 5591fc4..a5f8011 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_channel_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOABIS_LIBS) \ diff --git a/tests/acc/acc_test.ok b/tests/acc/acc_test.ok index 5a5ddf6..61a6581 100644 --- a/tests/acc/acc_test.ok +++ b/tests/acc/acc_test.ok @@ -3,6 +3,14 @@ NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() do_allowed_len_adm_loop(1) @@ -113,12 +121,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() do_allowed_len_ramp_loop(1) @@ -359,12 +383,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() *** Barring one ACC *** @@ -436,12 +476,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() (bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x200 (active_len=1, ramp_len=10, adm_len=1, perm_len=10, rotation=on) @@ -510,12 +566,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() *** Barring one ACC *** @@ -587,12 +659,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() (bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x300 (active_len=2, ramp_len=10, adm_len=2, perm_len=10, rotation=on) @@ -661,12 +749,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() *** Barring one ACC *** @@ -738,12 +842,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() (bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x380 (active_len=3, ramp_len=10, adm_len=3, perm_len=10, rotation=on) @@ -812,12 +932,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() *** Barring one ACC *** @@ -889,12 +1025,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() (bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3c0 (active_len=4, ramp_len=10, adm_len=4, perm_len=10, rotation=on) @@ -963,12 +1115,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() *** Barring one ACC *** @@ -1040,12 +1208,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() (bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3e0 (active_len=5, ramp_len=10, adm_len=5, perm_len=10, rotation=on) @@ -1114,12 +1298,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() *** Barring one ACC *** @@ -1191,12 +1391,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() (bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3f0 (active_len=6, ramp_len=10, adm_len=6, perm_len=10, rotation=on) @@ -1265,12 +1481,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() *** Barring one ACC *** @@ -1342,12 +1574,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() (bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3f8 (active_len=7, ramp_len=10, adm_len=7, perm_len=10, rotation=on) @@ -1416,12 +1664,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() *** Barring one ACC *** @@ -1493,12 +1757,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() (bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3fc (active_len=8, ramp_len=10, adm_len=8, perm_len=10, rotation=on) @@ -1567,12 +1847,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() (bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3fe (active_len=9, ramp_len=10, adm_len=9, perm_len=10, rotation=on) @@ -1641,12 +1937,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() (bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) @@ -1684,12 +1996,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() (bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3f8 (active_len=7, ramp_len=10, adm_len=7, perm_len=10, rotation=on) @@ -1709,12 +2037,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() *** Barring some ACCs *** @@ -1750,12 +2094,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() *** Barring one ACC *** @@ -1847,12 +2207,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() *** Barring one ACC *** @@ -1944,12 +2320,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() *** Barring one ACC *** @@ -2041,12 +2433,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() *** Barring one ACC *** @@ -2168,12 +2576,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() *** Barring one ACC *** @@ -2319,12 +2743,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() *** Barring one ACC *** @@ -2480,12 +2920,28 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_OP{DISABLED_NOTINSTALLED}: Allocated +NM_CHAN_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() *** Barring one ACC *** @@ -2547,4 +3003,12 @@ NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts0){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts1){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts2){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts3){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts4){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts5){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts6){DISABLED_NOTINSTALLED}: Deallocated +NM_CHAN_OP(bts0-trx0-ts7){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 dd5de46..299a9e1 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_channel_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index b49a396..5f83100 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_channel_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index ddf4429..b1df677 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_channel_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 \ diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 77d8244..2f5e7a1 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -206,9 +206,9 @@ /* 4 full rate and 4 half rate channels */ for (i = 1; i <= 6; i++) { bts->c0->ts[i].pchan_from_config = (i < 5) ? GSM_PCHAN_TCH_F : GSM_PCHAN_TCH_H; - bts->c0->ts[i].mo.nm_state.operational = NM_OPSTATE_ENABLED; - bts->c0->ts[i].mo.nm_state.availability = NM_AVSTATE_OK; - bts->c0->ts[i].mo.nm_state.administrative = NM_STATE_UNLOCKED; + bts->c0->ts[i].nm.mo.nm_state.operational = NM_OPSTATE_ENABLED; + bts->c0->ts[i].nm.mo.nm_state.availability = NM_AVSTATE_OK; + bts->c0->ts[i].nm.mo.nm_state.administrative = NM_STATE_UNLOCKED; } for (i = 0; i < ARRAY_SIZE(bts->c0->ts); i++) { diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am index f57b942..ee33fa0 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_channel_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iddc008c5737afb2fddd32c628bc5278056a64d89 Gerrit-Change-Number: 20404 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/af4cd84a/attachment.htm>