Change in osmo-gsm-tester[master]: pcap_recorder: Add support to run in netns

2018-11-06 Thread Pau Espin Pedrol 
Pau Espin Pedrol has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11474 )

Change subject: pcap_recorder: Add support to run in netns
..

pcap_recorder: Add support to run in netns

Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2
---
M src/osmo_gsm_tester/pcap_recorder.py
1 file changed, 10 insertions(+), 6 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Pau Espin Pedrol: Looks good to me, approved
  Harald Welte: Looks good to me, but someone else must approve



diff --git a/src/osmo_gsm_tester/pcap_recorder.py 
b/src/osmo_gsm_tester/pcap_recorder.py
index 98dea8b..70833d0 100644
--- a/src/osmo_gsm_tester/pcap_recorder.py
+++ b/src/osmo_gsm_tester/pcap_recorder.py
@@ -26,7 +26,7 @@

 class PcapRecorder(log.Origin):

-def __init__(self, suite_run, run_dir, iface=None, filters=''):
+def __init__(self, suite_run, run_dir, iface=None, filters='', netns=None):
 self.iface = iface
 if not self.iface:
 self.iface = "any"
@@ -34,16 +34,20 @@
 super().__init__(log.C_RUN, 'pcap-recorder_%s' % self.iface, 
filters=self.filters)
 self.suite_run = suite_run
 self.run_dir = run_dir
+self.netns = netns
 self.start()

 def start(self):
 self.dbg('Recording pcap', self.run_dir, self.filters)
 dumpfile = os.path.join(os.path.abspath(self.run_dir), self.name() + 
".pcap")
-self.process = process.Process(self.name(), self.run_dir,
-   ('tcpdump', '-n',
-   '-i', self.iface,
-   '-w', dumpfile,
-   self.filters))
+popen_args = ('tcpdump', '-n',
+  '-i', self.iface,
+  '-w', dumpfile,
+  self.filters)
+if self.netns:
+self.process = process.NetNSProcess(self.name(), self.run_dir, 
self.netns, popen_args)
+else:
+self.process = process.Process(self.name(), self.run_dir, 
popen_args)
 self.suite_run.remember_to_stop(self.process)
 self.process.launch()


--
To view, visit https://gerrit.osmocom.org/11474
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2
Gerrit-Change-Number: 11474
Gerrit-PatchSet: 3
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol

Change in osmo-gsm-tester[master]: pcap_recorder: Add support to run in netns

2018-11-06 Thread Pau Espin Pedrol 
Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/11474 )

Change subject: pcap_recorder: Add support to run in netns
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11474
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2
Gerrit-Change-Number: 11474
Gerrit-PatchSet: 3
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Tue, 06 Nov 2018 12:07:23 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-gsm-tester[master]: pcap_recorder: Add support to run in netns

2018-10-29 Thread Pau Espin Pedrol 
Hello Harald Welte, Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/11474

to look at the new patch set (#2).

Change subject: pcap_recorder: Add support to run in netns
..

pcap_recorder: Add support to run in netns

Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2
---
M src/osmo_gsm_tester/pcap_recorder.py
1 file changed, 10 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester 
refs/changes/74/11474/2
--
To view, visit https://gerrit.osmocom.org/11474
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2
Gerrit-Change-Number: 11474
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-gsm-tester[master]: pcap_recorder: Add support to run in netns

2018-10-26 Thread Harald Welte 
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11474 )

Change subject: pcap_recorder: Add support to run in netns
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/11474
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2
Gerrit-Change-Number: 11474
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Fri, 26 Oct 2018 17:51:24 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-gsm-tester[master]: pcap_recorder: Add support to run in netns

2018-10-26 Thread Pau Espin Pedrol 
Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/11474


Change subject: pcap_recorder: Add support to run in netns
..

pcap_recorder: Add support to run in netns

Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2
---
M src/osmo_gsm_tester/pcap_recorder.py
1 file changed, 10 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester 
refs/changes/74/11474/1

diff --git a/src/osmo_gsm_tester/pcap_recorder.py 
b/src/osmo_gsm_tester/pcap_recorder.py
index 98dea8b..70833d0 100644
--- a/src/osmo_gsm_tester/pcap_recorder.py
+++ b/src/osmo_gsm_tester/pcap_recorder.py
@@ -26,7 +26,7 @@

 class PcapRecorder(log.Origin):

-def __init__(self, suite_run, run_dir, iface=None, filters=''):
+def __init__(self, suite_run, run_dir, iface=None, filters='', netns=None):
 self.iface = iface
 if not self.iface:
 self.iface = "any"
@@ -34,16 +34,20 @@
 super().__init__(log.C_RUN, 'pcap-recorder_%s' % self.iface, 
filters=self.filters)
 self.suite_run = suite_run
 self.run_dir = run_dir
+self.netns = netns
 self.start()

 def start(self):
 self.dbg('Recording pcap', self.run_dir, self.filters)
 dumpfile = os.path.join(os.path.abspath(self.run_dir), self.name() + 
".pcap")
-self.process = process.Process(self.name(), self.run_dir,
-   ('tcpdump', '-n',
-   '-i', self.iface,
-   '-w', dumpfile,
-   self.filters))
+popen_args = ('tcpdump', '-n',
+  '-i', self.iface,
+  '-w', dumpfile,
+  self.filters)
+if self.netns:
+self.process = process.NetNSProcess(self.name(), self.run_dir, 
self.netns, popen_args)
+else:
+self.process = process.Process(self.name(), self.run_dir, 
popen_args)
 self.suite_run.remember_to_stop(self.process)
 self.process.launch()


--
To view, visit https://gerrit.osmocom.org/11474
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2
Gerrit-Change-Number: 11474
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol