August 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: abis_om2000: move switch-case to function

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28914 ) Change subject: abis_om2000: move switch-case to function ...................................................................... abis_om2000: move switch-case to function The switch-case in update_op_state() and update_mo_state() can be split off into functions. This makes to code better readable. Change-Id: I41f0d9d0d498f6f698c2c959baac50424f5ac317 Related: OS#5634 --- M src/osmo-bsc/abis_om2000.c 1 file changed, 33 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/14/28914/1 diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index 5026b5e..903e06e 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -960,6 +960,23 @@ return NULL; } +/* Derive an OML Availability state from an OM2000 MO state */ +enum abis_nm_avail_state oml_avstate_from_om2k_mostate(uint8_t mo_state, bool has_enabled_state) +{ + switch (mo_state) { + case OM2K_MOSTATE_RESET: + return NM_AVSTATE_POWER_OFF; + case OM2K_MOSTATE_STARTED: + return has_enabled_state ? NM_AVSTATE_OFF_LINE : NM_AVSTATE_OK; + case OM2K_MOSTATE_ENABLED: + return NM_AVSTATE_OK; + case OM2K_MOSTATE_DISABLED: + return NM_AVSTATE_POWER_OFF; + default: + return NM_AVSTATE_DEGRADED; + } +} + static void update_mo_state(struct gsm_bts *bts, struct abis_om2k_mo *mo, uint8_t mo_state) { struct gsm_nm_state *nm_state = mo2nm_state(bts, mo); @@ -987,23 +1004,7 @@ break; } - switch (mo_state) { - case OM2K_MOSTATE_RESET: - nsd.new_state.availability = NM_AVSTATE_POWER_OFF; - break; - case OM2K_MOSTATE_STARTED: - nsd.new_state.availability = has_enabled_state ? NM_AVSTATE_OFF_LINE : NM_AVSTATE_OK; - break; - case OM2K_MOSTATE_ENABLED: - nsd.new_state.availability = NM_AVSTATE_OK; - break; - case OM2K_MOSTATE_DISABLED: - nsd.new_state.availability = NM_AVSTATE_POWER_OFF; - break; - default: - nsd.new_state.availability = NM_AVSTATE_DEGRADED; - break; - } + nsd.new_state.availability = oml_avstate_from_om2k_mostate(mo_state, has_enabled_state); /* Update current state before emitting signal: */ nm_state->availability = nsd.new_state.availability; @@ -1011,6 +1012,19 @@ osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd); } +/* Derive an OML Operational state from an OM2000 OP state */ +enum abis_nm_op_state oml_opstate_from_om2k_opstate(uint8_t op_state) +{ + switch (op_state) { + case 1: + return NM_OPSTATE_ENABLED; + case 0: + return NM_OPSTATE_DISABLED; + default: + return NM_OPSTATE_NULL; + } +} + static void update_op_state(struct gsm_bts *bts, const struct abis_om2k_mo *mo, uint8_t op_state) { struct gsm_nm_state *nm_state = mo2nm_state(bts, mo); @@ -1020,17 +1034,8 @@ return; new_state = *nm_state; - switch (op_state) { - case 1: - new_state.operational = NM_OPSTATE_ENABLED; - break; - case 0: - new_state.operational = NM_OPSTATE_DISABLED; - break; - default: - new_state.operational = NM_OPSTATE_NULL; - break; - } + + new_state.operational = oml_opstate_from_om2k_opstate(op_state); nm_state->operational = new_state.operational; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I41f0d9d0d498f6f698c2c959baac50424f5ac317 Gerrit-Change-Number: 28914 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: abis_om2000: duplicate nmstate of bb_trxc mo to trx mo

