Commit Graph

27 Commits

Author SHA1 Message Date
Harald Welte 967d903040 remove deprecated 'logging level all everything' from configs
it has been deprecated in libosmocore.git 2.5 years ago:

commit 7e0686c6b4b456ec4e6e15689694b1bcf96c301f
Author: Neels Hofmeyr <neels@hofmeyr.de>
Date:   Mon Sep 10 20:58:52 2018 +0200

Change-Id: Ia6946fae497319a894d4e664ac8642340620822e
2021-04-25 13:11:03 +02:00
Harald Welte a8d0c95710 gbproxy: Add mp_gbproxy_ip to check BVC FSM state
In docker-playground.git I272e43b9be8ba53d8a815e8ab099c939f63413a7
we introduce FSM state introspection and we need to add the CTRL
hostname here.

Change-Id: Idcd77353a661cfc1685ded64b5993ff63637addc
2021-04-09 10:40:54 +02:00
Oliver Smith 033c6ab1be */jenkins.sh: set -e after setting clean up trap
Abort the script and trigger the clean up script, whenever any of the
commands below to prepare the testsuite are failing. This saves time
with figuring out why suddenly all or most tests are failing, and avoids
running the entire testsuite on jenkins if it's obviously not going to
work.

Related: OS#3208
Change-Id: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7
2021-02-26 09:32:34 +01:00
Oliver Smith 12b961942a jenkins-common.sh: add common clean up trap
Add set_clean_up_trap() in jenkins-common.sh and run it at the beginning
of the jenkins.sh files. Move the common clean up code from the end of
every jenkins.sh file into clean_up_common(), which gets called by the
trap. Add a custom clean_up() function to those jenkins.sh files that
need additional clean up.

Replace explicit container stop commands (for containers attached to the
docker network) with one call to network_clean() in clean_up_common(). It
kills all containers attached to the docker network.

The motivation for this change is the upcoming optional build of initrd
and kernel during ttcn3-ggsn-test/jenkins.sh. After building these, a
short smoke test will be performed to make sure we can boot the kernel
and initrd, before continuing to run the entire testsuite against it. If
building or the smoke test fails, we must do a proper clean up of the
network and fix permissions.

Related: OS#3208
Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb
2021-02-26 09:32:06 +01:00
Pau Espin c63a131a60 Remove test backward compatibility with older osmo-* versions
These changes are no longer needed since master versions of whole CNI
have been recently released.

Related: OS#5042
Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739
2021-02-25 16:41:47 +01:00
Alexander Couzens 6e9f0dcc88 gbproxy: update sns configuration to use ip-sns-bind
With libosmocore commit the SNS configuration requires a ip-sns-bind vty configuration
to define the binds which should be use.

Related: SYS#5354
Depends-on: I9ab8092bf286e7d90e92f5702a5404425e959c84 (libosmocore)
Change-Id: I11541540468584fc17a18fa294da5c9813c28d64
2021-02-16 21:24:29 +01:00
Oliver Smith a2104231f2 ttcn3-gbproxy-test: remove broken merge logs cmd
Remove commands that result in a docker error message, like in
Ie6f8270230e1f0372b63d610b7868ea8719b18ad.

Change-Id: I9dec8d27c0f09cd8ee75255c8dfa314c70387ee9
2021-02-16 17:36:35 +00:00
Daniel Willmann 60f4d39500 gbproxy: Fix ip-sns VTY config
Change-Id: I8faa5d29bfffe50c76c1b907717144ff893126a3
Related: SYS#5354
Depends: Ida979f3b9daa5f7280a629441e4006a7635653b0 (libosmocore.git)
2021-02-10 13:57:31 +01:00
Daniel Willmann ba06957cf4 Add osmo-gbproxy-* container for osmo-gbproxy
Uses the new repo split off of osmo-sgsn

Related: OS#4992
Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1
2021-02-04 16:48:23 +01:00
Harald Welte 22b58d7ecc osmo-gbproxy: fix configuration
also, only change those values from their default values that are
neccessary to change; fall-back on the defaults whenever possible.

Change-Id: I5fba21ddf1854ed2b4f829785ab016dfa284456e
2021-01-21 20:54:18 +01:00
Harald Welte 98365d159f gbproxy: Use separate NS-VC for data + signaling
This follows the change implemented in osmo-ttcn3-hacks.git
If0e404bdf2c30a5e18748695608611be83f61109 to use data-only
and signalling-only NS-VCs on the SGSN side

Change-Id: I58f8a6d1c8d01551d366bd7d0dbfb892cce512ae
Requires: osmo-ttcn3-hacks.git If0e404bdf2c30a5e18748695608611be83f61109
Related: OS#4953
2021-01-21 09:43:20 +00:00
Harald Welte 9f53e36985 gbproxy,pcu,sgsn: Update config files
In upstream I9798e639b4bc8658482945970775b012b5840779 we introduce
two additional fields per NSVC (data_weight, signalling_weight). Make
sure those are specified everywhere.

Related: OS#4953
Requires: osmo-ttcn3-hacks.git I9798e639b4bc8658482945970775b012b5840779
Change-Id: Ic607b3edc3bf724a8b2dbd6be8c806002c229509
2021-01-21 09:43:20 +00:00
Harald Welte d12441a935 gbproxy: Update configs for SGSN poool with 2 SGSN, NRI, ...
Change-Id: Iac57e079d1375f186ddc200471bad1fa622c8860
2021-01-17 19:26:34 +01:00
Alexander Couzens 26003afcbc make osmo-gbproxy.cfg in ttcn3-gbproxy and ttcn3-gbproxy-fr to look similiar
Reduces human error when changing the configruation for both
cases.

Change-Id: I807589cc04f23d483695467320d34d79eaf5d290
2021-01-12 12:20:24 +01:00
Alexander Couzens 460e3070d3 ttcn3-gbproxy-test-fr: fix SNS ip address
Change-Id: Iba5aee47fb237884d4b0238b9cef4e2370e7ce09
2021-01-12 12:20:15 +01:00
Alexander Couzens 663c77203b gbproxy-fr: Enable IP-SNS towards SGSN
Change-Id: Id59cc404c355a3f494ad60be8d3a499b217084ec
2021-01-11 22:50:59 +01:00
Daniel Willmann 096f6a0030 ttcn3-gbproxy-test: Fix pcap capture with dumpcap
In commit 2279aac6 dumpcap is used to capture pcaps, but dumpcap fails
if the directory isn't writable for everyone.
Commit 62ac27779 only fixed this issue for frame relay, this simply
mirrors the change for ttcn3-gbproxy-test

Change-Id: I11dcf9efd0b06544a82e31dec03fe76e182fd0d3
Related: OS#4518 SYS#5115
2021-01-08 16:51:37 +01:00
Daniel Willmann da8c47ecb5 ttcn3-gbproxy-test: Fix osmo-gbproxy config
Change-Id: If6fd41d0cecb807f002d87e18d4b0d80f41977ef
2021-01-05 18:48:46 +01:00
Harald Welte a6fc3bf44c osmo-gbproxy: Change config file to comply with change in upstream
In osmo-sgsn Change-Id Id67592aa7712e5e04e7264b2fb8f26d57eb7e69e we
have changed the config file syntax and must adjust here accordingly.

Change-Id: I8770baac2298ee9a71d7428ea30600751783b4f9
Depends: osmo-sgsn Id67592aa7712e5e04e7264b2fb8f26d57eb7e69e
2020-12-30 00:15:25 +01:00
Harald Welte 62ac277796 gbproxy-test-fr: Avoid dumpcap failing to write to /data
Change-Id: I73dbdb4d85342e5fccd5ea4d9927f3244293d718
2020-12-11 18:11:52 +01:00
Harald Welte a10c26d6f7 ttcn3-gbproxy-test-fr: depend also on osmo-sgsn-master
osmo-gbproxy-master is derived from osmo-sgsn-mater, and the former
needs to be re-built to catch up with osmo-sgsn.git changes (Where
the osmo-gbproxy source code is located)

Change-Id: I8abc9f89d19d657403569b7705cd923342ff300b
2020-12-11 12:16:07 +01:00
Harald Welte 233d37ee88 ttcn3-gbproxy-test-fr: Fix hdlcnet device names
In Change-Id I80de01c96185c60fe2de7a8ffa9daed2669658e1 we introduced
the wrong hdlcnetX device names.  We must use each devoce only once,
rather than trying to use hdlcnet1..4 twice.

Change-Id: I56f75995fe94b46b0210de2a4f83e384b4e4ca4f
2020-12-09 19:28:51 +01:00
Harald Welte d3dacd4ad4 gbproxy-test-fr: Fix syntax error in config file
It's mp_enable_bss_load_sharing, not mp_enable_load_sharing

Change-Id: I0d2241e0d9e376f27d04721034b1e197901aa662
2020-12-09 12:02:39 +01:00
Harald Welte 5e299ecfea gbproxy: Enable test of load-sharing when running over FR
Change-Id: I2ce1f67dc8f45f7a62a923e45fb479c4c482eec9
Depends: osmo-ttcn3-hacks.git I96e8b6a1a69148f770476e87c920dc256c1d7379
Related: OS#4520
2020-12-08 08:37:53 +01:00
Harald Welte 01eb160c53 gbproxy: update ttcn3 configuration to reflect osmo-gbproxy.cfg
In Change-Id I80de01c96185c60fe2de7a8ffa9daed2669658e1 we updated
only the osmo-gbproxy.cfg, but noth the GBProxy_Tests.cfg for the
test suite, which of course won't work.

Change-Id: I35603dc76926d76e57993f7eab1354eea8d25dad
Related: SYS#5226
2020-12-08 08:37:53 +01:00
Daniel Willmann 2689304aa5 ttcn3-gbproxy-test-fr: Catch up with config changes
Change-Id: I80de01c96185c60fe2de7a8ffa9daed2669658e1
Related: SYS#5226
Depends: I698a932b3dc78c776e9350283109463bcdc40e6b (osmo-ttcn3-hacks)
2020-12-04 20:09:04 +01:00
Harald Welte b83c28fc34 Add ttcn3-gbproxy-test-fr for FR related testing
Testing FR support in osmo-gbproxy is a bit more complicated
as it involves the "hdlc" net-devices privded by the hdlc_fr.ko
kernel module.

So we need to
* run on a host with actual hdlc net-devices (e.g. dahdi_dyamic_loc)
* move those net-devices into the containers after starting them
* wait for the net-devices to appear in the containers before starting
  either gbproxy or the test suite

Change-Id: Id4b52877db53cb6e59f6d0d3f754aaae633949e8
2020-11-30 15:50:31 +01:00