Change in osmo-gsm-tester[master]: srsenb: No need to generates values dict for every template file

[pespin]

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


Change subject: srsenb: No need to generates values dict for every template file
......................................................................

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
---
M src/osmo_gsm_tester/srs_enb.py
1 file changed, 12 insertions(+), 14 deletions(-)



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

diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py
index 1df8074..d4bdcaa 100644
--- a/src/osmo_gsm_tester/srs_enb.py
+++ b/src/osmo_gsm_tester/srs_enb.py
@@ -181,9 +181,15 @@
         self.suite_run.remember_to_stop(self.process)
         self.process.launch()
 
-    def gen_conf_file(self, path, filename):
-        self.dbg(config_file=path)
+    def gen_conf_file(self, path, filename, values):
+        self.dbg('srsENB ' + filename + ':\n' + pprint.pformat(values))
 
+        with open(path, 'w') as f:
+            r = template.render(filename, values)
+            self.dbg(r)
+            f.write(r)
+
+    def configure(self):
         values = dict(enb=config.get_defaults('enb'))
         config.overlay(values, dict(enb=config.get_defaults('srsenb')))
         config.overlay(values, dict(enb=self.suite_run.config().get('enb', {})))
@@ -214,14 +220,6 @@
                         + ',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))
-
-        with open(path, 'w') as f:
-            r = template.render(filename, values)
-            self.dbg(r)
-            f.write(r)
-
-    def configure(self):
         self.config_file = self.run_dir.child(srsENB.CFGFILE)
         self.config_sib_file = self.run_dir.child(srsENB.CFGFILE_SIB)
         self.config_rr_file = self.run_dir.child(srsENB.CFGFILE_RR)
@@ -229,10 +227,10 @@
         self.log_file = self.run_dir.child(srsENB.LOGFILE)
         self.pcap_file = self.run_dir.child(srsENB.PCAPFILE)
 
-        self.gen_conf_file(self.config_file, srsENB.CFGFILE)
-        self.gen_conf_file(self.config_sib_file, srsENB.CFGFILE_SIB)
-        self.gen_conf_file(self.config_rr_file, srsENB.CFGFILE_RR)
-        self.gen_conf_file(self.config_drb_file, srsENB.CFGFILE_DRB)
+        self.gen_conf_file(self.config_file, srsENB.CFGFILE, values)
+        self.gen_conf_file(self.config_sib_file, srsENB.CFGFILE_SIB, values)
+        self.gen_conf_file(self.config_rr_file, srsENB.CFGFILE_RR, values)
+        self.gen_conf_file(self.config_drb_file, srsENB.CFGFILE_DRB, values)
 
     def ue_add(self, ue):
         if self.ue is not None:

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17686
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: I4684d26375fce1e2ae28d3eccdc4f607fa5411a9
Gerrit-Change-Number: 17686
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/20200331/1255b7f7/attachment.htm>