commit f4cce261732d44a06cc5f9509b881159ae18f089
author Pau Espin Pedrol <pespin@sysmocom.de> Tue Mar 31 10:49:47 2020 +0200
committer Pau Espin Pedrol <pespin@sysmocom.de> Tue Mar 31 10:49:49 2020 +0200
tree 452ea224317a47763d3e23b676c9601694debaf7
parent 874130510d0012a1f8320aafdc83c75d4aafe49e

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

src/osmo_gsm_tester/srs_enb.py

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: