From ee9f02f2df6298210165e02451aade105e45dde7 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Tue, 1 Dec 2020 19:59:15 +0100 Subject: Introduce NM GPRS NSE FSM Related: OS#4870 Change-Id: I91a5f40324d5373eac885032295690cec97214a6 --- include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h | 6 +- include/osmocom/bsc/nm_common_fsm.h | 9 + include/osmocom/bsc/signal.h | 1 + src/ipaccess/Makefile.am | 2 + src/osmo-bsc/Makefile.am | 1 + src/osmo-bsc/abis_nm.c | 3 + src/osmo-bsc/bts_ipaccess_nanobts.c | 58 +++- src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c | 4 +- src/osmo-bsc/bts_sm.c | 14 + src/osmo-bsc/nm_gprs_nse_fsm.c | 371 +++++++++++++++++++++ src/utils/Makefile.am | 2 + tests/abis/Makefile.am | 1 + tests/acc/Makefile.am | 1 + tests/acc/acc_test.ok | 58 ++++ tests/bsc/Makefile.am | 1 + tests/gsm0408/Makefile.am | 1 + tests/handover/Makefile.am | 1 + tests/nanobts_omlattr/Makefile.am | 1 + tests/nanobts_omlattr/nanobts_omlattr_test.c | 2 +- 19 files changed, 516 insertions(+), 21 deletions(-) create mode 100644 src/osmo-bsc/nm_gprs_nse_fsm.c diff --git a/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h b/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h index bc7860b2d..22a8c34cb 100644 --- a/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h +++ b/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h @@ -24,8 +24,12 @@ #include #include +struct gsm_bts_sm; +struct gsm_bts; +struct gsm_bts_trx; + struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts); -struct msgb *nanobts_attr_nse_get(struct gsm_bts *bts); +struct msgb *nanobts_attr_nse_get(struct gsm_bts_sm *bts_sm); struct msgb *nanobts_attr_cell_get(struct gsm_bts *bts); struct msgb *nanobts_attr_nscv_get(struct gsm_bts *bts); struct msgb *nanobts_attr_radio_get(struct gsm_bts *bts, diff --git a/include/osmocom/bsc/nm_common_fsm.h b/include/osmocom/bsc/nm_common_fsm.h index 00031fb1e..b8b821f80 100644 --- a/include/osmocom/bsc/nm_common_fsm.h +++ b/include/osmocom/bsc/nm_common_fsm.h @@ -82,3 +82,12 @@ enum nm_chan_op_fsm_states { NM_CHAN_ST_OP_ENABLED, }; extern struct osmo_fsm nm_chan_fsm; + +/* GPRS NSE */ +enum nm_gprs_op_nse_states { + NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED, + NM_GPRS_NSE_ST_OP_DISABLED_DEPENDENCY, + NM_GPRS_NSE_ST_OP_DISABLED_OFFLINE, + NM_GPRS_NSE_ST_OP_ENABLED, +}; +extern struct osmo_fsm nm_gprs_nse_fsm; diff --git a/include/osmocom/bsc/signal.h b/include/osmocom/bsc/signal.h index 088d4f29c..4933703a8 100644 --- a/include/osmocom/bsc/signal.h +++ b/include/osmocom/bsc/signal.h @@ -65,6 +65,7 @@ enum signal_nm { S_NM_NACK, /* GSM 12.21 various NM_MT_*_NACK happened */ S_NM_IPACC_NACK, /* GSM 12.21 nanoBTS extensions NM_MT_IPACC_*_*_NACK happened */ S_NM_IPACC_ACK, /* GSM 12.21 nanoBTS extensions NM_MT_IPACC_*_*_ACK happened */ + S_NM_IPACC_SET_ATTR_ACK,/* GSM 12.21 nanoBTS extensions NM_MT_IPACC_SET_ATTR_ACK happened */ S_NM_IPACC_RESTART_ACK, /* nanoBTS has send a restart ack */ S_NM_IPACC_RESTART_NACK,/* nanoBTS has send a restart ack */ S_NM_TEST_REP, /* GSM 12.21 Test Report */ diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index c489e0a90..e22620621 100644 --- a/src/ipaccess/Makefile.am +++ b/src/ipaccess/Makefile.am @@ -60,6 +60,7 @@ ipaccess_config_LDADD = \ $(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_gprs_nse_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(OSMO_LIBS) \ $(NULL) @@ -82,6 +83,7 @@ ipaccess_proxy_LDADD = \ $(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_gprs_nse_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 89f869d01..b1b2cc6e4 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -81,6 +81,7 @@ osmo_bsc_SOURCES = \ nm_bb_transc_fsm.c \ nm_bts_sm_fsm.c \ nm_bts_fsm.c \ + nm_gprs_nse_fsm.c \ nm_channel_fsm.c \ nm_rcarrier_fsm.c \ gsm_08_08.c \ diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 657948f8a..d837779a6 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -2922,6 +2922,9 @@ static int abis_nm_rx_ipacc(struct msgb *msg) signal.msg_type = foh->msg_type; osmo_signal_dispatch(SS_NM, S_NM_IPACC_ACK, &signal); break; + case NM_MT_IPACC_SET_ATTR_ACK: + osmo_signal_dispatch(SS_NM, S_NM_IPACC_SET_ATTR_ACK, msg); + break; default: break; } diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 73d6318de..7d0a2c050 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -46,6 +46,7 @@ #include #include #include +#include #include static int bts_model_nanobts_start(struct gsm_network *net); @@ -134,6 +135,7 @@ static int nm_statechg_event(int evt, struct nm_statechg_signal_data *nsd) struct gsm_bts_bb_trx *bb_transc; struct gsm_bts_trx_ts *ts; struct gsm_gprs_nsvc *nsvc; + struct gsm_gprs_nse *nse; struct msgb *msgb; @@ -148,6 +150,7 @@ static int nm_statechg_event(int evt, struct nm_statechg_signal_data *nsd) obj_class != NM_OC_BASEB_TRANSC && obj_class != NM_OC_RADIO_CARRIER && obj_class != NM_OC_CHANNEL && + obj_class != NM_OC_GPRS_NSE && evt != S_NM_STATECHG_OPER) return 0; @@ -174,21 +177,8 @@ static int nm_statechg_event(int evt, struct nm_statechg_signal_data *nsd) osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_STATE_CHG_REP, nsd); break; case NM_OC_GPRS_NSE: - bts_sm = container_of(obj, struct gsm_bts_sm, gprs.nse); - bts = bts_sm->bts[0]; - if (bts->gprs.mode == BTS_GPRS_NONE) - break; - if (new_state->availability == NM_AVSTATE_DEPENDENCY) { - msgb = nanobts_attr_nse_get(bts); - if (!msgb) - break; - abis_nm_ipaccess_set_attr(bts, obj_class, bts->bts_nr, - 0xff, 0xff, msgb->data, - msgb->len); - msgb_free(msgb); - abis_nm_opstart(bts, obj_class, bts->bts_nr, - 0xff, 0xff); - } + nse = obj; + osmo_fsm_inst_dispatch(nse->mo.fi, NM_EV_STATE_CHG_REP, nsd); break; case NM_OC_GPRS_CELL: bts = container_of(obj, struct gsm_bts, gprs.cell); @@ -204,8 +194,6 @@ static int nm_statechg_event(int evt, struct nm_statechg_signal_data *nsd) msgb_free(msgb); abis_nm_chg_adm_state(bts, obj_class, bts->bts_nr, 0, 0xff, NM_STATE_UNLOCKED); - abis_nm_chg_adm_state(bts, NM_OC_GPRS_NSE, bts->bts_nr, - 0xff, 0xff, NM_STATE_UNLOCKED); abis_nm_opstart(bts, obj_class, bts->bts_nr, 0, 0xff); } @@ -279,6 +267,9 @@ static int sw_activ_rep(struct msgb *mb) return -EINVAL; osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_SW_ACT_REP, NULL); break; + case NM_OC_GPRS_NSE: + osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nse.mo.fi, NM_EV_SW_ACT_REP, NULL); + break; } return 0; } @@ -325,6 +316,9 @@ static void nm_rx_opstart_ack(struct msgb *oml_msg) case NM_OC_CHANNEL: nm_rx_opstart_ack_chan(oml_msg); break; + case NM_OC_GPRS_NSE: + osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nse.mo.fi, NM_EV_OPSTART_ACK, NULL); + break; default: break; } @@ -360,6 +354,9 @@ static void nm_rx_opstart_nack(struct msgb *oml_msg) return; osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_OPSTART_NACK, NULL); break; + case NM_OC_GPRS_NSE: + osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nse.mo.fi, NM_EV_OPSTART_NACK, NULL); + break; default: break; } @@ -405,6 +402,29 @@ static void nm_rx_set_chan_attr_ack(struct msgb *oml_msg) osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_SET_ATTR_ACK, NULL); } +static void nm_rx_ipacc_set_attr_ack(struct msgb *oml_msg) +{ + struct e1inp_sign_link *sign_link = oml_msg->dst; + struct gsm_bts *bts = sign_link->trx->bts; + struct abis_om_hdr *oh = msgb_l2(oml_msg); + uint8_t idstrlen = oh->data[0]; + struct abis_om_fom_hdr *foh; + void *obj; + struct gsm_gprs_nse *nse; + + foh = (struct abis_om_fom_hdr *) (oh->data + 1 + idstrlen); + obj = gsm_objclass2obj(bts, foh->obj_class, &foh->obj_inst); + + switch (foh->obj_class) { + case NM_OC_GPRS_NSE: + nse = obj; + osmo_fsm_inst_dispatch(nse->mo.fi, NM_EV_SET_ATTR_ACK, NULL); + break; + default: + LOGPFOH(DNM, LOGL_ERROR, foh, "IPACC Set Attr Ack received on incorrect object class %d!\n", foh->obj_class); + } +} + /* 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) @@ -433,6 +453,9 @@ static int bts_ipa_nm_sig_cb(unsigned int subsys, unsigned int signal, case S_NM_SET_CHAN_ATTR_ACK: nm_rx_set_chan_attr_ack(signal_data); return 0; + case S_NM_IPACC_SET_ATTR_ACK: + nm_rx_ipacc_set_attr_ack(signal_data); + return 0; default: break; } @@ -524,6 +547,7 @@ void ipaccess_drop_oml(struct gsm_bts *bts, const char *reason) } osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_OML_DOWN, NULL); + osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nse.mo.fi, NM_EV_OML_DOWN, NULL); osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OML_DOWN, NULL); gsm_bts_all_ts_dispatch(bts, TS_EV_OML_DOWN, NULL); diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index 5ad0f47bc..e23a688e3 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -101,11 +101,11 @@ struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts) return msgb; } -struct msgb *nanobts_attr_nse_get(struct gsm_bts *bts) +struct msgb *nanobts_attr_nse_get(struct gsm_bts_sm *bts_sm) { struct msgb *msgb; uint8_t buf[256]; - struct gsm_bts_sm *bts_sm = bts->site_mgr; + struct gsm_bts *bts = gsm_bts_sm_get_bts(bts_sm); msgb = msgb_alloc(1024, "nanobts_attr_bts"); if (!msgb) return NULL; diff --git a/src/osmo-bsc/bts_sm.c b/src/osmo-bsc/bts_sm.c index a016124d9..296a21d76 100644 --- a/src/osmo-bsc/bts_sm.c +++ b/src/osmo-bsc/bts_sm.c @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -29,6 +30,11 @@ static const uint8_t bts_nse_timer_default[] = { 3, 3, 3, 3, 30, 3, 10 }; static int gsm_bts_sm_talloc_destructor(struct gsm_bts_sm *bts_sm) { + if (bts_sm->gprs.nse.mo.fi) { + osmo_fsm_inst_free(bts_sm->gprs.nse.mo.fi); + bts_sm->gprs.nse.mo.fi = NULL; + } + if (bts_sm->mo.fi) { osmo_fsm_inst_free(bts_sm->mo.fi); bts_sm->mo.fi = NULL; @@ -58,6 +64,14 @@ struct gsm_bts_sm *gsm_bts_sm_alloc(struct gsm_network *net, uint8_t bts_num) gsm_mo_init(&bts_sm->mo, bts, NM_OC_SITE_MANAGER, 0xff, 0xff, 0xff); + + bts_sm->gprs.nse.mo.fi = osmo_fsm_inst_alloc(&nm_gprs_nse_fsm, bts_sm, &bts_sm->gprs.nse, + LOGL_INFO, NULL); + osmo_fsm_inst_update_id_f(bts_sm->gprs.nse.mo.fi, "nse%d", bts_num); + gsm_mo_init(&bts_sm->gprs.nse.mo, bts, NM_OC_GPRS_NSE, bts->nr, 0xff, 0xff); + memcpy(&bts_sm->gprs.nse.timer, bts_nse_timer_default, + sizeof(bts_sm->gprs.nse.timer)); + for (i = 0; i < ARRAY_SIZE(bts_sm->gprs.nsvc); i++) { bts_sm->gprs.nsvc[i].bts = bts; bts_sm->gprs.nsvc[i].id = i; diff --git a/src/osmo-bsc/nm_gprs_nse_fsm.c b/src/osmo-bsc/nm_gprs_nse_fsm.c new file mode 100644 index 000000000..497b43ce9 --- /dev/null +++ b/src/osmo-bsc/nm_gprs_nse_fsm.c @@ -0,0 +1,371 @@ +/* NM GPRS NSE FSM */ + +/* (C) 2020 by sysmocom - s.m.f.c. GmbH + * Author: Pau Espin Pedrol + * + * 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 . + * + */ + +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#define X(s) (1 << (s)) + +#define nm_gprs_nse_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_gprs_nse *nse = (struct gsm_gprs_nse *)fi->priv; + + nse->mo.set_attr_sent = false; + nse->mo.set_attr_ack_received = false; + nse->mo.adm_unlock_sent = false; + nse->mo.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_EV_SW_ACT_REP: + break; + case NM_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_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_ST_OP_ENABLED); + return; + } + switch (new_state->availability) { /* operational = DISABLED */ + case NM_AVSTATE_DEPENDENCY: + nm_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_ST_OP_DISABLED_DEPENDENCY); + return; + case NM_AVSTATE_OFF_LINE: + case NM_AVSTATE_OK: + nm_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_ST_OP_DISABLED_OFFLINE); + return; + default: + return; + } + default: + OSMO_ASSERT(0); + } +} + +static void configure_loop(struct gsm_gprs_nse *nse, struct gsm_nm_state *state, bool allow_opstart) { + struct msgb *msgb; + struct gsm_bts_sm *bts_sm = container_of(nse, struct gsm_bts_sm, gprs.nse); + struct gsm_bts *bts = gsm_bts_sm_get_bts(bts_sm); + + if (!nse->mo.set_attr_sent && !nse->mo.set_attr_ack_received) { + nse->mo.set_attr_sent = true; + msgb = nanobts_attr_nse_get(bts_sm); + abis_nm_ipaccess_set_attr(bts, NM_OC_GPRS_NSE, bts->bts_nr, + 0xff, 0xff, msgb->data, + msgb->len); + msgb_free(msgb); + } + + /* Attributes must be set before unlocking */ + if (state->administrative != NM_STATE_UNLOCKED && nse->mo.set_attr_ack_received && + !nse->mo.adm_unlock_sent) { + nse->mo.adm_unlock_sent = true; + abis_nm_chg_adm_state(bts, NM_OC_GPRS_NSE, + bts->bts_nr, 0xff, 0xff, + NM_STATE_UNLOCKED); + } + + if (allow_opstart && state->administrative == NM_STATE_UNLOCKED && + nse->mo.set_attr_ack_received) { + if (!nse->mo.opstart_sent) { + nse->mo.opstart_sent = true; + abis_nm_opstart(bts, NM_OC_GPRS_NSE, bts->bts_nr, 0xff, 0xff); + } + } +} + +static void st_op_disabled_dependency_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_gprs_nse *nse = (struct gsm_gprs_nse *)fi->priv; + struct gsm_bts_sm *bts_sm = container_of(nse, struct gsm_bts_sm, gprs.nse); + + /* 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 (bts_sm->peer_has_no_avstate_offline) { + nm_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_ST_OP_DISABLED_OFFLINE); + return; + } + configure_loop(nse, &nse->mo.nm_state, false); +} + +static void st_op_disabled_dependency(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gsm_gprs_nse *nse = (struct gsm_gprs_nse *)fi->priv; + struct nm_statechg_signal_data *nsd; + struct gsm_nm_state *new_state; + + switch (event) { + case NM_EV_SET_ATTR_ACK: + nse->mo.set_attr_ack_received = true; + nse->mo.set_attr_sent = false; + configure_loop(nse, &nse->mo.nm_state, false); + return; + case NM_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_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_ST_OP_ENABLED); + return; + } + switch (new_state->availability) { /* operational = DISABLED */ + case NM_AVSTATE_NOT_INSTALLED: + case NM_AVSTATE_POWER_OFF: + nm_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED); + return; + case NM_AVSTATE_OFF_LINE: + case NM_AVSTATE_OK: + nm_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_ST_OP_DISABLED_OFFLINE); + return; + case NM_AVSTATE_DEPENDENCY: + configure_loop(nse, 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_gprs_nse *nse = (struct gsm_gprs_nse *)fi->priv; + + /* Warning: In here we may be acessing an state older than new_state + from prev (syncrhonous) FSM state */ + configure_loop(nse, &nse->mo.nm_state, true); +} + +static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gsm_gprs_nse *nse = (struct gsm_gprs_nse *)fi->priv; + struct gsm_bts_sm *bts_sm = container_of(nse, struct gsm_bts_sm, gprs.nse); + struct nm_statechg_signal_data *nsd; + struct gsm_nm_state *new_state; + + switch (event) { + case NM_EV_SET_ATTR_ACK: + nse->mo.set_attr_ack_received = true; + nse->mo.set_attr_sent = false; + configure_loop(nse, &nse->mo.nm_state, true); + return; + case NM_EV_STATE_CHG_REP: + nsd = (struct nm_statechg_signal_data *)data; + new_state = nsd->new_state; + if (new_state->operational == NM_OPSTATE_ENABLED) { + nm_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_ST_OP_ENABLED); + return; + } + switch (new_state->availability) { /* operational = DISABLED */ + case NM_AVSTATE_NOT_INSTALLED: + case NM_AVSTATE_POWER_OFF: + nm_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED); + return; + case NM_AVSTATE_DEPENDENCY: + /* There's no point in moving back to Dependency, since it's broken + and it acts actually as if it was in Offline state */ + if (!bts_sm->peer_has_no_avstate_offline) { + nm_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_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(nse, new_state, true); + } + return; + case NM_AVSTATE_OFF_LINE: + case NM_AVSTATE_OK: + configure_loop(nse, 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_gprs_nse *nse = (struct gsm_gprs_nse *)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 */ + nse->mo.opstart_sent = false; + nse->mo.adm_unlock_sent = false; + nse->mo.set_attr_ack_received = false; + nse->mo.set_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_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_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED); + return; + case NM_AVSTATE_DEPENDENCY: + nm_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_ST_OP_DISABLED_DEPENDENCY); + return; + case NM_AVSTATE_OFF_LINE: + case NM_AVSTATE_OK: + nm_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_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_gprs_nse *nse = (struct gsm_gprs_nse *)fi->priv; + struct gsm_bts_sm *bts_sm = container_of(nse, struct gsm_bts_sm, gprs.nse); + struct gsm_bts *bts = gsm_bts_sm_get_bts(bts_sm); + + switch (event) { + case NM_EV_OPSTART_ACK: + case NM_EV_OPSTART_NACK: + /* TODO: if on state OFFLINE and rx NACK, try again? */ + nse->mo.opstart_sent = false; + break; + case NM_EV_FORCE_LOCK: + nse->mo.force_rf_lock = (bool)(intptr_t)data; + abis_nm_chg_adm_state(bts, NM_OC_GPRS_NSE, + bts->bts_nr, 0xff, 0xff, + nse->mo.force_rf_lock ? NM_STATE_LOCKED : NM_STATE_UNLOCKED); + break; + case NM_EV_OML_DOWN: + nm_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED); + break; + default: + OSMO_ASSERT(0); + } +} + +static struct osmo_fsm_state nm_gprs_nse_fsm_states[] = { + [NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED] = { + .in_event_mask = + X(NM_EV_SW_ACT_REP) | + X(NM_EV_STATE_CHG_REP), + .out_state_mask = + X(NM_GPRS_NSE_ST_OP_DISABLED_DEPENDENCY) | + X(NM_GPRS_NSE_ST_OP_DISABLED_OFFLINE) | + X(NM_GPRS_NSE_ST_OP_ENABLED), + .name = "DISABLED_NOTINSTALLED", + .onenter = st_op_disabled_notinstalled_on_enter, + .action = st_op_disabled_notinstalled, + }, + [NM_GPRS_NSE_ST_OP_DISABLED_DEPENDENCY] = { + .in_event_mask = + X(NM_EV_STATE_CHG_REP) | + X(NM_EV_SET_ATTR_ACK), + .out_state_mask = + X(NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED) | + X(NM_GPRS_NSE_ST_OP_DISABLED_OFFLINE) | + X(NM_GPRS_NSE_ST_OP_ENABLED), + .name = "DISABLED_DEPENDENCY", + .onenter = st_op_disabled_dependency_on_enter, + .action = st_op_disabled_dependency, + }, + [NM_GPRS_NSE_ST_OP_DISABLED_OFFLINE] = { + .in_event_mask = + X(NM_EV_STATE_CHG_REP) | + X(NM_EV_SET_ATTR_ACK), + .out_state_mask = + X(NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED) | + X(NM_GPRS_NSE_ST_OP_DISABLED_DEPENDENCY) | + X(NM_GPRS_NSE_ST_OP_ENABLED), + .name = "DISABLED_OFFLINE", + .onenter = st_op_disabled_offline_on_enter, + .action = st_op_disabled_offline, + }, + [NM_GPRS_NSE_ST_OP_ENABLED] = { + .in_event_mask = + X(NM_EV_STATE_CHG_REP), + .out_state_mask = + X(NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED) | + X(NM_GPRS_NSE_ST_OP_DISABLED_DEPENDENCY) | + X(NM_GPRS_NSE_ST_OP_DISABLED_OFFLINE), + .name = "ENABLED", + .onenter = st_op_enabled_on_enter, + .action = st_op_enabled, + }, +}; + +struct osmo_fsm nm_gprs_nse_fsm = { + .name = "NM_GPRS_NSE_OP", + .states = nm_gprs_nse_fsm_states, + .num_states = ARRAY_SIZE(nm_gprs_nse_fsm_states), + .allstate_event_mask = + X(NM_EV_OPSTART_ACK) | + X(NM_EV_OPSTART_NACK) | + X(NM_EV_FORCE_LOCK) | + X(NM_EV_OML_DOWN), + .allstate_action = st_op_allstate, + .event_names = nm_fsm_event_names, + .log_subsys = DNM, +}; + +static __attribute__((constructor)) void nm_gprs_nse_fsm_init(void) +{ + OSMO_ASSERT(osmo_fsm_register(&nm_gprs_nse_fsm) == 0); +} diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index dfc68c5b1..57552588e 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -62,6 +62,7 @@ bs11_config_LDADD = \ $(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_gprs_nse_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ @@ -140,6 +141,7 @@ meas_json_LDADD = \ $(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_gprs_nse_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 681e35a19..daaca661c 100644 --- a/tests/abis/Makefile.am +++ b/tests/abis/Makefile.am @@ -38,6 +38,7 @@ abis_test_LDADD = \ $(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_gprs_nse_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 1536365eb..44e510799 100644 --- a/tests/acc/Makefile.am +++ b/tests/acc/Makefile.am @@ -38,6 +38,7 @@ acc_test_LDADD = \ $(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_gprs_nse_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 069ad746f..9a099f9be 100644 --- a/tests/acc/acc_test.ok +++ b/tests/acc/acc_test.ok @@ -12,6 +12,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_mgr_no_ramp() do_allowed_len_adm_loop(1) (bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3fe (active_len=9, ramp_len=10, adm_len=9, perm_len=10, rotation=on) @@ -117,6 +118,7 @@ pcu_info_update(): t2=0x03 t3=0xff, allowed: *** Barring zero ACCs *** (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) pcu_info_update(): t2=0x00 t3=0x00, allowed: 0 1 2 3 4 5 6 7 8 9 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -144,6 +146,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_mgr_manual_ramp() do_allowed_len_ramp_loop(1) (bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3fe (active_len=9, ramp_len=9, adm_len=10, perm_len=10, rotation=on) @@ -379,6 +382,7 @@ pcu_info_update(): t2=0x01 t3=0xbf, allowed: 6 9 pcu_info_update(): t2=0x03 t3=0xff, allowed: (bts=0) ACC: New ACC allowed subset 0x24c (active_len=4, ramp_len=4, adm_len=4, perm_len=4, rotation=off) pcu_info_update(): t2=0x01 t3=0xb3, allowed: 2 3 6 9 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -406,6 +410,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_mgr_rotate() *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) @@ -472,6 +477,7 @@ pcu_info_update(): t2=0x03 t3=0xfe, allowed: 0 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x001 -> 0x002 (active_len=1, ramp_len=10, adm_len=1, perm_len=9, rotation=on) pcu_info_update(): t2=0x03 t3=0xfd, allowed: 1 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -499,6 +505,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated 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) pcu_info_update(): t2=0x01 t3=0xff, allowed: 9 @@ -562,6 +569,7 @@ pcu_info_update(): t2=0x02 t3=0xff, allowed: 8 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x100 -> 0x200 (active_len=1, ramp_len=10, adm_len=1, perm_len=10, rotation=on) pcu_info_update(): t2=0x01 t3=0xff, allowed: 9 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -589,6 +597,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_mgr_rotate() *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) @@ -655,6 +664,7 @@ pcu_info_update(): t2=0x02 t3=0xfe, allowed: 0 8 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x101 -> 0x003 (active_len=2, ramp_len=10, adm_len=2, perm_len=9, rotation=on) pcu_info_update(): t2=0x03 t3=0xfc, allowed: 0 1 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -682,6 +692,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated 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) pcu_info_update(): t2=0x00 t3=0xff, allowed: 8 9 @@ -745,6 +756,7 @@ pcu_info_update(): t2=0x02 t3=0x7f, allowed: 7 8 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x180 -> 0x300 (active_len=2, ramp_len=10, adm_len=2, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0xff, allowed: 8 9 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -772,6 +784,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_mgr_rotate() *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) @@ -838,6 +851,7 @@ pcu_info_update(): t2=0x02 t3=0x7e, allowed: 0 7 8 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x181 -> 0x103 (active_len=3, ramp_len=10, adm_len=3, perm_len=9, rotation=on) pcu_info_update(): t2=0x02 t3=0xfc, allowed: 0 1 8 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -865,6 +879,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated 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) pcu_info_update(): t2=0x00 t3=0x7f, allowed: 7 8 9 @@ -928,6 +943,7 @@ pcu_info_update(): t2=0x02 t3=0x3f, allowed: 6 7 8 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x1c0 -> 0x380 (active_len=3, ramp_len=10, adm_len=3, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0x7f, allowed: 7 8 9 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -955,6 +971,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_mgr_rotate() *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) @@ -1021,6 +1038,7 @@ pcu_info_update(): t2=0x02 t3=0x3e, allowed: 0 6 7 8 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x1c1 -> 0x183 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) pcu_info_update(): t2=0x02 t3=0x7c, allowed: 0 1 7 8 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -1048,6 +1066,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated 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) pcu_info_update(): t2=0x00 t3=0x3f, allowed: 6 7 8 9 @@ -1111,6 +1130,7 @@ pcu_info_update(): t2=0x02 t3=0x1f, allowed: 5 6 7 8 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x1e0 -> 0x3c0 (active_len=4, ramp_len=10, adm_len=4, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0x3f, allowed: 6 7 8 9 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -1138,6 +1158,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_mgr_rotate() *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) @@ -1204,6 +1225,7 @@ pcu_info_update(): t2=0x02 t3=0x1e, allowed: 0 5 6 7 8 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x1e1 -> 0x1c3 (active_len=5, ramp_len=10, adm_len=5, perm_len=9, rotation=on) pcu_info_update(): t2=0x02 t3=0x3c, allowed: 0 1 6 7 8 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -1231,6 +1253,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated 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) pcu_info_update(): t2=0x00 t3=0x1f, allowed: 5 6 7 8 9 @@ -1294,6 +1317,7 @@ pcu_info_update(): t2=0x02 t3=0x0f, allowed: 4 5 6 7 8 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x1f0 -> 0x3e0 (active_len=5, ramp_len=10, adm_len=5, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0x1f, allowed: 5 6 7 8 9 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -1321,6 +1345,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_mgr_rotate() *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) @@ -1387,6 +1412,7 @@ pcu_info_update(): t2=0x02 t3=0x0e, allowed: 0 4 5 6 7 8 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x1f1 -> 0x1e3 (active_len=6, ramp_len=10, adm_len=6, perm_len=9, rotation=on) pcu_info_update(): t2=0x02 t3=0x1c, allowed: 0 1 5 6 7 8 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -1414,6 +1440,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated 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) pcu_info_update(): t2=0x00 t3=0x0f, allowed: 4 5 6 7 8 9 @@ -1477,6 +1504,7 @@ pcu_info_update(): t2=0x02 t3=0x07, allowed: 3 4 5 6 7 8 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x1f8 -> 0x3f0 (active_len=6, ramp_len=10, adm_len=6, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0x0f, allowed: 4 5 6 7 8 9 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -1504,6 +1532,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_mgr_rotate() *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) @@ -1570,6 +1599,7 @@ pcu_info_update(): t2=0x02 t3=0x06, allowed: 0 3 4 5 6 7 8 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x1f9 -> 0x1f3 (active_len=7, ramp_len=10, adm_len=7, perm_len=9, rotation=on) pcu_info_update(): t2=0x02 t3=0x0c, allowed: 0 1 4 5 6 7 8 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -1597,6 +1627,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated 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) pcu_info_update(): t2=0x00 t3=0x07, allowed: 3 4 5 6 7 8 9 @@ -1660,6 +1691,7 @@ pcu_info_update(): t2=0x02 t3=0x03, allowed: 2 3 4 5 6 7 8 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x1fc -> 0x3f8 (active_len=7, ramp_len=10, adm_len=7, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0x07, allowed: 3 4 5 6 7 8 9 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -1687,6 +1719,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_mgr_rotate() *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) @@ -1753,6 +1786,7 @@ pcu_info_update(): t2=0x02 t3=0x02, allowed: 0 2 3 4 5 6 7 8 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x1fd -> 0x1fb (active_len=8, ramp_len=10, adm_len=8, perm_len=9, rotation=on) pcu_info_update(): t2=0x02 t3=0x04, allowed: 0 1 3 4 5 6 7 8 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -1780,6 +1814,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated 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) pcu_info_update(): t2=0x00 t3=0x03, allowed: 2 3 4 5 6 7 8 9 @@ -1843,6 +1878,7 @@ pcu_info_update(): t2=0x02 t3=0x01, allowed: 1 2 3 4 5 6 7 8 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x1fe -> 0x3fc (active_len=8, ramp_len=10, adm_len=8, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0x03, allowed: 2 3 4 5 6 7 8 9 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -1870,6 +1906,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated 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) pcu_info_update(): t2=0x00 t3=0x01, allowed: 1 2 3 4 5 6 7 8 9 @@ -1933,6 +1970,7 @@ pcu_info_update(): t2=0x02 t3=0x00, allowed: 0 1 2 3 4 5 6 7 8 sys={40.000000}: select() (bts=0) ACC: rotate ACC allowed active subset 0x1ff -> 0x3fe (active_len=9, ramp_len=10, adm_len=9, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0x01, allowed: 1 2 3 4 5 6 7 8 9 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -1960,6 +1998,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated 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) pcu_info_update(): t2=0x03 t3=0xff, allowed: @@ -1992,6 +2031,7 @@ pcu_info_update(): t2=0x02 t3=0x00, allowed: 0 1 2 3 4 5 6 7 8 sys={450.000000}: select() (bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) pcu_info_update(): t2=0x00 t3=0x00, allowed: 0 1 2 3 4 5 6 7 8 9 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -2019,6 +2059,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated 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) pcu_info_update(): t2=0x00 t3=0x07, allowed: 3 4 5 6 7 8 9 @@ -2033,6 +2074,7 @@ sys={10.000000}: select() (bts=0) ACC: update ACC allowed active subset 0x03f -> 0x07f (active_len=7, ramp_len=7, adm_len=7, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0x80, allowed: 0 1 2 3 4 5 6 sys={15.000000}: select() +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -2060,6 +2102,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_ramp3() *** Barring some ACCs *** (bts=0) ACC: New ACC allowed subset 0x15a (active_len=5, ramp_len=10, adm_len=10, perm_len=5, rotation=off) @@ -2090,6 +2133,7 @@ sys={40.000000}: select() (bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=9, adm_len=10, perm_len=5, rotation=off) sys={45.000000}: select() (bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=10, perm_len=5, rotation=off) +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -2117,6 +2161,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_ramp_up_rotate() *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) @@ -2203,6 +2248,7 @@ sys={2500.000000}: select() sys={2750.000000}: select() sys={3000.000000}: select() sys={3250.000000}: select() +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -2230,6 +2276,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_ramp_up_rotate() *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) @@ -2316,6 +2363,7 @@ sys={2500.000000}: select() sys={2750.000000}: select() sys={3000.000000}: select() sys={3250.000000}: select() +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -2343,6 +2391,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_ramp_up_rotate() *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) @@ -2429,6 +2478,7 @@ sys={2500.000000}: select() sys={2750.000000}: select() sys={3000.000000}: select() sys={3250.000000}: select() +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -2456,6 +2506,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_ramp_updown_rotate() *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) @@ -2572,6 +2623,7 @@ sys={6750.000000}: select(46): chan_load_avg=60 sys={7000.000000}: select(47): chan_load_avg=75 sys={7250.000000}: select(48): chan_load_avg=90 sys={7500.000000}: select(49): chan_load_avg=100 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -2599,6 +2651,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_ramp_updown_rotate() *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) @@ -2739,6 +2792,7 @@ pcu_info_update(): t2=0x03 t3=0xfc, allowed: 0 1 sys={4200.000000}: select(49): chan_load_avg=25 (bts=0) ACC: rotate ACC allowed active subset 0x003 -> 0x006 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) pcu_info_update(): t2=0x03 t3=0xf9, allowed: 1 2 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -2766,6 +2820,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_ramp_updown_rotate() *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) @@ -2916,6 +2971,7 @@ pcu_info_update(): t2=0x03 t3=0xe3, allowed: 2 3 4 sys={4200.000000}: select(49): chan_load_avg=90 (bts=0) ACC: rotate ACC allowed active subset 0x01c -> 0x038 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) pcu_info_update(): t2=0x03 t3=0xc7, allowed: 3 4 5 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated @@ -2943,6 +2999,7 @@ 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) +NM_GPRS_NSE_OP{DISABLED_NOTINSTALLED}: Allocated BTS allocation OK in test_acc_ramp_updown_rotate() *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) @@ -2999,6 +3056,7 @@ sys={11750.000000}: select(46): chan_load_avg=60 sys={12000.000000}: select(47): chan_load_avg=65 sys={12250.000000}: select(48): chan_load_avg=70 sys={12500.000000}: select(49): chan_load_avg=75 +NM_GPRS_NSE_OP(nse0){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_SM_OP(bts_sm){DISABLED_NOTINSTALLED}: Deallocated NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am index 02842eb46..770b73b47 100644 --- a/tests/bsc/Makefile.am +++ b/tests/bsc/Makefile.am @@ -52,6 +52,7 @@ bsc_test_LDADD = \ $(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_gprs_nse_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 c04a5ae46..7fb62db96 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -41,6 +41,7 @@ gsm0408_test_LDADD = \ $(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_gprs_nse_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 02fcdc141..1a75ea0c9 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -86,6 +86,7 @@ handover_test_LDADD = \ $(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_gprs_nse_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/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am index 29097b834..8bd2ba986 100644 --- a/tests/nanobts_omlattr/Makefile.am +++ b/tests/nanobts_omlattr/Makefile.am @@ -35,6 +35,7 @@ nanobts_omlattr_test_LDADD = \ $(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_gprs_nse_fsm.o \ $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index c36abc659..6e851380f 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -125,7 +125,7 @@ static void test_nanobts_attr_nse_get(struct gsm_bts *bts, uint8_t *expected) printf("Testing nanobts_attr_nse_get()...\n"); - msgb = nanobts_attr_nse_get(bts); + msgb = nanobts_attr_nse_get(bts->site_mgr); printf("result= %s\n", osmo_hexdump_nospc(msgb->data, msgb->len)); printf("expected=%s\n", osmo_hexdump_nospc(expected, msgb->len)); OSMO_ASSERT(memcmp(msgb->data, expected, msgb->len) == 0); -- cgit v1.2.3