Skip to content

Fix device disconnected whilst monitoring #830

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 2 commits into from
Oct 1, 2024
Merged

Fix device disconnected whilst monitoring #830

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4514dac
fix device disconnected whilst monitoring
hitnik Sep 26, 2024
0ccdd0b
Merge branch 'dev' into bug/device_conn_monitoring
jboddey Oct 1, 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
11 changes: 8 additions & 3 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 @@ -17,6 +17,7 @@
import json
import os
from scapy.all import sniff, wrpcap, BOOTP, AsyncSniffer
from scapy.error import Scapy_Exception
import shutil
import subprocess
import sys
Expand Down Expand Up @@ -306,9 +307,13 @@ def _start_device_monitor(self, device):

if not self._ip_ctrl.check_interface_status(
self._session.get_device_interface()):
sniffer.stop()
self._session.set_status(TestrunStatus.CANCELLED)
LOGGER.error('Device interface disconnected, cancelling Testrun')
try:
sniffer.stop()
except Scapy_Exception:
LOGGER.error('Device adapter disconnected whilst monitoring.')
finally:
self._session.set_status(TestrunStatus.CANCELLED)
LOGGER.error('Device interface disconnected, cancelling Testrun')

LOGGER.debug('Writing packets to monitor.pcap')
wrpcap(os.path.join(device_runtime_dir, 'monitor.pcap'),
Expand Down