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

Change in osmo-hnbgw[master]: hnbgw_rx_hnb_deregister: Don't call hnb_context_release()

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29332 ) Change subject: hnbgw_rx_hnb_deregister: Don't call hnb_context_release() ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-hnbgw/+/29332/comment/701df572_c3acd650 PS2, Line 9: Don't release the HNB context as there's plenty of code that (at first sounded like "don't ever release a HNB context") -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id5c4f5c900ea049f54afbf58edb84b4dc00b1dcb Gerrit-Change-Number: 29332 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 Sep 2022 21:07:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: Abort if processing SCTP connection without HNB context

by neels

Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29331 ) Change subject: Abort if processing SCTP connection without HNB context ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: i remain somewhat sceptical of the vagueness in the commit log, but ok -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1eedab6f3ac974e942b02eaae41556f87dd8b6ba Gerrit-Change-Number: 29331 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 Sep 2022 20:57:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in pysim[master]: Revert "contrib/jenkins.sh: pylint v2.15 is unstable, pin v2.14.5"

by neels

Attention is currently required from: laforge, fixeria, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/29276 ) Change subject: Revert "contrib/jenkins.sh: pylint v2.15 is unstable, pin v2.14.5" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/29276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1bf36e0c6db14a10ff4eab57bae238401dbd7fd0 Gerrit-Change-Number: 29276 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 Sep 2022 20:53:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: test PS RAB Ass both with and without PFCP

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29231 ) Change subject: hnbgw: test PS RAB Ass both with and without PFCP ...................................................................... Patch Set 3: (1 comment) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29231/comment/eb921179_560e… PS3, Line 100: boolean mp_enable_pfcp_tests := false; > if the plan is to run master with this set to true and latest with this set to false: maybe use f_os […] the plan is to run this with true for ttcn3-hnbgw-test-pfcp and false for ttcn3-hnbgw-test. IOW i need two test suites, one testing behavior with PFCP support, and the other without. I submitted the docker-playground patch now that adds the new test suite, as reference -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29231 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: I511e758807e0512c18f3f9e0a8c4699b9a3f5992 Gerrit-Change-Number: 29231 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 Sep 2022 20:49:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: test PS RAB Ass both with and without PFCP

