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

[M] Change in libosmocore[master]: After writing VTY config, run sync() in a different thread

by pespin

Attention is currently required from: jolly, laforge. pespin has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/libosmocore/+/37798?usp=email ) Change subject: After writing VTY config, run sync() in a different thread ...................................................................... Patch Set 5: (1 comment) Patchset: PS5: > Actually I don't see why we should use sync()/fsync() at all? As you mentioned i a call, modern file […] I'm fine with whatever means not adding a new thread to libosmocore just for this specific case used seldomly. One can also use the vty cmd to write the config file to another file, and then over ssh copy over the new file to the old file in whatever sync/safe manner they want. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37798?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3cb2ee68b2e4c730f96522208c4abf00d0f49a44 Gerrit-Change-Number: 37798 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Hoernchen <ewild(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 23 Aug 2024 11:16:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

10 months, 2 weeks

1
0
0 0

[M] Change in docker-playground[master]: ttcn3-epdg-test: restore osmo-epdg.latest.config

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/37914?usp=email ) Change subject: ttcn3-epdg-test: restore osmo-epdg.latest.config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37914?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icb3e79d5f5ca9af67037c2746318d61fd2713967 Gerrit-Change-Number: 37914 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Aug 2024 11:14:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

10 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: Immediate stop all components upon ConnHdlr failure

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37909?usp=email ) Change subject: s1gw: Immediate stop all components upon ConnHdlr failure ...................................................................... s1gw: Immediate stop all components upon ConnHdlr failure Otherwise it's difficult to see/find in logs stuff like timeouts waiting for messages, etc. Change-Id: I8b3b7e9cd61a8ad0d167f20a41c61eac3f245d70 --- M s1gw/ConnHdlr.ttcn 1 file changed, 16 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/s1gw/ConnHdlr.ttcn b/s1gw/ConnHdlr.ttcn index cd327ef..4af0ef7 100644 --- a/s1gw/ConnHdlr.ttcn +++ b/s1gw/ConnHdlr.ttcn @@ -70,8 +70,8 @@ local_addr, 0, -1, { sctp := c_SctpTuple_S1AP }); if (not ispresent(res.connId)) { - setverdict(fail, "Could not create an S1AP socket, check your configuration"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Could not create an S1AP socket, check your configuration"); } g_s1ap_conn_id := res.connId; @@ -83,8 +83,8 @@ } [] S1AP_ENB.receive(PortEvent:{sctpEvent := ?}) { repeat; } [] T.timeout { - setverdict(fail, "eNB connection establishment timeout"); - self.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "eNB connection establishment timeout"); } } } @@ -131,11 +131,12 @@ T.stop; } [] S1AP_CONN.receive(S1AP_PDU:?) -> value pdu { - setverdict(fail, "Rx unexpected S1AP PDU from eNB: ", pdu); - T.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx unexpected S1AP PDU from eNB: ", pdu)); } [] T.timeout { - setverdict(fail, "Timeout waiting for S1AP PDU from eNB: ", tr_pdu); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for S1AP PDU from eNB: ", tr_pdu)); } } } @@ -156,11 +157,12 @@ } [] S1AP_ENB.receive(t_S1AP_RecvFrom(?)) -> value recv { pdu := recv.msg; - setverdict(fail, "Rx unexpected S1AP PDU from MME: ", pdu); - T.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx unexpected S1AP PDU from MME: ", pdu)); } [] T.timeout { - setverdict(fail, "Timeout waiting for S1AP PDU from MME: ", tr_pdu); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for S1AP PDU from MME: ", tr_pdu)); } } } @@ -188,11 +190,12 @@ T.stop; } [] S1AP_CONN.receive(S1AP_PDU:?) -> value pdu { - setverdict(fail, "Rx unexpected S1AP PDU: ", pdu); - T.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx unexpected S1AP PDU: ", pdu)); } [] T.timeout { - setverdict(fail, "Timeout waiting for S1AP SetupReq"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for S1AP SetupReq")); } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37909?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8b3b7e9cd61a8ad0d167f20a41c61eac3f245d70 Gerrit-Change-Number: 37909 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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>

