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

Change in osmo-msc[master]: Add ESME-specific logging

by laforge

Attention is currently required from: pespin, msuraev. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28845 ) Change subject: Add ESME-specific logging ...................................................................... Patch Set 11: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie5ddde762350385f8d18ee1d441584a41b0290ec Gerrit-Change-Number: 28845 Gerrit-PatchSet: 11 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 19:59:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: Introduce libsmpputil

by laforge

Attention is currently required from: pespin, msuraev. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28844 ) Change subject: Introduce libsmpputil ...................................................................... Patch Set 11: (1 comment) File src/utils/Makefile.am: https://gerrit.osmocom.org/c/osmo-msc/+/28844/comment/0bed29c4_2685863e PS2, Line 32: $(top_srcdir)/src/libmsc/smpp_smsc.h \ > Done the header file is still in a [lib]msc specific sub-directory? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I61910651bc7c188dc2fb67d96189a66a47e7e8fb Gerrit-Change-Number: 28844 Gerrit-PatchSet: 11 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 19:59:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in docker-playground[master]: ttcn3-cbc: Update osmo-cbc.cfg, CBC_Tests.cfg to latest ttcn3 testsuite

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/28890 ) Change subject: ttcn3-cbc: Update osmo-cbc.cfg, CBC_Tests.cfg to latest ttcn3 testsuite ...................................................................... ttcn3-cbc: Update osmo-cbc.cfg, CBC_Tests.cfg to latest ttcn3 testsuite New changes in ttcn3 also test SBcAP and CBSP links as client mode in osmo-cbc. Related: OS#4945 Requires: osmo-ttcn3-hacks.git c832c10b28c70f244423143f133cf63aea937997 Change-Id: I14a50d3d2284ceffc0607880fecddbff2a048284 --- M ttcn3-cbc-test/CBC_Tests.cfg M ttcn3-cbc-test/osmo-cbc.cfg 2 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/28890/1 diff --git a/ttcn3-cbc-test/CBC_Tests.cfg b/ttcn3-cbc-test/CBC_Tests.cfg index 23607e2..6e7ab21 100644 --- a/ttcn3-cbc-test/CBC_Tests.cfg +++ b/ttcn3-cbc-test/CBC_Tests.cfg @@ -9,6 +9,7 @@ [TESTPORT_PARAMETERS] [MODULE_PARAMETERS] +CBC_Tests.mp_local_host := "172.18.27.100"; CBC_Tests.mp_cbc_host := "172.18.27.20"; [MAIN_CONTROLLER] diff --git a/ttcn3-cbc-test/osmo-cbc.cfg b/ttcn3-cbc-test/osmo-cbc.cfg index c97c893..fdb2011 100644 --- a/ttcn3-cbc-test/osmo-cbc.cfg +++ b/ttcn3-cbc-test/osmo-cbc.cfg @@ -32,11 +32,19 @@ sbcap local-ip 172.18.27.20 local-port 29168 - peer cbsp ttcn3-bsc + peer cbsp ttcn3-bsc-client mode server remote-port 15000 remote-ip 172.18.27.100 - peer sbcap ttcn3-mme + peer cbsp ttcn3-bsc-server + mode client + remote-port 15001 + remote-ip 172.18.27.100 + peer sbcap ttcn3-mme-client mode server remote-port 16000 remote-ip 172.18.27.100 + peer sbcap ttcn3-mme-server + mode client + remote-port 16001 + remote-ip 172.18.27.100 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I14a50d3d2284ceffc0607880fecddbff2a048284 Gerrit-Change-Number: 28890 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Add Tguard

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28888 ) Change subject: cbc: Add Tguard ...................................................................... cbc: Add Tguard Change-Id: I92b0a2ec931cefed34a33bd90cbc5c97d0aec540 --- M cbc/CBC_Tests.ttcn 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/28888/1 diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 8e7e1c5..64cf5e2 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -46,6 +46,7 @@ const integer MAX_MME := 3; type component test_CT extends CBSP_Adapter_CT, http_CT { + timer g_Tguard := 60.0; var integer g_num_bsc; var integer g_num_mme; var BSC_ConnHdlr g_vc_conn_BSC[MAX_BSC]; @@ -68,6 +69,15 @@ mtc.stop; } +/* altstep for the global guard timer */ +private altstep as_Tguard() runs on test_CT { + [] g_Tguard.timeout { + setverdict(fail, "Tguard timeout"); + all component.stop; + mtc.stop; + } +} + /* * BSC Conn Handler: */ @@ -151,7 +161,11 @@ } } -function f_start() runs on test_CT { +function f_start(float t_guard := 60.0) runs on test_CT { + /* Start guard timer and activate it as default */ + g_Tguard.start(t_guard); + activate(as_Tguard()); + for (var integer i := 0; i < g_num_bsc; i := i + 1) { f_start_bsc(i, testcasename(), g_pars_BSC[i]); } @@ -195,7 +209,7 @@ testcase TC_rx_keepalive_timeout() runs on test_CT { f_init(num_bsc := 1); g_pars_BSC[0].start_fn := refers(f_bsc_TC_rx_keepalive_timeout); - f_start(); + f_start(t_guard := 100.0); f_shutdown_helper(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28888 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: I92b0a2ec931cefed34a33bd90cbc5c97d0aec540 Gerrit-Change-Number: 28888 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Support mme/bsc sctp/tcp server mode

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28889 ) Change subject: cbc: Support mme/bsc sctp/tcp server mode ...................................................................... cbc: Support mme/bsc sctp/tcp server mode Related: OS#4945 Change-Id: I9fa4ddfa18ac85644f219874e6b2166e1795e3a9 --- M cbc/BSC_ConnectionHandler.ttcn M cbc/CBC_Tests.ttcn M cbc/CBS_Message.ttcn M cbc/MME_ConnectionHandler.ttcn M library/CBSP_Adapter.ttcn M library/sbcap/SBC_AP_Adapter.ttcn 6 files changed, 166 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/28889/1 diff --git a/cbc/BSC_ConnectionHandler.ttcn b/cbc/BSC_ConnectionHandler.ttcn index ec86f01..a8601a6 100644 --- a/cbc/BSC_ConnectionHandler.ttcn +++ b/cbc/BSC_ConnectionHandler.ttcn @@ -25,15 +25,23 @@ type function void_fn() runs on BSC_ConnHdlr; +/* Coordinate with test_CT: */ +type port BSC_ConnHdlr_Coord_PT message { + inout charstring; +} with { extension "internal" }; + /* this component represents a single subscriber connection */ type component BSC_ConnHdlr extends CBSP_Adapter_CT { var BSC_ConnHdlrPars g_pars; + port BSC_ConnHdlr_Coord_PT COORD; } type record BSC_ConnHdlrPars { + charstring bsc_host, integer bsc_cbsp_port, charstring cbc_host, integer cbc_cbsp_port, + boolean tcp_is_client, void_fn start_fn, CBS_Message exp_cbs_msg optional, BSSMAP_FIELD_CellIdentificationList cell_list_success optional @@ -41,7 +49,13 @@ function f_BSC_ConnHdlr_main(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { g_pars := pars; - CBSP_Adapter.f_connect(g_pars.cbc_host, g_pars.cbc_cbsp_port, "", g_pars.bsc_cbsp_port); + if (g_pars.tcp_is_client) { + CBSP_Adapter.f_connect(g_pars.cbc_host, g_pars.cbc_cbsp_port, + g_pars.bsc_host, g_pars.bsc_cbsp_port); + } else { + CBSP_Adapter.f_bind(g_pars.bsc_host, g_pars.bsc_cbsp_port); + CBSP_Adapter.f_wait_client_connect(); + } var BSSMAP_FIELD_CellIdentificationList cell_list := { cIl_allInBSS := ''O @@ -51,6 +65,7 @@ f_cbsp_send(ts_CBSP_RESTART(cell_list, CBSP_BC_MSGT_CBS, CBSP_RI_DATA_LOST)); f_cbsp_send(ts_CBSP_RESTART(cell_list, CBSP_BC_MSGT_EMERG, CBSP_RI_DATA_LOST)); as_cbsp_reset(0); + COORD.send(COORD_MSG_CONNECTED); g_pars.start_fn.apply(); } diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 64cf5e2..406baed 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -33,18 +33,38 @@ import from BSC_ConnectionHandler all; import from MME_ConnectionHandler all; +const integer MAX_BSC := 2; +const integer MAX_MME := 2; + +type record BSC_modulepar_cfg { + boolean tcp_is_client +}; +type record of BSC_modulepar_cfg BSC_modulepar_cfgs; + +type record MME_modulepar_cfg { + boolean sctp_is_client +}; +type record of MME_modulepar_cfg MME_modulepar_cfgs; + modulepar { + charstring mp_local_host := "127.0.0.2"; charstring mp_cbc_host := "127.0.0.1"; integer mp_cbc_cbsp_port := 48049; integer mp_cbc_sbcap_port := c_SBC_AP_PORT; integer mp_cbc_ecbe_port := 12345; integer mp_local_cbsp_port := 15000; integer mp_local_sbcap_port := 16000; + /* Must match osmo-cbc.cfg: */ + BSC_modulepar_cfgs mp_bsc_cfg := { + { tcp_is_client := true }, + { tcp_is_client := false } + }; + MME_modulepar_cfgs mp_mme_cfg := { + { sctp_is_client := true }, + { sctp_is_client := false } + }; }; -const integer MAX_BSC := 3; -const integer MAX_MME := 3; - type component test_CT extends CBSP_Adapter_CT, http_CT { timer g_Tguard := 60.0; var integer g_num_bsc; @@ -53,6 +73,8 @@ var MME_ConnHdlr g_vc_conn_MME[MAX_MME]; var BSC_ConnHdlrPars g_pars_BSC[MAX_BSC]; var MME_ConnHdlrPars g_pars_MME[MAX_MME]; + port BSC_ConnHdlr_Coord_PT COORD_BSC[MAX_BSC]; + port MME_ConnHdlr_Coord_PT COORD_MME[MAX_BSC]; }; private function f_shutdown_helper() runs on test_CT { @@ -84,12 +106,16 @@ private function f_BSC_ConnHdlr_start_fn_void() runs on BSC_ConnHdlr { log("Default start_fn() function called!"); } -private function f_init_pars_bsc(integer bsc_cbsp_port, charstring cbc_host, integer cbc_cbsp_port) +private function f_init_pars_bsc(charstring bsc_host, integer bsc_cbsp_port, + charstring cbc_host, integer cbc_cbsp_port, + boolean tcp_is_client) runs on test_CT return BSC_ConnHdlrPars { var BSC_ConnHdlrPars pars := { + bsc_host := bsc_host, bsc_cbsp_port := bsc_cbsp_port, cbc_host := cbc_host, cbc_cbsp_port := cbc_cbsp_port, + tcp_is_client := tcp_is_client, start_fn := refers(f_BSC_ConnHdlr_start_fn_void), exp_cbs_msg := omit, cell_list_success := omit @@ -101,7 +127,10 @@ var BSC_ConnHdlr vc_conn; id := id & "-BSC" & int2str(idx); vc_conn := BSC_ConnHdlr.create(id) alive; - g_pars_BSC[idx] := f_init_pars_bsc(mp_local_cbsp_port + idx, mp_cbc_host, mp_cbc_cbsp_port); + g_pars_BSC[idx] := f_init_pars_bsc(mp_local_host, mp_local_cbsp_port + idx, + mp_cbc_host, mp_cbc_cbsp_port, + mp_bsc_cfg[idx].tcp_is_client); + connect(self:COORD_BSC[idx], vc_conn:COORD); return vc_conn; } @@ -118,12 +147,16 @@ private function f_MME_ConnHdlr_start_fn_void() runs on MME_ConnHdlr { log("Default start_fn() function called!"); } -private function f_init_pars_mme(integer mme_sbcap_port, charstring cbc_host, integer cbc_sbcap_port) +private function f_init_pars_mme(charstring mme_host, integer mme_sbcap_port, + charstring cbc_host, integer cbc_sbcap_port, + boolean sctp_is_client) runs on test_CT return MME_ConnHdlrPars { var MME_ConnHdlrPars pars := { + mme_host := mme_host, mme_sbcap_port := mme_sbcap_port, cbc_host := cbc_host, cbc_sbcap_port := cbc_sbcap_port, + sctp_is_client := sctp_is_client, start_fn := refers(f_MME_ConnHdlr_start_fn_void), exp_cbs_msg := omit, write_replace_warning_ind_cause := omit, @@ -136,7 +169,10 @@ var MME_ConnHdlr vc_conn; id := id & "-MME" & int2str(idx); vc_conn := MME_ConnHdlr.create(id) alive; - g_pars_MME[idx] := f_init_pars_mme(mp_local_sbcap_port + idx, mp_cbc_host, mp_cbc_sbcap_port); + g_pars_MME[idx] := f_init_pars_mme(mp_local_host, mp_local_sbcap_port + idx, + mp_cbc_host, mp_cbc_sbcap_port, + mp_mme_cfg[idx].sctp_is_client); + connect(self:COORD_MME[idx], vc_conn:COORD); return vc_conn; } @@ -172,7 +208,14 @@ for (var integer i := 0; i < g_num_mme; i := i + 1) { f_start_mme(i, testcasename(), g_pars_MME[i]); } - f_sleep(2.0); /* wait all conns connected */ + + /* Now wait for conns to be ready: */ + for (var integer i := 0; i < g_num_bsc; i := i + 1) { + COORD_BSC[i].receive(COORD_MSG_CONNECTED); + } + for (var integer i := 0; i < g_num_mme; i := i + 1) { + COORD_MME[i].receive(COORD_MSG_CONNECTED); + } } /* test whether or not we receive a valid KEEP-ALIVE from the CBC */ @@ -483,6 +526,56 @@ f_shutdown_helper(); } +/* Create and delete message with BSC acting as TCP server */ +testcase TC_ecbe_create_delete_bsc_server() runs on test_CT { + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; + var template (value) CBS_Message msg := t_CBSmsg(46, 16752); + + /* The 2nd BSC is the one configured as server, but we only want to test + * that one, so initialize both but copy over config of the 2nd one to + * the first one, to start only one BSC: */ + f_init(num_bsc := 2); + g_num_bsc := 1; + g_pars_BSC[0] := g_pars_BSC[1]; + + cell_list_success := ts_BSSMAP_CIL_CI({ + ts_BSSMAP_CI_CI(50001), + ts_BSSMAP_CI_CI(50002), + ts_BSSMAP_CI_CI(50003) + }); + g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); + g_pars_BSC[0].exp_cbs_msg := valueof(msg); + g_pars_BSC[0].cell_list_success := valueof(cell_list_success); + f_start(); + f_create_and_delete(valueof(msg)); + f_shutdown_helper(); +} + +/* Create and delete message with MME acting as SCTP server */ +testcase TC_ecbe_create_delete_mme_server() runs on test_CT { + var template (value) CellId_Broadcast_List bcast_cell_id_li; + var template (value) CBS_Message msg := t_CBSmsg(48, 16752); + + /* The 2nd MME is the one configured as server, but we only want to test + * that one, so initialize both but copy over config of the 2nd one to + * the first one, to start only one MME: */ + f_init(num_bsc := 0, num_mme := 2); + g_num_mme := 1; + g_pars_MME[0] := g_pars_MME[1]; + + bcast_cell_id_li := { + ts_SBCAP_CellId_Broadcast_List_Item(ts_SBCAP_ECGI(f_enc_mcc_mnc('901'H, '70'H), 1234)), + ts_SBCAP_CellId_Broadcast_List_Item(ts_SBCAP_ECGI(f_enc_mcc_mnc('901'H, '70'H), 5678)) + }; + g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); + g_pars_MME[0].exp_cbs_msg := valueof(msg); + g_pars_MME[0].write_replace_warning_ind_cause := SBC_AP_Cause_message_accepted; + g_pars_MME[0].bcast_cell_id_list := valueof(bcast_cell_id_li); + f_start(); + f_create_and_delete(valueof(msg)); + f_shutdown_helper(); +} + control { execute( TC_rx_keepalive() ); execute( TC_rx_keepalive_timeout() ); @@ -493,6 +586,8 @@ execute( TC_ecbe_create_delete_lai() ); execute( TC_ecbe_create_delete_mme_indication() ); execute( TC_ecbe_create_delete_bsc_and_mme() ); + execute( TC_ecbe_create_delete_bsc_server() ); + execute( TC_ecbe_create_delete_mme_server() ); } } diff --git a/cbc/CBS_Message.ttcn b/cbc/CBS_Message.ttcn index 6f77a1b..1ce6935 100644 --- a/cbc/CBS_Message.ttcn +++ b/cbc/CBS_Message.ttcn @@ -17,6 +17,10 @@ import from CBSP_Types all; +/* Messages used for coordination between handlers and test_CT: */ +const charstring COORD_MSG_CONNECTED := "COORD_MSG_CONNECTED"; + + type record CBS_Message { uint16_t msg_id, uint16_t ser_nr, diff --git a/cbc/MME_ConnectionHandler.ttcn b/cbc/MME_ConnectionHandler.ttcn index fec358c..ed0502e 100644 --- a/cbc/MME_ConnectionHandler.ttcn +++ b/cbc/MME_ConnectionHandler.ttcn @@ -25,15 +25,23 @@ type function void_fn() runs on MME_ConnHdlr; +/* Coordinate with test_CT: */ +type port MME_ConnHdlr_Coord_PT message { + inout charstring; +} with { extension "internal" }; + /* this component represents a single subscriber connection */ type component MME_ConnHdlr extends SBC_AP_Adapter_CT { var MME_ConnHdlrPars g_pars; + port MME_ConnHdlr_Coord_PT COORD; } type record MME_ConnHdlrPars { + charstring mme_host, integer mme_sbcap_port, charstring cbc_host, integer cbc_sbcap_port, + boolean sctp_is_client, void_fn start_fn, CBS_Message exp_cbs_msg optional, SBC_AP_Cause write_replace_warning_ind_cause optional, @@ -42,7 +50,14 @@ function f_MME_ConnHdlr_main(charstring id, MME_ConnHdlrPars pars) runs on MME_ConnHdlr { g_pars := pars; - SBC_AP_Adapter.f_connect(g_pars.cbc_host, g_pars.cbc_sbcap_port, "", g_pars.mme_sbcap_port); + if (g_pars.sctp_is_client) { + SBC_AP_Adapter.f_connect(g_pars.cbc_host, g_pars.cbc_sbcap_port, + g_pars.mme_host, g_pars.mme_sbcap_port); + } else { + SBC_AP_Adapter.f_bind(g_pars.mme_host, g_pars.mme_sbcap_port); + SBC_AP_Adapter.f_wait_client_connect(); + } + COORD.send(COORD_MSG_CONNECTED); g_pars.start_fn.apply(); } diff --git a/library/CBSP_Adapter.ttcn b/library/CBSP_Adapter.ttcn index de89d58..278a2f2 100644 --- a/library/CBSP_Adapter.ttcn +++ b/library/CBSP_Adapter.ttcn @@ -77,6 +77,16 @@ f_set_tcp_segmentation(idx); } +function f_wait_client_connect(integer idx := 0) runs on CBSP_Adapter_CT { + var IPL4asp_Types.PortEvent rx_event; + CBSP[idx].receive(IPL4asp_Types.PortEvent:{connOpened:=?}) -> value rx_event { + log("Connection from ", rx_event.connOpened.remName, ":", rx_event.connOpened.remPort); + /* we want to store the client's connId, not the 'bind socket' one */ + g_cbsp_conn_id[idx] := rx_event.connOpened.connId; + } + f_set_tcp_segmentation(idx); +} + function f_cbsp_send(template (value) CBSP_PDU pdu, integer idx := 0) runs on CBSP_Adapter_CT { CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], pdu)); } diff --git a/library/sbcap/SBC_AP_Adapter.ttcn b/library/sbcap/SBC_AP_Adapter.ttcn index 3217c5e..515a723 100644 --- a/library/sbcap/SBC_AP_Adapter.ttcn +++ b/library/sbcap/SBC_AP_Adapter.ttcn @@ -77,6 +77,23 @@ g_SBC_AP_conn_id[idx] := res.connId; } +function f_wait_client_connect(integer idx := 0) runs on SBC_AP_Adapter_CT { + var IPL4asp_Types.PortEvent rx_event; + SBC_AP[idx].receive(IPL4asp_Types.PortEvent:{connOpened:=?}) -> value rx_event { + log("Connection from ", rx_event.connOpened.remName, ":", rx_event.connOpened.remPort); + /* we want to store the client's connId, not the 'bind socket' one */ + g_SBC_AP_conn_id[idx] := rx_event.connOpened.connId; + } + timer Tcommup := 10.0; + Tcommup.start; + alt { + [] SBC_AP[idx].receive(tr_SctpAssocChange_COMM_UP(g_SBC_AP_conn_id[idx])) {} + [] Tcommup.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting SCTP_COMM_UP"); + } + } +} + function f_SBC_AP_send(template (value) SBC_AP_PDU pdu, integer idx := 0) runs on SBC_AP_Adapter_CT { SBC_AP[idx].send(ts_SBC_AP_Send(g_SBC_AP_conn_id[idx], pdu)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28889 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: I9fa4ddfa18ac85644f219874e6b2166e1795e3a9 Gerrit-Change-Number: 28889 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: cbsp/sbcap: Set link fsm id with peer's name

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28886 ) Change subject: cbsp/sbcap: Set link fsm id with peer's name ...................................................................... cbsp/sbcap: Set link fsm id with peer's name Otherwise the id is left unset. Change-Id: I8a6850293cbe01c66e4fb545d646d63743ddaecb --- M src/cbsp_link.c M src/sbcap_link.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/86/28886/1 diff --git a/src/cbsp_link.c b/src/cbsp_link.c index 564e134..b432aad 100644 --- a/src/cbsp_link.c +++ b/src/cbsp_link.c @@ -48,7 +48,7 @@ link->peer = peer; link->is_client = (peer->link_mode == CBC_PEER_LINK_MODE_CLIENT); - link->fi = osmo_fsm_inst_alloc(&cbsp_link_fsm, link, link, LOGL_DEBUG, NULL); + link->fi = osmo_fsm_inst_alloc(&cbsp_link_fsm, link, link, LOGL_DEBUG, peer->name); if (!link->fi) { LOGPCC(link, LOGL_ERROR, "Unable to allocate FSM\n"); talloc_free(link); diff --git a/src/sbcap_link.c b/src/sbcap_link.c index 9af842f..9cf794b 100644 --- a/src/sbcap_link.c +++ b/src/sbcap_link.c @@ -53,7 +53,7 @@ link->peer = peer; link->is_client = (peer->link_mode == CBC_PEER_LINK_MODE_CLIENT); - link->fi = osmo_fsm_inst_alloc(&sbcap_link_fsm, link, link, LOGL_DEBUG, NULL); + link->fi = osmo_fsm_inst_alloc(&sbcap_link_fsm, link, link, LOGL_DEBUG, peer->name); if (!link->fi) { LOGPSBCAPC(link, LOGL_ERROR, "Unable to allocate FSM\n"); talloc_free(link); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I8a6850293cbe01c66e4fb545d646d63743ddaecb Gerrit-Change-Number: 28886 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: cbsp/sbcap: Fail if trying to Tx on non-connected (connecting) link

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28887 ) Change subject: cbsp/sbcap: Fail if trying to Tx on non-connected (connecting) link ...................................................................... cbsp/sbcap: Fail if trying to Tx on non-connected (connecting) link This way upper layers know right away that the message could not be transmitted to that peer. Change-Id: I1d2285d18ee064fd78191765e8cb833bf5ee08a4 --- M src/cbsp_link.c M src/sbcap_link.c 2 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/87/28887/1 diff --git a/src/cbsp_link.c b/src/cbsp_link.c index b432aad..045cfa4 100644 --- a/src/cbsp_link.c +++ b/src/cbsp_link.c @@ -327,6 +327,11 @@ get_value_string(cbsp_msg_type_names, cbsp->msg_type)); talloc_free(cbsp); return -ENOLINK; + } else if (link->is_client && !osmo_stream_cli_is_connected(link->cli_conn)) { + LOGPCC(link, LOGL_NOTICE, "Cannot transmit %s: reconnecting\n", + get_value_string(cbsp_msg_type_names, cbsp->msg_type)); + talloc_free(cbsp); + return -ENOTCONN; } LOGPCC(link, LOGL_INFO, "Transmitting %s\n", diff --git a/src/sbcap_link.c b/src/sbcap_link.c index 9cf794b..be64ce7 100644 --- a/src/sbcap_link.c +++ b/src/sbcap_link.c @@ -394,6 +394,11 @@ sbcap_pdu_get_name(pdu)); rc = -ENOLINK; goto ret_free; + } else if (link->is_client && !osmo_stream_cli_is_connected(link->cli_conn)) { + LOGPSBCAPC(link, LOGL_NOTICE, "Cannot transmit msg %s: reconnecting\n", + sbcap_pdu_get_name(pdu)); + rc = -ENOTCONN; + goto ret_free; } LOGPSBCAPC(link, LOGL_INFO, "Tx msg %s\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I1d2285d18ee064fd78191765e8cb833bf5ee08a4 Gerrit-Change-Number: 28887 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: cbsp: Fix heap-use-after-free closing cli conn in connecting state

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28885 ) Change subject: cbsp: Fix heap-use-after-free closing cli conn in connecting state ...................................................................... cbsp: Fix heap-use-after-free closing cli conn in connecting state if conn is not in STREAM_CLI_STATE_CONNECTED state, it won't call disconnect_cb during osmo_stream_cli_destroy(), hence the osmo-cbc pointers holding are not nullified correctly. """ 20220801174147247 DCBSP NOTICE ttcn3-bsc-server: Disconnected. (cbsp_link.c:101) 20220801174147247 DCBSP NOTICE ttcn3-bsc-server: Reconnecting... (cbsp_link.c:102) 20220801174147247 DLINP INFO [WAIT_RECONNECT] osmo_stream_cli_reconnect(): retrying in 5 seconds... (stream.c:287) 20220801174152235 DCBSP DEBUG CBSP-Link[0x612000002c20]{RESET_PENDING}: Timeout of T3 (fsm.c:317) 20220801174152236 DCBSP DEBUG CBSP-Link[0x612000002c20]{RESET_PENDING}: timer_cb requested termination (fsm.c:327) 20220801174152236 DCBSP DEBUG CBSP-Link[0x612000002c20]{RESET_PENDING}: Terminating (cause = OSMO_FSM_TERM_TIMEOUT) (fsm.c:332) ================================================================= ==17==ERROR: AddressSanitizer: heap-use-after-free on address 0x6180000024f0 at pc 0x7fbd28a05d01 bp 0x7ffe247352b0 sp 0x7ffe247352a8 READ of size 4 at 0x6180000024f0 thread T0 #0 0x7fbd28a05d00 in osmo_stream_cli_close /tmp/libosmo-netif/src/stream.c:307 #1 0x7fbd28a0a5b3 in osmo_stream_cli_destroy /tmp/libosmo-netif/src/stream.c:714 #2 0x55c3534a0322 in cbc_cbsp_link_close /tmp/osmo-cbc/src/cbsp_link.c:356 #3 0x55c3534a16e1 in cbsp_link_fsm_cleanup /tmp/osmo-cbc/src/cbsp_link_fsm.c:199 #4 0x7fbd28bf5085 in _osmo_fsm_inst_term /tmp/libosmocore/src/fsm.c:947 #5 0x7fbd28be6881 in fsm_tmr_cb /tmp/libosmocore/src/fsm.c:332 #6 0x7fbd28bc70ab in osmo_timers_update /tmp/libosmocore/src/timer.c:269 #7 0x7fbd28bcba5b in _osmo_select_main /tmp/libosmocore/src/select.c:394 #8 0x7fbd28bcbb31 in osmo_select_main /tmp/libosmocore/src/select.c:438 #9 0x55c35348bce8 in main /tmp/osmo-cbc/src/cbc_main.c:314 #10 0x7fbd27a4cd09 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x26d09) #11 0x55c353488ce9 in _start (/usr/local/bin/osmo-cbc+0x68ce9) """ Change-Id: Ic13578e958345207892465644b5e1f28537c032d --- M src/cbsp_link.c M src/sbcap_link.c 2 files changed, 19 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/85/28885/1 diff --git a/src/cbsp_link.c b/src/cbsp_link.c index 5587f58..564e134 100644 --- a/src/cbsp_link.c +++ b/src/cbsp_link.c @@ -352,10 +352,17 @@ if (!link->conn) return; - if (link->is_client) + if (link->is_client) { osmo_stream_cli_destroy(link->cli_conn); - else + if (link->peer) + link->peer->link.cbsp = NULL; + link->cli_conn = NULL; + if (link->fi) + osmo_fsm_inst_dispatch(link->fi, CBSP_LINK_E_CMD_CLOSE, NULL); + } else { osmo_stream_srv_destroy(link->srv_conn); + /* Same as waht's done for cli is done for srv in closed_cb() */ + } } /* diff --git a/src/sbcap_link.c b/src/sbcap_link.c index 07ada0c..9af842f 100644 --- a/src/sbcap_link.c +++ b/src/sbcap_link.c @@ -420,10 +420,18 @@ if (!link->conn) return; - if (link->is_client) + if (link->is_client) { osmo_stream_cli_destroy(link->cli_conn); - else + osmo_stream_cli_destroy(link->cli_conn); + if (link->peer) + link->peer->link.sbcap = NULL; + link->cli_conn = NULL; + if (link->fi) + osmo_fsm_inst_dispatch(link->fi, SBcAP_LINK_E_CMD_CLOSE, NULL); + } else { osmo_stream_srv_destroy(link->srv_conn); + /* Same as waht's done for cli is done for srv in closed_cb() */ + } } /* -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ic13578e958345207892465644b5e1f28537c032d Gerrit-Change-Number: 28885 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: Add ESME-specific logging

by msuraev

Attention is currently required from: pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28845 ) Change subject: Add ESME-specific logging ...................................................................... Patch Set 11: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie5ddde762350385f8d18ee1d441584a41b0290ec Gerrit-Change-Number: 28845 Gerrit-PatchSet: 11 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 18:14:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: Introduce libsmpputil

by msuraev

Attention is currently required from: laforge, pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28844 ) Change subject: Introduce libsmpputil ...................................................................... Patch Set 11: (1 comment) This change is ready for review. File src/utils/Makefile.am: https://gerrit.osmocom.org/c/osmo-msc/+/28844/comment/2fdc5f1b_2931fe3f PS2, Line 32: $(top_srcdir)/src/libmsc/smpp_smsc.h \ > Given it's internal build-time optional library I don't think it's worth the effort. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I61910651bc7c188dc2fb67d96189a66a47e7e8fb Gerrit-Change-Number: 28844 Gerrit-PatchSet: 11 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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: Mon, 01 Aug 2022 18:14:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: SMPP: move read/write callbacks to libsmpputil

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28848 ) Change subject: SMPP: move read/write callbacks to libsmpputil ...................................................................... Patch Set 18: Verified+1 (1 comment) This change is ready for review. Patchset: PS18: Overriding linter as it's not a new code - just moving existing code to a proper place. Although personally I'm not a big fan of macros with flow control either. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I875eb5249004d3a960aee46c5099592d18fcaa76 Gerrit-Change-Number: 28848 Gerrit-PatchSet: 18 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 18:13:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Send Write-Replace-Warn-Ind after ACKing the request

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28883 ) Change subject: cbc: Send Write-Replace-Warn-Ind after ACKing the request ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28883 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: Ifcdcddc7dccb5439126a5fa29bb540669ed25908 Gerrit-Change-Number: 28883 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 16:08:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: test PS RAB GTP mapping

by fixeria

Attention is currently required from: neels, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818 ) Change subject: hnbgw: test PS RAB GTP mapping ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818 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: I93c4689ddc016eb4eb25f8cbdd0142936c6f972b Gerrit-Change-Number: 28818 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 16:01:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-bsc[master]: bsc_subscr_conn_fsm: fix use after free

by fixeria

Attention is currently required from: neels, pespin, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28884 ) Change subject: bsc_subscr_conn_fsm: fix use after free ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28884 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia857e3af6c17282b7e8178b6d249eb0f99ed98e3 Gerrit-Change-Number: 28884 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 15:55:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-bsc[master]: bsc_subscr_conn_fsm: fix use after free

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28884 ) Change subject: bsc_subscr_conn_fsm: fix use after free ...................................................................... bsc_subscr_conn_fsm: fix use after free In cases where the MGCP client endpoint FSM is terminating early the bsc sbscr conn FSM receives the signal GSCON_EV_FORGET_MGW_ENDPOINT, which then calls gscon_forget_mgw_endpoint(). However, this only nulls the conn->user_plane->mgw_endpoint_ci_msc struct pointer, not the others. This causes the assignment FSM to access conn->assignment.created_ci_for_msc whle trying to initiate a DLCX. We must make sure that when the MGCP client endpoint FSM dies, that all other CI pointers that reference the same CI are also set to NULL. Change-Id: Ia857e3af6c17282b7e8178b6d249eb0f99ed98e3 Related: OS#5572 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/28884/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 9af28c7..7c0c7c3 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -940,6 +940,10 @@ mgcp_client = osmo_mgcpc_ep_client(conn->user_plane.mgw_endpoint); mgcp_client_pool_put(mgcp_client); + /* Be sure that the endpoint CI we are maintaining in user_plane + * is also removed from the other locations as well. */ + gscon_forget_mgw_endpoint_ci(conn, conn->user_plane.mgw_endpoint_ci_msc); + conn->user_plane.mgw_endpoint = NULL; conn->user_plane.mgw_endpoint_ci_msc = NULL; conn->ho.created_ci_for_msc = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28884 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia857e3af6c17282b7e8178b6d249eb0f99ed98e3 Gerrit-Change-Number: 28884 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Send Write-Replace-Warn-Ind after ACKing the request

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28883 to look at the new patch set (#2). Change subject: cbc: Send Write-Replace-Warn-Ind after ACKing the request ...................................................................... cbc: Send Write-Replace-Warn-Ind after ACKing the request This way we can test how does osmo-cbc behave when receiving such message. Related: OS#4945 Change-Id: Ifcdcddc7dccb5439126a5fa29bb540669ed25908 --- M cbc/CBC_Tests.ttcn M cbc/MME_ConnectionHandler.ttcn M library/sbcap/SBC_AP_Templates.ttcn 3 files changed, 106 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/28883/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28883 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: Ifcdcddc7dccb5439126a5fa29bb540669ed25908 Gerrit-Change-Number: 28883 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

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

by osmith

Attention is currently required from: laforge, pespin, fixeria. osmith 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: (1 comment) Patchset: PS1: > Using python for this looks a bit overkill but fine :) thanks for reviewing! reasoning for using python is getting a readable trace when the script fails and argparse -- 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 14:33:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: l1sched: ensure n_bits_total is always initialized

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28866 ) Change subject: trxcon: l1sched: ensure n_bits_total is always initialized ...................................................................... trxcon: l1sched: ensure n_bits_total is always initialized Change-Id: I590cfe55365b7ad021a3d0925a0f1ea136e67125 Related: CID#205451 --- M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/sched_lchan_tchh.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c index 1a1b93d..96acf0e 100644 --- a/src/host/trxcon/src/sched_lchan_tchf.c +++ b/src/host/trxcon/src/sched_lchan_tchf.c @@ -39,7 +39,7 @@ uint32_t fn, uint8_t bid, const sbit_t *bits, const struct l1sched_meas_set *meas) { - int n_errors = -1, n_bits_total, rc; + int n_errors = -1, n_bits_total = 0, rc; sbit_t *buffer, *offset; uint8_t l2[128], *mask; size_t l2_len; diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index a8c641b..12ddc15 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -195,7 +195,7 @@ uint32_t fn, uint8_t bid, const sbit_t *bits, const struct l1sched_meas_set *meas) { - int n_errors = -1, n_bits_total, rc; + int n_errors = -1, n_bits_total = 0, rc; sbit_t *buffer, *offset; uint8_t l2[128], *mask; size_t l2_len; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I590cfe55365b7ad021a3d0925a0f1ea136e67125 Gerrit-Change-Number: 28866 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: assert *ts is not NULL in l1sched_set_lchans

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28810 ) Change subject: trxcon: assert *ts is not NULL in l1sched_set_lchans ...................................................................... trxcon: assert *ts is not NULL in l1sched_set_lchans We cannot use ts->sched as logging context because ts is NULL. Change-Id: I53b40b31f20fc9aefdfcac1406c465d226e5fde0 Related: CID#275337 --- M src/host/trxcon/src/sched_trx.c 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index 10a4c5f..af2d9b3 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -418,10 +418,7 @@ int rc = 0; /* Prevent NULL-pointer deference */ - if (ts == NULL) { - LOGP_SCHEDC(ts->sched, LOGL_ERROR, "Timeslot isn't configured\n"); - return -EINVAL; - } + OSMO_ASSERT(ts != NULL); /* Iterate over all allocated lchans */ llist_for_each_entry(lchan, &ts->lchans, list) { -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28810 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I53b40b31f20fc9aefdfcac1406c465d226e5fde0 Gerrit-Change-Number: 28810 Gerrit-PatchSet: 3 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: l1sched: ensure n_bits_total is always initialized

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28866 ) Change subject: trxcon: l1sched: ensure n_bits_total is always initialized ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I590cfe55365b7ad021a3d0925a0f1ea136e67125 Gerrit-Change-Number: 28866 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 14:32:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: WIP

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28883 ) Change subject: WIP ...................................................................... WIP Change-Id: Ifcdcddc7dccb5439126a5fa29bb540669ed25908 --- M cbc/CBC_Tests.ttcn M cbc/MME_ConnectionHandler.ttcn M library/sbcap/SBC_AP_Templates.ttcn 3 files changed, 105 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/28883/1 diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 76fc3be..f39b487 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -115,7 +115,9 @@ cbc_host := cbc_host, cbc_sbcap_port := cbc_sbcap_port, start_fn := refers(f_MME_ConnHdlr_start_fn_void), - exp_cbs_msg := omit + exp_cbs_msg := omit, + write_replace_warning_ind_cause := omit, + bcast_cell_id_list := omit }; return pars; } @@ -298,6 +300,12 @@ private function f_mme_create_and_delete() runs on MME_ConnHdlr { f_sbcap_handle_write_replace_warn_req(g_pars.exp_cbs_msg, 0); + if (ispresent(g_pars.write_replace_warning_ind_cause) and + ispresent(g_pars.bcast_cell_id_list)) { + f_sbcap_tx_write_replace_warn_ind(0, g_pars.exp_cbs_msg, + g_pars.write_replace_warning_ind_cause, + g_pars.bcast_cell_id_list) + } f_sbcap_handle_stop_warn_req(0, g_pars.exp_cbs_msg); } @@ -411,10 +419,32 @@ f_shutdown_helper(); } +/* Create and delete message with MME available. MME reports + * Write-Replace-Warning-Indication and Stop-Warning-Indication to CBC + */ +testcase TC_ecbe_create_delete_mme_indication() runs on test_CT { + var template (value) CellId_Broadcast_List bcast_cell_id_li; + var template (value) CBS_Message msg := t_CBSmsg(48, 16752); + + f_init(num_bsc := 0, num_mme := 1); + + bcast_cell_id_li := { + ts_SBCAP_CellId_Broadcast_List_Item(ts_SBCAP_ECGI(f_enc_mcc_mnc('901'H, '70'H), 1234)) + }; + g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); + g_pars_MME[0].exp_cbs_msg := valueof(msg); + g_pars_MME[0].write_replace_warning_ind_cause := SBC_AP_Cause_message_accepted; + g_pars_MME[0].bcast_cell_id_list := valueof(bcast_cell_id_li); + f_start(); + f_create_and_delete(valueof(msg)); + f_shutdown_helper(); +} + /* Create and delete message with both BSC and MME available */ testcase TC_ecbe_create_delete_bsc_and_mme() runs on test_CT { f_init(num_bsc := 1, num_mme := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; + var template (value) CellId_Broadcast_List bcast_cell_id_li; var template (value) CBS_Message msg := t_CBSmsg(43, 16752); cell_list_success := ts_BSSMAP_CIL_CGI({ @@ -425,8 +455,14 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); + + bcast_cell_id_li := { + ts_SBCAP_CellId_Broadcast_List_Item(ts_SBCAP_ECGI(f_enc_mcc_mnc('901'H, '70'H), 1234)) + }; g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); g_pars_MME[0].exp_cbs_msg := valueof(msg); + g_pars_MME[0].write_replace_warning_ind_cause := SBC_AP_Cause_message_accepted; + g_pars_MME[0].bcast_cell_id_list := valueof(bcast_cell_id_li); f_start(); f_create_and_delete(valueof(msg)); f_shutdown_helper(); @@ -440,6 +476,7 @@ execute( TC_ecbe_create_delete_lac() ); execute( TC_ecbe_create_delete_ci() ); execute( TC_ecbe_create_delete_lai() ); + execute( TC_ecbe_create_delete_mme_indication() ); execute( TC_ecbe_create_delete_bsc_and_mme() ); } diff --git a/cbc/MME_ConnectionHandler.ttcn b/cbc/MME_ConnectionHandler.ttcn index 055aaa3..fec358c 100644 --- a/cbc/MME_ConnectionHandler.ttcn +++ b/cbc/MME_ConnectionHandler.ttcn @@ -35,7 +35,9 @@ charstring cbc_host, integer cbc_sbcap_port, void_fn start_fn, - CBS_Message exp_cbs_msg optional + CBS_Message exp_cbs_msg optional, + SBC_AP_Cause write_replace_warning_ind_cause optional, + CellId_Broadcast_List bcast_cell_id_list optional }; function f_MME_ConnHdlr_main(charstring id, MME_ConnHdlrPars pars) runs on MME_ConnHdlr { @@ -53,6 +55,17 @@ f_SBC_AP_send(tx, idx); } +function f_sbcap_tx_write_replace_warn_ind(integer idx := 0, CBS_Message msg, + SBC_AP_Cause cause, + template (value) CellId_Broadcast_List bcast_cell_id_li) +runs on MME_ConnHdlr { + var template (value) SBC_AP_PDU tx; + tx := ts_SBCAP_WRITE_WARNING_IND(int2bit(msg.msg_id, 16), + int2bit(msg.ser_nr, 16), + cause, bcast_cell_id_li); + f_SBC_AP_send(tx, idx); +} + function f_sbcap_tx_stop_warn_resp(integer idx := 0, CBS_Message msg) runs on MME_ConnHdlr { var template (value) SBC_AP_PDU tx; diff --git a/library/sbcap/SBC_AP_Templates.ttcn b/library/sbcap/SBC_AP_Templates.ttcn index d5f2471..0a9519e 100644 --- a/library/sbcap/SBC_AP_Templates.ttcn +++ b/library/sbcap/SBC_AP_Templates.ttcn @@ -11,6 +11,28 @@ import from SBC_AP_Types all; +/* 3GPP TS 36.413 9.2.1.38 */ +template (value) EUTRAN_CGI ts_SBCAP_ECGI(PLMNidentity plmn_id := '09F107'O, integer cell_id := 1) := { + pLMNidentity := plmn_id, + cell_ID := int2bit(cell_id, 28), + iE_Extensions := omit +} + +/* 3GPP TS 36.413 9.2.1.54 */ +template (value) CellId_Broadcast_List_Item ts_SBCAP_CellId_Broadcast_List_Item( + template (value) EUTRAN_CGI ecgi := ts_SBCAP_ECGI()) := { + eCGI := ecgi, + iE_Extensions := omit +} +template (value) Broadcast_Scheduled_Area_List ts_SBCAP_Broadcast_Scheduled_Area_List( + template (value) CellId_Broadcast_List cell_id_li := {ts_SBCAP_CellId_Broadcast_List_Item()}) +:= { + cellId_Broadcast_List := cell_id_li, + tAI_Broadcast_List := omit, + emergencyAreaID_Broadcast_List := omit, + iE_Extensions := omit +} + template (value) SBC_AP_PDU ts_SBCAP_PWS_RESTART( template (value) Restarted_Cell_List restart_cl, @@ -190,6 +212,37 @@ } } +/* 4.3.4.2.5 WRITE REPLACE WARNING INDICATION */ +template (value) SBC_AP_PDU +ts_SBCAP_WRITE_WARNING_IND(template (value) BIT16 p_msg_id, template (value) BIT16 p_ser_nr, + template (value) SBC_AP_Cause cause := SBC_AP_Cause_message_accepted, + template (value) CellId_Broadcast_List bcast_cell_id_li := {ts_SBCAP_CellId_Broadcast_List_Item()}) := { + initiatingMessage := { + procedureCode := id_Write_Replace_Warning_Indication, + criticality := ignore, + value_ := { + write_Replace_Warning_Indication := { + protocolIEs := { + { + id := SBC_AP_Constants.id_Message_Identifier, + criticality := reject, + value_ := { Message_Identifier := p_msg_id } + }, { + id := SBC_AP_Constants.id_Serial_Number, + criticality := reject, + value_ := { Serial_Number := p_ser_nr } + }, { + id := SBC_AP_Constants.id_Broadcast_Scheduled_Area_List, + criticality := reject, + value_ := { broadcast_Scheduled_Area_List := ts_SBCAP_Broadcast_Scheduled_Area_List(bcast_cell_id_li) } + } + }, + protocolExtensions := omit + } + } + } +} + /* 4.3.4.2.3 STOP WARNING REQUEST */ template (value) SBC_AP_PDU ts_SBCAP_WRITE_WARNING_RESP(template (value) BIT16 p_msg_id, template (value) BIT16 p_ser_nr, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28883 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: Ifcdcddc7dccb5439126a5fa29bb540669ed25908 Gerrit-Change-Number: 28883 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

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

by pespin

Attention is currently required from: osmith, laforge, fixeria. pespin 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 14:29:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

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

by osmith

Attention is currently required from: osmith, laforge, fixeria. Hello Jenkins Builder, laforge, pespin, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/28882 to look at the new patch set (#2). Change subject: scripts/obs: rewrite pushing source pkgs to OBS ...................................................................... scripts/obs: rewrite pushing source pkgs to OBS Harald requested that the OBS scripts should not stop if building one specific source package fails, instead it should keep going and report at the end a non-success exit code. Given that the shell script code has historically grown and became hard to maintain, I decided to rewrite the scripts for implementing this feature. This rewrite solves additional problems: * No full checkout of an OBS project like network:osmocom:latest anymore, with lots of packages that won't get updated (e.g. the uhd package has a uhd-images_3.14.1.1.tar.xz file that is 108 MB). With the old code, developers had to wait minutes during the checkout before the script reaches code that is currently being developed. Now only single packages get checked out right before they get updated. * No need to clone git repositories over and over. With the new code, git repos only get cloned if needed (for latest it is not needed if the remote git tag is the same as the version in OBS). During development, the cloned git repositories are cached. * Output from commands like "git tag -l" is not written to the log unless they failed. This makes the log more readable, which is especially important when a package fails to build, we keep going and need to spot the build error in the middle of the log later on. * No more duplicated code for nightly and latest scripts that worked similar but had slight differences. Also the list of packages is not duplicated for nightly and latest anymore; nightly uses all packages and latest uses packages that have at least one git tag. * Building source packages is decoupled from uploading them. A separate script build_srcpkg.py can be used to just build the deb + rpm spec source packages, without interacting with the OBS server. * The scripts can optionally run in docker with a command-line switch, and this is used by jenkins. This way we don't need to install more dependencies on the host such as rebar3 which is now needed for erlang/osmo_dia2gsup. * Add erlang/osmo_dia2gsup and run its generate_build_dep.sh (SYS#6006) I have done the new implementation in python to make use of argparse and to be able to use try/except and print a trace when building one package fails. Example output: * https://jenkins.osmocom.org/jenkins/job/Osmocom_OBS_nightly_obs.osmocom.org… * https://jenkins.osmocom.org/jenkins/job/Osmocom_OBS_latest_obs.osmocom.org/… Change-Id: I45a555d05a9da808c0fe0145aae665f583cb80d9 --- M .gitignore M jobs/osmocom-obs.yml D scripts/common-obs-conflict.sh D scripts/common-obs.sh A scripts/obs/build_srcpkg.py A scripts/obs/data/Dockerfile A scripts/obs/data/Release.key A scripts/obs/data/rpmlintrc A scripts/obs/lib/__init__.py A scripts/obs/lib/config.py A scripts/obs/lib/debian.py A scripts/obs/lib/docker.py A scripts/obs/lib/git.py A scripts/obs/lib/metapkg.py A scripts/obs/lib/osc.py A scripts/obs/lib/rpm_spec.py A scripts/obs/lib/srcpkg.py A scripts/obs/update_obs_project.py D scripts/osmocom-latest-packages.sh D scripts/osmocom-next-packages.sh D scripts/osmocom-nightly-packages.sh 21 files changed, 1,338 insertions(+), 1,016 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/82/28882/2 -- 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: l1sched: ensure n_bits_total is always initialized

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28866 ) Change subject: trxcon: l1sched: ensure n_bits_total is always initialized ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I590cfe55365b7ad021a3d0925a0f1ea136e67125 Gerrit-Change-Number: 28866 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 14:26:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

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

by pespin

Attention is currently required from: osmith, laforge, fixeria. pespin 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 1: Code-Review+1 (1 comment) Patchset: PS1: Using python for this looks a bit overkill but fine :) -- 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: 1 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 14:25:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: assert *ts is not NULL in l1sched_set_lchans

