- gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: library/SDP_Templates: Add templates for precondition qos attributes
by pespin 20 Jun '24

20 Jun '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37257?usp=email ) Change subject: library/SDP_Templates: Add templates for precondition qos attributes ...................................................................... library/SDP_Templates: Add templates for precondition qos attributes Change-Id: I656ec1fa77bf3390a690fb0ed385d0be95c0f6b4 --- M library/SDP_Templates.ttcn 1 file changed, 86 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/37257/1 diff --git a/library/SDP_Templates.ttcn b/library/SDP_Templates.ttcn index 525da8e..ece6147 100644 --- a/library/SDP_Templates.ttcn +++ b/library/SDP_Templates.ttcn @@ -147,6 +147,83 @@ } } +/* rfc3312 */ +const charstring c_SDP_PRECON_TYPE_qos := "qos"; +const charstring c_SDP_PRECON_STRENGTH_TAG_mandatory := "mandatory"; +const charstring c_SDP_PRECON_STRENGTH_TAG_optional := "optional"; +const charstring c_SDP_PRECON_STRENGTH_TAG_none := "none"; +const charstring c_SDP_PRECON_STRENGTH_TAG_failure := "failure"; +const charstring c_SDP_PRECON_STRENGTH_TAG_unknown := "unknown"; +const charstring c_SDP_PRECON_STATUS_TYPE_e2e := "e2e"; +const charstring c_SDP_PRECON_STATUS_TYPE_local := "local"; +const charstring c_SDP_PRECON_STATUS_TYPE_remote := "remote"; +const charstring c_SDP_PRECON_DIR_TAG_none := "none"; +const charstring c_SDP_PRECON_DIR_TAG_send := "send"; +const charstring c_SDP_PRECON_DIR_TAG_recv := "recv"; +const charstring c_SDP_PRECON_DIR_TAG_sendrecv := "sendrecv"; + +template (present) SDP_attribute tr_SDP_curr(charstring status_type, + charstring dir_tag, + charstring precondition_type := c_SDP_PRECON_TYPE_qos) := { + curr := { + attr_value := precondition_type & " " & status_type & " " & dir_tag + } +} +template (present) SDP_attribute tr_SDP_curr_present := { + curr := { + attr_value := ? + } +} +template (value) SDP_attribute ts_SDP_curr(charstring status_type, + charstring dir_tag, + charstring precondition_type := c_SDP_PRECON_TYPE_qos) := { + curr := { + attr_value := precondition_type & " " & status_type & " " & dir_tag + } +} + +template (present) SDP_attribute tr_SDP_des(charstring status_type, + charstring strength_tag, + charstring dir_tag, + charstring precondition_type := c_SDP_PRECON_TYPE_qos) := { + curr := { + attr_value := precondition_type & " " & strength_tag & " " & status_type & " " & dir_tag + } +} +template (present) SDP_attribute tr_SDP_des_present := { + des := { + attr_value := ? + } +} +template (value) SDP_attribute ts_SDP_des(charstring status_type, + charstring strength_tag, + charstring dir_tag, + charstring precondition_type := c_SDP_PRECON_TYPE_qos) := { + des := { + attr_value := precondition_type & " " & strength_tag & " " & status_type & " " & dir_tag + } +} + +template (present) SDP_attribute tr_SDP_conf(charstring status_type, + charstring dir_tag, + charstring precondition_type := c_SDP_PRECON_TYPE_qos) := { + conf := { + attr_value := precondition_type & " " & status_type & " " & dir_tag + } +} +template (present) SDP_attribute tr_SDP_conf_present := { + conf := { + attr_value := ? + } +} +template (value) SDP_attribute ts_SDP_conf(charstring status_type, + charstring dir_tag, + charstring precondition_type := c_SDP_PRECON_TYPE_qos) := { + conf := { + attr_value := precondition_type & " " & status_type & " " & dir_tag + } +} + function f_sdp_addr2addrtype(charstring addr) return charstring { for (var integer i := 0; i < lengthof(addr); i := i + 1) { if (addr[i] == ":") { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37257?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: I656ec1fa77bf3390a690fb0ed385d0be95c0f6b4 Gerrit-Change-Number: 37257 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in docker-playground[master]: ttcn3-s1gw-test: run eNB/MME domains in separate networks
by pespin 19 Jun '24

19 Jun '24

Attention is currently required from: fixeria, laforge, osmith, pespin. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37256?usp=email ) Change subject: ttcn3-s1gw-test: run eNB/MME domains in separate networks ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I'm not sure what do you win with this tbh, other than making the whole setup more complex and dropping use of usual docker-container helpers. In the end, osmo-s1gw is really doing nothing with network interfaces, it only handles/work with sockets bound to IP addresses, so the network interface configuration is totally transparent to it and shouldn't matter at all. You can test with 1 netif with several IP addresses, like we do in Asterisk_Tests or iirc in EPDG_Tests. I'm happy to hear I'm wrong about this. -- 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-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(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: Wed, 19 Jun 2024 18:41:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in docker-playground[master]: ttcn3-s1gw-test: run eNB/MME domains in separate networks
by fixeria 19 Jun '24

19 Jun '24

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 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: test Precondition extension in IMS MT call
by pespin 19 Jun '24

19 Jun '24

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 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: test Precondition extension in IMS MO call
by pespin 19 Jun '24

19 Jun '24

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 0

[S] Change in osmo-ttcn3-hacks[master]: Makefile: re-generate per-suite Makefile(s) if needed
by fixeria 19 Jun '24

19 Jun '24

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 0

[S] Change in osmo-ttcn3-hacks[master]: Makefile: re-generate per-suite Makefile(s) if needed
by neels 19 Jun '24

19 Jun '24

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 0

[S] Change in osmo-ttcn3-hacks[master]: Makefile: re-generate per-suite Makefile(s) if needed
by pespin 19 Jun '24

19 Jun '24

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 0

[S] Change in osmo-ttcn3-hacks[master]: Makefile: re-generate per-suite Makefile(s) if needed
by fixeria 19 Jun '24

19 Jun '24

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 0

[S] Change in osmo-iuh[master]: support Paging in cn_ranap_rx_initiating_msg_co
by pespin 19 Jun '24

19 Jun '24

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 0

2026

2025

2024

2023

2022

gerrit-log