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

[M] Change in osmo-mgw[master]: mgcp_client_fsm: allow the same codec multiple times in ptmap
by dexter 13 Sep '23

13 Sep '23

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34349?usp=email ) Change subject: mgcp_client_fsm: allow the same codec multiple times in ptmap ...................................................................... Patch Set 3: (4 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-mgw/+/34349/comment/0bb31340_ea6347a7 PS2, Line 10: he which to used and optionally a payload type map (ptmap) that is used > "he which" makes no sense :) Done Patchset: PS2: > After looking at the whole patch, I have the feeling this patch is a HACK and not a real fix. […] The way how ptmap works is not changed by this patch. It still works as expected when used with unique codec/pt pairs. All we do now is to allow the same codec appearing multiple times under the assumption that the order matches to order we have in the codecs[] array. I think this is an elegant fix since it does not change the API interface. It only extends the way how ptmap is used a little bit. Since we do not have to change the struct in any way we do not break the ABI, nor the API. File include/osmocom/mgcp_client/mgcp_client_fsm.h: https://gerrit.osmocom.org/c/osmo-mgw/+/34349/comment/f73e3b0f_aedc8b71 PS2, Line 39: * codecs array above). In case the same codec type (enum mgcp_codecs) is appearing multiple times in codecs. > This sentence is wrong and I'm not following it: "In case ... […] Done File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34349/comment/f61bce52_98b8cf60 PS2, Line 152: unsigned int map_codec_to_pt2(bool *ptmap_used, const struct ptmap *ptmap, > I'd say better move the "ptmap_used" arg to the end, since it's the only in-out param (so when readi […] Are you sure? Our convention is to have the output parameters first and then everything that is input. Or do I miss something here? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34349?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie13ce59d3165936a16e16588b4d58f0ce7e0ae67 Gerrit-Change-Number: 34349 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Sep 2023 09:28:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-mgw[master]: mgcp_client_fsm: allow the same codec multiple times in ptmap
by dexter 13 Sep '23

13 Sep '23

Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/34349?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review-1 by pespin, Verified-1 by Jenkins Builder Change subject: mgcp_client_fsm: allow the same codec multiple times in ptmap ...................................................................... mgcp_client_fsm: allow the same codec multiple times in ptmap In struct mgcp_conn_peer, the API user is supposed to fill in the codecs he wants to use and optionally a payload type map (ptmap). The ptmap is used to assign a user defined payload type number for each codec. (in case ptmap is not used, the IANA/3GPP assigned payload type numbers apply) Unfortunately ptmap works like a simple lookup table. When a payload type is looked up for a specific codec, then the lookup table is searched for the codec and the payload type of the first entry that is found is returned. This works fine as long as the same codec is not apparing twice, which different payload type numbers. What seems to be a corner case on the first look turns out to be a common case with AMR, where a bandwith-efficient mode and an octet-aligned mode may be specified. Then we need to specify AMR twice, but with different payload type numbers in ptmap. So, let's equip the function that does the mapping (map_pt_to_codec) with a memory, so that it can checkmark entries it has already mapped. This will allow us to put the same codec type multiple times in ptmap and as long as the order in ptmap matches the order used in codecs the mapping will be consistent. Related: OS#6171 Change-Id: Ie13ce59d3165936a16e16588b4d58f0ce7e0ae67 --- M include/osmocom/mgcp_client/mgcp_client.h M include/osmocom/mgcp_client/mgcp_client_fsm.h M src/libosmo-mgcp-client/mgcp_client.c M tests/mgcp_client/mgcp_client_test.c M tests/mgcp_client/mgcp_client_test.ok 5 files changed, 112 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/49/34349/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34349?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie13ce59d3165936a16e16588b4d58f0ce7e0ae67 Gerrit-Change-Number: 34349 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-gsm-manuals[master]: add static SS7 routing example to cs7-config.adoc
by laforge 13 Sep '23

13 Sep '23

Attention is currently required from: msuraev, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273?usp=email ) Change subject: add static SS7 routing example to cs7-config.adoc ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: is there anything possible to make this patch proceed? It has been around since april, and the last feedback was provided just one month ago. Thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273?usp=email 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: I44afddf7004f5bf37eec706ca3da12c04f83f8fa Gerrit-Change-Number: 32273 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Sep 2023 08:15:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA
by laforge 13 Sep '23