by osmith

Attention is currently required from: laforge, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28810 ) Change subject: trxcon: assert *ts is not NULL in l1sched_set_lchans ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28810 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I53b40b31f20fc9aefdfcac1406c465d226e5fde0 Gerrit-Change-Number: 28810 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 14:25:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: tests/ranap_rab_ass: fix potential NULL pointer dereferences

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28837 ) Change subject: tests/ranap_rab_ass: fix potential NULL pointer dereferences ...................................................................... tests/ranap_rab_ass: fix potential NULL pointer dereferences Change-Id: I16fea7b2a8cb1d693e01c91d7633550e2e599ceb Related: CID#275345 --- M tests/ranap_rab_ass/ranap_rab_ass_test.c M tests/ranap_rab_ass/ranap_rab_ass_test.ok 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.c b/tests/ranap_rab_ass/ranap_rab_ass_test.c index 043b16b..f4e7999 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.c +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.c @@ -61,7 +61,7 @@ OSMO_ASSERT(rc == 0); encoded = ranap_rab_ass_req_encode(&message.msg.raB_AssignmentRequestIEs); - printf("ranap_rab_ass_req_encode %s\n", encoded ? "ok" : "ERROR"); + OSMO_ASSERT(encoded != NULL); printf("INPUT: %s\n", osmo_hexdump_nospc(testvec, sizeof(testvec))); printf("RESULT: %s\n", osmo_hexdump_nospc(encoded->data, encoded->len)); @@ -214,6 +214,7 @@ printf("after: addr=%s, port=%u, rab_id=%u\n", addr_str.ip, addr_str.port, rab_id); encoded = ranap_rab_ass_req_encode(&message.msg.raB_AssignmentRequestIEs); + OSMO_ASSERT(encoded != NULL); OSMO_ASSERT(encoded->len == sizeof(testvec_expected_out)); OSMO_ASSERT(memcmp(encoded->data, testvec_expected_out, encoded->len) == 0); diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.ok b/tests/ranap_rab_ass/ranap_rab_ass_test.ok index 47fb97f..73565af 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.ok +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.ok @@ -1,4 +1,3 @@ -ranap_rab_ass_req_encode ok INPUT: 0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f760000400100 RESULT: 0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f760000400100 ranap_rab_ass_resp_encode rc=46 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I16fea7b2a8cb1d693e01c91d7633550e2e599ceb Gerrit-Change-Number: 28837 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: tests/ranap_rab_ass: fix potential NULL pointer dereferences

