From e024d011cb92dc3f68b3bf26111768f1736c3599 Mon Sep 17 00:00:00 2001 From: MariusBaldovin Date: Tue, 12 Nov 2024 15:16:52 +0000 Subject: [PATCH 1/2] if dhcp-1.pcap is empty or not found it should check monitor and startup pcap files for ipv6 address --- modules/test/conn/python/src/connection_module.py | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/test/conn/python/src/connection_module.py b/modules/test/conn/python/src/connection_module.py index d47d25ba4..972652abc 100644 --- a/modules/test/conn/python/src/connection_module.py +++ b/modules/test/conn/python/src/connection_module.py @@ -594,7 +594,6 @@ def _has_slaac_addres(self): packet_capture += rdpcap(DHCP_CAPTURE_FILE) except (FileNotFoundError, Scapy_Exception): LOGGER.error('dhcp-1.pcap not found or empty, ignoring') - return None, False sends_ipv6 = False for packet_number, packet in enumerate(packet_capture, start=1): From 63367963eaefd8c16bc6b99262dccce2637a7f07 Mon Sep 17 00:00:00 2001 From: MariusBaldovin Date: Tue, 12 Nov 2024 15:25:43 +0000 Subject: [PATCH 2/2] update --- modules/test/conn/python/src/connection_module.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/test/conn/python/src/connection_module.py b/modules/test/conn/python/src/connection_module.py index 972652abc..c83df7b64 100644 --- a/modules/test/conn/python/src/connection_module.py +++ b/modules/test/conn/python/src/connection_module.py @@ -572,7 +572,7 @@ def _connection_ipv6_slaac(self): LOGGER.info('Running connection.ipv6_slaac') result = None - slac_test, sends_ipv6 = self._has_slaac_addres() + slac_test, sends_ipv6 = self._has_slaac_address() if slac_test: result = True, f'Device has formed SLAAC address {self._device_ipv6_addr}' elif slac_test is None: @@ -586,7 +586,7 @@ def _connection_ipv6_slaac(self): result = False, 'Device does not support IPv6' return result - def _has_slaac_addres(self): + def _has_slaac_address(self): packet_capture = (rdpcap(self.startup_capture_file) + rdpcap(self.monitor_capture_file))