June 2024 - gerrit-log - lists.osmocom.org

[M] Change in docker-playground[master]: ttcn3-s1gw-test: run eNB/MME domains in separate networks

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/37256?usp=email ) Change subject: ttcn3-s1gw-test: run eNB/MME domains in separate networks ...................................................................... ttcn3-s1gw-test: run eNB/MME domains in separate networks The idea is to simulate more realistic conditions for the IUT by creating two virtual network interfaces in each container: one for the eNB (A) and one for the MME (B) domains. (network A) | (network B) | +-------------+ | osmo-s1gw | +-------------+ +----------------> | | <---------------+ | | | | | +--------------> | | <-------------+ | | | +-------------+ | | | | | | | ==|=|=======================|======================|=|== | | | +-----------+ | | | | +-------------+ | | | | | | +-> | ConnHdlr(1) | <-------> | | <--| | | +-------------+ | | | | | | | S1APSRV | | | +-------------+ | | | | |---> | ConnHdlr(N) | <-------> | | <----+ +-------------+ | | | | +-----------+ | This is achieved by passing multiple --network arguments to the docker-run command. Sadly, we cannot use docker_network_params more than once, because docker does not understand multiple --ip / --ip6 arguments (using the most recent one). Furthermore, we cannot use network_replace_subnet_in_configs because it replaces subnet in all IP addresses, so we put %VAR%s to the config files and replace them using sed manually. Change-Id: I4c72cb58eeb2d0ccca307dcfcfb04d09bfb0834e Related: SYS#6772 --- M ttcn3-s1gw-test/S1GW_Tests.cfg M ttcn3-s1gw-test/jenkins.sh M ttcn3-s1gw-test/osmo-s1gw.config 3 files changed, 75 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/56/37256/1 diff --git a/ttcn3-s1gw-test/S1GW_Tests.cfg b/ttcn3-s1gw-test/S1GW_Tests.cfg index a81c95e..dadc393 100644 --- a/ttcn3-s1gw-test/S1GW_Tests.cfg +++ b/ttcn3-s1gw-test/S1GW_Tests.cfg @@ -7,9 +7,10 @@ [TESTPORT_PARAMETERS] [MODULE_PARAMETERS] -S1GW_Tests.mp_s1gw_enb_ip := "172.18.10.200"; -S1GW_Tests.mp_s1gw_mme_ip := "172.18.10.100"; -S1GW_Tests.mp_mme_bind_ip := "172.18.10.101"; +# %VAR%s are replaced by jenkins.sh +S1GW_Tests.mp_s1gw_enb_ip := "%ENBNET%.2"; +S1GW_Tests.mp_s1gw_mme_ip := "%MMENET%.2"; +S1GW_Tests.mp_mme_bind_ip := "%MMENET%.3"; [MAIN_CONTROLLER] diff --git a/ttcn3-s1gw-test/jenkins.sh b/ttcn3-s1gw-test/jenkins.sh index 9fcf5f1..dbc3347 100755 --- a/ttcn3-s1gw-test/jenkins.sh +++ b/ttcn3-s1gw-test/jenkins.sh @@ -16,13 +16,29 @@ mkdir $VOL_BASE_DIR/s1gw cp osmo-s1gw.config $VOL_BASE_DIR/s1gw/ +# create the eNB network network_create -network_replace_subnet_in_configs +ENB_SUBNET=$SUBNET +ENB_NET_NAME=$NET_NAME + +# create the MME network +network_create +MME_SUBNET=$SUBNET +MME_NET_NAME=$NET_NAME + +# manually replace %VAR%s (subnet) in configs +sed -i -e "s/%ENBNET%/172.18.$ENB_SUBNET/g" \ + -e "s/%MMENET%/172.18.$MME_SUBNET/g" \ + "$VOL_BASE_DIR/s1gw-tester/S1GW_Tests.cfg" \ + "$VOL_BASE_DIR/s1gw/osmo-s1gw.config" echo "Starting container with osmo-s1gw" +# veth1 is assigned 172.18.$ENB_SUBNET.2 by docker +# veth2 is assigned 172.18.$MME_SUBNET.2 by docker docker run --rm \ - $(docker_network_params $SUBNET 100) \ --ulimit core=-1 \ + --network $ENB_NET_NAME \ + --network $MME_NET_NAME \ -v $VOL_BASE_DIR/s1gw:/data \ --name ${BUILD_TAG}-s1gw -d \ $DOCKER_ARGS \ @@ -32,9 +48,12 @@ sleep 2 echo "Starting container with the S1GW testsuite" +# veth1 is assigned 172.18.$ENB_SUBNET.3 by docker +# veth2 is assigned 172.18.$MME_SUBNET.3 by docker docker run --rm \ - $(docker_network_params $SUBNET 101) \ --ulimit core=-1 \ + --network $ENB_NET_NAME \ + --network $MME_NET_NAME \ -e "TTCN3_PCAP_PATH=/data" \ -v $VOL_BASE_DIR/s1gw-tester:/data \ --name ${BUILD_TAG}-ttcn3-s1gw-test \ diff --git a/ttcn3-s1gw-test/osmo-s1gw.config b/ttcn3-s1gw-test/osmo-s1gw.config index 13b5058..0d58d9a 100644 --- a/ttcn3-s1gw-test/osmo-s1gw.config +++ b/ttcn3-s1gw-test/osmo-s1gw.config @@ -11,9 +11,10 @@ %% +----------------+ +-----------------+ %% ================================================================================ {osmo_s1gw, - [{s1gw_bind_addr, "172.18.10.200"}, %% S1GW bind address for incoming eNB connections - {mme_loc_addr, "172.18.10.100"}, %% local address for outgoing connections to the MME - {mme_rem_addr, "172.18.10.101"} %% remote address for outgoing connections to the MME + %% %VAR%s are replaced by jenkins.sh + [{s1gw_bind_addr, "%ENBNET%.2"}, %% S1GW bind address for incoming eNB connections + {mme_loc_addr, "%MMENET%.2"}, %% local address for outgoing connections to the MME + {mme_rem_addr, "%MMENET%.3"} %% remote address for outgoing connections to the MME ]}, %% ================================================================================ %% kernel config -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37256?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: I4c72cb58eeb2d0ccca307dcfcfb04d09bfb0834e Gerrit-Change-Number: 37256 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: test Precondition extension in IMS MT call

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37249?usp=email ) Change subject: asterisk: test Precondition extension in IMS MT call ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37249?usp=email 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: Ic96a6f99edbcf299fde36a2146a3ce252e09536a Gerrit-Change-Number: 37249 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 19 Jun 2024 17:46:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: test Precondition extension in IMS MO call

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37248?usp=email ) Change subject: asterisk: test Precondition extension in IMS MO call ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37248?usp=email 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: I1e26f3bb9e54be5b5e15a003b2000ae3e88b9027 Gerrit-Change-Number: 37248 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 19 Jun 2024 17:46:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Makefile: re-generate per-suite Makefile(s) if needed

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37255?usp=email ) Change subject: Makefile: re-generate per-suite Makefile(s) if needed ...................................................................... Makefile: re-generate per-suite Makefile(s) if needed Make per-suite Makefile depend on scripts generating it, so that make will re-generate Makefile if any of its scripts has changed. Otherwise, Makefile(s) are not re-generated automatically. Change-Id: I8b73bf8e4c2f6e008eab9581f8c6840b22a5bd6a --- M Makefile 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/Makefile b/Makefile index 5a35e6e..cbb8083 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ all: $(foreach dir,$(SUBDIRS),$(dir)/all) define DIR_Makefile_template -$(1)/Makefile: +$(1)/Makefile: $(1)/gen_links.sh $(1)/regen_makefile.sh (cd $(1) && ./gen_links.sh && ./regen_makefile.sh) endef -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37255?usp=email 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: I8b73bf8e4c2f6e008eab9581f8c6840b22a5bd6a Gerrit-Change-Number: 37255 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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

