From 0163b66d9cb15fc4ae31e2775accfe0468a4329c Mon Sep 17 00:00:00 2001 From: jhughesbiot Date: Tue, 18 Feb 2025 15:27:38 -0700 Subject: [PATCH] Fix bacnet version for devices that do not report IP address in their discovery response --- .../test/protocol/python/src/protocol_module.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/test/protocol/python/src/protocol_module.py b/modules/test/protocol/python/src/protocol_module.py index 9d99c91bd..1961b26dc 100644 --- a/modules/test/protocol/python/src/protocol_module.py +++ b/modules/test/protocol/python/src/protocol_module.py @@ -29,7 +29,7 @@ def __init__(self, module): super().__init__(module_name=module, log_name=LOG_NAME) global LOGGER LOGGER = self._get_logger() - self._bacnet = BACnet(log=LOGGER,device_hw_addr=self._device_mac) + self._bacnet = BACnet(log=LOGGER, device_hw_addr=self._device_mac) def _protocol_valid_bacnet(self): LOGGER.info('Running protocol.valid_bacnet') @@ -70,13 +70,11 @@ def _protocol_bacnet_version(self): if len(self._bacnet.devices) > 0: for device in self._bacnet.devices: - if self._device_ipv4_addr in device[2]: - LOGGER.debug(f'Checking BACnet version for device: {device}') - result_status, result_description = \ - self._bacnet.validate_protocol_version(device[2], device[3]) - break - else: - LOGGER.debug('Device does not match expected IP address, skipping') + LOGGER.debug(f'Checking BACnet version for device: {device}') + result_status, result_description = \ + self._bacnet.validate_protocol_version(self._device_ipv4_addr, + device[3]) + break LOGGER.info(result_description) return result_status, result_description