Commit Graph

183 Commits

Author SHA1 Message Date
Neels Hofmeyr b5a3d6732a cfg templates: log level and source basename last, log no category-hex
Makes for saner log output in stderr files.

Change-Id: I2755beffd18d6779367c04e4aaaed119d66eb3be
2020-12-10 23:03:27 +00:00
Andre Puschmann 65a9e741ad ms_amarisoft: fix various regressions
this patch fixes some regressions in the Amarisoft UE class,
the config template, etc. that have been undetected bc we never
executed tests with it.

Change-Id: I397e675a4018acf3372a3b7e29fd864703b2b919
2020-11-23 12:33:52 +01:00
Andre Puschmann 3166b6353e enb: add QAM64 support for UL
* add new UE feature
* enable in srsue.conf.templ
* add new table for maximum rates
* add config scenario to enable SIB option for QAM64

Change-Id: I6ac2c9989a761e91b93d76c2507f55f0140b202d
2020-11-20 11:50:43 +01:00
Nils Fürste 1e736ea46e {enb,ms}_srs: Add DL QAM-256 support
Due to the integration of DL-QAM256 another table for DL max rates is needed.
Therefore, I added the parameter 'qam256' to the feature list in the resource.cfg.

The patch also enables the correct UE settings in the config file.

Change-Id: I2d34395449cdcfb31db66ea887d9adbee551e757
2020-11-11 12:47:47 +01:00
Pau Espin ef7256a138 enb: Support cells from different ENBs in ncell_list
Change-Id: I1242c56ff42caea06e7f96317def82064fd11325
2020-11-09 18:54:26 +01:00
Andre Puschmann a7fd39448c srsenb_rr.conf: add PCI, TAC and root_seq_idx as cell param
make sure to insert cell specific TAC, PCI and root seq ind
into cell config and do not depend on cell index for a particular
enb. This causes issues in multi-eNB setups.

Change-Id: I6642128a449a0562dd23f7fa393ff48ae2503006
2020-11-09 13:10:21 +01:00
Andre Puschmann d0682bad0f enb: add basic TDD config option
this patch adds the basic notion of FDD and TDD duplexing modes
to the eNB object. So far we've always assume FDD.

Since only Amarisoft eNB supports TDD, the required config
template changes, etc. are only applied there.

The patch also adds a scenario to enable the default TDD config.

Change-Id: I37216b5bfdf527d221913283b6c41d3c8fd6b500
2020-10-16 14:17:36 +00:00
Pau Espin 680ba03038 sysmocom: Introduce suite to test emergency calls
Change-Id: I2e851c94311ded0abd4ff072b8cc72316d972750
2020-10-15 15:50:48 +00:00
Pau Espin d0e8601ace templates/osmo-bts-trx: Increase osmo-trx rx-gain
Otherwise osmo-trx with a B200 seems to be having issues receiving some
data from the MS otherwise, making "sms" test fail. In general LU works
fine, and when MS sends the SMS, CM Service Request+Accept also works
fine, but then the BTS never sees the CP-DATA afterwards probably due to
MS power loop.

Change-Id: I5f7e3d22a142521ab83db81635ded252dabcf111
2020-10-14 10:59:55 +00:00
Pau Espin 10c64fee41 srsenb: Activate handover in config file
This is needed to test handover features.

Change-Id: Ifa8462f4d1e183e73b059a7af37bcdf7b3e247f6
2020-10-13 09:55:45 +02:00
Pau Espin 9ff1eabdb1 srsenb: Fix ECI in handover cell list
So far we only support setting cell IDs from same ENB. Support for
handover to other ENB will come later, probably by adding some API to be
called during the test to add own's CellID's to other ENB's config.t

Change-Id: I1780bda130cde0faab15d4032117e0aa2b9c5dbe
2020-10-12 20:58:01 +02:00
Andre Puschmann b5f0444021 srs{enb,ue}: add rf_dev_sync option to config templates
pass-through the option so they can be used in templates

