Commit Graph

868 Commits

Author SHA1 Message Date
Pau Espin 19155245a4 bts_oc2g: Fix missing import remote
Change-Id: I318683b8dc6215f5bf863cfb1581e2c3bfa05621
2020-04-10 02:09:22 +02:00
Pau Espin ce82b038c7 pcu_{sysmo,oc2g}: Inherit from pcu abstract class
For some reason these classes were still not inheriting from the base
class (probably because it was added after they existed) and they
started failing after recent changes which presumed they where already
inheriting.

Change-Id: I88217baf490ec45373d0743585377ed2639a8cfd
2020-04-10 01:59:48 +02:00
Pau Espin 23e60e5b37 amarisoft_ue: Implement data plane
Use the ifup script to set up the netns + configure the tun device
created by lteue. Use it also as a hook to know when the UE is attached.
Since tun setup is done by arch-optimized lte-avx(2) binaries, we also
need to give capabilitites to them (instead of allowing inheritance of
caps in general in the setcap script).

Change-Id: I1e228b1296eac8e4cb183c2faa735b0468abe124
2020-04-08 15:16:52 +02:00
Pau Espin 80855498f1 utils/bin: Support passing several bin files to setcap helper scripts
Change-Id: Ifa43f895ae0796d086f35778263aaba07f2e1b7a
2020-04-08 15:16:10 +02:00
Pau Espin 6b8f5ae3d2 srs/amarisoft{ue,enb}: Fix b200 specific rf_dev_args
Commit 12ae6d79a5 switched the rf_dev_type
to be in lowercase but forgot to change these conditions.

Change-Id: I91d3877381b4e6343dc4aa0465e699341ed6648d
2020-04-07 18:51:59 +02:00
Andre Puschmann d97ab42462 amarisoft_ue: fix UHD support
the Amarisoft UE seems to be only working with UHD when the bandwidth
param is provided. It seems the set_bandwidth() API is used.

Change-Id: I3f20a5a8ca80c63374f0ad500fd2794e2dc45479
2020-04-07 18:38:21 +02:00
Pau Espin 69488f6d8a Move suites/ dir inside example/
example/paths.conf and documentation are updated accordingly.

Test suites should have been moved a long time ago, since the they are
user or setup-specific based on what needs to be tested.

Change-Id: I154b19979b545deba8b232b60172903f63fd9e28
2020-04-07 16:12:47 +00:00
Pau Espin 29b7132eb8 pcu: Enable 'egprs only' vty option if egprs requested
Change-Id: Idd0b5bf8769d693480268c0a0b89dbfd63779e48
2020-04-07 16:12:47 +00:00
Andre Puschmann a7f1983658 enb: add measurement modifier to scenario files
this commit adds basic support for configuring measurements in the
eNB config. It currently support A1, A2, and A3 events.
By default UE measurements are turned off and need to be enabled by
configuring an event with:

+mod-enb-meas-event@{name},{report_type},{value},{hysterisis},{time to trigger}

For example one can update the a2 and a3 event with:

+mod-enb-meas-event@a2,rsrq,-40,2,480+mod-enb-meas-event@a3,rsrp,6,1,512

Change-Id: Ia7657be2396886840570bc41645450a268b4cfff
2020-04-07 17:23:37 +02:00
Andre Puschmann 9a5be2c8fd amarisoftue.cfg.tmpl: fix UE bandwidth/rate config and power on automatically
Change-Id: I2d63055d0648a1758905fd277c20edaeec8f9b85
2020-04-07 15:09:24 +00:00
Pau Espin 65beb8f324 amarisoftUE: adding basic support for Amarisoft UE
Change-Id: Idda0d3a040663969dd71781814198b47fff7daf3
2020-04-07 15:09:24 +00:00
Pau Espin 3edc29cab1 templates: Improve cs7 config in osmo-{bsc,msc}
Change-Id: I0aa0057c85e606d45e67d01b818db7549033bdbd
2020-04-06 17:52:22 +02:00
Pau Espin ba213a3067 pcu: Improve logging and gsmtap
Change-Id: I506a39b114eed55a185d329cea5e9d6ba379a2ae
2020-04-06 17:33:33 +02:00
Pau Espin 3f2a5e5b41 contrib: build amarisoft: Set trx_zmq.so RPATH to point to copied dependency libsrslte_rf.so
In the ENB case it's not really required since osmo-gsm-tester makes use
of LD_LIBRARY_PATH. However, since the UE is potentially run with
capabilitites to create tunnels and alike, LD_LIBRARY_PATH cannot be
used and lteue will fail to load trx_zmq.so (because it cannot find its
dependency libsrslte_rf.so).