by neels

Attention is currently required from: fixeria, dexter. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28837 ) Change subject: tests/ranap_rab_ass: fix potential NULL pointer dereferences ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I16fea7b2a8cb1d693e01c91d7633550e2e599ceb Gerrit-Change-Number: 28837 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 14:21:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

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

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28882 ) Change subject: scripts/obs: rewrite pushing source pkgs to OBS ...................................................................... scripts/obs: rewrite pushing source pkgs to OBS Harald requested that the OBS scripts should not stop if building one specific source package fails, instead it should keep going and report at the end a non-success exit code. Given that the shell script code has historically grown and became hard to maintain, I decided to rewrite the scripts for implementing this feature. This rewrite solves additional problems: * No full checkout of an OBS project like network:osmocom:latest anymore, with lots of packages that won't get updated (e.g. the uhd package has a uhd-images_3.14.1.1.tar.xz file that is 108 MB). With the old code, developers had to wait minutes during the checkout before the script reaches code that is currently being developed. Now only single packages get checked out right before they get updated. * No need to clone git repositories over and over. With the new code, git repos only get cloned if needed (for latest it is not needed if the remote git tag is the same as the version in OBS). During development, the cloned git repositories are cached. * Output from commands like "git tag -l" is not written to the log unless they failed. This makes the log more readable, which is especially important when a package fails to build, we keep going and need to spot the build error in the middle of the log later on. * No more duplicated code for nightly and latest scripts that worked similar but had slight differences. Also the list of packages is not duplicated for nightly and latest anymore; nightly uses all packages and latest uses packages that have at least one git tag. * Building source packages is decoupled from uploading them. A separate script build_srcpkg.py can be used to just build the deb + rpm spec source packages, without interacting with the OBS server. * The scripts can optionally run in docker with a command-line switch, and this is used by jenkins. This way we don't need to install more dependencies on the host such as rebar3 which is now needed for erlang/osmo_dia2gsup. * Add erlang/osmo_dia2gsup and run its generate_build_dep.sh (SYS#6006) I have done the new implementation in python to make use of argparse and to be able to use try/except and print a trace when building one package fails. Example output: * https://jenkins.osmocom.org/jenkins/job/Osmocom_OBS_nightly_obs.osmocom.org… * https://jenkins.osmocom.org/jenkins/job/Osmocom_OBS_latest_obs.osmocom.org/… Change-Id: I45a555d05a9da808c0fe0145aae665f583cb80d9 --- M .gitignore M jobs/osmocom-obs.yml D scripts/common-obs-conflict.sh D scripts/common-obs.sh A scripts/obs/build_srcpkg.py A scripts/obs/data/Dockerfile A scripts/obs/data/Release.key A scripts/obs/data/rpmlintrc A scripts/obs/lib/__init__.py A scripts/obs/lib/config.py A scripts/obs/lib/debian.py A scripts/obs/lib/docker.py A scripts/obs/lib/git.py A scripts/obs/lib/metapkg.py A scripts/obs/lib/osc.py A scripts/obs/lib/rpm_spec.py A scripts/obs/lib/srcpkg.py A scripts/obs/update_obs_project.py D scripts/osmocom-latest-packages.sh D scripts/osmocom-next-packages.sh D scripts/osmocom-nightly-packages.sh 21 files changed, 1,338 insertions(+), 1,016 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/82/28882/1 diff --git a/.gitignore b/.gitignore index 78e48b5..1009a64 100644 --- a/.gitignore +++ b/.gitignore @@ -6,12 +6,10 @@ jenkins_jobs.ini jenkins-jobs.ini __pycache__/ +_cache/ _temp/ _deps/ _release_tarballs/ _docker_playground _repo_install_test_data/ _repo_install_test_cache/ - -# osmocom-nightly-packages.sh -nightly-3g_* diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml index cfd3bff..ddb71f1 100644 --- a/jobs/osmocom-obs.yml +++ b/jobs/osmocom-obs.yml @@ -4,9 +4,12 @@ jobs: - Osmocom_OBS_{type}_{server} type: - - nightly - - latest - # - next (disabled: OS#5322) + - nightly: + # For nightly we don't provide ABI compatibility, make sure packages + # from different build dates are not mixed by accident + conflict_version: "$(date +%Y%m%d%H%M)" + - latest: + conflict_version: "" server: - build.opensuse.org: proj: "network:osmocom" @@ -28,10 +31,16 @@ default: 'refs/remotes/origin/master' builders: - shell: | - export PROJ={proj}:{type} - export OBS_SERVER={server} + export PYTHONUNBUFFERED=1 - ./scripts/osmocom-{type}-packages.sh + ./scripts/obs/update_obs_project.py \ + --apiurl {server} \ + --conflict-version {conflict_version} \ + --docker \ + --feed {type} \ + --git-fetch \ + --meta \ + {proj}:{type} scm: - git: branches: diff --git a/scripts/common-obs-conflict.sh b/scripts/common-obs-conflict.sh deleted file mode 100644 index 98c8b70..0000000 --- a/scripts/common-obs-conflict.sh +++ /dev/null @@ -1,146 +0,0 @@ -#!/bin/sh -# Create conflicting dummy packages in OBS (opensuse build service), so users can't mix packages -# built from different branches by accident - -OSMO_OBS_CONFLICT_PKGVER="${OSMO_OBS_CONFLICT_PKGVER:-1.0.0}" - -# Create the conflicting package for debian -# -# $1: name of dummy package (e.g. "osmocom-nightly") -# $2-*: name of conflicting packages (e.g. "osmocom-latest") -# -# Generates the following directory structure: -# debian -# ├── changelog -# ├── compat -# ├── control -# ├── copyright -# ├── rules -# └── source -# └── format -osmo_obs_prepare_conflict_deb() { - local pkgname="$1" - shift - local oldpwd="$PWD" - - mkdir -p "debian/source" - cd "debian" - - # Fill control - cat << EOF > control -Source: ${pkgname} -Section: unknown -Priority: optional -Maintainer: Oliver Smith <osmith(a)sysmocom.de> -Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.8 - -Package: ${pkgname} -Depends: \${misc:Depends} -Architecture: any -EOF - printf "Conflicts: " >> control - first=1 - for i in "$@"; do - if [ "$first" -eq 1 ]; then - first=0 - else - printf ", " >> control - fi - printf "%s" "$i" >> control - done - printf "\n" >> control - cat << EOF >> control -Description: Dummy package, which conflicts with: $@ -EOF - - # Fill changelog - cat << EOF > changelog -${pkgname} (${OSMO_OBS_CONFLICT_PKGVER}) unstable; urgency=medium - - * Dummy package, which conflicts with: $@ - - -- Oliver Smith <osmith(a)sysmocom.de> Thu, 13 Jun 2019 12:50:19 +0200 -EOF - - # Fill rules - cat << EOF > rules -#!/usr/bin/make -f -%: - dh \$@ -EOF - - # Finish up debian dir - chmod +x rules - echo "9" > compat - echo "3.0 (native)" > source/format - touch copyright - - cd "$oldpwd" -} - -# Create the conflicting package for rpm (e.g. contrib/osmocom-nightly.spec.in). The remaining -# placeholders are replaced in osmo_obs_add_rpm_spec(). -# -# $1: name of dummy package (e.g. "osmocom-nightly") -# $2-*: name of conflicting packages (e.g. "osmocom-latest") -osmo_obs_prepare_conflict_rpm() { - local pkgname="$1" - shift - local spec_in="contrib/$pkgname.spec.in" - - mkdir -p contrib - - cat << EOF > "$spec_in" -Name: $pkgname -Version: @VERSION@ -Release: 0 -Summary: Dummy package, which conflicts with: $@ -License: AGPL-3.0-or-later -Group: Hardware/Mobile -Source: @SOURCE@ -EOF - - for i in "$@"; do - echo "Conflicts: $i" >> "$spec_in" - done - - cat << EOF >> "$spec_in" -%description -Dummy package, which conflicts with: $@ -%files -EOF - -} - -# Print names of packages that the conflict package from the current feed -# (e.g. osmocom-nightly) should conflict with (e.g. osmocom-latest, -# osmocom-next, osmocom-2021q1) -osmo_obs_prepare_conflict_args() { - for i in $FEEDS_ALL; do - if [ "$i" != "$FEED" ]; then - echo "osmocom-$i" - fi - done -} - -# Create conflicting packages, based on global $FEED and $FEEDS_ALL vars -osmo_obs_prepare_conflict() { - local pkgname="osmocom-$FEED" - local conflict_args="$(osmo_obs_prepare_conflict_args)" - local oldpwd="$PWD" - - mkdir -p "$pkgname" - cd "$pkgname" - - osmo_obs_prepare_conflict_deb "$pkgname" $conflict_args - osmo_obs_prepare_conflict_rpm "$pkgname" $conflict_args - - # Put in git repository - git init . - git add -A - git commit -m "auto-commit: $pkgname dummy package" || true - git tag -f "$OSMO_OBS_CONFLICT_PKGVER" - - cd "$oldpwd" -} diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh deleted file mode 100644 index 6f96e95..0000000 --- a/scripts/common-obs.sh +++ /dev/null @@ -1,326 +0,0 @@ -#!/bin/sh -# Various common code used in the OBS (opensuse build service) related osmo-ci shell scripts -. "$(dirname "$0")/common-obs-conflict.sh" - -FEEDS_ALL=" - 2021q1 - 2021q4 - 2022q1 - 2022q2 - latest - next - nightly -" - -osmo_cmd_require \ - dch \ - dh \ - dpkg-buildpackage \ - gbp \ - git \ - meson \ - mktemp \ - osc \ - patch \ - sed - -if [ -z "$PROJ" ]; then - echo "PROJ environment variable is not set" - exit 1 -fi - -if [ -z "$OBS_SERVER" ]; then - echo "OBS_SERVER environment variable is not set" - exit 1 -fi - -# Related configuration sections are in .oscrc (OS#5557) -echo "Using OBS server: $OBS_SERVER" -shopt -s expand_aliases -alias osc="osc -A '$OBS_SERVER'" - -# Add dependency to all (sub)packages in debian/control and commit the change. -# $1: path to debian/control file -# $2: package name (e.g. "libosmocore") -# $3: dependency package name (e.g. "osmocom-nightly") -# $4: dependency package version (optional, e.g. "1.0.0.202101151122") -osmo_obs_add_depend_deb() { - local d_control="$1" - local pkgname="$2" - local depend="$3" - local dependver="$4" - - if [ "$pkgname" = "$depend" ]; then - echo "NOTE: skipping dependency on itself: $depend" - return - fi - - if [ -n "$dependver" ]; then - depend="$depend (= $dependver)" - fi - - # Note: adding the comma at the end should be fine. If there is a Depends: line, it is most likely not empty. It - # should at least have ${misc:Depends} according to lintian. - sed "s/^Depends: /Depends: $depend, /g" -i "$d_control" - - git -C "$(dirname "$d_control")" commit -m "auto-commit: debian: depend on $depend" . -} - -# Add dependency to all (sub)packages in rpm spec file -# $1: path to rpm spec file -# $2: package name (e.g. "libosmocore") -# $3: dependency package name (e.g. "osmocom-nightly") -# $4: dependency package version (optional, e.g. "1.0.0.202101151122") -osmo_obs_add_depend_rpm() { - local spec="$1" - local pkgname="$2" - local depend="$3" - local dependver="$4" - - if [ "$pkgname" = "$depend" ]; then - echo "NOTE: skipping dependency on itself: $depend" - return - fi - - if [ -n "$dependver" ]; then - depend="$depend = $dependver" - fi - - ( while IFS= read -r line; do - echo "$line" - - case "$line" in - # Main package - "Name:"*) - echo "Requires: $depend" - ;; - # Subpackages - "%package"*) - echo "Requires: $depend" - ;; - # Build recipe - "%build"*) - if [ -n "$dependver" ]; then - cat << EOF -# HACK: don't let rpmlint abort the build when it finds that a library depends -# on a package with a specific version. The path used here is listed in: -# https://build.opensuse.org/package/view_file/devel:openSUSE:Factory:rpmlint… -# Instead of writing to the SOURCES dir, we could upload osmocom-rpmlintrc as -# additional source for each package. But that's way more effort, not worth it. -echo "setBadness('shlib-fixed-dependency', 0)" \\ - > "%{_sourcedir}/osmocom-rpmlintrc" - -EOF - fi - ;; - esac - done < "$spec" ) > "$spec.new" - - mv "$spec.new" "$spec" -} - -# Copy a project's rpm spec.in file to the osc package dir, set the version/source, depend on the conflicting dummy -# package and 'osc add' it -# $1: oscdir (path to checked out OSC package) -# $2: repodir (path to git repository) -# $3: package name (e.g. "libosmocore") -# $4: dependency package name (e.g. "osmocom-nightly") -# $5: dependency package version (optional, e.g. "1.0.0.202101151122") -osmo_obs_add_rpm_spec() { - local oscdir="$1" - local repodir="$2" - local name="$3" - local depend="$4" - local dependver="$5" - local spec_in="$(find "$repodir" -name "$name.spec.in")" - local spec="$oscdir/$name.spec" - local tarball - local version - local epoch - - if [ -z "$spec_in" ]; then - echo "WARNING: RPM spec missing: $name.spec.in" - return - fi - - cp "$spec_in" "$spec" - - osmo_obs_add_depend_rpm "$spec" "$name" "$depend" "$dependver" - - # Set version and epoch from "Version: [EPOCH:]VERSION" in .dsc - version="$(grep "^Version: " "$oscdir"/*.dsc | cut -d: -f2- | xargs)" - case $version in - *:*) - epoch=$(echo "$version" | cut -d : -f 1) - version=$(echo "$version" | cut -d : -f 2) - ;; - esac - if [ -n "$epoch" ]; then - sed -i "s/^Version:.*/Version: $version\nEpoch: $epoch/g" "$spec" - else - sed -i "s/^Version:.*/Version: $version/g" "$spec" - fi - - # Set source file - tarball="$(cd "$oscdir" && ls -1 *_*.tar.*)" - sed -i "s/^Source:.*/Source: $tarball/g" "$spec" - - osc add "$spec" -} - -# Get the path to a distribution specific patch, either from osmo-ci.git or from the project repository. -# $PWD must be the project repository dir. -# $1: distribution name (e.g. "debian8") -# $2: project repository (e.g. "osmo-trx", "limesuite") -osmo_obs_distro_specific_patch() { - local distro="$1" - local repo="$2" - local ret - - ret="$OSMO_CI_DIR/obs-patches/$repo/build-for-$distro.patch" - if [ -f "$ret" ]; then - echo "$ret" - return - fi - - ret="debian/patches/build-for-$distro.patch" - if [ -f "$ret" ]; then - echo "$ret" - return - fi -} - -# Check if checkout or build of a given package should be skipped, based on the -# PACKAGES environment variable. -# $1: package name (e.g. "libosmocore") -osmo_obs_skip_pkg() { - local pkgname="$1" - - if [ -z "$PACKAGES" ]; then - # Don't skip - return 1 - fi - - for i in "osmocom-$FEED" $PACKAGES; do - if [ "$i" = "$pkgname" ]; then - return 1 - fi - done - - # Skip - return 0 -} - -# Copy an already checked out repository dir and apply a distribution specific patch. -# $PWD must be where all repositories are checked out in subdirs. -# $1: distribution name (e.g. "debian8") -# $2: project repository (e.g. "osmo-trx", "limesuite") -osmo_obs_checkout_copy() { - local distro="$1" - local repo="$2" - local patch - - if osmo_obs_skip_pkg "$repo"; then - return - fi - - echo - echo "====> Checking out $repo-$distro" - - # Verify distro name for consistency - local distros=" - debian8 - debian10 - " - local found=0 - local distro_i - for distro_i in $distros; do - if [ "$distro_i" = "$distro" ]; then - found=1 - break - fi - done - if [ "$found" -eq 0 ]; then - echo "ERROR: invalid distro name: $distro, should be one of: $distros" - exit 1 - fi - - # Copy - if [ -d "$repo-$distro" ]; then - rm -rf "$repo-$distro" - fi - cp -a "$repo" "$repo-$distro" - cd "$repo-$distro" - - # Commit patch - patch="$(osmo_obs_distro_specific_patch "$distro" "$repo")" - if [ -z "$patch" ]; then - echo "ERROR: no patch found for distro=$distro, repo=$repo" - exit 1 - fi - patch -p1 < "$patch" - git commit -m "auto-commit: apply $patch" debian/ - cd .. -} - -# Run git-version-gen inside Osmocom repositories, so the .tarball-version -# becomes part of the source repository. Usually this would be done with -# "make dist", but we use git-buildpackage instead. -osmo_obs_git_version_gen() { - if [ -x ./git-version-gen ]; then - ./git-version-gen . > .tarball-version 2>/dev/null - fi -} - -# Return a version based on the latest tag and commit (e.g. "1.5.1.93.47cc") -# or fall back to the last debian version (e.g. "2.2.6"). Run -# osmo_obs_git_version_gen before. $PWD must be inside a git repository. -osmo_obs_get_commit_version() { - local version="" - - if [ -e ".tarball-version" ]; then - version=$(cat .tarball-version) - # debian doesn't allow '-' in version. - version=$(echo "$version" | sed 's/-/./g' ) - fi - - # deb version - deb_version=$(head -1 debian/changelog | cut -d ' ' -f 2 | sed 's,(,,' | sed 's,),,') - if [ -z "$version" ] || [ "$version" = "UNKNOWN" ]; then - version="$deb_version" - else - # add epoch from debian/changelog - case $deb_version in - *:*) - epoch=$(echo "$deb_version" | cut -d : -f 1) - version=$epoch:$version - ;; - esac - fi - - echo -n "$version" -} - -# Verify that $FEED is in $FEEDS and $FEEDS_ALL -osmo_obs_verify_feed() { - local i - local j - - for i in $FEEDS; do - if [ "$i" != "$FEED" ]; then - continue - fi - - for j in $FEEDS_ALL; do - if [ "$j" = "$i" ]; then - return - fi - done - - echo "feed found in FEEDS but not FEEDS_ALL: $FEED" - exit 1 - done - - echo "unsupported feed: $FEED" - exit 1 -} diff --git a/scripts/obs/build_srcpkg.py b/scripts/obs/build_srcpkg.py new file mode 100755 index 0000000..d41e78b --- /dev/null +++ b/scripts/obs/build_srcpkg.py @@ -0,0 +1,48 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +import argparse +import lib +import lib.config +import lib.docker +import lib.git +import lib.metapkg +import lib.srcpkg + + +def main(): + parser = argparse.ArgumentParser( + description="For one or more packages, clone the git repository and" + " build the debian source package as well as an rpm .spec" + " file. This is the same code that runs to generate source" + " packages which we upload to https://obs.osmocom.org." + f" Output dir: {lib.config.path_temp}/srcpkgs") + lib.add_shared_arguments(parser) + parser.add_argument("package", nargs="?", + help="package name, e.g. libosmocore or open5gs") + args = parser.parse_args() + + if not args.meta and not args.package: + print("ERROR: specify -m and/or a package. See -h for help.") + exit(1) + + lib.set_cmds_verbose(args.verbose) + + if args.docker: + lib.docker.run_in_docker_and_exit(__file__, args) + + lib.check_required_programs() + if args.package: + lib.check_package(args.package) + lib.remove_temp() + + if args.meta: + lib.metapkg.build(args.feed, args.conflict_version) + + if args.package: + lib.srcpkg.build(args.package, args.feed, args.conflict_version, + args.git_fetch) + + +if __name__ == "__main__": + main() diff --git a/scripts/obs/data/Dockerfile b/scripts/obs/data/Dockerfile new file mode 100644 index 0000000..d8bd9c5 --- /dev/null +++ b/scripts/obs/data/Dockerfile @@ -0,0 +1,35 @@ +FROM debian:bullseye +ARG UID + +RUN apt-get update && \ + apt-get upgrade -y && \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + gnupg2 \ + && \ + apt-get clean + +COPY Release.key /tmp/Release.key +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb https://downloads.osmocom.org/packages/osmocom:/latest/Debian_11/ ./" \ + > /etc/apt/sources.list.d/osmocom-latest.list + +RUN apt-get update && \ + apt-get upgrade -y && \ + apt-get install -y --no-install-recommends \ + debhelper \ + dh-python \ + dpkg-dev \ + fakeroot \ + git \ + meson \ + osc \ + python3-setuptools \ + rebar3 \ + sed \ + && \ + apt-get clean + +RUN useradd --uid=${UID} -m user +USER user diff --git a/scripts/obs/data/Release.key b/scripts/obs/data/Release.key new file mode 100644 index 0000000..ecca084 --- /dev/null +++ b/scripts/obs/data/Release.key @@ -0,0 +1,26 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBGKzE1QBCADFcM3ZzggvgxNRNNqDGWf5xIDAiK5qzFLdGes7L6F9VCHdaPy0 +RAOB5bFb/Q1tSDFNEBLtaauXKz+4iGL6qMVjZcyjzpB5w4jKN+kkrFRhjDNUv/SH +BX6d+P7v5WBGSNArNgA8D1BGzckp5a99EZ0okMJFEqIcN40PD6OGugpq5XnVV5Nk +e93fLa2Cu8vhFBcVn6CuHeEhsmuMf6NLbQRNfNNCEEUYaZn7beMYtpZ7t1djsKx5 +1xGm50OzI22FLu8lELQ9d7qMVGRG3WHYawX9BDteRybiyqxfwUHm1haWazRJtlGt +UWyzvwAb80BK1J2Nu5fbAa3w5CoEPAbUuCyrABEBAAG0JW9zbW9jb20gT0JTIFBy +b2plY3QgPG9zbW9jb21Ab3Ntb2NvbT6JAVQEEwEIAD4WIQRrKp83ktFetw1Oao+G +pzC2U3JZcwUCYrMV4wIbAwUJBB6yjwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAK +CRCGpzC2U3JZc4FRCACQQkKIrnvQ7n2u7GSmyVZa3I+oLoFXSGqaGyey5TW/nrMm +vFDKU3qliHiuNSmUY35SnAhXUsvqOYppxVRoO1MLrqUvzMOnIWqkJpf8mtjGUnsW +jyVeto7Rsjs75y2i1Hk+e7ljb/V65J3NlfrfEYWbqR9AKd53ReNXTdrQ0J05A38N +GdI4Ld/2lNISAwaBmGhqdeKsLHpQw/JERU1TApVJR1whFiIwDF1rOCg9GPnNKIk7 +yRZdK267XzztrainX/cbPILyzUZEDhYs6wQuyACyQ1YUxZIxrwVfk7PMNay8CrLH +z42B73Ne5IAj8+op/3iJafFONLm7YXiDUFN+QDYAiQEzBBMBCAAdFiEExoiYhHND +S7aVYlnqa51NyAUyjdsFAmKzE1UACgkQa51NyAUyjdvuZgf+OXmr//i7u7Gg7eWB +7e0qUsyCId9lXS8J437x3K6ciJfD7/6RSy8TFW5Nglm/uSkbyq582I8t+SoOirMD +E6cg9U/5+h5s46bAf+Kd2XS/6tLGeNLM18i4el8CP06NpFzDrsKu76uYFpyRiiHD +otBdtgxeLJ83LugGfZslF+/5cigJkAJMhAdVvGO8h85R6fba8ZSOKtMKkaQRfi76 +nhyOrJPlLuS+DLEnHwdkOFgtKnxHdjM97K+Tx0gisb6uwaWroXfSLnhP8RTLLZZy +Z+noU1Hw3c+mn4c/NYbcC/uwHYHKRzuf9gHnQ3dGgv0Z5sbeLRVo92hjGj7Ftlyd +4hmKBg== +=HxK4 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/scripts/obs/data/rpmlintrc b/scripts/obs/data/rpmlintrc new file mode 100644 index 0000000..aa3903c --- /dev/null +++ b/scripts/obs/data/rpmlintrc @@ -0,0 +1,5 @@ +# Don't abort the build when finding a library that depends on a package with +# a specific version. This is intentional for nightly builds, we don't want +# libraries from different build dates to be mixed as they might have ABI +# incompatibilities. +setBadness('shlib-fixed-dependency', 0) diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py new file mode 100644 index 0000000..193c248 --- /dev/null +++ b/scripts/obs/lib/__init__.py @@ -0,0 +1,145 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +import importlib +import os +import shutil +import subprocess +import sys +import tempfile +import lib.config + +cmds_verbose = False + + +def add_shared_arguments(parser): + parser.add_argument("-f", "--feed", help="package feed (default: nightly)", + metavar="FEED", default="nightly", + choices=lib.config.feeds) + parser.add_argument("-d", "--docker", + help="run in docker to avoid installing required pkgs", + action="store_true") + parser.add_argument("-g", "--git-fetch", + help="fetch already cloned git repositories", + action="store_true") + parser.add_argument("-m", "--meta", action="store_true", + help="build a meta package (e.g. osmocom-nightly)") + parser.add_argument("-c", "--conflict-version", nargs="?", + help="Of the generated source packages, all Osmocom" + " packages (not e.g. open5gs, see lib/config.py" + " for full list) depend on a meta-package such as" + " osmocom-nightly, osmocom-latest, osmocom-2021q1" + " etc. These meta-packages conflict with each" + " other to ensure that one does not mix e.g." + " latest and nightly packages by accident." + " With this -c argument, it is possible to let" + " these packages depend on a meta-package of a" + " specific version. This is used for nightly and" + " 20YYqX packages to ensure they are not mixed" + " from different build dates (ABI compatibility" + " is only on latest).") + parser.add_argument("-v", "--verbose", action="store_true", + help="always print shell commands and their output," + " instead of only printing them on error") + + +def set_cmds_verbose(new_val): + global cmds_verbose + cmds_verbose = new_val + + +def check_required_programs(): + ok = True + + for program in lib.config.required_programs: + if not shutil.which(program): + print(f"ERROR: missing program: {program}") + ok = False + + for module in lib.config.required_python_modules: + if not importlib.find_loader(module): + print(f"ERROR: missing python3 module: {module}") + ok = False + + if not ok: + print("Either install them or use the -d argument to run in docker") + exit(1) + + +def check_package(package): + if package in lib.config.projects_osmocom: + return + if package in lib.config.projects_other: + return + + print(f"ERROR: unknown package: {package}") + print("See packages_osmocom and packages_other in obs/lib/config.py") + exit(1) + + +def exit_error_cmd(completed, error_msg): + """ :param completed: return from run_cmd() below """ + print() + print(f"ERROR: {error_msg}") + print() + print(f"*** command ***\n{completed.args}\n") + print(f"*** returncode ***\n{completed.returncode}\n") + print(f"*** output ***\n{completed.output}") + print("*** python trace ***") + raise RuntimeError("shell command related error, find details right above" + " this python trace") + + +def run_cmd(cmd, check=True, *args, **kwargs): + """ Like subprocess.run, but has check=True and text=True by default and + allows capturing the output while displaying it at the same time. By + default the output is hidden unless there's an error, with -v the + output gets written to stdout. + :returns: subprocess.CompletedProcess instance, but with combined + stdout + stderr written to ret.output + :param check: stop with error if exit code is not 0 """ + global cmds_verbose + + if cmds_verbose: + print(f"+ {cmd}") + + with tempfile.TemporaryFile(encoding="utf8", mode="w+") as output_buf: + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, text=True, bufsize=1, + *args, **kwargs) + + while True: + out = p.stdout.read(1) + if out == "" and p.poll() is not None: + break + if out != "": + output_buf.write(out) + if cmds_verbose: + sys.stdout.write(out) + sys.stdout.flush() + + output_buf.seek(0) + setattr(p, "output", output_buf.read()) + + if p.returncode == 0 or not check: + return p + + exit_error_cmd(p, "command failed unexpectedly") + + +def remove_temp(): + run_cmd(["rm", "-rf", lib.config.path_temp]) + + +def remove_cache_extra_files(): + """ dpkg-buildpackage outputs all files to the top dir of the package + dir, so it will always put them in _cache when building e.g. the debian + source package of _cache/libosmocore. Clear all extra files from _cache + that don't belog to the git repositories which we actually want to + cache. """ + run_cmd(["find", lib.config.path_cache, "-maxdepth", "1", "-type", "f", + "-delete"]) + + +def get_output_path(project): + return f"{lib.config.path_temp}/srcpkgs/{os.path.basename(project)}" diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py new file mode 100644 index 0000000..22c9c05 --- /dev/null +++ b/scripts/obs/lib/config.py @@ -0,0 +1,103 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +import os + +# Lists are ordered alphabetically. + +path_top = os.path.normpath(f"{os.path.realpath(__file__)}/../..") +path_cache = f"{path_top}/_cache" +path_temp = f"{path_top}/_temp" + +# Keep in sync with packages installed in data/Dockerfile +required_programs = [ + "dh", + "dh_python3", + "dpkg-buildpackage", + "fakeroot", + "find", + "git", + "meson", + "osc", + "rebar3", + "sed", +] + +required_python_modules = [ + "setuptools", +] + +feeds = [ + "2022q1", + "2022q2", + "latest", + "nightly", +] + +# Osmocom projects: generated source packages will depend on a meta package, +# such as osmocom-nightly, osmocom-latest or osmocom-2022q1. This meta package +# prevents that packages from different feeds are mixed by accident. +projects_osmocom = [ + "erlang/osmo_dia2gsup", + "libasn1c", + "libgtpnl", + "libosmo-abis", + "libosmo-dsp", + "libosmo-netif", + "libosmo-sccp", + "libosmocore", + "libsmpp34", + "libusrp", + "osmo-bsc", + "osmo-bts", + "osmo-cbc", + "osmo-e1d", + "osmo-gbproxy", + "osmo-ggsn", + "osmo-gsm-manuals", + "osmo-hlr", + "osmo-hnbgw", + "osmo-hnodeb", + "osmo-iuh", + "osmo-mgw", + "osmo-msc", + "osmo-pcap", + "osmo-pcu", + "osmo-remsim", + "osmo-sgsn", + "osmo-sip-connector", + "osmo-smlc", + "osmo-sysmon", + "osmo-trx", + "osmo-uecups", + "python/osmo-python-tests", + "rtl-sdr", + "simtrace2", +] +projects_other = [ + "limesuite", + "neocon", + "open5gs", +] + +git_url_default = "https://gerrit.osmocom.org" # /project gets appended +git_url_other = { + "libosmo-dsp": "https://gitea.osmocom.org/sdr/libosmo-dsp", + "limesuite": "https://github.com/myriadrf/LimeSuite", + "neocon": "https://github.com/laf0rge/neocon", + "open5gs": "https://github.com/open5gs/open5gs", + "rtl-sdr": "https://gitea.osmocom.org/sdr/rtl-sdr", +} + +git_branch_default = "master" +git_branch_other = { + "open5gs": "main", +} + +git_latest_tag_pattern_default = "^[0-9]*\\.[0-9]*\\.[0-9]*$" +git_latest_tag_pattern_other = { + "limesuite": "^v[0-9]*\\.[0-9]*\\.[0-9]*$", + "open5gs": "^v[0-9]*\\.[0-9]*\\.[0-9]*$", +} + +docker_image_name = "debian-bullseye-osmocom-obs" diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py new file mode 100644 index 0000000..af152da --- /dev/null +++ b/scripts/obs/lib/debian.py @@ -0,0 +1,109 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +import datetime +import os +import shlex +import lib +import lib.git + + +def control_add_depend(project, pkgname, version): + """ :param pkgname: of the meta-package to depend on (e.g. osmocom-nightly) + :param version: of the meta-pkgname to depend on or None """ + repo_path = lib.git.get_repo_path(project) + + if version: + depend = f"{pkgname} (= {version})" + else: + depend = pkgname + + cmd = ["sed", f"s/^Depends: /Depends: {depend}, /", "-i", "debian/control"] + lib.run_cmd(cmd, cwd=repo_path) + + +def changelog_add_entry(project, feed, version): + """ :param version: for the new changelog entry """ + repo_path = lib.git.get_repo_path(project) + changelog_path = f"{repo_path}/debian/changelog" + + changelog_old = open(changelog_path).read() + + # Package name might be different from project name, read it from changelog + pkgname = changelog_old.split(" ", 1)[0] + assert pkgname + + # Debian doesn't allow '-' in version + version = version.replace("-", ".") + + # Debian changelog requires this specific date format + date = datetime.datetime.now(datetime.timezone.utc) + date_str = date.strftime("%a, %d %b %Y %H:%M:%S %z") + + # Add new changelog entry + with open(changelog_path, "w") as f: + f.write(f"{pkgname} ({version}) unstable; urgency=medium\n") + f.write("\n") + f.write(" * Automatically generated changelog entry for building the" + f" Osmocom {feed} feed\n") + f.write("\n") + f.write(f" -- Osmocom OBS scripts <info(a)osmocom.org> {date_str}\n") + f.write("\n") + f.write(changelog_old) + + +def fix_source_format(project): + """ Always use format "3.0 (native)" (e.g. limesuite has "3.0 (quilt)").""" + repo_path = lib.git.get_repo_path(project) + format_path = f"{repo_path}/debian/source/format" + if not os.path.exists(format_path): + return + + expected = "3.0 (native)\n" + current = open(format_path, "r").read() + + if current == expected: + return + + print(f"{project}: fixing debian/source/format ({current.rstrip()} =>" + f" {expected.rstrip()})") + open(format_path, "w").write(expected) + + +def get_last_version_from_changelog(project): + repo_path = lib.git.get_repo_path(project) + changelog_path = f"{repo_path}/debian/changelog" + + if not os.path.exists(changelog_path): + return None + + changelog = open(changelog_path).read() + if not changelog: + return None + + return changelog.split("(", 1)[1].split(")", 1)[0] + + +def changelog_add_entry_if_needed(project, feed, version): + """ Adjust the changelog if the version in the changelog is different from + the given version. """ + version_changelog = get_last_version_from_changelog(project) + if version_changelog == version: + return + + print(f"{project}: adding debian/changelog entry ({version_changelog} =>" + f" {version})") + changelog_add_entry(project, feed, version) + + +def build_source_package(project): + fix_source_format(project) + print(f"{project}: building debian source package") + lib.run_cmd(["dpkg-buildpackage", "-S", "-uc", "-us", "-d"], + cwd=lib.git.get_repo_path(project)) + + +def move_files_to_output(project): + path_output = lib.get_output_path(project) + lib.run_cmd(f"mv *.tar* *.dsc {shlex.quote(path_output)}", shell=True, + cwd=lib.config.path_cache) diff --git a/scripts/obs/lib/docker.py b/scripts/obs/lib/docker.py new file mode 100644 index 0000000..a5dbcd9 --- /dev/null +++ b/scripts/obs/lib/docker.py @@ -0,0 +1,62 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +import os +import shutil +import subprocess +import sys +import lib +import lib.config + + +def build_image(): + print(f"docker: building image {lib.config.docker_image_name}") + lib.run_cmd(["docker", "build", + "--build-arg", f"UID={os.getuid()}", + "-t", lib.config.docker_image_name, + f"{lib.config.path_top}/data"]) + + +def get_oscrc(): + ret = os.path.expanduser("~/.oscrc") + if "OSCRC" in os.environ: + ret = os.environ["OSCRC"] + + if os.path.exists(ret): + return os.path.realpath(ret) + + print("ERROR: couldn't find ~/.oscrc. Put it there or set OSCRC.") + exit(1) + + +def run_in_docker_and_exit(script_path, args, add_oscrc=False): + if "INSIDE_DOCKER" in os.environ: + return + + if not shutil.which("docker"): + print("ERROR: docker is not installed") + exit(1) + + oscrc = None + if add_oscrc: + oscrc = get_oscrc() + + # Build the docker image. Unless it is up-to-date, this will take a few + # minutes or so, therefore print the output. + lib.set_cmds_verbose(True) + build_image() + lib.set_cmds_verbose(args.verbose) + + cmd = ["docker", "run", + "-e", "INSIDE_DOCKER=1", + "-e", "PYTHONUNBUFFERED=1", + "--rm", "-v", f"{lib.config.path_top}:/obs"] + + if oscrc: + cmd += ["-v", f"{oscrc}:/home/user/.oscrc"] + + script_path = f"/obs/{os.path.basename(script_path)}" + cmd += [lib.config.docker_image_name, script_path] + sys.argv[1:] + + print(f"docker: running: {os.path.basename(script_path)} inside docker") + ret = subprocess.run(cmd) + exit(ret.returncode) diff --git a/scripts/obs/lib/git.py b/scripts/obs/lib/git.py new file mode 100644 index 0000000..67f1d5e --- /dev/null +++ b/scripts/obs/lib/git.py @@ -0,0 +1,109 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +import os +import re +import lib.config + + +def get_repo_path(project): + return f"{lib.config.path_cache}/{os.path.basename(project)}" + + +def get_repo_url(project): + if project in lib.config.git_url_other: + return lib.config.git_url_other[project] + return f"{lib.config.git_url_default}/{project}" + + +def get_latest_tag_pattern(project): + if project in lib.config.git_latest_tag_pattern_other: + return lib.config.git_latest_tag_pattern_other[project] + return lib.config.git_latest_tag_pattern_default + + +def clone(project, fetch=False): + repo_path = get_repo_path(project) + url = get_repo_url(project) + + if os.path.exists(repo_path): + if fetch: + print(f"{project}: cloning {url} (cached, fetching)") + lib.run_cmd(["git", "fetch"], cwd=repo_path) + else: + print(f"{project}: cloning {url} (cached, not fetching)") + return + + print(f"{project}: cloning {url}") + os.makedirs(lib.config.path_cache, exist_ok=True) + lib.run_cmd(["git", "clone", url, repo_path]) + + lib.run_cmd(["git", "config", "user.name", "Osmocom OBS scripts"], + cwd=repo_path) + lib.run_cmd(["git", "config", "user.email", "info(a)osmocom.org"], + cwd=repo_path) + + +def clean(project): + repo_path = get_repo_path(project) + lib.run_cmd(["git", "clean", "-ffxd"], cwd=repo_path) + + +def checkout(project, branch): + repo_path = get_repo_path(project) + print(f"{project}: checking out {branch}") + lib.run_cmd(["git", "checkout", "-f", branch], cwd=repo_path) + lib.run_cmd(["git", "reset", "--hard", branch], cwd=repo_path) + + +def checkout_default_branch(project): + branch = lib.config.git_branch_default + if project in lib.config.git_branch_other: + branch = lib.config.git_branch_other[project] + + checkout(project, f"origin/{branch}") + + +def get_latest_tag(project): + pattern_str = get_latest_tag_pattern(project) + pattern = re.compile(pattern_str) + repo_path = get_repo_path(project) + + git_tag_ret = lib.run_cmd(["git", "tag", "-l", "--sort=-v:refname"], + cwd=repo_path) + + for line in git_tag_ret.output.split('\n'): + line = line.strip('\r') + if pattern.match(line): + return line + + lib.exit_error_cmd(git_tag_ret, f"couldn't find latest tag for {project}," + f" regex used on output: {pattern_str}") + + +def get_latest_tag_remote(project): + pattern_str = get_latest_tag_pattern(project) + pattern = re.compile(pattern_str) + + print(f"{project}: getting latest tag from git remote") + ls_remote = lib.run_cmd(["git", "ls-remote", "--tags", "--sort=-v:refname", + get_repo_url(project)]) + for line in ls_remote.output.split('\n'): + # Tags are listed twice, skip the ones with ^{} at the end + if "^{}" in line: + continue + + if "refs/tags/" not in line: + continue + + line = line.rstrip().split("refs/tags/")[1] + if pattern.match(line): + return line + + # No tag found probably means the repository was just created and doesn't + # have a release tag yet + return None + + +def checkout_latest_tag(project): + checkout(project, get_latest_tag(project)) diff --git a/scripts/obs/lib/metapkg.py b/scripts/obs/lib/metapkg.py new file mode 100644 index 0000000..dd261de --- /dev/null +++ b/scripts/obs/lib/metapkg.py @@ -0,0 +1,104 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +import os +import lib +import lib.config +import lib.debian +import lib.rpm_spec + + +def get_conflicts(feed): + ret = [] + for f in lib.config.feeds: + if f == feed: + continue + ret += [f"osmocom-{f}"] + return ret + + +def prepare_source_dir(feed): + path = f"{lib.config.path_cache}/osmocom-{feed}" + + if os.path.exists(path): + lib.run_cmd(["rm", "-rf", path]) + + os.makedirs(f"{path}/debian") + os.makedirs(f"{path}/contrib") + + +def generate_debian_pkg(feed, version): + path = f"{lib.config.path_cache}/osmocom-{feed}" + conflicts = get_conflicts(feed) + + with open(f"{path}/debian/control", "w") as f: + f.write(f"Source: osmocom-{feed}\n") + f.write("Section: unknown\n") + f.write("Priority: optional\n") + f.write("Maintainer: Osmocom OBS scripts <info(a)osmocom.org>\n") + f.write("Build-Depends: debhelper (>= 10)\n") + f.write("Standards-Version: 3.9.8\n") + f.write("\n") + f.write(f"Package: osmocom-{feed}\n") + f.write("Depends: ${misc:Depends}\n") + f.write("Architecture: any\n") + f.write(f"Conflicts: {', '.join(conflicts)}\n") + f.write(f"Description: Dummy package, conflicts with {conflicts}\n") + + with open(f"{path}/debian/changelog", "w") as f: + f.write(f"osmocom-{feed} ({version}) unstable; urgency=medium\n") + f.write("\n") + f.write(f" * Dummy package, which conflicts with: {conflicts}\n") + f.write("\n") + f.write(" -- Osmocom OBS scripts <info(a)osmocom.org> Tue, 25 Jul 2022" + " 15:48:00 +0200\n") + + with open(f"{path}/debian/rules", "w") as f: + f.write("#!/usr/bin/make -f\n") + f.write("%:\n") + f.write("\tdh $@\n") + + lib.run_cmd(["chmod", "+x", f"{path}/debian/rules"]) + + with open(f"{path}/debian/compat", "w") as f: + f.write("10\n") + + +def generate_rpm_spec(feed, version): + print(f"osmocom-{feed}: generating rpm spec file") + path = (f"{lib.config.path_cache}/osmocom-{feed}/contrib/osmocom-{feed}" + ".spec.in") + conflicts = get_conflicts(feed) + + with open(path, "w") as f: + f.write(f"Name: osmocom-{feed}\n") + f.write(f"Version: {version}\n") + f.write(f"Summary: Dummy package, conflicts with: {conflicts}\n") + f.write("Release: 0\n") + f.write("License: AGPL-3.0-or-later\n") + f.write("Group: Hardware/Mobile\n") + for conflict in conflicts: + f.write(f"Conflicts: {conflict}\n") + f.write("%description\n") + f.write(f"Dummy package, which conflicts with: {conflicts}\n") + f.write("%files\n") + + +def build(feed, conflict_version): + pkgname = f"osmocom-{feed}" + version = conflict_version if conflict_version else "1.0.0" + print(f"{pkgname}: generating meta package {version}") + + prepare_source_dir(feed) + generate_debian_pkg(feed, version) + + os.makedirs(lib.get_output_path(pkgname)) + lib.remove_cache_extra_files() + + lib.debian.build_source_package(pkgname) + lib.debian.move_files_to_output(pkgname) + + generate_rpm_spec(feed, version) + lib.rpm_spec.copy_to_output(pkgname) + + lib.remove_cache_extra_files() + return version diff --git a/scripts/obs/lib/osc.py b/scripts/obs/lib/osc.py new file mode 100644 index 0000000..2fcdbc6 --- /dev/null +++ b/scripts/obs/lib/osc.py @@ -0,0 +1,120 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + +import glob +import os +import shlex +import shutil +import lib +import lib.config + +apiurl = None + + +def check_proj(obs_project): + if ":" in obs_project: + return + + print(f"ERROR: this doesn't look like a valid OBS project: {obs_project}") + exit(1) + + +def set_apiurl(url): + global apiurl + apiurl = url + + +def run_osc(cmd, *args, **kwargs): + global apiurl + + # For some osc commands like 'osc add *' it makes sense to use a flat + # string and shell=True, hence support both list and string in this wrapper + if isinstance(cmd, str): + if apiurl: + cmd = f"osc -A {shlex.quote(apiurl)} {cmd}" + else: + cmd = f"osc {cmd}" + else: + if apiurl: + cmd = ["osc", "-A", apiurl] + cmd + else: + cmd = ["osc"] + cmd + + return lib.run_cmd(cmd, *args, **kwargs) + + +def get_remote_pkgs(proj): + print(f"OBS: getting packages in {proj}") + ret = run_osc(["list", proj]) + return ret.output.rstrip().split("\n") + + +def get_package_version(proj, package): + print(f"{package}: getting OBS version") + ret = run_osc(["list", proj, os.path.basename(package)]) + + # Empty OBS package + if ret.output == '\n': + return "0" + + # Extract the version from the dsc filename + for line in ret.output.split('\n'): + line = line.rstrip() + + if line.endswith(".dsc"): + return line.split("_")[-1][:-4] + + lib.exit_error_cmd(ret, "failed to find package version on OBS by" + " extracting the version from the .dsc filename") + + +def create_package(proj, package): + print(f"{package}: creating new OBS package") + + # cut off repository prefix like in "python/osmo-python-tests" + package = os.path.basename(package) + + path_meta = f"{lib.config.path_temp}/_meta" + path_meta_obs = f"source/{proj}/{package}/_meta" + + with open(path_meta, "w") as f: + f.write(f'<package name="{package}" project="{proj}">\n') + f.write(f'<title>{package}</title>\n') + f.write('<description></description>\n') + f.write('</package>\n') + + run_osc(["api", "-X", "PUT", "-T", path_meta, path_meta_obs]) + + os.unlink(path_meta) + + +def remove_temp_osc(): + lib.run_cmd(["rm", "-rf", f"{lib.config.path_temp}/osc"]) + + +def update_package(proj, package, version): + print(f"{package}: updating OBS package") + + # cut off repository prefix like in "python/osmo-python-tests" + package = os.path.basename(package) + + path_output = lib.get_output_path(package) + path_temp_osc = f"{lib.config.path_temp}/osc" + path_temp_osc_pkg = f"{path_temp_osc}/{proj}/{package}" + + remove_temp_osc() + os.makedirs(path_temp_osc) + + run_osc(["checkout", proj, package], cwd=path_temp_osc) + + if glob.glob(f"{path_temp_osc_pkg}/*"): + run_osc("del *", shell=True, cwd=path_temp_osc_pkg) + + lib.run_cmd(f"mv * {shlex.quote(path_temp_osc_pkg)}", shell=True, + cwd=path_output) + + run_osc("add *", shell=True, cwd=path_temp_osc_pkg) + run_osc(["commit", "-m", f"upgrade to {version}"], cwd=path_temp_osc_pkg) + + remove_temp_osc() diff --git a/scripts/obs/lib/rpm_spec.py b/scripts/obs/lib/rpm_spec.py new file mode 100644 index 0000000..a7c4379 --- /dev/null +++ b/scripts/obs/lib/rpm_spec.py @@ -0,0 +1,84 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +import glob +import os +import shutil +import lib +import lib.git + + +def get_spec_in_path(project): + repo_path = lib.git.get_repo_path(project) + ret = glob.glob(f"{repo_path}/**/contrib/*.spec.in", recursive=True) + assert len(ret) < 2 + return ret[0] if ret else None + + +def get_source_name(project): + """ Get the name to the .tar.xz file generated by dpkg-buildpackage, that + we also use in the rpm spec file. This requires + lib.debian.move_files_to_output() to run first.""" + path_output = lib.get_output_path(project) + ret = glob.glob(f"{path_output}/*.tar.*") + assert len(ret) == 1 + return os.path.basename(ret[0]) + + +def add_depend(project, pkgname, version): + """ Add a 'Requires: ...' line below the 'Name:' and '%package' lines of + the .spec.in file. + :param pkgname: of the meta-package to depend on (e.g. osmocom-nightly) + :param version: of the meta-pkgname to depend on or None """ + path = get_spec_in_path(project) + + req_line = f"Requires: {pkgname}" + if version: + req_line += f" = {version}" + + # Main package + lib.run_cmd(["sed", "-e", "/^Name:/a\\", "-e", req_line, "-i", path]) + + # Subpackages + lib.run_cmd(["sed", "-e", "/^%package/a\\", "-e", req_line, "-i", path]) + + +def generate(project, version, epoch): + """ Update the version and source in the .spec.in file. + :param version: from get-version-gen script """ + print(f"{project}: generating rpm spec file") + path = get_spec_in_path(project) + source = get_source_name(project) + + # rpmbuild doesn't allow '-' in version + version = version.replace("-", ".") + + # Version + lib.run_cmd(["sed", f"s/^Version:.*/Version: {version}/", "-i", path]) + if epoch: + epoch_line = f"Epoch: {epoch}" + lib.run_cmd(["sed", "-e", "/^Version:/a\\", "-e", epoch_line, "-i", + path]) + + # Source: add the one generated by dpkg-buildpackage and another line with + # rpmlintrc + lib.run_cmd(["sed", f"s/^Source:.*/Source: {source}/", "-i", path]) + rpmlint_line = "Source1: rpmlintrc" + lib.run_cmd(["sed", "-e", "/^Source:/a\\", "-e", rpmlint_line, "-i", path]) + + # rpmbuild assumes the directory inside the source tarball has the version + # at the end, but dpkg-buildpackage doesn't generate it that way. Set the + # directory with "%setup -n dirname". + lib.run_cmd(["sed", f"s/^%setup/%setup -n {os.path.basename(project)}/", + "-i", path]) + + +def copy_to_output(project): + # rpm spec + path_spec_in = get_spec_in_path(project) + path_output = lib.get_output_path(project) + name_spec = os.path.basename(path_spec_in)[:-3] # remove '.in' + shutil.copy(path_spec_in, f"{path_output}/{name_spec}") + + # rpmlintrc + shutil.copy(f"{lib.config.path_top}/data/rpmlintrc", path_output) diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py new file mode 100644 index 0000000..468a240 --- /dev/null +++ b/scripts/obs/lib/srcpkg.py @@ -0,0 +1,157 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +import os +import lib.config +import lib.debian +import lib.rpm_spec + + +def checkout_for_feed(project, feed): + """ checkout a commit, either latest tag or master or 20YY branch """ + if feed == "latest": + lib.git.checkout_latest_tag(project) + elif feed == "nightly": + lib.git.checkout_default_branch(project) + else: # 2022q1 etc + lib.git.checkout(project, feed) + + +def get_git_version_gen_path(project): + # Use git-version-gen in the project's repository if available + repo_path = lib.git.get_repo_path(project) + ret = f"{repo_path}/git-version-gen" + if os.path.exists(ret): + return ret + + # Use git-version-gen script from libosmocore.git as fallback + print(f"{project}: has no git-version-gen, using the one from libosmocore") + repo_path = lib.git.get_repo_path("libosmocore") + ret = f"{repo_path}/git-version-gen" + if not os.path.exists(ret): + lib.git.clone("libosmocore") + if os.path.exists(ret): + return ret + + print(f"ERROR: {project}.git doesn't have a git-version-gen script and" + " couldn't find libosmocore.git's copy of the script here either: " + + ret) + exit(1) + + +def get_git_version(project): + """ :returns: the string from git-version-gen, e.g. '1.7.0.10-76bdb' """ + repo_path = lib.git.get_repo_path(project) + script_path = get_git_version_gen_path(project) + + ret = lib.run_cmd([script_path, "."], cwd=repo_path) + if not ret.output: + lib.exit_error_cmd(ret, "empty output from git-version-gen") + + return ret.output + + +def get_version_for_feed(project, feed, conflict_version): + if feed == "latest": + # There's always a tag if we are here. If there was none, the build + # would have been skipped for latest. + ret = lib.git.get_latest_tag(project) + return ret[1:] if ret.startswith("v") else ret + + ret = get_git_version(project) + + # Try to get the last version from the debian/changelog if we can't get + # it with git-version-gen, like it was done in the previous OBS scripts + if ret == "UNKNOWN": + ret = lib.debian.get_last_version_from_changelog(project) + # cut off epoch, we retrieve it separately in get_epoch() below + if ":" in ret: + ret = ret.split(":")[1] + + if not ret: + ret = "0.0.0" + + # Append the conflict_version to increase the version even if the commit + # did not change (OS#5135) + if conflict_version: + ret = f"{ret}.{conflict_version}" + + return ret + + +def get_epoch(project): + """ The osmo-gbproxy used to have the same package version as osmo-sgsn + until 2021 where it was split into its own git repository. From then + on, osmo-gbproxy has a 0.*.* package version, which is smaller than + the previous 1.*.* from osmo-sgsn. We had to set the epoch to 1 for + osmo-gbproxy so package managers know these 0.*.* versions are higher + than the previous 1.*.* ones that are still found in e.g. debian 11. + The epoch is set in debian/changelog, retrieve it from there. + :returns: the epoch number if set, e.g. "1" or an empty string """ + version_epoch = lib.debian.get_last_version_from_changelog(project) + + if ":" in version_epoch: + return version_epoch.split(":")[0] + + return "" + + +def prepare_project_osmo_dia2gsup(): + """ Run erlang/osmo_dia2gsup's generate_build_dep.sh script to download + sources for dependencies. """ + lib.run_cmd("contrib/generate_build_dep.sh", + cwd=lib.git.get_repo_path("erlang/osmo_dia2gsup")) + + +def prepare_project_open5gs(): + """ Build fails without downloading freeDiameter sources. Also we can't + just update all subprojects because it would fail with 'Subproject + exists but has no meson.build file' for promethous-client-c. """ + lib.run_cmd(["meson", "subprojects", "download", "freeDiameter"], + cwd=lib.git.get_repo_path("open5gs")) + + +def write_tarball_version(project, version): + repo_path = lib.git.get_repo_path(project) + + with open(f"{repo_path}/.tarball-version", "w") as f: + f.write(f"{version}\n") + + +def build(project, feed, conflict_version, fetch): + lib.git.clone(project, fetch) + lib.git.clean(project) + checkout_for_feed(project, feed) + version = get_version_for_feed(project, feed, conflict_version) + epoch = get_epoch(project) + version_epoch = f"{epoch}:{version}" if epoch else version + has_rpm_spec = lib.rpm_spec.get_spec_in_path(project) is not None + + print(f"{project}: building source package {version_epoch}") + write_tarball_version(project, version_epoch) + + if project in lib.config.projects_osmocom: + metapkg = f"osmocom-{feed}" + lib.debian.control_add_depend(project, metapkg, conflict_version) + if has_rpm_spec: + lib.rpm_spec.add_depend(project, metapkg, conflict_version) + + lib.debian.changelog_add_entry_if_needed(project, feed, version_epoch) + + os.makedirs(lib.get_output_path(project)) + lib.remove_cache_extra_files() + + project_specific_func = f"prepare_project_{os.path.basename(project)}" + if project_specific_func in globals(): + print(f"{project}: running {project_specific_func}") + globals()[project_specific_func]() + + lib.debian.build_source_package(project) + lib.debian.move_files_to_output(project) + + if has_rpm_spec: + lib.rpm_spec.generate(project, version, epoch) + lib.rpm_spec.copy_to_output(project) + + lib.remove_cache_extra_files() + return version_epoch diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py new file mode 100755 index 0000000..759acfe --- /dev/null +++ b/scripts/obs/update_obs_project.py @@ -0,0 +1,215 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +import argparse +import os +import traceback +import lib +import lib.config +import lib.docker +import lib.git +import lib.metapkg +import lib.osc +import lib.srcpkg + +srcpkgs_built = {} # dict of pkgname: version +srcpkgs_skipped = [] # list of pkgnames +srcpkgs_failed_build = [] # list of pkgnames +srcpkgs_failed_upload = [] # list of pkgnames +srcpkgs_updated = [] # list of pkgnames + + +def parse_packages(packages_arg): + if packages_arg: + for package in packages_arg: + lib.check_package(package) + return packages_arg + + # Default to all + ret = [] + ret += lib.config.projects_osmocom + ret += lib.config.projects_other + return ret + + +def build_srcpkg(feed, package, conflict_version, fetch, is_meta_pkg): + global srcpkgs_built + global srcpkgs_failed_build + + version = None + + try: + if is_meta_pkg: + version = lib.metapkg.build(feed, conflict_version) + else: + version = lib.srcpkg.build(package, feed, conflict_version, fetch) + srcpkgs_built[package] = version + except Exception as ex: + traceback.print_exception(type(ex), ex, ex.__traceback__) + print() + print(f"{package}: build failed") + srcpkgs_failed_build += [package] + + +def is_up_to_date(obs_version, git_latest_version): + if obs_version == git_latest_version: + return True + + # e.g. open5gs has "v" infront of version in git tag + if f"v{obs_version}" == git_latest_version: + return True + + return False + + +def build_srcpkg_if_needed(proj, feed, pkgs_remote, package, conflict_version, + fetch, is_meta_pkg, skip_up_to_date): + global srcpkgs_skipped + + if feed != "latest": + print(f"{package}: building source package (feed is {feed})") + else: + if is_meta_pkg: + latest_version = conflict_version if conflict_version else "1.0.0" + else: + latest_version = lib.git.get_latest_tag_remote(package) + + if latest_version is None: + print(f"{package}: skipping (no git tag found)") + srcpkgs_skipped += [package] + return + + if os.path.basename(package) not in pkgs_remote: + print(f"{package}: building source package (not in OBS)") + else: + obs_version = lib.osc.get_package_version(proj, package) + if is_up_to_date(obs_version, latest_version): + if skip_up_to_date: + print(f"{package}: skipping ({obs_version} is up-to-date)") + srcpkgs_skipped += [package] + return + else: + print(f"{package}: building source package" + f" ({obs_version} is up-to-date, but" + " --no-skip-up-to-date is set)") + else: + print(f"{package}: building source package (outdated:" + f" {latest_version} <=> {obs_version} in OBS)") + + build_srcpkg(feed, package, conflict_version, fetch, is_meta_pkg) + + +def upload_srcpkg(proj, feed, pkgs_remote, package, version): + if os.path.basename(package) not in pkgs_remote: + lib.osc.create_package(proj, package) + lib.osc.update_package(proj, package, version) + + +def build_srcpkgs(proj, feed, pkgs_remote, packages, conflict_version, fetch, + meta, skip_up_to_date): + print() + print("### Building source packages ###") + print() + + if meta: + build_srcpkg_if_needed(proj, feed, pkgs_remote, f"osmocom-{feed}", + conflict_version, fetch, True, skip_up_to_date) + + for package in packages: + build_srcpkg_if_needed(proj, feed, pkgs_remote, package, + conflict_version, fetch, False, skip_up_to_date) + + +def upload_srcpkgs(proj, feed, pkgs_remote): + global srcpkgs_built + global srcpkgs_failed_upload + global srcpkgs_updated + + srcpkgs_failed_upload = [] + srcpkgs_updated = [] + + if not srcpkgs_built: + return + + print() + print("### Uploading built packages ###") + print() + + for package, version in srcpkgs_built.items(): + try: + upload_srcpkg(proj, feed, pkgs_remote, package, version) + srcpkgs_updated += [package] + except Exception as ex: + traceback.print_exception(type(ex), ex, ex.__traceback__) + print() + print(f"{package}: upload failed") + srcpkgs_failed_upload += [package] + + +def exit_with_summary(): + global srcpkgs_updated + global srcpkgs_skipped + global srcpkgs_failed_build + global srcpkgs_failed_upload + + print() + print("### Summary ###") + print() + print(f"Updated: {len(srcpkgs_updated)}") + print(f"Skipped: {len(srcpkgs_skipped)}") + print(f"Failed (srcpkg build): {len(srcpkgs_failed_build)}") + print(f"Failed (srcpkg upload): {len(srcpkgs_failed_upload)}") + + if not srcpkgs_failed_build and not srcpkgs_failed_upload: + exit(0) + + print() + print("List of failed packages:") + for package in srcpkgs_failed_build: + print(f"* {package} (srcpkg build)") + for package in srcpkgs_failed_upload: + print(f"* {package} (srcpkg upload)") + + exit(1) + + +def main(): + parser = argparse.ArgumentParser( + description="Generate source packages and upload them to OBS.") + lib.add_shared_arguments(parser) + parser.add_argument("-A", "--apiurl", help="OBS API URL or .oscrc alias" + " (e.g. https://obs.osmocom.org)") + parser.add_argument("-n", "--no-skip-up-to-date", + dest="skip_up_to_date", action="store_false", + help="for latest feed, build and upload packages even" + " if the version did not change") + parser.add_argument("obs_project", + help="OBS project, e.g. home:osmith:nightly") + parser.add_argument("package", nargs="*", + help="package name, e.g. libosmocore or open5gs," + " default is all packages") + args = parser.parse_args() + proj = args.obs_project + feed = args.feed + packages = parse_packages(args.package) + + lib.set_cmds_verbose(args.verbose) + + if args.docker: + lib.docker.run_in_docker_and_exit(__file__, args, True) + + lib.osc.check_proj(proj) + lib.osc.set_apiurl(args.apiurl) + lib.check_required_programs() + lib.remove_temp() + + pkgs_remote = lib.osc.get_remote_pkgs(proj) + + build_srcpkgs(proj, feed, pkgs_remote, packages, args.conflict_version, + args.git_fetch, args.meta, args.skip_up_to_date) + upload_srcpkgs(proj, feed, pkgs_remote) + exit_with_summary() + + +if __name__ == "__main__": + main() diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh deleted file mode 100755 index 9055f5c..0000000 --- a/scripts/osmocom-latest-packages.sh +++ /dev/null @@ -1,247 +0,0 @@ -#!/bin/sh -# Generate source packages and upload them to OBS, for the latest feed. -# New packages are only uploaded if the source changed. -# Environment variables: -# * PROJ: the OBS namespace to upload to (e.g. "network:osmocom:latest") -# * FEED: -# * "latest": use latest tagged release (default) -# * other: use last commit of branch of same name, exit with error if it does -# not exist -# * PACKAGES: set to a space-separated list of packages to skip all others -. "$(dirname "$0")/common.sh" -. "$(dirname "$0")/common-obs.sh" - -# Values for FEED env var. Adjust FEEDS_ALL in common-obs when changing. -FEEDS=" - latest -" - -set -e -set -x - -DT=$(date +%Y%m%d%H%M) -TOP=$(pwd) -DEBSRCDIR="$TOP/debsrc" -FEED="${FEED:-latest}" - -### OBS build -prepare() { - # start with a checkout of the project - if [ -d $PROJ ]; then - (cd $PROJ && osc up) - else - osc co $PROJ - fi - [ -d "$DEBSRCDIR" ] && rm -rf "$DEBSRCDIR" - mkdir "$DEBSRCDIR" - - cd "$TOP" - osmo_obs_prepare_conflict -} - -get_last_tag() { - project="$1" - if [ "$project" = "limesuite" ] || [ "$project" = "open5gs" ]; then - ver_regexp="^v[0-9]*.[0-9]*.[0-9]*$" - else - ver_regexp="^[0-9]*.[0-9]*.[0-9]*$" - fi - VER=$(git -C "${TOP}/${project}" tag -l --sort=v:refname | grep "$ver_regexp" | tail -n 1) - echo "${VER}" -} - -checkout() { - path=$1 - project="$(basename $path)" - url=$2 - gitbpargs="" - - if osmo_obs_skip_pkg "$project"; then - return - fi - - if [ -z "$url" ]; then - url="$(osmo_git_clone_url "$path")" - fi - - echo - echo "====> Checking out $project" - cd "$TOP" - [ -d "$project" ] || osmo_git_clone_date "$url" "$project" - cd "$project" - git fetch - - if [ "$FEED" = "latest" ]; then - VER=$(get_last_tag "$project") - git checkout -f -B "$VER" "refs/tags/$VER" - else - git checkout -f -B "$FEED" "origin/$FEED" - fi - - if [ "$project" = "open5gs" ]; then - meson subprojects download freeDiameter - fi -} - -# Generate a source package and upload it to OBS -# $1: package name (e.g. "libosmocore") -# $2: arguments to pass to "gbp buildpackage" -build() { - project=$1 - gitbpargs="$2" - output="$DEBSRCDIR/$project" - - if osmo_obs_skip_pkg "$project"; then - return - fi - - echo - echo "====> Building $project" - cd "$TOP/$project" - - osmo_obs_git_version_gen - - if [ "$FEED" = "latest" ]; then - debian_branch=$(get_last_tag "$project") - else - debian_branch="$FEED" - # Set new debian changelog version with commit appended. This version will - # become part of resulting filenames, and will change if commits have been - # added to the feed's branch. - VER="$(osmo_obs_get_commit_version)" - dch -b -v "$VER" -m "Snapshot build" - git commit -m "$VER snapshot" debian/ - fi - - osmo_obs_add_depend_deb "./debian/control" "$project" "osmocom-$FEED" - - if [ "$project" = "open5gs" ]; then - # we cannot control the output directory of the generated source :( - dpkg-buildpackage -S -uc -us -d - mkdir -p "$output" - mv "../$name"*.tar* "../$name"*.dsc "$output" - elif [ -x ./git-version-gen ]; then - gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \ - "--git-debian-branch=$debian_branch" --git-ignore-new $gitbpargs \ - --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' - else - gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \ - "--git-debian-branch=$debian_branch" --git-ignore-new $gitbpargs - fi - - if [ ! -d "$TOP/$PROJ/$project" ] ; then - # creating a new package is different from using old ones - mkdir "$TOP/$PROJ/$project" - mv "$output/"*.dsc "$TOP/$PROJ/$project/" - mv "$output/"*.tar* "$TOP/$PROJ/$project/" - cd "$TOP/$PROJ" - osc add "$project" - else - cd "$TOP/$PROJ/$project" - - # update OBS only if the filename doesn't match - file=$(cd "$output/" ; ls ./*.dsc) - if [ ! -e "$file" ] ; then - osc rm ./* || true - mv "$output/"*.dsc . - mv "$output/"*.tar* . - osc add ./* - fi - fi - - osmo_obs_add_rpm_spec "$TOP/$PROJ/$project" "$TOP/$project" "$project" "osmocom-$FEED" - - cd "$TOP" -} - -# add those once they have tagged any versions that include the 'debian' sub-dir: -#rtl-sdr -#osmo-fl2k - -build_osmocom() { - prepare - - # NOTE: when adding a repository that is not in gerrit, adjust osmo_git_clone_url() - checkout limesuite https://github.com/myriadrf/LimeSuite - checkout osmo-gsm-manuals - checkout libosmocore - checkout libosmo-sccp - checkout libosmo-abis - checkout libosmo-netif - checkout libsmpp34 - checkout libasn1c - checkout libgtpnl - checkout libusrp - checkout osmo-iuh - checkout osmo-ggsn - checkout osmo-sgsn - checkout osmo-pcap - checkout osmo-trx - checkout osmo-sip-connector - checkout osmo-bts - checkout osmo-pcu - checkout osmo-hlr - checkout osmo-mgw - checkout osmo-msc - checkout osmo-bsc - checkout python/osmo-python-tests - checkout simtrace2 - checkout libosmo-dsp - checkout osmo-sysmon - checkout osmo-remsim - checkout open5gs https://github.com/open5gs/open5gs - checkout neocon https://github.com/laf0rge/neocon - checkout osmo-uecups - checkout osmo-e1d - checkout osmo-smlc - checkout osmo-cbc - checkout osmo-gbproxy - checkout osmo-hnodeb - checkout osmo-hnbgw - - cd "$TOP" - - build osmocom-$FEED - build limesuite --git-upstream-tree="$(get_last_tag limesuite)" - build osmo-gsm-manuals - build libosmocore - build libosmo-sccp - build libosmo-abis - build libosmo-netif - build libsmpp34 - build libasn1c - build libgtpnl - build libusrp - build osmo-iuh - build osmo-ggsn - build osmo-sgsn - build osmo-pcap - build osmo-trx - build osmo-sip-connector - build osmo-bts - build osmo-pcu - build osmo-hlr - build osmo-mgw - build osmo-msc - build osmo-bsc - build osmo-python-tests - build simtrace2 - build libosmo-dsp - build osmo-sysmon - build osmo-remsim - build open5gs - build neocon - build osmo-uecups - build osmo-e1d - build osmo-smlc - build osmo-cbc - build osmo-gbproxy - build osmo-hnodeb - build osmo-hnbgw - - cd "$TOP/$PROJ" - osc ci -m "$FEED versions of $DT" --noservice -} - -osmo_obs_verify_feed -build_osmocom diff --git a/scripts/osmocom-next-packages.sh b/scripts/osmocom-next-packages.sh deleted file mode 100755 index aa9ab90..0000000 --- a/scripts/osmocom-next-packages.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# Generate source packages and upload them to OBS, for the next feed. -. "$(dirname "$0")/common.sh" - -export FEED="next" -$OSMO_CI_DIR/scripts/osmocom-nightly-packages.sh diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh deleted file mode 100755 index 426495e..0000000 --- a/scripts/osmocom-nightly-packages.sh +++ /dev/null @@ -1,282 +0,0 @@ -#!/bin/bash -# Generate source packages and upload them to OBS, for the nightly or next feed. -# New packages are always uploaded, even if the source does not change. Only -# packages of the same build date (DT) can be installed together. -# Environment variables: -# * PROJ: the OBS namespace to upload to (e.g. "network:osmocom:nightly") -# * FEED: controls the source branch that is used: -# * "nightly": use "master" branch (default) -# * "next": use "next" branch if it exists, otherwise use "master" branch -# * other (e.g. "2021q1"): use last commit of branch of same name, exit with -# error if it does not exist -# * PACKAGES: set to a space-separated list of packages to skip all others -. "$(dirname "$0")/common.sh" -. "$(dirname "$0")/common-obs.sh" - -# Values for FEED env var. Adjust FEEDS_ALL in common-obs when changing. -FEEDS=" - 2021q1 - 2021q4 - 2022q1 - 2022q2 - next - nightly -" - -set -e -set -x - -DT=$(date +%Y%m%d%H%M) -OSMO_OBS_CONFLICT_PKGVER="$OSMO_OBS_CONFLICT_PKGVER.$DT" -TOP=$(pwd)/$(mktemp -d nightly-3g_XXXXXX) -FEED="${FEED:-nightly}" - -### OBS build -prepare() { - # clean up the whole space - mkdir -p "$REPO/osc/" - cd "$REPO/osc" - osc co "$PROJ" - - cd "$REPO" - osmo_obs_prepare_conflict -} - -get_last_tag() { - project="$1" - if [ "$project" = "limesuite" ]; then - ver_regexp="^v[0-9]*.[0-9]*.[0-9]*$" - else - ver_regexp="^[0-9]*.[0-9]*.[0-9]*$" - fi - VER=$(git -C "${REPO}/${project}" tag -l --sort=v:refname | grep "$ver_regexp" | tail -n 1) - echo "${VER}" -} - -### common -checkout() { - local name=$1 - local url=$2 - local branch=$3 - - if osmo_obs_skip_pkg "$name"; then - return - fi - - if [ -z "$url" ]; then - url="$(osmo_git_clone_url "$name")" - fi - - if [ -z "$branch" ]; then - case "$FEED" in - nightly|next) ;; - *) branch="$FEED" ;; # e.g. 2021q1 - esac - fi - - cd "$REPO" - - if [ -n "$branch" ] ; then - osmo_git_clone_date "$url" -b "$branch" - else - osmo_git_clone_date "$url" - fi - - if [ "$FEED" = "next" ] && git -C "$name" show-branch remotes/origin/next >/dev/null 2>&1; then - git -C "$name" checkout next - fi - - cd - -} - -# Generate a source package and upload it to OBS -# $1: package name (e.g. "libosmocore") -# $2: update debian dir, unless set to "no_commit": -# * add dependency on osmocom-$FEED package -# * add new version to changelog (e.g. "1.5.1.96.c96d7.202104281354") -# $3: arguments to pass to "gbp buildpackage" -build() { - local name=$1 - local changelog=$2 - local gitbpargs=$3 - local repodir=$REPO/$name - local oscdir=$REPO/osc/$PROJ/$name - local dependver="$OSMO_OBS_CONFLICT_PKGVER" - - if osmo_obs_skip_pkg "$name"; then - return - fi - - if [ -d "$oscdir" ] ; then - # remove earlier version - cd "$oscdir" - osc rm -- * || true - else - # new package - mkdir -p "$oscdir/" - cd "$REPO/osc/$PROJ/" - osc add "$name" - fi - - cd "$repodir" - - if [ "$changelog" != "no_commit" ] ; then - osmo_obs_git_version_gen - # Add date to increase version even if commit did not change (OS#5135) - VER="$(osmo_obs_get_commit_version).$DT" - osmo_obs_add_depend_deb "./debian/control" "$name" "osmocom-$FEED" "$dependver" - dch -b -v "$VER" -m "Snapshot build" - git commit -m "$VER snapshot" debian/ - fi - - mkdir -p "$DATA/$name" - if [ "$name" = "open5gs" ]; then - # we cannot control the output directory of the generated source :( - dpkg-buildpackage -S -uc -us -d - mv "../$name"*.tar* "../$name"*.dsc "$DATA/$name/" - elif [ -f .tarball-version ]; then - gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" \ - --git-ignore-new $gitbpargs \ - --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' - else - gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" \ - --git-ignore-new $gitbpargs - fi - - mv "$DATA/$name/"*.tar* "$DATA/$name/"*.dsc "$oscdir/" - - cd "$oscdir" - osc add -- *.tar* *.dsc - osmo_obs_add_rpm_spec "$oscdir" "$repodir" "$name" "osmocom-$FEED" "$dependver" - osc ci -m "Snapshot $name $DT" --noservice -} - -post() { - cd "$REPO/osc/$PROJ/" - osc status -} - -checkout_limesuite() { - if osmo_obs_skip_pkg "limesuite"; then - return - fi - - cd "$REPO" - git clone https://github.com/myriadrf/LimeSuite limesuite - TAG="$(get_last_tag limesuite)" - cd limesuite - git checkout "$TAG" -} - -checkout_open5gs() { - if osmo_obs_skip_pkg "open5gs"; then - return - fi - - cd "$REPO" - git clone https://github.com/open5gs/open5gs - cd open5gs - meson subprojects download freeDiameter -} - -build_osmocom() { - DATA=$TOP/data - REPO=$TOP/repo - - # rather than including a dangerous 'rm -rf *' here, lets delegate to the user: - if [ -n "$(ls $TOP)" ]; then - echo "ERROR: I need to run in an empty directory." - exit 1 - fi - - prepare - - # NOTE: when adding a repository that is not in gerrit, adjust osmo_git_clone_url() - checkout_limesuite - checkout osmo-gsm-manuals - checkout libosmocore - checkout libosmo-sccp - checkout libosmo-abis - checkout libosmo-netif - checkout libsmpp34 - checkout libasn1c - checkout libgtpnl - checkout libusrp - checkout osmo-iuh - checkout osmo-ggsn - checkout osmo-sgsn - checkout osmo-pcap - checkout osmo-trx - checkout osmo-sip-connector - checkout osmo-bts - checkout osmo-pcu - checkout osmo-hlr - checkout osmo-mgw - checkout osmo-msc - checkout osmo-bsc - checkout python/osmo-python-tests - checkout rtl-sdr - checkout osmo-fl2k - checkout simtrace2 - checkout libosmo-dsp - checkout osmo-sysmon - checkout osmo-remsim - checkout_open5gs - checkout neocon https://github.com/laf0rge/neocon - checkout osmo-uecups - checkout osmo-e1d - checkout osmo-smlc - checkout osmo-cbc - checkout osmo-gbproxy - checkout osmo-hnodeb - checkout osmo-hnbgw - checkout osmo-bsc-nat - - cd "$REPO" - - build osmocom-$FEED no_commit - build limesuite no_commit --git-upstream-tree="$(get_last_tag limesuite)" - build osmo-gsm-manuals - build libosmocore - build libosmo-sccp - build libosmo-abis - build libosmo-netif - build libsmpp34 - build libasn1c - build libgtpnl - build libusrp - build osmo-iuh - build osmo-ggsn - build osmo-sgsn - build osmo-pcap - build osmo-trx - build osmo-sip-connector - build osmo-bts - build osmo-pcu - build osmo-hlr - build osmo-mgw - build osmo-msc - build osmo-bsc - build osmo-python-tests - build rtl-sdr - build osmo-fl2k - build simtrace2 - build libosmo-dsp - build osmo-sysmon - build osmo-remsim - build open5gs - build neocon - build osmo-uecups - build osmo-e1d - build osmo-smlc - build osmo-cbc - build osmo-gbproxy - build osmo-hnodeb - build osmo-hnbgw - build osmo-bsc-nat - - post -} - -osmo_obs_verify_feed -build_osmocom -- 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in docker-playground[master]: ttcn3-cbc: Disable gsmtap_log debug for dasn1c category

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/28881 ) Change subject: ttcn3-cbc: Disable gsmtap_log debug for dasn1c category ...................................................................... ttcn3-cbc: Disable gsmtap_log debug for dasn1c category This category prints incredibly large output of ASN1c encoder/decoder, which clogs the logging subsystem while debugging general issues. Since the encoder/decoder is somehow determenistic, let's disable logging all the debugging; it can be enabled by the user when specifically debugging any enc/dec related issue. Change-Id: I53cc2fe717fa70a8f187788fc4d31d28e0d4e98a --- M ttcn3-cbc-test/osmo-cbc.cfg 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/81/28881/1 diff --git a/ttcn3-cbc-test/osmo-cbc.cfg b/ttcn3-cbc-test/osmo-cbc.cfg index 9d7f4a1..c97c893 100644 --- a/ttcn3-cbc-test/osmo-cbc.cfg +++ b/ttcn3-cbc-test/osmo-cbc.cfg @@ -1,6 +1,7 @@ ! log gsmtap 172.18.27.100 logging level set-all debug + logging level asn1c info logging filter all 1 ! log stderr -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28881 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I53cc2fe717fa70a8f187788fc4d31d28e0d4e98a Gerrit-Change-Number: 28881 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: tests: use common stubs for SMS queue test

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28842 ) Change subject: tests: use common stubs for SMS queue test ...................................................................... tests: use common stubs for SMS queue test Related: OS#5568 Change-Id: Ic854eb919e6fcc82bd0245f62c72985b938c6b7a --- M tests/sms_queue/Makefile.am M tests/sms_queue/sms_queue_test.c M tests/stubs.c 3 files changed, 4 insertions(+), 21 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve msuraev: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/sms_queue/Makefile.am b/tests/sms_queue/Makefile.am index daf056a..c83a946 100644 --- a/tests/sms_queue/Makefile.am +++ b/tests/sms_queue/Makefile.am @@ -12,6 +12,7 @@ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOSIGTRAN_CFLAGS) \ $(LIBOSMORANAP_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(LIBASN1C_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(LIBOSMOGSUPCLIENT_CFLAGS) \ @@ -29,6 +30,7 @@ sms_queue_test_SOURCES = \ sms_queue_test.c \ + $(srcdir)/../stubs.c \ $(NULL) sms_queue_test_LDADD = \ diff --git a/tests/sms_queue/sms_queue_test.c b/tests/sms_queue/sms_queue_test.c index f681657..cc78e14 100644 --- a/tests/sms_queue/sms_queue_test.c +++ b/tests/sms_queue/sms_queue_test.c @@ -277,24 +277,3 @@ return 0; } - -void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {} -struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; } -void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {} -struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, - int fd, int (*cb)(struct osmo_stream_srv *conn), - int (*closed_cb)(struct osmo_stream_srv *conn), - void *data) { return NULL; } -void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg) {} -void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto) {} -struct osmo_fd *osmo_stream_srv_link_get_ofd(struct osmo_stream_srv_link *link) { return NULL; } -struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx) { return NULL; } -void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn) { return NULL; } -void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay) {} -void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb) - (struct osmo_stream_srv_link *link, int fd)) {} -int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; } -void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; } -void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {} -void osmo_stream_srv_link_set_addr(struct osmo_stream_srv_link *link, const char *addr) {} -int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; } diff --git a/tests/stubs.c b/tests/stubs.c index d011a31..e6ef548 100644 --- a/tests/stubs.c +++ b/tests/stubs.c @@ -37,7 +37,9 @@ void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb) (struct osmo_stream_srv_link *link, int fd)) {} int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; } +void osmo_stream_srv_link_close(struct osmo_stream_srv_link *link) {} void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; } +char *osmo_stream_srv_link_get_sockname(const struct osmo_stream_srv_link *link) { return NULL; } void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {} void osmo_stream_srv_link_set_addr(struct osmo_stream_srv_link *link, const char *addr) {} int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic854eb919e6fcc82bd0245f62c72985b938c6b7a Gerrit-Change-Number: 28842 Gerrit-PatchSet: 5 Gerrit-Owner: msuraev <msuraev(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 year, 9 months

