cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

ctrl: Add command to get the current load of a BTS 

Add a command and test to see the current channel load and
available channels per BTS.

Related: SYS#798
This commit is contained in:
Holger Hans Peter Freyther 2014-12-05 12:03:24 +01:00
parent de4bbc7146
commit 5eebb7a814
2 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
openbsc/src/libbsc/bsc_ctrl_commands.c
View File

@ -25,6 +25,7 @@
#include <openbsc/gsm_data.h>
#include <openbsc/abis_nm.h>
#include <openbsc/debug.h>
#include <openbsc/chan_alloc.h>
#define CTRL_CMD_VTY_STRING(cmdname, cmdstr, dtype, element) \
CTRL_HELPER_GET_STRING(cmdname, dtype, element) \
@ -219,6 +220,57 @@ static int set_bts_si(struct ctrl_cmd *cmd, void *data)
}
CTRL_CMD_DEFINE(bts_si, "send-new-system-informations");
static int verify_bts_chan_load(struct ctrl_cmd *cmd, const char *v, void *d)
{
return 0;
}
static int get_bts_chan_load(struct ctrl_cmd *cmd, void *data)
{
int i;
struct pchan_load pl;
struct gsm_bts *bts;
const char *space = "";
bts = cmd->node;
memset(&pl, 0, sizeof(pl));
bts_chan_load(&pl, bts);
cmd->reply = talloc_strdup(cmd, "");
for (i = 0; i < ARRAY_SIZE(pl.pchan); ++i) {
const struct load_counter *lc = &pl.pchan[i];
/* These can never have user load */
if (i == GSM_PCHAN_NONE)
continue;
if (i == GSM_PCHAN_CCCH)
continue;
if (i == GSM_PCHAN_PDCH)
continue;
cmd->reply = talloc_asprintf_append(cmd->reply,
"%s%s,%u,%u",
space, gsm_pchan_name(i), lc->used, lc->total);
if (!cmd->reply)
goto error;
space = " ";
}
return CTRL_CMD_REPLY;
error:
cmd->reply = "Memory allocation failure";
return CTRL_CMD_ERROR;
}
static int set_bts_chan_load(struct ctrl_cmd *cmd, void *data)
{
cmd->reply = "Read only attribute";
return CTRL_CMD_ERROR;
}
CTRL_CMD_DEFINE(bts_chan_load, "channel-load");
/* TRX related commands below here */
CTRL_HELPER_GET_INT(trx_max_power, struct gsm_bts_trx, max_power_red);
static int verify_trx_max_power(struct ctrl_cmd *cmd, const char *value, void *_data)
@ -274,6 +326,7 @@ int bsc_base_ctrl_cmds_install(void)
rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_ci);
rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_apply_config);
rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_si);
rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_chan_load);
rc |= ctrl_cmd_install(CTRL_NODE_TRX, &cmd_trx_max_power);
rc |= ctrl_cmd_install(CTRL_NODE_TRX, &cmd_trx_arfcn);

10
openbsc/tests/ctrl_test_runner.py
View File

@ -226,6 +226,16 @@ class TestCtrlBSC(TestCtrlBase):
self.assertEquals(r['mtype'], 'ERROR')
self.assertEquals(r['error'], 'Failed to generate SI')
def testBtsChannelLoad(self):
r = self.do_set('bts.0.channel-load', '1')
self.assertEquals(r['mtype'], 'ERROR')
self.assertEquals(r['error'], 'Read only attribute')
# No RSL link so everything is 0
r = self.do_get('bts.0.channel-load')
self.assertEquals(r['mtype'], 'GET_REPLY')
self.assertEquals(r['value'], 'CCCH+SDCCH4,0,0 TCH/F,0,0 TCH/H,0,0 SDCCH8,0,0 TCH/F_PDCH,0,0')
def testTrxPowerRed(self):
r = self.do_get('bts.0.trx.0.max-power-reduction')
self.assertEquals(r['mtype'], 'GET_REPLY')