just concatenate with rf_dev_args for srsLTE eNB/UE, arguments
parsing will handle them

Change-Id: I3818026c159780f29968888f547163cdf730afad
2020-10-12 17:27:25 +02:00
Andre Puschmann c489f190be enb_amarisoft: add rf_dev_sync option to specify the sync type
this allows to specify "external_clock" for example to use
the external REF input of an USRP

Change-Id: Ie066993440840cbd2c18e8f0c0c577b92ac7092d
2020-10-12 16:47:11 +02:00
Andre Puschmann e3a1910915 ms_srs: add freq_offset as resource param
this allows to specify a freq tuning offset in Hz in the MS resource config

Change-Id: Iab726edd27e890d2c2dddbea91afe80d8a5068aa
2020-10-06 09:52:46 +02:00
Andre Puschmann a9bbbd64e4 amarisoft_enb.cfg.tmpl: seperate PRACH root sequences for cells
seperate the root sequence index for each cell a bit more to
avoid detection of a single PRACH in both cells

Change-Id: I5aea1a27939c880944779c282e902465ab513715
2020-10-05 13:49:12 +02:00
Andre Puschmann 51fa941994 amarisoft_enb.cfg.tmpl: increas threshold for failed UL retransmissions
this avoids the eNB from releasing the UE too early if the UL channel
stays very bad for a longer time but many PUSCH are scheduled

Change-Id: Ib82616e920eecc70fbded12433e54bd90ae1bcd4
2020-10-05 13:49:12 +02:00
Andre Puschmann 0908ceb0eb amarisoft_enb.cfg.tmpl: use default tac 0007
this is the tac used in srsepc.

Change-Id: I1de432a52281ea210abae5648239fd89ba5eb4ce
2020-10-05 13:49:12 +02:00
Andre Puschmann dda20e27e9 amarisoft_sib23.asn.tmpl: set p-b value in SIB23 depending on TM
this fixes a wrong p-b value used for TM2 and above

Change-Id: I89c557c456f3330f491cc66bc4931a0234bf6e02
2020-10-05 13:49:12 +02:00
Andre Puschmann eb991f5f5a srsenb_rr.conf.tmpl: set TAC for cells to 0x0007
this is the default TAC used in the EPC. A recent EPC patch
will reject the S1 setup request if the TACs don't match

Change-Id: I94fdb96631ce3ae35a1b2a9f90d1101df9161233
2020-10-05 13:49:12 +02:00
Andre Puschmann 52fb33cd9c srsenb_rr.conf.example: comment CQI and SR specific subframes
this enables auto-selection by eNB which has been implemented
recently

Change-Id: I17e16c5c47a2fba5c2955a1c3e6e0e16f83bab72
2020-10-05 13:49:12 +02:00
Andre Puschmann 4db88de2fa enb_srs: expose DL AWGN channel modifier for srsENB
we've added the modifier to configure Amarisoft eNB channel
model. This patch enables it for srsENB.

Change-Id: I30e65d0431b2d2792986128287caf8b23a22b2c1
2020-09-20 10:01:17 +00:00
Pau Espin 1b99ad67d2 osmo-trx: Set more restrictive logging levels to avoid sporadic high load on stderr
Change-Id: I9dca89027d9015b946440363eae5f7bd3e082268
2020-09-18 13:28:20 +02:00
Pau Espin a7a89bdd32 bts-trx: Disable power-ramp
Power ramping features were implemented recently for osmo-bts-trx. We
don't want to enable them because it makes phones take longer (if even
at all) to find the network.

Change-Id: I35e2f560b28eddef886ad3b2f8ffb4ff79be77da
2020-09-18 12:43:25 +02:00
Andre Puschmann 0cfc08436d enb: expose RRC inactivity timer
allow the user to specifiy the RRC inactiviy timer used in the eNB.
set the default value to 20s

