lists.osmocom.org
Sign In Sign Up
Manage this list Sign In Sign Up

Keyboard Shortcuts

Thread View

  • j: Next unread message
  • k: Previous unread message
  • j a: Jump to all threads
  • j l: Jump to MailingList overview

gerrit-log

Thread Start a new thread
Download
Threads by month
  • ----- 2026 -----
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2025 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2024 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2023 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2022 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
gerrit-log@lists.osmocom.org

August 2022

  • 3 participants
  • 2402 discussions
Change in osmo-ttcn3-hacks[master]: cbc: Test ETWS msg over CBSP
by osmith 04 Aug '22

04 Aug '22
Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28912 ) Change subject: cbc: Test ETWS msg over CBSP ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28912 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: Ie22a00120218a205db11a5622274dcc67435f5de Gerrit-Change-Number: 28912 Gerrit-PatchSet: 3 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Aug 2022 11:46:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
Change in docker-playground[master]: ttcn3-cbc: Update osmo-cbc.cfg, CBC_Tests.cfg to latest ttcn3 testsuite
by pespin 04 Aug '22

04 Aug '22
pespin has submitted this change. ( 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(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified 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: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
Change in osmo-ttcn3-hacks[master]: cbc: Expect Concurrent-Warning-Message-Indicator IE in SBcAP Write-Re...
by pespin 04 Aug '22

04 Aug '22
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28898 ) Change subject: cbc: Expect Concurrent-Warning-Message-Indicator IE in SBcAP Write-Repl-Req ...................................................................... cbc: Expect Concurrent-Warning-Message-Indicator IE in SBcAP Write-Repl-Req 3GPP TS 23.041 9.3.32 states that the IE is always present for non-ETWS messages and never present in ETWS messages. The present template is used for CBS messages (non-ETWS) only so far. Once we add support to test ETWS message this will be updated accordingly if needed. Related: osmo-cbc.git I4a5ac56b7e6eeb85aee07ae2ddf10fa2afbbf4ef Related: OS#4945 Change-Id: I8f2067069ecf0c46f86279413a10e5970ec4456c --- M library/sbcap/SBC_AP_Templates.ttcn 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/sbcap/SBC_AP_Templates.ttcn b/library/sbcap/SBC_AP_Templates.ttcn index bfe9e97..0071056 100644 --- a/library/sbcap/SBC_AP_Templates.ttcn +++ b/library/sbcap/SBC_AP_Templates.ttcn @@ -159,7 +159,8 @@ template (present) uint16_t p_num_bcast, template (present) BIT8 dcs := ?, template (present) octetstring p_msg_content := ?, - template (present) Send_Write_Replace_Warning_Indication send_ind := ? + template (present) Send_Write_Replace_Warning_Indication send_ind := ?, + template (present) Concurrent_Warning_Message_Indicator concurrent_ind := ? ) := { initiatingMessage := { procedureCode := id_Write_Replace_Warning, @@ -206,6 +207,10 @@ /* OMC ID */ /* Concurrent Warning Message Indicator */ }, { + id := SBC_AP_Constants.id_Concurrent_Warning_Message_Indicator, + criticality := reject, + value_ := { Concurrent_Warning_Message_Indicator := concurrent_ind } + }, { id := SBC_AP_Constants.id_Send_Write_Replace_Warning_Indication, criticality := ignore, value_ := { Send_Write_Replace_Warning_Indication := send_ind } 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/+/28898 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: I8f2067069ecf0c46f86279413a10e5970ec4456c Gerrit-Change-Number: 28898 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
Change in osmo-ttcn3-hacks[master]: cbc: test concurrent CBS message
by pespin 04 Aug '22

04 Aug '22
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28899 ) Change subject: cbc: test concurrent CBS message ...................................................................... cbc: test concurrent CBS message Test having more than one active CBS message being broadcasted to an MME. Related: OS#4945 Change-Id: Ie9208c33f3b2586e19b446318b6ae9da07a76506 --- M cbc/CBC_Tests.ttcn 1 file changed, 58 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 9beaddf..fdf3b0f 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -596,6 +596,63 @@ f_shutdown_helper(); } +/* Create 2 concurrent messages against an MME, then delete them */ +private function f_mme_TC_concurrent_cbs_msg_mme() runs on MME_ConnHdlr { + var CBS_Message msg[2]; + msg[0] := g_pars.exp_cbs_msg; + msg[1] := msg[0]; + msg[1].msg_id := msg[0].msg_id + 1; + + for (var integer i := 0; i < lengthof(msg); i := i + 1) { + f_sbcap_handle_write_replace_warn_req(msg[i], 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, msg[i], + g_pars.write_replace_warning_ind_cause, + g_pars.bcast_cell_id_list) + } + } + /* Now handle Stop: */ + for (var integer i := 0; i < lengthof(msg); i := i + 1) { + f_sbcap_handle_stop_warn_req(0, msg[i]); + } +} +testcase TC_concurrent_cbs_msg_mme() runs on test_CT { + var template (value) CellId_Broadcast_List bcast_cell_id_li; + var CBS_Message msg[2]; + var EcbeCbcMessage ecbe; + + msg[0] := valueof(t_CBSmsg(49, 16752)); + msg[1] := msg[0]; + msg[1].msg_id := msg[0].msg_id + 1; + + 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_TC_concurrent_cbs_msg_mme); + g_pars_MME[0].exp_cbs_msg := msg[0]; + 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(); + + for (var integer i := 0; i < lengthof(msg); i := i + 1) { + ecbe := f_cbs2ecbe(msg[i], "TTCN-3"); + f_ecbe_tx_post_cbs(ecbe); + f_ecbe_rx_resp(201); + } + + f_sleep(2.0); + + for (var integer i := 0; i < lengthof(msg); i := i + 1) { + f_ecbe_tx_delete_cbs(msg[i].msg_id); + f_ecbe_rx_resp(200); + } + + f_shutdown_helper(); +} + control { execute( TC_rx_keepalive() ); execute( TC_rx_keepalive_timeout() ); @@ -609,6 +666,7 @@ execute( TC_ecbe_create_delete_bsc_and_mme() ); execute( TC_ecbe_create_delete_bsc_server() ); execute( TC_ecbe_create_delete_mme_server() ); + execute( TC_concurrent_cbs_msg_mme() ); } } 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/+/28899 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: Ie9208c33f3b2586e19b446318b6ae9da07a76506 Gerrit-Change-Number: 28899 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
Change in osmo-ttcn3-hacks[master]: cbc: Support mme/bsc sctp/tcp server mode
by pespin 04 Aug '22

04 Aug '22
pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve 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: 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
Change in osmo-ttcn3-hacks[master]: cbc: Test sending Unknown TAI List to osmo-cbc
by pespin 04 Aug '22

04 Aug '22
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28893 ) Change subject: cbc: Test sending Unknown TAI List to osmo-cbc ...................................................................... cbc: Test sending Unknown TAI List to osmo-cbc Related: OS#4945 Change-Id: I7d8cf5e6498d03ad340b8f843ce93a20171e9fca --- M cbc/CBC_Tests.ttcn M cbc/MME_ConnectionHandler.ttcn M library/sbcap/SBC_AP_Templates.ttcn 3 files changed, 71 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 406baed..9beaddf 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -160,6 +160,7 @@ start_fn := refers(f_MME_ConnHdlr_start_fn_void), exp_cbs_msg := omit, write_replace_warning_ind_cause := omit, + write_repl_unknown_TAIs := omit, bcast_cell_id_list := omit }; return pars; @@ -498,6 +499,25 @@ f_shutdown_helper(); } +/* Create and delete message with MME available. MME reports + * Write-Replace-Response with Unknown TAI IE. + */ +testcase TC_ecbe_create_delete_mme_unknown_tai() runs on test_CT { + var template (value) List_of_TAIs write_repl_unknown_TAIs; + var template (value) CBS_Message msg := t_CBSmsg(48, 16752); + + f_init(num_bsc := 0, num_mme := 1); + + write_repl_unknown_TAIs := {{ts_SBCAP_TAI(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].write_repl_unknown_TAIs := valueof(write_repl_unknown_TAIs); + 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); @@ -585,6 +605,7 @@ execute( TC_ecbe_create_delete_ci() ); execute( TC_ecbe_create_delete_lai() ); execute( TC_ecbe_create_delete_mme_indication() ); + execute( TC_ecbe_create_delete_mme_unknown_tai() ); 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/MME_ConnectionHandler.ttcn b/cbc/MME_ConnectionHandler.ttcn index ed0502e..4bcc853 100644 --- a/cbc/MME_ConnectionHandler.ttcn +++ b/cbc/MME_ConnectionHandler.ttcn @@ -45,6 +45,7 @@ void_fn start_fn, CBS_Message exp_cbs_msg optional, SBC_AP_Cause write_replace_warning_ind_cause optional, + List_of_TAIs write_repl_unknown_TAIs optional, CellId_Broadcast_List bcast_cell_id_list optional }; @@ -64,9 +65,16 @@ 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)); + if (ispresent(g_pars.write_repl_unknown_TAIs)) { + tx := ts_SBCAP_WRITE_WARNING_RESP_UNKNOWN_TAI( + int2bit(msg.msg_id, 16), + int2bit(msg.ser_nr, 16), + SBC_AP_Cause_message_accepted, + g_pars.write_repl_unknown_TAIs); + } else { + tx := ts_SBCAP_WRITE_WARNING_RESP(int2bit(msg.msg_id, 16), + int2bit(msg.ser_nr, 16)); + } f_SBC_AP_send(tx, idx); } diff --git a/library/sbcap/SBC_AP_Templates.ttcn b/library/sbcap/SBC_AP_Templates.ttcn index 0a9519e..bfe9e97 100644 --- a/library/sbcap/SBC_AP_Templates.ttcn +++ b/library/sbcap/SBC_AP_Templates.ttcn @@ -18,6 +18,13 @@ iE_Extensions := omit } +/* 3GPP TS 36.413 9.2.3.16 */ +template (value) TAI ts_SBCAP_TAI(PLMNidentity plmn_id := '09F107'O, uint16_t tac := 1) := { + pLMNidentity := plmn_id, + tAC := int2oct(tac, 2), + 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()) := { @@ -273,6 +280,38 @@ } } +template (value) SBC_AP_PDU +ts_SBCAP_WRITE_WARNING_RESP_UNKNOWN_TAI(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) List_of_TAIs unknown_tai_list := {{ts_SBCAP_TAI}}) +modifies ts_SBCAP_WRITE_WARNING_RESP := { + successfulOutcome := { + value_ := { + write_Replace_Warning_Response := { + 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_Cause, + criticality := reject, + value_ := { Cause := enum2int(valueof(cause)) } + }, { + id := SBC_AP_Constants.id_Unknown_Tracking_Area_List, + criticality := ignore, + value_ := { List_of_TAIs := unknown_tai_list } + } + } + } + } + } +} + template (present) SBC_AP_PDU tr_SBCAP_STOP_WARNING(template (present) BIT16 p_msg_id, template (present) BIT16 p_ser_nr) := { initiatingMessage := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7d8cf5e6498d03ad340b8f843ce93a20171e9fca Gerrit-Change-Number: 28893 Gerrit-PatchSet: 4 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
Change in osmo-ttcn3-hacks[master]: cbc: Test ETWS msg over CBSP
by pespin 04 Aug '22

