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

Change in osmo-ttcn3-hacks[master]: cosmetic: bsc: Fix typo

by fixeria

Attention is currently required from: osmith, pespin, daniel, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29825 ) Change subject: cosmetic: bsc: Fix typo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29825 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: Idd572b262561b03732ba825abee412e2fad17714 Gerrit-Change-Number: 29825 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Oct 2022 19:27:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_mgwpool_pin_bts

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29830 ) Change subject: bsc: Introduce test TC_mgwpool_pin_bts ...................................................................... bsc: Introduce test TC_mgwpool_pin_bts Change-Id: If6e5ab5e5d3478621306e716836a5c7ddd129c0d Related: SYS#5987 --- M bsc/BSC_Tests.ttcn 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/29830/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index df1d0a8..c83a184 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -11928,6 +11928,36 @@ f_shutdown_helper(); } +/* Test BTS pinning to an MGW is applied */ +testcase TC_mgwpool_pin_bts() runs on test_CT { + var TestHdlrParams pars1 := f_gen_test_hdlr_pars(); + var MSC_ConnHdlr vc_conn1; + pars1.mgwpool_idx := 0; + + var TestHdlrParams pars2 := f_gen_test_hdlr_pars(); + var MSC_ConnHdlr vc_conn2; + pars2.mgwpool_idx := 0; /* expect it in the first one, since the BTS is pinned to the first MGW */ + pars2.media_nr := 2; + + f_init(1, true, nr_mgw := 2); + f_sleep(1.0); + + f_vty_mgw_enable(1); + f_vty_cfg_bts(BSCVTY, 0, { "mgw pool-target 0" }); + + vc_conn1 := f_start_handler_create(pars1); + vc_conn2 := f_start_handler_create(pars2); + connect(vc_conn1:COORD, vc_conn2:COORD); + f_start_handler_run(vc_conn1, refers(f_TC_mgwpool_call_seq_1), pars1); + f_start_handler_run(vc_conn2, refers(f_TC_mgwpool_call_seq_2), pars2); + vc_conn1.done; + vc_conn2.done; + + f_vty_cfg_bts(BSCVTY, 0, { "no mgw pool-target" } ); + + f_shutdown_helper(); +} + control { /* CTRL interface testing */ execute( TC_ctrl_msc_connection_status() ); @@ -12267,6 +12297,7 @@ if (Misc_Helpers.f_osmo_repo_is("nightly")) { execute( TC_mgwpool_all_used() ); execute( TC_mgwpool_blocked_not_used() ); + execute( TC_mgwpool_pin_bts() ); } /* Run TC_ho_out_of_this_bsc last, because it may trigger a segfault before osmo-bsc's patch -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29830 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: If6e5ab5e5d3478621306e716836a5c7ddd129c0d Gerrit-Change-Number: 29830 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Support running several MGW node emulations

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29828 ) Change subject: bsc: Support running several MGW node emulations ...................................................................... bsc: Support running several MGW node emulations Change-Id: Ic84726c09ad3c6bea3ce6f0198db862d7dbb6dd3 --- M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_LCLS.ttcn M bsc/MSC_ConnectionHandler.ttcn 3 files changed, 32 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/29828/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 0f3c75c..f00cc88 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -81,6 +81,7 @@ const integer NUM_BTS_CFG := 4; /* we have 4 BTS in the osmo-bsc.cfg (for inter-BSC HO tests) but use only 3 */ const integer NUM_TRX_CFG := 1; /* we support up to 4 TRX per BTS, but have only 1 TRX per BTS in osmo-bsc.cfg */ const integer NUM_MSC := 3; +const integer NUM_MGW := 2; const float T3101_MAX := 12.0; /* make sure to sync this with the osmo-bts.cfg you're using */ @@ -619,7 +620,8 @@ /* Configure/manage IPA_Emulation per-BTS/TRX port: */ port IPA_CFG_PT IPA_CFG_PORT[NUM_BTS][NUM_TRX]; - var MGCP_Emulation_CT vc_MGCP; + var MGCP_Emulation_CT vc_MGCP[NUM_MGW]; + var integer g_nr_mgw; /* number of vc_MGCP to initialize */ port TELNETasp_PT BSCVTY; /* StatsD */ @@ -1053,8 +1055,8 @@ } } -function f_init_mgcp(charstring id) runs on test_CT { - id := id & "-MGCP"; +function f_init_mgcp(integer mgw_nr, charstring id) runs on test_CT { + id := id & "-MGCP-" & int2str(mgw_nr); var MGCPOps ops := { create_cb := refers(MGCP_Emulation.ExpectedCreateCallback), @@ -1064,14 +1066,14 @@ callagent_ip := mp_bsc_ip, callagent_udp_port := -1, mgw_ip := mp_test_ip, - mgw_udp_port := 2427, + mgw_udp_port := 2427 + mgw_nr, /* Enable it for SCCPlite, since we have 2 MGCP sockets towards MGW (UDP one + the one with MGCP over IPA forwarded from MSC one) */ multi_conn_mode := (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_SCCPlite_SERVER) }; - vc_MGCP := MGCP_Emulation_CT.create(id) alive; - vc_MGCP.start(MGCP_Emulation.main(ops, mgcp_pars, id)); + vc_MGCP[mgw_nr] := MGCP_Emulation_CT.create(id) alive; + vc_MGCP[mgw_nr].start(MGCP_Emulation.main(ops, mgcp_pars, id)); } /* Enable or disable (current default) Osmux. When enabling, BSSMAP Reset @@ -1191,7 +1193,7 @@ * \param nr_msc Number of virtual MSCs to bring up to connect to osmo-bsc. */ function f_init(integer nr_bts := NUM_BTS, boolean handler_mode := false, - integer nr_msc := 1, float guard_timeout := 30.0) runs on test_CT { + integer nr_msc := 1, integer nr_mgw := 1, float guard_timeout := 30.0) runs on test_CT { var integer bssap_idx; if (g_initialized) { @@ -1246,7 +1248,10 @@ f_ipa_ctrl_start_client(mp_bsc_ip, mp_bsc_ctrl_port); - f_init_mgcp("VirtMGW"); + g_nr_mgw := nr_mgw; + for (var integer i := 0; i < g_nr_mgw; i := i+1) { + f_init_mgcp(i, "VirtMGW"); + } for (var integer i := 0; i < nr_bts; i := i+1) { f_init_bts(i, c_BtsParams[i].trx_num, handler_mode); @@ -3776,7 +3781,7 @@ f_ipa_ctrl_start_client(mp_bsc_ip, mp_bsc_ctrl_port); - f_init_mgcp("VirtMGW"); + f_init_mgcp(0, "VirtMGW"); /* start RSL/OML connection (XXX re-uses RSL port/protocol definitions for OML) */ map(client.vc_IPA:IPA_PORT, system:IPA); @@ -3833,9 +3838,8 @@ /* helper function to create and connect a MSC_ConnHdlr component * TODO: allow connecting to TRX1..N, not only TRX0 */ -private function f_connect_handler(inout MSC_ConnHdlr vc_conn, integer bssap_idx := 0) runs on test_CT { +private function f_connect_handler(inout MSC_ConnHdlr vc_conn, integer bssap_idx := 0, integer mgwpool_idx := 0) runs on test_CT { connect(vc_conn:RAN, g_bssap[bssap_idx].vc_RAN:PROC); - connect(vc_conn:MGCP_PROC, vc_MGCP:MGCP_PROC); connect(vc_conn:RSL, bts[0][0].rsl.vc_RSL:CLIENT_PT); connect(vc_conn:RSL_PROC, bts[0][0].rsl.vc_RSL:RSL_PROC); if (isvalue(bts[1][0])) { @@ -3851,9 +3855,10 @@ connect(vc_conn:BSSAP_LE, g_bssap_le.vc_BSSAP_LE:CLIENT); connect(vc_conn:BSSAP_LE_PROC, g_bssap_le.vc_BSSAP_LE:PROC); } - connect(vc_conn:MGCP, vc_MGCP:MGCP_CLIENT); - connect(vc_conn:MGCP_MULTI, vc_MGCP:MGCP_CLIENT_MULTI); connect(vc_conn:STATSD_PROC, vc_STATSD:STATSD_PROC); + connect(vc_conn:MGCP_PROC, vc_MGCP[mgwpool_idx]:MGCP_PROC); + connect(vc_conn:MGCP, vc_MGCP[mgwpool_idx]:MGCP_CLIENT); + connect(vc_conn:MGCP_MULTI, vc_MGCP[mgwpool_idx]:MGCP_CLIENT_MULTI); } function f_start_handler_create(template (omit) TestHdlrParams pars := omit) @@ -3861,11 +3866,14 @@ var charstring id := testcasename(); var MSC_ConnHdlr vc_conn; var integer bssap_idx := 0; + var integer mgwpool_idx := 0; if (isvalue(pars)) { - bssap_idx := valueof(pars).mscpool.bssap_idx; + var TestHdlrParams pars_val := valueof(pars); + bssap_idx := pars_val.mscpool.bssap_idx; + mgwpool_idx := pars_val.mgwpool_idx; } vc_conn := MSC_ConnHdlr.create(id); - f_connect_handler(vc_conn, bssap_idx); + f_connect_handler(vc_conn, bssap_idx, mgwpool_idx); return vc_conn; } @@ -9588,7 +9596,7 @@ f_init(1); /* HACK: work around "Couldn't find Expect for CRCX" */ - vc_MGCP.stop; + vc_MGCP[0].stop; var template PDU_BSSAP ass_cmd := f_gen_ass_req(); ass_cmd.pdu.bssmap.assignmentRequest.codecList := ts_BSSMAP_IE_CodecList({ts_CodecFR}); @@ -11692,7 +11700,7 @@ f_init(nr_bts := 3); /* HACK: work around "Couldn't find Expect for CRCX" */ - vc_MGCP.stop; + vc_MGCP[0].stop; f_vty_enter_cfg_bts(BSCVTY, 2); f_vty_transceive(BSCVTY, "channel allocator ascending"); @@ -11715,7 +11723,7 @@ f_init(nr_bts := 3); /* HACK: work around "Couldn't find Expect for CRCX" */ - vc_MGCP.stop; + vc_MGCP[0].stop; f_vty_enter_cfg_bts(BSCVTY, 2); f_vty_transceive(BSCVTY, "channel allocator descending"); @@ -11741,7 +11749,7 @@ f_init(nr_bts := 3); /* HACK: work around "Couldn't find Expect for CRCX" */ - vc_MGCP.stop; + vc_MGCP[0].stop; f_vty_enter_cfg_bts(BSCVTY, 2); f_vty_transceive(BSCVTY, "channel allocator mode assignment dynamic"); diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn index 82f6b11..0e7692c 100644 --- a/bsc/BSC_Tests_LCLS.ttcn +++ b/bsc/BSC_Tests_LCLS.ttcn @@ -162,9 +162,8 @@ /* helper function to create and connect a MSC_ConnHdlr component */ /* FIXME: Why can't we use BSC_Tests.f_connect_andler() ?!? * TODO: allow connecting to TRX1..N, not only TRX0 */ -private function f_connect_handler(inout LCLS_MSC_ConnHdlr vc_conn, integer bssap_idx := 0) runs on lcls_test_CT { +private function f_connect_handler(inout LCLS_MSC_ConnHdlr vc_conn, integer bssap_idx := 0, integer mgwpool_idx := 0) runs on lcls_test_CT { connect(vc_conn:RAN, g_bssap[bssap_idx].vc_RAN:PROC); - connect(vc_conn:MGCP_PROC, vc_MGCP:MGCP_PROC); connect(vc_conn:RSL, bts[0][0].rsl.vc_RSL:CLIENT_PT); connect(vc_conn:RSL_PROC, bts[0][0].rsl.vc_RSL:RSL_PROC); if (isvalue(bts[1][0])) { @@ -172,7 +171,8 @@ connect(vc_conn:RSL1_PROC, bts[1][0].rsl.vc_RSL:RSL_PROC); } connect(vc_conn:BSSAP, g_bssap[bssap_idx].vc_RAN:CLIENT); - connect(vc_conn:MGCP, vc_MGCP:MGCP_CLIENT); + connect(vc_conn:MGCP_PROC, vc_MGCP[mgwpool_idx]:MGCP_PROC); + connect(vc_conn:MGCP, vc_MGCP[mgwpool_idx]:MGCP_CLIENT); } /* function creating the two ConnHdlrs, connecting them + starting them */ diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 8524f4b..dd044e0 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -747,6 +747,7 @@ boolean use_osmux_bts, charstring host_aoip_tla, TestHdlrParamsMSCPool mscpool, + integer mgwpool_idx, /* MGCP_Emulation_CT (vc_MGCP) to use for this MSC ConnHdlr */ boolean media_mgw_offer_ipv6, OCT3 last_used_eutran_plmn optional, boolean exp_fast_return, /* RR Release expected to contain CellSelectInd ? */ @@ -790,6 +791,7 @@ rsl_idx := 0, l3_info := omit }, + mgwpool_idx := 0, media_mgw_offer_ipv6 := true, last_used_eutran_plmn := omit, exp_fast_return := false, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29828 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: Ic84726c09ad3c6bea3ce6f0198db862d7dbb6dd3 Gerrit-Change-Number: 29828 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Add tests for MGW pool features

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29829 ) Change subject: bsc: Add tests for MGW pool features ...................................................................... bsc: Add tests for MGW pool features Add a couple tests to validate some MGW pool features, like load balancing and skip selection blocked MGWs from the pool. Related: SYS#5987 Change-Id: I6a8c30309be406e37190dc67b6ee5af13e1b9e68 --- M bsc/BSC_Tests.ttcn 1 file changed, 113 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/29829/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index f00cc88..df1d0a8 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -11822,6 +11822,112 @@ f_shutdown_helper(); } +private function f_vty_mgw_enable(integer mgw_nr := 1) runs on test_CT { + var rof_charstring cmds := { + "remote-ip " & mp_test_ip, + "remote-port " & int2str(2427 + mgw_nr) + }; + f_vty_config3(BSCVTY, {"network", "mgw " & int2str(mgw_nr)}, cmds); + f_vty_transceive(BSCVTY, "mgw " & int2str(mgw_nr) & " reconnect") +} +private function f_vty_mgw_disable(integer mgw_nr := 1) runs on test_CT { + f_vty_config3(BSCVTY, {"network"}, { "no mgw " &int2str(mgw_nr) }); +} +private function f_vty_mgw_block(integer mgw_nr := 1, boolean blocked := true) runs on test_CT { + var charstring arg; + if (blocked) { + arg := "block"; + } else { + arg := "unblock"; + } + f_vty_transceive(BSCVTY, "mgw " & int2str(mgw_nr) & " " & arg); +} +const charstring COORD_CMD_ESTABLISHED := "COORD_CMD_ESTABLISHED"; +private function f_TC_mgwpool_call_seq_1(charstring id) runs on MSC_ConnHdlr { + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + + f_establish_fully(ass_cmd, exp_compl); + COORD.send(COORD_CMD_ESTABLISHED); + + COORD.receive(COORD_CMD_ESTABLISHED); + f_perform_clear() + f_create_mgcp_delete_ep(g_media.mgcp_ep); +} +private function f_TC_mgwpool_call_seq_2(charstring id) runs on MSC_ConnHdlr { + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + + + COORD.receive(COORD_CMD_ESTABLISHED); + f_establish_fully(ass_cmd, exp_compl); + COORD.send(COORD_CMD_ESTABLISHED); + + f_perform_clear() + f_create_mgcp_delete_ep(g_media.mgcp_ep); +} +/* Test load is spread around 2 available MGWs */ +testcase TC_mgwpool_all_used() runs on test_CT { + var TestHdlrParams pars1 := f_gen_test_hdlr_pars(); + var MSC_ConnHdlr vc_conn1; + pars1.mgwpool_idx := 0; + + var TestHdlrParams pars2 := f_gen_test_hdlr_pars(); + var MSC_ConnHdlr vc_conn2; + pars2.mgwpool_idx := 1; + + f_init(1, true, nr_mgw := 2); + f_sleep(1.0); + + f_vty_mgw_enable(1); + + vc_conn1 := f_start_handler_create(pars1); + vc_conn2 := f_start_handler_create(pars2); + connect(vc_conn1:COORD, vc_conn2:COORD); + f_start_handler_run(vc_conn1, refers(f_TC_mgwpool_call_seq_1), pars1); + f_start_handler_run(vc_conn2, refers(f_TC_mgwpool_call_seq_2), pars2); + vc_conn1.done; + vc_conn2.done; + + f_vty_mgw_disable(1); + + f_shutdown_helper(); +} + +/* Test blocked MGW in the pool are not selected */ +testcase TC_mgwpool_blocked_not_used() runs on test_CT { + var TestHdlrParams pars1 := f_gen_test_hdlr_pars(); + var MSC_ConnHdlr vc_conn1; + pars1.mgwpool_idx := 0; + + var TestHdlrParams pars2 := f_gen_test_hdlr_pars(); + var MSC_ConnHdlr vc_conn2; + pars2.mgwpool_idx := 0; /* expect it in the first one, since the second will be blocked */ + pars2.media_nr := 2; + + f_init(1, true, nr_mgw := 2); + f_sleep(1.0); + + f_vty_mgw_enable(1); + f_vty_mgw_block(1, true); + + vc_conn1 := f_start_handler_create(pars1); + vc_conn2 := f_start_handler_create(pars2); + connect(vc_conn1:COORD, vc_conn2:COORD); + f_start_handler_run(vc_conn1, refers(f_TC_mgwpool_call_seq_1), pars1); + f_start_handler_run(vc_conn2, refers(f_TC_mgwpool_call_seq_2), pars2); + vc_conn1.done; + vc_conn2.done; + + f_vty_mgw_disable(1); + + f_shutdown_helper(); +} + control { /* CTRL interface testing */ execute( TC_ctrl_msc_connection_status() ); @@ -12156,6 +12262,13 @@ execute( TC_chan_alloc_algo_descending() ); execute( TC_chan_alloc_algo_ass_dynamic() ); + /* MGW pool */ + /* this conditional canbe dropped once osmo-bsc >1.10.0 is released: */ + if (Misc_Helpers.f_osmo_repo_is("nightly")) { + execute( TC_mgwpool_all_used() ); + execute( TC_mgwpool_blocked_not_used() ); + } + /* Run TC_ho_out_of_this_bsc last, because it may trigger a segfault before osmo-bsc's patch * with change-id I5a3345ab0005a73597f5c27207480912a2f5aae6 */ execute( TC_ho_out_of_this_bsc() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29829 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: I6a8c30309be406e37190dc67b6ee5af13e1b9e68 Gerrit-Change-Number: 29829 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-ci[master]: jenkins-gerrit: add note for build fails/pkgs pass

by msuraev

Attention is currently required from: osmith, fixeria. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29794 ) Change subject: jenkins-gerrit: add note for build fails/pkgs pass ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I70027ec970a220c3ddfa766302faec7bd8752118 Gerrit-Change-Number: 29794 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Oct 2022 17:45:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-msc[master]: SMPP: use default port from libsmpp34

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28865 ) Change subject: SMPP: use default port from libsmpp34 ...................................................................... SMPP: use default port from libsmpp34 Related: OS#5568 Requires: libsmpp34.git I2fcc15ac60b7b6501c9cb1afd0fe6d66d4b76f5f Change-Id: I2140ed57e64f17fb79130014eaf88f58b62d7a00 --- M TODO-RELEASE M src/libsmpputil/smpp_smsc.c M src/utils/smpp_mirror.c 3 files changed, 6 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 502fff6..9293b93 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,5 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-mgcp-client >1.10.0 mgcp_client_pool_config_write() \ No newline at end of file +libosmo-mgcp-client >1.10.0 mgcp_client_pool_config_write() +libsmpp34 > 1.14.1 Dependency bump required diff --git a/src/libsmpputil/smpp_smsc.c b/src/libsmpputil/smpp_smsc.c index a1f2b2f..059915d 100644 --- a/src/libsmpputil/smpp_smsc.c +++ b/src/libsmpputil/smpp_smsc.c @@ -974,21 +974,17 @@ { int rc; - /* default port for SMPP */ - if (!port) - port = 2775; - LOGP(DSMPP, LOGL_NOTICE, "SMPP at %s %d\n", - bind_addr? bind_addr : "0.0.0.0", port); + bind_addr ? bind_addr : "0.0.0.0", port ? port : SMPP_PORT); rc = osmo_sock_init_ofd(&smsc->listen_ofd, AF_UNSPEC, SOCK_STREAM, - IPPROTO_TCP, bind_addr, port, + IPPROTO_TCP, bind_addr, port ? port : SMPP_PORT, OSMO_SOCK_F_BIND); if (rc < 0) return rc; /* store new address and port */ - rc = smpp_smsc_conf(smsc, bind_addr, port); + rc = smpp_smsc_conf(smsc, bind_addr, port ? port : SMPP_PORT); if (rc) smpp_smsc_stop(smsc); return rc; diff --git a/src/utils/smpp_mirror.c b/src/utils/smpp_mirror.c index 552ceee..3356468 100644 --- a/src/utils/smpp_mirror.c +++ b/src/utils/smpp_mirror.c @@ -244,7 +244,7 @@ int rc; if (port == 0) - port = 2775; + port = SMPP_PORT; esme->wqueue.bfd.data = esme; esme->wqueue.read_cb = esme_read_cb; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2140ed57e64f17fb79130014eaf88f58b62d7a00 Gerrit-Change-Number: 28865 Gerrit-PatchSet: 11 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-msc[master]: SMPP: use default port from libsmpp34

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28865 ) Change subject: SMPP: use default port from libsmpp34 ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2140ed57e64f17fb79130014eaf88f58b62d7a00 Gerrit-Change-Number: 28865 Gerrit-PatchSet: 11 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Oct 2022 17:17:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-msc[master]: SMPP: use default port from libsmpp34

