<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11474">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Pau Espin Pedrol: Looks good to me, approved
  Harald Welte: Looks good to me, but someone else must approve

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcap_recorder: Add support to run in netns<br><br>Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2<br>---<br>M src/osmo_gsm_tester/pcap_recorder.py<br>1 file changed, 10 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/pcap_recorder.py b/src/osmo_gsm_tester/pcap_recorder.py</span><br><span>index 98dea8b..70833d0 100644</span><br><span>--- a/src/osmo_gsm_tester/pcap_recorder.py</span><br><span>+++ b/src/osmo_gsm_tester/pcap_recorder.py</span><br><span>@@ -26,7 +26,7 @@</span><br><span> </span><br><span> class PcapRecorder(log.Origin):</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    def __init__(self, suite_run, run_dir, iface=None, filters=''):</span><br><span style="color: hsl(120, 100%, 40%);">+    def __init__(self, suite_run, run_dir, iface=None, filters='', netns=None):</span><br><span>         self.iface = iface</span><br><span>         if not self.iface:</span><br><span>             self.iface = "any"</span><br><span>@@ -34,16 +34,20 @@</span><br><span>         super().__init__(log.C_RUN, 'pcap-recorder_%s' % self.iface, filters=self.filters)</span><br><span>         self.suite_run = suite_run</span><br><span>         self.run_dir = run_dir</span><br><span style="color: hsl(120, 100%, 40%);">+        self.netns = netns</span><br><span>         self.start()</span><br><span> </span><br><span>     def start(self):</span><br><span>         self.dbg('Recording pcap', self.run_dir, self.filters)</span><br><span>         dumpfile = os.path.join(os.path.abspath(self.run_dir), self.name() + ".pcap")</span><br><span style="color: hsl(0, 100%, 40%);">-        self.process = process.Process(self.name(), self.run_dir,</span><br><span style="color: hsl(0, 100%, 40%);">-                                       ('tcpdump', '-n',</span><br><span style="color: hsl(0, 100%, 40%);">-                                       '-i', self.iface,</span><br><span style="color: hsl(0, 100%, 40%);">-                                       '-w', dumpfile,</span><br><span style="color: hsl(0, 100%, 40%);">-                                       self.filters))</span><br><span style="color: hsl(120, 100%, 40%);">+        popen_args = ('tcpdump', '-n',</span><br><span style="color: hsl(120, 100%, 40%);">+                      '-i', self.iface,</span><br><span style="color: hsl(120, 100%, 40%);">+                      '-w', dumpfile,</span><br><span style="color: hsl(120, 100%, 40%);">+                      self.filters)</span><br><span style="color: hsl(120, 100%, 40%);">+        if self.netns:</span><br><span style="color: hsl(120, 100%, 40%);">+            self.process = process.NetNSProcess(self.name(), self.run_dir, self.netns, popen_args)</span><br><span style="color: hsl(120, 100%, 40%);">+        else:</span><br><span style="color: hsl(120, 100%, 40%);">+            self.process = process.Process(self.name(), self.run_dir, popen_args)</span><br><span>         self.suite_run.remember_to_stop(self.process)</span><br><span>         self.process.launch()</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11474">change 11474</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/11474"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2 </div>
<div style="display:none"> Gerrit-Change-Number: 11474 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>