Change-Id: I6a264b8dee893b883d40a48831cbb47eb15e1e7b
2020-08-27 15:37:54 +02:00
Andre Puschmann 736c30b4dc srsenb_rr.conf.tmpl: reduce PUCCH PRBs for SR and CQI to 1
this gives higher UL throughput because less resources are reserved for
SR/CQI. For more users we may have to make the value configurable again.

Change-Id: If6c313a1deafffda26e9effeb807ca71064c46bc
2020-08-27 15:37:54 +02:00
Andre Puschmann a7b21a888b srs{ue,enb}.conf.tmpl: remove restriction of PHY threads for ZMQ
we now support any number of PHY threads also with ZMQ operation

Change-Id: I31abfce742f757179fbfe4099cd0a934db4e63d7
2020-08-27 15:37:54 +02:00
Andre Puschmann 6039c1ce4f srsenb_drb.conf.tmpl: add QCI8 config
add QCI config with RLC UM and PDCP SDU discard set to infinity

Change-Id: If946f569f7bbb98fc754f30ff5627fa5ca4afe68
2020-07-16 09:30:44 +02:00
Andre Puschmann dbe4bb3cb1 amarisoft_enb.cfg.tmpl: enable eNB PCAP if configured
enable PCAP output in eNB config

Change-Id: I8482315ce854c5b21a90b77de55dbb82f3049bcd
2020-07-15 14:43:51 +02:00
Andre Puschmann bafedff963 amarisoft_drb: adapt QCI 8 config for ZMQ operation
we use the otherwise unused QCI 8 as a slightly modified
version of QCI 7 (default RLC UM) with a PDCP discard
timer set to infinity to avoid dropping PDCP SDUs if
packets arive faster than can be processed in the DL

Change-Id: I06b7b583701f90827fba36564f969b5d58c9b9ad
2020-07-15 14:29:23 +02:00
Andre Puschmann 5c4c052d81 amarisoft_{mme,enb}: make sure mcc/mnc are zero padded
same as for srsEPC this is also required for Amarisoft MME and eNB to support, i.e. 001/01

Note that the 3 digit MNC isn't covered by this.

Change-Id: I80a84e01ec9530c285634452d7c18c17bdd595ce
2020-07-15 10:48:18 +02:00
Pau Espin 0f7f265114 4G: Add milenage support
Change-Id: I4c1fb9bfec9927f2bfa29e6b27959323838f59e5
2020-07-13 18:33:53 +02:00
Andre Puschmann 1dddb7b264 srsepc.conf.tmpl: zero-pad mnc and mcc in config
srsEPC expect zero-padding MNC/MCC in config file. However,
001 and mcc will end up as 1 in the rendered template.
Therefore, they need to be formatted correctly.

Change-Id: Ie63cd1b15b961e493a6dcbd7e5a4fbabe0bb6f33
2020-07-09 13:43:00 +00:00
Andre Puschmann 59c83a2159 srsue.conf.tmpl: use UE cat 8 whenever more than one carrier is configured
Change-Id: Id96827960cac436b8ac363e28c2b0ab7b6acf57f
2020-07-09 13:43:00 +00:00
Andre Puschmann 955249d39d enb_amarisoft: add option to enable and configure DL AWGN channel
expose option to enable DL AWGN noise and make SNR configurable

Change-Id: Ib248e87e5abd855d4c974eab42ec40828c6e1d40
2020-07-09 13:43:00 +00:00
Andre Puschmann 9df7cd0a12 srsue.conf.tmpl: add default EARFCNs for 4xCA config
Change-Id: I553241735b5e204cb4be03936b90628d156c418c
2020-07-01 10:52:09 +02:00
Andre Puschmann 0694c30c8e amarisoft_enb: update lteenb default parameter for PDCCH, SRS and CQI
those configs should provide better HO performance, PDDCH format is selected automatically

Change-Id: I62a4240ac062d793ae5e197f852ea09eb4fe4ae9
2020-07-01 10:52:09 +02:00
Andre Puschmann 82ced3fb1d {enb,epc,ms}_srs: expose log.all_level parameter
expose paramter to set log level, use warning as default

