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.orgpespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24194 ) Change subject: srsenb: enable S1AP pcaps as well when PCAPs are configured ...................................................................... srsenb: enable S1AP pcaps as well when PCAPs are configured this stores the S1AP pcaps in an own file but uses the same switch to enable them. Change-Id: If24048d61d8dff0b9b31aff9ed6995342830ebf8 --- M src/osmo_gsm_tester/obj/enb_srs.py M src/osmo_gsm_tester/templates/srsenb.conf.tmpl 2 files changed, 15 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py index 05488af..708e63a 100644 --- a/src/osmo_gsm_tester/obj/enb_srs.py +++ b/src/osmo_gsm_tester/obj/enb_srs.py @@ -49,7 +49,8 @@ CFGFILE_RR = 'srsenb_rr.conf' CFGFILE_DRB = 'srsenb_drb.conf' LOGFILE = 'srsenb.log' - PCAPFILE = 'srsenb.pcap' + PCAPFILE = 'srsenb_mac.pcap' + S1AP_PCAPFILE = 'srsenb_s1ap.pcap' TRACINGFILE = 'srsenb_tracing.log' METRICSFILE = 'srsenb_metrics.csv' @@ -66,6 +67,7 @@ self.tracing_file = None self.log_file = None self.pcap_file = None + self.s1ap_pcap_file = None self.process = None self.rem_host = None self.remote_run_dir = None @@ -75,6 +77,7 @@ self.remote_config_drb_file = None self.remote_log_file = None self.remote_pcap_file = None + self.remote_s1ap_pcap_file = None self.remote_tracing_file = None self.remote_metrics_file = None self.enable_pcap = False @@ -110,6 +113,10 @@ self.rem_host.scpfrom('scp-back-pcap', self.remote_pcap_file, self.pcap_file) except Exception as e: self.log(repr(e)) + try: + self.rem_host.scpfrom('scp-back-s1-pcap', self.remote_s1ap_pcap_file, self.s1ap_pcap_file) + except Exception as e: + self.log(repr(e)) if self.enable_tracing: try: self.rem_host.scpfrom('scp-back-tracing', self.remote_tracing_file, self.tracing_file) @@ -204,6 +211,7 @@ self.config_drb_file = self.run_dir.child(srsENB.CFGFILE_DRB) self.log_file = self.run_dir.child(srsENB.LOGFILE) self.pcap_file = self.run_dir.child(srsENB.PCAPFILE) + self.s1ap_pcap_file = self.run_dir.child(srsENB.S1AP_PCAPFILE) self.metrics_file = self.run_dir.child(srsENB.METRICSFILE) self.tracing_file = self.run_dir.child(srsENB.TRACINGFILE) @@ -219,6 +227,7 @@ self.remote_config_drb_file = self.remote_run_dir.child(srsENB.CFGFILE_DRB) self.remote_log_file = self.remote_run_dir.child(srsENB.LOGFILE) self.remote_pcap_file = self.remote_run_dir.child(srsENB.PCAPFILE) + self.remote_s1ap_pcap_file = self.remote_run_dir.child(srsENB.S1AP_PCAPFILE) self.remote_metrics_file = self.remote_run_dir.child(srsENB.METRICSFILE) self.remote_tracing_file = self.remote_run_dir.child(srsENB.TRACINGFILE) @@ -231,6 +240,7 @@ drbfile = self.config_drb_file if self._run_node.is_local() else self.remote_config_drb_file logfile = self.log_file if self._run_node.is_local() else self.remote_log_file pcapfile = self.pcap_file if self._run_node.is_local() else self.remote_pcap_file + s1ap_pcapfile = self.s1ap_pcap_file if self._run_node.is_local() else self.remote_s1ap_pcap_file config.overlay(values, dict(enb=dict(metrics_filename=metricsfile, tracing_filename=tracingfile, sib_filename=sibfile, @@ -238,6 +248,7 @@ drb_filename=drbfile, log_filename=logfile, pcap_filename=pcapfile, + s1ap_pcap_filename=s1ap_pcapfile, ))) # Convert parsed boolean string to Python boolean: diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl index ea18af7..2aa80dc 100644 --- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl @@ -101,6 +101,9 @@ enable = ${'true' if enb.enable_pcap else 'false'} filename = ${enb.pcap_filename} +s1ap_enable = ${'true' if enb.enable_pcap else 'false'} +s1ap_filename = ${enb.s1ap_pcap_filename} + ##################################################################### # Log configuration # -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24194 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: If24048d61d8dff0b9b31aff9ed6995342830ebf8 Gerrit-Change-Number: 24194 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre <andre at softwareradiosystems.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210511/f7958943/attachment.htm>