1
0
0 0

Change in osmo-msc[master]: Ignore .deb build byproducts

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28839 ) Change subject: Ignore .deb build byproducts ...................................................................... Ignore .deb build byproducts Change-Id: I0ff10ef5766edf5f2aacf62acc98f25f01706ab4 --- M .gitignore 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index eaff7cd..412e5f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,11 @@ debian/*.log +debian/autoreconf.* +debian/*.substvars +debian/tmp +debian/files +debian/.debhelper +debian/osmo-msc*/ + *.o *.lo *.a @@ -73,5 +80,6 @@ doc/manuals/osmomsc-usermanual.xml doc/manuals/common doc/manuals/build +doc/manuals/vty/msc_vty_reference.xml contrib/osmo-msc.spec -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0ff10ef5766edf5f2aacf62acc98f25f01706ab4 Gerrit-Change-Number: 28839 Gerrit-PatchSet: 5 Gerrit-Owner: msuraev <msuraev(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 year, 9 months

1
0
0 0

Change in osmo-msc[master]: ESME: use osmo_sock_get_name() for logging

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28841 ) Change subject: ESME: use osmo_sock_get_name() for logging ...................................................................... ESME: use osmo_sock_get_name() for logging This allows us to drop single-use parameters from osmo_esme to facilitate further code changes. Related: OS#5568 Change-Id: I34bd4c145b0f6287a323e2350808feb59f1d3187 --- M src/libmsc/smpp_smsc.c M src/libmsc/smpp_smsc.h M src/libmsc/smpp_vty.c 3 files changed, 2 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index 4ba52fc..da66074 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -947,9 +947,6 @@ esme->wqueue.read_cb = esme_link_read_cb; esme->wqueue.write_cb = esme_link_write_cb; - esme->sa_len = OSMO_MIN(sizeof(esme->sa), s_len); - memcpy(&esme->sa, s, esme->sa_len); - llist_add_tail(&esme->list, &smsc->esme_list); return 0; diff --git a/src/libmsc/smpp_smsc.h b/src/libmsc/smpp_smsc.h index 257589e..76772a3 100644 --- a/src/libmsc/smpp_smsc.h +++ b/src/libmsc/smpp_smsc.h @@ -45,8 +45,6 @@ uint32_t own_seq_nr; struct osmo_wqueue wqueue; - struct sockaddr_storage sa; - socklen_t sa_len; enum esme_read_state read_state; uint32_t read_len; diff --git a/src/libmsc/smpp_vty.c b/src/libmsc/smpp_vty.c index 31e2090..da260a8 100644 --- a/src/libmsc/smpp_vty.c +++ b/src/libmsc/smpp_vty.c @@ -30,6 +30,7 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/utils.h> +#include <osmocom/core/socket.h> #include <osmocom/core/talloc.h> #include <osmocom/msc/vty.h> @@ -524,17 +525,10 @@ static void dump_one_esme(struct vty *vty, struct osmo_esme *esme) { - char host[128], serv[128]; - - host[0] = 0; - serv[0] = 0; - getnameinfo((const struct sockaddr *) &esme->sa, esme->sa_len, - host, sizeof(host), serv, sizeof(serv), NI_NUMERICSERV); - vty_out(vty, "ESME System ID: %s, Password: %s, SMPP Version %02x%s", esme->system_id, esme->acl ? esme->acl->passwd : "", esme->smpp_version, VTY_NEWLINE); - vty_out(vty, " Connected from: %s:%s%s", host, serv, VTY_NEWLINE); + vty_out(vty, " Connection %s%s", osmo_sock_get_name(tall_vty_ctx, esme->wqueue.bfd.fd), VTY_NEWLINE); if (esme->smsc->def_route == esme->acl) vty_out(vty, " Is current default route%s", VTY_NEWLINE); } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I34bd4c145b0f6287a323e2350808feb59f1d3187 Gerrit-Change-Number: 28841 Gerrit-PatchSet: 5 Gerrit-Owner: msuraev <msuraev(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-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: SMPP: clarify (re)start logic

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28843 ) Change subject: SMPP: clarify (re)start logic ...................................................................... SMPP: clarify (re)start logic Having smpp_smsc_stop() called from within smpp_smsc_start() instead of explicitly inside smpp_smsc_restart() is confusing and could lead to hard-to-trace bugs. Let's get this fixed first before going further. Related: OS#5568 Change-Id: I353f5b82c9f5308d93e926538d4ef7e24d0b0339 --- M src/libmsc/smpp_smsc.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index 34391c2..4ba52fc 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -1011,8 +1011,6 @@ if (!port) port = 2775; - smpp_smsc_stop(smsc); - LOGP(DSMPP, LOGL_NOTICE, "SMPP at %s %d\n", bind_addr? bind_addr : "0.0.0.0", port); @@ -1035,6 +1033,8 @@ { int rc; + smpp_smsc_stop(smsc); + rc = smpp_smsc_start(smsc, bind_addr, port); if (rc) /* if there is an error, try to re-bind to the old port */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I353f5b82c9f5308d93e926538d4ef7e24d0b0339 Gerrit-Change-Number: 28843 Gerrit-PatchSet: 5 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: tests: use common stubs for SMS queue test