04 Aug '22
Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28912 ) Change subject: cbc: Test ETWS msg over CBSP ...................................................................... Patch Set 3: (1 comment) File library/CBSP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28912/comment/910be751_b4db… PS2, Line 424: > 6.5.0 > maybe change the error message to "unsupported template kind (wrong titan version?)" then or somethi […] As stated I'm simply keeping the original message here, notreally related to this patch. I'm only duplicating the template to have a slightly different representation here. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28912 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: Ie22a00120218a205db11a5622274dcc67435f5de Gerrit-Change-Number: 28912 Gerrit-PatchSet: 3 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Aug 2022 11:37:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment
1 0
0 0
Change in osmo-ttcn3-hacks[master]: cbc: Test sending Unknown TAI List to osmo-cbc
by pespin 04 Aug '22

04 Aug '22
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28893 ) Change subject: cbc: Test sending Unknown TAI List to osmo-cbc ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7d8cf5e6498d03ad340b8f843ce93a20171e9fca Gerrit-Change-Number: 28893 Gerrit-PatchSet: 4 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Aug 2022 11:36:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
Change in osmo-ttcn3-hacks[master]: cbc: Test sending Unknown TAI List to osmo-cbc
by osmith 04 Aug '22

04 Aug '22
Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28893 ) Change subject: cbc: Test sending Unknown TAI List to osmo-cbc ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7d8cf5e6498d03ad340b8f843ce93a20171e9fca Gerrit-Change-Number: 28893 Gerrit-PatchSet: 4 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Aug 2022 11:34:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
Change in osmo-ttcn3-hacks[master]: sbcap: Fix spec references in comments
by pespin 04 Aug '22

04 Aug '22
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28930 ) Change subject: sbcap: Fix spec references in comments ...................................................................... sbcap: Fix spec references in comments Change-Id: I89bc9d15548e6c709f0e1b614f00bc98ec41d441 --- M library/sbcap/SBC_AP_Templates.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/28930/1 diff --git a/library/sbcap/SBC_AP_Templates.ttcn b/library/sbcap/SBC_AP_Templates.ttcn index 4ca714c..68afb58 100644 --- a/library/sbcap/SBC_AP_Templates.ttcn +++ b/library/sbcap/SBC_AP_Templates.ttcn @@ -302,7 +302,7 @@ } } -/* 4.3.4.2.3 STOP WARNING REQUEST */ +/* 4.3.4.2.2 WRITE-REPLACE WARNING RESPONSE */ template (value) SBC_AP_PDU ts_SBCAP_WRITE_WARNING_RESP(template (value) BIT16 p_msg_id, template (value) BIT16 p_ser_nr, template (value) SBC_AP_Cause cause := SBC_AP_Cause_message_accepted) := { @@ -364,6 +364,7 @@ } } +/* 4.3.4.2.3 STOP WARNING REQUEST */ template (present) SBC_AP_PDU tr_SBCAP_STOP_WARNING(template (present) BIT16 p_msg_id, template (present) BIT16 p_ser_nr) := { initiatingMessage := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28930 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: I89bc9d15548e6c709f0e1b614f00bc98ec41d441 Gerrit-Change-Number: 28930 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange
1 0
0 0
  • ← Newer
  • 1
  • ...
  • 207
  • 208
  • 209
  • 210
  • 211
  • 212
  • 213
  • ...
  • 241
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.