April 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: bts: Proper tear down
by pespin 11 Apr '23

11 Apr '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266 ) Change subject: bts: Proper tear down ...................................................................... bts: Proper tear down This way we stop vc_IPA_OML before stopping the main component. If we don't do this, the vc_IPA_OML is potentially receiving tons of OML messages during BTS bringup which it tries to forward to the main component. If the main component has stopped at that point, port IPA_OML_PORT is no longer active and hence vc_IPA_OML fails with a dynamic test error. Change-Id: I761ae94aa698a74bb30b8a6b1860358545f222b5 --- M bts/BTS_Tests_OML.ttcn 1 file changed, 41 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/bts/BTS_Tests_OML.ttcn b/bts/BTS_Tests_OML.ttcn index ac66c02..e3099e2 100644 --- a/bts/BTS_Tests_OML.ttcn +++ b/bts/BTS_Tests_OML.ttcn @@ -152,6 +152,11 @@ pt.send(t_SD_PCUIF(pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION, testcasename()))); } +private function f_shutdown_helper() runs on BSC_OML_CT +{ + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, pass); +} + /* Perform an "OPSTART" procedure with the speciifed MO" */ private function f_oml_opstart(template (value) OML_FOM_ObjectClass obj_class, template (value) OML_FOM_ObjectInstance obj_inst, @@ -431,6 +436,7 @@ testcase TC_oml_nothing() runs on BSC_OML_CT { f_init_oml(testcasename()); f_sleep(100.0); + f_shutdown_helper(); } /* test behavior for unsupported message discriminator */ @@ -447,6 +453,7 @@ }; f_oml_send_exp_fail_rep(mmi_pdu, "Unexpected response to MMI message"); + f_shutdown_helper(); } /* send a message of unknown/unsupported type */ @@ -455,6 +462,7 @@ var OML_PDU tx := valueof(ts_OML_MsgType(NM_MT_ESTABLISH_TEI, NM_OC_BTS, ts_OML_ObjectInstance(0, 255, 255), omit)); f_oml_send_exp_fail_rep(tx, "ESTABLISH_TEI"); + f_shutdown_helper(); } /* send message shorter than OML header length indicates */ @@ -468,6 +476,7 @@ ts_OML_ObjectInstance(0, 255, 255), ?, ?, ?); f_oml_exp_rx(exp_fail, "Failure Event Report"); + f_shutdown_helper(); } /* send message longer than OML header length indicates */ @@ -480,6 +489,7 @@ tr_OML_ChangeAdmStateACK(NM_OC_BTS, ts_OML_ObjectInstance(0, 255, 255), NM_STATE_LOCKED); f_oml_exp_rx(exp, "Change ADM State ACK"); + f_shutdown_helper(); } /* test behavior for unsupported placement (!= ONLY) */ @@ -499,6 +509,7 @@ pdu.placement := ABIS_OM_PLACEMENT_LAST; f_oml_send_exp_fail_rep(pdu, "Unexpected response to PLACEMENT_LAST"); + f_shutdown_helper(); } /* test behavior for sequence != 0 (invalid if mdisc == ONLY) */ @@ -513,6 +524,7 @@ pdu.sequence := 23; f_oml_send_exp_fail_rep(pdu, "Unexpected response to sequence != 0"); + f_shutdown_helper(); } /* test behavior for unsupported obj_class */ @@ -526,6 +538,7 @@ /* NM_NACK_OBJCLASS_INVAL */ f_oml_send_exp_nack(pdu, NM_NACK_OBJCLASS_NOTSUPP); + f_shutdown_helper(); } /* test behavior for wrong BTS number in object instance */ @@ -537,6 +550,7 @@ var OML_PDU pdu := valueof(ts_OML_ChangeAdmState(obj_class, obj_inst, NM_STATE_LOCKED)); f_oml_send_exp_nack(pdu, NM_NACK_BTSNR_UNKN); + f_shutdown_helper(); } /* test behavior for wrong TRX number in object instance */ @@ -548,6 +562,7 @@ var OML_PDU pdu := valueof(ts_OML_ChangeAdmState(obj_class, obj_inst, NM_STATE_LOCKED)); f_oml_send_exp_nack(pdu, NM_NACK_TRXNR_UNKN); + f_shutdown_helper(); } /* test behavior for wrong TS number in object instance */ @@ -559,6 +574,7 @@ var OML_PDU pdu := valueof(ts_OML_ChangeAdmState(obj_class, obj_inst, NM_STATE_LOCKED)); f_oml_send_exp_nack(pdu, NM_NACK_OBJINST_UNKN); + f_shutdown_helper(); } /* RADIO CARRIER: Test OPSTART with SET BTS ATTRIBUTES; expect ACK */ @@ -570,6 +586,7 @@ f_oml_radio_attr(0); f_oml_opstart(obj_class, obj_inst); + f_shutdown_helper(); } /* RADIO CARRIER: Test OPSTART without SET BTS ATTRIBUTES; expect NACK */ @@ -581,6 +598,7 @@ /* we are *not* setting any attributes here */ f_oml_opstart(obj_class, obj_inst, exp_fail := true); + f_shutdown_helper(); } @@ -600,6 +618,7 @@ f_oml_bts_setattr(); f_oml_opstart(obj_class, obj_inst, false, NM_OPSTATE_ENABLED); + f_shutdown_helper(); } @@ -612,6 +631,7 @@ /* we are *not* setting any attributes here */ f_oml_opstart(obj_class, obj_inst, exp_fail := true); + f_shutdown_helper(); } /* CHANNEL: Test OPSTART after SET CHANNEL ATTRIBUTES; expect ACK */ @@ -623,6 +643,7 @@ f_oml_ts_attr(trx_nr := 0, ts_nr := 1); f_oml_opstart(obj_class, obj_inst); + f_shutdown_helper(); } @@ -635,6 +656,7 @@ /* we are *not* setting any attributes here */ f_oml_opstart(obj_class, obj_inst, exp_fail := true); + f_shutdown_helper(); } /* Ensure the initial Event State Change Reports after OML connect match our expectation */ @@ -649,6 +671,7 @@ [] OML.receive(tr_OML_StateChgEvtRep(NM_OC_BTS, ts_OML_ObjectInstance(0, 255, 255), NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY)); } + f_shutdown_helper(); } /* Make sure that the IUT sends RSL Connect NACK when the remote is not reachable. */ @@ -673,6 +696,7 @@ setverdict(fail, "Timeout waiting for RSL Connect NACK"); } } + f_shutdown_helper(); } /* Make sure that the IUT forwards Container PCUIF messages between BSC and PCU */ @@ -766,7 +790,7 @@ } [] T.timeout { setverdict(fail, "Timeout waiting for ANR request on BSC inteface"); } } - setverdict(pass); + f_shutdown_helper(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266 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: I761ae94aa698a74bb30b8a6b1860358545f222b5 Gerrit-Change-Number: 32266 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts/oml: Ignore SW Activated Reports
by pespin 11 Apr '23

11 Apr '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32267 ) Change subject: bts/oml: Ignore SW Activated Reports ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32267 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: I054dc74f60edee027923f03f8e73e56b1dc11a83 Gerrit-Change-Number: 32267 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 16:38:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts: Proper tear down
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266 ) Change subject: bts: Proper tear down ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266 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: I761ae94aa698a74bb30b8a6b1860358545f222b5 Gerrit-Change-Number: 32266 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 16:29:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: si2quater: check return value of osmo_earfcn_del()
by fixeria 11 Apr '23

