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

Change in osmo-cbc[master]: sbcap: Log info about messages received and trasmitted

by neels

Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28819 ) Change subject: sbcap: Log info about messages received and trasmitted ...................................................................... Patch Set 2: (2 comments) File src/sbcap/sbcap_common.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28819/comment/8394af11_8ad84526 PS2, Line 162: static char pdu_name[256] = "<unknown>"; may i suggest the pattern int sbcap_pdu_get_name_buf(char *buf, size_t buflen, const ...) { (this function) return sb.chars_needed; } char *sbcap_pdu_get_name_c(void *ctx, const ... ) { OSMO_NAME_C_IMPL( ... ) } - avoids adding static buf (e.g. via OTC_SELECT) - can be used more than once per printf() - can be re-used via OSMO_STRBUF_APPEND() https://gerrit.osmocom.org/c/osmo-cbc/+/28819/comment/b51de4b3_c88485fe PS2, Line 166: OSMO_STRBUF_PRINTF(sb, "%s", sbcap_procedure_code_str(pc)); are you sure about: sbcap_procedure_code_str() might return NULL -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ifd1eca79bf4fac63de8066cd6a18004138d51d04 Gerrit-Change-Number: 28819 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 20:38:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Move cbc_cell_id2str() and make it public

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28820 ) Change subject: Move cbc_cell_id2str() and make it public ...................................................................... Patch Set 2: (1 comment) File src/cbc_data.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28820/comment/95c32c14_8a4bcf09 PS2, Line 40: static char buf[256]; any chance that this could become char *cbc_cell_id2str_c(void *ctx, const... ) before it spreads to more code? ... to avoid static buffers, which hog mem and can be used only once per printf. just an idea -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I74ccbbc810a2fa76fb2999a7588b3f67d4d21e03 Gerrit-Change-Number: 28820 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 20:24:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework trxcon_fsm, move into a separate file

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28809 ) Change subject: trxcon: rework trxcon_fsm, move into a separate file ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifaf63ead9dd180181358e771367b2a686ba159ca Gerrit-Change-Number: 28809 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 28 Jul 2022 19:56:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: make l1sched_start_ciphering() accept const *key

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28807 ) Change subject: trxcon: make l1sched_start_ciphering() accept const *key ...................................................................... trxcon: make l1sched_start_ciphering() accept const *key Change-Id: I042903d779b6fbae68951a94788a458bf5226046 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_trx.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index d2cc2eb..2c48eae 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -397,7 +397,7 @@ int l1sched_configure_ts(struct l1sched_state *sched, int tn, enum gsm_phys_chan_config config); int l1sched_start_ciphering(struct l1sched_ts *ts, uint8_t algo, - uint8_t *key, uint8_t key_len); + const uint8_t *key, uint8_t key_len); /* Logical channel management functions */ enum gsm_phys_chan_config l1sched_chan_nr2pchan_config(uint8_t chan_nr); diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index 556fe6a..10a4c5f 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -368,7 +368,7 @@ } int l1sched_start_ciphering(struct l1sched_ts *ts, uint8_t algo, - uint8_t *key, uint8_t key_len) + const uint8_t *key, uint8_t key_len) { struct l1sched_lchan_state *lchan; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I042903d779b6fbae68951a94788a458bf5226046 Gerrit-Change-Number: 28807 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: sbcap: Expect IE Send-Write-Replace-Warning-Indication

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28831 ) Change subject: sbcap: Expect IE Send-Write-Replace-Warning-Indication ...................................................................... sbcap: Expect IE Send-Write-Replace-Warning-Indication Since osmo-cbc.git I563e7d1c999f14b8197bb41e85b7bcf6262fe2a0, Write Replace Warning Indication is sent, so expect it. Change-Id: I84e3ae7a532a8a76ac1c26d357da7eaa73f39374 --- M library/sbcap/SBC_AP_Templates.ttcn 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/28831/1 diff --git a/library/sbcap/SBC_AP_Templates.ttcn b/library/sbcap/SBC_AP_Templates.ttcn index c0c0837..d5f2471 100644 --- a/library/sbcap/SBC_AP_Templates.ttcn +++ b/library/sbcap/SBC_AP_Templates.ttcn @@ -129,7 +129,8 @@ template (present) uint12_t p_rep_per, template (present) uint16_t p_num_bcast, template (present) BIT8 dcs := ?, - template (present) octetstring p_msg_content := ? + template (present) octetstring p_msg_content := ?, + template (present) Send_Write_Replace_Warning_Indication send_ind := ? ) := { initiatingMessage := { procedureCode := id_Write_Replace_Warning, @@ -173,11 +174,13 @@ id := SBC_AP_Constants.id_Warning_Message_Content, criticality := ignore, value_ := { Warning_Message_Content := p_msg_content } - } - /* Warning Message Content */ /* OMC ID */ /* Concurrent Warning Message Indicator */ - /* Send Write Replace Warning Indication */ + }, { + id := SBC_AP_Constants.id_Send_Write_Replace_Warning_Indication, + criticality := ignore, + value_ := { Send_Write_Replace_Warning_Indication := send_ind } + } /* Global eNB ID */ /* Warning Area Coordinates */ }, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28831 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: I84e3ae7a532a8a76ac1c26d357da7eaa73f39374 Gerrit-Change-Number: 28831 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Handle each CBSP and SBc-AP on a separate component

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28830 ) Change subject: cbc: Handle each CBSP and SBc-AP on a separate component ...................................................................... cbc: Handle each CBSP and SBc-AP on a separate component * Each BSC_ConnectionHandler emulates a BSC and handles one TCP/CBSP conn. * Each MME_ConectionHandler emulates an MME and handles one SCTP/SBc-AP conn. * ECBE related functionalities are moved to its own file ECBE_Components.ttcn. * CBS_Message is moved to its own file since it is used by all modules. Related: OS#4945 Change-Id: Ia0300a2ae69bdf604373dbc484537958413c79a2 --- A cbc/BSC_ConnectionHandler.ttcn M cbc/CBC_Tests.ttcn A cbc/CBS_Message.ttcn A cbc/ECBE_Components.ttcn A cbc/MME_ConnectionHandler.ttcn 5 files changed, 610 insertions(+), 325 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/28830/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28830 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: Ia0300a2ae69bdf604373dbc484537958413c79a2 Gerrit-Change-Number: 28830 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Handle each CBSP and SBc-AP on a seaprate component

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28830 ) Change subject: cbc: Handle each CBSP and SBc-AP on a seaprate component ...................................................................... cbc: Handle each CBSP and SBc-AP on a seaprate component * Each BSC_ConnectionHandler emulates a BSC and handles one TCP/CBSP conn. * Each MME_ConectionHandler emulates an MME and handles one SCTP/SBc-AP conn. * ECBE related functionalities are moved to its own file ECBE_Components.ttcn. * CBS_Message is moved to its own file since it is used by all modules. Related: OS#4945 Change-Id: Ia0300a2ae69bdf604373dbc484537958413c79a2 --- A cbc/BSC_ConnectionHandler.ttcn M cbc/CBC_Tests.ttcn A cbc/CBS_Message.ttcn A cbc/ECBE_Components.ttcn A cbc/MME_ConnectionHandler.ttcn 5 files changed, 610 insertions(+), 325 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/28830/1 diff --git a/cbc/BSC_ConnectionHandler.ttcn b/cbc/BSC_ConnectionHandler.ttcn new file mode 100644 index 0000000..ec86f01 --- /dev/null +++ b/cbc/BSC_ConnectionHandler.ttcn @@ -0,0 +1,175 @@ +/* BSC (CBSP) Connection Handler of CBC test suite in TTCN-3 + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module BSC_ConnectionHandler { + +import from Osmocom_Types all; + +import from BSSAP_Types all; +import from BSSMAP_Templates all; +import from CBSP_Types all; +import from CBSP_Templates all; +import from CBSP_Adapter all; +import from CBSP_CodecPort all; + +import from CBS_Message all; + +type function void_fn() runs on BSC_ConnHdlr; + +/* this component represents a single subscriber connection */ +type component BSC_ConnHdlr extends CBSP_Adapter_CT { + var BSC_ConnHdlrPars g_pars; +} + +type record BSC_ConnHdlrPars { + integer bsc_cbsp_port, + charstring cbc_host, + integer cbc_cbsp_port, + void_fn start_fn, + CBS_Message exp_cbs_msg optional, + BSSMAP_FIELD_CellIdentificationList cell_list_success optional +}; + +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); + + var BSSMAP_FIELD_CellIdentificationList cell_list := { + cIl_allInBSS := ''O + }; + activate(as_cbsp_keepalive_ack(0)); + activate(as_cbsp_restart(0)); + 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); + + g_pars.start_fn.apply(); +} + +altstep as_cbsp_reset(integer idx) runs on CBSP_Adapter_CT { + var CBSP_RecvFrom rf; + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_RESET)) -> value rf { + var CBSP_IE ie; + f_cbsp_find_ie(rf.msg, CBSP_IEI_CELL_LIST, ie); + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], + ts_CBSP_RESET_COMPL(ie.body.cell_list.cell_id))); + } +} + +/* receive + acknowledge KEEP-ALIVE */ +altstep as_cbsp_keepalive_ack(integer idx) runs on CBSP_Adapter_CT { + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_KEEP_ALIVE)) { + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], ts_CBSP_KEEP_ALIVE_COMPL)); + } +} + +/* receive + ignore RESTART */ +altstep as_cbsp_restart(integer idx) runs on CBSP_Adapter_CT { + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_RESTART)); +} + +function f_cbsp_tx_write_compl(CBS_Message msg, integer idx := 0, + template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, + template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit) +runs on BSC_ConnHdlr { + var template (value) CBSP_PDU tx; + var template (value) BSSMAP_FIELD_CellIdentificationList tx_list; + if (istemplatekind(tx_cell_list, "omit")) { + /* use the "expected list" when confirming the write-replace */ + tx_list := msg.cell_list; + } else { + /* use an user-provided different list of cells */ + tx_list := valueof(tx_cell_list); + } + if (istemplatekind(tx_compl_list, "omit")) { + tx := ts_CBSP_WRITE_CBS_COMPL(msg.msg_id, msg.ser_nr, tx_list, msg.channel_ind); + } else { + tx := ts_CBSP_REPLACE_CBS_COMPL(msg.msg_id, msg.ser_nr, msg.old_ser_nr, + valueof(tx_compl_list), tx_list, + msg.channel_ind); + } + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); +} + +function f_cbsp_tx_write_fail(CBS_Message msg, integer idx := 0, + template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, + template (omit) CBSP_FailureListItems tx_fail_list := omit) +runs on BSC_ConnHdlr { + var template (value) CBSP_PDU tx; + tx := ts_CBSP_WRITE_CBS_FAIL(msg.msg_id, msg.ser_nr, valueof(tx_fail_list), + omit, tx_cell_list, msg.channel_ind); + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); +} + +/* handle a CBSP-WRITE-REPLACE and respond to it with COMPLETE or FAILURE depending on arguments */ +function f_cbsp_handle_write(CBS_Message msg, integer idx := 0, + template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, + template (omit) CBSP_FailureListItems tx_fail_list := omit, + template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit) +runs on BSC_ConnHdlr { + var template CBSP_IEs content_ies := {}; + var template (present) CBSP_PDU rx_templ; + var CBSP_RecvFrom rf; + for (var integer i := 0; i < lengthof(msg.content); i := i+1) { + //content_ies[i] := tr_CbspMsgContent(msg.content[i].payload, msg.content[i].user_len); + content_ies[i] := tr_CbspMsgContent(?, ?); + } + rx_templ := tr_CBSP_WRITE_CBS(msg.msg_id, msg.ser_nr, msg.cell_list, msg.channel_ind, + msg.category, msg.rep_period, msg.num_bcast_req, msg.dcs, + content_ies); + alt { + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { + var template (value) CBSP_PDU tx; + if (istemplatekind(tx_fail_list, "omit")) { + f_cbsp_tx_write_compl(msg, idx, tx_cell_list, tx_compl_list); + } else { + f_cbsp_tx_write_fail(msg, idx, tx_cell_list, tx_fail_list); + } + } + [] as_cbsp_keepalive_ack(idx) { repeat; } + [] CBSP[idx].receive { + setverdict(fail, "Received unexpected CBSP in index ", idx); + } + } +} + +/* handle a CBSP-KILL and respond to it with COMPLETE or FAILURE depending on arguments */ +function f_cbsp_handle_kill(integer idx, uint16_t msg_id, uint16_t ser_nr, + template BSSMAP_FIELD_CellIdentificationList exp_list, + template (omit) BSSMAP_FIELD_CellIdentificationList tx_list, + template (omit) CBSP_FailureListItems tx_fail_list := omit, + template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit, + template (omit) uint8_t channel_ind := omit) +runs on BSC_ConnHdlr { + var template (present) CBSP_PDU rx_templ; + var CBSP_RecvFrom rf; + + rx_templ := tr_CBSP_KILL(msg_id, ser_nr, exp_list, channel_ind); + alt { + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { + var template (value) CBSP_PDU tx; + if (istemplatekind(tx_fail_list, "omit")) { + tx := ts_CBSP_KILL_COMPL(msg_id, ser_nr, tx_compl_list, tx_list, channel_ind); + } else { + tx := ts_CBSP_KILL_FAIL(msg_id, ser_nr, valueof(tx_fail_list), tx_compl_list, + tx_list, channel_ind); + } + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); + } + [] as_cbsp_keepalive_ack(idx) { repeat; } + [] CBSP[idx].receive { + setverdict(fail, "Received unexpected CBSP in index ", idx); + } + } +} + +} diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 2abd33e..11b8e5a 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -10,6 +10,11 @@ import from CBSP_Adapter all; import from CBSP_CodecPort all; +import from SABP_Types all; +import from SABP_Templates all; +import from SABP_IEs all; +import from SABP_PDU_Descriptions all; + import from SBC_AP_IEs all; import from SBC_AP_Constants all; import from SBC_AP_PDU_Contents all; @@ -23,6 +28,11 @@ import from HTTPmsg_Types all; import from ECBE_Types all; +import from CBS_Message all; +import from ECBE_Components all; +import from BSC_ConnectionHandler all; +import from MME_ConnectionHandler all; + modulepar { charstring mp_cbc_host := "127.0.0.1"; integer mp_cbc_cbsp_port := 48049; @@ -32,159 +42,144 @@ integer mp_local_sbcap_port := 9998; }; -type component test_CT extends CBSP_Adapter_CT, SBC_AP_Adapter_CT, http_CT { +const integer MAX_BSC := 3; +const integer MAX_MME := 3; + +type component test_CT extends CBSP_Adapter_CT, http_CT { + var integer g_num_bsc; + var integer g_num_mme; + var BSC_ConnHdlr g_vc_conn_BSC[MAX_BSC]; + 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]; }; -/********************************************************************************* - * ECBE (REST) interface - *********************************************************************************/ - -function f_ecbe_tx_post_cbs(EcbeCbcMessage cbc) -runs on http_CT { - var charstring body := oct2char(enc_EcbeCbcMessage(cbc)); - log("TX POST CBS: ", body); - var HTTPMessage http_resp; - f_http_tx_request(url := "/api/ecbe/v1/message", method := "POST", body := body); -} - -function f_ecbe_rx_resp(template integer exp_sts := (200..299)) -runs on http_CT return HTTPResponse { - var HTTPMessage http_resp := f_http_rx_response(tr_HTTP_Resp(exp_sts), tout := 20.0); - return http_resp.response; -} - -/* run a HTTP POST to add a new CBC message */ -function f_ecbe_post_cbs(EcbeCbcMessage cbc, template integer exp_sts := 201) -runs on http_CT return HTTPResponse { - f_ecbe_tx_post_cbs(cbc); - return f_ecbe_rx_resp(exp_sts) -} - -function f_ecbe_tx_delete_cbs(integer msg_id) -runs on http_CT { - f_http_tx_request("/api/ecbe/v1/message/" & int2str(msg_id), method := "DELETE"); -} - -/* run a HTTP GET on specified URL expecting json in RSRES format as response */ -function f_ecbe_delete_cbs(integer msg_id, template integer exp_sts := 200) -runs on http_CT return HTTPResponse { - f_ecbe_tx_delete_cbs(msg_id); - return f_ecbe_rx_resp(exp_sts); -} - - -altstep as_cbsp_reset(integer idx) runs on CBSP_Adapter_CT { - var CBSP_RecvFrom rf; - [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_RESET)) -> value rf { - var CBSP_IE ie; - f_cbsp_find_ie(rf.msg, CBSP_IEI_CELL_LIST, ie); - CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], - ts_CBSP_RESET_COMPL(ie.body.cell_list.cell_id))); - } -} - -private function f_cbs2ecbe_category(CBSP_Category cat_in) return EcbeCategory -{ - select (cat_in) { - case (CBSP_CATEG_HIGH_PRIO) { return high_priority; } - case (CBSP_CATEG_BACKGROUND) { return background; } - case (CBSP_CATEG_NORMAL) { return normal; } - case else { mtc.stop } - } -} - -private function f_cbs2ecbe_page(CBS_MessageContent inp) return EcbePage -{ - return hex2str(oct2hex(inp.payload)); -} - -/* convert from CBS_Message to EcbeCbcMessage */ -function f_cbs2ecbe(CBS_Message inp, charstring cbe_name) return EcbeCbcMessage -{ - var EcbeCbcMessage ret := { - cbe_name := cbe_name, - category := f_cbs2ecbe_category(inp.category), - repetition_period := inp.rep_period, - num_of_bcast := inp.num_bcast_req, - scope := { scope_plmn := {} }, - smscb_message := { - serial_nr := { - serial_nr_encoded := inp.ser_nr - }, - message_id := inp.msg_id, - payload := { - payload_encoded := { - dcs := inp.dcs, - pages := { } /* appended below */ - } - } - } - }; - for (var integer i := 0; i < lengthof(inp.content); i := i+1) { - ret.smscb_message.payload.payload_encoded.pages := - ret.smscb_message.payload.payload_encoded.pages & { f_cbs2ecbe_page(inp.content[i]) }; - } - return ret; -} - -/********************************************************************************* - * CBSP interface - *********************************************************************************/ - -/* receive + acknowledge KEEP-ALIVE */ -altstep as_cbsp_keepalive_ack(integer idx) runs on CBSP_Adapter_CT { - [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_KEEP_ALIVE)) { - CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], ts_CBSP_KEEP_ALIVE_COMPL)); - } -} - -/* receive + ignore RESTART */ -altstep as_cbsp_restart(integer idx) runs on CBSP_Adapter_CT { - [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_RESTART)); -} - private function f_shutdown_helper() runs on test_CT { + /* Wait for all BSC cons to terminate */ + for (var integer i := 0; i < g_num_bsc; i := i + 1) { + g_vc_conn_BSC[i].done; + } + /* Wait for all MME cons to terminate */ + for (var integer i := 0; i < g_num_mme; i := i + 1) { + g_vc_conn_MME[i].done; + } all component.stop; setverdict(pass); mtc.stop; } -private function f_init(boolean raw := false) runs on test_CT { - f_http_init(mp_cbc_host, mp_cbc_ecbe_port); - CBSP_Adapter.f_connect(mp_cbc_host, mp_cbc_cbsp_port, "", mp_local_cbsp_port); - SBC_AP_Adapter.f_connect(mp_cbc_host, mp_cbc_sbcap_port, "", mp_local_sbcap_port); +/* + * BSC Conn Handler: + */ +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) + runs on test_CT return BSC_ConnHdlrPars { + var BSC_ConnHdlrPars pars := { + bsc_cbsp_port := bsc_cbsp_port, + cbc_host := cbc_host, + cbc_cbsp_port := cbc_cbsp_port, + start_fn := refers(f_BSC_ConnHdlr_start_fn_void), + exp_cbs_msg := omit, + cell_list_success := omit + }; + return pars; +} - if (not raw) { - var BSSMAP_FIELD_CellIdentificationList cell_list := { - cIl_allInBSS := ''O - }; - activate(as_cbsp_keepalive_ack(0)); - activate(as_cbsp_restart(0)); - 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); +private function f_init_bsc(integer idx, charstring id) runs on test_CT return BSC_ConnHdlr { + 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); + return vc_conn; +} + +private function f_start_bsc(integer idx, charstring id, BSC_ConnHdlrPars pars) + runs on test_CT { + id := id & "-BSC" & int2str(idx); + g_vc_conn_BSC[idx] := f_init_bsc(idx, id); + g_vc_conn_BSC[idx].start(f_BSC_ConnHdlr_main(id, pars)); +} + +/* + * MME Conn Handler: + */ +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) + runs on test_CT return MME_ConnHdlrPars { + var MME_ConnHdlrPars pars := { + mme_sbcap_port := mme_sbcap_port, + cbc_host := cbc_host, + cbc_sbcap_port := cbc_sbcap_port, + start_fn := refers(f_MME_ConnHdlr_start_fn_void), + exp_cbs_msg := omit + }; + return pars; +} + +private function f_init_mme(integer idx, charstring id) runs on test_CT return MME_ConnHdlr { + 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); + return vc_conn; +} + +private function f_start_mme(integer idx, charstring id, MME_ConnHdlrPars pars) + runs on test_CT { + id := id & "-MME" & int2str(idx); + g_vc_conn_MME[idx] := f_init_mme(idx, id); + g_vc_conn_MME[idx].start(f_MME_ConnHdlr_main(id, pars)); +} + +private function f_init(integer num_bsc := 1, integer num_mme := 1) runs on test_CT { + f_http_init(mp_cbc_host, mp_cbc_ecbe_port); + + g_num_bsc := num_bsc; + for (var integer i := 0; i < g_num_bsc; i := i + 1) { + g_vc_conn_BSC[i] := f_init_bsc(i, testcasename()); + } + + g_num_mme := num_mme; + for (var integer i := 0; i < g_num_mme; i := i + 1) { + g_vc_conn_MME[i] := f_init_mme(i, testcasename()); } } +function f_start() runs on test_CT { + for (var integer i := 0; i < g_num_mme; i := i + 1) { + f_start_bsc(i, testcasename(), g_pars_BSC[i]); + } + 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 */ +} + /* test whether or not we receive a valid KEEP-ALIVE from the CBC */ -testcase TC_rx_keepalive() runs on test_CT { +private function f_bsc_TC_rx_keepalive() runs on BSC_ConnHdlr { var CBSP_PDU rx; var CBSP_IE ie; - - f_init(); rx := f_cbsp_exp(tr_CBSP_KEEP_ALIVE(?)); f_cbsp_find_ie(rx, CBSP_IEI_KEEP_ALIVE_REP_PERIOD, ie); +} +testcase TC_rx_keepalive() runs on test_CT { + f_init(); + g_pars_BSC[0].start_fn := refers(f_bsc_TC_rx_keepalive); + f_start(); f_shutdown_helper(); } /* test whether CBC terminates connection if KEEP-ALIVE is not answered by BSC */ -testcase TC_rx_keepalive_timeout() runs on test_CT { +private function f_bsc_TC_rx_keepalive_timeout() runs on BSC_ConnHdlr { var CBSP_PDU rx; var CBSP_IE ie; var integer ka_rep_per_s; - f_init(); rx := f_cbsp_exp(tr_CBSP_KEEP_ALIVE(?)); f_cbsp_find_ie(rx, CBSP_IEI_KEEP_ALIVE_REP_PERIOD, ie); @@ -194,188 +189,22 @@ /* expect the CBSP connection to be closed */ CBSP[0].receive(PortEvent:{connClosed:=?}) - +} +testcase TC_rx_keepalive_timeout() runs on test_CT { + f_init(); + g_pars_BSC[0].start_fn := refers(f_bsc_TC_rx_keepalive_timeout); + f_start(); f_shutdown_helper(); } -type record CBS_Message { - uint16_t msg_id, - uint16_t ser_nr, - uint16_t old_ser_nr optional, - BSSMAP_FIELD_CellIdentificationList cell_list, - uint8_t channel_ind, - CBSP_Category category, - uint16_t rep_period, - uint16_t num_bcast_req, - uint8_t dcs, - CBS_MessageContents content -}; -type record CBS_MessageContent { - octetstring payload, - uint8_t user_len -}; -type record of CBS_MessageContent CBS_MessageContents; - -private function f_cbsp_tx_write_compl(CBS_Message msg, integer idx := 0, - template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, - template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit) -runs on test_CT { - var template (value) CBSP_PDU tx; - var template (value) BSSMAP_FIELD_CellIdentificationList tx_list; - if (istemplatekind(tx_cell_list, "omit")) { - /* use the "expected list" when confirming the write-replace */ - tx_list := msg.cell_list; - } else { - /* use an user-provided different list of cells */ - tx_list := valueof(tx_cell_list); - } - if (istemplatekind(tx_compl_list, "omit")) { - tx := ts_CBSP_WRITE_CBS_COMPL(msg.msg_id, msg.ser_nr, tx_list, msg.channel_ind); - } else { - tx := ts_CBSP_REPLACE_CBS_COMPL(msg.msg_id, msg.ser_nr, msg.old_ser_nr, - valueof(tx_compl_list), tx_list, - msg.channel_ind); - } - CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); -} - -private function f_cbsp_tx_write_fail(CBS_Message msg, integer idx := 0, - template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, - template (omit) CBSP_FailureListItems tx_fail_list := omit) -runs on test_CT { - var template (value) CBSP_PDU tx; - tx := ts_CBSP_WRITE_CBS_FAIL(msg.msg_id, msg.ser_nr, valueof(tx_fail_list), - omit, tx_cell_list, msg.channel_ind); - CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); -} - -/* handle a CBSP-WRITE-REPLACE and respond to it with COMPLETE or FAILURE depending on arguments */ -private function f_cbsp_handle_write(CBS_Message msg, integer idx := 0, - template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, - template (omit) CBSP_FailureListItems tx_fail_list := omit, - template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit) -runs on test_CT { - var template CBSP_IEs content_ies := {}; - var template (present) CBSP_PDU rx_templ; - var CBSP_RecvFrom rf; - for (var integer i := 0; i < lengthof(msg.content); i := i+1) { - //content_ies[i] := tr_CbspMsgContent(msg.content[i].payload, msg.content[i].user_len); - content_ies[i] := tr_CbspMsgContent(?, ?); - } - rx_templ := tr_CBSP_WRITE_CBS(msg.msg_id, msg.ser_nr, msg.cell_list, msg.channel_ind, - msg.category, msg.rep_period, msg.num_bcast_req, msg.dcs, - content_ies); - alt { - [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { - var template (value) CBSP_PDU tx; - if (istemplatekind(tx_fail_list, "omit")) { - f_cbsp_tx_write_compl(msg, idx, tx_cell_list, tx_compl_list); - } else { - f_cbsp_tx_write_fail(msg, idx, tx_cell_list, tx_fail_list); - } - } - [] as_cbsp_keepalive_ack(idx) { repeat; } - [] CBSP[idx].receive { - setverdict(fail, "Received unexpected CBSP in index ", idx); - } - } -} - -/* handle a CBSP-KILL and respond to it with COMPLETE or FAILURE depending on arguments */ -private function f_cbsp_handle_kill(integer idx, uint16_t msg_id, uint16_t ser_nr, - template BSSMAP_FIELD_CellIdentificationList exp_list, - template (omit) BSSMAP_FIELD_CellIdentificationList tx_list, - template (omit) CBSP_FailureListItems tx_fail_list := omit, - template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit, - template (omit) uint8_t channel_ind := omit) -runs on test_CT { - var template (present) CBSP_PDU rx_templ; - var CBSP_RecvFrom rf; - - rx_templ := tr_CBSP_KILL(msg_id, ser_nr, exp_list, channel_ind); - alt { - [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { - var template (value) CBSP_PDU tx; - if (istemplatekind(tx_fail_list, "omit")) { - tx := ts_CBSP_KILL_COMPL(msg_id, ser_nr, tx_compl_list, tx_list, channel_ind); - } else { - tx := ts_CBSP_KILL_FAIL(msg_id, ser_nr, valueof(tx_fail_list), tx_compl_list, - tx_list, channel_ind); - } - CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); - } - [] as_cbsp_keepalive_ack(idx) { repeat; } - [] CBSP[idx].receive { - setverdict(fail, "Received unexpected CBSP in index ", idx); - } - } -} - -private function f_sbcap_tx_write_replace_warn_resp(CBS_Message msg, integer idx := 0) -runs on test_CT { - var template (value) SBC_AP_PDU tx; - /* TODO: pass Unknown Tracking Area List as parameter above (omit by default) */ - tx := ts_SBCAP_WRITE_WARNING_RESP(int2bit(msg.msg_id, 16), - int2bit(msg.ser_nr, 16)); - f_SBC_AP_send(tx, idx); -} - -private function f_sbcap_tx_stop_warn_resp(integer idx := 0, CBS_Message msg) -runs on test_CT { - var template (value) SBC_AP_PDU tx; - tx := ts_SBCAP_STOP_WARNING_RESP(int2bit(msg.msg_id, 16), - int2bit(msg.ser_nr, 16)); - f_SBC_AP_send(tx, idx); -} - -/* handle a SBc-AP Write-Replace Request and respond to it with Response or FAILURE depending on arguments */ -private function f_sbcap_handle_write_replace_warn_req(CBS_Message msg, integer idx := 0, - template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit) -runs on test_CT { - var template (present) SBC_AP_PDU rx_templ; - var SBC_AP_RecvFrom rf; - rx_templ := tr_SBCAP_WRITE_WARNING(int2bit(msg.msg_id, 16), - int2bit(msg.ser_nr, 16), - msg.rep_period, - msg.num_bcast_req); - alt { - [] SBC_AP[idx].receive(tr_SBC_AP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { - var template (value) SBC_AP_PDU tx; - log ("received expected req:", rf); - f_sbcap_tx_write_replace_warn_resp(msg, idx); - } - [] SBC_AP[idx].receive { - setverdict(fail, "Received unexpected SBc-AP in index ", idx); - } - } -} - -/* handle a SBc-AP Stop-Warning-Request and respond to it with Response or FAILURE depending on arguments */ -private function f_sbcap_handle_stop_warn_req(integer idx := 0, CBS_Message msg) -runs on test_CT { - var template (present) SBC_AP_PDU rx_templ; - var SBC_AP_RecvFrom rf; - - rx_templ := tr_SBCAP_STOP_WARNING(int2bit(msg.msg_id, 16), - int2bit(msg.ser_nr, 16)); - alt { - [] SBC_AP[idx].receive(tr_SBC_AP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { - var template (value) SBC_AP_PDU tx; - log ("received expected req:", rf); - f_sbcap_tx_stop_warn_resp(idx, msg); - } - [] SBC_AP[idx].receive { - setverdict(fail, "Received unexpected SBc-AP in index ", idx); - } - } -} - private const BSSMAP_FIELD_CellIdentificationList cil_BSS := { cIl_allInBSS := ''O }; - +private function f_bsc_TC_write_replace() runs on BSC_ConnHdlr { + f_cbsp_handle_write(g_pars.exp_cbs_msg); + f_sleep(100.0); +} testcase TC_write_replace() runs on test_CT { - f_init(); var CBS_Message msg := { msg_id := 42, ser_nr := 16752, @@ -390,8 +219,11 @@ { '00'O, 1 } } }; - f_cbsp_handle_write(msg); - f_sleep(100.0); + + f_init(); + g_pars_BSC[0].exp_cbs_msg := msg; + g_pars_BSC[0].start_fn := refers(f_bsc_TC_write_replace); + f_start(); f_shutdown_helper(); } @@ -427,11 +259,6 @@ log(dec_CBSP_PDU(c_kill_compl)); } -import from SABP_Types all; -import from SABP_Templates all; -import from SABP_IEs all; -import from SABP_PDU_Descriptions all; - testcase TC_selftest_sabp() runs on test_CT { const octetstring c_write := '00000080930000080006000211120007000240c0000f0010000113f0030282ec0613f0030282ec070001400100000d0002012a000900020000000400010100000056029f01b4d90d064297d9ec37e8fe96b3c9a0303bdd68341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d10012'O; @@ -457,26 +284,32 @@ log("Restart: ", enc_SABP_PDU(valueof(tx))); } -/********************************************************************************* - * ECBE interface (verifying expected procedures on CBSP) - *********************************************************************************/ +private function f_bsc_create_and_delete() runs on BSC_ConnHdlr { + var template (omit) BSSMAP_FIELD_CellIdentificationList cell_list_success := omit; + if (ispresent(g_pars.cell_list_success)) { + cell_list_success := g_pars.cell_list_success; + } + f_cbsp_handle_write(g_pars.exp_cbs_msg, 0, cell_list_success); + f_cbsp_handle_kill(0, g_pars.exp_cbs_msg.msg_id, g_pars.exp_cbs_msg.ser_nr, + exp_list:=cell_list_success, tx_list:=cell_list_success, + tx_fail_list:=omit, tx_compl_list:=omit, + channel_ind:=g_pars.exp_cbs_msg.channel_ind); +} -function f_create_and_delete(CBS_Message msg, - template (omit) BSSMAP_FIELD_CellIdentificationList cell_list_success) +private function f_mme_create_and_delete() runs on MME_ConnHdlr { + f_sbcap_handle_write_replace_warn_req(g_pars.exp_cbs_msg, 0); + f_sbcap_handle_stop_warn_req(0, g_pars.exp_cbs_msg); +} + +function f_create_and_delete(CBS_Message msg) runs on test_CT { var EcbeCbcMessage ecbe := f_cbs2ecbe(msg, "TTCN-3"); f_ecbe_tx_post_cbs(ecbe); - f_cbsp_handle_write(msg, 0, cell_list_success); - f_sbcap_handle_write_replace_warn_req(msg, 0); f_ecbe_rx_resp(201); f_sleep(2.0); f_ecbe_tx_delete_cbs(msg.msg_id); - /* FIXME: cbc segfaults if we terminate here (if we don't wait for Connect_result? */ - f_cbsp_handle_kill(0, msg.msg_id, msg.ser_nr, exp_list:=cell_list_success, tx_list:=cell_list_success, - tx_fail_list:=omit, tx_compl_list:=omit, channel_ind:=msg.channel_ind); - f_sbcap_handle_stop_warn_req(0, msg); f_ecbe_rx_resp(200); } @@ -506,7 +339,13 @@ ts_BSSMAP_CI_CGI('901'H, '70'H, 24, 42), ts_BSSMAP_CI_CGI('901'H, '70'H, 24, 43) }); - f_create_and_delete(valueof(msg), cell_list_success); + 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); + g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); + g_pars_MME[0].exp_cbs_msg := valueof(msg); + f_start(); + f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_lac_ci() runs on test_CT { @@ -518,7 +357,13 @@ ts_BSSMAP_CI_LAC_CI(10002, 50002), ts_BSSMAP_CI_LAC_CI(10003, 50003) }); - f_create_and_delete(valueof(msg), cell_list_success); + 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); + g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); + g_pars_MME[0].exp_cbs_msg := valueof(msg); + f_start(); + f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_lac() runs on test_CT { @@ -530,7 +375,13 @@ ts_BSSMAP_CI_LAC(10002), ts_BSSMAP_CI_LAC(10003) }); - f_create_and_delete(valueof(msg), cell_list_success); + 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); + g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); + g_pars_MME[0].exp_cbs_msg := valueof(msg); + f_start(); + f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_ci() runs on test_CT { @@ -542,7 +393,13 @@ ts_BSSMAP_CI_CI(50002), ts_BSSMAP_CI_CI(50003) }); - f_create_and_delete(valueof(msg), cell_list_success); + 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); + g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); + g_pars_MME[0].exp_cbs_msg := valueof(msg); + f_start(); + f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_lai() runs on test_CT { @@ -554,7 +411,13 @@ ts_BSSMAP_CI_LAI('901'H, '70'H, 26), ts_BSSMAP_CI_LAI('901'H, '70'H, 27) }); - f_create_and_delete(valueof(msg), cell_list_success); + 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); + g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); + g_pars_MME[0].exp_cbs_msg := valueof(msg); + f_start(); + f_create_and_delete(valueof(msg)); f_shutdown_helper(); } diff --git a/cbc/CBS_Message.ttcn b/cbc/CBS_Message.ttcn new file mode 100644 index 0000000..6f77a1b --- /dev/null +++ b/cbc/CBS_Message.ttcn @@ -0,0 +1,38 @@ +/* ECBE (REST) interface client of osmo-cbc test suite in TTCN-3 + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module CBS_Message { + +import from Osmocom_Types all; + +import from BSSAP_Types all; +import from BSSMAP_Templates all; + +import from CBSP_Types all; + +type record CBS_Message { + uint16_t msg_id, + uint16_t ser_nr, + uint16_t old_ser_nr optional, + BSSMAP_FIELD_CellIdentificationList cell_list, + uint8_t channel_ind, + CBSP_Category category, + uint16_t rep_period, + uint16_t num_bcast_req, + uint8_t dcs, + CBS_MessageContents content +}; +type record CBS_MessageContent { + octetstring payload, + uint8_t user_len +}; +type record of CBS_MessageContent CBS_MessageContents; + +} diff --git a/cbc/ECBE_Components.ttcn b/cbc/ECBE_Components.ttcn new file mode 100644 index 0000000..eaf2772 --- /dev/null +++ b/cbc/ECBE_Components.ttcn @@ -0,0 +1,104 @@ +/* ECBE (REST) interface client of osmo-cbc test suite in TTCN-3 + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module ECBE_Components { + +import from Osmocom_Types all; + +import from HTTP_Adapter all; +import from HTTPmsg_Types all; +import from ECBE_Types all; + +import from CBSP_Types all; + +import from CBS_Message all; + +private function f_cbs2ecbe_category(CBSP_Category cat_in) return EcbeCategory +{ + select (cat_in) { + case (CBSP_CATEG_HIGH_PRIO) { return high_priority; } + case (CBSP_CATEG_BACKGROUND) { return background; } + case (CBSP_CATEG_NORMAL) { return normal; } + case else { mtc.stop } + } +} + +private function f_cbs2ecbe_page(CBS_MessageContent inp) return EcbePage +{ + return hex2str(oct2hex(inp.payload)); +} + +/* convert from CBS_Message to EcbeCbcMessage */ +function f_cbs2ecbe(CBS_Message inp, charstring cbe_name) return EcbeCbcMessage +{ + var EcbeCbcMessage ret := { + cbe_name := cbe_name, + category := f_cbs2ecbe_category(inp.category), + repetition_period := inp.rep_period, + num_of_bcast := inp.num_bcast_req, + scope := { scope_plmn := {} }, + smscb_message := { + serial_nr := { + serial_nr_encoded := inp.ser_nr + }, + message_id := inp.msg_id, + payload := { + payload_encoded := { + dcs := inp.dcs, + pages := { } /* appended below */ + } + } + } + }; + for (var integer i := 0; i < lengthof(inp.content); i := i+1) { + ret.smscb_message.payload.payload_encoded.pages := + ret.smscb_message.payload.payload_encoded.pages & { f_cbs2ecbe_page(inp.content[i]) }; + } + return ret; +} + +/********************************************************************************* + * ECBE (REST) interface + *********************************************************************************/ + +function f_ecbe_tx_post_cbs(EcbeCbcMessage cbc) +runs on http_CT { + var charstring body := oct2char(enc_EcbeCbcMessage(cbc)); + log("TX POST CBS: ", body); + var HTTPMessage http_resp; + f_http_tx_request(url := "/api/ecbe/v1/message", method := "POST", body := body); +} + +function f_ecbe_rx_resp(template integer exp_sts := (200..299)) +runs on http_CT return HTTPResponse { + var HTTPMessage http_resp := f_http_rx_response(tr_HTTP_Resp(exp_sts), tout := 20.0); + return http_resp.response; +} + +/* run a HTTP POST to add a new CBC message */ +function f_ecbe_post_cbs(EcbeCbcMessage cbc, template integer exp_sts := 201) +runs on http_CT return HTTPResponse { + f_ecbe_tx_post_cbs(cbc); + return f_ecbe_rx_resp(exp_sts) +} + +function f_ecbe_tx_delete_cbs(integer msg_id) +runs on http_CT { + f_http_tx_request("/api/ecbe/v1/message/" & int2str(msg_id), method := "DELETE"); +} + +/* run a HTTP GET on specified URL expecting json in RSRES format as response */ +function f_ecbe_delete_cbs(integer msg_id, template integer exp_sts := 200) +runs on http_CT return HTTPResponse { + f_ecbe_tx_delete_cbs(msg_id); + return f_ecbe_rx_resp(exp_sts); +} + +} diff --git a/cbc/MME_ConnectionHandler.ttcn b/cbc/MME_ConnectionHandler.ttcn new file mode 100644 index 0000000..eef5742 --- /dev/null +++ b/cbc/MME_ConnectionHandler.ttcn @@ -0,0 +1,105 @@ +/* MME (SBc-AP) Connection Handler of CBC test suite in TTCN-3 + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module MME_ConnectionHandler { + +import from SBC_AP_IEs all; +import from SBC_AP_Constants all; +import from SBC_AP_PDU_Contents all; +import from SBC_AP_PDU_Descriptions all; +import from SBC_AP_Types all; +import from SBC_AP_Templates all; +import from SBC_AP_CodecPort all; +import from SBC_AP_Adapter all; + +import from CBS_Message all; + +type function void_fn() runs on MME_ConnHdlr; + +/* this component represents a single subscriber connection */ +type component MME_ConnHdlr extends SBC_AP_Adapter_CT { + var MME_ConnHdlrPars g_pars; +} + +type record MME_ConnHdlrPars { + integer mme_sbcap_port, + charstring cbc_host, + integer cbc_sbcap_port, + void_fn start_fn, + CBS_Message exp_cbs_msg optional +}; + +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); + g_pars.start_fn.apply(); +} + +function f_sbcap_tx_write_replace_warn_resp(CBS_Message msg, integer idx := 0) +runs on MME_ConnHdlr { + var template (value) SBC_AP_PDU tx; + /* TODO: pass Unknown Tracking Area List as parameter above (omit by default) */ + tx := ts_SBCAP_WRITE_WARNING_RESP(int2bit(msg.msg_id, 16), + int2bit(msg.ser_nr, 16)); + 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; + tx := ts_SBCAP_STOP_WARNING_RESP(int2bit(msg.msg_id, 16), + int2bit(msg.ser_nr, 16)); + f_SBC_AP_send(tx, idx); +} + +/* handle a SBc-AP Write-Replace Request and respond to it with Response or FAILURE depending on arguments */ +function f_sbcap_handle_write_replace_warn_req(CBS_Message msg, integer idx := 0) +runs on MME_ConnHdlr { + var template (present) SBC_AP_PDU rx_templ; + var SBC_AP_RecvFrom rf; + rx_templ := tr_SBCAP_WRITE_WARNING(int2bit(msg.msg_id, 16), + int2bit(msg.ser_nr, 16), + msg.rep_period, + msg.num_bcast_req); + alt { + [] SBC_AP[idx].receive(tr_SBC_AP_Recv(g_SBC_AP_conn_id[idx], rx_templ)) -> value rf { + var template (value) SBC_AP_PDU tx; + log ("received expected req:", rf); + f_sbcap_tx_write_replace_warn_resp(msg, idx); + } + [] SBC_AP[idx].receive { + setverdict(fail, "Received unexpected SBc-AP in index ", idx); + } + } +} + +/* handle a SBc-AP Stop-Warning-Request and respond to it with Response or FAILURE depending on arguments */ +function f_sbcap_handle_stop_warn_req(integer idx := 0, CBS_Message msg) +runs on MME_ConnHdlr { + var template (present) SBC_AP_PDU rx_templ; + var SBC_AP_RecvFrom rf; + + rx_templ := tr_SBCAP_STOP_WARNING(int2bit(msg.msg_id, 16), + int2bit(msg.ser_nr, 16)); + alt { + [] SBC_AP[idx].receive(tr_SBC_AP_Recv(g_SBC_AP_conn_id[idx], rx_templ)) -> value rf { + var template (value) SBC_AP_PDU tx; + log ("received expected req:", rf); + f_sbcap_tx_stop_warn_resp(idx, msg); + } + [] SBC_AP[idx].receive { + setverdict(fail, "Received unexpected SBc-AP in index ", idx); + } + } +} + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28830 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: Ia0300a2ae69bdf604373dbc484537958413c79a2 Gerrit-Change-Number: 28830 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in libosmocore[master]: fsm: osmo_fsm_{event,inst,state}_name(): make *fi pointer const

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28829 ) Change subject: fsm: osmo_fsm_{event,inst,state}_name(): make *fi pointer const ...................................................................... fsm: osmo_fsm_{event,inst,state}_name(): make *fi pointer const Change-Id: I98cde213deb5a3bf39eb9f5e5451f40223632844 --- M include/osmocom/core/fsm.h M src/fsm.c 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index 77ebe7c..5e5b091 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -224,9 +224,9 @@ int osmo_fsm_inst_update_id_f(struct osmo_fsm_inst *fi, const char *fmt, ...); int osmo_fsm_inst_update_id_f_sanitize(struct osmo_fsm_inst *fi, char replace_with, const char *fmt, ...); -const char *osmo_fsm_event_name(struct osmo_fsm *fsm, uint32_t event); -const char *osmo_fsm_inst_name(struct osmo_fsm_inst *fi); -const char *osmo_fsm_state_name(struct osmo_fsm *fsm, uint32_t state); +const char *osmo_fsm_event_name(const struct osmo_fsm *fsm, uint32_t event); +const char *osmo_fsm_inst_name(const struct osmo_fsm_inst *fi); +const char *osmo_fsm_state_name(const struct osmo_fsm *fsm, uint32_t state); /*! return the name of the state the FSM instance is currently in. */ static inline const char *osmo_fsm_inst_state_name(struct osmo_fsm_inst *fi) diff --git a/src/fsm.c b/src/fsm.c index b51c5cb..9333cac 100644 --- a/src/fsm.c +++ b/src/fsm.c @@ -576,7 +576,7 @@ * \param[in] event Event integer value * \returns string rendering of the event */ -const char *osmo_fsm_event_name(struct osmo_fsm *fsm, uint32_t event) +const char *osmo_fsm_event_name(const struct osmo_fsm *fsm, uint32_t event) { static __thread char buf[32]; if (!fsm->event_names) { @@ -590,7 +590,7 @@ * \param[in] fi FSM instance * \returns string rendering of the FSM identity */ -const char *osmo_fsm_inst_name(struct osmo_fsm_inst *fi) +const char *osmo_fsm_inst_name(const struct osmo_fsm_inst *fi) { if (!fi) return "NULL"; @@ -606,7 +606,7 @@ * \param[in] state FSM state number * \returns string rendering of the FSM state */ -const char *osmo_fsm_state_name(struct osmo_fsm *fsm, uint32_t state) +const char *osmo_fsm_state_name(const struct osmo_fsm *fsm, uint32_t state) { static __thread char buf[32]; if (state >= fsm->num_states) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I98cde213deb5a3bf39eb9f5e5451f40223632844 Gerrit-Change-Number: 28829 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in libosmocore[master]: fsm: osmo_fsm_{event,inst,state}_name(): make *fi pointer const

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28829 ) Change subject: fsm: osmo_fsm_{event,inst,state}_name(): make *fi pointer const ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I98cde213deb5a3bf39eb9f5e5451f40223632844 Gerrit-Change-Number: 28829 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 17:09:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in libosmocore[master]: fsm: osmo_fsm_{event,inst,state}_name(): make *fi pointer const

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28829 ) Change subject: fsm: osmo_fsm_{event,inst,state}_name(): make *fi pointer const ...................................................................... fsm: osmo_fsm_{event,inst,state}_name(): make *fi pointer const Change-Id: I98cde213deb5a3bf39eb9f5e5451f40223632844 --- M include/osmocom/core/fsm.h M src/fsm.c 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/29/28829/1 diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index 77ebe7c..5e5b091 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -224,9 +224,9 @@ int osmo_fsm_inst_update_id_f(struct osmo_fsm_inst *fi, const char *fmt, ...); int osmo_fsm_inst_update_id_f_sanitize(struct osmo_fsm_inst *fi, char replace_with, const char *fmt, ...); -const char *osmo_fsm_event_name(struct osmo_fsm *fsm, uint32_t event); -const char *osmo_fsm_inst_name(struct osmo_fsm_inst *fi); -const char *osmo_fsm_state_name(struct osmo_fsm *fsm, uint32_t state); +const char *osmo_fsm_event_name(const struct osmo_fsm *fsm, uint32_t event); +const char *osmo_fsm_inst_name(const struct osmo_fsm_inst *fi); +const char *osmo_fsm_state_name(const struct osmo_fsm *fsm, uint32_t state); /*! return the name of the state the FSM instance is currently in. */ static inline const char *osmo_fsm_inst_state_name(struct osmo_fsm_inst *fi) diff --git a/src/fsm.c b/src/fsm.c index b51c5cb..9333cac 100644 --- a/src/fsm.c +++ b/src/fsm.c @@ -576,7 +576,7 @@ * \param[in] event Event integer value * \returns string rendering of the event */ -const char *osmo_fsm_event_name(struct osmo_fsm *fsm, uint32_t event) +const char *osmo_fsm_event_name(const struct osmo_fsm *fsm, uint32_t event) { static __thread char buf[32]; if (!fsm->event_names) { @@ -590,7 +590,7 @@ * \param[in] fi FSM instance * \returns string rendering of the FSM identity */ -const char *osmo_fsm_inst_name(struct osmo_fsm_inst *fi) +const char *osmo_fsm_inst_name(const struct osmo_fsm_inst *fi) { if (!fi) return "NULL"; @@ -606,7 +606,7 @@ * \param[in] state FSM state number * \returns string rendering of the FSM state */ -const char *osmo_fsm_state_name(struct osmo_fsm *fsm, uint32_t state) +const char *osmo_fsm_state_name(const struct osmo_fsm *fsm, uint32_t state) { static __thread char buf[32]; if (state >= fsm->num_states) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I98cde213deb5a3bf39eb9f5e5451f40223632844 Gerrit-Change-Number: 28829 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022