13 Sep '23

Attention is currently required from: arehbein, fixeria, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email ) Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... Patch Set 21: (1 comment) Patchset: PS21: what I don't really understand here is why there is no code being removed. If we are pushing the ipa [de]segmentation down the stack into the libraries, then shouldn't the code dealing with it so far be removed from the call chain somewhere? -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 21 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Sep 2023 08:14:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-mgw[master]: mgcp_client_fsm: explain member param in struct mgcp_conn_peer better
by laforge 13 Sep '23

13 Sep '23

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34350?usp=email ) Change subject: mgcp_client_fsm: explain member param in struct mgcp_conn_peer better ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34350?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iea4dc1e72fccaa464ce503fae88b5d8a867b1d19 Gerrit-Change-Number: 34350 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Sep 2023 08:10:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-sgsn[master]: sgsn_rim: forward message based on RIM ROUTING ADDRESS
by laforge 13 Sep '23

13 Sep '23

Attention is currently required from: dexter, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/34122?usp=email ) Change subject: sgsn_rim: forward message based on RIM ROUTING ADDRESS ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/34122?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifd2b915ed2f05130cff8ee77714b82005c17de3d Gerrit-Change-Number: 34122 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Sep 2023 08:08:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: abis_nm: send Get Attributes to GPRS Cell MO(s)
by laforge 13 Sep '23

13 Sep '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34360?usp=email ) Change subject: abis_nm: send Get Attributes to GPRS Cell MO(s) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34360?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib6d87da49217f1c8d76445ce623a511a07daedbf Gerrit-Change-Number: 34360 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Sep 2023 08:07:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: abis_nm: send Get Attributes to Rado Carrier MO(s)
by laforge 13 Sep '23

13 Sep '23

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34359?usp=email ) Change subject: abis_nm: send Get Attributes to Rado Carrier MO(s) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34359?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If7b75689c12a253377f2747babd4d7ebd1db5f87 Gerrit-Change-Number: 34359 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Sep 2023 08:07:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in docker-playground[master]: ttcn3-hnbgw: Update config files for latest after osmo-hnbgw new release
by laforge 13 Sep '23

