<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17836">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">epc_srs.py: Pass filenames to main cfg file template instead of cmdline args<br><br>Change-Id: I1ac3a3cace7ec2b0f85c5d9a5f97d5007d7c65ac<br>---<br>M src/osmo_gsm_tester/obj/epc_srs.py<br>M src/osmo_gsm_tester/templates/srsepc.conf.tmpl<br>2 files changed, 40 insertions(+), 44 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/epc_srs.py b/src/osmo_gsm_tester/obj/epc_srs.py</span><br><span>index 7288e69..fc1ee5f 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/epc_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/epc_srs.py</span><br><span>@@ -41,6 +41,7 @@</span><br><span> self.pcap_file = None</span><br><span> self.process = None</span><br><span> self.rem_host = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_inst = None</span><br><span> self.remote_config_file = None</span><br><span> self.remote_db_file = None</span><br><span> self.remote_log_file = None</span><br><span>@@ -74,30 +75,9 @@</span><br><span> self.start_remotely()</span><br><span> </span><br><span> def start_remotely(self):</span><br><span style="color: hsl(0, 100%, 40%);">- self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('srslte')))</span><br><span style="color: hsl(0, 100%, 40%);">- lib = self.inst.child('lib')</span><br><span style="color: hsl(0, 100%, 40%);">- if not os.path.isdir(lib):</span><br><span style="color: hsl(0, 100%, 40%);">- raise log.Error('No lib/ in', self.inst)</span><br><span style="color: hsl(0, 100%, 40%);">- if not self.inst.isfile('bin', srsEPC.BINFILE):</span><br><span style="color: hsl(0, 100%, 40%);">- raise log.Error('No %s binary in' % srsEPC.BINFILE, self.inst)</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_lib = self.remote_inst.child('lib')</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_binary = self.remote_inst.child('bin', srsEPC.BINFILE)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.rem_host = remote.RemoteHost(self.run_dir, self._run_node.ssh_user(), self._run_node.ssh_addr())</span><br><span style="color: hsl(0, 100%, 40%);">- remote_prefix_dir = util.Dir(srsEPC.REMOTE_DIR)</span><br><span style="color: hsl(0, 100%, 40%);">- remote_inst = util.Dir(remote_prefix_dir.child(os.path.basename(str(self.inst))))</span><br><span style="color: hsl(0, 100%, 40%);">- remote_run_dir = util.Dir(remote_prefix_dir.child(srsEPC.BINFILE))</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_config_file = remote_run_dir.child(srsEPC.CFGFILE)</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_db_file = remote_run_dir.child(srsEPC.DBFILE)</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_log_file = remote_run_dir.child(srsEPC.LOGFILE)</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_pcap_file = remote_run_dir.child(srsEPC.PCAPFILE)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- self.rem_host.recreate_remote_dir(remote_inst)</span><br><span style="color: hsl(0, 100%, 40%);">- self.rem_host.scp('scp-inst-to-remote', str(self.inst), remote_prefix_dir)</span><br><span style="color: hsl(0, 100%, 40%);">- self.rem_host.recreate_remote_dir(remote_run_dir)</span><br><span style="color: hsl(0, 100%, 40%);">- self.rem_host.scp('scp-cfg-to-remote', self.config_file, self.remote_config_file)</span><br><span style="color: hsl(0, 100%, 40%);">- self.rem_host.scp('scp-db-to-remote', self.db_file, self.remote_db_file)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- remote_lib = remote_inst.child('lib')</span><br><span style="color: hsl(0, 100%, 40%);">- remote_binary = remote_inst.child('bin', srsEPC.BINFILE)</span><br><span> # setting capabilities will later disable use of LD_LIBRARY_PATH from ELF loader -> modify RPATH instead.</span><br><span> self.log('Setting RPATH for srsepc')</span><br><span> self.rem_host.change_elf_rpath(remote_binary, remote_lib)</span><br><span>@@ -105,27 +85,17 @@</span><br><span> self.log('Applying CAP_NET_ADMIN capability to srsepc')</span><br><span> self.rem_host.setcap_net_admin(remote_binary)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- args = (remote_binary, self.remote_config_file,</span><br><span style="color: hsl(0, 100%, 40%);">- '--hss.db_file=' + self.remote_db_file,</span><br><span style="color: hsl(0, 100%, 40%);">- '--log.filename=' + self.remote_log_file,</span><br><span style="color: hsl(0, 100%, 40%);">- '--pcap.filename=' + self.remote_pcap_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ args = (remote_binary, self.remote_config_file)</span><br><span> </span><br><span> self.process = self.rem_host.RemoteProcess(srsEPC.BINFILE, args)</span><br><span style="color: hsl(0, 100%, 40%);">- #self.process = self.rem_host.RemoteProcessFixIgnoreSIGHUP(srsEPC.BINFILE, remote_run_dir, args)</span><br><span> self.suite_run.remember_to_stop(self.process)</span><br><span> self.process.launch()</span><br><span> </span><br><span> def start_locally(self):</span><br><span style="color: hsl(0, 100%, 40%);">- inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('srslte')))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> binary = inst.child('bin', BINFILE)</span><br><span style="color: hsl(0, 100%, 40%);">- if not os.path.isfile(binary):</span><br><span style="color: hsl(0, 100%, 40%);">- raise log.Error('Binary missing:', binary)</span><br><span> lib = inst.child('lib')</span><br><span style="color: hsl(0, 100%, 40%);">- if not os.path.isdir(lib):</span><br><span style="color: hsl(0, 100%, 40%);">- raise log.Error('No lib/ in', inst)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> env = {}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # setting capabilities will later disable use of LD_LIBRARY_PATH from ELF loader -> modify RPATH instead.</span><br><span> self.log('Setting RPATH for srsepc')</span><br><span> # srsepc binary needs patchelf <= 0.9 (0.10 and current master fail) to avoid failing during patch. OS#4389, patchelf-GH#192.</span><br><span>@@ -134,25 +104,44 @@</span><br><span> self.log('Applying CAP_NET_ADMIN capability to srsepc')</span><br><span> util.setcap_net_admin(binary, self.run_dir.new_dir('setcap_net_admin'))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.dbg(run_dir=self.run_dir, binary=binary, env=env)</span><br><span style="color: hsl(0, 100%, 40%);">- args = (binary, os.path.abspath(self.config_file),</span><br><span style="color: hsl(0, 100%, 40%);">- '--hss.db_file=' + self.db_file,</span><br><span style="color: hsl(0, 100%, 40%);">- '--log.filename=' + self.log_file,</span><br><span style="color: hsl(0, 100%, 40%);">- '--pcap.filename=' + self.pcap_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ args = (binary, os.path.abspath(self.config_file))</span><br><span> </span><br><span> self.process = process.Process(self.name(), self.run_dir, args, env=env)</span><br><span> self.suite_run.remember_to_stop(self.process)</span><br><span> self.process.launch()</span><br><span> </span><br><span> def configure(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('srslte')))</span><br><span style="color: hsl(120, 100%, 40%);">+ if not os.path.isdir(self.inst.child('lib')):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('No lib/ in', self.inst)</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.inst.isfile('bin', srsEPC.BINFILE):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('No %s binary in' % srsEPC.BINFILE, self.inst)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> self.config_file = self.run_dir.child(srsEPC.CFGFILE)</span><br><span> self.db_file = self.run_dir.child(srsEPC.DBFILE)</span><br><span> self.log_file = self.run_dir.child(srsEPC.LOGFILE)</span><br><span> self.pcap_file = self.run_dir.child(srsEPC.PCAPFILE)</span><br><span style="color: hsl(0, 100%, 40%);">- self.dbg(config_file=self.config_file, db_file=self.db_file)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self._run_node.is_local():</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host = remote.RemoteHost(self.run_dir, self._run_node.ssh_user(), self._run_node.ssh_addr())</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_prefix_dir = util.Dir(srsEPC.REMOTE_DIR)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_inst = util.Dir(remote_prefix_dir.child(os.path.basename(str(self.inst))))</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_run_dir = util.Dir(remote_prefix_dir.child(srsEPC.BINFILE))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_config_file = remote_run_dir.child(srsEPC.CFGFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_db_file = remote_run_dir.child(srsEPC.DBFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_log_file = remote_run_dir.child(srsEPC.LOGFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_pcap_file = remote_run_dir.child(srsEPC.PCAPFILE)</span><br><span> </span><br><span> values = super().configure(['srsepc'])</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ dbfile = self.db_file if self._run_node.is_local() else self.remote_db_file</span><br><span style="color: hsl(120, 100%, 40%);">+ logfile = self.log_file if self._run_node.is_local() else self.remote_log_file</span><br><span style="color: hsl(120, 100%, 40%);">+ pcapfile = self.pcap_file if self._run_node.is_local() else self.remote_pcap_file</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(epc=dict(db_filename=dbfile,</span><br><span style="color: hsl(120, 100%, 40%);">+ log_filename=logfile,</span><br><span style="color: hsl(120, 100%, 40%);">+ pcap_filename=pcapfile)))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Convert parsed boolean string to Python boolean:</span><br><span> self.enable_pcap = util.str2bool(values['epc'].get('enable_pcap', 'false'))</span><br><span> config.overlay(values, dict(epc={'enable_pcap': self.enable_pcap}))</span><br><span>@@ -175,6 +164,13 @@</span><br><span> self.dbg(r)</span><br><span> f.write(r)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if not self._run_node.is_local():</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.recreate_remote_dir(self.remote_inst)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.scp('scp-inst-to-remote', str(self.inst), remote_prefix_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.recreate_remote_dir(remote_run_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.scp('scp-cfg-to-remote', self.config_file, self.remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.scp('scp-db-to-remote', self.db_file, self.remote_db_file)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def subscriber_add(self, modem, msisdn=None, algo_str=None):</span><br><span> if msisdn is None:</span><br><span> msisdn = self.suite_run.resources_pool.next_msisdn(modem)</span><br><span>diff --git a/src/osmo_gsm_tester/templates/srsepc.conf.tmpl b/src/osmo_gsm_tester/templates/srsepc.conf.tmpl</span><br><span>index cb03967..a792989 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/srsepc.conf.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/srsepc.conf.tmpl</span><br><span>@@ -40,7 +40,7 @@</span><br><span> #</span><br><span> #####################################################################</span><br><span> [hss]</span><br><span style="color: hsl(0, 100%, 40%);">-db_file = user_db.csv</span><br><span style="color: hsl(120, 100%, 40%);">+db_file = ${epc.db_filename}</span><br><span> </span><br><span> #####################################################################</span><br><span> # SP-GW configuration</span><br><span>@@ -72,7 +72,7 @@</span><br><span> ####################################################################</span><br><span> [pcap]</span><br><span> enable = ${'true' if epc.enable_pcap else 'false'}</span><br><span style="color: hsl(0, 100%, 40%);">-filename = /tmp/epc.pcap</span><br><span style="color: hsl(120, 100%, 40%);">+filename = ${epc.pcap_filename}</span><br><span> </span><br><span> ####################################################################</span><br><span> # Log configuration</span><br><span>@@ -95,7 +95,7 @@</span><br><span> [log]</span><br><span> all_level = info</span><br><span> all_hex_limit = 32</span><br><span style="color: hsl(0, 100%, 40%);">-filename = /tmp/epc.log</span><br><span style="color: hsl(120, 100%, 40%);">+filename = ${epc.log_filename}</span><br><span> </span><br><span> #nas_level = debug</span><br><span> #s1ap_level = debug</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17836">change 17836</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17836"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1ac3a3cace7ec2b0f85c5d9a5f97d5007d7c65ac </div>
<div style="display:none"> Gerrit-Change-Number: 17836 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>