by msuraev

Attention is currently required from: msuraev. Hello Jenkins Builder, laforge, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28865 to look at the new patch set (#11). Change subject: SMPP: use default port from libsmpp34 ...................................................................... SMPP: use default port from libsmpp34 Related: OS#5568 Requires: libsmpp34.git I2fcc15ac60b7b6501c9cb1afd0fe6d66d4b76f5f Change-Id: I2140ed57e64f17fb79130014eaf88f58b62d7a00 --- M TODO-RELEASE M src/libsmpputil/smpp_smsc.c M src/utils/smpp_mirror.c 3 files changed, 6 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/65/28865/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2140ed57e64f17fb79130014eaf88f58b62d7a00 Gerrit-Change-Number: 28865 Gerrit-PatchSet: 11 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in osmo-msc[master]: doc: Include mgwpool.adoc from osmo-gsm-manuals

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29821 ) Change subject: doc: Include mgwpool.adoc from osmo-gsm-manuals ...................................................................... doc: Include mgwpool.adoc from osmo-gsm-manuals This way we document the recently gained support for MGW pooling. Related: SYS#5987 Depends: osmo-gsm-manuals.git Change-Id Ieda0d4bfe6fc90da6e19c791d8ec2da89427ba3b Change-Id: I9d8116a74a63591599c4cbafa60f9a313e6ab19c --- M doc/manuals/chapters/running.adoc M doc/manuals/osmomsc-usermanual.adoc 2 files changed, 5 insertions(+), 0 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index fac0a9f..f8550ae 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -159,6 +159,9 @@ DLCX to the media gateway. This helps to clear lingering calls from the media gateway when the OsmoMSC is restarted. +OsmoMSC is also able to handle a pool of media gateways for load +distribution. See also <<mgw_pooling>>. + [NOTE] ==== Previous versions of OsmoMSC (1.9.0 and below) didn't have the 'mgw' VTY node and diff --git a/doc/manuals/osmomsc-usermanual.adoc b/doc/manuals/osmomsc-usermanual.adoc index 7ba45d4..632abc7 100644 --- a/doc/manuals/osmomsc-usermanual.adoc +++ b/doc/manuals/osmomsc-usermanual.adoc @@ -32,6 +32,8 @@ include::{srcdir}/chapters/osmux_msc.adoc[] +include::./common/chapters/mgwpool.adoc[] + include::./common/chapters/control_if.adoc[] include::./common/chapters/gsup.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9d8116a74a63591599c4cbafa60f9a313e6ab19c Gerrit-Change-Number: 29821 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: doc: Use mgwpool.adoc from osmo-gsm-manuals.git

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29820 ) Change subject: doc: Use mgwpool.adoc from osmo-gsm-manuals.git ...................................................................... doc: Use mgwpool.adoc from osmo-gsm-manuals.git The adoc file has been moved to osmo-gsm-manuals.git so that it can be included by other apps supporting MGW pooling from libosmo-mgcp-client, such as osmo-msc and osmo-hnbgw. Related: SYS#5987 Depends: osmo-gsm-manuals.git Change-Id Ieda0d4bfe6fc90da6e19c791d8ec2da89427ba3b Change-Id: Icaee61905fbefe4632b562603fce393b70a114b1 --- D doc/manuals/chapters/mgwpool.adoc M doc/manuals/osmobsc-usermanual.adoc 2 files changed, 1 insertion(+), 240 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/mgwpool.adoc b/doc/manuals/chapters/mgwpool.adoc deleted file mode 100644 index c429159..0000000 --- a/doc/manuals/chapters/mgwpool.adoc +++ /dev/null @@ -1,239 +0,0 @@ -[[mgw_pooling]] -== MGW Pooling - -{program-name} is able to use a pool of media gateway (MGW) instances. -The aim of MGW pooling is to evenly distribute the RTP voice stream load across -multiple MGW instances. This can help to scale out over multiple VMs or physical -machines. Until osmo-mgw includes multithreading support, it may also be used to -scale-out to multiple cores on a single host. - -The load distribution is managed in such a way that when a new call is placed, -the pool will automatically assign the call to the MGW with the lowest load. - -MGW pooling is recommended for larger RAN or CN installations. For small networks -and lab installations the classic method with one MGW per BSC offers sufficient -performance. - -=== MGW pool VTY configuration - -In {program-name} the MGW is controlled via an MGCP-Client. The VTY commands to -configure the MGCP-Client are part of the several 'mgw' nodes, one per -MGCP-Client to set up. - -To setup an MGW pool, the user must first install multiple OsmoMGW instances, so -that they won’t interfere with each other. This can be done using different -local host IP addresses or different ports. When OsmoMGW is installed from -packages, the systemd configuration may also require adjustment. - -By default, MGCP-Client will use whatever source IP address is resolved by the -kernel routing subsystem, and will also ask the kernel to pick a free UDP port. - -Example configuration with two MGCP-Client instances in a pool: ----- - mgw 0 - description media-gw-0 <2> - remote-ip 127.0.0.1 - remote-port 2432 - local-ip 127.0.0.1 - local-port 2431 - endpoint-domain mgw0 <1> - mgw 1 - description media-gw-1 <2> - remote-ip 127.0.0.1 - remote-port 2430 - local-ip 127.0.0.1 - local-port 2429 - endpoint-domain mgw1 <1> ----- - -<1> When working with multiple MGW / MGCP-Client instances, the domain name for -each MGW should be different. Otherwise it won't be possible to distinguish the -endpoint names in the log. It should also be noted that the domain name must -match the configuration of the related OsmoMGW instance. - -<2> It is also possible to assign a descriptive name to each MGW instance. The -MGCP client specific log lines will then use this name as logging context. If -no description is set, the domain name will be used. - -=== MGW pool management - -The MNGW pool is fully runtime-manageable. The only limitation -is that an MGCP-Client can not be restarted or removed as long as it is serving -calls (see also: <<mgw_pooling_blocking>>). - -==== MGW pool status - -The VTY implements a 'show mgw-pool' command that lists the currently configured -MGW pool members, their status and call utilization. The following snippet shows -an output example run on OsmoBSC, but it should be also available on other -applications supporting the MGW pooling VTY featues: - ----- -OsmoBSC> show mgw-pool -% MGW-Pool: -% MGW 0:media-gw-0 -% mgcp-client: connected -% service: unblocked -% ongoing calls: 1 -% MGW 1:media-gw-1 -% mgcp-client: connected -% service: unblocked -% ongoing calls: 0 ----- - -==== Adding an MGW / MGCP-Client to the MGW pool - -To add a new MGCP-Client to the pool, the 'mgw' node is used. Like with the -'bts' or the 'msc' node a reference number is used that usually starts at 0. -However it is still possible to assign any number from 0-255. The enumeration -also may contain gaps. The following snippet shows an output example run on -OsmoBSC, but it should be also available on other applications supporting the -MGW pooling VTY featues: - ----- -OsmoBSC> enable -OsmoBSC# configure terminal -OsmoBSC(config)# network -OsmoBSC(config-net)# mgw 2 -OsmoBSC(config-mgw)# ? - local-ip local bind to connect to MGW from - local-port local port to connect to MGW from - remote-ip remote IP address to reach the MGW at - remote-port remote port to reach the MGW at - endpoint-domain Set the domain name to send in MGCP messages, e.g. the part 'foo' in 'rtpbridge/*@foo'. - reset-endpoint Add an endpoint name that should be reset (DLCX) on connect to the reset-endpoint list,e.g. 'rtpbridge/*' ----- - -The newly added MGW will immediately appear in the mgw-pool list but it won't -be used until its configuration finished by reconnecting it. - ----- -% MGW-Pool: -% MGW 0:media-gw-0 -% mgcp-client: connected -% service: unblocked -% ongoing calls: 2 -% MGW 1:media-gw-1 -% mgcp-client: connected -% service: unblocked -% ongoing calls: 3 -% MGW 2:mgw <1> -% mgcp-client: disconnected -% service: unblocked -% ongoing calls: 0 ----- - -<1> In this example a description is not set yet, so the domain name ("mgw") -is displayed. - -==== Reconnecting an MGW / MGCP-Client - -It may become necessary to reconnect an MGCP-Client. This is the case when the -VTY configuration was changed at runtime. In order to make the changes effective -the MGW configuration must be reloaded by reconnecting the MGW connection. Also -newly created MGW instances require a reconnect once their configuration is -done. - -To reconnect an MGCP-Client use the 'reconnect' VTY command: ----- -OsmoBSC# mgw 2 reconnect ----- - -The mgcp-client status should immediately change to 'connected'. The MGW is now -ready to be used for new calls. - ----- -OsmoBSC# show mgw-pool -% MGW-Pool: -% MGW 0:media-gw-0 -% mgcp-client: connected -% service: unblocked -% ongoing calls: 2 -% MGW 1:media-gw-1 -% mgcp-client: connected -% service: unblocked -% ongoing calls: 3 -% MGW 2:mgw -% mgcp-client: connected -% service: unblocked -% ongoing calls: 0 ----- - -It should be noted that MGCP a protocol is used via UDP, the connect only -happens locally to forward the UDP datagrams properly. Also (unless a reset -endpoint is configured like in the example config above) there will be no -immediate interaction with the MGW. However, the log should at least confirm -the the connect worked and the MGCP client has been created successfully. - ----- -Mon Aug 2 17:15:00 2021 DLMGCP mgcp_client.c:788 MGCP client: using endpoint domain '@mgw' -Mon Aug 2 17:15:00 2021 DLMGCP mgcp_client.c:908 MGCP GW connection: r=127.0.0.1:2427<->l=127.0.0.1:2727 ----- - -It is strongly advised to check the activity on the related MGW and to follow -the log in order to see that the communication between {program-name} and the MGW is -working correctly. - -[[mgw_pooling_blocking]] -==== Blocking an MGW / MGCP-Client - -If it becomes apparent that an MGCP-Client must be restarted or removed from -the config (maintenance) the operator can put that MGCP-Client into a blocked -mode. A blocked MGCP-Client will still serve the ongoing calls but it will not -be picked for the assignment of new calls. - -To block an MGCP-Client use the 'block' VTY command: ----- -OsmoBSC# mgw 2 block -OsmoBSC# show mgw-pool -% MGW-Pool: -% MGW 0:media-gw-0 -% mgcp-client: connected -% service: unblocked -% ongoing calls: 11 -% MGW 1:media-gw-1 -% mgcp-client: connected -% service: unblocked -% ongoing calls: 12 -% MGW 2:mgw -% mgcp-client: connected -% service: blocked -% ongoing calls: 10 ----- - -When the number of ongoing calls has tapered off, the MGW / MGCP-Client can be -restarted or removed if necessary. - ----- -OsmoBSC# show mgw-pool -% MGW-Pool: -% MGW 0:media-gw-0 -% mgcp-client: connected -% service: unblocked -% ongoing calls: 15 -% MGW 1:media-gw-1 -% mgcp-client: connected -% service: unblocked -% ongoing calls: 14 -% MGW 2:mgw -% mgcp-client: connected -% service: blocked -% ongoing calls: 0 ----- - -If the blockade should be reverted, the 'unblock' VTY command can be used in -the same way to remove the blockade. (Reconnecting will not remove the -blockade.) - -==== Removing an MGW / MGCP-Client - -An MGCP-Client is removed from the pool using the 'no mgw' command from the -configure terminal. The MGCP-Client instance will automatically be terminated -and the related resources are freed. The only requirement is that there are no -ongoing calls on the selected instance. - ----- -OsmoBSC# configure terminal -OsmoBSC(config)# network -OsmoBSC(config-net)# no mgw 2 ----- diff --git a/doc/manuals/osmobsc-usermanual.adoc b/doc/manuals/osmobsc-usermanual.adoc index f835525..2e77e1b 100644 --- a/doc/manuals/osmobsc-usermanual.adoc +++ b/doc/manuals/osmobsc-usermanual.adoc @@ -36,7 +36,7 @@ include::{srcdir}/chapters/mscpool.adoc[] -include::{srcdir}/chapters/mgwpool.adoc[] +include::./common/chapters/mgwpool.adoc[] include::{srcdir}/chapters/smlc.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icaee61905fbefe4632b562603fce393b70a114b1 Gerrit-Change-Number: 29820 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022