March 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-mgw[master]: mgcp_codec: fix oa/bwe comparison in mgcp_codec_pt_translate()
by dexter 27 Mar '23

27 Mar '23

Attention is currently required from: laforge, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/27392 ) Change subject: mgcp_codec: fix oa/bwe comparison in mgcp_codec_pt_translate() ...................................................................... Patch Set 5: (2 comments) File src/libosmo-mgcp/mgcp_codec.c: https://gerrit.osmocom.org/c/osmo-mgw/+/27392/comment/6ea38604_0ed6485e PS1, Line 369: static bool codecs_same(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec *codec_b, bool match_pload_fmt) > Yes, format conversion is transcoding in a "scientific" definition of the word. […] Ack https://gerrit.osmocom.org/c/osmo-mgw/+/27392/comment/7dc8f996_39b061d9 PS1, Line 431: /* In case we weren't able to find an exact match, we will try to find a match that is the same codec, but the > agreeing with pespin Than it is probably better to refactor the existing code a bit. The function that finds the payload type on the opposite connection could also find a convertible codec that could be the exactly the same or something that OsmoMGW can convert. That would be more flexible as we get access to the resulting codec struct instead of only the payload type. I have put that part in a follow up patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/27392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifbd201a2749009a4644a29bd77e1d0fc0c124a9d Gerrit-Change-Number: 27392 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Mar 2023 13:56:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-mgw[master]: mgcp_codec: fix oa/bwe comparison in mgcp_codec_pt_translate()
by dexter 27 Mar '23