Change-Id: Ifcbc6ed1c4c465b4cfab4c5689cde44624095f29
2020-04-06 16:32:13 +02:00
Andre Puschmann 65e769f034 srsue.conf.tmpl: fix the configuration of UE params for carrier aggregation
the num_carriers is parsed as a string in the conf dict and therefore
needs to converted to int before matching

also changed the num_carriers to be of type UINT

Change-Id: I1386812d32e1181ba666720bbb875bf9bbce0f51
2020-04-06 13:44:45 +00:00
Andre Puschmann a0e69aa698 amarisoft_enb: add handling of num_cells modifier
the num_cells modifier allows to create multiple cells in a single enb
both cells are by default configured for CA

Change-Id: Ie9f16ce06ee56002c01097f2d338278f09ea4337
2020-04-06 13:44:45 +00:00
Andre Puschmann a70f05cd9a amarisoft_rf_driver_temp: fix tx time offset for ZMQ driver
Change-Id: Icee282837e62e02a17b93efba4c22756efa2a5d3
2020-04-06 13:44:45 +00:00
Pau Espin d45a29e694 amarisoft_enb: Support zmq rf_driver
Change-Id: I958834d99584e33f632b839a0bd0acccc2379049
2020-04-06 13:44:45 +00:00
Pau Espin 04ad3b5fb4 epc: Replace rlc_drb_mode with qci attribute
Change-Id: I21b7d7009f9b0df8ec4f59189a65cfc26f164f04
2020-04-06 13:17:28 +00:00
Pau Espin 8bf740a452 suites/gprs/: beautify output result of ping tests
Print ping output at the end and replace the whole test stdout report
with ping execution.

Change-Id: I90001ddc6bc1145ac9d115aee762f4f3500e8dc8
2020-04-06 14:07:04 +02:00
Pau Espin eae9c90d17 Add modem resource features attributes: 2g, 3g, 4g
This allows selecting modem by supported network type. It will allow
using 4G modems with type different than srsue in 4g suite in the future.

Change-Id: I38bcf6abf789f52c3ed0bee7911567fa872e2491
2020-04-03 18:56:01 +02:00
Pau Espin 64ad952de1 contrib/jenkins-build-amarisoft.sh: Fix typo copying trx_uhd.so to UE
Change-Id: I0c9b83b9adf0548e78363462744644bc528c2d29
2020-04-03 18:17:09 +02:00
Pau Espin a560ea7b85 contrib/jenkins-build-amarisoft.sh: Make build of amarisoft trx_zmq.so optional
That module is only available so far in a private repository, so allow
still other amarisof tusers to build the bundles with UHD support.

Change-Id: I361f179c8e7f379173fa9109028e139fc4c8c251
2020-04-03 18:17:09 +02:00
Pau Espin 214f15e5ee amarisoft_enb: Add missing default values in constructor
Change-Id: I61c04df14468b38cfe4afaaeb5404367838ff0a9
2020-04-03 16:56:12 +02:00
Pau Espin 17253af1e9 Introduce contrib/jenkins-build-amarisoft.sh
Prepares inst tgz archives to be consumed by osmo-gsm-tester from
Amarisoft prebuilt binaries.

Change-Id: I372606fc5ff9f6bb3ef848f2fe229b83382ddc09
2020-04-03 15:49:00 +02:00
Pau Espin 76b2c2a108 srs_{ue,enb}: Add modifier to pass arbitrary cmd line arguments
Change-Id: Ie438c8aa9992dbc61b2133473a83d565cf5c7056
2020-04-01 20:06:33 +02:00
Pau Espin 20a49112e9 config.py: Allow escaping commas in parametrized scenario names
comma character ',' is used in the command line to split between
parameters, which means a parameter value itself couldn't contain it.
This commit allows passing a comma inside a character value by escaping
it with '\,'.

