Change in osmo-gsm-tester[master]: srs_enb: Make num_prb a config parameter

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

pespin gerrit-no-reply at lists.osmocom.org
Thu Feb 27 14:07:30 UTC 2020


pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17286 )


Change subject: srs_enb: Make num_prb a config parameter
......................................................................

srs_enb: Make num_prb a config parameter

Change-Id: I336e71f53556596050cf3eb55a7810a009dbf7a8
---
M example/defaults.conf
M src/osmo_gsm_tester/srs_enb.py
M src/osmo_gsm_tester/templates/srsenb.conf.tmpl
3 files changed, 12 insertions(+), 9 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/86/17286/1

diff --git a/example/defaults.conf b/example/defaults.conf
index f32e1f5..0bff86a 100644
--- a/example/defaults.conf
+++ b/example/defaults.conf
@@ -100,3 +100,4 @@
 srsenb:
   mcc: 901
   mnc: 70
+  num_prb: 100
diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py
index 6fb186f..85180e4 100644
--- a/src/osmo_gsm_tester/srs_enb.py
+++ b/src/osmo_gsm_tester/srs_enb.py
@@ -57,11 +57,6 @@
         self.remote_config_drb_file = None
         self.remote_log_file = None
         self.suite_run = suite_run
-        self.nof_prb=100
-        if self.nof_prb == 75:
-          self.base_srate=15.36e6
-        else:
-          self.base_srate=23.04e6
         self.remote_user = conf.get('remote_user', None)
         if not rf_type_valid(conf.get('rf_dev_type', None)):
             raise log.Error('Invalid rf_dev_type=%s' % conf.get('rf_dev_type', None))
@@ -125,7 +120,6 @@
                 '--enb_files.drb_config=' + self.remote_config_drb_file,
                 '--expert.nof_phy_threads=1',
                 '--expert.rrc_inactivity_timer=1500',
-                '--enb.n_prb=' + str(self.nof_prb),
                 '--log.filename=' + self.remote_log_file)
 
         self.process = self.rem_host.RemoteProcessFixIgnoreSIGHUP(srsENB.BINFILE, util.Dir(srsENB.REMOTE_DIR), args, remote_env=remote_env)
@@ -151,7 +145,6 @@
                 '--enb_files.drb_config=' + os.path.abspath(self.config_drb_file),
                 '--expert.nof_phy_threads=1',
                 '--expert.rrc_inactivity_timer=1500',
-                '--enb.n_prb=' + str(self.nof_prb),
                 '--log.filename=' + self.log_file)
 
         self.process = process.Process(self.name(), self.run_dir, args, env=env)
@@ -168,7 +161,16 @@
 
         # We need to set some specific variables programatically here to match IP addresses:
         if self._conf.get('rf_dev_type') == 'zmq':
-            config.overlay(values, dict(enb=dict(rf_dev_args='fail_on_disconnect=true,tx_port=tcp://'+ self.addr() +':2000,rx_port=tcp://'+ self.ue.addr() +':2001,id=enb,base_srate='+ str(self.base_srate))))
+            num_prb = values['enb'].get('num_prb', None)
+            assert num_prb
+            if num_prb == 75:
+              base_srate=15.36e6
+            else:
+              base_srate=23.04e6
+            rf_dev_args = 'fail_on_disconnect=true,tx_port=tcp://' + self.addr() \
+                        + ':2000,rx_port=tcp://'+ self.ue.addr() \
+                        + ':2001,id=enb,base_srate='+ str(base_srate)
+            config.overlay(values, dict(enb=dict(rf_dev_args=rf_dev_args)))
 
         self.dbg('srsENB ' + filename + ':\n' + pprint.pformat(values))
 
diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
index 2006832..f040156 100644
--- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
@@ -28,7 +28,7 @@
 mme_addr = ${enb.mme_addr}
 gtp_bind_addr = ${enb.addr}
 s1c_bind_addr = ${enb.addr}
-n_prb = 50
+n_prb = ${enb.num_prb}
 #tm = 4
 #nof_ports = 2
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17286
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I336e71f53556596050cf3eb55a7810a009dbf7a8
Gerrit-Change-Number: 17286
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200227/fac34680/attachment.htm>


More information about the gerrit-log mailing list