1 year

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Makefile: re-generate per-suite Makefile(s) if needed

by neels

Attention is currently required from: fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37255?usp=email ) Change subject: Makefile: re-generate per-suite Makefile(s) if needed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37255?usp=email 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: I8b73bf8e4c2f6e008eab9581f8c6840b22a5bd6a Gerrit-Change-Number: 37255 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Jun 2024 17:30:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Makefile: re-generate per-suite Makefile(s) if needed

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37255?usp=email ) Change subject: Makefile: re-generate per-suite Makefile(s) if needed ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37255?usp=email 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: I8b73bf8e4c2f6e008eab9581f8c6840b22a5bd6a Gerrit-Change-Number: 37255 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Jun 2024 17:22:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Makefile: re-generate per-suite Makefile(s) if needed

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37255?usp=email ) Change subject: Makefile: re-generate per-suite Makefile(s) if needed ...................................................................... Makefile: re-generate per-suite Makefile(s) if needed Make per-suite Makefile depend on scripts generating it, so that make will re-generate Makefile if any of its scripts has changed. Otherwise, Makefile(s) are not re-generated automatically. Change-Id: I8b73bf8e4c2f6e008eab9581f8c6840b22a5bd6a --- M Makefile 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/37255/1 diff --git a/Makefile b/Makefile index 5a35e6e..cbb8083 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ all: $(foreach dir,$(SUBDIRS),$(dir)/all) define DIR_Makefile_template -$(1)/Makefile: +$(1)/Makefile: $(1)/gen_links.sh $(1)/regen_makefile.sh (cd $(1) && ./gen_links.sh && ./regen_makefile.sh) endef -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37255?usp=email 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: I8b73bf8e4c2f6e008eab9581f8c6840b22a5bd6a Gerrit-Change-Number: 37255 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[S] Change in osmo-iuh[master]: support Paging in cn_ranap_rx_initiating_msg_co

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/37254?usp=email ) Change subject: support Paging in cn_ranap_rx_initiating_msg_co ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/37254?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ie3e66eee1cc4553799e128580d39f3d40f79dcf5 Gerrit-Change-Number: 37254 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Jun 2024 14:11:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-iuh[master]: support Paging in cn_ranap_rx_initiating_msg_co

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/37254?usp=email ) Change subject: support Paging in cn_ranap_rx_initiating_msg_co ...................................................................... support Paging in cn_ranap_rx_initiating_msg_co Allow decoding Paging messages. So far not present because none of our RANAP implementations cares to decode Paging. osmo-gsm-shark uses this to show RANAP Paging. Change-Id: Ie3e66eee1cc4553799e128580d39f3d40f79dcf5 --- M src/ranap_common_cn.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/54/37254/1 diff --git a/src/ranap_common_cn.c b/src/ranap_common_cn.c index 72698a4..3035501 100644 --- a/src/ranap_common_cn.c +++ b/src/ranap_common_cn.c @@ -86,6 +86,9 @@ case RANAP_ProcedureCode_id_LocationReport: rc = ranap_decode_locationreporties(&message->msg.locationReportIEs, &imsg->value); break; + case RANAP_ProcedureCode_id_Paging: + rc = ranap_decode_pagingies(&message->msg.pagingIEs, &imsg->value); + break; default: LOGP(DRANAP, LOGL_INFO, "Received RANAP Procedure %s (CO, IM) from RNC. Decode not implemented\n", @@ -144,6 +147,9 @@ case RANAP_ProcedureCode_id_LocationReport: ranap_free_locationreporties(&message->msg.locationReportIEs); break; + case RANAP_ProcedureCode_id_Paging: + ranap_free_pagingies(&message->msg.pagingIEs); + break; default: LOGP(DRANAP, LOGL_INFO, "Freeing RANAP Procedure %s (CO, IM) from RNC not implemented\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/37254?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ie3e66eee1cc4553799e128580d39f3d40f79dcf5 Gerrit-Change-Number: 37254 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[S] Change in libosmo-abis[master]: rtp2trau_hr16: use osmo_hr_check_sid()

by pespin

Attention is currently required from: falconia. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/37250?usp=email ) Change subject: rtp2trau_hr16: use osmo_hr_check_sid() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File TODO-RELEASE: https://gerrit.osmocom.org/c/libosmo-abis/+/37250/comment/ec4fc161_2a6bae5e PS1, Line 12: libosmocodec >1.9.0 bugfix in osmo_hr_check_sid() in case length=0 > It is not clear to me exactly how to describe the relevant API aspect here - please help me. […] Ah I see, I was unaware that the API already existed but was broken. Then I guess it's fine as it is. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37250?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia8fe7e9ea65fadf7f5c136355ca8c24c89f09ef2 Gerrit-Change-Number: 37250 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Wed, 19 Jun 2024 10:33:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2024