13 Sep '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34399?usp=email ) Change subject: ttcn3-hnbgw: Update config files for latest after osmo-hnbgw new release ...................................................................... ttcn3-hnbgw: Update config files for latest after osmo-hnbgw new release Change-Id: Id184686ba50ec07532b2f11cc9513626f66ed94c --- M ttcn3-hnbgw-test/jenkins.sh D ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg D ttcn3-hnbgw-test/osmo-stp-legacy.cfg D ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg 4 files changed, 11 insertions(+), 179 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index 308d562..c47c9ca 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -31,10 +31,6 @@ mkdir $base_dir/hnbgw-tester/unix cp "$tests_cfg" $base_dir/hnbgw-tester/ write_mp_osmo_repo "$base_dir/hnbgw-tester/HNBGW_Tests.cfg" - # Can be removed once a new release osmo-hnbgw > 1.4.0 is avilable: - if ! image_suffix_is_master; then - sed -i 's/HNBGW_Tests.mp_validate_talloc_asn1 := true/HNBGW_Tests.mp_validate_talloc_asn1 := false/g' "$base_dir/hnbgw-tester/HNBGW_Tests.cfg" - fi mkdir $base_dir/stp cp "$stp_cfg" $base_dir/stp/osmo-stp.cfg @@ -82,19 +78,9 @@ docker_kill_wait ${BUILD_TAG}-stp } -osmo_stp_cfg="osmo-stp.cfg" -osmo_hnbgw_cfg="osmo-hnbgw.cfg" -osmo_hnbgw_with_pfcp_cfg="with-pfcp/osmo-hnbgw.cfg" - -if image_suffix_is_latest; then - osmo_stp_cfg="osmo-stp-legacy.cfg" - osmo_hnbgw_cfg="osmo-hnbgw-legacy.cfg" - osmo_hnbgw_with_pfcp_cfg="with-pfcp/osmo-hnbgw-legacy.cfg" -fi - echo Testing without PFCP -run_tests "$VOL_BASE_DIR" "HNBGW_Tests.cfg" $osmo_stp_cfg $osmo_hnbgw_cfg +run_tests "$VOL_BASE_DIR" "HNBGW_Tests.cfg" "osmo-stp.cfg" "osmo-hnbgw.cfg" echo Testing with PFCP mkdir "$VOL_BASE_DIR_PFCP" -run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" $osmo_stp_cfg $osmo_hnbgw_with_pfcp_cfg +run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" "osmo-stp.cfg" "with-pfcp/osmo-hnbgw.cfg" diff --git a/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg b/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg deleted file mode 100644 index 07413a4..0000000 --- a/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg +++ /dev/null @@ -1,50 +0,0 @@ -! -! OsmoHNBGW (1.1.0) configuration saved from vty -!! -! -log gsmtap 172.18.35.203 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category-hex 1 - logging print category 1 - logging print thread-id 0 - logging print extended-timestamp 1 - logging print file 1 - logging level set-all debug -! -line vty - no login - bind 0.0.0.0 -ctrl - bind 0.0.0.0 -! -cs7 instance 0 - asp asp-clnt-msc-0 2905 2905 m3ua - local-ip 172.18.35.20 - remote-ip 172.18.35.200 - role asp - sctp-role client - point-code 0.23.5 - sccp-address msc - routing-indicator PC - point-code 0.23.4 - sccp-address sgsn - routing-indicator PC - point-code 0.23.1 -hnbgw - log-prefix hnb-id - iuh - local-ip 172.18.35.20 - local-port 29169 - hnbap-allow-tmsi 1 - iucs - remote-addr msc - iups - remote-addr sgsn - mgcp - mgw local-ip 172.18.35.20 - mgw remote-ip 172.18.35.203 diff --git a/ttcn3-hnbgw-test/osmo-stp-legacy.cfg b/ttcn3-hnbgw-test/osmo-stp-legacy.cfg deleted file mode 100644 index 16ab3fa..0000000 --- a/ttcn3-hnbgw-test/osmo-stp-legacy.cfg +++ /dev/null @@ -1,56 +0,0 @@ -! -! OsmoSTP (0.8.1) configuration saved from vty -!! -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug - logging level lmgcp notice -! -line vty - no login -! -cs7 instance 0 - xua rkm routing-key-allocation dynamic-permitted - asp virt-msc0-0 23905 2905 m3ua - local-ip 172.18.35.200 - remote-ip 172.18.35.203 - role sg - sctp-role server - as virt-msc0 m3ua - asp virt-msc0-0 - routing-key 1 0.23.4 - asp virt-sgsn0-0 23906 2905 m3ua - local-ip 172.18.35.200 - remote-ip 172.18.35.203 - role sg - sctp-role server - as virt-sgsn0 m3ua - asp virt-sgsn0-0 - routing-key 2 0.23.1 - - - route-table system - update route 0.23.4 7.255.7 linkset virt-msc0 - update route 0.23.1 7.255.7 linkset virt-sgsn0 - listen m3ua 2905 - accept-asp-connections dynamic-permitted diff --git a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg deleted file mode 100644 index 7ccbc7b..0000000 --- a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg +++ /dev/null @@ -1,57 +0,0 @@ -! -! OsmoHNBGW (1.1.0) configuration saved from vty -!! -! -log gsmtap 172.18.35.203 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category-hex 1 - logging print category 1 - logging print thread-id 0 - logging print extended-timestamp 1 - logging print file 1 - logging level set-all debug -! -line vty - no login - bind 0.0.0.0 -ctrl - bind 0.0.0.0 -! -cs7 instance 0 - asp asp-clnt-msc-0 2905 2905 m3ua - local-ip 172.18.35.20 - remote-ip 172.18.35.200 - role asp - sctp-role client - point-code 0.23.5 - sccp-address msc - routing-indicator PC - point-code 0.23.4 - sccp-address sgsn - routing-indicator PC - point-code 0.23.1 -hnbgw - log-prefix hnb-id - iuh - local-ip 172.18.35.20 - local-port 29169 - hnbap-allow-tmsi 1 - iucs - remote-addr msc - iups - remote-addr sgsn - mgcp - mgw local-ip 172.18.35.20 - mgw remote-ip 172.18.35.203 - pfcp - remote-addr 172.18.35.203 - local-addr 172.18.35.20 - # so far HNBGW_Tests.ttcn does not heed the port an Assoc Setup Req came from, it always responds to port 8805 - local-port 8805 - # send PFCP Assoc Setup Req more often - timer pfcp x26 5 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34399?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id184686ba50ec07532b2f11cc9513626f66ed94c Gerrit-Change-Number: 34399 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: ttcn3-bts: Use PCUIF v11
by laforge 13 Sep '23