10 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: s1gw: Wait for component to stop before testing IUT for conn refused

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37908?usp=email ) Change subject: s1gw: Wait for component to stop before testing IUT for conn refused ...................................................................... s1gw: Wait for component to stop before testing IUT for conn refused Change-Id: I9dcac498766dd4a597cc5827bdb9192e861356c6 --- M s1gw/S1GW_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index d766ed1..de680bb 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -159,6 +159,7 @@ f_init(); f_init_s1ap_srv(); vc_S1APSRV.stop; + vc_S1APSRV.done; vc_conn := f_ConnHdlr_spawn(refers(f_TC_conn_term_mme_unavail), pars); vc_conn.done; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37908?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9dcac498766dd4a597cc5827bdb9192e861356c6 Gerrit-Change-Number: 37908 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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>

10 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: s1gw: Increase failure timeouts to ease debugging

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37910?usp=email ) Change subject: s1gw: Increase failure timeouts to ease debugging ...................................................................... s1gw: Increase failure timeouts to ease debugging Let the IUT do some stuff before quickly exiting. In fact, the previous timeouts were a bit tight anyway since several messages may be required before an answer comes back on the same interface. Change-Id: I985511c1a56edb0663826a20bbf27ea34a6c4dcd --- M s1gw/ConnHdlr.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/s1gw/ConnHdlr.ttcn b/s1gw/ConnHdlr.ttcn index 4af0ef7..4b906c2 100644 --- a/s1gw/ConnHdlr.ttcn +++ b/s1gw/ConnHdlr.ttcn @@ -120,7 +120,7 @@ function f_ConnHdlr_rx_s1ap_from_enb(out S1AP_PDU pdu, template (present) S1AP_PDU tr_pdu := ?, - float Tval := 0.5) + float Tval := 3.0) runs on ConnHdlr { timer T := Tval; @@ -143,7 +143,7 @@ function f_ConnHdlr_rx_s1ap_from_mme(out S1AP_PDU pdu, template (present) S1AP_PDU tr_pdu := ?, - float Tval := 0.5) + float Tval := 3.0) runs on ConnHdlr { var S1AP_RecvFrom recv; timer T := Tval; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37910?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I985511c1a56edb0663826a20bbf27ea34a6c4dcd Gerrit-Change-Number: 37910 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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>

10 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: Fix direction of e-RAB Setup

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37911?usp=email ) Change subject: s1gw: Fix direction of e-RAB Setup ...................................................................... s1gw: Fix direction of e-RAB Setup Change-Id: Idfc3bc0a53d5f966a889b997c3d5a4928297236f --- M s1gw/S1GW_Tests.ttcn 1 file changed, 10 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index de680bb..5e2433e 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -175,7 +175,7 @@ f_ConnHdlr_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); f_ConnHdlr_setup(pars.genb_id); - log("eNB -> [S1GW] -> MME: E-RAB SETUP REQUEST"); + log("eNB <- [S1GW] <- MME: E-RAB SETUP REQUEST"); var template (value) E_RABToBeSetupListBearerSUReq items_req; var E_RABToBeSetupItemBearerSUReq item_req := { e_RAB_ID := erab_id, @@ -196,18 +196,18 @@ iE_Extensions := omit }; - /* eNB -> S1GW */ + /* MME -> S1GW */ item_req.transportLayerAddress := oct2bit(f_inet_addr("1.2.3.4")); items_req := ts_S1AP_RABToBeSetupListBearerSUReq(item_req); - f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABSetupReq(mme_id, enb_id, items_req)); + f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABSetupReq(mme_id, enb_id, items_req)); - /* S1GW -> MME */ + /* S1GW -> eNB */ item_req.transportLayerAddress := oct2bit(f_inet_addr(mp_s1gw_mme_ip)); items_req := ts_S1AP_RABToBeSetupListBearerSUReq(item_req); - f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABSetupReq(mme_id, enb_id, items_req)); + f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABSetupReq(mme_id, enb_id, items_req)); - log("eNB <- [S1GW] <- MME: E-RAB SETUP RESPONSE"); + log("eNB -> [S1GW] -> MME: E-RAB SETUP RESPONSE"); var template (value) E_RABSetupListBearerSURes items_res; var E_RABSetupItemBearerSURes item_res := { e_RAB_ID := erab_id, @@ -216,15 +216,15 @@ iE_Extensions := omit }; - /* MME -> S1GW */ + /* eNB -> S1GW */ item_res.transportLayerAddress := oct2bit(f_inet_addr("4.3.2.1")); items_res := ts_S1AP_RABSetupListBearerSURes(item_res); - f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABSetupRsp(mme_id, enb_id, items_res)); + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABSetupRsp(mme_id, enb_id, items_res)); - /* S1GW -> eNB */ + /* S1GW -> MME */ item_res.transportLayerAddress := oct2bit(f_inet_addr(mp_s1gw_enb_ip)); items_res := ts_S1AP_RABSetupListBearerSURes(item_res); - f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABSetupRsp(mme_id, enb_id, items_res)); + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABSetupRsp(mme_id, enb_id, items_res)); f_ConnHdlr_disconnect(); f_ConnHdlr_unregister(pars.genb_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37911?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idfc3bc0a53d5f966a889b997c3d5a4928297236f Gerrit-Change-Number: 37911 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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>

10 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: Add mp_enb_bind_ip module parameter

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37905?usp=email ) Change subject: s1gw: Add mp_enb_bind_ip module parameter ...................................................................... s1gw: Add mp_enb_bind_ip module parameter This allows more easily understanding pcap traces by looking at the config file to identify the ip addresses. Change-Id: I294b14e6ef119c17eec22f813d5755279560e0bc --- M s1gw/ConnHdlr.ttcn M s1gw/S1GW_Tests.cfg M s1gw/S1GW_Tests.ttcn 3 files changed, 8 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/s1gw/ConnHdlr.ttcn b/s1gw/ConnHdlr.ttcn index 69c19b6..cd327ef 100644 --- a/s1gw/ConnHdlr.ttcn +++ b/s1gw/ConnHdlr.ttcn @@ -58,7 +58,7 @@ type function void_fn(ConnHdlrPars pars) runs on ConnHdlr; -function f_ConnHdlr_connect(charstring remote_addr) runs on ConnHdlr { +function f_ConnHdlr_connect(charstring local_addr, charstring remote_addr) runs on ConnHdlr { var Result res; timer T; @@ -67,7 +67,7 @@ /* initiate SCTP connection establishment */ res := S1AP_CodecPort_CtrlFunct.f_IPL4_connect(S1AP_ENB, remote_addr, 36412, - "0.0.0.0", 0, -1, + local_addr, 0, -1, { sctp := c_SctpTuple_S1AP }); if (not ispresent(res.connId)) { setverdict(fail, "Could not create an S1AP socket, check your configuration"); diff --git a/s1gw/S1GW_Tests.cfg b/s1gw/S1GW_Tests.cfg index 536f0ec..8365b13 100644 --- a/s1gw/S1GW_Tests.cfg +++ b/s1gw/S1GW_Tests.cfg @@ -13,6 +13,7 @@ [MODULE_PARAMETERS] S1GW_Tests.mp_s1gw_enb_ip := "127.0.1.1"; S1GW_Tests.mp_s1gw_mme_ip := "127.0.2.1"; +S1GW_Tests.mp_enb_bind_ip := "127.0.1.10"; S1GW_Tests.mp_mme_bind_ip := "127.0.2.10"; [MAIN_CONTROLLER] diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 2625799..d766ed1 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -35,6 +35,7 @@ modulepar { charstring mp_s1gw_enb_ip; /* eNB facing address of the S1GW */ charstring mp_s1gw_mme_ip; /* MME facing address of the S1GW */ + charstring mp_enb_bind_ip; /* eNB address to use locally when connecting to S1GW */ charstring mp_mme_bind_ip; /* MME address on which we get connections from S1GW */ } @@ -81,7 +82,7 @@ function f_TC_setup(ConnHdlrPars pars) runs on ConnHdlr { f_ConnHdlr_register(pars.genb_id); - f_ConnHdlr_connect(mp_s1gw_enb_ip); + f_ConnHdlr_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); f_ConnHdlr_setup(pars.genb_id); f_sleep(0.5); /* keep the connection idle for some time */ f_ConnHdlr_disconnect(); @@ -120,7 +121,7 @@ function f_TC_conn_term_by_mme(ConnHdlrPars pars) runs on ConnHdlr { f_ConnHdlr_register(pars.genb_id); - f_ConnHdlr_connect(mp_s1gw_enb_ip); + f_ConnHdlr_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); f_ConnHdlr_setup(pars.genb_id); f_sleep(0.5); /* keep the connection idle for some time */ @@ -146,7 +147,7 @@ /* MME is not available, expect S1GW to terminate the eNB connection */ function f_TC_conn_term_mme_unavail(ConnHdlrPars pars) runs on ConnHdlr { /* establish an eNB connection to the S1GW */ - f_ConnHdlr_connect(mp_s1gw_enb_ip); + f_ConnHdlr_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); /* expect our eNB connection to be released gracefully */ f_ConnHdlr_expect_shutdown(); setverdict(pass); @@ -170,7 +171,7 @@ var S1AP_PDU pdu; f_ConnHdlr_register(pars.genb_id); - f_ConnHdlr_connect(mp_s1gw_enb_ip); + f_ConnHdlr_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); f_ConnHdlr_setup(pars.genb_id); log("eNB -> [S1GW] -> MME: E-RAB SETUP REQUEST"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37905?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I294b14e6ef119c17eec22f813d5755279560e0bc Gerrit-Change-Number: 37905 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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>

10 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: initial testenv.cfg

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37906?usp=email ) Change subject: s1gw: initial testenv.cfg ...................................................................... s1gw: initial testenv.cfg This commit already provides a running setup to run the testsuite, similar to the one already available in docker-playground.git. Change-Id: Ib66c3f23355c117302b48fc9ef05cde1920d8739 --- A s1gw/osmo-s1gw.config A s1gw/testenv.cfg 2 files changed, 44 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/s1gw/osmo-s1gw.config b/s1gw/osmo-s1gw.config new file mode 100644 index 0000000..f4a4a73 --- /dev/null +++ b/s1gw/osmo-s1gw.config @@ -0,0 +1,35 @@ +%% -*- erlang -*- + +[%% ================================================================================ + %% application config + %% + %% eNB S1GW + %% +-----+ +----------------+ + %% | ... | --> | s1gw_bind_addr | MME + %% +-----+ +----------------+ +-----------------+ + %% | mme_loc_addr | --> | mme_rem_addr | + %% +----------------+ +-----------------+ + %% ================================================================================ + {osmo_s1gw, + [{s1gw_bind_addr, "127.0.1.1"}, %% S1GW bind address for incoming eNB connections + {mme_loc_addr, "127.0.2.1"}, %% local address for outgoing connections to the MME + {mme_rem_addr, "127.0.2.10"} %% remote address for outgoing connections to the MME + ]}, + %% ================================================================================ + %% kernel config + %% ================================================================================ + {kernel, + [{logger_level, debug}, + {logger, + [{handler, default, logger_std_h, + #{level => debug, + formatter => {logger_formatter, + #{template => [time, " ", + "[", level, "]", + {pid, [" ", pid, ""], ""}, + {prefix, [" ", prefix, " ::"], ""}, + " ", msg, + {mfa, [" (", mfa, ":", line, ")"], ""}, + "\n"]}}}}]}]}]. + +%% vim:set ts=2 sw=2 et: diff --git a/s1gw/testenv.cfg b/s1gw/testenv.cfg new file mode 100644 index 0000000..ff74821 --- /dev/null +++ b/s1gw/testenv.cfg @@ -0,0 +1,9 @@ +[testsuite] +program=S1GW_Tests +config=S1GW_Tests.cfg + +[s1gw] +program=ERL_FLAGS="-config osmo-s1gw.config" osmo-s1gw +make=osmo-s1gw +package=osmo-s1gw +copy=osmo-s1gw.config -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37906?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib66c3f23355c117302b48fc9ef05cde1920d8739 Gerrit-Change-Number: 37906 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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>

10 months, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: s1gw: Split ConnHdlr to its own file

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37898?usp=email ) Change subject: s1gw: Split ConnHdlr to its own file ...................................................................... s1gw: Split ConnHdlr to its own file This allows easily separating general routines from test specific code. Change-Id: I9f8d9afbccd59f3e22649b35d2a7ef75578d051a --- A s1gw/ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn 2 files changed, 205 insertions(+), 172 deletions(-) Approvals: osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/s1gw/ConnHdlr.ttcn b/s1gw/ConnHdlr.ttcn new file mode 100644 index 0000000..69c19b6 --- /dev/null +++ b/s1gw/ConnHdlr.ttcn @@ -0,0 +1,200 @@ +/* OsmoS1GW (S1AP Gateway) ConnHdlr + * + * (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Vadim Yanitskiy <vyanitskiy(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 ConnHdlr { + +import from General_Types all; +import from Osmocom_Types all; +import from Native_Functions all; +import from IPL4asp_Types all; +import from Misc_Helpers all; + +import from S1AP_CodecPort all; +import from S1AP_CodecPort_CtrlFunct all; +import from S1AP_Types all; +import from S1AP_Templates all; +import from S1AP_PDU_Descriptions all; +import from S1AP_IEs all; +import from S1AP_PDU_Contents all; +import from S1AP_Constants all; + +import from SCTP_Templates all; +import from S1AP_Server all; + +type component ConnHdlr extends S1APSRV_ConnHdlr { + port S1AP_CODEC_PT S1AP_ENB; + var ConnectionId g_s1ap_conn_id := -1; +}; +type record of ConnHdlr ConnHdlrList; + +type record ConnHdlrPars { + Global_ENB_ID genb_id +}; + +template Global_ENB_ID +ts_Global_ENB_ID(integer enb_id := 0, + OCT3 plmn_id := '00f110'O) := { + pLMNidentity := plmn_id, + eNB_ID := { + macroENB_ID := int2bit(enb_id, 20) + }, + iE_Extensions := omit +} + +template (value) ConnHdlrPars +t_ConnHdlrPars(integer enb_id := 0) := { + genb_id := ts_Global_ENB_ID(enb_id) +} + +type function void_fn(ConnHdlrPars pars) runs on ConnHdlr; + +function f_ConnHdlr_connect(charstring remote_addr) runs on ConnHdlr { + var Result res; + timer T; + + map(self:S1AP_ENB, system:S1AP_CODEC_PT); + + /* initiate SCTP connection establishment */ + res := S1AP_CodecPort_CtrlFunct.f_IPL4_connect(S1AP_ENB, + remote_addr, 36412, + "0.0.0.0", 0, -1, + { sctp := c_SctpTuple_S1AP }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not create an S1AP socket, check your configuration"); + mtc.stop; + } + g_s1ap_conn_id := res.connId; + + /* wait for the establishment confirmation */ + T.start(2.0); + alt { + [] S1AP_ENB.receive(tr_SctpAssocChange(SCTP_COMM_UP, g_s1ap_conn_id)) { + log("eNB connection established"); + } + [] S1AP_ENB.receive(PortEvent:{sctpEvent := ?}) { repeat; } + [] T.timeout { + setverdict(fail, "eNB connection establishment timeout"); + self.stop; + } + } +} + +function f_ConnHdlr_disconnect() runs on ConnHdlr { + var Result res; + + S1AP_CodecPort_CtrlFunct.f_IPL4_close(S1AP_ENB, g_s1ap_conn_id, + { sctp := c_SctpTuple_S1AP }); + g_s1ap_conn_id := -1; + unmap(self:S1AP_ENB, system:S1AP_CODEC_PT); + + S1AP_CONN.receive(S1APSRV_Event:S1APSRV_EVENT_CONN_DOWN); + + log("eNB connection closed"); +} + +function f_ConnHdlr_expect_shutdown() runs on ConnHdlr { + S1AP_ENB.receive(tr_SctpShutDownEvent(g_s1ap_conn_id)); + S1AP_ENB.receive(tr_SctpAssocChange(SCTP_SHUTDOWN_COMP, g_s1ap_conn_id)); + S1AP_ENB.receive(PortEvent:{connClosed := ?}); +} + +function f_ConnHdlr_tx_s1ap_from_enb(template (value) S1AP_PDU pdu) +runs on ConnHdlr { + S1AP_ENB.send(t_S1AP_Send(g_s1ap_conn_id, pdu)); +} + +function f_ConnHdlr_tx_s1ap_from_mme(template (value) S1AP_PDU pdu) +runs on ConnHdlr { + S1AP_CONN.send(pdu); +} + +function f_ConnHdlr_rx_s1ap_from_enb(out S1AP_PDU pdu, + template (present) S1AP_PDU tr_pdu := ?, + float Tval := 0.5) +runs on ConnHdlr { + timer T := Tval; + + T.start; + alt { + [] S1AP_CONN.receive(tr_pdu) -> value pdu { + setverdict(pass); + T.stop; + } + [] S1AP_CONN.receive(S1AP_PDU:?) -> value pdu { + setverdict(fail, "Rx unexpected S1AP PDU from eNB: ", pdu); + T.stop; + } + [] T.timeout { + setverdict(fail, "Timeout waiting for S1AP PDU from eNB: ", tr_pdu); + } + } +} + +function f_ConnHdlr_rx_s1ap_from_mme(out S1AP_PDU pdu, + template (present) S1AP_PDU tr_pdu := ?, + float Tval := 0.5) +runs on ConnHdlr { + var S1AP_RecvFrom recv; + timer T := Tval; + + T.start; + alt { + [] S1AP_ENB.receive(t_S1AP_RecvFrom(tr_pdu)) -> value recv { + pdu := recv.msg; + setverdict(pass); + T.stop; + } + [] S1AP_ENB.receive(t_S1AP_RecvFrom(?)) -> value recv { + pdu := recv.msg; + setverdict(fail, "Rx unexpected S1AP PDU from MME: ", pdu); + T.stop; + } + [] T.timeout { + setverdict(fail, "Timeout waiting for S1AP PDU from MME: ", tr_pdu); + } + } +} + +function f_ConnHdlr_setup(Global_ENB_ID genb_id) runs on ConnHdlr { + var S1AP_PDU pdu; + timer T; + + var SupportedTAs supported_tas_dummy := { + { + tAC := '0000'O, + broadcastPLMNs := { '00f000'O }, + iE_Extensions := omit + } + }; + + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_SetupReq(genb_id, + supported_tas_dummy, + v32)); + T.start(1.0); + alt { + [] S1AP_CONN.receive(S1APSRV_Event:S1APSRV_EVENT_CONN_UP) { repeat; } + [] S1AP_CONN.receive(tr_S1AP_SetupReq) { + setverdict(pass); + T.stop; + } + [] S1AP_CONN.receive(S1AP_PDU:?) -> value pdu { + setverdict(fail, "Rx unexpected S1AP PDU: ", pdu); + T.stop; + } + [] T.timeout { + setverdict(fail, "Timeout waiting for S1AP SetupReq"); + } + } +} + +} diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 0fb3075..2625799 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -30,6 +30,7 @@ import from SCTP_Templates all; import from S1AP_Server all; +import from ConnHdlr all; modulepar { charstring mp_s1gw_enb_ip; /* eNB facing address of the S1GW */ @@ -37,13 +38,6 @@ charstring mp_mme_bind_ip; /* MME address on which we get connections from S1GW */ } -private type record of ConnHdlr ConnHdlrList; - -type component ConnHdlr extends S1APSRV_ConnHdlr { - port S1AP_CODEC_PT S1AP_ENB; - var ConnectionId g_s1ap_conn_id := -1; -}; - type component test_CT { timer g_Tguard; var S1AP_Server_CT vc_S1APSRV; @@ -55,16 +49,6 @@ } } -template Global_ENB_ID -ts_Global_ENB_ID(integer enb_id := 0, - OCT3 plmn_id := '00f110'O) := { - pLMNidentity := plmn_id, - eNB_ID := { - macroENB_ID := int2bit(enb_id, 20) - }, - iE_Extensions := omit -} - function f_init(float Tval := 20.0) runs on test_CT { g_Tguard.start(Tval); activate(as_Tguard()); @@ -80,17 +64,6 @@ vc_S1APSRV.start(S1AP_Server.main(cpars)); } -type record ConnHdlrPars { - Global_ENB_ID genb_id -}; - -template (value) ConnHdlrPars -t_ConnHdlrPars(integer enb_id := 0) := { - genb_id := ts_Global_ENB_ID(enb_id) -} - -type function void_fn(ConnHdlrPars pars) runs on ConnHdlr; - function f_ConnHdlr_spawn(void_fn fn, ConnHdlrPars pars) runs on test_CT return ConnHdlr { var ConnHdlr vc_conn; @@ -105,150 +78,10 @@ return vc_conn; } -function f_ConnHdlr_connect() runs on ConnHdlr { - var Result res; - timer T; - - map(self:S1AP_ENB, system:S1AP_CODEC_PT); - - /* initiate SCTP connection establishment */ - res := S1AP_CodecPort_CtrlFunct.f_IPL4_connect(S1AP_ENB, - mp_s1gw_enb_ip, 36412, - "0.0.0.0", 0, -1, - { sctp := c_SctpTuple_S1AP }); - if (not ispresent(res.connId)) { - setverdict(fail, "Could not create an S1AP socket, check your configuration"); - mtc.stop; - } - g_s1ap_conn_id := res.connId; - - /* wait for the establishment confirmation */ - T.start(2.0); - alt { - [] S1AP_ENB.receive(tr_SctpAssocChange(SCTP_COMM_UP, g_s1ap_conn_id)) { - log("eNB connection established"); - } - [] S1AP_ENB.receive(PortEvent:{sctpEvent := ?}) { repeat; } - [] T.timeout { - setverdict(fail, "eNB connection establishment timeout"); - self.stop; - } - } -} - -function f_ConnHdlr_disconnect() runs on ConnHdlr { - var Result res; - - S1AP_CodecPort_CtrlFunct.f_IPL4_close(S1AP_ENB, g_s1ap_conn_id, - { sctp := c_SctpTuple_S1AP }); - g_s1ap_conn_id := -1; - unmap(self:S1AP_ENB, system:S1AP_CODEC_PT); - - S1AP_CONN.receive(S1APSRV_Event:S1APSRV_EVENT_CONN_DOWN); - - log("eNB connection closed"); -} - -function f_ConnHdlr_expect_shutdown() runs on ConnHdlr { - S1AP_ENB.receive(tr_SctpShutDownEvent(g_s1ap_conn_id)); - S1AP_ENB.receive(tr_SctpAssocChange(SCTP_SHUTDOWN_COMP, g_s1ap_conn_id)); - S1AP_ENB.receive(PortEvent:{connClosed := ?}); -} - -function f_ConnHdlr_tx_s1ap_from_enb(template (value) S1AP_PDU pdu) -runs on ConnHdlr { - S1AP_ENB.send(t_S1AP_Send(g_s1ap_conn_id, pdu)); -} - -function f_ConnHdlr_tx_s1ap_from_mme(template (value) S1AP_PDU pdu) -runs on ConnHdlr { - S1AP_CONN.send(pdu); -} - -function f_ConnHdlr_rx_s1ap_from_enb(out S1AP_PDU pdu, - template (present) S1AP_PDU tr_pdu := ?, - float Tval := 0.5) -runs on ConnHdlr { - timer T := Tval; - - T.start; - alt { - [] S1AP_CONN.receive(tr_pdu) -> value pdu { - setverdict(pass); - T.stop; - } - [] S1AP_CONN.receive(S1AP_PDU:?) -> value pdu { - setverdict(fail, "Rx unexpected S1AP PDU from eNB: ", pdu); - T.stop; - } - [] T.timeout { - setverdict(fail, "Timeout waiting for S1AP PDU from eNB: ", tr_pdu); - } - } -} - -function f_ConnHdlr_rx_s1ap_from_mme(out S1AP_PDU pdu, - template (present) S1AP_PDU tr_pdu := ?, - float Tval := 0.5) -runs on ConnHdlr { - var S1AP_RecvFrom recv; - timer T := Tval; - - T.start; - alt { - [] S1AP_ENB.receive(t_S1AP_RecvFrom(tr_pdu)) -> value recv { - pdu := recv.msg; - setverdict(pass); - T.stop; - } - [] S1AP_ENB.receive(t_S1AP_RecvFrom(?)) -> value recv { - pdu := recv.msg; - setverdict(fail, "Rx unexpected S1AP PDU from MME: ", pdu); - T.stop; - } - [] T.timeout { - setverdict(fail, "Timeout waiting for S1AP PDU from MME: ", tr_pdu); - } - } -} - -function f_ConnHdlr_setup(Global_ENB_ID genb_id) runs on ConnHdlr { - var S1AP_PDU pdu; - timer T; - - var SupportedTAs supported_tas_dummy := { - { - tAC := '0000'O, - broadcastPLMNs := { '00f000'O }, - iE_Extensions := omit - } - }; - - f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_SetupReq(genb_id, - supported_tas_dummy, - v32)); - T.start(1.0); - alt { - [] S1AP_CONN.receive(S1APSRV_Event:S1APSRV_EVENT_CONN_UP) { repeat; } - [] S1AP_CONN.receive(tr_S1AP_SetupReq) { - setverdict(pass); - T.stop; - } - [] S1AP_CONN.receive(S1AP_PDU:?) -> value pdu { - setverdict(fail, "Rx unexpected S1AP PDU: ", pdu); - T.stop; - } - [] T.timeout { - setverdict(fail, "Timeout waiting for S1AP SetupReq"); - } - } -} - - function f_TC_setup(ConnHdlrPars pars) runs on ConnHdlr { f_ConnHdlr_register(pars.genb_id); - f_ConnHdlr_connect(); + f_ConnHdlr_connect(mp_s1gw_enb_ip); f_ConnHdlr_setup(pars.genb_id); f_sleep(0.5); /* keep the connection idle for some time */ f_ConnHdlr_disconnect(); @@ -287,7 +120,7 @@ function f_TC_conn_term_by_mme(ConnHdlrPars pars) runs on ConnHdlr { f_ConnHdlr_register(pars.genb_id); - f_ConnHdlr_connect(); + f_ConnHdlr_connect(mp_s1gw_enb_ip); f_ConnHdlr_setup(pars.genb_id); f_sleep(0.5); /* keep the connection idle for some time */ @@ -313,7 +146,7 @@ /* MME is not available, expect S1GW to terminate the eNB connection */ function f_TC_conn_term_mme_unavail(ConnHdlrPars pars) runs on ConnHdlr { /* establish an eNB connection to the S1GW */ - f_ConnHdlr_connect(); + f_ConnHdlr_connect(mp_s1gw_enb_ip); /* expect our eNB connection to be released gracefully */ f_ConnHdlr_expect_shutdown(); setverdict(pass); @@ -337,7 +170,7 @@ var S1AP_PDU pdu; f_ConnHdlr_register(pars.genb_id); - f_ConnHdlr_connect(); + f_ConnHdlr_connect(mp_s1gw_enb_ip); f_ConnHdlr_setup(pars.genb_id); log("eNB -> [S1GW] -> MME: E-RAB SETUP REQUEST"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9f8d9afbccd59f3e22649b35d2a7ef75578d051a Gerrit-Change-Number: 37898 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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>

10 months, 2 weeks

1
0
0 0

[XL] Change in docker-playground[master]: Remove ttcn3 testsuites ported to testenv, part 1

by pespin

Attention is currently required from: daniel, laforge, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/37714?usp=email ) Change subject: Remove ttcn3 testsuites ported to testenv, part 1 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37714?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7182c7e8eb00a9323fe1b6d27f630d253b4d34f6 Gerrit-Change-Number: 37714 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Aug 2024 11:13:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

10 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2024