diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-03-21 14:45:13 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-03-22 05:23:11 +0100 |
| commit | 408856088bcf376f5317803fd8d1747f8b920054 (patch) | |
| tree | 9266e5698859483ef5b359f4d6f2e3e7cdd4f109 /openbsc/tests | |
| parent | 8469818e33ef81e9f707a0c4dd13d7b91ecf83f5 (diff) | |
backport support for 3-digit MNC with leading zerosneels/mnc3
Backport the patches with the following change-ids:
osmo-bsc.git:
I5b097dbb6329f284e3b4914a744d5c3ad628f715
I8e722103344186fde118b26d8353db95a4581daa
I78f30aef7aa224b2e9db54c3a844d8f520b3aee0
I38ac98a4d25159cfd4f686efbfbaf8f00625a6d8
osmo-iuh.git:
I29ebcddd45fe3079f8883589a83cc7216a535475
Also apply change of ipac_bcch_info.cgi to struct osmo_cell_global_id in
src/ipaccess/network_listen.c, a change that appears to not have been necessary
in the new split repositories.
Related: OS#3010
Change-Id: Ibf50fd7e1ca5472d0a38fcb87c68227d6de44f42
Diffstat (limited to 'openbsc/tests')
| -rw-r--r-- | openbsc/tests/ctrl_test_runner.py | 17 | ||||
| -rw-r--r-- | openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.c | 3 |
2 files changed, 12 insertions, 8 deletions
diff --git a/openbsc/tests/ctrl_test_runner.py b/openbsc/tests/ctrl_test_runner.py index b63dd27ad..cf83fad8d 100644 --- a/openbsc/tests/ctrl_test_runner.py +++ b/openbsc/tests/ctrl_test_runner.py @@ -375,27 +375,32 @@ class TestCtrlBSC(TestCtrlBase): r = self.do_get('mcc') self.assertEquals(r['mtype'], 'GET_REPLY') self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '23') + self.assertEquals(r['value'], '023') r = self.do_set('mcc', '023') r = self.do_get('mcc') self.assertEquals(r['mtype'], 'GET_REPLY') self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '23') + self.assertEquals(r['value'], '023') def testMnc(self): r = self.do_set('mnc', '9') r = self.do_get('mnc') self.assertEquals(r['mtype'], 'GET_REPLY') self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '9') + self.assertEquals(r['value'], '09') r = self.do_set('mnc', '09') r = self.do_get('mnc') self.assertEquals(r['mtype'], 'GET_REPLY') self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '9') + self.assertEquals(r['value'], '09') + r = self.do_set('mnc', '009') + r = self.do_get('mnc') + self.assertEquals(r['mtype'], 'GET_REPLY') + self.assertEquals(r['var'], 'mnc') + self.assertEquals(r['value'], '009') def testMccMncApply(self): # Test some invalid input @@ -432,7 +437,7 @@ class TestCtrlBSC(TestCtrlBase): r = self.do_get('mnc') self.assertEquals(r['mtype'], 'GET_REPLY') self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '4') + self.assertEquals(r['value'], '04') r = self.do_get('mcc') self.assertEquals(r['mtype'], 'GET_REPLY') @@ -448,7 +453,7 @@ class TestCtrlBSC(TestCtrlBase): r = self.do_get('mnc') self.assertEquals(r['mtype'], 'GET_REPLY') self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '3') + self.assertEquals(r['value'], '03') r = self.do_get('mcc') self.assertEquals(r['mtype'], 'GET_REPLY') diff --git a/openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.c b/openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.c index ec3eb2ceb..e34b19bf1 100644 --- a/openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -210,8 +210,7 @@ int main(int argc, char **argv) bts->rach_ldavg_slots = -1; bts->c0->arfcn = 866; bts->cell_identity = 1337; - bts->network->country_code = 1; - bts->network->network_code = 1; + bts->network->plmn = (struct osmo_plmn_id){ .mcc=1, .mnc=1 }; bts->location_area_code = 1; bts->gprs.rac = 0; uint8_t attr_bts_expected[] = |