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

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: add mscpool paging tests

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33488 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: hnbgw: add mscpool paging tests ...................................................................... hnbgw: add mscpool paging tests Change-Id: If4bbd5c970108b01e8556fa7744ff627db75fb13 --- M hnbgw/HNBGW_Tests.ttcn M library/RAN_Emulation.ttcnpp M library/ranap/RANAP_Templates.ttcn 3 files changed, 172 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index b1f6cae..d2854d5 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -46,6 +46,7 @@ import from RANAP_PDU_Contents all; import from RANAP_IEs all; import from RANAP_Templates all; +import from RANAP_CodecPort all; import from RAN_Adapter all; import from RAN_Emulation all; @@ -68,6 +69,8 @@ import from L3_Templates all; import from L3_Common all; +import from SCCPasp_Types all; + const integer NUM_MSC := 4; const integer NUM_SGSN := 4; @@ -274,7 +277,10 @@ boolean expect_separate_sccp_cr, integer tx_sccp_cr_data_len, charstring pfcp_local_addr, - octetstring nas_pdu optional + octetstring nas_pdu optional, + /* local and remote SCCP addresses, used in TC_mscpool_paging_* */ + SCCP_PAR_Address sccp_addr_msc optional, + SCCP_PAR_Address sccp_addr_hnbgw optional } /* We extend: @@ -991,7 +997,9 @@ expect_separate_sccp_cr := expect_separate_sccp_cr, tx_sccp_cr_data_len := tx_sccp_cr_data_len, pfcp_local_addr := mp_pfcp_ip_local, - nas_pdu := omit + nas_pdu := omit, + sccp_addr_msc := omit, + sccp_addr_hnbgw := omit } /* Create an Iuh connection; send InitialUE; expect it to appear on new SCCP conenction */ @@ -2287,6 +2295,109 @@ f_shutdown_helper(); } +/* Make sure that whichever MSC paged a subscriber will also get the Paging Response. Page by IMSI, which would be + * round-robined to another MSC, to make sure the Paging->Response relation is stronger than the NRI->MSC mapping. */ +friend function f_tc_mscpool_paging_imsi(charstring id, TestHdlrParams pars) runs on ConnHdlr { + f_init_handler(pars); + + var hexstring imsi := '001010000000123'H; + var RANAP_IEs.CN_DomainIndicator domain_ind; + if (pars.ps_domain) { + domain_ind := ps_domain; + } else { + domain_ind := cs_domain; + } + var template (value) RANAP_PDU paging := ts_RANAP_Paging(domain_ind, imsi_hex2oct(imsi)); + BSSAP.send(ts_RANAP_UNITDATA_req(pars.sccp_addr_hnbgw, pars.sccp_addr_msc, paging)); + /* TODO: Expect RUA ConnectionlessTransfer Paging (on all HNB). + * We could verify the Paging sent from osmo-hnbgw to RUA with some effort, + * but, this test does not care whether the Paging was forwarded to RUA or not, only that osmo-hnbgw *received* + * the Paging. In the CN pool decisions, osmo-hnbgw should match up Paging Response to an earlier Paging. + */ + + f_sleep(1.0); + + /* Despite the round robin pointing at the second MSC ('roundrobin next msc 1'), the earlier Paging for the same IMSI + * causes this Paging Response to go to the first MSC ('msc 0'). */ + f_perform_compl_l3(f_gen_one_compl_l3(PAGRESP, ts_MI_IMSI_LV(imsi))); + f_sleep(1.0); +} + +testcase TC_mscpool_paging_imsi() runs on test_CT { + f_init(nr_msc := 3); + f_sleep(1.0); + + var boolean ps_domain := false; + + /* Testing a Paging on the first MSC to get a Paging Response back to the first MSC. Set round robin to the + * second MSC to make sure we're getting the Paging logic, not a coincidental round robin match. */ + f_vty_set_roundrobin_next(HNBGWVTY, ps_domain, 0); + + f_ctrs_cn_init(ps_domain := ps_domain); + + var ConnHdlr vc_conn1; + var template (value) TestHdlrParams pars1 := t_pars(0, ps_domain := ps_domain, cn_nr := 0); + pars1.sccp_addr_hnbgw := g_cn[valueof(pars1.cn_idx)].sccp_addr_peer; + pars1.sccp_addr_msc := g_cn[valueof(pars1.cn_idx)].sccp_addr_own; + vc_conn1 := f_start_handler_with_pars(refers(f_tc_mscpool_paging_imsi), pars1); + vc_conn1.done; + f_ctrs_cn_expect(0, "cnpool:subscr:paged"); + f_shutdown_helper(); +} + +/* Make sure that whichever MSC paged a subscriber will also get the Paging Response. Page by TMSI with an NRI value + * that matches a different MSC, to make sure the Paging->Response relation is stronger than the NRI->MSC mapping. */ +friend function f_tc_mscpool_paging_tmsi(charstring id, TestHdlrParams pars) runs on ConnHdlr { + f_init_handler(pars); + + var hexstring imsi := '001010000000124'H; + var integer nri_v := 300; /* <-- second MSC's NRI */ + var octetstring tmsi := f_gen_tmsi(suffix := 0, nri_v := nri_v); + + var RANAP_IEs.CN_DomainIndicator domain_ind; + if (pars.ps_domain) { + domain_ind := ps_domain; + } else { + domain_ind := cs_domain; + } + var template (value) RANAP_PDU paging := ts_RANAP_Paging_temp_id(domain_ind, imsi_hex2oct(imsi), + ts_RANAP_TemporaryUE_ID_TMSI(tmsi)); + BSSAP.send(ts_RANAP_UNITDATA_req(pars.sccp_addr_hnbgw, pars.sccp_addr_msc, paging)); + /* TODO: Expect RUA ConnectionlessTransfer Paging (on all HNB). + * We could verify the Paging sent from osmo-hnbgw to RUA with some effort, + * but, this test does not care whether the Paging was forwarded to RUA or not, only that osmo-hnbgw *received* + * the Paging. In the CN pool decisions, osmo-hnbgw should match up Paging Response to an earlier Paging. + */ + + f_sleep(1.0); + + /* Despite the round robin pointing at the third MSC ('roundrobin next msc 2'), the earlier Paging for the same + * TMSI causes this Paging Response to go to the first MSC ('msc 0'). */ + f_perform_compl_l3(f_gen_one_compl_l3(PAGRESP, ts_MI_TMSI_NRI_LV(nri_v))); + f_sleep(1.0); +} +testcase TC_mscpool_paging_tmsi() runs on test_CT { + f_init(nr_msc := 3); + f_sleep(1.0); + + var boolean ps_domain := false; + + /* Testing a Paging on the first MSC to get a Paging Response back to the first MSC. Set round robin to the + * third MSC to make sure we're getting the Paging logic, not a coincidental round robin match. */ + f_vty_set_roundrobin_next(HNBGWVTY, ps_domain, 0); + + f_ctrs_cn_init(ps_domain := ps_domain); + + var ConnHdlr vc_conn1; + var template (value) TestHdlrParams pars1 := t_pars(0, ps_domain := ps_domain, cn_nr := 0); + pars1.sccp_addr_hnbgw := g_cn[valueof(pars1.cn_idx)].sccp_addr_peer; + pars1.sccp_addr_msc := g_cn[valueof(pars1.cn_idx)].sccp_addr_own; + vc_conn1 := f_start_handler_with_pars(refers(f_tc_mscpool_paging_tmsi), pars1); + vc_conn1.done; + f_ctrs_cn_expect(0, "cnpool:subscr:paged"); + f_shutdown_helper(); +} + /* For round-robin, skip a CN link that has 'no allow-attach' set. */ testcase TC_mscpool_no_allow_attach_round_robin() runs on test_CT { @@ -2450,6 +2561,8 @@ execute( TC_mscpool_L3Complete_by_tmsi_valid_nri_1() ); execute( TC_mscpool_L3Complete_by_tmsi_valid_nri_2() ); execute( TC_mscpool_LU_by_tmsi_from_other_PLMN() ); + execute( TC_mscpool_paging_imsi() ); + execute( TC_mscpool_paging_tmsi() ); execute( TC_mscpool_no_allow_attach_round_robin() ); execute( TC_mscpool_no_allow_attach_valid_nri() ); execute( TC_mscpool_sccp_n_pcstate_detaches_cnlink() ); diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 40929ee..25727f3 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -168,6 +168,7 @@ #endif #ifdef RAN_EMULATION_RANAP RANAP_PDU, + RANAP_N_UNITDATA_req, /* Client requests us to create SCCP Connection */ RANAP_Conn_Req, #endif @@ -969,6 +970,7 @@ var RANAP_N_DISCONNECT_ind rdisc_ind; var RANAP_Conn_Req creq; var RANAP_PDU ranap; + var RANAP_N_UNITDATA_req ranap_ud; var RAN_ConnHdlr vc_conn; var PDU_DTAP_PS_MO ps_mo; var PDU_DTAP_PS_MT ps_mt; @@ -1034,6 +1036,11 @@ RANAP.send(ts_RANAP_DATA_req(conn_id, ranap)); } + /* e.g. for Paging from virtual MSC/SGSN to SUT osmo-hnbgw */ + [] CLIENT.receive(RANAP_N_UNITDATA_req:?) -> value ranap_ud sender vc_conn { + RANAP.send(ranap_ud); + } + /* Disconnect request client -> SCCP */ [] CLIENT.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ) -> sender vc_conn { var integer conn_id := f_conn_id_by_comp(vc_conn); diff --git a/library/ranap/RANAP_Templates.ttcn b/library/ranap/RANAP_Templates.ttcn index bc56bdb..051195f 100644 --- a/library/ranap/RANAP_Templates.ttcn +++ b/library/ranap/RANAP_Templates.ttcn @@ -720,6 +720,47 @@ } } +template (value) TemporaryUE_ID ts_RANAP_TemporaryUE_ID_TMSI(octetstring tmsi) := { + tMSI := tmsi +} + +template (value) RANAP_PDU +ts_RANAP_Paging_temp_id(template (value) CN_DomainIndicator dom, template (value) IMSI imsi, + template (value) TemporaryUE_ID temp_id, + template (omit) Paging.protocolExtensions exts := omit) := { + initiatingMessage := { + procedureCode := id_Paging, + criticality := ignore, + value_ := { + paging := { + protocolIEs := { + { + id := id_CN_DomainIndicator, + criticality := ignore, + value_ := { + cN_DomainIndicator := dom + } + }, { + id := id_PermanentNAS_UE_ID, + criticality := ignore, + value_ := { + permanentNAS_UE_ID := { + iMSI := imsi + } + } + }, { + id := id_TemporaryUE_ID, + criticality := ignore, + value_ := { + temporaryUE_ID := temp_id + } + } + }, + protocolExtensions := exts + } + } + } +} /***************************************************************************************************** -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33488 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: If4bbd5c970108b01e8556fa7744ff627db75fb13 Gerrit-Change-Number: 33488 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 12 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: rua: also match on RUA Disconnect without RANAP payload

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33490 ) Change subject: rua: also match on RUA Disconnect without RANAP payload ...................................................................... rua: also match on RUA Disconnect without RANAP payload Add tr_RUA_Disconnect_opt_ranap that matches RUA Disconnect with and without RANAP payload. Use this in RUA_Emulation as_main_rua(), to trigger a RUA_Disc_Ind to the CLIENT also for Disconnect without RANAP data. Rationale: This patch exists for the line RUA.receive(RUA_Disc_Ind:?); in the TC_apply_sccp patch Ia1ff0cb56893edf045ea3cb3233882ca93445d21 In upcoming HNBGW_Tests.TC_apply_sccp, I want to test for an ungraceful RUA Disconnect, which is sent without a RANAP payload. But tr_RUA_Disconnect only matches when a RANAP Message IE is present. In consequence, RUA_Emulation ignores "empty" RUA Disconnect, and my test case cannot verify that the RUA Disconnect occurred. Fix that. Change-Id: Ia0b89e9198794d196a88040ee89bdf24f3b08ae0 --- M library/rua/RUA_Emulation.ttcn M library/rua/RUA_Templates.ttcn 2 files changed, 66 insertions(+), 3 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/rua/RUA_Emulation.ttcn b/library/rua/RUA_Emulation.ttcn index af4b8b3..a9c445e 100644 --- a/library/rua/RUA_Emulation.ttcn +++ b/library/rua/RUA_Emulation.ttcn @@ -301,13 +301,15 @@ } /* RUA -> Client: disconnect of an existing connection */ - [] RUA.receive(tr_RUA_Disconnect) -> value rua { + [] RUA.receive(tr_RUA_Disconnect_opt_ranap) -> value rua { cause := rua.initiatingMessage.value_.disconnect_.protocolIEs[2].value_.cause; context_id := rua.initiatingMessage.value_.disconnect_.protocolIEs[1].value_.context_ID; vc_conn := f_comp_by_context_id(context_id); /* send contained RANAP message to user */ - ranap_enc := rua.initiatingMessage.value_.disconnect_.protocolIEs[3].value_.rANAP_Message; - f_handle_userData_RANAP(vc_conn, dec_RANAP_PDU(ranap_enc)); + if (lengthof(rua.initiatingMessage.value_.disconnect_.protocolIEs) > 3) { + ranap_enc := rua.initiatingMessage.value_.disconnect_.protocolIEs[3].value_.rANAP_Message; + f_handle_userData_RANAP(vc_conn, dec_RANAP_PDU(ranap_enc)); + } /* notify user of disconnect */ if (CLIENT.checkstate("Connected")) { CLIENT.send(RUA_Disc_Ind:{cause}); diff --git a/library/rua/RUA_Templates.ttcn b/library/rua/RUA_Templates.ttcn index ee65412..738042e 100644 --- a/library/rua/RUA_Templates.ttcn +++ b/library/rua/RUA_Templates.ttcn @@ -231,6 +231,38 @@ } } +/* Same as tr_RUA_Disconnect() but without a ranap arg: match also a RUA Disconnect without any RANAP payload. */ +template (present) RUA_PDU +tr_RUA_Disconnect_opt_ranap(template (present) CN_DomainIndicator domain := ?, + template (present) bitstring context_id := ?, + template (present) Cause cause := ?) := { + initiatingMessage := { + procedureCode := 3, + criticality := reject, + value_ := { + disconnect_ := { + protocolIEs := { + { + id := 7, + criticality := reject, + value_ := { cN_DomainIndicator := domain } + }, { + id := 3, + criticality := reject, + value_ := { context_ID := context_id } + }, { + id := 1, + criticality := reject, + value_ := { cause := cause } + }, + * + }, + protocolExtensions := omit + } + } + } +} + /* 9.1.6 CONNECTIONLESS TRANSFER */ template (value) RUA_PDU ts_RUA_ConnectionlessTransfer(template (value) octetstring ranap_msg) := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33490 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: Ia0b89e9198794d196a88040ee89bdf24f3b08ae0 Gerrit-Change-Number: 33490 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 12 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: TC_apply_sccp()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33491 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: hnbgw: TC_apply_sccp() ...................................................................... hnbgw: TC_apply_sccp() Change-Id: Ia1ff0cb56893edf045ea3cb3233882ca93445d21 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 83 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index d2854d5..c3849b8 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -2529,6 +2529,77 @@ f_shutdown_helper(); } +private function f_vty_add_sccp_addr(TELNETasp_PT pt, charstring addr_name, charstring pc, integer cs7_nr := 0) +{ + f_vty_enter_config(pt); + f_vty_transceive(pt, "cs7 instance 0"); + f_vty_transceive(pt, "sccp-address " & addr_name); + f_vty_transceive(pt, "point-code " & pc); + f_vty_transceive(pt, "end"); +} + +private function f_vty_set_cnlink_addr(TELNETasp_PT pt, charstring cnlink_and_nr, charstring addr_name) +{ + f_vty_enter_config(pt); + f_vty_transceive(pt, cnlink_and_nr); + f_vty_transceive(pt, "remote-addr " & addr_name); + f_vty_transceive(pt, "end"); +} + +private function f_vty_apply_sccp(TELNETasp_PT pt) +{ + f_vty_enter_config(pt); + f_vty_transceive(pt, "apply sccp"); + f_vty_transceive(pt, "end"); +} + +template (present) RUA_Disc_Req tr_RUA_Disc_Req := { + ranap := ?, + cause := ? +}; + +/* With a cnlink up, change the SCCP address, and verify that it restarts upon vty 'apply sccp' */ +private function f_tc_apply_sccp(charstring id, TestHdlrParams pars) runs on ConnHdlr +{ + f_init_handler(pars); + f_perform_compl_l3(f_gen_compl3_by_domain(pars.ps_domain, 1)[0]); + + f_sleep(1.0); + f_logp(HNBGWVTY, "Changing SCCP address, don't apply yet"); + + f_vty_add_sccp_addr(HNBGWVTY, "msc-foo", "0.42.4"); + f_vty_set_cnlink_addr(HNBGWVTY, "msc 0", "msc-foo"); + + /* No effect yet, link still open both ways */ + f_sleep(1.0); + f_iuh2iu(ts_RANAP_DirectTransfer(f_rnd_octstring(10))); + f_iu2iuh(ts_RANAP_DirectTransfer(f_rnd_octstring(10))); + + f_logp(HNBGWVTY, "Apply SCCP address changes"); + f_vty_apply_sccp(HNBGWVTY); + + /* We modified the SCCP configuration, expect disconnect of UE that was active on the aborted link. */ + RUA.receive(RUA_Disc_Ind:?); + BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND); + + /* Would be nice to test reconnection on the other point-code, too. That would require another cnlink in + * osmo-stp.cfg and module parameters... */ + + f_sleep(1.0); +} +testcase TC_apply_sccp() runs on test_CT +{ + f_init(); + f_sleep(1.0); + + var ConnHdlr vc_conn; + var template (value) TestHdlrParams pars := t_pars(0); + vc_conn := f_start_handler_with_pars(refers(f_tc_apply_sccp), pars); + vc_conn.done; + + f_shutdown_helper(); +} + control { execute(TC_hnb_register()); execute(TC_hnb_register_duplicate()); @@ -2578,6 +2649,9 @@ /* Run at the end since it makes osmo-hnbgw <= 1.3.0 crash: OS#5676 */ execute(TC_hnb_reregister_reuse_sctp_assoc()); + + /* Run at the end since it messes with the SCCP config */ + execute( TC_apply_sccp() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33491 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: Ia1ff0cb56893edf045ea3cb3233882ca93445d21 Gerrit-Change-Number: 33491 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 12 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: RANAP_Templates: drop unused arg from ts_RANAP_Paging()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33487 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: RANAP_Templates: drop unused arg from ts_RANAP_Paging() ...................................................................... RANAP_Templates: drop unused arg from ts_RANAP_Paging() Change-Id: I7e4bbdba34d2f0af9044050fff19ced5ea969ae9 --- M library/ranap/RANAP_Templates.ttcn 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/ranap/RANAP_Templates.ttcn b/library/ranap/RANAP_Templates.ttcn index 7fac3a4..bc56bdb 100644 --- a/library/ranap/RANAP_Templates.ttcn +++ b/library/ranap/RANAP_Templates.ttcn @@ -661,7 +661,6 @@ template (value) RANAP_PDU ts_RANAP_Paging(template (value) CN_DomainIndicator dom, template (value) IMSI imsi, - template (omit) TemporaryUE_ID temp_id := omit, template (omit) Paging.protocolExtensions exts := omit) := { initiatingMessage := { procedureCode := id_Paging, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33487 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: I7e4bbdba34d2f0af9044050fff19ced5ea969ae9 Gerrit-Change-Number: 33487 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 12 months

1
0
0 0

[M] Change in osmo-pcu[master]: pcuif_proto: get rid of _DT, _dt (Direct TLLI)

by dexter

Attention is currently required from: osmith. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34134 ) Change subject: pcuif_proto: get rid of _DT, _dt (Direct TLLI) ...................................................................... Patch Set 1: (1 comment) File include/osmocom/pcu/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-pcu/+/34134/comment/0c633798_06bb1a41 PS1, Line 21: #define PCU_IF_MSG_DATA_CNF_DT 0x11 /* confirm (using message id) */ > I'm not sure if we need backwards compatibility here (keep the old define next to the new one)? But […] The problem here is that osmo-pcu (current master) supports both PCUIF v.11 (the one we are currently developing) and PCUIF v.10. For v.10 we still need the old defines, structs etc. We intend to keel the PCUIF v.10 support for a while. The problem are the TTCN3 tests. If we change them to use v.11, then latest will fail. What we could do though is dropping the v.10 support some hours before the new release. Unfortunately changes to PCUIF are very complicated because we must touch osmo-pcu, osmo-bts, osmo-bsc, and the testsuite for osmo-pcu and osmo-bsc. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If641b507dcb6b176109c99dce7cff2a7561364b0 Gerrit-Change-Number: 34134 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 17 Aug 2023 15:18:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 12 months

1
0
0 0

[S] Change in osmo-bts[master]: pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34105 ) Change subject: pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt ...................................................................... pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt The struct gsm_pcu_if_data_cnf_dt was added when the first experiments mit Ericsson RBS base stations were made. It is essentially a copy of gsm_pcu_if_data, where the mamber "data" was replaced with a member "msg_id" (which was originally called "tlli"). Since we didn't know back then which parameters we would still need at some later point we kept all the other parameters. However, to this day we never used the parameters below fn. Even fn was only used for logging purposes, but is now also unused. Let's remove all those unused members. (Since all removed members are at the tail of the struct, compatibility with other programs that use the PCUIF should not break.) Related: OS#5927 Change-Id: I779605858648e2a1c202c37e197a6e32e6ea3786 --- M include/osmo-bts/pcuif_proto.h 1 file changed, 24 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve dexter: Looks good to me, approved diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index 3e3d6cc..b93822d 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -91,15 +91,6 @@ struct gsm_pcu_if_data_cnf_dt { uint8_t sapi; uint32_t msg_id; - uint32_t fn; - uint16_t arfcn; - uint8_t trx_nr; - uint8_t ts_nr; - uint8_t block_nr; - int8_t rssi; - uint16_t ber10k; /* !< \brief BER in units of 0.01% */ - int16_t ta_offs_qbits; /* !< \brief Burst TA Offset in quarter bits */ - int16_t lqual_cb; /* !< \brief Link quality in centiBel */ } __attribute__ ((packed)); struct gsm_pcu_if_rts_req { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I779605858648e2a1c202c37e197a6e32e6ea3786 Gerrit-Change-Number: 34105 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 12 months

1
0
0 0

[S] Change in osmo-bts[master]: pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt

by dexter

Attention is currently required from: laforge, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34105 ) Change subject: pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt ...................................................................... Patch Set 1: Code-Review+2 (2 comments) Patchset: PS1: > a msg_id assigned by PCU is certainly enough, since it's the PCU taking care of internally keeping s […] I wonder if Ericsson really uses the TLLI as an identifier. Maybe that is only what we first assumed when we saw that it is a 4 byte identifier. As far as I remember they call it a "Mobile Identifier", so it's not explicitly said that the identifier has to be a TLLI. I have had also a look at the IMMEDIATE ASSIGNMENT SENT message. There we only get the "Mobile Identifier" back, but not the frame number or anything other that would make the confirmation more unique. So yes, we should do the actual matching in the PCU, then we can improve this from there and hand out guaranteed unique identifiers later. PS1: All the corresponding patches were ready and are merged. I think we can merge this one too, so I add +2 now. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I779605858648e2a1c202c37e197a6e32e6ea3786 Gerrit-Change-Number: 34105 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 17 Aug 2023 15:05:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 12 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34110 ) Change subject: PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt ...................................................................... PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt The record PCUIF_data_cnf_dt was added when the first experiments with Ericsson RBS base stations were made. It is essentially a copy of record PCUIF_data, where the mamber "data" was replaced with a member "msg_id" (which was originally called "tlli"). Since we didn't know back then which parameters we would still need at some later point we kept all the other parameters. However, to this day we never used the parameters below fn. Even fn was only used for logging purposes, but is now also unused. Let's remove all those unused members. (Since all removed members are at the tail of the struct, compatibility with other programs that use the PCUIF should not break.) Related: OS#5927 Change-Id: Ie17d73d4c4bf2921800f87f6d6be7c05ce3a291d --- M library/PCUIF_CodecPort.ttcn M library/PCUIF_Types.ttcn 2 files changed, 29 insertions(+), 39 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved diff --git a/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn index 6d06ad4..ff87ee9 100644 --- a/library/PCUIF_CodecPort.ttcn +++ b/library/PCUIF_CodecPort.ttcn @@ -178,7 +178,7 @@ return; } } - [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF_DT(bts_nr, 0, 0, PCU_IF_SAPI_PCH_DT))) -> value sd { + [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF_DT(bts_nr, PCU_IF_SAPI_PCH_DT))) -> value sd { if (mp_pcuif_version < 11) { setverdict(fail, "expecting tr_PCUIF_DATA_CNF in PCUIF v.10 or earlier"); mtc.stop; diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 2e3667a..2a86b54 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -106,16 +106,7 @@ type record PCUIF_data_cnf_dt { PCUIF_Sapi sapi, - OCT4 msg_id, - uint32_t fn, - uint16_t arfcn, - uint8_t trx_nr, - uint8_t ts_nr, - uint8_t block_nr, - int8_t rssi, - uint16_t ber10k, - int16_t ta_offs_qbits, - int16_t lqual_cb + OCT4 msg_id } with { variant "" }; type record PCUIF_rts_req { @@ -692,11 +683,6 @@ } template (value) PCUIF_Message ts_PCUIF_DATA_CNF_DT(template (value) uint8_t bts_nr, - template (value) uint8_t trx_nr, - template (value) uint8_t ts_nr, - template (value) uint8_t block_nr, - template (value) uint32_t fn, - template (value) uint16_t arfcn, template (value) PCUIF_Sapi sapi, template (value) OCT4 msg_id) := { msg_type := PCU_IF_MSG_DATA_CNF_DT, @@ -705,22 +691,11 @@ u := { data_cnf_dt := { sapi := sapi, - msg_id := msg_id, - fn := fn, - arfcn := arfcn, - trx_nr := trx_nr, - ts_nr := ts_nr, - block_nr := block_nr, - rssi := 0, - ber10k := 0, - ta_offs_qbits := 0, - lqual_cb := 0 + msg_id := msg_id } } } -template PCUIF_Message tr_PCUIF_DATA_CNF_DT(template uint8_t bts_nr := ?, - template uint8_t trx_nr := ?, - template uint8_t ts_nr := ?, +template PCUIF_Message tr_PCUIF_DATA_CNF_DT(template uint8_t bts_nr, template PCUIF_Sapi sapi := ?, template OCT4 msg_id := ?) := { msg_type := PCU_IF_MSG_DATA_CNF_DT, @@ -729,16 +704,7 @@ u := { data_cnf_dt := { sapi := sapi, - msg_id := msg_id, - fn := ?, - arfcn := ?, - trx_nr := trx_nr, - ts_nr := ts_nr, - block_nr := ?, - rssi := ?, - ber10k := ?, - ta_offs_qbits := ?, - lqual_cb := ? + msg_id := msg_id } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34110 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: Ie17d73d4c4bf2921800f87f6d6be7c05ce3a291d Gerrit-Change-Number: 34110 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 12 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt

by dexter

Attention is currently required from: osmith. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34110 ) Change subject: PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt ...................................................................... Patch Set 5: Code-Review+2 (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34110/comment/aa6f7c92_0857… PS3, Line 10: mit > with? :) Done Patchset: PS5: re-adding +2, just fixed the commit message -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34110 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: Ie17d73d4c4bf2921800f87f6d6be7c05ce3a291d Gerrit-Change-Number: 34110 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 17 Aug 2023 15:03:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 12 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: get rid of _DT, _dt (Direct TLLI)

by dexter

Attention is currently required from: dexter. Hello osmith, Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34138 to look at the new patch set (#5). Change subject: PCUIF_Types: get rid of _DT, _dt (Direct TLLI) ...................................................................... PCUIF_Types: get rid of _DT, _dt (Direct TLLI) Since we now no longer refer to TLLI when we mean "message ID" (msg_id), we should also remove the "_DT" / "_dt" suffix from structs and define constants and replace it with "_2" if required. Depends: osmo-pcu.git If641b507dcb6b176109c99dce7cff2a7561364b0 Related: OS#5927 Change-Id: I15e754ce3ceed92a517586a073d3e3ed008b5eef --- M bts/BTS_Tests.ttcn M library/PCUIF_CodecPort.ttcn M library/PCUIF_Types.ttcn M pcu/PCUIF_Components.ttcn 4 files changed, 53 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/34138/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34138 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: I15e754ce3ceed92a517586a073d3e3ed008b5eef Gerrit-Change-Number: 34138 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 12 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023