Change-Id: Ic0bd9a029137a59e8c4a32b807eba7a64fcfa51f
2020-04-01 20:06:33 +02:00
Pau Espin 12ae6d79a5 srs{enb,ue}: Use lowcase UHD as rf_type string
Older versions of srsLTe.git required passing UHD in caps to the conf
file, but that's not the case anymore. Let's use lowcase then.

Change-Id: If8a289ba110229d31b62b0d3adc1ae97324e6d27
2020-04-01 18:06:17 +00:00
Andre Puschmann 4d35ea2b33 srsenb_rr.conf.temp: patch scheduler variables for 6 PRB cells
Change-Id: Ifdab42da8184cdf8367c5be1639a0faea3e68db1
2020-04-01 15:35:36 +02:00
Andre Puschmann 2dcc4312a0 iperf3: add config to adjust the duration of the iperf run
the time is passed as a string param and is then converted
into seconds when literals "h" or "m" are found.
So it would accept 2m and would convert it to 120s, for example.

Example:

+cfg-iperf3-time@15+

Change-Id: Iff28816f83670751e9e91de31ec59b1b0ad8fc0d
2020-04-01 15:35:03 +02:00
Pau Espin c04528cb1f Make amarisoft license server optional
* Since license_server_addr logic is generic among all amarisoft
  software, let's move it to its own config category "amarisoft", which
  all amarisoft classes (amarisoft_{enb,epc}.py as of now) will import
  during configure().
* The license server is disabled by default (value 0.0.0.0) since the
  usual case is to have a license in the local system.
* the license server can be enabled using scenario
  cfg-amarisoft-license@A.B.C.D where A.B.C.D is the address to use.

Change-Id: Id5456ad9497e91370857b80ff9a389111d3611ff
2020-04-01 15:22:14 +02:00
Andre Puschmann 7225d52e39 srs_{ue,enb}: change UHD stream args and buffer size as function of cell width for B2XX
Change-Id: I2de0526ee9bd2f7bb75c7d529b3f52d75117c5cc
2020-04-01 14:38:06 +02:00
Pau Espin da2e31f929 Introduce support for AmarisoftEPC
* A new abstract generic base class EPC is created
* srsEPC and AmarisoftEPC inherit from that class
* options are loaded from defaults.conf in cascade. First generic "epc",
  afterwards the specific enb type.
* A new scenario is added to select the EPC type to use. srsEPC is the
  default unless stated by an scenario.
* AmarisoftEPC delegates setup of the tun IP address to an "ifup"
  script. As a result, since we run without root permissions (ony with
  CAP_NET_ADMIN), the ifup script itself is unablet o set the IP
  address. To solve this, we introduce a new osmo-gsm-tester helper
  script which must be installed in the slave node which can be called
  through sudo to increase privileges to do so.

With this commit, I can already get srsUE<->amarisoftENB<->amarisoftEPC
to pass ping and iperf3 4g tests.

Change-Id: Ia50ea6a74b63b2d688c8d683aea11416ad40a6d3
2020-03-31 19:18:18 +02:00
Pau Espin 55e278c758 amarisoft_enb: Drop unused lib variable
Change-Id: Iea3e77a4b9f25f2781f617cd4bfd0ba4b34c709e
2020-03-31 13:35:48 +02:00
Pau Espin e44e76a787 {srs,amarisoft}enb:Move shared code to parent generic class eNodeB
Change-Id: Ica0f1d4179a905d6dfc77d3e8eb08ac6cd5c3d2e
2020-03-31 12:35:19 +02:00
Pau Espin 9aa932fd11 srsue: start_locally(): Fix missing class name in attribute access
Change-Id: Iab4196b12ee12a06ba2129053f2291c1e4c284ff
2020-03-31 12:03:38 +02:00
Pau Espin f4cce26173 srsenb: No need to generates values dict for every template file
Let's only do all the dictionary processing once and not for each
template file.

Change-Id: I4684d26375fce1e2ae28d3eccdc4f607fa5411a9
2020-03-31 10:49:49 +02:00
Pau Espin 874130510d srsenb: start_locally(): Fix missing class name in attribute access
Change-Id: I5e11dc9c3c0dcf4808a3ad67fe96580480fe47d1
2020-03-31 10:46:18 +02:00
Pau Espin 786a6bcd20 Introduce initial Amarisoft ENB support
* object class expects the amarisoft software to be placed in directory
  provided by env var AMARISOFT_PATH_ENB. On local runs, it will run the
  software from there. On remote runs it will copy over that directory to
  the slave.