Change-Id: I4e77e5351399aefef47a309c82b8805e2c6022c5
2020-06-23 16:41:00 +02:00
Andre Puschmann d5a58d0d61 ltemme: add two on-demand dedicated bearer for TOS 0xb8 and 0x60
two bearer of QCI 1 and 2

Change-Id: I857bed943b0184540b0a8ac696e7ebddd693be87
2020-06-23 16:41:00 +02:00
Andre Puschmann 62e887d9b4 amarisoft_enb.cfg.tmpl: expose log options
this allows to alter the log options through a modifier

Change-Id: Iecd24afe6b242fbebc8463c9e1fa1c3b60b27d01
2020-06-17 08:54:07 +00:00
Andre Puschmann 393cd61382 amarisoft_drb.cfg.tmpl: adjust default values for QCI 1 and 2
use more realistic values for QCI 1 and 2 bearers to prepare
QoS operation

Change-Id: Ibfffde9ecccd473f22e816bd47e197fbe24b0ded
2020-06-15 15:09:55 +00:00
Andre Puschmann 7c759d9a89 srsenb_sib.conf.tmpl: add default SIB3
if SIB3 isn't transmitted, the UE won't do HO and cell reselection

Change-Id: I329a59d9d0fa3b25bc00b760a455eadbe0b7220f
2020-06-11 20:37:17 +02:00
Pau Espin 3b49d46464 amarisoft_enb: Properly set S1AP SCTP bind ip addr
Change-Id: I8e2b8609cb198c6d5e293cffaa0a9de99600f06d
2020-06-11 13:18:20 +02:00
Andre Puschmann 8eeea7f991 srsenb.conf.tmpl: reduce RRC inactivity timer to 5s
the default value of 60s is too long to trigger errors in the handling
of this timer. So a 5s timer is more likely to reveal potential issues
during the test execution

Change-Id: Id7a6739487c7875c4f26a47d05978c9ea9f33873
2020-06-10 10:12:49 +02:00
Andre Puschmann f7915a8509 srsenb_sib.conf.tmpl: increase default T311 value to 10s
this matches the default of Amarisoft eNB so tests can use the same values

Change-Id: Ic81fb6428751305d8b37a25bddb0d018ca6f51f6
2020-06-10 10:12:49 +02:00
Andre Puschmann 98ad77e4a0 srsenb_sib.conf_tmpl: fix whitespaces
Change-Id: Ifbd3c8bd97d7e2d3f165e88f3358dce9e7e33067
2020-06-10 10:12:49 +02:00
Andre Puschmann 487d1ef142 amarisoft_enb: fix RI config
this cause all MIMO modes to fail because RI reporting was disabled

Change-Id: Ic25233cf7feb4ded8b3d0f440191cc958d8bc0ec
2020-06-10 08:12:10 +00:00
Andre Puschmann 549826d424 enb: add rf_port to cell list param
we need to make the rf_port a param in the cell list because for CA with
two cells on different EARFNCs, the RF port is different

for two cells without CA on the same EARFCN the RF port is the same

so we need to be able to configure it

Change-Id: I32e83cc34811588757104c5ce1cae7277402addd
2020-05-06 20:21:18 +00:00
Andre Puschmann 96b17df282 srsenb_rr.conf.tmpl: extend CQI and SR subframe scheduling
this fixes an issues when allocating CQI resources for multiple carriers
or multiple users

Change-Id: I8b9345502003da2f5b6841a98b77375656e84d8c
2020-04-21 15:05:51 +02:00
Andre Puschmann bf40f8c8bf amarisoft_enb: use two antenna ports for TM > 1
Change-Id: Ia241f96341780760d482d389097659b0f7b897e8
2020-04-21 15:05:51 +02:00
Pau Espin d6c792536f amarisoftENB: Fix running with num_cells=2
The B200 device being used in the physical setup doesn't support several
RF ports, so let's hardcode it to 0 for now.

Change-Id: Id4c31be2bd0c75f469e2293ade011c7b7ceedb1c
2020-04-20 18:21:11 +02:00