13 Sep '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34398?usp=email ) Change subject: ttcn3-bts: Use PCUIF v11 ...................................................................... ttcn3-bts: Use PCUIF v11 Since osmo-bts 1.7.0 which was just released, PCUIF v11 is supported, so use it both in master and latest. Change-Id: I6c905d074ffc324dd72d6a5c9ce79f3c241ac780 --- M ttcn3-bts-test/generic/BTS_Tests.cfg M ttcn3-bts-test/jenkins.sh M ttcn3-bts-test/oml/BTS_Tests.cfg M ttcn3-bts-test/virtphy/BTS_Tests.cfg 4 files changed, 15 insertions(+), 17 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: 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 7015111..634d60d 100644 --- a/ttcn3-bts-test/generic/BTS_Tests.cfg +++ b/ttcn3-bts-test/generic/BTS_Tests.cfg @@ -18,7 +18,7 @@ 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 -PCUIF_Types.mp_pcuif_version := 10; +PCUIF_Types.mp_pcuif_version := 11; [MAIN_CONTROLLER] diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index c456f37..ed1e095 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -121,31 +121,17 @@ $REPO_USER/ttcn3-bts-test } -set_pcuif_version() { - # This changes the PCUIF module parameter of the TTCN3 testsuite when the testsuite is - # executed for current master. For latest the PCUIF module parameter must stay at v.10 - # since in osmo-btw-latest PCUIF v.11 is not yet supported. After the next release PCUIF - # v.11 will be supported in osmo-bts-latest as well and this function, including the - # PCUIF_Types.mp_pcuif_version setting in the configuration files can be removed. - if image_suffix_is_master; then - sed -i 's/PCUIF_Types.mp_pcuif_version := 10/PCUIF_Types.mp_pcuif_version := 11/g' $1 - fi -} - network_create mkdir $VOL_BASE_DIR/bts-tester-generic cp generic/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/ write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg" -set_pcuif_version "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg" mkdir $VOL_BASE_DIR/bts-tester-virtphy cp virtphy/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-virtphy/ write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-virtphy/BTS_Tests.cfg" -set_pcuif_version "$VOL_BASE_DIR/bts-tester-virtphy/BTS_Tests.cfg" mkdir $VOL_BASE_DIR/bts-tester-oml cp oml/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-oml/ write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-oml/BTS_Tests.cfg" -set_pcuif_version "$VOL_BASE_DIR/bts-tester-oml/BTS_Tests.cfg" mkdir $VOL_BASE_DIR/bts-tester-hopping cp fh/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-hopping/ write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg" diff --git a/ttcn3-bts-test/oml/BTS_Tests.cfg b/ttcn3-bts-test/oml/BTS_Tests.cfg index bcecf28..74afc44 100644 --- a/ttcn3-bts-test/oml/BTS_Tests.cfg +++ b/ttcn3-bts-test/oml/BTS_Tests.cfg @@ -19,7 +19,7 @@ BTS_Tests_OML.mp_oml_ip := "172.18.9.10" BTS_Tests_OML.mp_oml_port := 3002 BTS_Tests_OML.mp_pcu_socket := "/data/unix/pcu_sock" -PCUIF_Types.mp_pcuif_version := 10; +PCUIF_Types.mp_pcuif_version := 11; [MAIN_CONTROLLER] diff --git a/ttcn3-bts-test/virtphy/BTS_Tests.cfg b/ttcn3-bts-test/virtphy/BTS_Tests.cfg index 74d6f53..fe8afe4 100644 --- a/ttcn3-bts-test/virtphy/BTS_Tests.cfg +++ b/ttcn3-bts-test/virtphy/BTS_Tests.cfg @@ -17,7 +17,7 @@ BTS_Tests.mp_ctrl_ip := "172.18.9.20" BTS_Tests.mp_l1_supports_gprs := true BTS_Tests.mp_bts_trxc_port := -1; -PCUIF_Types.mp_pcuif_version := 10; +PCUIF_Types.mp_pcuif_version := 11; [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34398?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6c905d074ffc324dd72d6a5c9ce79f3c241ac780 Gerrit-Change-Number: 34398 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

2025

2024

2023

2022

gerrit-log September 2023