Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 117s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 118s] [COMPILING libboard/qmod/source/card_pres.c] [ 118s] [COMPILING libboard/qmod/source/wwan_led.c] [ 118s] [COMPILING libboard/qmod/source/i2c.c] [ 118s] [COMPILING libboard/qmod/source/board_qmod.c] [ 118s] [COMPILING apps/dfu/main.c] [ 118s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 118s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 118s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 118s] Memory region Used Size Region Size %age Used [ 118s] rom: 16588 B16 KB101.25% [ 118s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 118s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 118s] collect2: error: ld returned 1 exit status [ 118s] % [ 118s] make[2]: *** [Makefile:234: flash] Error 1 [ 118s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 118s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 118s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 118s] dh_auto_build: error: make -j1 returned exit code 2 [ 118s] make: *** [debian/rules:16: build] Error 25 [ 118s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 118s] ### VM INTERACTION START ### [ 122s] [ 112.012439] sysrq: Power Off [ 122s] [ 112.017847] reboot: Power down [ 122s] ### VM INTERACTION END ### [ 122s] [ 122s] sheep85 failed "build simtrace2_0.7.0.69.aadd.dsc" at Sat Nov 7 02:41:21 UTC 2020. [ 122s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 115s] [COMPILING apps/dfu/main.c] [ 115s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 115s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 115s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 115s] Memory region Used Size Region Size %age Used [ 115s] rom: 16580 B16 KB101.20% [ 115s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 115s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 115s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 115s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 115s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 115s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 115s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 115s] collect2: error: ld returned 1 exit status [ 115s] % [ 115s] make[2]: *** [Makefile:234: flash] Error 1 [ 115s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 115s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 115s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 115s] dh_auto_build: error: make -j1 returned exit code 2 [ 115s] make: *** [debian/rules:16: build] Error 25 [ 115s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 115s] ### VM INTERACTION START ### [ 118s] [ 108.007482] sysrq: Power Off [ 118s] [ 108.011344] reboot: Power down [ 118s] ### VM INTERACTION END ### [ 118s] [ 118s] sheep85 failed "build simtrace2_0.7.0.69.aadd.dsc" at Sat Nov 7 02:41:28 UTC 2020. [ 118s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_cs_max_dl and TC_dl_cs1_to_cs4
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21051 ) Change subject: pcu: Introduce test TC_cs_max_dl and TC_dl_cs1_to_cs4 .. Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21051/2/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21051/2/pcu/PCU_Tests.ttcn@956 PS2, Line 956: /* Set maximum allowed DL CS to 3 */ This is not true. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21051 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: If847d091f3f4e6a7c77fbadc7280423637c50b35 Gerrit-Change-Number: 21051 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 21:52:08 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: f_acknackdesc_ack_block: Fix BSN wrap-around
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21050 ) Change subject: pcu: f_acknackdesc_ack_block: Fix BSN wrap-around .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21050 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: Ibe90e58e04ae5e24c36a0b3dda6742080107bd51 Gerrit-Change-Number: 21050 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 21:46:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_cs_initial_dl
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21035 ) Change subject: pcu: Introduce test TC_cs_initial_dl .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21035 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: I00bae15a007935cc4e027e63de4367d83e994bd7 Gerrit-Change-Number: 21035 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Fri, 06 Nov 2020 21:45:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gbproxy: Get the peer if paging by BVCI on SIG_BVC
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21030 ) Change subject: gbproxy: Get the peer if paging by BVCI on SIG_BVC .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic72f0f03e5886ab76404915fc60a2796e6881a7a Gerrit-Change-Number: 21030 Gerrit-PatchSet: 7 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 21:33:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: Let libosmocore handle VTY parent node tracking
daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21028 ) Change subject: Let libosmocore handle VTY parent node tracking .. Let libosmocore handle VTY parent node tracking * is_config_node is deprecated, so don't set it * go_parent_cb is only used if we want to do special stuff upon exiting a node, in osmo-sgsn and gtphub only osmo_ss7_vty_go_parent() needs to be called Change-Id: I2008dd9026922d29ee703c59e70d3fecced0ee18 --- M src/gbproxy/gb_proxy_main.c M src/gtphub/gtphub_main.c M src/sgsn/sgsn_main.c 3 files changed, 4 insertions(+), 94 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gbproxy/gb_proxy_main.c b/src/gbproxy/gb_proxy_main.c index f8c5ade..63e5f49 100644 --- a/src/gbproxy/gb_proxy_main.c +++ b/src/gbproxy/gb_proxy_main.c @@ -183,39 +183,9 @@ } } -int gbproxy_vty_is_config_node(struct vty *vty, int node) -{ -switch (node) { -/* add items that are not config */ -case CONFIG_NODE: -return 0; - -default: -return 1; -} -} - -int gbproxy_vty_go_parent(struct vty *vty) -{ -switch (vty->node) { -case GBPROXY_NODE: -default: -if (gbproxy_vty_is_config_node(vty, vty->node)) -vty->node = CONFIG_NODE; -else -vty->node = ENABLE_NODE; - -vty->index = NULL; -} - -return vty->node; -} - static struct vty_app_info vty_info = { .name = "OsmoGbProxy", .version= PACKAGE_VERSION, - .go_parent_cb = gbproxy_vty_go_parent, - .is_config_node = gbproxy_vty_is_config_node, }; /* default categories */ diff --git a/src/gtphub/gtphub_main.c b/src/gtphub/gtphub_main.c index 664c801..665224a 100644 --- a/src/gtphub/gtphub_main.c +++ b/src/gtphub/gtphub_main.c @@ -118,44 +118,12 @@ } } -#if BUILD_IU -int gtphub_vty_go_parent(struct vty *vty) -{ - switch (vty->node) { - default: - osmo_ss7_vty_go_parent(vty); - } - - return vty->node; -} -#endif - -int gtphub_vty_is_config_node(struct vty *vty, int node) -{ - /* Check if libosmo-sccp declares the node in -* question as config node */ -#if BUILD_IU - if (osmo_ss7_is_config_node(vty, node)) - return 1; -#endif - - switch (node) { - /* add items that are not config */ - case CONFIG_NODE: - return 0; - - default: - return 1; - } -} - static struct vty_app_info vty_info = { .name = "OsmoGTPhub", .version= PACKAGE_VERSION, #if BUILD_IU - .go_parent_cb = gtphub_vty_go_parent, + .go_parent_cb = osmo_ss7_vty_go_parent, #endif - .is_config_node = gtphub_vty_is_config_node, }; struct cmdline_cfg { diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index 3044f95..1eccad8 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -172,35 +172,6 @@ /* NSI that BSSGP uses when transmitting on NS */ extern struct gprs_ns_inst *bssgp_nsi; -int sgsn_vty_is_config_node(struct vty *vty, int node) -{ - /* So far the SGSN has no nested nodes that need parent node -* declaration, except for the ss7 vty nodes. */ - switch (node) { - case SGSN_NODE: - return 1; - default: -#if BUILD_IU - return osmo_ss7_is_config_node(vty, node); -#else - return 0; -#endif - } -} - -int sgsn_vty_go_parent(struct vty *vty) -{ - /* So far the SGSN has no nested nodes that need parent node -* declaration, except for the ss7 vty nodes. */ -#if BUILD_IU - return osmo_ss7_vty_go_parent(vty); -#else - vty->node = CONFIG_NODE; - vty->index = NULL; - return 0; -#endif -} - static void bvc_reset_persistent_nsvcs(void) { /* Send BVC-RESET on all persistent NSVCs */ @@ -221,8 +192,9 @@ static struct vty_app_info vty_info = { .name = "OsmoSGSN", .version= PACKAGE_VERSION, - .go_parent_cb = sgsn_vty_go_parent, - .is_config_node = sgsn_vty_is_config_node, +#if BUILD_IU + .go_parent_cb = osmo_ss7_vty_go_parent, +#endif }; static void print_help(void) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2008dd9026922d29ee703c59e70d3fecced0ee18 Gerrit-Change-Number: 21028 Gerrit-PatchSet: 8 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer:
Change in osmo-sgsn[master]: gbproxy: Get the peer if paging by BVCI on SIG_BVC
daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21030 ) Change subject: gbproxy: Get the peer if paging by BVCI on SIG_BVC .. gbproxy: Get the peer if paging by BVCI on SIG_BVC Currently the code reports routing the message to a BVCI but never even tries to get the peer for it. Change-Id: Ic72f0f03e5886ab76404915fc60a2796e6881a7a Related: SYS#4998 --- M src/gbproxy/gb_proxy.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c index e8a81e7..ccf3f73 100644 --- a/src/gbproxy/gb_proxy.c +++ b/src/gbproxy/gb_proxy.c @@ -1105,6 +1105,7 @@ nsei); if (TLVP_PRESENT(tp, BSSGP_IE_BVCI)) { uint16_t bvci = ntohs(tlvp_val16_unal(tp, BSSGP_IE_BVCI)); + peer = gbproxy_peer_by_bvci(cfg, bvci); LOGPC(DGPRS, LOGL_INFO, "routing by BVCI to peer BVCI=%u\n", bvci); errctr = GBPROX_GLOB_CTR_OTHER_ERR; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic72f0f03e5886ab76404915fc60a2796e6881a7a Gerrit-Change-Number: 21030 Gerrit-PatchSet: 7 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-sgsn[master]: gbproxy: Add todo for BVC RESET logic
daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21038 ) Change subject: gbproxy: Add todo for BVC RESET logic .. gbproxy: Add todo for BVC RESET logic When we receive a signalling BVC RESET from the SGSN we want to reset the signalling BVCs for every peer. Change-Id: I98c1a53d0e4b9a988e9ddec97ce0c67ded6f6326 Related: SYS#4998 --- M src/gbproxy/gb_proxy.c M tests/gbproxy/gbproxy_test.ok 2 files changed, 10 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c index 2ce7464..e8a81e7 100644 --- a/src/gbproxy/gb_proxy.c +++ b/src/gbproxy/gb_proxy.c @@ -1218,7 +1218,16 @@ case BSSGP_PDUT_BVC_RESET_ACK: if (cfg->route_to_sgsn2 && nsei == cfg->nsip_sgsn2_nsei) break; - /* fall through */ + /* simple case: BVCI IE is mandatory */ + if (!TLVP_PRESENT(, BSSGP_IE_BVCI)) + goto err_mand_ie; + bvci = ntohs(tlvp_val16_unal(, BSSGP_IE_BVCI)); + if (bvci == BVCI_SIGNALLING) { + /* TODO: Reset all PTP BVCIs */ + } else { + rc = gbprox_relay2bvci(cfg, msg, bvci, ns_bvci); + } + break; case BSSGP_PDUT_FLUSH_LL: /* simple case: BVCI IE is mandatory */ if (!TLVP_PRESENT(, BSSGP_IE_BVCI)) diff --git a/tests/gbproxy/gbproxy_test.ok b/tests/gbproxy/gbproxy_test.ok index 50c7cd7..6f20f12 100644 --- a/tests/gbproxy/gbproxy_test.ok +++ b/tests/gbproxy/gbproxy_test.ok @@ -3236,7 +3236,6 @@ 23 04 82 10 02 Gbproxy global: -Invalid BVC Identifier : 1 Patch error: no peer: 1 Peers: NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96 @@ -4307,7 +4306,6 @@ Detach Accept count : 3 TLLI-Cache: 0 Gbproxy global: -Invalid BVC Identifier : 1 BSSGP protocol error (SGSN): 2 Patch error: no peer: 1 === test_gbproxy_keep_info === -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I98c1a53d0e4b9a988e9ddec97ce0c67ded6f6326 Gerrit-Change-Number: 21038 Gerrit-PatchSet: 6 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged
Change in osmo-sgsn[master]: gbproxy: Add todo for BVC RESET logic
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21038 ) Change subject: gbproxy: Add todo for BVC RESET logic .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I98c1a53d0e4b9a988e9ddec97ce0c67ded6f6326 Gerrit-Change-Number: 21038 Gerrit-PatchSet: 6 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 06 Nov 2020 21:29:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: Let libosmocore handle VTY parent node tracking
Hello Jenkins Builder, laforge, pespin, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21028 to look at the new patch set (#8). Change subject: Let libosmocore handle VTY parent node tracking .. Let libosmocore handle VTY parent node tracking * is_config_node is deprecated, so don't set it * go_parent_cb is only used if we want to do special stuff upon exiting a node, in osmo-sgsn and gtphub only osmo_ss7_vty_go_parent() needs to be called Change-Id: I2008dd9026922d29ee703c59e70d3fecced0ee18 --- M src/gbproxy/gb_proxy_main.c M src/gtphub/gtphub_main.c M src/sgsn/sgsn_main.c 3 files changed, 4 insertions(+), 94 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/28/21028/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2008dd9026922d29ee703c59e70d3fecced0ee18 Gerrit-Change-Number: 21028 Gerrit-PatchSet: 8 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-sgsn[master]: osmo-gbproxy: Free msgb in ns2 prim callback
Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21059 to look at the new patch set (#5). Change subject: osmo-gbproxy: Free msgb in ns2 prim callback .. osmo-gbproxy: Free msgb in ns2 prim callback Commit cce88282388f in libosmocore changed the msg ownership model - the callback that the user registers is now responsible for freeing the msg. Change-Id: Iee940aba7d94afefb5957dbe5f0b04dcf951b31c Related: SYS#4998 --- M src/gbproxy/gb_proxy.c M tests/gbproxy/gbproxy_test.c 2 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/59/21059/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iee940aba7d94afefb5957dbe5f0b04dcf951b31c Gerrit-Change-Number: 21059 Gerrit-PatchSet: 5 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-sgsn[master]: osmo-gbproxy: Implement nsvc-state ctrl command
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21058 to look at the new patch set (#5). Change subject: osmo-gbproxy: Implement nsvc-state ctrl command .. osmo-gbproxy: Implement nsvc-state ctrl command Change-Id: I0beb572103803f3ee4ecb28d9bf2e3139e0f8aa4 --- M src/gbproxy/gb_proxy_ctrl.c 1 file changed, 15 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/58/21058/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0beb572103803f3ee4ecb28d9bf2e3139e0f8aa4 Gerrit-Change-Number: 21058 Gerrit-PatchSet: 5 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in osmo-sgsn[master]: configure.ac: Require python3 for ext_tests
Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21061 to look at the new patch set (#4). Change subject: configure.ac: Require python3 for ext_tests .. configure.ac: Require python3 for ext_tests The python scripts already use #!/usr/bin/env python3 so it was pure coincidence that the tests are working. Change-Id: I96ac31e7862fe102e5baee0c2e25458ff0451a50 --- M configure.ac 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/61/21061/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I96ac31e7862fe102e5baee0c2e25458ff0451a50 Gerrit-Change-Number: 21061 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-sgsn[master]: gbproxy: Add todo for BVC RESET logic
Hello Jenkins Builder, laforge, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21038 to look at the new patch set (#6). Change subject: gbproxy: Add todo for BVC RESET logic .. gbproxy: Add todo for BVC RESET logic When we receive a signalling BVC RESET from the SGSN we want to reset the signalling BVCs for every peer. Change-Id: I98c1a53d0e4b9a988e9ddec97ce0c67ded6f6326 Related: SYS#4998 --- M src/gbproxy/gb_proxy.c M tests/gbproxy/gbproxy_test.ok 2 files changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/38/21038/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I98c1a53d0e4b9a988e9ddec97ce0c67ded6f6326 Gerrit-Change-Number: 21038 Gerrit-PatchSet: 6 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset
Change in osmo-sgsn[master]: gbproxy: Whitespace fixes
daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21037 ) Change subject: gbproxy: Whitespace fixes .. gbproxy: Whitespace fixes Change-Id: Id70c15050b6314fdcd452e89e358d657e1f86e57 --- M src/gbproxy/gb_proxy.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c index 542d6d5..2ce7464 100644 --- a/src/gbproxy/gb_proxy.c +++ b/src/gbproxy/gb_proxy.c @@ -77,7 +77,7 @@ }; static int gbprox_relay2peer(struct msgb *old_msg, struct gbproxy_peer *peer, - uint16_t ns_bvci); +uint16_t ns_bvci); static int gbprox_relay2sgsn(struct gbproxy_config *cfg, struct msgb *old_msg, uint16_t ns_bvci, uint16_t sgsn_nsei); static void gbproxy_reset_imsi_acquisition(struct gbproxy_link_info* link_info); @@ -804,7 +804,7 @@ /* feed a message down the NS-VC associated with the specified peer */ static int gbprox_relay2peer(struct msgb *old_msg, struct gbproxy_peer *peer, - uint16_t ns_bvci) +uint16_t ns_bvci) { /* create a copy of the message so the old one can * be free()d safely when we return from gbprox_rcvmsg() */ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id70c15050b6314fdcd452e89e358d657e1f86e57 Gerrit-Change-Number: 21037 Gerrit-PatchSet: 5 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged
Change in osmo-sgsn[master]: Port gbproxy to NS2
daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 ) Change subject: Port gbproxy to NS2 .. Port gbproxy to NS2 Since NS2 has a different abstraction we mock up the prim send/recv functions and don't test NS like the old tests did. Related: SYS#4998 Change-Id: Iecfd0408a35a11638d254c1db3c1d477b1a11524 --- M doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg M include/osmocom/sgsn/gb_proxy.h M src/gbproxy/gb_proxy.c M src/gbproxy/gb_proxy_ctrl.c M src/gbproxy/gb_proxy_main.c M src/gbproxy/gb_proxy_patch.c M src/gbproxy/gb_proxy_vty.c M tests/gbproxy/gbproxy_test.c M tests/gbproxy/gbproxy_test.ok M tests/vty_test_runner.py 10 files changed, 3,325 insertions(+), 4,991 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iecfd0408a35a11638d254c1db3c1d477b1a11524 Gerrit-Change-Number: 21029 Gerrit-PatchSet: 6 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-sgsn[master]: Port gbproxy to NS2
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 ) Change subject: Port gbproxy to NS2 .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iecfd0408a35a11638d254c1db3c1d477b1a11524 Gerrit-Change-Number: 21029 Gerrit-PatchSet: 6 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 21:07:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: prepare tests for new GPRS/EGPRS multiplex support
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20984 ) Change subject: pcu: prepare tests for new GPRS/EGPRS multiplex support .. Patch Set 3: It's not needed to pass it in every test case, and as I shared, most of the test won't need it once we do new release of osmo-pcu. Passing info_ind is actually a really good and quick way of configuring osmo-pcu the way we want for each test. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20984 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: Ib95aae155b0712313a30f0c5404a8cb1f28b98f5 Gerrit-Change-Number: 20984 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 20:52:13 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Relax some CS/MCS expectancy checks
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21049 ) Change subject: pcu: Relax some CS/MCS expectancy checks .. Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21049/2/library/RLCMAC_Templates.ttcn File library/RLCMAC_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21049/2/library/RLCMAC_Templates.ttcn@21 PS2, Line 21: cs_gprs_any We usually prefix all templates with 'tr_' / 'ts_' / 't_'. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21049 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: I79b81d473b7428b57a0ec501c5bd0d88e35c81e3 Gerrit-Change-Number: 21049 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Fri, 06 Nov 2020 20:20:55 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: prepare tests for new GPRS/EGPRS multiplex support
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20984 ) Change subject: pcu: prepare tests for new GPRS/EGPRS multiplex support .. Patch Set 3: > Patch Set 2: > > > Patch Set 2: > > > > Well, ok, what do you think about f_init_raw_egprs() then? > > Why do you want that? simply pass a different template if needed. I don't see > an issue with that. I don't like the need to pass the INFO.ind and now also the flags in every test case. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20984 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: Ib95aae155b0712313a30f0c5404a8cb1f28b98f5 Gerrit-Change-Number: 20984 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 20:17:56 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Implement check for expected (M)CS in received data block
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21034 ) Change subject: pcu: Implement check for expected (M)CS in received data block .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21034 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: Ibdc63f6b695c08e4ddf5894c22767d07acf21311 Gerrit-Change-Number: 21034 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 20:16:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: RLCMAC_EncDec: Provide decoded (m)cs in (E)GPRS data blocks
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21033 ) Change subject: RLCMAC_EncDec: Provide decoded (m)cs in (E)GPRS data blocks .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21033 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: I80ed44e575cc0a11510832e5bbfc07173e7b75b8 Gerrit-Change-Number: 21033 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 20:15:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf_ul: Log mismatching TLLI on log message
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/21067 ) Change subject: tbf_ul: Log mismatching TLLI on log message .. tbf_ul: Log mismatching TLLI on log message Change-Id: Ia2ac7062c1f3308a1485da6d769cb8a869fa8100 --- M src/tbf_ul.cpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/67/21067/1 diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index c594c59..57da02a 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -460,8 +460,8 @@ update_ms(new_tlli, GPRS_RLCMAC_UL_TBF); } else if (new_tlli && new_tlli != tlli()) { LOGPTBFUL(this, LOGL_NOTICE, - "TLLI mismatch on UL DATA TFI=%d. (Ignoring due to contention resolution)\n", - rlc->tfi); + "Decoded TLLI=%08x mismatch on UL DATA TFI=%d. (Ignoring due to contention resolution)\n", + new_tlli, rlc->tfi); m_window.invalidate_bsn(rdbi->bsn); continue; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/21067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia2ac7062c1f3308a1485da6d769cb8a869fa8100 Gerrit-Change-Number: 21067 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: RLCMAC_EncDec: Fix Encoding of TLLI in UlEgprsDataBlock
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21066 ) Change subject: RLCMAC_EncDec: Fix Encoding of TLLI in UlEgprsDataBlock .. RLCMAC_EncDec: Fix Encoding of TLLI in UlEgprsDataBlock Change-Id: If13f36db9c86c10d7c5a6a307c430ee090b7dd06 --- M library/RLCMAC_EncDec.cc 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/21066/1 diff --git a/library/RLCMAC_EncDec.cc b/library/RLCMAC_EncDec.cc index c5fc447..4dba35a 100644 --- a/library/RLCMAC_EncDec.cc +++ b/library/RLCMAC_EncDec.cc @@ -1291,7 +1291,13 @@ if (in.tlli__ind()) { - aligned_buffer.put_string(in.tlli()); + /* The TLLI is encoded in little endian for EGPRS (see +* TS 44.060, figure 10.3a.2.1, note 2) */ + OCTETSTRING tlli = in.tlli(); + aligned_buffer.put_c(tlli[3].get_octet()); + aligned_buffer.put_c(tlli[2].get_octet()); + aligned_buffer.put_c(tlli[1].get_octet()); + aligned_buffer.put_c(tlli[0].get_octet()); } if (in.mac__hdr().pfi__ind()) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21066 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: If13f36db9c86c10d7c5a6a307c430ee090b7dd06 Gerrit-Change-Number: 21066 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: RLCMAC_EncDec: Fix encoding of TI and E bits in UlEgprsDataBlock
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21064 ) Change subject: RLCMAC_EncDec: Fix encoding of TI and E bits in UlEgprsDataBlock .. RLCMAC_EncDec: Fix encoding of TI and E bits in UlEgprsDataBlock Change-Id: I442a12a16fe0d0664c677eec10bb81e2544235aa --- M library/RLCMAC_EncDec.cc 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/21064/1 diff --git a/library/RLCMAC_EncDec.cc b/library/RLCMAC_EncDec.cc index 6b78064..d900108 100644 --- a/library/RLCMAC_EncDec.cc +++ b/library/RLCMAC_EncDec.cc @@ -1181,7 +1181,6 @@ unsigned int data_block_bits, data_block_offsets[2]; unsigned int num_calls; CodingScheme mcs; - boolean tlli_ind, e; mcs = RLCMAC__Templates::f__rlcmac__cps__htype__to__mcs(in.mac__hdr().cps(), in.mac__hdr().header__type()); //fprintf(stderr, "RLCMAC: infered MCS %s (%d)\n", mcs.enum_to_str(static_cast(mcs.as_int())), mcs.as_int()); @@ -1215,7 +1214,7 @@ } /* Put first TI + E byte */ - aligned_buffer.put_c(tlli_ind << 1 | e << 0); /* M=0, E=1 LEN=0 */ + aligned_buffer.put_c((in.tlli__ind() & 0x01) << 1 | (in.e() & 0x01) << 0); //printbuffer("After encoding first byte", aligned_buffer); if (in.e() == false) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21064 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: I442a12a16fe0d0664c677eec10bb81e2544235aa Gerrit-Change-Number: 21064 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: RLCMAC_EncDec: Implement encoding for RlcmacUlEgprsDataHeader HeaderT...
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21065 ) Change subject: RLCMAC_EncDec: Implement encoding for RlcmacUlEgprsDataHeader HeaderType 1 and 2 .. RLCMAC_EncDec: Implement encoding for RlcmacUlEgprsDataHeader HeaderType 1 and 2 Change-Id: I4e0b0e0960634fd2e5f09073a1ef093200dbe707 --- M library/RLCMAC_EncDec.cc M library/RLCMAC_Templates.ttcn M library/RLCMAC_Types.ttcn 3 files changed, 41 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/21065/1 diff --git a/library/RLCMAC_EncDec.cc b/library/RLCMAC_EncDec.cc index d900108..c5fc447 100644 --- a/library/RLCMAC_EncDec.cc +++ b/library/RLCMAC_EncDec.cc @@ -1140,13 +1140,48 @@ static void enc__RlcmacUlEgprsDataHeader_type1(const EgprsUlMacDataHeader& si, TTCN_Buffer& ttcn_buffer) { - fprintf(stderr, "FIXME: Not implemented! %s (%s:%u)\n", __func__, __FILE__, __LINE__); + struct gprs_rlc_ul_header_egprs_1 egprs1; + + egprs1.r = bs2uint8(si.r__ri()); + egprs1.si = bs2uint8(si.foi__si()); + egprs1.cv = si.countdown(); + egprs1.tfi_hi = si.tfi() >> 0; + egprs1.tfi_lo = si.tfi() >> 2; + egprs1.bsn1_hi = si.bsn1() >> 0; + egprs1.bsn1_lo = si.bsn1() >> 5; + egprs1.bsn2_hi = si.bsn2__offset() >> 0; + egprs1.bsn2_lo = si.bsn2__offset() >> 2; + egprs1.cps = si.cps(); + egprs1.rsb = bs2uint8(si.rsb()); + egprs1.pi = si.pfi__ind(); + egprs1.spare_hi = 0; + egprs1.spare_lo = 0; + egprs1.dummy = 0; + + ttcn_buffer.put_s(sizeof(egprs1), (const unsigned char *)); } static void enc__RlcmacUlEgprsDataHeader_type2(const EgprsUlMacDataHeader& si, TTCN_Buffer& ttcn_buffer) { - fprintf(stderr, "FIXME: Not implemented! %s (%s:%u)\n", __func__, __FILE__, __LINE__); + struct gprs_rlc_ul_header_egprs_2 egprs2; + + egprs2.r = bs2uint8(si.r__ri()); + egprs2.si = bs2uint8(si.foi__si()); + egprs2.cv = si.countdown(); + egprs2.tfi_hi = si.tfi() >> 0; + egprs2.tfi_lo = si.tfi() >> 2; + egprs2.bsn1_hi = si.bsn1() >> 0; + egprs2.bsn1_lo = si.bsn1() >> 5; + egprs2.cps_hi = si.cps() >> 0; + egprs2.cps_lo = si.cps() >> 2; + egprs2.rsb = bs2uint8(si.rsb()); + egprs2.pi = si.pfi__ind(); + egprs2.spare_hi = 0; + egprs2.spare_lo = 0; + egprs2.dummy = 0; + + ttcn_buffer.put_s(sizeof(egprs2), (const unsigned char *)); } static diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index f24cce1..b18c8db 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -421,7 +421,7 @@ /* Template for uplink Data block */ template RlcmacUlBlock t_RLCMAC_UL_EGPRS_DATA(CodingScheme mcs, template uint5_t tfi, template uint4_t cv, - template uint11_t bsn1, template EgprsLlcBlocks blocks := {}) := { + template uint11_t bsn1, template uint8_t bsn2_offset := 0, template EgprsLlcBlocks blocks := {}) := { data_egprs := { mcs := mcs, mac_hdr := { @@ -431,6 +431,7 @@ foi_si := '0'B, r_ri := '0'B, bsn1 := bsn1, + bsn2_offset := bsn2_offset, cps := f_rlcmac_mcs_to_cps(mcs, 1, false), pfi_ind := false, rsb := '0'B, diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index 80a9997..eb9d845 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -223,7 +223,7 @@ MacRrbp rrbp, BIT2esp, uint3_t usf, - uint14_tbsn1, + uint11_tbsn1, uint8_t bsn2_offset, uint2_t pr, /* power reduction */ uint2_t spb, @@ -279,6 +279,7 @@ BIT1foi_si, BIT1r_ri, uint11_tbsn1, + uint8_t bsn2_offset, uint4_t cps, boolean pfi_ind, BIT1rsb, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21065 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: I4e0b0e0960634fd2e5f09073a1ef093200dbe707 Gerrit-Change-Number: 21065 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_multislot_tbf_ms_class_from_2phase
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20983 ) Change subject: pcu: Introduce test TC_ul_multislot_tbf_ms_class_from_2phase .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20983 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: I26a3cc0f2bd7bab176aa52df3e40aca7300de216 Gerrit-Change-Number: 20983 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 17:51:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_2phase
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20967 ) Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_2phase .. pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_2phase Change-Id: Ie0035bab79c286a968394d7b724d975f43d187ce --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 101 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index f2b0efb..f9697a1 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -41,6 +41,12 @@ uint8_t blk_nr }; +/* Useful to store poll FN + BTS+TRX+TS requested by network */ +type record PollFnCtx { + TsTrxBtsNum tstrxbts, + uint32_t fn +}; + template (value) TsTrxBtsNum ts_TsTrxBtsNum(uint3_t ts_nr := 7, uint3_t trx_nr := 0, uint8_t bts_nr := 0, diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 44213a7..bb17190 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -267,6 +267,47 @@ } } +private function f_ms_establish_ul_tbf_2phase_access(inout GprsMS ms, +template (omit) RlcmacUlCtrlMsg pkt_res_req := omit) +runs on RAW_PCU_Test_CT return PollFnCtx { + var PollFnCtx pollctx; + + /* Single block (two phase) packet access */ + var uint16_t ra := bit2int(chan_req_sb); + if (g_force_two_phase_access) { + /* If 2phase access is enforced by the network, then let's +* request a One phase packet access, we'll receive a single block +* anyway +*/ +ra := bit2int(chan_req_def); + } + + /* Establish an Uplink TBF */ + f_ms_use_ra(ms, ra, ra_is_11bit := 0); + f_ms_establish_ul_tbf(ms); + + /* Make sure we've got an Uplink TBF assignment */ + if (not match(ms.ul_tbf.ass.ccch, tr_PacketUlSglAssign)) { + setverdict(fail, "Wrong Packet Uplink Assignment received: ", ms.ul_tbf.ass.ccch, " vs exp: ", tr_PacketUlSglAssign); + f_shutdown(__BFILE__, __LINE__); + } + + /* Send PACKET RESOURCE REQUEST +* (see 3GPP TS 04.60 "7.1.3.1 Initiation of the Packet resource request procedure") +*/ + if (istemplatekind(pkt_res_req, "omit")) { + pkt_res_req := ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, omit); + } + + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(pkt_res_req), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + /* Store 1st UlTBF context before receiving next one, will will +* overwrite the TS allocation on MS with info from new UL TBF: +*/ + pollctx.tstrxbts := f_ms_tx_TsTrxBtsNum(ms); + f_ms_rx_pkt_ass_pacch(ms, pollctx.fn, tr_RLCMAC_UL_PACKET_ASS, nr := f_ms_tx_TsTrxBtsNum(ms)); + return pollctx; +} + testcase TC_pcuif_suspend() runs on RAW_PCU_Test_CT { var octetstring ra_id := enc_RoutingAreaIdentification(mp_gb_cfg.bvc[0].cell_id.ra_id); var GprsTlli tlli := ''O; @@ -1156,20 +1197,12 @@ runs on RAW_PCU_Test_CT { var RlcmacDlBlock dl_block; var octetstring data := f_rnd_octstring(10); + var PollFnCtx pollctx; var uint32_t sched_fn; var uint32_t dl_fn; var uint32_t unused_fn; var GprsMS ms; - /* Single block (two phase) packet access */ - var uint16_t ra := bit2int(chan_req_sb); - if (g_force_two_phase_access) { - /* If 2phase access is enforced by the network, then let's - request a One phase packet access, we'll receive a single block - anyway */ - ra := bit2int(chan_req_def); - } - /* Initialize NS/BSSGP side */ f_init_bssgp(); /* Initialize GPRS MS side */ @@ -1183,21 +1216,9 @@ f_bssgp_establish(); f_bssgp_client_llgmm_assign(''O, ms.tlli); - /* Establish an Uplink TBF */ - f_ms_use_ra(ms, ra, ra_is_11bit := 0); - f_ms_establish_ul_tbf(ms); + /* Send PACKET RESOURCE REQUEST to upgrade to EGPRS */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); - /* Make sure we've got an Uplink TBF assignment */ - if (not match(ms.ul_tbf.ass.ccch, tr_PacketUlSglAssign)) { - setverdict(fail, "Wrong Packet Uplink Assignment received: ", ms.ul_tbf.ass.ccch, " vs exp: ", tr_PacketUlSglAssign); - f_shutdown(__BFILE__, __LINE__); - } - - /* Send PACKET RESOURCE REQUEST to upgrade to EGPRS -* (see 3GPP TS 04.60 "7.1.3.1 Initiation of the Packet resource request
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947 ) Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn .. pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn Related: SYS#5131 Change-Id: I417953a4c89dec82500b3b66f08ed648d266d813 --- M pcu/PCU_Tests.ttcn 1 file changed, 56 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 1b5fb78..44213a7 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -1665,6 +1665,61 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Verify allocation and use of multislot tbf, triggered by MS class provided in SGSN. SYS#5131 */ +testcase TC_dl_multislot_tbf_ms_class_from_sgsn() runs on RAW_PCU_Test_CT { + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var octetstring data := f_rnd_octstring(10); + var PacketDlAssign dl_tbf_ass; + var RlcmacDlBlock dl_block; + var uint32_t poll_fn; + var uint32_t sched_fn; + var GprsMS ms; + timer T := 5.0; + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Only 1 TRX with 8 PDCH */ + f_PCUIF_ver_INFO_PDCHMask_set(info_ind, ''B, 0); + f_PCUIF_ver_INFO_PDCHMask_set(info_ind, ''B, (1 .. 7)); + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Establish an Uplink TBF, this way the PCU can send DL Assignment + through PDCH (no multiblock assignment possible through PCH) */ + f_ms_establish_ul_tbf(ms); + + /* Send one UL block (with TLLI since we are in One-Phase Access + contention resoultion) and make sure it is ACKED fine */ + f_ms_tx_ul_data_block(ms, data, with_tlli := true, nr := f_ms_tx_TsTrxBtsNum(ms)); + /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, poll_fn, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* SGSN sends some DL data, PCU will assign DL TBF through PACCH */ + var MultislotCap_GPRS_BSSGP mscap_gprs := { + gprsmultislotclass := '10010'B, /* MS class 18, supports 8 DL and 8 UL */ + gprsextendeddynalloccap := '0'B + }; + var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, omit)) }; + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, ms_racap)); + dl_block := f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS, nr := f_ms_tx_TsTrxBtsNum(ms)); + if (f_dltbf_num_slots(ms.dl_tbf) != 8) { + setverdict(fail, "Expected 8 PDCH slots allocated but got ", f_dltbf_num_slots(ms.dl_tbf)); + f_shutdown(__BFILE__, __LINE__); + } + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn, nr := f_ms_tx_TsTrxBtsNum(ms)); + + f_shutdown(__BFILE__, __LINE__, final := true); +} + /* Test scenario where MS wants to request a new TBF once the current one is * ending, by means of sending a Packet Resource Request on ul slot provided by * last Pkt Ul ACK's RRBP. @@ -2751,6 +2806,7 @@ execute( TC_pcuif_fh_pkt_ass_ul() ); execute( TC_pcuif_fh_pkt_ass_dl() ); execute( TC_multitrx_multims_alloc() ); + execute( TC_dl_multislot_tbf_ms_class_from_sgsn() ); } execute( TC_pcuif_info_ind_subsequent() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947 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: I417953a4c89dec82500b3b66f08ed648d266d813 Gerrit-Change-Number: 20947 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_multislot_tbf_ms_class_from_2phase
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20983 ) Change subject: pcu: Introduce test TC_ul_multislot_tbf_ms_class_from_2phase .. pcu: Introduce test TC_ul_multislot_tbf_ms_class_from_2phase Similar to the DL TBF counterpart from last commit, this time verifying UL multislot TBF is allocated. Change-Id: I26a3cc0f2bd7bab176aa52df3e40aca7300de216 --- M pcu/PCU_Tests.ttcn 1 file changed, 44 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index bb17190..3421c73 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -1790,6 +1790,49 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +testcase TC_ul_multislot_tbf_ms_class_from_2phase() runs on RAW_PCU_Test_CT { + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var RlcmacDlBlock dl_block; + var octetstring data := f_rnd_octstring(10); + var PollFnCtx pollctx; + var uint32_t sched_fn; + var GprsMS ms; + + var MultislotCap_GPRS mscap_gprs := { + gprsmultislotclass := '10010'B, /* MS class 18, supports 8 DL and 8 UL */ + gprsextendeddynalloccap := '0'B + }; + var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; + + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Only 1 TRX with 8 PDCH */ + f_PCUIF_ver_INFO_PDCHMask_set(info_ind, ''B, 0); + f_PCUIF_ver_INFO_PDCHMask_set(info_ind, ''B, (1 .. 7)); + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST to notify the MultiSlot Class */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + + if (f_ultbf_num_slots(ms.ul_tbf) != 8) { + setverdict(fail, "Expected 8 PDCH slot allocated but got ", f_ultbf_num_slots(ms.ul_tbf)); + f_shutdown(__BFILE__, __LINE__); + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + /* Test scenario where MS wants to request a new TBF once the current one is * ending, by means of sending a Packet Resource Request on ul slot provided by * last Pkt Ul ACK's RRBP. @@ -2878,6 +2921,7 @@ execute( TC_multitrx_multims_alloc() ); execute( TC_dl_multislot_tbf_ms_class_from_sgsn() ); execute( TC_dl_multislot_tbf_ms_class_from_2phase() ); + execute( TC_ul_multislot_tbf_ms_class_from_2phase() ); } execute( TC_pcuif_info_ind_subsequent() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20983 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: I26a3cc0f2bd7bab176aa52df3e40aca7300de216 Gerrit-Change-Number: 20983 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_2phase
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20967 ) Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_2phase .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20967 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: Ie0035bab79c286a968394d7b724d975f43d187ce Gerrit-Change-Number: 20967 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 17:51:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947 ) Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947 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: I417953a4c89dec82500b3b66f08ed648d266d813 Gerrit-Change-Number: 20947 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 17:51:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: Port gbproxy to NS2
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 ) Change subject: Port gbproxy to NS2 .. Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iecfd0408a35a11638d254c1db3c1d477b1a11524 Gerrit-Change-Number: 21029 Gerrit-PatchSet: 6 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 17:45:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: Port gbproxy to NS2
Hello Jenkins Builder, laforge, pespin, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 to look at the new patch set (#6). Change subject: Port gbproxy to NS2 .. Port gbproxy to NS2 Since NS2 has a different abstraction we mock up the prim send/recv functions and don't test NS like the old tests did. Related: SYS#4998 Change-Id: Iecfd0408a35a11638d254c1db3c1d477b1a11524 --- M doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg M include/osmocom/sgsn/gb_proxy.h M src/gbproxy/gb_proxy.c M src/gbproxy/gb_proxy_ctrl.c M src/gbproxy/gb_proxy_main.c M src/gbproxy/gb_proxy_patch.c M src/gbproxy/gb_proxy_vty.c M tests/gbproxy/gbproxy_test.c M tests/gbproxy/gbproxy_test.ok M tests/vty_test_runner.py 10 files changed, 3,325 insertions(+), 4,991 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/29/21029/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iecfd0408a35a11638d254c1db3c1d477b1a11524 Gerrit-Change-Number: 21029 Gerrit-PatchSet: 6 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-sgsn[master]: configure.ac: Require python3 for ext_tests
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21061 ) Change subject: configure.ac: Require python3 for ext_tests .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I96ac31e7862fe102e5baee0c2e25458ff0451a50 Gerrit-Change-Number: 21061 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 16:41:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: configure.ac: Require python3 for ext_tests
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21060 ) Change subject: configure.ac: Require python3 for ext_tests .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id5745d5ff5ff1072ccfbf9ad50b2d67f3ea95583 Gerrit-Change-Number: 21060 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 16:41:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: configure.ac: Require python3 for ext_tests
Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21061 to look at the new patch set (#2). Change subject: configure.ac: Require python3 for ext_tests .. configure.ac: Require python3 for ext_tests The python scripts already use #!/usr/bin/env python3 so it was pure coincidence that the tests are working. Change-Id: I96ac31e7862fe102e5baee0c2e25458ff0451a50 --- M configure.ac 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/61/21061/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I96ac31e7862fe102e5baee0c2e25458ff0451a50 Gerrit-Change-Number: 21061 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: configure.ac: Require python3 for ext_tests
Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/21060 to look at the new patch set (#2). Change subject: configure.ac: Require python3 for ext_tests .. configure.ac: Require python3 for ext_tests The python scripts already use #!/usr/bin/env python3 so it was pure coincidence that the tests are working. Change-Id: Id5745d5ff5ff1072ccfbf9ad50b2d67f3ea95583 --- M configure.ac 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/21060/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id5745d5ff5ff1072ccfbf9ad50b2d67f3ea95583 Gerrit-Change-Number: 21060 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-sgsn[master]: configure.ac: Require python3 for ext_tests
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21061 ) Change subject: configure.ac: Require python3 for ext_tests .. Patch Set 1: > Patch Set 1: > > a bit more verbosity would be nice. Do the ext_tests actually work with > python3? If so, with which version? We generally consider debian8 as the > last supported platform, so if we require python3, then it needs to work with > that Right, forgot to mention: the python scripts are already executed with python3: #!/usr/bin/env python3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I96ac31e7862fe102e5baee0c2e25458ff0451a50 Gerrit-Change-Number: 21061 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 16:00:55 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bsc[master]: configure.ac: Require python3 for ext_tests
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21060 ) Change subject: configure.ac: Require python3 for ext_tests .. Patch Set 1: > Patch Set 1: > > a bit more verbosity would be nice. Do the ext_tests actually work with > python3? If so, with which version? We generally consider debian8 as the > last supported platform, so if we require python3, then it needs to work with > that Right, forgot to mention: the python scripts are already executed with python3: #!/usr/bin/env python3 > Also, what about https://gerrit.osmocom.org/c/osmo-bsc/+/5661 ? can it be > abandoned? osmo-bsc commit e1f0844afbe14d2cfb7a5247deefff10bffb1a2f switched to python3 (everywhere but in configure.ac) so I think so, yeah. I don't know how / have the permissions to abandon that change, though. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id5745d5ff5ff1072ccfbf9ad50b2d67f3ea95583 Gerrit-Change-Number: 21060 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 16:00:35 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-sgsn[master]: Port gbproxy to NS2
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 ) Change subject: Port gbproxy to NS2 .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iecfd0408a35a11638d254c1db3c1d477b1a11524 Gerrit-Change-Number: 21029 Gerrit-PatchSet: 5 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 15:55:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: ns2: Improve NSVC output
daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21062 ) Change subject: ns2: Improve NSVC output .. ns2: Improve NSVC output In show ns lots of info was printed many times. We can just use gprs_ns2_ll_str() to get the information about an NSVC so use that and ensure newlines. The NSVC are still printed twice - at least for the UDP bind: Once in dump_nse and once in dump_bind. Change-Id: I6f734d92ec1e17f339f7b32e449ffd614efa7319 Related: SYS#4998 --- M src/gb/gprs_ns2_vty.c 1 file changed, 1 insertion(+), 33 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index a457361..65fe88e 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -245,39 +245,7 @@ static void dump_nsvc(struct vty *vty, struct gprs_ns2_vc *nsvc, bool stats) { - struct osmo_sockaddr_str remote; - struct osmo_sockaddr_str local; - const struct osmo_sockaddr *sockaddr; - - switch (nsvc->ll) { - case GPRS_NS_LL_UDP: { - sockaddr = gprs_ns2_ip_vc_remote(nsvc); - if (!sockaddr) { - vty_out(vty, "unknown"); - break; - } - - if (osmo_sockaddr_str_from_sockaddr( - , - >u.sas)) { - vty_out(vty, "unknown"); - break; - } - - vty_out(vty, "%s:%u <> %s:%u", local.ip, local.port, remote.ip, remote.port); - break; - } - case GPRS_NS_LL_FR_GRE: - /* TODO: implement dump_nse for FR GRE */ - case GPRS_NS_LL_E1: - /* TODO: implement dump_nse for E1 */ - break; - } - - vty_out(vty, "Remote: %s ", -gprs_ns2_ll_str(nsvc)); - - vty_out(vty, "%s%s", nsvc->ll == GPRS_NS_LL_UDP ? "UDP" : "FR-GRE", VTY_NEWLINE); + vty_out(vty, " %s%s", gprs_ns2_ll_str(nsvc), VTY_NEWLINE); if (stats) { vty_out_rate_ctr_group(vty, " ", nsvc->ctrg); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6f734d92ec1e17f339f7b32e449ffd614efa7319 Gerrit-Change-Number: 21062 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-sgsn[master]: Port gbproxy to NS2
Hello Jenkins Builder, laforge, pespin, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 to look at the new patch set (#5). Change subject: Port gbproxy to NS2 .. Port gbproxy to NS2 Since NS2 has a different abstraction we mock up the prim send/recv functions and don't test NS like the old tests did. Related: SYS#4998 Change-Id: Iecfd0408a35a11638d254c1db3c1d477b1a11524 --- M doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg M include/osmocom/sgsn/gb_proxy.h M src/gbproxy/gb_proxy.c M src/gbproxy/gb_proxy_ctrl.c M src/gbproxy/gb_proxy_main.c M src/gbproxy/gb_proxy_patch.c M src/gbproxy/gb_proxy_vty.c M tests/gbproxy/gbproxy_test.c M tests/gbproxy/gbproxy_test.ok M tests/vty_test_runner.py 10 files changed, 3,325 insertions(+), 4,976 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/29/21029/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iecfd0408a35a11638d254c1db3c1d477b1a11524 Gerrit-Change-Number: 21029 Gerrit-PatchSet: 5 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_multislot_tbf_ms_class_from_2phase
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20983 ) Change subject: pcu: Introduce test TC_ul_multislot_tbf_ms_class_from_2phase .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20983 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: I26a3cc0f2bd7bab176aa52df3e40aca7300de216 Gerrit-Change-Number: 20983 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 15:32:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_2phase
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20967 ) Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_2phase .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20967 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: Ie0035bab79c286a968394d7b724d975f43d187ce Gerrit-Change-Number: 20967 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 15:31:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: ns2: Improve NSVC output
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21062 ) Change subject: ns2: Improve NSVC output .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6f734d92ec1e17f339f7b32e449ffd614efa7319 Gerrit-Change-Number: 21062 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 15:30:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947 ) Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947 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: I417953a4c89dec82500b3b66f08ed648d266d813 Gerrit-Change-Number: 20947 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 15:31:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: configure.ac: Require python3 for ext_tests
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21061 ) Change subject: configure.ac: Require python3 for ext_tests .. Patch Set 1: a bit more verbosity would be nice. Do the ext_tests actually work with python3? If so, with which version? We generally consider debian8 as the last supported platform, so if we require python3, then it needs to work with that Also, what about https://gerrit.osmocom.org/c/osmo-bsc/+/5661 ? can it be abandoned? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I96ac31e7862fe102e5baee0c2e25458ff0451a50 Gerrit-Change-Number: 21061 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 15:30:25 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bsc[master]: configure.ac: Require python3 for ext_tests
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21060 ) Change subject: configure.ac: Require python3 for ext_tests .. Patch Set 1: a bit more verbosity would be nice. Do the ext_tests actually work with python3? If so, with which version? We generally consider debian8 as the last supported platform, so if we require python3, then it needs to work with that Also, what about https://gerrit.osmocom.org/c/osmo-bsc/+/5661 ? can it be abandoned? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id5745d5ff5ff1072ccfbf9ad50b2d67f3ea95583 Gerrit-Change-Number: 21060 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 15:30:31 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: ns2: Improve NSVC output
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21062 ) Change subject: ns2: Improve NSVC output .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6f734d92ec1e17f339f7b32e449ffd614efa7319 Gerrit-Change-Number: 21062 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 15:30:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: jobs/master-builds.yml: enable manuals for all osmo-bts variants
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/21063 ) Change subject: jobs/master-builds.yml: enable manuals for all osmo-bts variants .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/21063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I517be2d475f57026dab7f001d2298cf1a1aa2c7c Gerrit-Change-Number: 21063 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 15:26:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: jobs/master-builds.yml: enable manuals for all osmo-bts variants
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/21063 ) Change subject: jobs/master-builds.yml: enable manuals for all osmo-bts variants .. jobs/master-builds.yml: enable manuals for all osmo-bts variants Since Idba84164b90e3d183a20b5eb69cbfe15745e447c, we started to generate separate PDFs for different osmo-bts-variants, so let's enable them all. Otherwise only osmo-bts-{virtual,sysmo} PDFs are generated and uploaded to the server. Change-Id: I517be2d475f57026dab7f001d2298cf1a1aa2c7c Related: SYS#4937 --- M jobs/master-builds.yml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved; Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 47a9eea..8ba36f0 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -184,9 +184,9 @@ a3_name: WITH_MANUALS a3: !!python/tuple ["1", "0"] combination_filter: > -(FIRMWARE_VERSION == "master" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") || +(FIRMWARE_VERSION == "master" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") || (FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") || -(FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") || +(FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") || (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") || (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") || (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") || -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/21063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I517be2d475f57026dab7f001d2298cf1a1aa2c7c Gerrit-Change-Number: 21063 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ci[master]: jobs/master-builds.yml: enable manuals for all osmo-bts variants
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/21063 ) Change subject: jobs/master-builds.yml: enable manuals for all osmo-bts variants .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/21063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I517be2d475f57026dab7f001d2298cf1a1aa2c7c Gerrit-Change-Number: 21063 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 15:13:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: jobs/master-builds.yml: enable manuals for all osmo-bts variants
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/21063 ) Change subject: jobs/master-builds.yml: enable manuals for all osmo-bts variants .. jobs/master-builds.yml: enable manuals for all osmo-bts variants Since Idba84164b90e3d183a20b5eb69cbfe15745e447c, we started to generate separate PDFs for different osmo-bts-variants, so let's enable them all. Otherwise only osmo-bts-{virtual,sysmo} PDFs are generated and uploaded to the server. Change-Id: I517be2d475f57026dab7f001d2298cf1a1aa2c7c Related: SYS#4937 --- M jobs/master-builds.yml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/63/21063/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 47a9eea..8ba36f0 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -184,9 +184,9 @@ a3_name: WITH_MANUALS a3: !!python/tuple ["1", "0"] combination_filter: > -(FIRMWARE_VERSION == "master" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") || +(FIRMWARE_VERSION == "master" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") || (FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") || -(FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") || +(FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") || (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") || (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") || (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") || -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/21063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I517be2d475f57026dab7f001d2298cf1a1aa2c7c Gerrit-Change-Number: 21063 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in libosmocore[master]: ns2: Improve NSVC output
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/21062 ) Change subject: ns2: Improve NSVC output .. ns2: Improve NSVC output In show ns lots of info was printed many times. We can just use gprs_ns2_ll_str() to get the information about an NSVC so use that and ensure newlines. The NSVC are still printed twice - at least for the UDP bind: Once in dump_nse and once in dump_bind. Change-Id: I6f734d92ec1e17f339f7b32e449ffd614efa7319 Related: SYS#4998 --- M src/gb/gprs_ns2_vty.c 1 file changed, 1 insertion(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/21062/1 diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index a457361..65fe88e 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -245,39 +245,7 @@ static void dump_nsvc(struct vty *vty, struct gprs_ns2_vc *nsvc, bool stats) { - struct osmo_sockaddr_str remote; - struct osmo_sockaddr_str local; - const struct osmo_sockaddr *sockaddr; - - switch (nsvc->ll) { - case GPRS_NS_LL_UDP: { - sockaddr = gprs_ns2_ip_vc_remote(nsvc); - if (!sockaddr) { - vty_out(vty, "unknown"); - break; - } - - if (osmo_sockaddr_str_from_sockaddr( - , - >u.sas)) { - vty_out(vty, "unknown"); - break; - } - - vty_out(vty, "%s:%u <> %s:%u", local.ip, local.port, remote.ip, remote.port); - break; - } - case GPRS_NS_LL_FR_GRE: - /* TODO: implement dump_nse for FR GRE */ - case GPRS_NS_LL_E1: - /* TODO: implement dump_nse for E1 */ - break; - } - - vty_out(vty, "Remote: %s ", -gprs_ns2_ll_str(nsvc)); - - vty_out(vty, "%s%s", nsvc->ll == GPRS_NS_LL_UDP ? "UDP" : "FR-GRE", VTY_NEWLINE); + vty_out(vty, " %s%s", gprs_ns2_ll_str(nsvc), VTY_NEWLINE); if (stats) { vty_out_rate_ctr_group(vty, " ", nsvc->ctrg); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6f734d92ec1e17f339f7b32e449ffd614efa7319 Gerrit-Change-Number: 21062 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
Change in osmo-bsc[master]: configure.ac: Require python3 for ext_tests
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21060 ) Change subject: configure.ac: Require python3 for ext_tests .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id5745d5ff5ff1072ccfbf9ad50b2d67f3ea95583 Gerrit-Change-Number: 21060 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 14:41:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: configure.ac: Require python3 for ext_tests
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21061 ) Change subject: configure.ac: Require python3 for ext_tests .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I96ac31e7862fe102e5baee0c2e25458ff0451a50 Gerrit-Change-Number: 21061 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 14:41:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: configure.ac: Require python3 for ext_tests
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21061 ) Change subject: configure.ac: Require python3 for ext_tests .. configure.ac: Require python3 for ext_tests Change-Id: I96ac31e7862fe102e5baee0c2e25458ff0451a50 --- M configure.ac 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/61/21061/1 diff --git a/configure.ac b/configure.ac index 12af7e6..346e020 100644 --- a/configure.ac +++ b/configure.ac @@ -172,9 +172,9 @@ [Include the VTY/CTRL tests in make check [default=no]]), [enable_ext_tests="$enableval"],[enable_ext_tests="no"]) if test "x$enable_ext_tests" = "xyes" ; then - AC_CHECK_PROG(PYTHON2_AVAIL,python2,yes) -if test "x$PYTHON2_AVAIL" != "xyes" ; then - AC_MSG_ERROR([Please install python2 to run the VTY/CTRL tests.]) + AC_CHECK_PROG(PYTHON3_AVAIL,python3,yes) +if test "x$PYTHON3_AVAIL" != "xyes" ; then + AC_MSG_ERROR([Please install python3 to run the VTY/CTRL tests.]) fi AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes) if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I96ac31e7862fe102e5baee0c2e25458ff0451a50 Gerrit-Change-Number: 21061 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
Change in osmo-bsc[master]: configure.ac: Require python3 for ext_tests
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21060 ) Change subject: configure.ac: Require python3 for ext_tests .. configure.ac: Require python3 for ext_tests Change-Id: Id5745d5ff5ff1072ccfbf9ad50b2d67f3ea95583 --- M configure.ac 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/21060/1 diff --git a/configure.ac b/configure.ac index ed9b2cb..f1f17b8 100644 --- a/configure.ac +++ b/configure.ac @@ -154,9 +154,9 @@ [Include the VTY/CTRL tests in make check [default=no]]), [enable_ext_tests="$enableval"],[enable_ext_tests="no"]) if test "x$enable_ext_tests" = "xyes" ; then - AC_CHECK_PROG(PYTHON2_AVAIL,python2,yes) -if test "x$PYTHON2_AVAIL" != "xyes" ; then - AC_MSG_ERROR([Please install python2 to run the VTY/CTRL tests.]) + AC_CHECK_PROG(PYTHON3_AVAIL,python3,yes) +if test "x$PYTHON3_AVAIL" != "xyes" ; then + AC_MSG_ERROR([Please install python3 to run the VTY/CTRL tests.]) fi AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes) if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id5745d5ff5ff1072ccfbf9ad50b2d67f3ea95583 Gerrit-Change-Number: 21060 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
Change in osmo-sgsn[master]: Port gbproxy to NS2
Hello Jenkins Builder, laforge, pespin, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 to look at the new patch set (#4). Change subject: Port gbproxy to NS2 .. Port gbproxy to NS2 Since NS2 has a different abstraction we mock up the prim send/recv functions and don't test NS like the old tests did. Related: SYS#4998 Change-Id: Iecfd0408a35a11638d254c1db3c1d477b1a11524 --- M doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg M include/osmocom/sgsn/gb_proxy.h M src/gbproxy/gb_proxy.c M src/gbproxy/gb_proxy_ctrl.c M src/gbproxy/gb_proxy_main.c M src/gbproxy/gb_proxy_patch.c M src/gbproxy/gb_proxy_vty.c M tests/gbproxy/gbproxy_test.c M tests/gbproxy/gbproxy_test.ok 9 files changed, 3,319 insertions(+), 4,970 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/29/21029/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iecfd0408a35a11638d254c1db3c1d477b1a11524 Gerrit-Change-Number: 21029 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn
Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947 to look at the new patch set (#7). Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn .. pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn Related: SYS#5131 Change-Id: I417953a4c89dec82500b3b66f08ed648d266d813 --- M pcu/PCU_Tests.ttcn 1 file changed, 56 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/20947/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947 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: I417953a4c89dec82500b3b66f08ed648d266d813 Gerrit-Change-Number: 20947 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_2phase
Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20967 to look at the new patch set (#5). Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_2phase .. pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_2phase Change-Id: Ie0035bab79c286a968394d7b724d975f43d187ce --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 101 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/20967/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20967 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: Ie0035bab79c286a968394d7b724d975f43d187ce Gerrit-Change-Number: 20967 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_multislot_tbf_ms_class_from_2phase
Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20983 to look at the new patch set (#3). Change subject: pcu: Introduce test TC_ul_multislot_tbf_ms_class_from_2phase .. pcu: Introduce test TC_ul_multislot_tbf_ms_class_from_2phase Similar to the DL TBF counterpart from last commit, this time verifying UL multislot TBF is allocated. Change-Id: I26a3cc0f2bd7bab176aa52df3e40aca7300de216 --- M pcu/PCU_Tests.ttcn 1 file changed, 44 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/20983/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20983 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: I26a3cc0f2bd7bab176aa52df3e40aca7300de216 Gerrit-Change-Number: 20983 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947 ) Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn .. Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947/6/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947/6/pcu/PCU_Tests.ttcn@1685 PS6, Line 1685: /* Only 1 TRX with 8 PDCH */ > BTW, you can just use f_PCUIF_ver_INFO_PDCHMask_set(): […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947 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: I417953a4c89dec82500b3b66f08ed648d266d813 Gerrit-Change-Number: 20947 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 13:17:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947 ) Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn .. Patch Set 6: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947/6/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947/6/pcu/PCU_Tests.ttcn@1685 PS6, Line 1685: /* Only 1 TRX with 8 PDCH */ BTW, you can just use f_PCUIF_ver_INFO_PDCHMask_set(): f_PCUIF_ver_INFO_PDCHMask_set(info_ind, ''B, (1 .. 7)) f_PCUIF_ver_INFO_PDCHMask_set(info_ind, ''B, 0) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947 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: I417953a4c89dec82500b3b66f08ed648d266d813 Gerrit-Change-Number: 20947 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 13:09:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Add infra to handle multitrx and multits envs
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20968 ) Change subject: pcu: Add infra to handle multitrx and multits envs .. pcu: Add infra to handle multitrx and multits envs ARFCNs are allocated sequentially, so that conversion between arfcn<->trx_nr is easily done. Some helper functions are introduced to be able to submit and expect messages on a given TRX+TS, which is required for setups with several TRX and PDCH-enabled TS different than the default. These new APIs will be used in PCU_Tests.ttcn in subsequent patches. Change-Id: I28430e6d8c77d2b7dc630d186d425a5d82587b82 --- M library/PCUIF_Types.ttcn M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 3 files changed, 87 insertions(+), 18 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 8af3757..a7a32ab 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -815,21 +815,21 @@ template (value) PCUIF_InfoV09Trx ts_PCUIF_InfoV09TrxNULL := ts_PCUIF_InfoV09Trx(0, ''B, '00'O); -template (value) PCUIF_InfoTrxs ts_PCUIF_InfoV09Trxs_def := { +template (value) PCUIF_InfoTrxs ts_PCUIF_InfoV09Trxs_def(uint16_t base_arfcn) := { v09 := { - ts_PCUIF_InfoV09Trx, ts_PCUIF_InfoV09TrxNULL, + ts_PCUIF_InfoV09Trx(arfcn := base_arfcn + 0), ts_PCUIF_InfoV09TrxNULL, ts_PCUIF_InfoV09TrxNULL, ts_PCUIF_InfoV09TrxNULL, ts_PCUIF_InfoV09TrxNULL, ts_PCUIF_InfoV09TrxNULL, ts_PCUIF_InfoV09TrxNULL, ts_PCUIF_InfoV09TrxNULL } }; -template (value) PCUIF_InfoTrxs ts_PCUIF_InfoV10Trxs_def := { +template (value) PCUIF_InfoTrxs ts_PCUIF_InfoV10Trxs_def(uint16_t base_arfcn) := { v10 := { - ts_PCUIF_InfoV10Trx(arfcn := 871), ts_PCUIF_InfoV10Trx(arfcn := 872), - ts_PCUIF_InfoV10Trx(arfcn := 873), ts_PCUIF_InfoV10Trx(arfcn := 874), - ts_PCUIF_InfoV10Trx(arfcn := 875), ts_PCUIF_InfoV10Trx(arfcn := 876), - ts_PCUIF_InfoV10Trx(arfcn := 877), ts_PCUIF_InfoV10Trx(arfcn := 878) + ts_PCUIF_InfoV10Trx(arfcn := base_arfcn + 0), ts_PCUIF_InfoV10Trx(arfcn := base_arfcn + 1), + ts_PCUIF_InfoV10Trx(arfcn := base_arfcn + 2), ts_PCUIF_InfoV10Trx(arfcn := base_arfcn + 3), + ts_PCUIF_InfoV10Trx(arfcn := base_arfcn + 4), ts_PCUIF_InfoV10Trx(arfcn := base_arfcn + 5), + ts_PCUIF_InfoV10Trx(arfcn := base_arfcn + 6), ts_PCUIF_InfoV10Trx(arfcn := base_arfcn + 7) } }; @@ -972,12 +972,12 @@ /* TODO: remove this as soon as we drop version 9 support */ -function f_PCUIF_ver_INFO_Trxs() +function f_PCUIF_ver_INFO_Trxs(uint16_t base_arfcn) return PCUIF_InfoTrxs { if (PCUIF_Types.mp_pcuif_version >= 10) { - return valueof(ts_PCUIF_InfoV10Trxs_def); + return valueof(ts_PCUIF_InfoV10Trxs_def(base_arfcn)); } else { - return valueof(ts_PCUIF_InfoV09Trxs_def); + return valueof(ts_PCUIF_InfoV09Trxs_def(base_arfcn)); } } diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 9dd4650..f2b0efb 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -29,6 +29,11 @@ import from PCUIF_Components all; import from Native_Functions all; +modulepar { + /* ARFCN of 1st TRX. Subsequent TRX are allocated incrementing ARFCNs. Nth TRX => base_arfcn + N-1 */ + GsmArfcn mp_base_arfcn := 871; +}; + type record TsTrxBtsNum { uint3_t ts_nr, uint3_t trx_nr, @@ -64,7 +69,7 @@ GsmRrMessagerr_imm_ass optional, PacketDlAssignChan ass optional, uint5_t tfi, - GsmArfcnarfcn, + GsmArfcnarfcn optional, BIT8ts_mask, AckNackDescription acknack_desc }; @@ -79,7 +84,7 @@ GsmRrMessagerr_imm_ass optional, PacketUlAssignChan ass optional, uint5_t tfi, - GsmArfcnarfcn, + GsmArfcnarfcn optional, BIT8ts_mask, uint3_t usf[8], boolean is_egprs, @@ -124,7 +129,7 @@ rr_imm_ass := omit, ass := omit, tfi := 0, - arfcn := 0, + arfcn := omit, ts_mask := ''B, acknack_desc := t_AckNackDescription_init }; @@ -133,7 +138,7 @@ rr_imm_ass := omit, ass := omit, tfi := 0, - arfcn := 0, + arfcn := omit, ts_mask := ''B, usf := { USF_UNUSED, USF_UNUSED, USF_UNUSED, USF_UNUSED, USF_UNUSED, USF_UNUSED, USF_UNUSED, USF_UNUSED }, is_egprs := false, @@ -199,6 +204,18 @@ mtc.stop; } +function
Change in osmo-ttcn3-hacks[master]: pcu: Add infra to handle multitrx and multits envs
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20968 ) Change subject: pcu: Add infra to handle multitrx and multits envs .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20968 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: I28430e6d8c77d2b7dc630d186d425a5d82587b82 Gerrit-Change-Number: 20968 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 13:03:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Add infra to handle multitrx and multits envs
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20968 ) Change subject: pcu: Add infra to handle multitrx and multits envs .. Patch Set 3: Ping. This commit (and next ones in patchset) have been here waiting most of the current week after the requested changes were made. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20968 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: I28430e6d8c77d2b7dc630d186d425a5d82587b82 Gerrit-Change-Number: 20968 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 12:59:29 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-sgsn[master]: osmo-gbproxy: Free msgb in ns2 prim callback
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21059 ) Change subject: osmo-gbproxy: Free msgb in ns2 prim callback .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iee940aba7d94afefb5957dbe5f0b04dcf951b31c Gerrit-Change-Number: 21059 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 06 Nov 2020 12:56:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: osmo-gbproxy: Implement nsvc-state ctrl command
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21058 ) Change subject: osmo-gbproxy: Implement nsvc-state ctrl command .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-sgsn/+/21058/1/src/gbproxy/gb_proxy_ctrl.c File src/gbproxy/gb_proxy_ctrl.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/21058/1/src/gbproxy/gb_proxy_ctrl.c@48 PS1, Line 48: data->is_sgsn ? "SGSN" : "BSS" ); do we usually use caps in ctrl message data stuff? I don't think so. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0beb572103803f3ee4ecb28d9bf2e3139e0f8aa4 Gerrit-Change-Number: 21058 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 12:55:35 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-sgsn[master]: Port gbproxy to NS2
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 ) Change subject: Port gbproxy to NS2 .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iecfd0408a35a11638d254c1db3c1d477b1a11524 Gerrit-Change-Number: 21029 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 12:54:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gbproxy: Get the peer if paging by BVCI on SIG_BVC
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21030 ) Change subject: gbproxy: Get the peer if paging by BVCI on SIG_BVC .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic72f0f03e5886ab76404915fc60a2796e6881a7a Gerrit-Change-Number: 21030 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 12:53:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf_dl: Don't fake EGPRS MS class when no related info is available
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20936 ) Change subject: tbf_dl: Don't fake EGPRS MS class when no related info is available .. Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/20936/3/src/tbf_dl.cpp File src/tbf_dl.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/20936/3/src/tbf_dl.cpp@a134 PS3, Line 134: LOGP(DTBF, LOGL_NOTICE, "Not accepting non-EGPRS phone in EGPRS-only mode\n"); : bts->bts->do_rate_ctr_inc(CTR_TBF_FAILED_EGPRS_ONLY); : return NULL; > I really disagree here. Having a clean "EGPRS only works" vs "GPRS only > works" situation is good. […] Well to me clearly having a GPRS-only phone connected to a network which can successfully transmit data from time to time is better than having one never being able to transmit. And if you want ALL phones to be able to transmit, then you can still do so by configuring PCU to use only CS1-4 (GPRS-only) or/and MCS1-4 (EGPRS-GMSK). And anyway, in the MCS5-9 enabled caseit's not like there's an obscure bug making it fail which we have to debug, why know why (USF possibly encoded in MCS-5-9). So in any case, this is only a temporary state until I implement the part where EGPRS dl data blocks are downgraded to MCS1-4 when MS owner of USF is GPRS-only. So if you are really against merging this in this state, let's keep it here until I implemented that, but then I need to carry on my own branches on lots of patches moving/improving stuff around, and also changes in TTCN3-pcu tests, etc, having to rebase, etc. So I'd prefer having all the submitted patches merged so I can concentrate on going forward instead of maintaining my own branches, which are growing every day. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icce66cadb51af25ae0c3b3719940eccb548fe33b Gerrit-Change-Number: 20936 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 12:53:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gbproxy: Get the peer if paging by BVCI on SIG_BVC
Hello Jenkins Builder, laforge, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21030 to look at the new patch set (#3). Change subject: gbproxy: Get the peer if paging by BVCI on SIG_BVC .. gbproxy: Get the peer if paging by BVCI on SIG_BVC Currently the code reports routing the message to a BVCI but never even tries to get the peer for it. Change-Id: Ic72f0f03e5886ab76404915fc60a2796e6881a7a Related: SYS#4998 --- M src/gbproxy/gb_proxy.c M tests/gbproxy/gbproxy_test.ok 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/30/21030/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic72f0f03e5886ab76404915fc60a2796e6881a7a Gerrit-Change-Number: 21030 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset
Change in osmo-sgsn[master]: osmo-gbproxy: Free msgb in ns2 prim callback
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21059 ) Change subject: osmo-gbproxy: Free msgb in ns2 prim callback .. osmo-gbproxy: Free msgb in ns2 prim callback Commit cce88282388f in libosmocore changed the msg ownership model - the callback that the user registers is now responsible for freeing the msg. Change-Id: Iee940aba7d94afefb5957dbe5f0b04dcf951b31c Related: SYS#4998 --- M src/gbproxy/gb_proxy.c M tests/gbproxy/gbproxy_test.c 2 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/59/21059/1 diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c index ccf3f73..fb58284 100644 --- a/src/gbproxy/gb_proxy.c +++ b/src/gbproxy/gb_proxy.c @@ -1470,6 +1470,7 @@ msgb_nsei(oph->msg) = nsp->nsei; rc = gbprox_rcvmsg(cfg, oph->msg); + msgb_free(oph->msg); break; case PRIM_NS_STATUS: gprs_ns_prim_status_cb(cfg, nsp); diff --git a/tests/gbproxy/gbproxy_test.c b/tests/gbproxy/gbproxy_test.c index 05bc300..1287e48 100644 --- a/tests/gbproxy/gbproxy_test.c +++ b/tests/gbproxy/gbproxy_test.c @@ -505,7 +505,6 @@ PRIM_OP_INDICATION, msg); gprs_ns2_callback(, ); - talloc_free(msg); } static int gbprox_test_bssgp_send_cb(void *ctx, struct msgb *msg); @@ -1037,9 +1036,8 @@ break; } - /* Hand off to gbproxy */ + /* Hand off to gbproxy which will free the msg */ return gprs_ns2_prim_cb(oph, ctx); - } /* Get the next message from the receive FIFO -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iee940aba7d94afefb5957dbe5f0b04dcf951b31c Gerrit-Change-Number: 21059 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
Change in osmo-sgsn[master]: Let libosmocore handle VTY parent node tracking
Hello Jenkins Builder, laforge, pespin, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21028 to look at the new patch set (#4). Change subject: Let libosmocore handle VTY parent node tracking .. Let libosmocore handle VTY parent node tracking * is_config_node is deprecated, so don't set it * go_parent_cb is only used if we want to do special stuff upon exiting a node, in osmo-sgsn and gtphub only osmo_ss7_vty_go_parent() needs to be called Change-Id: I2008dd9026922d29ee703c59e70d3fecced0ee18 --- M src/gbproxy/gb_proxy_main.c M src/gtphub/gtphub_main.c M src/sgsn/sgsn_main.c 3 files changed, 4 insertions(+), 94 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/28/21028/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2008dd9026922d29ee703c59e70d3fecced0ee18 Gerrit-Change-Number: 21028 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-sgsn[master]: osmo-gbproxy: Implement nsvc-state ctrl command
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21058 ) Change subject: osmo-gbproxy: Implement nsvc-state ctrl command .. osmo-gbproxy: Implement nsvc-state ctrl command Change-Id: I0beb572103803f3ee4ecb28d9bf2e3139e0f8aa4 --- M src/gbproxy/gb_proxy_ctrl.c 1 file changed, 15 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/58/21058/1 diff --git a/src/gbproxy/gb_proxy_ctrl.c b/src/gbproxy/gb_proxy_ctrl.c index 3ebc7d1..9577383 100644 --- a/src/gbproxy/gb_proxy_ctrl.c +++ b/src/gbproxy/gb_proxy_ctrl.c @@ -33,12 +33,20 @@ extern vector ctrl_node_vec; -static int ctrl_nsvc_state_cb(struct gprs_ns2_vc *nsvc, void *ctx) { -/* FIXME: Can't get NSVC state in ns2 - struct ctrl_cmd *cmd = (struct ctrl_cmd *)ctx; +struct nsvc_cb_data { + struct ctrl_cmd *cmd; + uint16_t nsei; + bool is_sgsn; +}; - cmd->reply = gprs_ns2_vc_state_append(cmd->reply, nsvc); -*/ +static int ctrl_nsvc_state_cb(struct gprs_ns2_vc *nsvc, void *ctx) { + struct nsvc_cb_data *data = (struct nsvc_cb_data *)ctx; + struct ctrl_cmd *cmd = (struct ctrl_cmd *)data->cmd; + + cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%s,%s,%s\n", + data->nsei, gprs_ns2_ll_str(nsvc), gprs_ns2_nsvc_state_name(nsvc), + data->is_sgsn ? "SGSN" : "BSS" ); + return 0; } @@ -66,8 +74,8 @@ if (nse) gprs_ns2_nse_foreach_nsvc(nse, _nsvc_state_cb, cmd); } - cmd->reply = "Getting NSVC state not yet implemented for NS2"; - return CTRL_CMD_ERROR; + + return CTRL_CMD_REPLY; } CTRL_CMD_DEFINE_RO(nsvc_state, "nsvc-state"); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0beb572103803f3ee4ecb28d9bf2e3139e0f8aa4 Gerrit-Change-Number: 21058 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
Change in osmo-sgsn[master]: Port gbproxy to NS2
Hello Jenkins Builder, laforge, pespin, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 to look at the new patch set (#3). Change subject: Port gbproxy to NS2 .. Port gbproxy to NS2 Since NS2 has a different abstraction we mock up the prim send/recv functions and don't test NS like the old tests did. Related: SYS#4998 Change-Id: Iecfd0408a35a11638d254c1db3c1d477b1a11524 --- M include/osmocom/sgsn/gb_proxy.h M src/gbproxy/gb_proxy.c M src/gbproxy/gb_proxy_ctrl.c M src/gbproxy/gb_proxy_main.c M src/gbproxy/gb_proxy_patch.c M src/gbproxy/gb_proxy_vty.c M tests/gbproxy/gbproxy_test.c M tests/gbproxy/gbproxy_test.ok 8 files changed, 3,316 insertions(+), 4,969 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/29/21029/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iecfd0408a35a11638d254c1db3c1d477b1a11524 Gerrit-Change-Number: 21029 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-gsm-tester[master]: iperf3_{dl, ul}: adapt pass/fail threshold
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21057 ) Change subject: iperf3_{dl,ul}: adapt pass/fail threshold .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I8a545b8175784e9d6b49d6bf80f637ef7aa731f7 Gerrit-Change-Number: 21057 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 12:35:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: iperf3: don't throw exception when parsing iperf Json fails
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21056 ) Change subject: iperf3: don't throw exception when parsing iperf Json fails .. Patch Set 1: Code-Review-1 iperf3 output is important if someone wants to check the throughput results on upper layers, so let's not blindly skip the failure here because anyway people using that will fail when trying to read the values. Let's instead try to understand why iperf3 fails sometimes, under which conditions, and selectively expect the output to be non-usable. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I14a17bf1f239fc7765c2272109dbdda5e8e08d79 Gerrit-Change-Number: 21056 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 12:34:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-abis[master]: migrate to osmo_fd_{read, write}_{enable, disable}()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/21054 ) Change subject: migrate to osmo_fd_{read,write}_{enable,disable}() .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/21054/1/src/input/e1d.c File src/input/e1d.c: https://gerrit.osmocom.org/c/libosmo-abis/+/21054/1/src/input/e1d.c@318 PS1, Line 318: osmo_fd_write_enable(& e1i_ts->driver.e1d.fd); space between & and var. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/21054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I005826dfe3a8ad0fd6e08df2c87b38ce916bda2d Gerrit-Change-Number: 21054 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 12:30:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: iperf3: don't throw exception when parsing iperf Json fails
srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21056 ) Change subject: iperf3: don't throw exception when parsing iperf Json fails .. iperf3: don't throw exception when parsing iperf Json fails test crashed when iperf didn't produce valid json output. since this isn't criticial in most cases, lets convert this into a log rather than a exception 05:42:23.089740 run iperf3-srv_192.168.4.1: failed parsing iperf3 output: "(launched: 2020-10-26_05:41:16.432261) " 05:42:23.092642 tst iperf3_ul.py:37: ERR: IndexError: list index out of range [trial-196↪4g_whitelist:amarisoftenb-rftype@zmq+srsue-rftype@zmq+mod-enb-nprb@50+mod-enb-cells-2ca+cfg-epc-type@amarisoftepc+cfg-epc-qci@8+cfg-srs-enable-pcap+cfg-log@info↪iperf3_ul.py:37] Change-Id: I14a17bf1f239fc7765c2272109dbdda5e8e08d79 --- M src/osmo_gsm_tester/obj/iperf3.py 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/56/21056/1 diff --git a/src/osmo_gsm_tester/obj/iperf3.py b/src/osmo_gsm_tester/obj/iperf3.py index 2039a9b..4785f78 100644 --- a/src/osmo_gsm_tester/obj/iperf3.py +++ b/src/osmo_gsm_tester/obj/iperf3.py @@ -48,7 +48,7 @@ return j except Exception as e: log_obj.log('failed parsing iperf3 output: "%s"' % data) -raise e +pass def print_result_node_udp(result, node_str): try: @@ -57,7 +57,7 @@ print("\tSUM: %d KB, %d kbps, %d seconds %d/%d lost" % (sum['bytes']/1000, sum['bits_per_second']/1000, sum['seconds'], sum['lost_packets'], sum['packets'])) except Exception as e: print("Exception while using iperf3 %s results: %r" % (node_str, repr(result))) -raise e +pass def print_result_node_tcp(result, node_str): try: @@ -68,7 +68,7 @@ print("\tRECV: %d KB, %d kbps, %d seconds" % (recv['bytes']/1000, recv['bits_per_second']/1000, recv['seconds'])) except Exception as e: print("Exception while using iperf3 %s results: %r" % (node_str, repr(result))) -raise e +pass def get_received_mbps(result, isUdp=True): try: @@ -76,7 +76,7 @@ return recv['bits_per_second']/1e6 except Exception as e: print("Exception while using iperf3 results: %r" % (repr(result))) -raise e +pass class IPerf3Server(log.Origin): -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I14a17bf1f239fc7765c2272109dbdda5e8e08d79 Gerrit-Change-Number: 21056 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: iperf3_{dl, ul}: adapt pass/fail threshold
srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21057 ) Change subject: iperf3_{dl,ul}: adapt pass/fail threshold .. iperf3_{dl,ul}: adapt pass/fail threshold change pass threshold to 80% of the max rate for half of the testduration (rolling average). the overall average might be lowered because of a slower TCP start or a late UE attach. Change-Id: I8a545b8175784e9d6b49d6bf80f637ef7aa731f7 --- M sysmocom/suites/4g/iperf3_dl.py M sysmocom/suites/4g/iperf3_ul.py 2 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/57/21057/1 diff --git a/sysmocom/suites/4g/iperf3_dl.py b/sysmocom/suites/4g/iperf3_dl.py index 6f79076..bf5b1f0 100755 --- a/sysmocom/suites/4g/iperf3_dl.py +++ b/sysmocom/suites/4g/iperf3_dl.py @@ -36,6 +36,8 @@ iperf3cli.print_results() iperf3srv.print_results(iperf3cli.proto() == iperf3cli.PROTO_UDP) -res_str = ue.verify_metric(max_rate * 0.8, operation='avg', metric='dl_brate', criterion='gt') +# 80% of the maximum rate for half of the test duration +half_duration = int(round(iperf3cli.time_sec() / 2)) +res_str = ue.verify_metric(max_rate * 0.8, operation='max_rolling_avg', metric='dl_brate', criterion='gt', window=half_duration) print(res_str) test.set_report_stdout(res_str) diff --git a/sysmocom/suites/4g/iperf3_ul.py b/sysmocom/suites/4g/iperf3_ul.py index 4ae0118..6c0d25d 100755 --- a/sysmocom/suites/4g/iperf3_ul.py +++ b/sysmocom/suites/4g/iperf3_ul.py @@ -36,6 +36,8 @@ iperf3cli.print_results() iperf3srv.print_results(iperf3cli.proto() == iperf3cli.PROTO_UDP) -res_str = ue.verify_metric(max_rate * 0.8, operation='avg', metric='ul_brate', criterion='gt') +# 80% of the maximum rate for half of the test duration +half_duration = int(round(iperf3cli.time_sec() / 2)) +res_str = ue.verify_metric(max_rate * 0.8, operation='max_rolling_avg', metric='ul_brate', criterion='gt', window=half_duration) print(res_str) test.set_report_stdout(res_str) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I8a545b8175784e9d6b49d6bf80f637ef7aa731f7 Gerrit-Change-Number: 21057 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange
Change in libosmocore[master]: ns2: Send NSVC representation in NS_AFF_CAUSE_VC_* status indication
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21040 ) Change subject: ns2: Send NSVC representation in NS_AFF_CAUSE_VC_* status indication .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iad6f0dc4565a46868cbbe17c361dcd473006c83d Gerrit-Change-Number: 21040 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 11:11:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: ns2: Send NSVC representation in NS_AFF_CAUSE_VC_* status indication
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21040 ) Change subject: ns2: Send NSVC representation in NS_AFF_CAUSE_VC_* status indication .. ns2: Send NSVC representation in NS_AFF_CAUSE_VC_* status indication NS_AFF_CAUSE_VC_* failure and recovery should indicate the NSVC in question. Use the string representation reported by gprs_ns2_ll_str() for that. NS_AFF_CAUSE_VC_RECOVERY was never sent so do that on unblock as well. Change-Id: Iad6f0dc4565a46868cbbe17c361dcd473006c83d Related: SYS#4998 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_vc_fsm.c 5 files changed, 17 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h index 728ca9f..c90d459 100644 --- a/include/osmocom/gprs/gprs_ns2.h +++ b/include/osmocom/gprs/gprs_ns2.h @@ -101,6 +101,7 @@ } congestion; struct { enum gprs_ns2_affecting_cause cause; + char *nsvc; /* 48.016 5.2.2.6 transfer capability */ int transfer; /* osmocom specific */ diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index b50daf4..6ddc58b 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -363,9 +363,11 @@ * \param[in] bvci BVCI to which the status relates * \param[in] cause The cause of the status */ void ns2_prim_status_ind(struct gprs_ns2_nse *nse, +struct gprs_ns2_vc *nsvc, uint16_t bvci, enum gprs_ns2_affecting_cause cause) { + char nsvc_str[NS2_LL_MAX_STR]; struct osmo_gprs_ns2_prim nsp = {}; nsp.nsei = nse->nsei; nsp.bvci = bvci; @@ -373,6 +375,9 @@ nsp.u.status.transfer = -1; nsp.u.status.first = nse->first; nsp.u.status.persistent = nse->persistent; + if (nsvc) + nsp.u.status.nsvc = gprs_ns2_ll_str_buf(nsvc_str, sizeof(nsvc_str), nsvc); + osmo_prim_init(, SAP_NS, PRIM_NS_STATUS, PRIM_OP_INDICATION, NULL); nse->nsi->cb(, nse->nsi->cb_data); @@ -430,7 +435,7 @@ if (!nsvc) return; - ns2_prim_status_ind(nsvc->nse, 0, NS_AFF_CAUSE_VC_FAILURE); + ns2_prim_status_ind(nsvc->nse, nsvc, 0, NS_AFF_CAUSE_VC_FAILURE); llist_del(>list); llist_del(>blist); @@ -608,7 +613,7 @@ gprs_ns2_free_nsvc(nsvc); } - ns2_prim_status_ind(nse, 0, NS_AFF_CAUSE_FAILURE); + ns2_prim_status_ind(nse, NULL, 0, NS_AFF_CAUSE_FAILURE); llist_del(>list); if (nse->bss_sns_fi) @@ -986,7 +991,7 @@ if (unblocked) { /* this is the first unblocked NSVC on an unavailable NSE */ nse->alive = true; - ns2_prim_status_ind(nse, 0, NS_AFF_CAUSE_RECOVERY); + ns2_prim_status_ind(nse, NULL, 0, NS_AFF_CAUSE_RECOVERY); nse->first = false; return; } @@ -1004,7 +1009,7 @@ /* nse became unavailable */ nse->alive = false; - ns2_prim_status_ind(nse, 0, NS_AFF_CAUSE_FAILURE); + ns2_prim_status_ind(nse, NULL, 0, NS_AFF_CAUSE_FAILURE); } /*! Create a new GPRS NS instance diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index b480391..dee3ab7 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -221,6 +221,7 @@ void gprs_ns2_sns_dump_vty(struct vty *vty, const struct gprs_ns2_nse *nse, bool stats); void ns2_prim_status_ind(struct gprs_ns2_nse *nse, +struct gprs_ns2_vc *nsvc, uint16_t bvci, enum gprs_ns2_affecting_cause cause); void ns2_nse_notify_alive(struct gprs_ns2_vc *nsvc, bool alive); diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index b2754f5..31f8a5f 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -686,7 +686,7 @@ struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; if (old_state != GPRS_SNS_ST_UNCONFIGURED) - ns2_prim_status_ind(gss->nse, 0, NS_AFF_CAUSE_SNS_FAILURE); + ns2_prim_status_ind(gss->nse, NULL, 0, NS_AFF_CAUSE_SNS_FAILURE); if (gss->num_max_ip4_remote > 0) ns2_tx_sns_size(gss->sns_nsvc, true, gss->num_max_nsvcs, gss->num_max_ip4_remote, -1); @@ -1126,7 +1126,7 @@ static void ns2_sns_st_configured_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) { struct gprs_ns2_nse *nse = nse_inst_from_fi(fi); - ns2_prim_status_ind(nse, 0, NS_AFF_CAUSE_SNS_CONFIGURED); + ns2_prim_status_ind(nse, NULL, 0, NS_AFF_CAUSE_SNS_CONFIGURED); } static const struct
Change in libosmocore[master]: ns2: Send NSVC representation in NS_AFF_CAUSE_VC_* status indication
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21040 ) Change subject: ns2: Send NSVC representation in NS_AFF_CAUSE_VC_* status indication .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/21040/1/src/gb/gprs_ns2.c File src/gb/gprs_ns2.c: https://gerrit.osmocom.org/c/libosmocore/+/21040/1/src/gb/gprs_ns2.c@378 PS1, Line 378: nsp.u.status.nsvc = gprs_ns2_ll_str_c(nse, nsvc); > Ack I remember lynxis requested using this function for some reason. But I don't really know why/how the talloc version should be required here. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iad6f0dc4565a46868cbbe17c361dcd473006c83d Gerrit-Change-Number: 21040 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 10:42:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-gsm-manuals[master]: Makefile.common.inc: make 'publish' target use $(UPLOAD_FILES)
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/21055 ) Change subject: Makefile.common.inc: make 'publish' target use $(UPLOAD_FILES) .. Makefile.common.inc: make 'publish' target use $(UPLOAD_FILES) In some projects, the VTY reference PDFs may be located in sub- directories. Let's use $(UPLOAD_FILES), it already contains the list of all *.pdf files to be uploaded / published. Change-Id: I7d46dc3b67dee1a91f3ade5a166d833df816abd4 Related: SYS#4937 --- M build/Makefile.common.inc 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/build/Makefile.common.inc b/build/Makefile.common.inc index b98e83f..ca06962 100644 --- a/build/Makefile.common.inc +++ b/build/Makefile.common.inc @@ -27,10 +27,8 @@ distclean: clean -publish: all - mkdir -p out - cp *.pdf out - rsync -avz -e "$(SSH_COMMAND)" ./out/ d...@rita.osmocom.org:web-files/latest/ +publish: $(UPLOAD_FILES) + rsync -avz -e "$(SSH_COMMAND)" $(UPLOAD_FILES) d...@rita.osmocom.org:web-files/latest/ # Install and uninstall targets # Notes about OSMO_GSM_MANUALS_NO_INSTALL: -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/21055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I7d46dc3b67dee1a91f3ade5a166d833df816abd4 Gerrit-Change-Number: 21055 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: merged
Change in libosmocore[master]: ns2: Send NSVC representation in NS_AFF_CAUSE_VC_* status indication
Hello Jenkins Builder, pespin, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/21040 to look at the new patch set (#2). Change subject: ns2: Send NSVC representation in NS_AFF_CAUSE_VC_* status indication .. ns2: Send NSVC representation in NS_AFF_CAUSE_VC_* status indication NS_AFF_CAUSE_VC_* failure and recovery should indicate the NSVC in question. Use the string representation reported by gprs_ns2_ll_str() for that. NS_AFF_CAUSE_VC_RECOVERY was never sent so do that on unblock as well. Change-Id: Iad6f0dc4565a46868cbbe17c361dcd473006c83d Related: SYS#4998 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_vc_fsm.c 5 files changed, 17 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/40/21040/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iad6f0dc4565a46868cbbe17c361dcd473006c83d Gerrit-Change-Number: 21040 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-gsm-manuals[master]: Makefile.common.inc: make 'publish' target use $(UPLOAD_FILES)
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/21055 ) Change subject: Makefile.common.inc: make 'publish' target use $(UPLOAD_FILES) .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/21055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I7d46dc3b67dee1a91f3ade5a166d833df816abd4 Gerrit-Change-Number: 21055 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Fri, 06 Nov 2020 10:41:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: gprs_ms: Avoid enabling EGPRS if no MCS are supported
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/21046 ) Change subject: gprs_ms: Avoid enabling EGPRS if no MCS are supported .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/21046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib19e9e006d851c2147de15f4aec36ab65250bdd3 Gerrit-Change-Number: 21046 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 10:33:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Get rid of bts->egprs_enabled
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20994 ) Change subject: Get rid of bts->egprs_enabled .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifcf23771bd23afc64ca6fea38948f98f2d134ecb Gerrit-Change-Number: 20994 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Fri, 06 Nov 2020 10:32:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Fix mcs_is_valid(): UNKNOWN value is not a valid (M)CS
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/21045 ) Change subject: Fix mcs_is_valid(): UNKNOWN value is not a valid (M)CS .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/21045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0a973e10cd9477f72d8bd47a06048414b33ae96a Gerrit-Change-Number: 21045 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Fri, 06 Nov 2020 10:33:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Fix configuration of initial_(m)cs
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/21032 ) Change subject: Fix configuration of initial_(m)cs .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/21032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifc6bc7c2734d1ae404adc2497afec5366e4f9e50 Gerrit-Change-Number: 21032 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 10:33:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Take into account BTS supported (M)CS values when retrieving the maximum
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20992 ) Change subject: Take into account BTS supported (M)CS values when retrieving the maximum .. Take into account BTS supported (M)CS values when retrieving the maximum Change-Id: I2d3a8bbae2f9887400ce56d2f8303ea30abaecfa --- M src/bts.cpp M src/bts.h M src/gprs_bssgp_pcu.cpp M src/gprs_ms.cpp M src/pcu_l1_if.cpp M src/pcu_vty.c 6 files changed, 168 insertions(+), 55 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/bts.cpp b/src/bts.cpp index 359f2d5..c2e3b9c 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -219,10 +219,10 @@ bts->cs_adj_enabled = 1; bts->cs_adj_upper_limit = 33; /* Decrease CS if the error rate is above */ bts->cs_adj_lower_limit = 10; /* Increase CS if the error rate is below */ - bts->max_cs_ul = MAX_GPRS_CS; - bts->max_cs_dl = MAX_GPRS_CS; - bts->max_mcs_ul = MAX_EDGE_MCS; - bts->max_mcs_dl = MAX_EDGE_MCS; + bts->vty.max_cs_ul = MAX_GPRS_CS; + bts->vty.max_cs_dl = MAX_GPRS_CS; + bts->vty.max_mcs_ul = MAX_EDGE_MCS; + bts->vty.max_mcs_dl = MAX_EDGE_MCS; /* CS-1 to CS-4 */ bts->cs_lqual_ranges[0].low = -256; bts->cs_lqual_ranges[0].high = 6; @@ -320,6 +320,10 @@ BTS::BTS() : m_cur_fn(0) , m_cur_blk_fn(-1) + , m_max_cs_dl(MAX_GPRS_CS) + , m_max_cs_ul(MAX_GPRS_CS) + , m_max_mcs_dl(MAX_EDGE_MCS) + , m_max_mcs_ul(MAX_EDGE_MCS) , m_pollController(*this) , m_sba(*this) , m_ms_store(this) @@ -1072,6 +1076,53 @@ bitvec_free(immediate_assignment); } +/* return maximum DL CS supported by BTS and allowed by VTY */ +uint8_t BTS::max_cs_dl(void) const +{ + return m_max_cs_dl; +} + +/* return maximum UL CS supported by BTS and allowed by VTY */ +uint8_t BTS::max_cs_ul(void) const +{ + return m_max_cs_ul; +} + +/* return maximum DL MCS supported by BTS and allowed by VTY */ +uint8_t BTS::max_mcs_dl(void) const +{ + return m_max_mcs_dl; +} + +/* return maximum UL MCS supported by BTS and allowed by VTY */ +uint8_t BTS::max_mcs_ul(void) const +{ + return m_max_mcs_ul; +} + +/* Set maximum DL CS supported by BTS and allowed by VTY */ +void BTS::set_max_cs_dl(uint8_t cs_dl) +{ + m_max_cs_dl = cs_dl; +} + +/* Set maximum UL CS supported by BTS and allowed by VTY */ +void BTS::set_max_cs_ul(uint8_t cs_ul) +{ + m_max_cs_ul = cs_ul; +} + +/* Set maximum DL MCS supported by BTS and allowed by VTY */ +void BTS::set_max_mcs_dl(uint8_t mcs_dl) +{ + m_max_mcs_dl = mcs_dl; +} + +/* Set maximum UL MCS supported by BTS and allowed by VTY */ +void BTS::set_max_mcs_ul(uint8_t mcs_ul) +{ + m_max_mcs_ul = mcs_ul; +} GprsMs *BTS::ms_alloc(uint8_t ms_class, uint8_t egprs_ms_class) { @@ -1161,3 +1212,57 @@ if (slots & (1 << i)) pdch[i].unreserve(dir); } + +void bts_set_max_cs(struct gprs_rlcmac_bts *bts, uint8_t cs_dl, uint8_t cs_ul) +{ + int i; + + bts->vty.max_cs_dl = cs_dl; + cs_dl = 0; + for (i = bts->vty.max_cs_dl - 1; i >= 0; i--) { + if (bts->cs_mask & (1 << i)) { + cs_dl = i + 1; + break; + } + } + + bts->vty.max_cs_ul = cs_ul; + cs_ul = 0; + for (i = bts->vty.max_cs_ul - 1; i >= 0; i--) { + if (bts->cs_mask & (1 << i)) { + cs_ul = i + 1; + break; + } + } + + LOGP(DRLCMAC, LOGL_DEBUG, "New max CS: DL=%u UL=%u\n", cs_dl, cs_ul); + bts->bts->set_max_cs_dl(cs_dl); + bts->bts->set_max_cs_ul(cs_ul); +} + +void bts_set_max_mcs(struct gprs_rlcmac_bts *bts, uint8_t mcs_dl, uint8_t mcs_ul) +{ + int i; + + bts->vty.max_mcs_dl = mcs_dl; + mcs_dl = 0; + for (i = bts->vty.max_mcs_dl - 1; i >= 0; i--) { + if (bts->mcs_mask & (1 << i)) { + mcs_dl = i + 1; + break; + } + } + + bts->vty.max_mcs_ul = mcs_ul; + mcs_ul = 0; + for (i = bts->vty.max_mcs_ul - 1; i >= 0; i--) { + if (bts->mcs_mask & (1 << i)) { + mcs_ul = i + 1; + break; + } + } + + LOGP(DRLCMAC, LOGL_DEBUG, "New max MCS: DL=%u UL=%u\n", mcs_dl, mcs_ul); + bts->bts->set_max_mcs_dl(mcs_dl); + bts->bts->set_max_mcs_ul(mcs_ul); +} diff --git a/src/bts.h b/src/bts.h index 7335483..8d7f6ca 100644 --- a/src/bts.h +++ b/src/bts.h @@ -114,8 +114,10 @@ uint16_t mcs_mask; /* Allowed MCS mask from BTS */ uint8_t initial_cs_dl, initial_cs_ul; uint8_t initial_mcs_dl, initial_mcs_ul; - uint8_t max_cs_dl, max_cs_ul; - uint8_t max_mcs_dl, max_mcs_ul; +
Change in osmo-pcu[master]: pdch: Process received CS1-4 data blocks regardless of egprs_enabled
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20929 ) Change subject: pdch: Process received CS1-4 data blocks regardless of egprs_enabled .. pdch: Process received CS1-4 data blocks regardless of egprs_enabled EGPRS "enabled" or "not enabled" is a bit of confusing idea, since there are different levels of EGPRS support. For instance we may have been instructed by config to not transmit using MCS5-9 (8PSK), or not use MCS1-9 at all (GMSK+8PSK). However, we cannot control what is sent to us or what we receive on lower layers, so if the BTS PHY/receiver was able to decode+receive, let's try to process it anyway... Related: OS#4544 Change-Id: Ie70ec8e4a2d688762d7d320d6ad58d5a0cc52ea1 --- M src/pdch.cpp 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/pdch.cpp b/src/pdch.cpp index c56776f..ff13477 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -788,12 +788,6 @@ bts()->send_gsmtap_meas(PCU_GSMTAP_C_UL_DATA_EGPRS, true, trx_no(), ts_no, GSMTAP_CHANNEL_PDTCH, fn, data, data_len, meas); - if (!bts()->bts_data()->egprs_enabled) { - LOGP(DRLCMACUL, LOGL_ERROR, - "Got %s RLC block but EGPRS is not enabled\n", - mcs_name(cs)); - return 0; - } } else { bts()->send_gsmtap_meas(PCU_GSMTAP_C_UL_DATA_GPRS, true, trx_no(), ts_no, GSMTAP_CHANNEL_PDTCH, fn, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie70ec8e4a2d688762d7d320d6ad58d5a0cc52ea1 Gerrit-Change-Number: 20929 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged
Change in osmo-pcu[master]: Enable egprs support through PCUIF from BTS/BSC
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20928 ) Change subject: Enable egprs support through PCUIF from BTS/BSC .. Enable egprs support through PCUIF from BTS/BSC This VTY command was added due to EGPRS being introduced later as an experimental feature. It's no longer needed and causes more problems than goodness (since people sometimes forgets to enable it). Let's rather simply enable EGPRS support based on what BTS/BSC requests over PCUIF. Related: OS#4544 Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 --- M src/pcu_l1_if.cpp M src/pcu_vty.c 2 files changed, 14 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 4f96567..127029b 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -623,12 +623,15 @@ } bts_set_max_cs(bts, bts->vty.max_cs_dl, bts->vty.max_cs_ul); /* recalc max CS values */ + bts->egprs_enabled = false; bts->mcs_mask = 0; for (i = 0; i < 9; i++) { uint8_t allowed = !!(info_ind->flags & (PCU_IF_FLAG_MCS1 << i)); bts->mcs_mask |= allowed << i; - if (allowed) + if (allowed) { + bts->egprs_enabled = true; LOGP(DL1IF, LOGL_DEBUG, " Use MCS%d\n", i + 1); + } } bts_set_max_mcs(bts, bts->vty.max_mcs_dl, bts->vty.max_mcs_ul); /* recalc max MCS values */ diff --git a/src/pcu_vty.c b/src/pcu_vty.c index bd83544..5e5dfbe 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -108,9 +108,6 @@ unsigned int i; vty_out(vty, "pcu%s", VTY_NEWLINE); - if (bts->egprs_enabled) - vty_out(vty, " egprs only%s", VTY_NEWLINE); - vty_out(vty, " flow-control-interval %d%s", bts->fc_interval, VTY_NEWLINE); if (bts->fc_bvc_bucket_size) @@ -273,29 +270,21 @@ #define EGPRS_STR "EGPRS configuration\n" -DEFUN_USRATTR(cfg_pcu_egprs, - cfg_pcu_egprs_cmd, - X(PCU_VTY_ATTR_NEW_TBF), - "egprs only", - EGPRS_STR "Use EGPRS and disable plain GPRS\n") +DEFUN_DEPRECATED(cfg_pcu_egprs, +cfg_pcu_egprs_cmd, +"egprs only", +EGPRS_STR "Use EGPRS and disable plain GPRS\n") { - struct gprs_rlcmac_bts *bts = bts_main_data(); - - bts->egprs_enabled = true; - + vty_out (vty, "'egprs only' is deprecated, egprs support is controled from BTS/BSC config, this is now a no-op%s", VTY_NEWLINE); return CMD_SUCCESS; } -DEFUN_USRATTR(cfg_pcu_no_egprs, - cfg_pcu_no_egprs_cmd, - X(PCU_VTY_ATTR_NEW_TBF), - "no egprs", - NO_STR EGPRS_STR) +DEFUN_DEPRECATED(cfg_pcu_no_egprs, +cfg_pcu_no_egprs_cmd, +"no egprs", +NO_STR EGPRS_STR) { - struct gprs_rlcmac_bts *bts = bts_main_data(); - - bts->egprs_enabled = false; - + vty_out (vty, "'no egprs only' is deprecated, egprs support is controled from BTS/BSC config, this is now a no-op%s", VTY_NEWLINE); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 Gerrit-Change-Number: 20928 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged
Change in osmo-pcu[master]: Take into account BTS supported (M)CS values when retrieving the maximum
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20992 ) Change subject: Take into account BTS supported (M)CS values when retrieving the maximum .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2d3a8bbae2f9887400ce56d2f8303ea30abaecfa Gerrit-Change-Number: 20992 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Nov 2020 10:31:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: Let libosmocore handle VTY parent node tracking
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21028 ) Change subject: Let libosmocore handle VTY parent node tracking .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2008dd9026922d29ee703c59e70d3fecced0ee18 Gerrit-Change-Number: 21028 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Nov 2020 10:29:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gbproxy: Get the peer if paging by BVCI on SIG_BVC
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21030 ) Change subject: gbproxy: Get the peer if paging by BVCI on SIG_BVC .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic72f0f03e5886ab76404915fc60a2796e6881a7a Gerrit-Change-Number: 21030 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 06 Nov 2020 10:29:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment