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

nitb: Add a test for "show network" in the python testsuite. 

Make sure that bsc_gsmnet->bsc_data->rf_ctrl is initialized for
NITB. In commit a9fae1ae66 the
conditions for the rf_ctrl was removed but it was still needed
for the NITB.

Fixes regression from:
a9fae1ae66
bsc: rf_ctrl will always be created, remove the NULL checks
This commit is contained in:
Ciaby 2014-03-06 17:20:55 +01:00 committed by Holger Hans Peter Freyther
parent 1a1463725b
commit ec6e4f8b3d
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openbsc/src/osmo-nitb/bsc_hack.c
View File

@ -38,6 +38,7 @@
#include <osmocom/core/talloc.h>
#include <openbsc/signal.h>
#include <openbsc/osmo_msc.h>
#include <openbsc/osmo_msc_data.h>
#include <openbsc/sms_queue.h>
#include <openbsc/vty.h>
#include <openbsc/bss.h>
@ -52,7 +53,6 @@
/* MCC and MNC for the Location Area Identifier */
struct gsm_network *bsc_gsmnet = 0;
static struct osmo_bsc_rf *rf_ctrl;
static const char *database_name = "hlr.sqlite3";
static const char *config_file = "openbsc.cfg";
static const char *rf_ctrl_name = NULL;
@ -298,8 +298,8 @@ int main(int argc, char **argv)
/* seed the PRNG */
srand(time(NULL));
rf_ctrl = osmo_bsc_rf_create(rf_ctrl_name, bsc_gsmnet);
if (!rf_ctrl) {
bsc_gsmnet->bsc_data->rf_ctrl = osmo_bsc_rf_create(rf_ctrl_name, bsc_gsmnet);
if (!bsc_gsmnet->bsc_data->rf_ctrl) {
fprintf(stderr, "Failed to create the RF service.\n");
exit(1);
}

8
openbsc/tests/vty_test_runner.py
View File

@ -248,6 +248,10 @@ class TestVTYNITB(TestVTYGenericBSC):
res = self.vty.command("show paging-group 0 1234567")
self.assertEquals(res, "%Paging group for IMSI 1234567 on BTS #0 is 7")
def testShowNetwork(self):
res = self.vty.command("show network")
self.assert_(res.startswith('BSC is on Country Code') >= 0)
class TestVTYBSC(TestVTYGenericBSC):
def vty_command(self):
@ -382,6 +386,10 @@ class TestVTYBSC(TestVTYGenericBSC):
res = self.vty.command("write terminal")
self.assertEquals(res.find(' timezone'), -1)
def testShowNetwork(self):
res = self.vty.command("show network")
self.assert_(res.startswith('BSC is on Country Code') >= 0)
class TestVTYNAT(TestVTYGenericBSC):
def vty_command(self):