by msuraev

Attention is currently required from: pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28842 ) Change subject: tests: use common stubs for SMS queue test ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic854eb919e6fcc82bd0245f62c72985b938c6b7a Gerrit-Change-Number: 28842 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(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: Mon, 01 Aug 2022 13:53:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in docker-playground[master]: OsmoMSC: add image to test gerrit patchset

by fixeria

Attention is currently required from: pespin, msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28873 ) Change subject: OsmoMSC: add image to test gerrit patchset ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Why don't you use regular git branches like everybody? […] I also don't see the need for having even more images per project here. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9cc4c804825e653c2da285396a395e4d986fc157 Gerrit-Change-Number: 28873 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 13:08:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: l1sched: ensure n_bits_total is always initialized

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28866 ) Change subject: trxcon: l1sched: ensure n_bits_total is always initialized ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > coverity saying there can be an issue doesn't mean there IS an issue :) It may be the case in this o […] Well, yeah, there can of course be false positives. But in this case Coverity actually shows a valid patch leading to using uninitialized memory. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I590cfe55365b7ad021a3d0925a0f1ea136e67125 Gerrit-Change-Number: 28866 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 12:55:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: assert *ts is not NULL in l1sched_set_lchans

by pespin

Attention is currently required from: osmith, laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28810 ) Change subject: trxcon: assert *ts is not NULL in l1sched_set_lchans ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28810 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I53b40b31f20fc9aefdfcac1406c465d226e5fde0 Gerrit-Change-Number: 28810 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 12:54:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: l1sched: ensure n_bits_total is always initialized

