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

[XS] Change in android-apdu-proxy[master]: README.md: order compatible devices alphabetically

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/android-apdu-proxy/+/38869?usp=email ) Change subject: README.md: order compatible devices alphabetically ...................................................................... README.md: order compatible devices alphabetically Change-Id: I51ef8b8e23bc12598cebc848a91c359769f744e5 Related: OS#6367 --- M README.md 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/README.md b/README.md index 8a5765b..797478e 100644 --- a/README.md +++ b/README.md @@ -288,9 +288,9 @@ | Brand | Model | Android version | API level | | -------- | ------------------------------ | --------------- | --------- | -| Samsung | SM-A217F/DSN (Galaxy A21s) | 10 | 29 | -| ONEPLUS | A6013 | 11 | 30 | | CAT | S62Pro | 11 | 30 | -| Google | Pixel7a | 13 | 33 | | Google | Pixel4a | 14 | 34 | +| Google | Pixel7a | 13 | 33 | +| ONEPLUS | A6013 | 11 | 30 | +| SAMSUNG | SM-A217F/DSN (Galaxy A21s) | 10 | 29 | | SAMSUNG | SM-G990B/DS (Galaxy S21 FE 5G) | 14 | 34 | -- To view, visit https://gerrit.osmocom.org/c/android-apdu-proxy/+/38869?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: android-apdu-proxy Gerrit-Branch: master Gerrit-Change-Id: I51ef8b8e23bc12598cebc848a91c359769f744e5 Gerrit-Change-Number: 38869 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

7 months

1
0
0 0

[XS] Change in android-apdu-proxy[master]: README.md: order compatible devices alphabetically

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/android-apdu-proxy/+/38869?usp=email ) Change subject: README.md: order compatible devices alphabetically ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/android-apdu-proxy/+/38869?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: android-apdu-proxy Gerrit-Branch: master Gerrit-Change-Id: I51ef8b8e23bc12598cebc848a91c359769f744e5 Gerrit-Change-Number: 38869 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Nov 2024 09:32:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[XS] Change in osmo-ci[master]: scripts/osmocom-api-doxygen: libosmo-abis after libosmo-netif

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38873?usp=email ) Change subject: scripts/osmocom-api-doxygen: libosmo-abis after libosmo-netif ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38873?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic80a9cc242ae0a8244d4e0a55cc08ba38039125b Gerrit-Change-Number: 38873 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Nov 2024 09:32:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[XS] Change in osmo-ci[master]: scripts/osmocom-build-old-tags: libosmo-abis after libosmo-netif

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38874?usp=email ) Change subject: scripts/osmocom-build-old-tags: libosmo-abis after libosmo-netif ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38874?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I778191a3c39b76712f8709fcda8efda41e95a8eb Gerrit-Change-Number: 38874 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Nov 2024 09:31:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[XS] Change in osmo-ci[master]: scripts/osmocom-api-doxygen: libosmo-abis after libosmo-netif

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38873?usp=email ) Change subject: scripts/osmocom-api-doxygen: libosmo-abis after libosmo-netif ...................................................................... scripts/osmocom-api-doxygen: libosmo-abis after libosmo-netif Depends: libosmo-abis I079dc3999de508301dd37ed03e399356a58d3cab Depends: libosmo-netif I13d6e88158f6d9ce017986283183ee9c2cc68cae Change-Id: Ic80a9cc242ae0a8244d4e0a55cc08ba38039125b --- M scripts/osmocom-api-doxygen.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/73/38873/1 diff --git a/scripts/osmocom-api-doxygen.sh b/scripts/osmocom-api-doxygen.sh index 0b9a965..bfe7dbf 100755 --- a/scripts/osmocom-api-doxygen.sh +++ b/scripts/osmocom-api-doxygen.sh @@ -5,9 +5,9 @@ # uploaded, also dependencies which need to be built repos_api=" libosmocore - libosmo-abis libosmo-dsp libosmo-netif + libosmo-abis libosmo-sigtran osmo-gmr " -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38873?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic80a9cc242ae0a8244d4e0a55cc08ba38039125b Gerrit-Change-Number: 38873 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

7 months

1
0
0 0