11 Apr '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32251 ) Change subject: si2quater: check return value of osmo_earfcn_del() ...................................................................... si2quater: check return value of osmo_earfcn_del() Change-Id: I227dad57737721c40a508f67616d9f5003bb1a3e Fixes: CID#313584 --- M src/osmo-bsc/bts_vty.c 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve msuraev: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 0ecb6d6..9ba3ac2 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -2078,7 +2078,9 @@ vty_out(vty, "%% Warning: not enough space in SI2quater (%u/%u used) for a given EARFCN %u%s", bts->si2q_count, SI2Q_MAX_NUM, arfcn, VTY_NEWLINE); - osmo_earfcn_del(e, arfcn); + + if (osmo_earfcn_del(e, arfcn) != 0) + vty_out(vty, "%% Failed to roll-back adding EARFCN %u%s", arfcn, VTY_NEWLINE); return CMD_WARNING; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I227dad57737721c40a508f67616d9f5003bb1a3e Gerrit-Change-Number: 32251 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bsc[master]: si2quater: check return value of osmo_earfcn_del()
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32251 ) Change subject: si2quater: check return value of osmo_earfcn_del() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I227dad57737721c40a508f67616d9f5003bb1a3e Gerrit-Change-Number: 32251 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 16:29:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts/oml: Repurpose test TC_ipa_rsl_connect_nack
by osmith 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269 ) Change subject: bts/oml: Repurpose test TC_ipa_rsl_connect_nack ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > This causes a segfault in osmo-bts when running against latest, as it doesn't have this patch, right […] (not resolved) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269 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: I10df611f0086d34a5482f7c8a79703938313ab3d Gerrit-Change-Number: 32269 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 16:28:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts/oml: Repurpose test TC_ipa_rsl_connect_nack
by osmith 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269 ) Change subject: bts/oml: Repurpose test TC_ipa_rsl_connect_nack ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: This causes a segfault in osmo-bts when running against latest, as it doesn't have this patch, right? https://gerrit.osmocom.org/c/osmo-bts/+/32268 So consider one of these: * backport the patch * move the test to the end * don't run the test against latest Otherwise LGTM. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269 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: I10df611f0086d34a5482f7c8a79703938313ab3d Gerrit-Change-Number: 32269 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 16:28:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: oml: Fix potential null ptr access on trx object
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32268 ) Change subject: oml: Fix potential null ptr access on trx object ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If27639ae1727fc5232e1a964a1b29f50c8805d80 Gerrit-Change-Number: 32268 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 16:28:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: bts-sysmo: Fix pinst->version filled too early
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32270 ) Change subject: bts-sysmo: Fix pinst->version filled too early ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ica53a5d852214b24de7f75b08ad7e595ce5236ee Gerrit-Change-Number: 32270 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 16:28:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: bts-sysmo: Delay marking phy_link as connected until L1 reset + got info
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32272 ) Change subject: bts-sysmo: Delay marking phy_link as connected until L1 reset + got info ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifdc791336fb8efd42f4428893f687093085af129 Gerrit-Change-Number: 32272 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 16:27:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0