by pespin

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28866 ) Change subject: trxcon: l1sched: ensure n_bits_total is always initialized ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Coverity tells us it can be an issue. Check CID#205451. coverity saying there can be an issue doesn't mean there IS an issue :) It may be the case in this one though of course! -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I590cfe55365b7ad021a3d0925a0f1ea136e67125 Gerrit-Change-Number: 28866 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 12:53:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28862 ) Change subject: trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb() ...................................................................... Patch Set 1: (1 comment) File src/host/trxcon/src/trxcon.c: https://gerrit.osmocom.org/c/osmocom-bb/+/28862/comment/99bb3f4c_749a77b7 PS1, Line 270: /* Reparent trxcon_inst from ctx to trxcon->fi */ > We're dealing with a chicken-egg problem here. […] I think it's much more clearer doing this instead of mangling with talloc contexts: fi = osmo_fsm_inst_alloc( priv = NULL) fi->priv = trxcon = talloc_zero(fi, struct trxcon_inst); trxcon->fi = fi; BTW FYI, I've seen usually this solved/workarounded by using talloc_steal during the cleanup callback when freeing the fi->priv. Let's see what other think about this topic. I'd really avoid reparenting and this kind of stuff as much as possible, otherwise there's a high potential of shooting at your/someone else's foot later on when updating the code. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5eb8ef6f62b1dc949dc60eaa558f123b3b93819c Gerrit-Change-Number: 28862 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 12:52:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: l1sched: ensure n_bits_total is always initialized

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28866 ) Change subject: trxcon: l1sched: ensure n_bits_total is always initialized ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Doesn't look like an issue at first glance, but fine. Coverity tells us it can be an issue. Check CID#205451. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I590cfe55365b7ad021a3d0925a0f1ea136e67125 Gerrit-Change-Number: 28866 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 12:48:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28862 ) Change subject: trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb() ...................................................................... Patch Set 1: (1 comment) File src/host/trxcon/src/trxcon.c: https://gerrit.osmocom.org/c/osmocom-bb/+/28862/comment/f205ae69_821d626f PS1, Line 270: /* Reparent trxcon_inst from ctx to trxcon->fi */ > Here again, reparenting makes everything more convoluted and difficult to follow imho, and must be u […] We're dealing with a chicken-egg problem here. trxcon_inst is allocated first because a) it holds a pointer to an FSM instance, so we can do trxcon->fi = osmo_fsm_inst_alloc(...) directly; b) we pass a pointer to trxcon_inst when calling osmo_fsm_inst_alloc(), so it becomes fi->priv. To me using talloc_reparent() does not really look that critical. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5eb8ef6f62b1dc949dc60eaa558f123b3b93819c Gerrit-Change-Number: 28862 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 12:46:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: send SACCH blocks in TC_rsl_ms_pwr_dyn_{up,max,ass_updown}

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28869 ) Change subject: BTS_Tests: send SACCH blocks in TC_rsl_ms_pwr_dyn_{up,max,ass_updown} ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28869 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: I31dd6b9026d04403092256176f67785a0a6486ad Gerrit-Change-Number: 28869 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 12:42:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: separate f_send_meas_rep() from f_transceive_meas_rep()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28880 ) Change subject: BTS_Tests: separate f_send_meas_rep() from f_transceive_meas_rep() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28880 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: Ia5d0315e053702df5fa8dad8c6c66c11c9f3edcb Gerrit-Change-Number: 28880 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 12:41:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: increate Tguard to 30.0s for TC_rsl_ms_pwr_dyn_up

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28868 ) Change subject: BTS_Tests: increate Tguard to 30.0s for TC_rsl_ms_pwr_dyn_up ...................................................................... BTS_Tests: increate Tguard to 30.0s for TC_rsl_ms_pwr_dyn_up A comment in f_TC_rsl_ms_pwr_dyn_up() states: > By default, the MS power loop gets triggered every 4th SACCH block (1.92s). > We need 9 * 4 dB steps to get from 0 dBm to 33 dBm, so 9 * 1.92s total. > Add an extra offset to avoid race conditions: +1.92s. so the alt statement is expected to block for 19.2s, while the guard timer is set to 20.0s by default. This is not enough, given that f_TC_rsl_ms_pwr_dyn_up() also needs to wait for the first SACCH block before entering the alt statement. Let's give it more time to run in order to avoid sporadic failures. Change-Id: Ib7de8383c95ac9e00560f786ec4c56f79f7d81bc Related: OS#5635 --- M bts/BTS_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index a322fde..223e55b 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3335,7 +3335,7 @@ f_init(); f_vty_config(BTSVTY, "phy 0", "osmotrx ms-power-loop -10"); for (var integer tn := 1; tn <= 1; tn := tn+1) { - pars := valueof(t_Pars(t_RslChanNr_Bm(tn), ts_RSL_ChanMode_SIGN)); + pars := valueof(t_Pars(t_RslChanNr_Bm(tn), ts_RSL_ChanMode_SIGN, t_guard := 30.0)); pars.bts0_band := f_vty_get_bts0_band(); vc_conn := f_start_handler(refers(f_TC_rsl_ms_pwr_dyn_up), pars, trxc_comp := true); vc_conn.done; 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28868 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: Ib7de8383c95ac9e00560f786ec4c56f79f7d81bc Gerrit-Change-Number: 28868 Gerrit-PatchSet: 3 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: f_est_rll_mo(): add waiting timeout (2s)

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28832 ) Change subject: BTS_Tests: f_est_rll_mo(): add waiting timeout (2s) ...................................................................... BTS_Tests: f_est_rll_mo(): add waiting timeout (2s) This helps to find where the problem is a lot quicker. Change-Id: I71ab69d85f453964749270d970c55e6f577a73a1 --- M bts/BTS_Tests.ttcn 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved dexter: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified Objections: laforge: I would prefer this is not merged as is diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 0f55c54..6772cc5 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -7061,9 +7061,11 @@ /* establish one Radio Link Layer via SABM -> UA. Use l3 for contention resolution */ private function f_est_rll_mo(uint3_t sapi, RslLinkId link_id, octetstring l3) runs on ConnHdlr { + timer T := 2.0; /* send SABM from MS -> BTS */ f_tx_lapdm(ts_LAPDm_SABM(sapi, cr_MO_CMD, true, l3), link_id); /* expect RLL EST IND on Abis */ + T.start; alt { [l3 != ''O] RSL.receive(tr_RSL_EST_IND(g_chan_nr, link_id, l3)); [l3 == ''O] RSL.receive(tr_RSL_EST_IND_NOL3(g_chan_nr, link_id)); @@ -7071,6 +7073,9 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Failing due to RSL_ERROR_IND"); } [] RSL.receive { repeat; } + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for RLL EST IND"); + } } /* expect UA from BTS -> MS */ f_l1_exp_lapdm(tr_LAPDm_UA(sapi, cr_MT_RSP, true, l3)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28832 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: I71ab69d85f453964749270d970c55e6f577a73a1 Gerrit-Change-Number: 28832 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: tune back to CCCH/BCCH in TC_sacch_chan_act_ho_[a]sync

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28833 ) Change subject: BTS_Tests: tune back to CCCH/BCCH in TC_sacch_chan_act_ho_[a]sync ...................................................................... BTS_Tests: tune back to CCCH/BCCH in TC_sacch_chan_act_ho_[a]sync Sending L1CTL_DM_REL_REQ does not make the L1 tune back to CCCH/BCCH. We need to send a L1CTL_FBSB_REQ after releasing a dedicated channel if we want to establish another one. This is essential when running tests using Calypso PHY, and will be required once we have proper trxcon_fsm implementation [1] merged. Related: [1] osmocom-bb.git Ifaf63ead9dd180181358e771367b2a686ba159ca Change-Id: I65fb243a62fc7670b43f467d6b79268cdfb98f36 --- M bts/BTS_Tests.ttcn 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 6772cc5..a322fde 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1456,6 +1456,9 @@ f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + /* Tune back to CCCH/BCCH */ + f_l1_tune(L1CTL); + /* Step 2: Activate ASYNC HO channel with MS power IE */ @@ -1533,6 +1536,9 @@ f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + /* Tune back to CCCH/BCCH */ + f_l1_tune(L1CTL); + /* Step 2a: Activate SYNC HO channel with only MS power IE */ @@ -1558,6 +1564,9 @@ f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + /* Tune back to CCCH/BCCH */ + f_l1_tune(L1CTL); + /* Step 2b: Activate SYNC HO channel with TA IE */ @@ -1582,6 +1591,9 @@ f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + /* Tune back to CCCH/BCCH */ + f_l1_tune(L1CTL); + /* Step 3: Activate SYNC HO channel with MS power IE and TA IE */ 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28833 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: I65fb243a62fc7670b43f467d6b79268cdfb98f36 Gerrit-Change-Number: 28833 Gerrit-PatchSet: 4 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: make ts_SacchL1Header easier to use

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28875 ) Change subject: library/GSM_RR_Types: make ts_SacchL1Header easier to use ...................................................................... library/GSM_RR_Types: make ts_SacchL1Header easier to use Move parameter 'fpc' at the end and assign false by default, so that there is not need to pass false. We never set it to true anyway. Change-Id: I8a0ef562c2426a637fbb9fe3d50711ee7738d04f --- M bts/BTS_Tests.ttcn M library/GSM_RR_Types.ttcn M library/LAPDm_RAW_PT.ttcn 3 files changed, 8 insertions(+), 7 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 5837a03..0f55c54 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -795,8 +795,7 @@ /* TITAN has weird (and often unusable) padding model, so we pad here manaully */ l3 := f_pad_oct(enc_GsmRrL3Message(meas_rep), 18, '00'O); l2 := f_pad_oct(enc_LapdmFrameAB(valueof(ts_LAPDm_AB(0, meas_rep))), 21, '00'O); - l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, false, - g_pars.l1_pars.ms_actual_ta); + l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, g_pars.l1_pars.ms_actual_ta); /* Send RR Measurement Report over the Um interface */ L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), l1h, l2)); @@ -2109,8 +2108,7 @@ log("LAPDm: ", lb); var template (value) SacchL1Header l1h := ts_SacchL1Header( - g_pars.l1_pars.ms_power_level, false, - g_pars.l1_pars.ms_actual_ta); + g_pars.l1_pars.ms_power_level, g_pars.l1_pars.ms_actual_ta); /* According to 3GPP TS 44.018, section 10.5.2.20, we should pad with zeroes */ var octetstring l2 := f_pad_oct(enc_LapdmFrameAB(valueof(lb)), 21, '00'O); @@ -6875,7 +6873,7 @@ /* TODO: we can use an extension of TTCN-3 for padding, i.e. PADDING('2B'O) */ if (valueof(link_id.c) == SACCH) { /* Compose dummy L1 header */ - l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, false, g_pars.l1_pars.ms_actual_ta); + l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, g_pars.l1_pars.ms_actual_ta); L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, link_id, l1h, f_pad_oct(l2, 21, '2B'O))); } else { /* If required, pad L2 frame with constant 0x2b filling */ diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 980020e..335e290 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -198,7 +198,10 @@ external function dec_SacchL1Header(in octetstring stream) return SacchL1Header with { extension "prototype(convert) decode(RAW)" }; - template (value) SacchL1Header ts_SacchL1Header(uint5_t ms_power_lvl, boolean fpc, uint8_t actual_ta) := { + template (value) SacchL1Header + ts_SacchL1Header(uint5_t ms_power_lvl, + uint8_t actual_ta, + boolean fpc := false) := { reserved := 0, fpc := fpc, ms_power_lvl := ms_power_lvl, diff --git a/library/LAPDm_RAW_PT.ttcn b/library/LAPDm_RAW_PT.ttcn index 3e2fba2..946da67 100644 --- a/library/LAPDm_RAW_PT.ttcn +++ b/library/LAPDm_RAW_PT.ttcn @@ -494,7 +494,7 @@ link_id := valueof(ts_RslLinkID_SACCH(lpd.sapi)); buf := f_pad_oct(enc_LapdmFrame(lpd.lapdm), 21, '2B'O); var SacchL1Header l1h := valueof(ts_SacchL1Header(ms_power_lvl, - false, timing_adv)); + timing_adv)); L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(chan_desc.chan_nr, link_id, l1h, buf)); } else { 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28875 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: I8a0ef562c2426a637fbb9fe3d50711ee7738d04f Gerrit-Change-Number: 28875 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(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 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: f_est_rll_mo(): add waiting timeout (2s)

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28832 ) Change subject: BTS_Tests: f_est_rll_mo(): add waiting timeout (2s) ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28832 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: I71ab69d85f453964749270d970c55e6f577a73a1 Gerrit-Change-Number: 28832 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 12:37:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: send SACCH blocks in TC_rsl_ms_pwr_dyn_{up,max,ass_updown}

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28869 ) Change subject: BTS_Tests: send SACCH blocks in TC_rsl_ms_pwr_dyn_{up,max,ass_updown} ...................................................................... Patch Set 3: (1 comment) File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28869/comment/a99fb0f7_7f40… PS2, Line 2968: var octetstring l2 := f_pad_oct('010349'O & '0615004001C0'O, 21, '00'O); > The '010349'O is LAPDm header, the '0615004001C0'O is an RR Measurement Report, the rest is '00'O pa […] Changed to f_send_meas_rep(ts_MeasurementResults) in the new patchset. See also Ia5d0315e053702df5fa8dad8c6c66c11c9f3edcb. Marking thread as resolved. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28869 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: I31dd6b9026d04403092256176f67785a0a6486ad Gerrit-Change-Number: 28869 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Aug 2022 12:36:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

2024

2023

2022

gerrit-log August 2022