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

[S] Change in docker-playground[master]: scripts/kernel-test: add KERNEL_SKIP_SMOKE_TEST
by osmith 18 Jul '23

18 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/33800 ) Change subject: scripts/kernel-test: add KERNEL_SKIP_SMOKE_TEST ...................................................................... scripts/kernel-test: add KERNEL_SKIP_SMOKE_TEST Speed up local test cycles by not running the smoke test every time. Change-Id: I505b74e8c9b221655a97c5464f6fe4f21204a894 --- M README.md M jenkins-common.sh M scripts/kernel-test/prepare.sh 3 files changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/00/33800/1 diff --git a/README.md b/README.md index 7a7c1ab..6f05417 100644 --- a/README.md +++ b/README.md @@ -84,6 +84,8 @@ * `KERNEL_BRANCH` branch to checkout (default: master) * `KERNEL_SKIP_REBUILD`: set to 1 to not build the kernel again if already built with `KERNEL_BUILD=1` +* `KERNEL_SKIP_SMOKE_TEST`: don't boot up the kernel in QEMU once before + running the testsuite The OBS repository mirror consists of `${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}`, diff --git a/jenkins-common.sh b/jenkins-common.sh index 56c06fc..82e6ec3 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -452,6 +452,7 @@ -e "KERNEL_REMOTE_NAME=$KERNEL_REMOTE_NAME" \ -e "KERNEL_URL=$KERNEL_URL" \ -e "KERNEL_SKIP_REBUILD=$KERNEL_SKIP_REBUILD" \ + -e "KERNEL_SKIP_SMOKE_TEST=$KERNEL_SKIP_SMOKE_TEST" \ "$@" \ "$docker_image" \ "/kernel-test/prepare.sh" diff --git a/scripts/kernel-test/prepare.sh b/scripts/kernel-test/prepare.sh index 0fc9675..1f1d1d5 100755 --- a/scripts/kernel-test/prepare.sh +++ b/scripts/kernel-test/prepare.sh @@ -20,4 +20,6 @@ cp /boot/vmlinuz-* /cache/kernel-test/linux fi -kernel_smoke_test +if [ "$KERNEL_SKIP_SMOKE_TEST" != 1 ]; then + kernel_smoke_test +fi -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I505b74e8c9b221655a97c5464f6fe4f21204a894 Gerrit-Change-Number: 33800 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: scripts/kernel-test: add KERNEL_SKIP_REBUILD
by osmith 18 Jul '23

18 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/33799 ) Change subject: scripts/kernel-test: add KERNEL_SKIP_REBUILD ...................................................................... scripts/kernel-test: add KERNEL_SKIP_REBUILD Speed up local test cycles by not building the kernel again from source if not needed. Change-Id: Iaa401918d7c09ec92ec546071d8961e99a4cbb47 --- M README.md M jenkins-common.sh M scripts/kernel-test/kernel-build.sh 3 files changed, 24 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/99/33799/1 diff --git a/README.md b/README.md index 0e59fe3..7a7c1ab 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,8 @@ repositories in the same local linux clone, default: net-next) * `KERNEL_URL`: git remote url (default: net-next.git on kernel.org) * `KERNEL_BRANCH` branch to checkout (default: master) +* `KERNEL_SKIP_REBUILD`: set to 1 to not build the kernel again if already + built with `KERNEL_BUILD=1` The OBS repository mirror consists of `${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}`, diff --git a/jenkins-common.sh b/jenkins-common.sh index 20c1c4e..56c06fc 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -451,6 +451,7 @@ -e "KERNEL_CONFIG_BASE=$kernel_config_base" \ -e "KERNEL_REMOTE_NAME=$KERNEL_REMOTE_NAME" \ -e "KERNEL_URL=$KERNEL_URL" \ + -e "KERNEL_SKIP_REBUILD=$KERNEL_SKIP_REBUILD" \ "$@" \ "$docker_image" \ "/kernel-test/prepare.sh" diff --git a/scripts/kernel-test/kernel-build.sh b/scripts/kernel-test/kernel-build.sh index 5f246ae..d2127e4 100755 --- a/scripts/kernel-test/kernel-build.sh +++ b/scripts/kernel-test/kernel-build.sh @@ -61,8 +61,13 @@ cp .config "$previous" } -prepare_git_repo -update_kernel_config +output="$KERNEL_DIR"/arch/x86/boot/bzImage -make "-j$(nproc)" -cp arch/x86/boot/bzImage /cache/kernel-test/linux +if [ ! -e "$output" ] || [ "$KERNEL_SKIP_REBUILD" != 1 ]; then + prepare_git_repo + update_kernel_config + + make "-j$(nproc)" +fi + +cp "$output" /cache/kernel-test/linux -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iaa401918d7c09ec92ec546071d8961e99a4cbb47 Gerrit-Change-Number: 33799 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: kernel_test_prepare: use $DOCKER_ARGS
by osmith 18 Jul '23