[XS] Change in osmo-ci[master]: scripts/osmocom-build-old-tags: libosmo-abis after libosmo-netif

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38874?usp=email ) Change subject: scripts/osmocom-build-old-tags: libosmo-abis after libosmo-netif ...................................................................... scripts/osmocom-build-old-tags: libosmo-abis after libosmo-netif Depends: libosmo-abis I079dc3999de508301dd37ed03e399356a58d3cab Depends: libosmo-netif I13d6e88158f6d9ce017986283183ee9c2cc68cae Change-Id: I778191a3c39b76712f8709fcda8efda41e95a8eb --- M scripts/osmocom-build-old-tags-against-master.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/74/38874/1 diff --git a/scripts/osmocom-build-old-tags-against-master.sh b/scripts/osmocom-build-old-tags-against-master.sh index 4f69ffc..b31ea2f 100755 --- a/scripts/osmocom-build-old-tags-against-master.sh +++ b/scripts/osmocom-build-old-tags-against-master.sh @@ -14,8 +14,8 @@ REPOS_MASTER=" libosmocore - libosmo-abis libosmo-netif + libosmo-abis libosmo-sigtran libosmo-sccp-legacy libsmpp34 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38874?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I778191a3c39b76712f8709fcda8efda41e95a8eb Gerrit-Change-Number: 38874 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

7 months

1
0
0 0

[XS] Change in libosmo-netif[master]: examples/ipa-stream-client: Fix wrong call to osmo_ipa_process_msg()

by osmith

