From 1fe012e6a8ca35284cf6b6d83b8649c7511c724e Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Sun, 14 May 2017 15:45:05 +0200 Subject: cosmetic: rather have an underscore in pcap_recorder.py Change-Id: Ib4886cb3fe0cb9c66d170097b98b4d1eb67cab81 --- src/osmo_gsm_tester/osmo_nitb.py | 6 ++-- src/osmo_gsm_tester/pcap_recorder.py | 59 ++++++++++++++++++++++++++++++++++++ src/osmo_gsm_tester/pcaprecorder.py | 59 ------------------------------------ 3 files changed, 62 insertions(+), 62 deletions(-) create mode 100644 src/osmo_gsm_tester/pcap_recorder.py delete mode 100644 src/osmo_gsm_tester/pcaprecorder.py (limited to 'src/osmo_gsm_tester') diff --git a/src/osmo_gsm_tester/osmo_nitb.py b/src/osmo_gsm_tester/osmo_nitb.py index b81d612..6ead67a 100644 --- a/src/osmo_gsm_tester/osmo_nitb.py +++ b/src/osmo_gsm_tester/osmo_nitb.py @@ -22,7 +22,7 @@ import random import re import socket -from . import log, util, config, template, process, osmo_ctrl, pcaprecorder +from . import log, util, config, template, process, osmo_ctrl, pcap_recorder class OsmoNitb(log.Origin): suite_run = None @@ -52,8 +52,8 @@ class OsmoNitb(log.Origin): raise RuntimeError('No lib/ in %r' % inst) iface = util.ip_to_iface(self.addr()) - pcaprecorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), - iface, self.addr()) + pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), + iface, self.addr()) env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } diff --git a/src/osmo_gsm_tester/pcap_recorder.py b/src/osmo_gsm_tester/pcap_recorder.py new file mode 100644 index 0000000..8a63b30 --- /dev/null +++ b/src/osmo_gsm_tester/pcap_recorder.py @@ -0,0 +1,59 @@ +# osmo_gsm_tester: specifics for running an osmo-nitb +# +# Copyright (C) 2016-2017 by sysmocom - s.f.m.c. GmbH +# +# Author: Pau Espin Pedrol +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import os +import random +import re +import socket + +from . import log, util, config, template, process, osmo_ctrl + +class PcapRecorder(log.Origin): + + def __init__(self, suite_run, run_dir, iface=None, addr=None): + self.suite_run = suite_run + self.run_dir = run_dir + self.iface = iface + if not self.iface: + self.iface = "any" + self.addr = addr + self.set_log_category(log.C_RUN) + self.set_name('pcap-recorder_%s' % self.iface) + self.start() + + def start(self): + self.log('Recording pcap', self.run_dir, self.gen_filter()) + 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.gen_filter()) + ) + self.suite_run.remember_to_stop(self.process) + self.process.launch() + + def gen_filter(self): + filter = "" + if self.addr: + filter += 'host ' + self.addr + return filter + + def running(self): + return not self.process.terminated() diff --git a/src/osmo_gsm_tester/pcaprecorder.py b/src/osmo_gsm_tester/pcaprecorder.py deleted file mode 100644 index 8a63b30..0000000 --- a/src/osmo_gsm_tester/pcaprecorder.py +++ /dev/null @@ -1,59 +0,0 @@ -# osmo_gsm_tester: specifics for running an osmo-nitb -# -# Copyright (C) 2016-2017 by sysmocom - s.f.m.c. GmbH -# -# Author: Pau Espin Pedrol -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -import os -import random -import re -import socket - -from . import log, util, config, template, process, osmo_ctrl - -class PcapRecorder(log.Origin): - - def __init__(self, suite_run, run_dir, iface=None, addr=None): - self.suite_run = suite_run - self.run_dir = run_dir - self.iface = iface - if not self.iface: - self.iface = "any" - self.addr = addr - self.set_log_category(log.C_RUN) - self.set_name('pcap-recorder_%s' % self.iface) - self.start() - - def start(self): - self.log('Recording pcap', self.run_dir, self.gen_filter()) - 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.gen_filter()) - ) - self.suite_run.remember_to_stop(self.process) - self.process.launch() - - def gen_filter(self): - filter = "" - if self.addr: - filter += 'host ' + self.addr - return filter - - def running(self): - return not self.process.terminated() -- cgit v1.2.3