- gerrit-log - lists.osmocom.org

Change in osmo-hnbgw[master]: do not depend on libosmo-gtlv
by fixeria 15 Sep '22

15 Sep '22

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29352 ) Change subject: do not depend on libosmo-gtlv ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I39eb59520231bcfed724060d3fda4ba919f2199d Gerrit-Change-Number: 29352 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 Sep 2022 15:03:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix AMR tests matching RSL MultiRate configuration IE
by fixeria 14 Sep '22

14 Sep '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29350 ) Change subject: BSC_Tests: fix AMR tests matching RSL MultiRate configuration IE ...................................................................... BSC_Tests: fix AMR tests matching RSL MultiRate configuration IE The RSL_IE_MultirateCfg was implemented and added to union RSL_IE_Body in [1]. Before this change, this IE was decoded as RSL_LV (basically an octetstring). Now this IE is decoded as RSL_IE_MultirateCfg, while some AMR tests still expect RSL_LV. Let them use RSL_IE_MultirateCfg. Change-Id: I40dab41d5dc5d14e358ba5a070ce174e7d8d4a4b Fixes: [1] I0a5ddce570c0fd70f096d897b0b609d20b552ff7 --- M bsc/BSC_Tests.ttcn 1 file changed, 60 insertions(+), 33 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 4d7717e..6d4bd82 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -4632,21 +4632,14 @@ f_shutdown_helper(); } -function f_TC_assignment_codec_amr(boolean fr, octetstring mrconf, bitstring s8_s0, bitstring exp_s8_s0, - charstring start_mode := "1") +function f_TC_assignment_codec_amr(boolean fr, RSL_IE_MultirateCfg mr_cfg, + bitstring s8_s0, bitstring exp_s8_s0, + charstring start_mode := "1") runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); var MSC_ConnHdlr vc_conn; - /* See note above */ - var RSL_IE_Body mr_conf := { - other := { - len := lengthof(mrconf), - payload := mrconf - } - }; - if (fr) { pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); } else { @@ -4654,7 +4647,7 @@ } pars.ass_codec_list.codecElements[0].s0_7 := s8_s0; pars.ass_codec_list.codecElements[0].s8_15 := '00000111'B; - pars.expect_mr_conf_ie := mr_conf; + pars.expect_mr_conf_ie := { multirate_cfg := mr_cfg }; pars.expect_mr_s0_s7 := exp_s8_s0; f_init(1, true); @@ -4693,71 +4686,90 @@ f_vty_amr_start_mode_restore(fr); } - /* Set S1, we expect an AMR multirate configuration IE with all four rates * set. */ testcase TC_assignment_codec_amr_f_S1() runs on test_CT { - f_TC_assignment_codec_amr(true, '289520882208'O, '00000010'B, '00000010'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '10010101'B, + params := '20882208'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '00000011'B, '00000010'B); f_shutdown_helper(); } /* Set S1, we expect an AMR multirate configuration IE with the lower three * rates set. */ testcase TC_assignment_codec_amr_h_S1() runs on test_CT { - f_TC_assignment_codec_amr(false, '2815208820'O, '00000010'B, '00000010'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00010101'B, + params := '208820'O)); + f_TC_assignment_codec_amr(false, mr_cfg, '00000010'B, '00000010'B); f_shutdown_helper(); } /* Set S1 and two other rates, we expect an AMR MULTIRATE CONFIGURATION IE with * all four rates (and only S1 set in the ASSIGNMENT COMPLETE) */ testcase TC_assignment_codec_amr_f_S124() runs on test_CT { - f_TC_assignment_codec_amr(true, '289520882208'O, '00010110'B, '00000010'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '10010101'B, + params := '20882208'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '00010110'B, '00000010'B); f_shutdown_helper(); } /* Set S1 and two other rates, we expect an AMR MULTIRATE CONFIGURATION IE with * all four rates (and only S1 set in the ASSIGNMENT COMPLETE) */ testcase TC_assignment_codec_amr_h_S124() runs on test_CT { - f_TC_assignment_codec_amr(false, '2815208820'O, '00010110'B, '00000010'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00010101'B, + params := '208820'O)); + f_TC_assignment_codec_amr(false, mr_cfg, '00010110'B, '00000010'B); f_shutdown_helper(); } /* The following block of tests selects more and more rates until all four * possible rates are in the active set (full rate) */ testcase TC_assignment_codec_amr_f_S0() runs on test_CT { - f_TC_assignment_codec_amr(true, '2801'O, '00000001'B, '00000001'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00000001'B)); + f_TC_assignment_codec_amr(true, mr_cfg, '00000001'B, '00000001'B); f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_S02() runs on test_CT { - f_TC_assignment_codec_amr(true, '28052080'O, '00000101'B, '00000101'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00000101'B, + params := '2080'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '00000101'B, '00000101'B); f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_S024() runs on test_CT { - f_TC_assignment_codec_amr(true, '2815208820'O, '00010101'B, '00010101'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00010101'B, + params := '208820'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '00010101'B, '00010101'B); f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_S0247() runs on test_CT { - f_TC_assignment_codec_amr(true, '289520882208'O, '10010101'B, '10010101'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '10010101'B, + params := '20882208'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '10010101'B, '10010101'B); f_shutdown_helper(); } /* The following block of tests selects more and more rates until all three * possible rates are in the active set (half rate) */ testcase TC_assignment_codec_amr_h_S0() runs on test_CT { - f_TC_assignment_codec_amr(false, '2801'O, '00000001'B, '00000001'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00000001'B)); + f_TC_assignment_codec_amr(false, mr_cfg, '00000001'B, '00000001'B); f_shutdown_helper(); } testcase TC_assignment_codec_amr_h_S02() runs on test_CT { - f_TC_assignment_codec_amr(false, '28052080'O, '00000101'B, '00000101'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00000101'B, + params := '2080'O)); + f_TC_assignment_codec_amr(false, mr_cfg, '00000101'B, '00000101'B); f_shutdown_helper(); } testcase TC_assignment_codec_amr_h_S024() runs on test_CT { - f_TC_assignment_codec_amr(false, '2815208820'O, '00010101'B, '00010101'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00010101'B, + params := '208820'O)); + f_TC_assignment_codec_amr(false, mr_cfg, '00010101'B, '00010101'B); f_shutdown_helper(); } @@ -4770,7 +4782,9 @@ testcase TC_assignment_codec_amr_h_S0247() runs on test_CT { /* Try to include 12,2k in into the active set even though the channel * is half rate only. The BSC is expected to remove the 12,0k */ - f_TC_assignment_codec_amr(false, '2815208820'O, '10010101'B, '00010101'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00010101'B, + params := '208820'O)); + f_TC_assignment_codec_amr(false, mr_cfg, '10010101'B, '00010101'B); f_shutdown_helper(); } @@ -4778,7 +4792,9 @@ /* See what happens when all rates are selected at once. Since then * Also S1 is selected, this setting will be prefered and we should * get 12.2k, 7,40k, 5,90k, and 4,75k in the active set. */ - f_TC_assignment_codec_amr(true, '289520882208'O, '11111111'B, '00000010'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '10010101'B, + params := '20882208'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '11111111'B, '00000010'B); f_shutdown_helper(); } @@ -4786,7 +4802,9 @@ /* Same as above, but with S1 missing, the MSC is then expected to * select the currently supported rates, which are also 12.2k, 7,40k, * 5,90k, and 4,75k, into the active set. */ - f_TC_assignment_codec_amr(true, '289520882208'O, '11111101'B, '10010101'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '10010101'B, + params := '20882208'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '11111101'B, '10010101'B); f_shutdown_helper(); } @@ -4809,28 +4827,37 @@ } testcase TC_assignment_codec_amr_f_start_mode_auto() runs on test_CT { - f_TC_assignment_codec_amr(true, '209520882208'O, '11111111'B, '00000010'B, - start_mode := "auto"); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(icmi := false, + codec_modes := '10010101'B, + params := '20882208'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '11111111'B, '00000010'B, start_mode := "auto"); f_shutdown_helper(); } testcase TC_assignment_codec_amr_h_start_mode_auto() runs on test_CT { - f_TC_assignment_codec_amr(false, '2015208820'O, '10010101'B, '00010101'B, + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(icmi := false, + codec_modes := '00010101'B, + params := '208820'O)); + f_TC_assignment_codec_amr(false, mr_cfg, '10010101'B, '00010101'B, start_mode := "auto"); f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_start_mode_4() runs on test_CT { /* "amr tch-f modes 0 2 4 7" => total 4 modes and start mode 4 => '11'B on the wire */ - f_TC_assignment_codec_amr(true, '2b9520882208'O, '11111111'B, '00000010'B, - start_mode := "4"); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(start_mode := 3, + codec_modes := '10010101'B, + params := '20882208'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '11111111'B, '00000010'B, start_mode := "4"); f_shutdown_helper(); } testcase TC_assignment_codec_amr_h_start_mode_4() runs on test_CT { /* "amr tch-h modes 0 2 4" => total 3 modes and start mode 4 => '10'B on the wire */ - f_TC_assignment_codec_amr(false, '2a15208820'O, '10010101'B, '00010101'B, - start_mode := "4"); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(start_mode := 2, + codec_modes := '00010101'B, + params := '208820'O)); + f_TC_assignment_codec_amr(false, mr_cfg, '10010101'B, '00010101'B, start_mode := "4"); f_shutdown_helper(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29350 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: I40dab41d5dc5d14e358ba5a070ce174e7d8d4a4b Gerrit-Change-Number: 29350 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: library/RSL_Types: account lengthof params in ts_RSL_MultirateCfg
by fixeria 14 Sep '22

14 Sep '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29348 ) Change subject: library/RSL_Types: account lengthof params in ts_RSL_MultirateCfg ...................................................................... library/RSL_Types: account lengthof params in ts_RSL_MultirateCfg In TTCN-3 it's not possible to store templates in records, so in f_assignment_codec() we match received RSL_IE_MR_CONFIG against the value (not template!) stored in g_pars.expect_mr_conf_ie. Because of that, the length field is not being calculated by TITAN for us, so we need to calculate it in ts_RSL_MultirateCfg ourselves. Automatic length calculation only works during encoding/decoding and when matching against a receive template. Change-Id: I595be86d69913ba25e965a5a5c6977e00c342e60 --- M library/RSL_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index acf7d40..cad8a34 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -832,7 +832,7 @@ template (value) RSL_IE_MultirateCfg ts_RSL_MultirateCfg(boolean icmi := true, uint2_t start_mode := 0, BIT8 codec_modes := '00000100'B /* 5,90k */, octetstring params := ''O) := { - len := 2, + len := 2 + lengthof(params), mr_speech_ver := 1, nscb := false, icmi := icmi, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29348 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: I595be86d69913ba25e965a5a5c6977e00c342e60 Gerrit-Change-Number: 29348 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: f_assignment_codec(): log the actual value on mismatch
by fixeria 14 Sep '22

14 Sep '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29349 ) Change subject: BSC_Tests: f_assignment_codec(): log the actual value on mismatch ...................................................................... BSC_Tests: f_assignment_codec(): log the actual value on mismatch Change-Id: I437c1e796b00bfae41620f05ef8f15c8db8ca3d9 --- M bsc/BSC_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index cd9514e..4d7717e 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -4354,8 +4354,8 @@ log("found RSL MR CONFIG IE: ", mr_conf); if (not match(mr_conf, g_pars.expect_mr_conf_ie)) { - setverdict(fail, "RSL MR CONFIG IE does not match expectation. Expected: ", - g_pars.expect_mr_conf_ie); + setverdict(fail, "RSL MR CONFIG IE does not match expectation. ", + "Expected: ", g_pars.expect_mr_conf_ie, ", got: ", mr_conf); } } else { if (f_rsl_find_ie(rsl, RSL_IE_MR_CONFIG, mr_conf) == true) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29349 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: I437c1e796b00bfae41620f05ef8f15c8db8ca3d9 Gerrit-Change-Number: 29349 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix AMR tests matching RSL MultiRate configuration IE
by pespin 14 Sep '22

14 Sep '22

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29350 ) Change subject: BSC_Tests: fix AMR tests matching RSL MultiRate configuration IE ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29350 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: I40dab41d5dc5d14e358ba5a070ce174e7d8d4a4b Gerrit-Change-Number: 29350 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 Sep 2022 12:19:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: ttcn3-bts: Add osmux configurations
by pespin 14 Sep '22

14 Sep '22

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29338 ) Change subject: ttcn3-bts: Add osmux configurations ...................................................................... Patch Set 4: (1 comment) File ttcn3-bts-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/29338/comment/a6b9d5e4_f8f… PS2, Line 149: logging level osmux info > This comment was not addressed. It is there. osmo-ttcn3-hacks/bts/osmo-bts.cfg -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I185b77eb4fa05501f098d89b80b66168349175bb Gerrit-Change-Number: 29338 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 Sep 2022 12:19:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: ttcn3-bts: Add osmux configurations
by fixeria 14 Sep '22

14 Sep '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29338 ) Change subject: ttcn3-bts: Add osmux configurations ...................................................................... Patch Set 4: (1 comment) File ttcn3-bts-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/29338/comment/40649d8b_43a… PS2, Line 149: logging level osmux info > There is no such line in osmo-bts.gen. […] This comment was not addressed. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I185b77eb4fa05501f098d89b80b66168349175bb Gerrit-Change-Number: 29338 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 Sep 2022 12:18:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: ttcn3-bts: Add osmux configurations
by pespin 14 Sep '22

14 Sep '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29338 ) Change subject: ttcn3-bts: Add osmux configurations ...................................................................... ttcn3-bts: Add osmux configurations Requires: osmo-ttcn3-hacks.git I1af23c7a60b05edc3b544f1fea0023f48e89f7a7 Requires: osmo-bts.git Ib80be434c06d07b3611bd18ae25dff8b14a7aad9 Related: SYS#5987 Change-Id: I185b77eb4fa05501f098d89b80b66168349175bb --- M ttcn3-bts-test/generic/BTS_Tests.cfg M ttcn3-bts-test/generic/osmo-bts.confmerge M ttcn3-bts-test/jenkins.sh 3 files changed, 23 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-bts-test/generic/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg index fd2e05d..dbf7ae0 100644 --- a/ttcn3-bts-test/generic/BTS_Tests.cfg +++ b/ttcn3-bts-test/generic/BTS_Tests.cfg @@ -16,6 +16,7 @@ L1CTL_PortType.m_l1ctl_sock_path := "/data/unix/osmocom_l2" BTS_Tests.mp_ctrl_ip := "172.18.9.20" BTS_Tests.mp_rtpem_bind_ip := "172.18.9.10" +BTS_Tests.mp_osmuxem_bind_ip := "172.18.9.10" [MAIN_CONTROLLER] diff --git a/ttcn3-bts-test/generic/osmo-bts.confmerge b/ttcn3-bts-test/generic/osmo-bts.confmerge index 7837748..9015904 100644 --- a/ttcn3-bts-test/generic/osmo-bts.confmerge +++ b/ttcn3-bts-test/generic/osmo-bts.confmerge @@ -7,5 +7,7 @@ oml remote-ip 172.18.9.11 gsmtap-remote-host 172.18.9.10 pcu-socket /data/unix/pcu_sock + osmux + local-ip 172.18.9.20 ctrl bind 0.0.0.0 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index c16be80..3438771 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -144,6 +144,11 @@ mkdir $VOL_BASE_DIR/bts mkdir $VOL_BASE_DIR/bts/unix cp generic/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ +# Disable until osmo-bts release > 1.5.0 +if ! image_suffix_is_master; then + sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg + sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg +fi mkdir $VOL_BASE_DIR/unix @@ -165,6 +170,11 @@ docker container kill ${BUILD_TAG}-fake_trx docker container kill ${BUILD_TAG}-bts cp virtphy/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ +# Disable until osmo-bts release > 1.5.0 +if ! image_suffix_is_master; then + sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg + sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg +fi start_bts virtual 0 start_virtphy # ... and execute the testsuite again with different cfg @@ -177,6 +187,11 @@ docker container kill ${BUILD_TAG}-bts cp oml/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ +# Disable until osmo-bts release > 1.5.0 +if ! image_suffix_is_master; then + sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg + sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg +fi start_bts trx 1 start_fake_trx start_trxcon @@ -186,6 +201,11 @@ # 4) Frequency hopping tests require different configuration files cp fh/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/ cp generic/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ +# Disable until osmo-bts release > 1.5.0 +if ! image_suffix_is_master; then + sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg + sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg +fi # restart the BSC/BTS and run the testsuite again docker container kill ${BUILD_TAG}-bts start_bsc -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I185b77eb4fa05501f098d89b80b66168349175bb Gerrit-Change-Number: 29338 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in docker-playground[master]: ttcn3-bts: Add osmux configurations
by pespin 14 Sep '22

14 Sep '22

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29338 ) Change subject: ttcn3-bts: Add osmux configurations ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I185b77eb4fa05501f098d89b80b66168349175bb Gerrit-Change-Number: 29338 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 Sep 2022 12:17:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-gsm-manuals[master]: Document osmux use in Abis interface
by pespin 14 Sep '22