18 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/33801 ) Change subject: kernel_test_prepare: use $DOCKER_ARGS ...................................................................... kernel_test_prepare: use $DOCKER_ARGS Use $DOCKER_ARGS in the docker run call to kernel-test/prepare.sh, which builds the initramfs. I use this to make a local build of osmo-ggsn + depends available in the docker container in /usr/local with the ttcn3.sh script in osmo-dev.git. Change-Id: Ie2500fa1bd9d57e2531463ce93fdd9930ad829d3 --- M jenkins-common.sh 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/01/33801/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index 82e6ec3..f91c615 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -453,6 +453,7 @@ -e "KERNEL_URL=$KERNEL_URL" \ -e "KERNEL_SKIP_REBUILD=$KERNEL_SKIP_REBUILD" \ -e "KERNEL_SKIP_SMOKE_TEST=$KERNEL_SKIP_SMOKE_TEST" \ + $DOCKER_ARGS \ "$@" \ "$docker_image" \ "/kernel-test/prepare.sh" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie2500fa1bd9d57e2531463ce93fdd9930ad829d3 Gerrit-Change-Number: 33801 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test: kernel-gtp: add ipv6
by osmith 18 Jul '23

18 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/33802 ) Change subject: ttcn3-ggsn-test: kernel-gtp: add ipv6 ...................................................................... ttcn3-ggsn-test: kernel-gtp: add ipv6 Change type-support from v4 to v4v6 for the "internet" apn. With this, some of the ipv6 and ipv4v6 test cases pass. I've also tried to add extra inet6 and inet46 blocks to the config, as in osmo-ggsn.cfg. But configuring multiple APNs with kernel GTP is not supported in osmo-ggsn: cannot create GTP tunnel device: Device or resource busy Related: OS#6096 Change-Id: If3549db216ff89bdb963744bb38015ad68d4cf6a --- M ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg 1 file changed, 24 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/02/33802/1 diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg index 6fbfd0e..cbf776c 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg @@ -46,14 +46,16 @@ gtp bind-ip 172.18.3.201 apn internet gtpu-mode kernel-gtp - tun-device tun4 - type-support v4 + tun-device tun46 + type-support v4v6 ip prefix dynamic 176.16.16.0/20 ip dns 0 172.18.3.201 ip dns 1 8.8.8.8 ip ifconfig 176.16.16.0/20 + ipv6 prefix dynamic 2001:780:44:2000:0:0:0:0/56 + ipv6 dns 0 fd02:db8:3::201 + ipv6 dns 1 2001:4860:4860::8844 + ipv6 ifconfig 2001:780:44:2000:0:0:0:0/56 no shutdown -# apn inet6 -# apn inet46 default-apn internet no shutdown ggsn -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If3549db216ff89bdb963744bb38015ad68d4cf6a Gerrit-Change-Number: 33802 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ggsn[master]: apn_start: allow kernel GTP with ipv6/ipv4v6
by osmith 18 Jul '23