by dexter

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/28896 to look at the new patch set (#2). Change subject: abis_om2000: duplicate nmstate of bb_trxc mo to trx mo ...................................................................... abis_om2000: duplicate nmstate of bb_trxc mo to trx mo In OM2000 a separate bb_trxc MO does not exist to archive better compatibilty towards classic ABIS and its MOs. Let's mirror the nmstate of the BB_TRANSC MO to the RCARRIER MO in order to make it look like if it were present. Change-Id: I4611d8af16a30725308bd527098b12a356bfde9f Related: OS#5634 --- M src/osmo-bsc/abis_om2000.c 1 file changed, 74 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/96/28896/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4611d8af16a30725308bd527098b12a356bfde9f Gerrit-Change-Number: 28896 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: abis_om2000: duplicate nmstate of bb_trxc mo to trx mo

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28896 ) Change subject: abis_om2000: duplicate nmstate of bb_trxc mo to trx mo ...................................................................... Patch Set 2: (7 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/81490f9c_a5fd550b PS1, Line 9: In OM2000 a separate bb_trxc MO does not exist to archive better > "does not exit. To achive" […] Done https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/eeff464d_c1b7a070 PS1, Line 10: compatibilty towards classic ABIS and its MOs lets mirror the nmstate of > Abis […] Done File src/osmo-bsc/abis_om2000.c: https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/fb615d8f_32a6f4f2 PS1, Line 1011: switch (mo_state) { > Move this to a function: mo2nm_state(uint8_t mo_state). […] Done https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/daafb537_edba490f PS1, Line 1032: duplicate_trxc_nm_state(bts, mo); > This looks wrong, you should emit signals for both NM objects not only one? […] I am doing this in a separate function now. However, I am not sure how to set nsd.obj. What also makes me wonder is why we do not set nsd.obj_class. How does the receiving entity know the kind of object is in nsd.obj? https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/254da984_44d2cb2d PS1, Line 1058: duplicate_trxc_nm_state(bts, mo); > Same, simply explicitly set bb_transc_nm_state->operational = new_state. […] Done https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/4607e8fe_9f0f3850 PS1, Line 1059: } > Not directly related to this patch but indirectly related to have stuff working as expected: AFAICT […] I think you are correct. I have fixed this in a different patch before this one. https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/45c93bce_947b2ccd PS1, Line 2245: otfp->trx->bb_transc.mo.nm_state.administrative = NM_STATE_UNLOCKED; > Not directly related to this patch but indirectly related to have stuff working as expected: AFAICT […] I have addressed this in a different patch before this one now. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4611d8af16a30725308bd527098b12a356bfde9f Gerrit-Change-Number: 28896 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Aug 2022 15:43:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-ci[master]: obs: build nightly-asan with --enable-sanitize

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28905 ) Change subject: obs: build nightly-asan with --enable-sanitize ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ife826b2c8e1173a2faf292e76815be6f0bd0a62c Gerrit-Change-Number: 28905 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Aug 2022 15:43:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Test sending Unknown TAI List to osmo-cbc

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28893 to look at the new patch set (#3). Change subject: cbc: Test sending Unknown TAI List to osmo-cbc ...................................................................... cbc: Test sending Unknown TAI List to osmo-cbc Related: OS#4945 Change-Id: I7d8cf5e6498d03ad340b8f843ce93a20171e9fca --- M cbc/CBC_Tests.ttcn M cbc/MME_ConnectionHandler.ttcn M library/sbcap/SBC_AP_Templates.ttcn 3 files changed, 80 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/28893/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7d8cf5e6498d03ad340b8f843ce93a20171e9fca Gerrit-Change-Number: 28893 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 10 months

1
0
0 0

Change in osmo-ci[master]: obs: fix_source_format: ignore missing \n

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28904 ) Change subject: obs: fix_source_format: ignore missing \n ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7f9bb22a389a2109109f7fecd3b7ae0413fe6f5b Gerrit-Change-Number: 28904 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Aug 2022 15:42:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-ci[master]: scripts/obs: rewrite pushing source pkgs to OBS

by laforge

Attention is currently required from: osmith, pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28882 ) Change subject: scripts/obs: rewrite pushing source pkgs to OBS ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I45a555d05a9da808c0fe0145aae665f583cb80d9 Gerrit-Change-Number: 28882 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Aug 2022 15:42:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: configure: fix warning: AC_OUTPUT should be used without arguments

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28901 ) Change subject: configure: fix warning: AC_OUTPUT should be used without arguments ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I71fc8dc78b8b10628ef0533c69e42c0298fb27df Gerrit-Change-Number: 28901 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Aug 2022 15:39:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: configure: fix AC_CONFIG_MACRO_DIRS related warnings

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28900 ) Change subject: configure: fix AC_CONFIG_MACRO_DIRS related warnings ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Id9d605490c4b403b99ed54745838cc9f242030c3 Gerrit-Change-Number: 28900 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Aug 2022 15:39:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: abis_om2000: duplicate nmstate of bb_trxc mo to trx mo

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28896 ) Change subject: abis_om2000: duplicate nmstate of bb_trxc mo to trx mo ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/abis_om2000.c: https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/696788e9_b67bf637 PS1, Line 895: prin this printf shouldn't be merged -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4611d8af16a30725308bd527098b12a356bfde9f Gerrit-Change-Number: 28896 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Aug 2022 15:39:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022