Change in osmo-bsc[master]: Set all NM OML objects to Locked by default

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20399 )

Change subject: Set all NM OML objects to Locked by default
......................................................................

Set all NM OML objects to Locked by default

Before they were set with a value of 0, which had no related enum field,
but since in general all comparsions are done against NM_STATE_UNLOCKED
they also hold valid.

The major change in behavior with this patch is upon OML link down,
where gsm_bts_mo_reset() is called on all objects. This way, upon OML
re-establishment we have again all objects as Locked again, which is the
expected default value as per TS 12.21.

Change-Id: I68ae0bc51a565f903b47cf72f3e3dd6f1a2d2651
---
M src/osmo-bsc/bts_trx.c
M src/osmo-bsc/gsm_data.c
M tests/ctrl_test_runner.py
3 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  fixeria: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c
index 25a3fc7..65ff752 100644
--- a/src/osmo-bsc/bts_trx.c
+++ b/src/osmo-bsc/bts_trx.c
@@ -41,7 +41,6 @@
 
 	trx->bts = bts;
 	trx->nr = bts->num_trx++;
-	trx->mo.nm_state.administrative = NM_STATE_UNLOCKED;
 
 	gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER,
 		    bts->nr, trx->nr, 0xff);
diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index 1152783..22616f3 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -153,6 +153,7 @@
 {
 	mo->nm_state.operational = NM_OPSTATE_NULL;
 	mo->nm_state.availability = NM_AVSTATE_POWER_OFF;
+	mo->nm_state.administrative = NM_STATE_LOCKED;
 }
 
 void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts,
diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py
index 2ccbfe8..55a4ca6 100755
--- a/tests/ctrl_test_runner.py
+++ b/tests/ctrl_test_runner.py
@@ -292,7 +292,7 @@
         r = self.do_get('bts.0.rf_state')
         self.assertEqual(r['mtype'], 'GET_REPLY')
         self.assertEqual(r['var'], 'bts.0.rf_state')
-        self.assertEqual(r['value'], 'inoperational,unlocked,on')
+        self.assertEqual(r['value'], 'inoperational,locked,on')
 
         r = self.do_set('rf_locked', '1')
         self.assertEqual(r['mtype'], 'SET_REPLY')

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20399
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I68ae0bc51a565f903b47cf72f3e3dd6f1a2d2651
Gerrit-Change-Number: 20399
Gerrit-PatchSet: 6
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201015/7df2eb68/attachment.htm>