Attention is currently required from: daniel, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38872?usp=email ) Change subject: examples/ipa-stream-client: Fix wrong call to osmo_ipa_process_msg() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38872?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Idec574f59587c681dd059266c9a9cf244bf41dc3 Gerrit-Change-Number: 38872 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Nov 2024 08:54:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[S] Change in osmo-bts[master]: bts-omldummy: Support configuring logging through cmdline

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bts/+/38871?usp=email ) Change subject: bts-omldummy: Support configuring logging through cmdline ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38871?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b33919d71bacefe60be192810518fd927625127 Gerrit-Change-Number: 38871 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Nov 2024 08:51:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: build virtphy from src with --binary-repo

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38851?usp=email ) Change subject: testenv: build virtphy from src with --binary-repo ...................................................................... testenv: build virtphy from src with --binary-repo Add logic to build virtphy from source when running with --binary-repo. This extra code path is needed because we currently don't have virtphy packaged (like trxcon and sccp_demo_user), and we need to build the libosmocore binary package instead of building completely from source as we would do it with osmo-dev. Use ".split(" ", 1)[0]" on the program= value to only look at its first word, so we can later on use it in testenv.cfg file as follows: [virtphy] program=virtphy -s /tmp/osmocom_l2 Change-Id: I37bac8509b2601286e4feab099782f82c8338dca --- M _testenv/testenv/podman_install.py 1 file changed, 20 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/_testenv/testenv/podman_install.py b/_testenv/testenv/podman_install.py index 3c38285..9033c14 100644 --- a/_testenv/testenv/podman_install.py +++ b/_testenv/testenv/podman_install.py @@ -13,6 +13,7 @@ git_dir = None bb_dir = None trxcon_dir = None +virtphy_dir = None sccp_dir = None jobs = None @@ -21,12 +22,14 @@ global git_dir global bb_dir global trxcon_dir + global virtphy_dir global sccp_dir global jobs git_dir = os.path.join(testenv.args.cache, "git") bb_dir = os.path.join(git_dir, "osmocom-bb") trxcon_dir = os.path.join(bb_dir, "src/host/trxcon") + virtphy_dir = os.path.join(bb_dir, "src/host/virt_phy") sccp_dir = os.path.join(git_dir, "libosmo-sigtran") jobs = multiprocessing.cpu_count() + 1 @@ -148,6 +151,20 @@ testenv.cmd.run(["ln", "-s", trxcon_in_srcdir, "/usr/local/bin/trxcon"]) +def from_source_virtphy(): + virtphy_in_srcdir = os.path.join(virtphy_dir, "src/virtphy") + + if not os.path.exists(virtphy_in_srcdir): + clone_osmocom_bb() + apt_install(["libosmocore-dev"]) + logging.info("Building virtphy") + testenv.cmd.run(["autoreconf", "-fi"], cwd=virtphy_dir) + testenv.cmd.run(["./configure"], cwd=virtphy_dir) + testenv.cmd.run(["make", "-j", f"{jobs}"], cwd=virtphy_dir) + + testenv.cmd.run(["ln", "-s", virtphy_in_srcdir, "/usr/local/bin/virtphy"]) + + def from_source_sccp_demo_user(): sccp_demo_user_path = os.path.join(sccp_dir, "examples/sccp_demo_user") @@ -178,9 +195,11 @@ def from_source(cfg, cfg_name, section): - program = cfg[section]["program"] + program = cfg[section]["program"].split(" ", 1)[0] if program == "trxcon": return from_source_trxcon() + if program == "virtphy": + return from_source_virtphy() if program == "run_fake_trx.sh": return clone_osmocom_bb() if program == "run_sccp_demo_user.sh": -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38851?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I37bac8509b2601286e4feab099782f82c8338dca Gerrit-Change-Number: 38851 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: bts: add initial testenv.cfg

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38852?usp=email ) Change subject: bts: add initial testenv.cfg ...................................................................... bts: add initial testenv.cfg As usually, imported from docker-playground and adjusted to run on the loopback device. Related: OS#6638 Change-Id: Id9ed3780d166c5f6736a006f466dc5f0dded6279 --- A bts/BTS_Tests_FH.cfg A bts/BTS_Tests_OML.cfg A bts/osmo-bsc-fh.confmerge A bts/osmo-bts-oml.confmerge M bts/run_fake_trx.sh A bts/testenv_generic.cfg A bts/testenv_hopping.cfg A bts/testenv_oml.cfg 8 files changed, 470 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/bts/BTS_Tests_FH.cfg b/bts/BTS_Tests_FH.cfg new file mode 100644 index 0000000..9adb812 --- /dev/null +++ b/bts/BTS_Tests_FH.cfg @@ -0,0 +1,133 @@ +[ORDERED_INCLUDE] +"BTS_Tests.cfg" + +[LOGGING] +/* The following hopping configuration corresponds to osmo-bsc-fh.confmerge. + * See https://gerrit.osmocom.org/c/docker-playground/+/19160/ for more details. + * + * == Physical channel configuration (FDMA) == + * + * +-------+------------------+------------------+------------------+------------------+ + * | # / # | TRX#0 | TRX#1 | TRX#2 | TRX#3 | + * +-------+------------------+------------------+------------------+------------------+ + * | ARFCN | 871 | 873 | 875 | 877 | + * +-------+------------------+------------------+------------------+------------------+ + * + * == Physical channel configuration (TDMA) == + * + * +-------+------------------+------------------+------------------+------------------+ + * | # / # | TRX#0 | TRX#1 | TRX#2 | TRX#3 | + * +-------+------------------+------------------+------------------+------------------+ + * | TS0 | CCCH+SDCCH4 | TCH/F (a) | TCH/F (a) | TCH/F (a) | + * +-------+------------------+------------------+------------------+------------------+ + * | TS1 | TCH/F | SDCCH8 | SDCCH8 (b) | SDCCH8 (b) | + * +-------+------------------+------------------+------------------+------------------+ + * | TS2 | TCH/F (c) | TCH/H (c) | TCH/F (d) | TCH/H (d) | + * +-------+------------------+------------------+------------------+------------------+ + * | TS3 | TCH/F_PDCH (e) | TCH/F_PDCH (e) | TCH/F_PDCH (e) | TCH/F_PDCH (e) | + * +-------+------------------+------------------+------------------+------------------+ + * | TS4 | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | + * +-------+------------------+------------------+------------------+------------------+ + * | TS5 | TCH/H (f) | TCH/H (f) | TCH/H (f) | TCH/H (f) | + * +-------+------------------+------------------+------------------+------------------+ + * | TS6 | SDCCH8 (g) | PDCH (h) | PDCH (h) | SDCCH8 (g) | + * +-------+------------------+------------------+------------------+------------------+ + * | TS7 | PDCH (i) | PDCH (j) | PDCH (i) | PDCH (j) | + * +-------+------------------+------------------+------------------+------------------+ + */ +[MODULE_PARAMETERS] +BTS_Tests.mp_freq_hop_enabled := true +BTS_Tests.mp_fh_config := { + { /* TS0 */ + { /* Group a) TCH/F */ + hsn := 0, + trx_maio := { + { trx_nr := 1, maio := 0 }, + { trx_nr := 2, maio := 1 }, + { trx_nr := 3, maio := 2 } + } + } + }, + { /* TS1 */ + { /* Group b) SDCCH8 */ + hsn := 1, + trx_maio := { + { trx_nr := 2, maio := 3 }, + { trx_nr := 3, maio := 5 } + } + } + }, + { /* TS2 */ + { /* Group c) TCH/F + TCH/H (mixed) */ + hsn := 2, + trx_maio := { + { trx_nr := 0, maio := 0 }, + { trx_nr := 1, maio := 1 } + } + }, + { /* Group d) TCH/F + TCH/H (mixed) */ + hsn := 2, + trx_maio := { + { trx_nr := 2, maio := 2 }, + { trx_nr := 3, maio := 3 } + } + } + }, + { /* TS3 */ + { /* Group e) TCH/F_PDCH */ + hsn := 3, + trx_maio := { + { trx_nr := 0, maio := 3 }, + { trx_nr := 1, maio := 2 }, + { trx_nr := 2, maio := 1 }, + { trx_nr := 3, maio := 0 } + } + } + }, + { /* TS4 */ + /* No groups, all TCH/F_TCH/H_PDCH */ + }, + { /* TS5 */ + { /* Group f) TCH/H */ + hsn := 5, + trx_maio := { + { trx_nr := 0, maio := 0 }, + { trx_nr := 1, maio := 1 }, + { trx_nr := 2, maio := 2 }, + { trx_nr := 3, maio := 3 } + } + } + }, + { /* TS6 */ + { /* Group g) SDCCH8 */ + hsn := 6, + trx_maio := { + { trx_nr := 0, maio := 1 }, + { trx_nr := 3, maio := 0 } + } + }, + { /* Group h) PDCH */ + hsn := 6, + trx_maio := { + { trx_nr := 1, maio := 1 }, + { trx_nr := 2, maio := 0 } + } + } + }, + { /* TS7 */ + { /* Group i) PDCH */ + hsn := 0, + trx_maio := { + { trx_nr := 0, maio := 1 }, + { trx_nr := 2, maio := 3 } + } + }, + { /* Group h) PDCH */ + hsn := 0, + trx_maio := { + { trx_nr := 1, maio := 0 }, + { trx_nr := 3, maio := 2 } + } + } + } +} diff --git a/bts/BTS_Tests_OML.cfg b/bts/BTS_Tests_OML.cfg new file mode 100644 index 0000000..6f535ee --- /dev/null +++ b/bts/BTS_Tests_OML.cfg @@ -0,0 +1,17 @@ +[ORDERED_INCLUDE] +"../Common.cfg" +"./BTS_Tests.default" + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +BTS_Tests_OML.mp_oml_port := 3002 +BTS_Tests_OML.mp_pcu_socket := "/tmp/pcu_sock" +PCUIF_Types.mp_pcuif_version := 12 + +[MAIN_CONTROLLER] + +[EXECUTE] +BTS_Tests_OML.control diff --git a/bts/osmo-bsc-fh.confmerge b/bts/osmo-bsc-fh.confmerge new file mode 100644 index 0000000..91a4710 --- /dev/null +++ b/bts/osmo-bsc-fh.confmerge @@ -0,0 +1,231 @@ +network + bts 0 + trx 0 + timeslot 0 + ! Shall not be hopping + timeslot 1 + ! Intentionally non-hopping + timeslot 2 + ! (c) HSN=2, MAIO=0,1 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 873 + timeslot 3 + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 3 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + ! Intentionally non-hopping + timeslot 5 + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + ! (g) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 877 + timeslot 7 + ! (i) HSN=0, MAIO=1,3 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 875 + trx 1 + timeslot 0 + ! (a) HSN=0, MAIO=0,1,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 1 + ! Intentionally non-hopping + timeslot 2 + phys_chan_config TCH/H + ! (c) HSN=2, MAIO=0,1 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 873 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 2 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + ! Intentionally non-hopping + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + ! (h) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 1 + hopping arfcn add 873 + hopping arfcn add 875 + timeslot 7 + ! (j) HSN=0, MAIO=0,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 873 + hopping arfcn add 877 + trx 2 + timeslot 0 + phys_chan_config TCH/F + ! (a) HSN=0, MAIO=0,1,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 1 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 1 + phys_chan_config SDCCH8 + ! (b) HSN=1, MAIO=3,5 + hopping enabled 1 + hopping sequence-number 1 + hopping maio 3 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 2 + phys_chan_config TCH/F + ! (d) HSN=2, MAIO=2,3 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 2 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + ! Intentionally non-hopping + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 2 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + ! (h) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 0 + hopping arfcn add 873 + hopping arfcn add 875 + timeslot 7 + ! (i) HSN=0, MAIO=1,3 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 3 + hopping arfcn add 871 + hopping arfcn add 875 + trx 3 + timeslot 0 + phys_chan_config TCH/F + ! (a) HSN=0, MAIO=0,1,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 2 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 1 + phys_chan_config SDCCH8 + ! (b) HSN=1, MAIO=3,5 + hopping enabled 1 + hopping sequence-number 1 + hopping maio 5 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 2 + ! (d) HSN=2, MAIO=2,3 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 3 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + ! Intentionally non-hopping + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 3 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + phys_chan_config SDCCH8 + ! (g) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 877 + timeslot 7 + phys_chan_config PDCH + ! (j) HSN=0, MAIO=0,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 2 + hopping arfcn add 873 + hopping arfcn add 877 diff --git a/bts/osmo-bts-oml.confmerge b/bts/osmo-bts-oml.confmerge new file mode 100644 index 0000000..0138bf7 --- /dev/null +++ b/bts/osmo-bts-oml.confmerge @@ -0,0 +1,10 @@ +bts 0 + oml remote-ip 127.0.0.1 + trx 0 + power-ramp step-size 2000 mdB + trx 1 + power-ramp step-size 2000 mdB + trx 2 + power-ramp step-size 2000 mdB + trx 3 + power-ramp step-size 2000 mdB diff --git a/bts/run_fake_trx.sh b/bts/run_fake_trx.sh index 6243ce2..860dec7 100755 --- a/bts/run_fake_trx.sh +++ b/bts/run_fake_trx.sh @@ -1,7 +1,15 @@ #!/bin/bash - # Most BTS_Tests require to have fake_trx running. # fake trx is part of osmo-trx + +if [ "$TESTENV_BINARY_REPO" = 1 ]; then + # testenv with --binary-repo -> osmocom-bb cloned separately + FAKE_TRX_DIR="$TESTENV_GIT_DIR"/osmocom-bb/src/target/trx_toolkit +elif [ -n "$TESTENV_SRC_DIR" ]; then + # testenv without --binary-repo -> osmocom-bb cloned via osmo-dev + FAKE_TRX_DIR="$TESTENV_SRC_DIR"/osmocom-bb/src/target/trx_toolkit +fi + FAKE_TRX_DIR="${FAKE_TRX_DIR:-../../osmo-trx/osmocom-bb/src/target/trx_toolkit}" cd "$FAKE_TRX_DIR" diff --git a/bts/testenv_generic.cfg b/bts/testenv_generic.cfg new file mode 100644 index 0000000..f33e616 --- /dev/null +++ b/bts/testenv_generic.cfg @@ -0,0 +1,24 @@ +[testsuite] +program=BTS_Tests +config=BTS_Tests.cfg + +[bsc] +program=osmo-bsc +make=osmo-bsc +package=osmo-bsc +copy=osmo-bsc.cfg + +[fake-trx] +program=run_fake_trx.sh +make=.make.osmocom-bb.clone + +[trxcon] +program=trxcon +make=trxcon + +[bts] +program=respawn.sh osmo-bts-trx +make=osmo-bts +package=osmo-bts +copy=osmo-bts.cfg +vty_port=4241 diff --git a/bts/testenv_hopping.cfg b/bts/testenv_hopping.cfg new file mode 100644 index 0000000..5adf485 --- /dev/null +++ b/bts/testenv_hopping.cfg @@ -0,0 +1,27 @@ +[testsuite] +program=BTS_Tests +config=BTS_Tests_FH.cfg +copy=BTS_Tests.cfg +clean=rename_junit_xml_classname.sh ":hopping" + +[bsc] +prepare=osmo-config-merge osmo-bsc.cfg osmo-bsc-fh.confmerge > osmo-bsc-fh.cfg +program=osmo-bsc -c osmo-bsc-fh.cfg +make=osmo-bsc +package=osmo-bsc libosmocore-utils +copy=osmo-bsc.cfg osmo-bsc-fh.confmerge + +[fake-trx] +program=run_fake_trx.sh +make=.make.osmocom-bb.clone + +[trxcon] +program=trxcon +make=trxcon + +[bts] +program=respawn.sh osmo-bts-trx +make=osmo-bts +package=osmo-bts +copy=osmo-bts.cfg +vty_port=4241 diff --git a/bts/testenv_oml.cfg b/bts/testenv_oml.cfg new file mode 100644 index 0000000..77a6fda --- /dev/null +++ b/bts/testenv_oml.cfg @@ -0,0 +1,19 @@ +[testsuite] +program=BTS_Tests +config=BTS_Tests_OML.cfg + +[fake-trx] +program=run_fake_trx.sh +make=.make.osmocom-bb.clone + +[trxcon] +program=trxcon +make=trxcon + +[bts] +prepare=osmo-config-merge osmo-bts.cfg osmo-bts-oml.confmerge > osmo-bts-oml.cfg +program=osmo-bts-trx -c osmo-bts-oml.cfg +make=osmo-bts +package=osmo-bts-trx libosmocore-utils +copy=osmo-bts.cfg osmo-bts-oml.confmerge +vty_port=4241 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38852?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id9ed3780d166c5f6736a006f466dc5f0dded6279 Gerrit-Change-Number: 38852 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024