18 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/33797 ) Change subject: apn_start: allow kernel GTP with ipv6/ipv4v6 ...................................................................... apn_start: allow kernel GTP with ipv6/ipv4v6 IPv6 support has been implemented in the kernel module. Related: OS#6096 Change-Id: I3df47b6c209f1e2f8254ba139581d6e622c6b35f --- M ggsn/ggsn.c 1 file changed, 12 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/97/33797/1 diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 0cde543..539e1f0 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -202,11 +202,6 @@ break; case APN_GTPU_MODE_KERNEL_GTP: LOGPAPN(LOGL_INFO, apn, "Opening Kernel GTP device %s\n", apn->tun.cfg.dev_name); - if (apn->cfg.apn_type_mask & (APN_TYPE_IPv6|APN_TYPE_IPv4v6)) { - LOGPAPN(LOGL_ERROR, apn, "Kernel GTP currently supports only IPv4\n"); - apn_stop(apn); - return -1; - } if (gsn == NULL) { /* skip bringing up the APN now if the GSN is not initialized yet. * This happens during initial load of the config file, as the -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/33797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I3df47b6c209f1e2f8254ba139581d6e622c6b35f Gerrit-Change-Number: 33797 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: ASCI: Retrieve NCH position from System Information 1
by dexter 18 Jul '23

18 Jul '23

Attention is currently required from: osmith, jolly, fixeria, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33296 ) Change subject: ASCI: Retrieve NCH position from System Information 1 ...................................................................... Patch Set 6: Code-Review+1 (2 comments) File src/common/sysinfo.c: https://gerrit.osmocom.org/c/osmo-bts/+/33296/comment/5360e140_2de2be1e PS6, Line 177: /* H <NCH Position : bit (5)> */ This is CSN.1, maybe put a spec reference here as well? https://gerrit.osmocom.org/c/osmo-bts/+/33296/comment/0017c8fa_2a430e5e PS6, Line 180: return -EINVAL; > It's not really an error, it's just "NCH not present" AFAIU. […] maybe ENOTSUP? I think also important would be a comment to explain that this is not an error. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I799a27179d478d4ff577d8bc47ae524834851e85 Gerrit-Change-Number: 33296 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 14:30:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-e1-recorder[master]: e1_recorder: Fix potential null-dereference
by dexter 18 Jul '23

18 Jul '23

Attention is currently required from: laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/33789 ) Change subject: e1_recorder: Fix potential null-dereference ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/33789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I481f0695f971f5cd2e77b8c9c62d423a70e0840d Gerrit-Change-Number: 33789 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 18 Jul 2023 14:18:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in simtrace2[master]: Fix unchecked return value of osmo_libusb_init()
by dexter 18 Jul '23

18 Jul '23

Attention is currently required from: laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/33792 ) Change subject: Fix unchecked return value of osmo_libusb_init() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/33792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic1f600dfd44d15da165a17d84f0faab6f6fd69c3 Gerrit-Change-Number: 33792 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 18 Jul 2023 14:15:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Components: add compatibility for PCU_IF_SAPI_PCH_DT
by dexter 18 Jul '23

18 Jul '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33795 ) Change subject: PCUIF_Components: add compatibility for PCU_IF_SAPI_PCH_DT ...................................................................... PCUIF_Components: add compatibility for PCU_IF_SAPI_PCH_DT When we receive a PCUIF_DATA_REQ, f_BTS_CT_handler will mangle the incoming message for us. The resulting BTS_CCCH_Block that is sent up to the component not only contains the PCUIF message, but will also have the already parsed MAC block attached. This currently only works for PCU_IF_SAPI_PCH, but not for PCU_IF_SAPI_PCH_DT. Let's add compatibility for PCU_IF_SAPI_PCH_DT. Related: OS#5927 Change-Id: Ibaa6d170ef0f1f61b708a872a3c2364585063503 --- M pcu/PCUIF_Components.ttcn 1 file changed, 39 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/33795/1 diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn index 375af8e..8a1207a 100644 --- a/pcu/PCUIF_Components.ttcn +++ b/pcu/PCUIF_Components.ttcn @@ -20,6 +20,7 @@ import from PCUIF_CodecPort all; import from Osmocom_Types all; +import from General_Types all; import from RLCMAC_Types all; import from GSM_RR_Types all; @@ -139,6 +140,8 @@ type record BTS_CCCH_Block { uint8_t bts_nr, PCUIF_data raw, + OCT4 tlli optional, + charstring imsi optional, GsmRrMessage rr_msg }; template BTS_PDTCH_Block tr_PCUIF_DATA_PDTCH(template uint8_t bts_nr, @@ -157,9 +160,13 @@ }; template BTS_CCCH_Block tr_PCUIF_DATA_RR(template uint8_t bts_nr, template PCUIF_data raw, - template GsmRrMessage rr_msg := ?) := { + template GsmRrMessage rr_msg := ?, + template OCT4 tlli := *, + template charstring imsi := *) := { bts_nr := bts_nr, raw := raw, + tlli := tlli, + imsi := imsi, rr_msg := rr_msg }; @@ -492,7 +499,7 @@ /* Wait until the PCU is connected */ PCUIF.receive(tr_RAW_PCU_EV(PCU_EV_CONNECT)); - var template PCUIF_Sapi tr_ccch_sapi := (PCU_IF_SAPI_PCH, PCU_IF_SAPI_AGCH); + var template PCUIF_Sapi tr_ccch_sapi := (PCU_IF_SAPI_PCH, PCU_IF_SAPI_PCH_DT, PCU_IF_SAPI_AGCH); alt { /* Wait for TXT.ind (PCU_VERSION) and respond with INFO.ind (SI13) */ [] PCUIF.receive(tr_PCUIF_TXT_IND(bts_nr, PCU_VERSION, ?)) -> value pcu_msg { @@ -530,6 +537,7 @@ } [decode_data_req] PCUIF.receive(tr_PCUIF_DATA_REQ(bts_nr, ?, ?, sapi := tr_ccch_sapi)) -> value pcu_msg { var octetstring data; + var PCUIF_pch_dt pch_dt; /* On PCH the payload is prefixed with paging group (3 octets): skip it. * TODO: add an additional template parameter, so we can match it. */ if (pcu_msg.u.data_req.sapi == PCU_IF_SAPI_PCH) { @@ -539,7 +547,17 @@ } pcu_msg_rr.bts_nr := bts_nr; pcu_msg_rr.raw := pcu_msg.u.data_req; - pcu_msg_rr.rr_msg := dec_GsmRrMessage(data); + + if (pcu_msg_rr.raw.sapi == PCU_IF_SAPI_PCH_DT) { + pch_dt := dec_PCUIF_pch_dt(pcu_msg_rr.raw.data); + pcu_msg_rr.tlli := pch_dt.tlli; + pcu_msg_rr.imsi := pch_dt.imsi; + pcu_msg_rr.rr_msg := dec_GsmRrMessage(pch_dt.data); + } else { + pcu_msg_rr.tlli := omit; + pcu_msg_rr.imsi := omit; + pcu_msg_rr.rr_msg := dec_GsmRrMessage(data); + } TC.send(pcu_msg_rr); repeat; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33795 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: Ibaa6d170ef0f1f61b708a872a3c2364585063503 Gerrit-Change-Number: 33795 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: GPRS_Components: use more suitable SAPI for DL TBF assignment
by dexter 18 Jul '23