27 Mar '23

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, msuraev, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/27392 to look at the new patch set (#5). Change subject: mgcp_codec: fix oa/bwe comparison in mgcp_codec_pt_translate() ...................................................................... mgcp_codec: fix oa/bwe comparison in mgcp_codec_pt_translate() The function mgcp_codec_pt_translate is very strict when comparing the codecs to each other to find a matching payload type number to be used on the egress side. This poses a problem when one side uses AMR in bandwith-efficient, while the other side uses AMR in octet-aligned payload type format. To the pt translate function the difference in the payload format will appear as if the codec were different and eventually the payload type number cannot be translated. since osmo-mgw offers conversion between the payload type format it would be no problem to ignore the payload type format when making the translation decision. The only exception here would be if one side would announce AMR two times, the first time with octet-aligned and the second time with bandwith-efficient format. Then we would have to use the payload type number from the exact match. (and skip any formatconversion) To archive such an optimized decision we will first go through the codec lists and perform an exact match. If we don't get a match we go through the codec lists a second time, but this time we ignore the payload format. Change-Id: Ifbd201a2749009a4644a29bd77e1d0fc0c124a9d Related: OS#5461 --- M src/libosmo-mgcp/mgcp_codec.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 119 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/92/27392/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/27392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifbd201a2749009a4644a29bd77e1d0fc0c124a9d Gerrit-Change-Number: 27392 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-mgw[master]: mgcp_codec: refactor payload type converstion
by dexter 27 Mar '23

27 Mar '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32083 ) Change subject: mgcp_codec: refactor payload type converstion ...................................................................... mgcp_codec: refactor payload type converstion in mgcp_codec.c we have a function mgcp_codec_pt_translate that is used to find the equivalent payload type number on an opposite connection. This is quite specific and the resulting payload type number may still belong to a codec that might require some form of conversion. Lets refactor this so that the function just finds a convertible codec for a given connection. This also opens up other usecases. The payload type conversion like we did it before can then be done with a few lines in mgcp_network.c Related: OS#5461 Change-Id: I085260a2ca8cfecdb58656b7a046c536189e238d --- M include/osmocom/mgcp/mgcp_codec.h M src/libosmo-mgcp/mgcp_codec.c M src/libosmo-mgcp/mgcp_network.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 5 files changed, 115 insertions(+), 65 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/83/32083/1 diff --git a/include/osmocom/mgcp/mgcp_codec.h b/include/osmocom/mgcp/mgcp_codec.h index 994d770..1f29b08 100644 --- a/include/osmocom/mgcp/mgcp_codec.h +++ b/include/osmocom/mgcp/mgcp_codec.h @@ -14,8 +14,9 @@ void mgcp_codec_reset_all(struct mgcp_conn_rtp *conn); int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name, const struct mgcp_codec_param *param); int mgcp_codec_decide(struct mgcp_conn_rtp *conn); -int mgcp_codec_pt_translate(struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst, int payload_type); +struct mgcp_rtp_codec *mgcp_codec_find_convertible(struct mgcp_conn_rtp *conn, struct mgcp_rtp_codec *codec); const struct mgcp_rtp_codec *mgcp_codec_pt_find_by_subtype_name(struct mgcp_conn_rtp *conn, const char *subtype_name, unsigned int match_nr); bool mgcp_codec_amr_align_mode_is_indicated(const struct mgcp_rtp_codec *codec); bool mgcp_codec_amr_is_octet_aligned(const struct mgcp_rtp_codec *codec); +struct mgcp_rtp_codec *mgcp_codec_from_pt(struct mgcp_conn_rtp *conn, int payload_type); diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index ccb5d77..9086047 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -425,63 +425,42 @@ return true; } -/*! Translate a given payload type number that belongs to the packet of a - * source connection to the equivalent payload type number that matches the - * configuration of a destination connection. - * \param[in] conn_src related source rtp-connection. - * \param[in] conn_dst related destination rtp-connection. - * \param[in] payload_type number from the source packet or source connection. - * \returns translated payload type number on success, -EINVAL on failure. */ -int mgcp_codec_pt_translate(struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst, int payload_type) +/*! For a given codec, find a convertible codec in the given connection. + * \param[in] conn connection to search for a convertible codec + * \param[in] codec for which a convertible codec shall be found. + * \returns codec on success, -NULL on failure. */ +struct mgcp_rtp_codec *mgcp_codec_find_convertible(struct mgcp_conn_rtp *conn, struct mgcp_rtp_codec *codec) { - struct mgcp_rtp_end *rtp_src; - struct mgcp_rtp_end *rtp_dst; - struct mgcp_rtp_codec *codec_src = NULL; - struct mgcp_rtp_codec *codec_dst = NULL; + struct mgcp_rtp_end *rtp_end; unsigned int i; unsigned int codecs_assigned; + struct mgcp_rtp_codec *codec_convertible = NULL; - rtp_src = &conn_src->end; - rtp_dst = &conn_dst->end; - - /* Find the codec information that is used on the source side */ - codecs_assigned = rtp_src->codecs_assigned; - OSMO_ASSERT(codecs_assigned <= MGCP_MAX_CODECS); - for (i = 0; i < codecs_assigned; i++) { - if (payload_type == rtp_src->codecs[i].payload_type) { - codec_src = &rtp_src->codecs[i]; - break; - } - } - if (!codec_src) - return -EINVAL; + rtp_end = &conn->end; /* Use the codec information from the source and try to find the equivalent of it on the destination side. In * the first run we will look for an exact match. */ - codecs_assigned = rtp_dst->codecs_assigned; + codecs_assigned = rtp_end->codecs_assigned; OSMO_ASSERT(codecs_assigned <= MGCP_MAX_CODECS); for (i = 0; i < codecs_assigned; i++) { - if (codecs_same(codec_src, &rtp_dst->codecs[i])) { - codec_dst = &rtp_dst->codecs[i]; + if (codecs_same(codec, &rtp_end->codecs[i])) { + codec_convertible = &rtp_end->codecs[i]; break; } } /* In case we weren't able to find an exact match, we will try to find a match that is the same codec, but the * payload format may be different. This alternative will require a frame format conversion (i.e. AMR bwe->oe) */ - if (!codec_dst) { + if (!codec_convertible) { for (i = 0; i < codecs_assigned; i++) { - if (codecs_convertible(codec_src, &rtp_dst->codecs[i])) { - codec_dst = &rtp_dst->codecs[i]; + if (codecs_convertible(codec, &rtp_end->codecs[i])) { + codec_convertible = &rtp_end->codecs[i]; break; } } } - if (!codec_dst) - return -EINVAL; - - return codec_dst->payload_type; + return codec_convertible; } /* Find the payload type number configured for a specific codec by SDP. @@ -508,3 +487,26 @@ } return NULL; } + +/*! Lookup a codec that is assigned to a connection by its payload type number. + * \param[in] conn related rtp-connection. + * \param[in] payload_type number of the codec to look up. + * \returns pointer to codec struct on success, NULL on failure. */ +struct mgcp_rtp_codec *mgcp_codec_from_pt(struct mgcp_conn_rtp *conn, int payload_type) +{ + struct mgcp_rtp_end *rtp_end = &conn->end; + unsigned int codecs_assigned = rtp_end->codecs_assigned; + struct mgcp_rtp_codec *codec = NULL; + size_t i; + + OSMO_ASSERT(codecs_assigned <= MGCP_MAX_CODECS); + + for (i = 0; i < codecs_assigned; i++) { + if (payload_type == rtp_end->codecs[i].payload_type) { + codec = &rtp_end->codecs[i]; + break; + } + } + + return codec; +} diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index af9ae99..ce08dd4 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -493,27 +493,31 @@ /* There may be different payload type numbers negotiated for two connections. * Patch the payload type of an RTP packet so that it uses the payload type * that is valid for the destination connection (conn_dst) */ -static int mgcp_patch_pt(struct mgcp_conn_rtp *conn_src, - struct mgcp_conn_rtp *conn_dst, struct msgb *msg) +static int mgcp_patch_pt(struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst, struct msgb *msg) { struct rtp_hdr *rtp_hdr; - uint8_t pt_in; - int pt_out; + struct mgcp_rtp_codec *codec_src; + struct mgcp_rtp_codec *codec_dst; if (msgb_length(msg) < sizeof(struct rtp_hdr)) { LOG_CONN_RTP(conn_src, LOGL_ERROR, "RTP packet too short (%u < %zu)\n", msgb_length(msg), sizeof(struct rtp_hdr)); return -EINVAL; } - rtp_hdr = (struct rtp_hdr *)msgb_data(msg); - pt_in = rtp_hdr->payload_type; - pt_out = mgcp_codec_pt_translate(conn_src, conn_dst, pt_in); - if (pt_out < 0) + /* Find the codec information that is used on the source side */ + codec_src = mgcp_codec_from_pt(conn_src, rtp_hdr->payload_type); + if (!codec_src) return -EINVAL; - rtp_hdr->payload_type = (uint8_t) pt_out; + /* Lookup a suitable codec in the destination connection. (The codec must be of the same type or at least + * convertible) */ + codec_dst = mgcp_codec_find_convertible(conn_dst, codec_src); + if (!codec_dst) + return -EINVAL; + + rtp_hdr->payload_type = (uint8_t) codec_dst->payload_type; return 0; } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 8f081a9..f77e697 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1769,26 +1769,26 @@ .amr_octet_aligned_present = false, }; -struct testcase_mgcp_codec_pt_translate_codec { +struct testcase_mgcp_codec_find_convertible_codec { int payload_type; const char *audio_name; const struct mgcp_codec_param *param; int expect_rc; }; -struct testcase_mgcp_codec_pt_translate_expect { +struct testcase_mgcp_codec_find_convertible_expect { bool end; int payload_type_map[2]; }; -struct testcase_mgcp_codec_pt_translate { +struct testcase_mgcp_codec_find_convertible { const char *descr; /* two conns on an endpoint, each with N configured codecs */ - struct testcase_mgcp_codec_pt_translate_codec codecs[2][10]; - struct testcase_mgcp_codec_pt_translate_expect expect[32]; + struct testcase_mgcp_codec_find_convertible_codec codecs[2][10]; + struct testcase_mgcp_codec_find_convertible_expect expect[32]; }; -static const struct testcase_mgcp_codec_pt_translate test_mgcp_codec_pt_translate_cases[] = { +static const struct testcase_mgcp_codec_find_convertible test_mgcp_codec_find_convertible_cases[] = { { .descr = "same order, but differing payload type numbers", .codecs = { @@ -2044,14 +2044,41 @@ }, }; -static void test_mgcp_codec_pt_translate(void) +static int pt_translate(struct mgcp_conn_rtp *conn, unsigned int index_src, unsigned int index_dst, int payload_type) +{ + struct mgcp_rtp_codec *codec_src = NULL; + struct mgcp_rtp_codec *codec_dst = NULL; + struct mgcp_conn_rtp *conn_src = &conn[index_src]; + struct mgcp_conn_rtp *conn_dst = &conn[index_dst]; + + /* Find the codec information that is used on the source side */ + codec_src = mgcp_codec_from_pt(conn_src, payload_type); + if (!codec_src) { + printf(" - mgcp_codec_from_pt(conn%u, %d) -> NO RESULT\n", index_src, payload_type); + return -EINVAL; + } else { + printf(" - mgcp_codec_from_pt(conn%u, %d) -> %s\n", index_src, payload_type, codec_src->subtype_name); + } + + codec_dst = mgcp_codec_find_convertible(conn_dst, codec_src); + if (!codec_dst) { + printf(" - mgcp_codec_find_convertible(conn%u, %s) -> NO RESULT\n", index_dst, codec_src->subtype_name); + return -EINVAL; + } else { + printf(" - mgcp_codec_find_convertible(conn%u, %s) -> %s -> %u\n", + index_dst, codec_src->subtype_name, codec_dst->subtype_name, codec_dst->payload_type); + return codec_dst->payload_type; + } +} + +static void test_mgcp_codec_find_convertible(void) { int i; bool ok = true; - printf("\nTesting mgcp_codec_pt_translate()\n"); + printf("\nTesting mgcp_codec_find_convertible()\n"); - for (i = 0; i < ARRAY_SIZE(test_mgcp_codec_pt_translate_cases); i++) { - const struct testcase_mgcp_codec_pt_translate *t = &test_mgcp_codec_pt_translate_cases[i]; + for (i = 0; i < ARRAY_SIZE(test_mgcp_codec_find_convertible_cases); i++) { + const struct testcase_mgcp_codec_find_convertible *t = &test_mgcp_codec_find_convertible_cases[i]; struct mgcp_conn_rtp conn[2] = {}; int rc; int conn_i; @@ -2062,7 +2089,7 @@ for (conn_i = 0; conn_i < 2; conn_i++) { printf(" - add codecs on conn%d:\n", conn_i); for (c = 0; c < ARRAY_SIZE(t->codecs[conn_i]); c++) { - const struct testcase_mgcp_codec_pt_translate_codec *codec = &t->codecs[conn_i][c]; + const struct testcase_mgcp_codec_find_convertible_codec *codec = &t->codecs[conn_i][c]; if (!codec->audio_name) break; @@ -2086,15 +2113,13 @@ } for (c = 0; c < ARRAY_SIZE(t->expect); c++) { - const struct testcase_mgcp_codec_pt_translate_expect *expect = &t->expect[c]; + const struct testcase_mgcp_codec_find_convertible_expect *expect = &t->expect[c]; int result; if (expect->end) break; - result = mgcp_codec_pt_translate(&conn[0], &conn[1], expect->payload_type_map[0]); - printf(" - mgcp_codec_pt_translate(conn0, conn1, %d) -> %d\n", - expect->payload_type_map[0], result); + result = pt_translate(conn, 0, 1,expect->payload_type_map[0]); if (result != expect->payload_type_map[1]) { printf(" ERROR: expected -> %d\n", expect->payload_type_map[1]); ok = false; @@ -2104,9 +2129,7 @@ if (expect->payload_type_map[1] < 0) continue; - result = mgcp_codec_pt_translate(&conn[1], &conn[0], expect->payload_type_map[1]); - printf(" - mgcp_codec_pt_translate(conn1, conn0, %d) -> %d\n", - expect->payload_type_map[1], result); + result = pt_translate(conn, 1, 0, expect->payload_type_map[1]); if (result != expect->payload_type_map[0]) { printf(" ERROR: expected -> %d\n", expect->payload_type_map[0]); ok = false; @@ -2274,7 +2297,7 @@ test_osmux_cid(); test_get_lco_identifier(); test_check_local_cx_options(ctx); - test_mgcp_codec_pt_translate(); + test_mgcp_codec_find_convertible(); test_conn_id_matching(); test_e1_trunk_nr_from_epname(); test_mgcp_is_rtp_dummy_payload(); diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 8b3b3d1..4ea9a34 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok Binary files differ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I085260a2ca8cfecdb58656b7a046c536189e238d Gerrit-Change-Number: 32083 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-mgw[master]: mgcp_codec: cosmetic: remove line break in api-doc
by dexter 27 Mar '23

27 Mar '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32084 ) Change subject: mgcp_codec: cosmetic: remove line break in api-doc ...................................................................... mgcp_codec: cosmetic: remove line break in api-doc We usually do not make a final line break on our api-doc strings. Change-Id: I025bbf36287ef014e294cc18a6435d7e2f9c1bff --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/84/32084/1 diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 9086047..003c4c4 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -470,8 +470,7 @@ * \param subtype_name SDP codec name without parameters (e.g. "AMR"). * \param match_nr Index for the match found, first being match_nr == 0. Iterate all matches by calling multiple times * with incrementing match_nr. - * \return codec definition for that conn matching the subtype_name, or NULL if no such match_nr is found. - */ + * \return codec definition for that conn matching the subtype_name, or NULL if no such match_nr is found. */ const struct mgcp_rtp_codec *mgcp_codec_pt_find_by_subtype_name(struct mgcp_conn_rtp *conn, const char *subtype_name, unsigned int match_nr) { -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I025bbf36287ef014e294cc18a6435d7e2f9c1bff Gerrit-Change-Number: 32084 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: pySim-shell: add cardinfo command
by fixeria 27 Mar '23

27 Mar '23

Attention is currently required from: laforge, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25805 ) Change subject: pySim-shell: add cardinfo command ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If31ed17102dc0108e27a5eb0344aabaaf19b19f9 Gerrit-Change-Number: 25805 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Mar 2023 12:14:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-bts-test: enable running GPRS related tests with trxcon
by fixeria 27 Mar '23

27 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31975 ) Change subject: ttcn3-bts-test: enable running GPRS related tests with trxcon ...................................................................... ttcn3-bts-test: enable running GPRS related tests with trxcon Change-Id: I06ad8e6403e2538c64d650f19a8d0bd4a344edbe Depends: osmo-ttcn3-hacks.git Ib8f4459480bbe12584a6fa71882f745f03c5055d Related: osmocom-bb.git I9567d64f9d00262e36147e8d7e541e5e246bda5f Related: OS#5500 --- M ttcn3-bts-test/generic/BTS_Tests.cfg 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: fixeria: 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 dbf7ae0..f6a0552 100644 --- a/ttcn3-bts-test/generic/BTS_Tests.cfg +++ b/ttcn3-bts-test/generic/BTS_Tests.cfg @@ -17,6 +17,7 @@ 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" +BTS_Tests.mp_l1_supports_gprs := true [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I06ad8e6403e2538c64d650f19a8d0bd4a344edbe Gerrit-Change-Number: 31975 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: ttcn3-bts-test: enable running GPRS related tests with trxcon
by fixeria 27 Mar '23

27 Mar '23

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31975 ) Change subject: ttcn3-bts-test: enable running GPRS related tests with trxcon ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I06ad8e6403e2538c64d650f19a8d0bd4a344edbe Gerrit-Change-Number: 31975 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Mar 2023 12:12:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-bts-test: enable running GPRS related tests with trxcon
by fixeria 27 Mar '23

27 Mar '23

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31975 ) Change subject: ttcn3-bts-test: enable running GPRS related tests with trxcon ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I06ad8e6403e2538c64d650f19a8d0bd4a344edbe Gerrit-Change-Number: 31975 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 27 Mar 2023 12:12:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: do L1CTL.clear in f_pcu_to_l1()
by fixeria 27 Mar '23

27 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31978 ) Change subject: BTS_Tests: do L1CTL.clear in f_pcu_to_l1() ...................................................................... BTS_Tests: do L1CTL.clear in f_pcu_to_l1() When calling f_pcu_to_l1(), the L1CTL port still contains many BCCH related L1CTL DATA.ind messages in the queue. It's not a really a problem since they all get discarded, but still they're producing lots of useless TTCN_MATCHING log messages. Change-Id: I57b745bcfc48dc621359658cd43d2ee622fde49b --- M bts/BTS_Tests.ttcn 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index d901664..9d7ab65 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5564,6 +5564,7 @@ timer T := 5.0; var L1ctlMessage rx_dl; + L1CTL.clear; PCU.clear; if (wait_rts) { f_pcu_wait_rts_and_data_req(bts_nr, trx_nr, ts_nr, sapi, data); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31978 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: I57b745bcfc48dc621359658cd43d2ee622fde49b Gerrit-Change-Number: 31978 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: keep pchan configuration unchanged in TC_pcu_*
by fixeria 27 Mar '23

27 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31979 ) Change subject: BTS_Tests: keep pchan configuration unchanged in TC_pcu_* ...................................................................... BTS_Tests: keep pchan configuration unchanged in TC_pcu_* Change [1] fixes support of dynamic timeslots in osmo-bts-virtual, so we don't need to change the pchan configuration anymore. Change-Id: I98397ac0fc17ece8f0e41b1ef1c158b47c9de026 Related: [1] osmo-bts.git I5db5b7dd6a8e84cf9a0d84f04a650c2ed8a4e368 --- M bts/BTS_Tests.ttcn 1 file changed, 20 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 9d7ab65..c55f962 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5509,7 +5509,7 @@ testcase TC_pcu_data_req_wrong_bts() runs on test_CT { var octetstring data := '0000'O & f_rnd_octstring(21); - f_virtphy_common(); + f_TC_pcu_init(); f_TC_pcu_act_req(0, 0, 7, true); f_TC_pcu_l1ctl_est_pdch(7); @@ -5522,7 +5522,7 @@ testcase TC_pcu_data_req_wrong_trx() runs on test_CT { var octetstring data := '0000'O & f_rnd_octstring(21); - f_virtphy_common(); + f_TC_pcu_init(); f_TC_pcu_act_req(0, 0, 7, true); f_TC_pcu_l1ctl_est_pdch(7); @@ -5535,7 +5535,7 @@ testcase TC_pcu_data_req_wrong_ts() runs on test_CT { var octetstring data := '0000'O & f_rnd_octstring(21); - f_virtphy_common(); + f_TC_pcu_init(); f_TC_pcu_act_req(0, 0, 7, true); f_TC_pcu_l1ctl_est_pdch(7); @@ -5548,7 +5548,7 @@ testcase TC_pcu_data_req_ts_inactive() runs on test_CT { var octetstring data := '0000'O & f_rnd_octstring(21); - f_virtphy_common(); + f_TC_pcu_init(); /* intentionally not calling f_TC_pcu_act_req() */ f_TC_pcu_l1ctl_est_pdch(7); @@ -5593,18 +5593,8 @@ } } -private function f_disable_dynamic_ts() runs on test_CT -{ - f_init_vty_bsc(); - /* I'm not quite sure why we need this with osmo-bts-virtual. Somehow it deosn't seem to - * support dynamic timeslots? But it uses the same scheduler as osmo-bts-trx ?!? */ - f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 3"}, "phys_chan_config TCH/F"); - f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 4"}, "phys_chan_config TCH/F"); +private function f_TC_pcu_init() runs on test_CT { f_init_with_pcuif(); -} - -private function f_virtphy_common() runs on test_CT { - f_disable_dynamic_ts(); f_init_l1ctl(); f_l1_tune(L1CTL); } @@ -5612,7 +5602,7 @@ testcase TC_pcu_data_req_pdtch() runs on test_CT { var octetstring data := '0000'O & f_rnd_octstring(21); - f_virtphy_common(); + f_TC_pcu_init(); f_TC_pcu_act_req(0, 0, 7, true); f_TC_pcu_l1ctl_est_pdch(7); @@ -5624,7 +5614,7 @@ testcase TC_pcu_data_req_ptcch() runs on test_CT { var octetstring data := '0000'O & f_rnd_octstring(21); - f_virtphy_common(); + f_TC_pcu_init(); f_TC_pcu_act_req(0, 0, 7, true); f_TC_pcu_l1ctl_est_pdch(7); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31979 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: I98397ac0fc17ece8f0e41b1ef1c158b47c9de026 Gerrit-Change-Number: 31979 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0