srs_{enb,ue}: add secondary cell and set dl/ul freq in eNB/UE config accordingly
Change-Id: I3730856003fffda4f3c3f9e835d62ddc312c4c31
diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py
index c4c72bc..ae9b12f 100644
--- a/src/osmo_gsm_tester/srs_enb.py
+++ b/src/osmo_gsm_tester/srs_enb.py
@@ -213,6 +213,7 @@
+ ',tx_port2=tcp://' + self.addr() + ':2002' \
+ ',rx_port=tcp://' + self.ue.addr() + ':2001' \
+ ',rx_port2=tcp://' + self.ue.addr() + ':2003' \
+ + ',tx_freq=2630e6,rx_freq=2510e6,tx_freq2=2650e6,rx_freq2=2530e6' \
+ ',id=enb,base_srate=' + str(base_srate)
config.overlay(values, dict(enb=dict(rf_dev_args=rf_dev_args)))
diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py
index fdcd6dd..3764496 100644
--- a/src/osmo_gsm_tester/srs_ue.py
+++ b/src/osmo_gsm_tester/srs_ue.py
@@ -234,6 +234,7 @@
+ ',tx_port2=tcp://' + self.addr() + ':2003' \
+ ',rx_port=tcp://' + self.enb.addr() + ':2000' \
+ ',rx_port2=tcp://' + self.enb.addr() + ':2002' \
+ + ',tx_freq=2510e6,rx_freq=2630e6,tx_freq2=2530e6,rx_freq2=2650e6' \
+ ',id=ue,base_srate='+ str(base_srate)
)))
diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
index d16f9d1..954b63f 100644
--- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
@@ -63,7 +63,6 @@
# Default "auto". B210 USRP: 400 us, bladeRF: 0 us.
#####################################################################
[rf]
-dl_earfcn = 3400
tx_gain = 80
rx_gain = 40
diff --git a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
index 2d31c3d..cd9f4aa 100644
--- a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
@@ -58,8 +58,8 @@
tac = 0x0001;
pci = 1;
// root_seq_idx = 204;
- dl_earfcn = 3400;
- //ul_earfcn = 21400;
+ dl_earfcn = 2850;
+ //ul_earfcn = 20850;
ho_active = false;
// CA cells
@@ -94,8 +94,8 @@
tac = 0x0002;
pci = 2;
root_seq_idx = 205;
- dl_earfcn = 2910;
- ul_earfcn = 20910;
+ dl_earfcn = 3050;
+ //ul_earfcn = 21050;
ho_active = false;
// CA cells