Commit Graph

342 Commits

Author SHA1 Message Date
Oliver Smith cd066df5be all: add strongswan-epdg
Change-Id: I95a5a86e141eac5ee6c2ecdf26ad6c473a0677f3
2024-07-17 11:49:43 +02:00
Neels Hofmeyr 9f920877b8 templates/hnbgw: add plmn
Change-Id: I6e68d5ae3c6cb6740401b4beb3e89bd8cf972f7f
2024-07-08 01:30:41 +02:00
Neels Hofmeyr ce90ede09d sctp-role fixups
Change-Id: I8eeb0947e7a3d4ff80efdbeec1e0aa064ff7000c
2024-07-08 01:30:41 +02:00
Neels Hofmeyr e80f32246a net/config,templates: hnbgw: separate ip cfg for MGCP and RTP
Change-Id: I1826ee0badc60bbf174d4bf4e47a8b9adf293a54
2024-07-08 01:30:41 +02:00
Neels Hofmeyr 98adf247ae default.opts: add nftables --with-json
Change-Id: I1fae5af5ce1538083b21a4afa25983b0c85dbd6d
2024-07-08 01:30:41 +02:00
Neels Hofmeyr 7f7d2ed8e0 make osmo-hnbgw: build with nftables
Change-Id: I758cc4ff96716c853fa6962dd7f286c06f08b589
2024-07-08 01:30:26 +02:00
Neels Hofmeyr 3718cb2148 templates: different rtp ranges for different mgw
Change-Id: I67bcbbcf22dc71a9436a771f5aefaf5377c4455e
2024-07-08 01:29:49 +02:00
Neels Hofmeyr c086672146 templates/osmo-sgsn.cfg: set SGSN_PC and STP_CN_IP
Change-Id: I4ac02bc93a08e4908040080127616431e97d5f5e
2024-07-08 01:29:49 +02:00
Neels Hofmeyr 536c2be96d hnbgw: configure HNBGW_PC and STP_CN_IP
Change-Id: I1dd26c165f6df985bc5172045efc12f675f5fadf
2024-07-08 01:29:49 +02:00
Neels Hofmeyr 9907ee2750 templates/osmo-bsc-0.cfg: mgw cfg
Change-Id: Ibb972871153830be7043ae088a4203796cf8cca8
2024-07-08 01:29:49 +02:00
Neels Hofmeyr 09191e5a1c templates/common_osmo_bsc: TCH modes = S1, allow all AMR rates
Change-Id: I37ee2042b7e73d8948c9e9c8dd5198f757eaf206
2024-07-08 01:29:49 +02:00
Neels Hofmeyr c73512b1a2 add comment: CMD_MSC for libudtrace
Change-Id: Ibca908e3ace1f66d0d437c4b9f1a6b5e9682f5f9
2024-07-08 01:29:49 +02:00
Neels Hofmeyr 4649e00f39 add templates/nano3G*
Change-Id: I5ad7442da40550c64e1455197f333b02dd6291ff
2024-07-08 01:29:49 +02:00
Neels Hofmeyr 377c0842be templates: bind CTRL to same IP as VTY
Change-Id: I8f84b33a687272ea868cdaac7d74c009c585a52e
2024-07-08 01:29:49 +02:00
Neels Hofmeyr 2a4595dc9e templates: add MGW for osmo-hnbgw 2024-07-08 01:29:49 +02:00
Neels Hofmeyr 903cdf1c2f add osmo-gsm-shark
Change-Id: I7ce51f6b118b42e04a461025366d315d9dbf6a88
2024-07-08 01:29:49 +02:00
Neels Hofmeyr f788b7197a default.opts: drop osmo-hnbgw --enable-pfcp
Change-Id: Ic18c74930c446b1209abd4f1f4ae9894ee944cc5
2024-07-08 01:29:49 +02:00
Neels Hofmeyr 62b57b85d5 add mgw-manual.opts
Change-Id: I31c27b0c5c8ac9c751daed30636a80a154f85d0b
2024-07-08 01:28:16 +02:00
Neels Hofmeyr 5bf0ba1043 hnbgw_with_pfcp.opts
Change-Id: If065c13823a8ec5780fccf446e81fb8e0e6f4f5e
2024-07-08 01:28:16 +02:00
Neels Hofmeyr 57939038c8 virt-nitb/run.sh tweak
Change-Id: I7559fb1b85fe5e6366d7543b4cf498ede4169385
2024-07-08 01:16:03 +02:00
Neels Hofmeyr 6f56af1629 virt-nitb: osmo-bsc codec fr1
Change-Id: I2ba759792c0c8ac01633f90fd0833ae182fa4f86
2024-07-08 01:16:03 +02:00
Neels Hofmeyr 0a6764c0e8 virt: use kamailio
Change-Id: I4fd4c22be5b9937122e0e7f357a62db1d5363fd7
2024-07-08 01:08:23 +02:00
Neels Hofmeyr dd062b67e4 virt-nitb cfg tweaks
Change-Id: I11821726f65ad59fad9bc2299a159ad04b697e45
2024-07-08 01:08:23 +02:00
Neels Hofmeyr 140d9c5a99 gitignore: add virt-nitb/*pcapng
Change-Id: I475ca421d585fa9e738f56a9572df6d97ef2cfb9
2024-07-08 00:45:29 +02:00
Oliver Smith 9a34cd26d5 gen_makefile: support erlang projects
Change-Id: Ib471a518c48dac8c0cd22bfb038b99b58014708f
2024-07-04 13:57:08 +02:00
Oliver Smith 5575b4f1f9 gen_makefile: fix stray -e in outputs
Instead of echo from coreutils, which has the -e flag to enable
interpretation of backslash escapes, the built-in echo from /bin/sh
gets used which defaults to interpretation of backslash escapes and
prints a literal "-e".

From https://www.gnu.org/software/make/manual/html_node/Choosing-the-Shell.html:

> The program used as the shell is taken from the variable SHELL. If this
> variable is not set in your makefile, the program /bin/sh is used as the
> shell.

Change-Id: I06ed3a8c55fd5eb51269afb8cd12433077c2f7e6
2024-07-04 10:47:34 +02:00
Oliver Smith a9ff9c743c gen_makefile: indent whole file with spaces
Use spaces as indent for the Makefile snippets and replace them with
tabs just before writing the Makefile. This way we can indent the whole
file with spaces. Instead of mixing spaces and tabs, and frequently
having spaces where tabs would need to be by accident, which then
results in a broken Makefile.

Use two spaces for the tabs, as in the vim modeline at the bottom.

Change-Id: I42eb2dda0f1f48d4a8ea2e1e59f9cfd8df7af800
2024-07-04 10:38:46 +02:00
Oliver Smith 7a8f6d4127 gen_makefile: write content into a buffer first
Instead of directly writing the new Makefile, write the new content into
a buffer variable first. This ensures that we don't abort half-way while
writing the Makefile, and it allows replacing spaces -> tabs in the
next patch.

Change-Id: I9a0ee9aa5047b7d9af9673465441039cd55c221b
2024-07-04 10:24:50 +02:00
Oliver Smith c3122640a7 gen_makefile: add --install-prefix argument
Make it feasible to set installation prefixes for both autotools and
meson projects (open5gs) when building them with osmo-dev. This will be
used by the new testenv script for osmo-ttcn3-hacks.

Related: OS#6494
Change-Id: I1788a9a1e6c83f108e03968f797c258da20863b0
2024-06-26 14:53:35 +02:00
Oliver Smith 510c90c760 gen_makefile: fix meson warning
Fix for:
  WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]` is ambiguous and deprecated.

Change-Id: I5de0285012344876dbe47f1ae663bf93c45aade0
2024-06-26 14:30:07 +02:00
Oliver Smith a6c08d7583 no_uring.opts: new file
Change-Id: Iafe1e78db66552e1b59818452570f9a6104742a3
2024-06-24 13:28:36 +02:00
Oliver Smith a77d2b6592 ccache.opts: find wrapper in debian path too
With Debian's packaging, the ccache symlinks are created in
/usr/lib/ccache/, not in /usr/lib/ccache/bin/. Tweak ccache.opts to
find gcc and g++ in both paths.

Change-Id: I3803d453c06c503bc9c0ea1823cb9470e5f157b1
2024-06-04 09:29:47 +02:00
Oliver Smith a7c4604d20 no_uring_tests.opts: new file
Change-Id: Ia1be7b4b51a1b7d21cf7053be9994ec37d58c89a
2024-04-19 13:45:11 +02:00
Oliver Smith 3fed942f99 ttcn3/ttcn3.sh: collect_logs: fix tester* paths
For ttcn3-bts-test and ttcn3-ggsn-test, the tester dir has the
configuration at the end (…-tester-all etc.). Support that in the
collect_logs function.

Change-Id: I2aaab0c37fffedaeb49a362f77d795f017e2a7da
2024-03-21 13:07:00 +01:00
Oliver Smith 97b7b0561b ttcn3.sh: add -c CONFIG argument
Allow only running one of the ttcn3-bts-test configurations, instead of
running all of them.

Depends: docker-playground I1dce5e6aa4b5d67f9f8c96ced611ab2875c353c8
Change-Id: I46028824847ffc2d0768d32c138ccd32a6c8c769
2024-02-28 10:44:06 +01:00
Oliver Smith f52f94c61c ttcn3.sh: bts: fix missing trxcon dependency
Change-Id: Ia4a588842921e4382d46d3b905bba6aab3ef3359
2024-02-27 15:09:37 +01:00
Oliver Smith 4fb86f0e4f ttcn3.sh: prepare_local_bin: always copy scripts
Always copy ttcn3-docker-run.sh from docker-playground.git, so we don't
use an outdated version if the file has changed.

Change-Id: I52df1da96a1848c5a4c054bb6bc9584074e9c35e
2024-02-26 16:47:45 +01:00
Oliver Smith 5740e63483 src/grd: urlencode / in project names
Fix that it didn't work with projects that contain a slash character,
such as erlang/osmo-epdg.

Change-Id: I810d6d0654ab8f3019c00e32762edfef7e7350a7
2024-02-21 09:19:27 +01:00
Oliver Smith b400b35689 ttcn3: fix permissions before running make clean
Change-Id: I3928bea4e4743c4fa0c82ca1fe2e963a0580a68e
2024-01-31 10:34:49 +01:00
Oliver Smith c4f76c40d1 ttcn3: pgw: depend on osmo-uecups
Change-Id: I95b77ea1a9f4c31c8886dc3f613e545135da320d
2023-11-23 14:06:03 +01:00
Oliver Smith af3d692e89 ttcn3: fix missing test name in usage desc
Change-Id: I5be5ee227dac0969e12d284ec518019c75698754
2023-11-23 13:59:09 +01:00
Oliver Smith 1e497a2110 ttcn3: add aliases hss -> hss-ogs etc.
Some open5gs testsuites end in -ogs (hss, mme, ggsn), others do not
(pgw). Let the user omit -ogs and choose the right one automatically.

Change-Id: I64fb519c15cfff8a8b560d51ff8b6b5d1aada8f7
2023-11-23 12:34:33 +01:00
Oliver Smith 32eda24020 ttcn3: support hss-ogs, mme-ogs, pgw
Change-Id: I08d76e6c92e2e3eacacb02a5a6f6d589e5889499
2023-11-23 12:33:44 +01:00
Oliver Smith 7dcf8520c5 ttcn3: run_docker: remove :ro
Don't mount usr_local, var_local as read-only, so the environment is
more similar to our jenkins.

Fix for:
  + /data/upfd-setup.sh
  + command -v open5gs-upfd
  + upfd_bin=/usr/local/bin/open5gs-upfd
  + setcap cap_net_raw+ep /usr/local/bin/open5gs-upfd
  Failed to set capabilities on file '/usr/local/bin/open5gs-upfd': Read-only file system

Change-Id: I52d2989d91119f0f1673f49723f1055fe7428d15
2023-11-23 11:59:42 +01:00
Oliver Smith 5f8deb0ce6 ttcn3: remove unused functions
Change-Id: I1939f1262757899c1a75c6d51cffd2ab13815c0f
2023-11-23 11:59:33 +01:00
Oliver Smith 7c8e69da79 ttcn3: add ggsn-ogs
Change-Id: Id84047e56a6c07fbf0984eb6aedcecd4d7f3ae97
2023-11-22 12:52:46 +01:00
Oliver Smith 45f8c39c96 Support building open5gs
Change-Id: Id145443ff53f13740167e9dde6417b7e915b8399
2023-11-22 11:43:24 +01:00
Oliver Smith 59dbd1c75f gen_makefile: split gen_make into more functions
Add separate functions for each rule (autoconf, configure, build,
install, reinstall, clean, distclean). This is in preparation for
supporting open5gs (meson).

Change-Id: Id7acfec7f5dd0d3d1a080b3c9d15005e51863e66
2023-11-22 11:43:24 +01:00
Oliver Smith 9d83a72e85 gen_makefile: don't shell out to nproc
Use python's multiprocessing.cpu_count() instead of "$(nproc)". The
latter didn't work properly in Makefiles, the right syntax would have
been "$(shell nproc)". Make didn't complain about it and assumed that we
want to use all CPUs with an empty argument "-j ", but meson doesn't
accept this syntax.

Change-Id: I58ca082339f3aff813f587f4c2be9c0951b9b2dd
2023-11-22 11:43:11 +01:00
Oliver Smith 8590b898e9 gen_makefile: update URL code for netfilter urls
* libgtnpnl is now developed at gerrit.osmocom.org
* use https:// instead of git:// for libnftnl, nftables
* read the urls from a new all.urls file
* don't set a push URL pointing to gerrit for projects that have
  different URLs

Change-Id: I5522c9fcc594d296c581ba59c0beb4882e2d976e
2023-11-22 11:43:10 +01:00