by neels

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29231 to look at the new patch set (#4). Change subject: hnbgw: test PS RAB Ass both with and without PFCP ...................................................................... hnbgw: test PS RAB Ass both with and without PFCP Add mp_enable_pfcp_tests. When true, osmo-hnbgw-with-pfcp.cfg needs to be used. Related: I39b9632f8524a9f3455c1a2d7611bfe8ba07c2fd (osmo-hnbgw) Related: I02b60941343000a4618e95f56326bec170c32bfe (docker-playground) Related: SYS#6093 Change-Id: I511e758807e0512c18f3f9e0a8c4699b9a3f5992 --- M hnbgw/HNBGW_Tests.ttcn A hnbgw/osmo-hnbgw-with-pfcp.cfg M hnbgw/osmo-hnbgw.cfg 3 files changed, 113 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/29231/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29231 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: I511e758807e0512c18f3f9e0a8c4699b9a3f5992 Gerrit-Change-Number: 29231 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 9 months

1
0
0 0

Change in docker-playground[master]: add ttcn3-hnbgw-test-pfcp

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/29339 ) Change subject: add ttcn3-hnbgw-test-pfcp ...................................................................... add ttcn3-hnbgw-test-pfcp Add a new test suite, running osmo-hnbgw with PFCP enabled. Just run all the same tests again, no matter if they are related to PS RAB Assignment or not, to also ensure no ill side effects from PFCP configuration. Related: SYS#5895 Depends: I511e758807e0512c18f3f9e0a8c4699b9a3f5992 (osmo-ttcn3-hacks) Change-Id: I02b60941343000a4618e95f56326bec170c32bfe --- A ttcn3-hnbgw-test-pfcp/Dockerfile A ttcn3-hnbgw-test-pfcp/HNBGW_Tests.cfg A ttcn3-hnbgw-test-pfcp/Makefile A ttcn3-hnbgw-test-pfcp/jenkins.sh A ttcn3-hnbgw-test-pfcp/osmo-hnbgw.cfg A ttcn3-hnbgw-test-pfcp/osmo-stp.cfg 6 files changed, 228 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/39/29339/1 diff --git a/ttcn3-hnbgw-test-pfcp/Dockerfile b/ttcn3-hnbgw-test-pfcp/Dockerfile new file mode 100644 index 0000000..4dd0d1b --- /dev/null +++ b/ttcn3-hnbgw-test-pfcp/Dockerfile @@ -0,0 +1,13 @@ +ARG REGISTRY +ARG USER +FROM $REGISTRY/$USER/debian-bullseye-titan +ARG OSMO_TTCN3_BRANCH="master" + +ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" hnbgw + +VOLUME /data + +COPY HNBGW_Tests.cfg /data/HNBGW_Tests.cfg + +CMD ttcn3-docker-run hnbgw HNBGW_Tests diff --git a/ttcn3-hnbgw-test-pfcp/HNBGW_Tests.cfg b/ttcn3-hnbgw-test-pfcp/HNBGW_Tests.cfg new file mode 100644 index 0000000..d3ea553 --- /dev/null +++ b/ttcn3-hnbgw-test-pfcp/HNBGW_Tests.cfg @@ -0,0 +1,49 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"/osmo-ttcn3-hacks/Common.cfg" +# testsuite specific configuration, not expected to change +"/osmo-ttcn3-hacks/hnbgw/HNBGW_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] +*.HNBGWVTY.CTRL_HOSTNAME := "172.18.35.20" + +[MODULE_PARAMETERS] +HNBGW_Tests.mp_hnodeb_ip := "172.18.35.203"; +HNBGW_Tests.mp_hnbgw_ip := "172.18.35.20"; +HNBGW_Tests.mp_mgw_ip := "172.18.35.203"; +HNBGW_Tests.mp_msc_cfg := { + transport := RANAP_TRANSPORT_IuCS, + sccp_service_type := "mtp3_itu", + sctp_addr := { 23905, "172.18.35.203", 2905, "172.18.35.200" }, + own_pc := 188, /* 0.23.4 first MSC emulation */ + own_ssn := 142, + peer_pc := 189, /* 0.23.5 osmo-hnbgw */ + peer_ssn := 142, + sio := '83'O, + rctx := 1 +}; +HNBGW_Tests.mp_sgsn_cfg := { + transport := RANAP_TRANSPORT_IuCS, + sccp_service_type := "mtp3_itu", + sctp_addr := { 23906, "172.18.35.203", 2905, "172.18.35.200" }, + own_pc := 185, /* 0.23.1 first SGSN emulation */ + own_ssn := 142, + peer_pc := 189, /* 0.23.5 osmo-hnbgw */ + peer_ssn := 142, + sio := '83'O, + rctx := 2 +}; + +HNBGW_Tests.mp_enable_pfcp_tests := true; +HNBGW_Tests.mp_pfcp_ip_local := "172.18.35.203"; +HNBGW_Tests.mp_pfcp_ip_remote := "172.18.35.20"; + + +[MAIN_CONTROLLER] + +[EXECUTE] +HNBGW_Tests.control diff --git a/ttcn3-hnbgw-test-pfcp/Makefile b/ttcn3-hnbgw-test-pfcp/Makefile new file mode 100644 index 0000000..1fcab4f --- /dev/null +++ b/ttcn3-hnbgw-test-pfcp/Makefile @@ -0,0 +1,3 @@ +RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.35.203 -v ggsn-test-vol:/data + +include ../make/Makefile diff --git a/ttcn3-hnbgw-test-pfcp/jenkins.sh b/ttcn3-hnbgw-test-pfcp/jenkins.sh new file mode 100755 index 0000000..71a4dc6 --- /dev/null +++ b/ttcn3-hnbgw-test-pfcp/jenkins.sh @@ -0,0 +1,62 @@ +#!/bin/sh + +. ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "osmo-stp-$IMAGE_SUFFIX" \ + "osmo-hnbgw-$IMAGE_SUFFIX" \ + "ttcn3-hnbgw-test" + +set_clean_up_trap +set -e + +mkdir $VOL_BASE_DIR/hnbgw-tester +mkdir $VOL_BASE_DIR/hnbgw-tester/unix +cp HNBGW_Tests.cfg $VOL_BASE_DIR/hnbgw-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/hnbgw-tester/HNBGW_Tests.cfg" + +mkdir $VOL_BASE_DIR/stp +cp osmo-stp.cfg $VOL_BASE_DIR/stp/ + +mkdir $VOL_BASE_DIR/hnbgw +mkdir $VOL_BASE_DIR/hnbgw/unix +cp osmo-hnbgw.cfg $VOL_BASE_DIR/hnbgw/ + +mkdir $VOL_BASE_DIR/unix + +SUBNET=35 +network_create $SUBNET + +echo Starting container with STP +docker run --rm \ + $(docker_network_params $SUBNET 200) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/stp:/data \ + --name ${BUILD_TAG}-stp -d \ + $DOCKER_ARGS \ + $REPO_USER/osmo-stp-$IMAGE_SUFFIX + +echo Starting container with HNBGW +docker run --rm \ + $(docker_network_params $SUBNET 20) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/hnbgw:/data \ + -v $VOL_BASE_DIR/unix:/data/unix \ + --name ${BUILD_TAG}-hnbgw -d \ + $DOCKER_ARGS \ + $REPO_USER/osmo-hnbgw-$IMAGE_SUFFIX + +echo Starting container with HNBGW testsuite +docker run --rm \ + $(docker_network_params $SUBNET 203) \ + --ulimit core=-1 \ + -e "TTCN3_PCAP_PATH=/data" \ + -v $VOL_BASE_DIR/hnbgw-tester:/data \ + -v $VOL_BASE_DIR/unix:/data/unix \ + --name ${BUILD_TAG}-ttcn3-hnbgw-test \ + $DOCKER_ARGS \ + $REPO_USER/ttcn3-hnbgw-test + +echo Stopping containers +docker container kill ${BUILD_TAG}-hnbgw +docker container kill ${BUILD_TAG}-stp diff --git a/ttcn3-hnbgw-test-pfcp/osmo-hnbgw.cfg b/ttcn3-hnbgw-test-pfcp/osmo-hnbgw.cfg new file mode 100644 index 0000000..0ba0afc --- /dev/null +++ b/ttcn3-hnbgw-test-pfcp/osmo-hnbgw.cfg @@ -0,0 +1,49 @@ +! +! 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 +! +cs7 instance 0 + asp asp-clnt-msc-0 2905 2905 m3ua + local-ip 172.18.35.20 + remote-ip 172.18.35.200 + 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 diff --git a/ttcn3-hnbgw-test-pfcp/osmo-stp.cfg b/ttcn3-hnbgw-test-pfcp/osmo-stp.cfg new file mode 100644 index 0000000..76685eb --- /dev/null +++ b/ttcn3-hnbgw-test-pfcp/osmo-stp.cfg @@ -0,0 +1,52 @@ +! +! 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 + 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 + 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 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I02b60941343000a4618e95f56326bec170c32bfe Gerrit-Change-Number: 29339 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts: Add osmux configurations

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29338 ) Change subject: ttcn3-bts: Add osmux configurations ...................................................................... Patch Set 2: (1 comment) File ttcn3-bts-test/generic/osmo-bts.confmerge: https://gerrit.osmocom.org/c/docker-playground/+/29338/comment/2cb71ac8_ae6… PS1, Line 10: osmux > This will break -latest. Should be done conditionally from jenkins.sh. Ack -- 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: 2 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 Sep 2022 16:29:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts: Add osmux configurations