14 Sep '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29354 ) Change subject: Document osmux use in Abis interface ...................................................................... Document osmux use in Abis interface Related: SYS#5987 Change-Id: Ic02d379f35f29f633d0fb14da3597481a0b8b8ba --- A common/chapters/osmux/mo_call_osmux_abis.msc A common/chapters/osmux/network_osmux_abis.dot M common/chapters/osmux/osmux.adoc 3 files changed, 106 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/54/29354/1 diff --git a/common/chapters/osmux/mo_call_osmux_abis.msc b/common/chapters/osmux/mo_call_osmux_abis.msc new file mode 100644 index 0000000..f52d414 --- /dev/null +++ b/common/chapters/osmux/mo_call_osmux_abis.msc @@ -0,0 +1,54 @@ +# MO-call with Osmux enable on 3GPP AoIP +msc { + hscale=2; + ms [label="MS"], bts [label="OsmoBTS"], bsc[label="OsmoBSC"], mgw_bsc[label="OsmoMGW(bsc)"], m_sc[label="MSC"], mgw_msc[label="OsmoMGW(msc)"]; + + bsc <- m_sc [label="BSSMAP RESET (with extension IE: Osmux Support)"]; + bsc -> m_sc [label="BSSMAP RESET ACK (with extension IE: Osmux Support)"]; + ...; + ms box mgw_msc [label="We assume a SDCCH is already established"]; + ...; + + ms -> bsc [label="DTAP CM Service Request"]; + bsc -> m_sc [label="Complete Layer 3 Information DTAP CM Service Request"]; + + # Allocate MGW/MSC Osmux endpoint + m_sc -> mgw_msc [label="MGCP CRCX rtpbridge/*@mgw, X-Osmux: *"]; + mgw_msc box mgw_msc [label="Bind to MGW-local RTP Port (5000)\nAllocate new endpoint 1"]; + mgw_msc -> m_sc [label="MGCP CRCX rtpbridge/1@mgw OK (MGW:5000)"]; + + bsc <- m_sc [label="BSSAP ASSGN REQ)"]; + bts <- bsc [label="RSL CHAN ACT"]; + bts -> bsc [label="RSL CHAN ACT ACK"]; + ms <- bsc [label="Assignment Command"]; + ms -> bsc [label="Assignment Complete"]; + ...; + + # connect BTS RTP with BSC-MGW RTP + bsc -> mgw_bsc [label="MGCP CRCX rtpbridge/*@mgw, X-Osmux: *"]; + mgw_bsc box mgw_bsc [label="Bind to MGW-local Osmux Port (1984)\n\nAllocate new endpoint 2, MGW's local CID 5"]; + bsc <- mgw_bsc [label="MGCP CRCX rtpbridge/2@mgw OK (MGW:1984, X-Osmux: 5)"]; + bts <- bsc [label="IPA CRCX (Extension IE Osmux-CID 5)"]; + bts box bts [label="Bind to BTS-local Osmux Port (1985), Allocate new BTS's local CID 7"]; + bts -> bsc [label="IPA CRCX ACK (BTS:1985, Extension IE Osmux-CID 7)"]; + bsc -> mgw_bsc [label="MGCP MDCX rtpbridge/2@mgw (BTS:1985, X-Osmux: 7)"]; + mgw_bsc box mgw_bsc [label="\nConnect to BTS:1985 MGW's remote CID 7"]; + bsc <- mgw_bsc [label="MGCP CRCX rtpbridge/2@mgw OK (MGW:1984, X-Osmux: 5)"]; + ...; + + mgw_bsc <- bsc [label="MGCP CRCX rtpbridge/2@mgw (MSC:5000)"]; + mgw_bsc box mgw_bsc [label="Bind to MGW-local RTP Port (2000)\nConnect to MSC:5000"]; + mgw_bsc -> bsc [label="MGCP CRCX rtpbridge/2@mgw OK (MGW:2000)"]; + ...; + + bsc -> m_sc [label="BSSAP ASSGN CMPL (3GPP AoIP MGW:2000)"]; + m_sc box m_sc [label="Connect remote RTP to MGW addr from ASSGN CMPL"]; + m_sc -> mgw_msc [label="MGCP MDCX rtpbridge/1@mgw (MGW:2000)"]; + m_sc <- mgw_msc [label="MGCP MDCX rtpbridge/1@mgw OK"]; + ...; + + mgw_bsc <=> mgw_msc [label="RTP Audio MGW:2000 MSC:5000"]; + bts <=> mgw_bsc [label="Osmux Audio BTS:1985 MGW:1984, CID(uplink):5, CID(downlink):7"]; + ms <=> bts [label="Um Audio (bidirectional)"]; + ms <-> m_sc [label="DTAP CC ALERTING"]; +} diff --git a/common/chapters/osmux/network_osmux_abis.dot b/common/chapters/osmux/network_osmux_abis.dot new file mode 100644 index 0000000..578e0d1 --- /dev/null +++ b/common/chapters/osmux/network_osmux_abis.dot @@ -0,0 +1,32 @@ +digraph G { + rankdir = LR; + subgraph cluster_RAN { + OsmoBTS1 [label="OsmoBTS"]; + OsmoBTS2 [label="OsmoBTS"]; + OsmoBSC; + OsmoMGW [label="OsmoMGW\n(for BSC)"]; + + OsmoBTS1 -> OsmoBSC [label="Abis/IP", dir="both"]; + OsmoBTS2 -> OsmoBSC [label="Abis/IP", dir="both"]; + OsmoBSC -> OsmoMGW [label="MGCP", dir="both"]; + { rank = same; OsmoBSC; OsmoMGW } + + OsmoBTS1 -> OsmoMGW [label="Osmux", dir="both", color=red]; + OsmoBTS2 -> OsmoMGW [label="RTP", dir="both"]; + + label = "RAN"; + } + subgraph cluster_CN { + OsmoMGW1 [label="OsmoMGW\n(for MSC)"]; + OsmoMSC [label="MSC\ne.g. OsmoMSC"]; + Core [label="Other CN Elements"]; + OsmoMSC -> Core [label="MAP/ISUP/SIP/GSUP", dir="both"]; + OsmoMSC -> OsmoMGW1 [label="MGCP", dir="both"]; + { rank = same; OsmoMSC; OsmoMGW1 } + OsmoMGW -> OsmoMGW1 [label="RTP", dir="both"]; + OsmoMGW1 -> Core [label="RTP", dir="both"]; + label = "CN"; + } + + OsmoBSC -> OsmoMSC [label="3GPP AoIP\nvia SIGTRAN/STP", dir="both"]; +} diff --git a/common/chapters/osmux/osmux.adoc b/common/chapters/osmux/osmux.adoc index 68d628f..f1e6f87 100644 --- a/common/chapters/osmux/osmux.adoc +++ b/common/chapters/osmux/osmux.adoc @@ -18,6 +18,11 @@ OsmoBSCNAT). The MGW attached those components need of course also be aware of `Osmux` existence in order to properly set up the audio data plane. +Under some specific circumstances, the operator may decide to set up the network +so that the satellite link lays in between the BTS and BSC. Hence, use of the +`Osmux` protocol is also possible between an Osmux capable BTS (like OsmoBTS) +and OsmoBSC (and its co-located MGW). + === Osmux and NAT It is quite usual for satellite based links to use NATs, which means any or both @@ -139,3 +144,18 @@ ---- include::mgcp_extension_osmux.adoc[] + +=== Abis setup with Osmux + +[[fig-network-osmux-aoip]] +.Sample node diagram of Osmux enabled in the Abis interface +[graphviz] +---- +include::network_osmux_abis.dot[] +---- + +.MO-call with Osmux enabled on Abis +[mscgen] +---- +include::mo_call_osmux_abis.msc[] +---- -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic02d379f35f29f633d0fb14da3597481a0b8b8ba Gerrit-Change-Number: 29354 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log