18 Jul '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33794 ) Change subject: GPRS_Components: use more suitable SAPI for DL TBF assignment ...................................................................... GPRS_Components: use more suitable SAPI for DL TBF assignment The function that assigns the downlink TBF f_ms_exp_dl_tbf_ass_ccch() uses SAPI PCU_IF_SAPI_AGCH as default but actually downlink TBFs are assigned via the PCH. This means we have to put PCU_IF_SAPI_PCH into the parameter list on every function call, so it makes sense to change the default to PCU_IF_SAPI_PCH and omit the SAPI when calling the function Related: OS#5927 Change-Id: I49c59bad0162cb303669f6108201f154918b1db3 --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 47 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/33794/1 diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 59c99d8..64a39dd 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -628,7 +628,7 @@ ms.ul_tbf := f_ultbf_new_from_rr_imm_ass(rr_imm_ass); } -function f_ms_exp_dl_tbf_ass_ccch(inout GprsMS ms, template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH, +function f_ms_exp_dl_tbf_ass_ccch(inout GprsMS ms, template PCUIF_Sapi sapi := PCU_IF_SAPI_PCH, template GsmRrMessage t_imm_ass := tr_IMM_TBF_ASS(true, ?, ?), template (present) TsTrxBtsNum nr := tr_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 76926ae..2598e7b 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -447,7 +447,7 @@ /* Now SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -480,7 +480,7 @@ /* New data arrives, PCU should page the MS since no TBF active exists: */ /* Send some more data, it will never reach the MS */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); f_shutdown(__BFILE__, __LINE__, final := true); } @@ -593,7 +593,7 @@ /* SGSN sends some DL data, PCU will initiate Packet Downlink * Assignment on CCCH (PCH). We don't care about the payload. */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, f_rnd_octstring(10))); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Make sure that Timing Advance is 0 (the actual value is not known yet). * As per 3GPP S 44.018, section 3.5.3.1.2, the network *shall* initiate @@ -1060,7 +1060,7 @@ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -1103,7 +1103,7 @@ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, ms_racap)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS */ f_sleep(X2002); @@ -1333,7 +1333,7 @@ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, bssgp_ms_racap_egprs_def)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -1727,7 +1727,7 @@ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data1)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -1786,7 +1786,7 @@ /* The TBF should be freed now, so new data should trigger an Assignment: */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data2)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -1828,7 +1828,7 @@ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data1)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -1861,7 +1861,7 @@ /* The TBF should be freed now, so new data should trigger an Assignment: */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data2)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -1907,7 +1907,7 @@ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -1981,7 +1981,7 @@ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data1)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -2054,7 +2054,7 @@ /* after T_3195 timeout, TBF is released */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data2)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -2119,7 +2119,7 @@ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -2435,7 +2435,7 @@ /* Now SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -2625,7 +2625,7 @@ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, ms_racap)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -2780,7 +2780,7 @@ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -2789,7 +2789,7 @@ /* Now we don't ack the dl block (emulate MS failed receiveing IMM ASS * or GPRS DL, or DL ACK was lost for some reason). As a result, PCU * should retrigger IMM ASS + GPRS DL procedure after poll timeout. */ - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -2831,7 +2831,7 @@ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS */ f_sleep(X2002); @@ -3028,7 +3028,7 @@ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data1)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -3047,7 +3047,7 @@ } /* PCU starts whole process again */ - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -3132,7 +3132,7 @@ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi7)); BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi8)); BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi1)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS */ f_sleep(X2002); @@ -3574,7 +3574,7 @@ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, racap_tmpl)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -3853,7 +3853,7 @@ /* Now SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, imsi := ts_BSSGP_IMSI(ms.imsi))); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); @@ -3945,7 +3945,7 @@ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, ms_racap)); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS */ f_sleep(X2002); @@ -4040,7 +4040,7 @@ /* UL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); f_rx_rlcmac_dl_block_exp_data(dl_block, dl_fn, data, 0); @@ -4107,7 +4107,7 @@ /* UL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Now the PCU is waiting for the MS to move to PDCH in order to send data to it (timer X2002). * The MS decides it want to send new Ul TBF so it send RACH req to ask for it: */ @@ -4187,7 +4187,7 @@ /* UL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Now the PCU is waiting for the MS to move to PDCH in order to send data to it (timer X2002). * The MS decides it want to send new Ul TBF so it send RACH req to ask for it: */ @@ -4652,7 +4652,7 @@ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, f_rnd_octstring(12))); - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); f_TC_pcuif_fh_check_imm_ass(valueof(info_ind), ms.dl_tbf.rr_imm_ass); f_shutdown(__BFILE__, __LINE__, final := true); @@ -7137,7 +7137,7 @@ } else { BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, bssgp_ms_racap_gprs)); } - f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS */ f_sleep(X2002); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33794 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: I49c59bad0162cb303669f6108201f154918b1db3 Gerrit-Change-Number: 33794 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0