From 167f313c619f0a66bdea28f80f1fd920a02935b6 Mon Sep 17 00:00:00 2001 From: MariusBaldovin Date: Fri, 22 Nov 2024 16:18:09 +0000 Subject: [PATCH 1/3] added conditionn to check if validate_bacnet_source --- modules/test/protocol/python/src/protocol_bacnet.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/test/protocol/python/src/protocol_bacnet.py b/modules/test/protocol/python/src/protocol_bacnet.py index a17c9cdd3..d6e3651ac 100644 --- a/modules/test/protocol/python/src/protocol_bacnet.py +++ b/modules/test/protocol/python/src/protocol_bacnet.py @@ -82,8 +82,10 @@ def validate_device(self): for device in self.devices: object_id = str(device[3]) # BACnet Object ID LOGGER.info('Checking device: ' + str(device)) - result &= self.validate_bacnet_source( + device_valid = self.validate_bacnet_source( object_id=object_id, device_hw_addr=self.device_hw_addr) + if device_valid is not None: + result &= device_valid description = ('BACnet device discovered' if result else 'BACnet device was found but was not device under test') else: @@ -91,7 +93,7 @@ def validate_device(self): description = 'BACnet device could not be discovered' LOGGER.info(description) except Exception: # pylint: disable=W0718 - LOGGER.error('Error occured when validating device', exc_info=True) + LOGGER.error('Error occured when validating device') return result, description @@ -131,7 +133,7 @@ def validate_bacnet_source(self, object_id, device_hw_addr): else: LOGGER.debug('BACnet detected for wrong MAC address') src = packet['_source']['layers']['eth.src'][0] - dst = packet['_source']['layers']['eth.dst'][0] + dst = packet['_source']['layers']['eth.dst'][0] LOGGER.debug(f'From: {src} To: {dst} Expected: {device_hw_addr}') valid = False return valid From e185fd6ab017f51640549abc8bf6edf18e6e1060 Mon Sep 17 00:00:00 2001 From: MariusBaldovin Date: Fri, 22 Nov 2024 16:19:11 +0000 Subject: [PATCH 2/3] added conditionn to check if validate_bacnet_source --- modules/test/protocol/python/src/protocol_bacnet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/test/protocol/python/src/protocol_bacnet.py b/modules/test/protocol/python/src/protocol_bacnet.py index d6e3651ac..496957818 100644 --- a/modules/test/protocol/python/src/protocol_bacnet.py +++ b/modules/test/protocol/python/src/protocol_bacnet.py @@ -93,7 +93,7 @@ def validate_device(self): description = 'BACnet device could not be discovered' LOGGER.info(description) except Exception: # pylint: disable=W0718 - LOGGER.error('Error occured when validating device') + LOGGER.error('Error occured when validating device', exc_info=True) return result, description From c65a3975106b7466234cbdb817040e172af2c0a0 Mon Sep 17 00:00:00 2001 From: MariusBaldovin Date: Fri, 22 Nov 2024 16:22:31 +0000 Subject: [PATCH 3/3] remove empty space --- modules/test/protocol/python/src/protocol_bacnet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/test/protocol/python/src/protocol_bacnet.py b/modules/test/protocol/python/src/protocol_bacnet.py index 496957818..9d4399b2b 100644 --- a/modules/test/protocol/python/src/protocol_bacnet.py +++ b/modules/test/protocol/python/src/protocol_bacnet.py @@ -133,7 +133,7 @@ def validate_bacnet_source(self, object_id, device_hw_addr): else: LOGGER.debug('BACnet detected for wrong MAC address') src = packet['_source']['layers']['eth.src'][0] - dst = packet['_source']['layers']['eth.dst'][0] + dst = packet['_source']['layers']['eth.dst'][0] LOGGER.debug(f'From: {src} To: {dst} Expected: {device_hw_addr}') valid = False return valid