by pespin

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/29338 to look at the new patch set (#2). 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(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/38/29338/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: 2 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 9 months

1
0
0 0

Change in osmo-bsc[master]: Add Osmux support on the Abis-side data plane

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29007 ) Change subject: Add Osmux support on the Abis-side data plane ...................................................................... Patch Set 4: (1 comment) File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/29007/comment/916348fb_936e6f27 PS3, Line 2883: LOGP(DRSL, LOGL_NOTICE, "Mantadory IE Osmux CID missing\n"); > Be careful with it! Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I48483b278ff829ee29d3e7fbcab0dd3a54728825 Gerrit-Change-Number: 29007 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 Sep 2022 15:46:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-bsc[master]: Add Osmux support on the Abis-side data plane

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29007 ) Change subject: Add Osmux support on the Abis-side data plane ...................................................................... Add Osmux support on the Abis-side data plane Related: SYS#5987 Change-Id: I48483b278ff829ee29d3e7fbcab0dd3a54728825 --- M TODO-RELEASE M include/osmocom/bsc/bts.h M include/osmocom/bsc/lchan.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bts.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/lchan_rtp_fsm.c 7 files changed, 111 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..f172501 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # 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 +libosmogsm >1.7.0 BTS_FEAT_OSMUX, RSL_IE_OSMO_OSMUX_CID diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 752a00a..b690652 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -590,6 +590,9 @@ struct amr_multirate_conf mr_full; struct amr_multirate_conf mr_half; + /* osmux config: */ + enum osmux_usage use_osmux; + /* PCU socket state */ char *pcu_sock_path; struct pcu_sock_state *pcu_state; diff --git a/include/osmocom/bsc/lchan.h b/include/osmocom/bsc/lchan.h index a6048c2..2de1227 100644 --- a/include/osmocom/bsc/lchan.h +++ b/include/osmocom/bsc/lchan.h @@ -299,6 +299,12 @@ uint8_t rr_cause; bool valid; } ass_compl; + + struct { + bool use; + uint8_t local_cid; + uint8_t remote_cid; + } osmux; } abis_ip; /* At first, the Timing Advance from the initial Channel Request. Later, the Timing Advance value received from diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 8ec94a9..1c60405 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2739,11 +2739,15 @@ port = ntohs(port); lchan->abis_ip.connect_port = port; } + if (TLVP_PRESENT(tv, RSL_IE_OSMO_OSMUX_CID)) { + lchan->abis_ip.osmux.remote_cid = tlvp_val8(tv, RSL_IE_OSMO_OSMUX_CID, 0); + } LOG_LCHAN(lchan, LOGL_DEBUG, "Rx IPACC %s ACK:" - " BTS=%s:%u conn_id=%u rtp_payload2=0x%02x speech_mode=0x%02x\n", + " BTS=%s:%u conn_id=%u rtp_payload2=0x%02x speech_mode=0x%02x osmux_use=%d osmux_loc_cid=%d\n", label, ip_to_a(lchan->abis_ip.bound_ip), lchan->abis_ip.bound_port, - lchan->abis_ip.conn_id, lchan->abis_ip.rtp_payload2, lchan->abis_ip.speech_mode); + lchan->abis_ip.conn_id, lchan->abis_ip.rtp_payload2, lchan->abis_ip.speech_mode, + lchan->abis_ip.osmux.use, lchan->abis_ip.osmux.local_cid); } /*! Send Issue IPA RSL CRCX to configure the RTP port of the BTS. @@ -2768,9 +2772,13 @@ /* 0x1- == receive-only, 0x-1 == EFR codec */ msgb_tv_put(msg, RSL_IE_IPAC_SPEECH_MODE, lchan->abis_ip.speech_mode); msgb_tv_put(msg, RSL_IE_IPAC_RTP_PAYLOAD, lchan->abis_ip.rtp_payload); + if (lchan->abis_ip.osmux.use) + msgb_tlv_put(msg, RSL_IE_OSMO_OSMUX_CID, 1, &lchan->abis_ip.osmux.local_cid); - LOG_LCHAN(lchan, LOGL_DEBUG, "Sending IPACC CRCX to BTS: speech_mode=0x%02x RTP_PAYLOAD=%d\n", - lchan->abis_ip.speech_mode, lchan->abis_ip.rtp_payload); + LOG_LCHAN(lchan, LOGL_DEBUG, + "Sending IPACC CRCX to BTS: speech_mode=0x%02x RTP_PAYLOAD=%d osmux_use=%d osmux_loc_cid=%d\n", + lchan->abis_ip.speech_mode, lchan->abis_ip.rtp_payload, + lchan->abis_ip.osmux.use, lchan->abis_ip.osmux.local_cid); msg->dst = rsl_chan_link(lchan); @@ -2808,6 +2816,8 @@ msgb_tv_put(msg, RSL_IE_IPAC_RTP_PAYLOAD, lchan->abis_ip.rtp_payload); if (lchan->abis_ip.rtp_payload2) msgb_tv_put(msg, RSL_IE_IPAC_RTP_PAYLOAD2, lchan->abis_ip.rtp_payload2); + if (lchan->abis_ip.osmux.use) + msgb_tlv_put(msg, RSL_IE_OSMO_OSMUX_CID, 1, &lchan->abis_ip.osmux.local_cid); msg->dst = rsl_chan_link(lchan); @@ -2865,6 +2875,15 @@ return -EINVAL; } + if (!lchan->abis_ip.osmux.use && TLVP_PRESENT(&tv, RSL_IE_OSMO_OSMUX_CID)) { + LOGP(DRSL, LOGL_NOTICE, "Received unexpected IE Osmux CID\n"); + return -EINVAL; + } + if (lchan->abis_ip.osmux.use && !TLVP_PRESENT(&tv, RSL_IE_OSMO_OSMUX_CID)) { + LOGP(DRSL, LOGL_NOTICE, "Mandatory IE Osmux CID missing\n"); + return -EINVAL; + } + ipac_parse_rtp(lchan, &tv, "CRCX"); osmo_fsm_inst_dispatch(lchan->fi_rtp, LCHAN_RTP_EV_IPACC_CRCX_ACK, 0); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 4976fe6..95e7430 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -428,6 +428,8 @@ memcpy(&bts->mr_half.bts_mode[0], &amr_hr_ms_bts_mode[0], sizeof(amr_hr_ms_bts_mode)); bts->mr_half.num_modes = ARRAY_SIZE(amr_hr_ms_bts_mode); + bts->use_osmux = OSMUX_USAGE_OFF; + bts_cbch_init(bts); bts_etws_init(bts); @@ -507,6 +509,13 @@ bts_gprs_mode_name(bts->gprs.mode)); return -EINVAL; } + if (bts->use_osmux == OSMUX_USAGE_ONLY && + !osmo_bts_has_feature(&bts->features, BTS_FEAT_OSMUX)) { + LOGP(DNM, LOGL_ERROR, + "(bts=%u) osmux use set to 'only', but BTS does not support Osmux\n", + bts->nr); + return -EINVAL; + } } /* Verify the physical channel mapping */ diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 492cb9a..3900768 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -2965,6 +2965,42 @@ return check_amr_config(vty); } +#define OSMUX_STR "RTP multiplexing\n" +DEFUN_USRATTR(cfg_bts_osmux, + cfg_bts_osmux_cmd, + X(BSC_VTY_ATTR_NEW_LCHAN), + "osmux (on|off|only)", + OSMUX_STR "Enable OSMUX\n" "Disable OSMUX\n" "Only use OSMUX\n") +{ + struct gsm_bts *bts = vty->index; + enum osmux_usage use; + + if (strcmp(argv[0], "off") == 0) + use = OSMUX_USAGE_OFF; + else if (strcmp(argv[0], "on") == 0) + use = OSMUX_USAGE_ON; + else if (strcmp(argv[0], "only") == 0) + use = OSMUX_USAGE_ONLY; + else + goto err; + + if (!is_osmobts(bts)) + goto err; + + if (bts->features_known && use != OSMUX_USAGE_OFF && + !osmo_bts_has_feature(&bts->features, BTS_FEAT_OSMUX)) + goto err; + + bts->use_osmux = use; + return CMD_SUCCESS; + +err: + LOGP(DNM, LOGL_ERROR, + "(bts=%u) Unable to set 'osmux %s', BTS does not support Osmux\n", + bts->nr, argv[0]); + return CMD_WARNING; +} + #define TNUM_STR "T-number, optionally preceded by 't' or 'T'\n" DEFUN_ATTR(cfg_bts_t3113_dynamic, cfg_bts_t3113_dynamic_cmd, "timer-dynamic TNNNN", @@ -4512,6 +4548,11 @@ config_write_bts_amr(vty, bts, &bts->mr_full, 1); config_write_bts_amr(vty, bts, &bts->mr_half, 0); + if (bts->use_osmux != OSMUX_USAGE_OFF) { + vty_out(vty, " osmux %s%s", bts->use_osmux == OSMUX_USAGE_ON ? "on" : "only", + VTY_NEWLINE); + } + config_write_bts_gprs(vty, bts); if (bts->excl_from_rf_lock) @@ -4773,6 +4814,7 @@ install_element(BTS_NODE, &cfg_bts_amr_hr_hyst2_cmd); install_element(BTS_NODE, &cfg_bts_amr_hr_hyst3_cmd); install_element(BTS_NODE, &cfg_bts_amr_hr_start_mode_cmd); + install_element(BTS_NODE, &cfg_bts_osmux_cmd); install_element(BTS_NODE, &cfg_bts_pcu_sock_cmd); install_element(BTS_NODE, &cfg_bts_acc_rotate_cmd); install_element(BTS_NODE, &cfg_bts_acc_rotate_quantum_cmd); diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 504bb34..87c235f 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -138,9 +138,10 @@ uint32_t prev_state) { struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); + struct gsm_bts *bts = lchan->ts->trx->bts; struct osmo_mgcpc_ep *mgwep; struct osmo_mgcpc_ep_ci *use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan); - struct mgcp_conn_peer crcx_info = {}; + struct mgcp_conn_peer crcx_info; if (!is_ipaccess_bts(lchan->ts->trx->bts)) { LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "Audio link to-BTS via E1, skipping IPACC\n"); @@ -163,13 +164,20 @@ lchan->mgw_endpoint_ci_bts = osmo_mgcpc_ep_ci_add(mgwep, "to-BTS"); + crcx_info = (struct mgcp_conn_peer){ + .ptime = 20, + .x_osmo_osmux_use = bts->use_osmux != OSMUX_USAGE_OFF, + .x_osmo_osmux_cid = -1, /* -1 is wildcard */ + }; if (lchan->conn) { crcx_info.call_id = lchan->conn->sccp.conn_id; if (lchan->conn->sccp.msc) crcx_info.x_osmo_ign = lchan->conn->sccp.msc->x_osmo_ign; } - crcx_info.ptime = 20; mgcp_pick_codec(&crcx_info, lchan, true); + /* TODO: lchan_rtp_fail() here if crcx_info->codecs[] contains non-AMR and bts->use_osmux=ONLY. + If bts->use_osmux=ON, only set .x_osmo_osmux_use if there's an AMR in crcx_info->codecs[]. + IF osmux=no, always set x_osmo_osmux_use=false*/ osmo_mgcpc_ep_ci_request(lchan->mgw_endpoint_ci_bts, MGCP_VERB_CRCX, &crcx_info, fi, LCHAN_RTP_EV_MGW_ENDPOINT_AVAILABLE, LCHAN_RTP_EV_MGW_ENDPOINT_ERROR, @@ -179,11 +187,26 @@ static void lchan_rtp_fsm_wait_mgw_endpoint_available(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); + struct gsm_bts *bts = lchan->ts->trx->bts; switch (event) { case LCHAN_RTP_EV_MGW_ENDPOINT_AVAILABLE: LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "MGW endpoint: %s\n", osmo_mgcpc_ep_ci_name(lchan_use_mgw_endpoint_ci_bts(lchan))); + if (osmo_mgcpc_ep_ci_get_crcx_info_to_osmux_cid(lchan->mgw_endpoint_ci_bts, + &lchan->abis_ip.osmux.local_cid)) { + if (bts->use_osmux == OSMUX_USAGE_OFF) { + lchan_rtp_fail("Got Osmux CID from MGW but we didn't ask for it"); + return; + } + lchan->abis_ip.osmux.use = true; + } else { + if (bts->use_osmux == OSMUX_USAGE_ONLY) { + lchan_rtp_fail("Got no Osmux CID from MGW but Osmux is mandatory"); + return; + } + lchan->abis_ip.osmux.use = false; + } lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_LCHAN_READY); return; @@ -415,6 +438,8 @@ mdcx_info = (struct mgcp_conn_peer){ .port = to_lchan->abis_ip.bound_port, .ptime = 20, + .x_osmo_osmux_use = lchan->abis_ip.osmux.use, + .x_osmo_osmux_cid = lchan->abis_ip.osmux.remote_cid, }; mgcp_pick_codec(&mdcx_info, to_lchan, true); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I48483b278ff829ee29d3e7fbcab0dd3a54728825 Gerrit-Change-Number: 29007 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2022