Skip to content

Fix AsyncSniffer not storing packets during monitor period #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jboddey merged 3 commits into from
Apr 16, 2024
Merged

Fix AsyncSniffer not storing packets during monitor period #384

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5dec222
Fix AsyncSniffer not storing packets during monitor period
jhughesoti Apr 9, 2024
5942f63
cleanup
jhughesoti Apr 9, 2024
c5e9540
Fix pylint issue
jboddey Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions framework/python/src/net_orc/network_orchestrator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ def __init__(self, session):

self._session = session
self._monitor_in_progress = False
self._monitor_packets = []
self._listener = None
self._net_modules = []

Expand Down Expand Up @@ -239,30 +240,33 @@ def _start_device_monitor(self, device):
"""Start a timer until the steady state has been reached and
callback the steady state method for this device."""
self.get_session().set_status('Monitoring')
self._monitor_packets = []
LOGGER.info(f'Monitoring device with mac addr {device.mac_addr} '
f'for {str(self._session.get_monitor_period())} seconds')

device_runtime_dir = os.path.join(RUNTIME_DIR, TEST_DIR,
device.mac_addr.replace(':', ''))

sniffer = AsyncSniffer(iface=self._session.get_device_interface(),
timeout=self._session.get_monitor_period())
timeout=self._session.get_monitor_period(),
prn=self._monitor_packet_callback)
sniffer.start()

while sniffer.running:
if not self._ip_ctrl.check_interface_status(
self._session.get_device_interface()):
self._session.set_status('Cancelled')
sniffer.stop()
self._session.set_status('Cancelled')
LOGGER.error('Device interface disconnected, cancelling Testrun')

packet_capture = sniffer.results
wrpcap(os.path.join(device_runtime_dir, 'monitor.pcap'), packet_capture)

wrpcap(os.path.join(device_runtime_dir, 'monitor.pcap'),
self._monitor_packets)
self._monitor_in_progress = False
self.get_listener().call_callback(NetworkEvent.DEVICE_STABLE,
device.mac_addr)

def _monitor_packet_callback(self, packet):
self._monitor_packets.append(packet)

def _check_network_services(self):
LOGGER.debug('Checking network modules...')
for net_module in self._net_modules:
Expand Down