* Configuration provided works with 6 PRBs, but probably won't work for
  other values (yet).
* ZMQ support not yet available, only UHD.

One can select the Amarisoft ENB by declaring it in resources.conf:
"""
- label: AmarisoftENB-B200
  type: amarisoftenb
  rf_dev_type: uhd
  rf_dev_args: "type=b200,serial=317B9FE,recv_frame_size=9232,send_frame_size=9232"
  remote_user: jenkins
  addr: 10.12.1.206
"""

And running:
"""
$ export AMARISOFT_PATH_ENB=/path/to/binaries
$ osmo-gsm-tester.py ... -s 4g:amarisoftenb-rftype@uhd+srsue-rftype@UHD+mod-enb-nprb@6 -t ping
"""

Change-Id: I1ddf4962ea6438ad977382ab201b724028ca46b3
2020-03-31 08:22:18 +00:00
Andre Puschmann 3c207529de srs_enb: enable console trace, use RemoteProcess class and fix params
In order for the console trace to work over SSH this commit
switches to use the default RemoteProcess class. Note that srsENB
now correctly handles the SIGHUP signal.

The commit also remove a few unneeded params of the eNB.

Change-Id: If5af43effa9145b6764a32557a20a2e1760f0486
2020-03-30 21:31:35 +00:00
Andre Puschmann 793260d0f6 defaults.conf: set num_carriers default value
Change-Id: Ibe94fada0a40c499dd516408756c4ef7988ccec5
2020-03-24 21:21:16 +01:00
Andre Puschmann 54f25cabc5 srs_ue: remove hard-coded num phy thread param
Change-Id: Ia4fac188ecbe6aba393a68ec0291b51cd1441029
2020-03-24 17:33:55 +01:00
Andre Puschmann 4ae614dbef srs_enb: remove num_cells getter
Change-Id: Ic5c45bb17440d2ee241840591baf02930a0b3470
2020-03-24 16:40:29 +01:00
Andre Puschmann a0782d5df9 srs_enb: remove unneeded enb parameters
Change-Id: I1f2e18c6552fc4a6e3a68d75a85744fadf26aacb
2020-03-24 16:40:10 +01:00
Andre Puschmann c2c8221c12 srs_enb: enable console trace, use RemoteProcess class
In order for the console trace to work over SSH this commit
switches to use the default RemoteProcess class. Note that srsENB
now correctly handles the SIGHUP signal.

Change-Id: I26391eb8409e14b34987e0b338e10613fa157e06
2020-03-24 16:39:35 +01:00
Andre Puschmann 3ffea80ae8 srs_{enb,ue}: add secondary cell and set dl/ul freq in eNB/UE config accordingly
Change-Id: I3730856003fffda4f3c3f9e835d62ddc312c4c31
2020-03-24 14:30:19 +01:00
Andre Puschmann d61613ac80 srs_ue: adding num_carriers paramter and corresponding modifier
this allows to configure a UE to support multiple carriers

Change-Id: I4fa0a0c6e52efb17aa0b07e55abb5470d8028e8b
2020-03-24 14:30:19 +01:00
Andre Puschmann 82b88901f3 srs_enb: add num_cells param to srsENB
this is needed to support the upcoming multi-cell feature in srsENB.
It's required for carrier aggregation (CA) but can also
be used for (currently) two independent 4G cells.

This commit adds baseline support for the parameter. Upcoming
commits will add hooks to configure the cell's EARFCN, etc.

Change-Id: I6d1658bf820163aee03b64b0f4ac68046c243f37
2020-03-24 14:30:19 +01:00
Andre Puschmann 22ec00a01f ms: add optional param to specify fixed APN IP address assigned to a MS
this allows to specify a fixed APN address for each subscriber in the
HLR. If the param is not provided in the resources config, the default
allocation type is used, which is to dynamically allocate an IP in the
supported range.

Change-Id: Ie6fcd7987dc7bc62a686bee3a10c67e3dd813419
2020-03-24 14:30:19 +01:00
Andre Puschmann 35234f2e21 srs_ue: add scenario for airplane mode simulation in srsUE
Change-Id: I5db2ff325ce4b4236c1ceec0831dd7420d52dedb
2020-03-23 21:00:36 +01:00