<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24194">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;">srsenb: enable S1AP pcaps as well when PCAPs are configured<br><br>this stores the S1AP pcaps in an own file but uses<br>the same switch to enable them.<br><br>Change-Id: If24048d61d8dff0b9b31aff9ed6995342830ebf8<br>---<br>M src/osmo_gsm_tester/obj/enb_srs.py<br>M src/osmo_gsm_tester/templates/srsenb.conf.tmpl<br>2 files changed, 15 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>index 05488af..708e63a 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>@@ -49,7 +49,8 @@</span><br><span> CFGFILE_RR = 'srsenb_rr.conf'</span><br><span> CFGFILE_DRB = 'srsenb_drb.conf'</span><br><span> LOGFILE = 'srsenb.log'</span><br><span style="color: hsl(0, 100%, 40%);">- PCAPFILE = 'srsenb.pcap'</span><br><span style="color: hsl(120, 100%, 40%);">+ PCAPFILE = 'srsenb_mac.pcap'</span><br><span style="color: hsl(120, 100%, 40%);">+ S1AP_PCAPFILE = 'srsenb_s1ap.pcap'</span><br><span> TRACINGFILE = 'srsenb_tracing.log'</span><br><span> METRICSFILE = 'srsenb_metrics.csv'</span><br><span> </span><br><span>@@ -66,6 +67,7 @@</span><br><span> self.tracing_file = None</span><br><span> self.log_file = None</span><br><span> self.pcap_file = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.s1ap_pcap_file = None</span><br><span> self.process = None</span><br><span> self.rem_host = None</span><br><span> self.remote_run_dir = None</span><br><span>@@ -75,6 +77,7 @@</span><br><span> self.remote_config_drb_file = None</span><br><span> self.remote_log_file = None</span><br><span> self.remote_pcap_file = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_s1ap_pcap_file = None</span><br><span> self.remote_tracing_file = None</span><br><span> self.remote_metrics_file = None</span><br><span> self.enable_pcap = False</span><br><span>@@ -110,6 +113,10 @@</span><br><span> self.rem_host.scpfrom('scp-back-pcap', self.remote_pcap_file, self.pcap_file)</span><br><span> except Exception as e:</span><br><span> self.log(repr(e))</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.scpfrom('scp-back-s1-pcap', self.remote_s1ap_pcap_file, self.s1ap_pcap_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ except Exception as e:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log(repr(e))</span><br><span> if self.enable_tracing:</span><br><span> try:</span><br><span> self.rem_host.scpfrom('scp-back-tracing', self.remote_tracing_file, self.tracing_file)</span><br><span>@@ -204,6 +211,7 @@</span><br><span> self.config_drb_file = self.run_dir.child(srsENB.CFGFILE_DRB)</span><br><span> self.log_file = self.run_dir.child(srsENB.LOGFILE)</span><br><span> self.pcap_file = self.run_dir.child(srsENB.PCAPFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.s1ap_pcap_file = self.run_dir.child(srsENB.S1AP_PCAPFILE)</span><br><span> self.metrics_file = self.run_dir.child(srsENB.METRICSFILE)</span><br><span> self.tracing_file = self.run_dir.child(srsENB.TRACINGFILE)</span><br><span> </span><br><span>@@ -219,6 +227,7 @@</span><br><span> self.remote_config_drb_file = self.remote_run_dir.child(srsENB.CFGFILE_DRB)</span><br><span> self.remote_log_file = self.remote_run_dir.child(srsENB.LOGFILE)</span><br><span> self.remote_pcap_file = self.remote_run_dir.child(srsENB.PCAPFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_s1ap_pcap_file = self.remote_run_dir.child(srsENB.S1AP_PCAPFILE)</span><br><span> self.remote_metrics_file = self.remote_run_dir.child(srsENB.METRICSFILE)</span><br><span> self.remote_tracing_file = self.remote_run_dir.child(srsENB.TRACINGFILE)</span><br><span> </span><br><span>@@ -231,6 +240,7 @@</span><br><span> drbfile = self.config_drb_file if self._run_node.is_local() else self.remote_config_drb_file</span><br><span> logfile = self.log_file if self._run_node.is_local() else self.remote_log_file</span><br><span> pcapfile = self.pcap_file if self._run_node.is_local() else self.remote_pcap_file</span><br><span style="color: hsl(120, 100%, 40%);">+ s1ap_pcapfile = self.s1ap_pcap_file if self._run_node.is_local() else self.remote_s1ap_pcap_file</span><br><span> config.overlay(values, dict(enb=dict(metrics_filename=metricsfile,</span><br><span> tracing_filename=tracingfile,</span><br><span> sib_filename=sibfile,</span><br><span>@@ -238,6 +248,7 @@</span><br><span> drb_filename=drbfile,</span><br><span> log_filename=logfile,</span><br><span> pcap_filename=pcapfile,</span><br><span style="color: hsl(120, 100%, 40%);">+ s1ap_pcap_filename=s1ap_pcapfile,</span><br><span> )))</span><br><span> </span><br><span> # Convert parsed boolean string to Python boolean:</span><br><span>diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl</span><br><span>index ea18af7..2aa80dc 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl</span><br><span>@@ -101,6 +101,9 @@</span><br><span> enable = ${'true' if enb.enable_pcap else 'false'}</span><br><span> filename = ${enb.pcap_filename}</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+s1ap_enable = ${'true' if enb.enable_pcap else 'false'}</span><br><span style="color: hsl(120, 100%, 40%);">+s1ap_filename = ${enb.s1ap_pcap_filename}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #####################################################################</span><br><span> # Log configuration</span><br><span> #</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24194">change 24194</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/+/24194"/><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: If24048d61d8dff0b9b31aff9ed6995342830ebf8 </div>
<div style="display:none"> Gerrit-Change-Number: 24194 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </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>