From fd815f0ce49a2cd97538e8a25cfb1b65bb1f01fe Mon Sep 17 00:00:00 2001 From: jhughesbiot Date: Wed, 19 Mar 2025 13:13:54 -0600 Subject: [PATCH] Resolve and use device address for reads --- modules/test/protocol/python/src/protocol_bacnet.py | 6 +++--- modules/test/protocol/python/src/protocol_module.py | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/test/protocol/python/src/protocol_bacnet.py b/modules/test/protocol/python/src/protocol_bacnet.py index 9f962346b..38d80ec11 100644 --- a/modules/test/protocol/python/src/protocol_bacnet.py +++ b/modules/test/protocol/python/src/protocol_bacnet.py @@ -97,13 +97,13 @@ def validate_device(self): return result, description - def validate_protocol_version(self, device_ip, device_id): + def validate_protocol_version(self, device_addr, device_id): LOGGER.info(f'Resolving protocol version for BACnet device: {device_id}') try: version = self.bacnet.read( - f'{device_ip} device {device_id} protocolVersion') + f'{device_addr} device {device_id} protocolVersion') revision = self.bacnet.read( - f'{device_ip} device {device_id} protocolRevision') + f'{device_addr} device {device_id} protocolRevision') protocol_version = f'{version}.{revision}' result = True result_description = f'Device uses BACnet version {protocol_version}' diff --git a/modules/test/protocol/python/src/protocol_module.py b/modules/test/protocol/python/src/protocol_module.py index 1961b26dc..dfba507c2 100644 --- a/modules/test/protocol/python/src/protocol_module.py +++ b/modules/test/protocol/python/src/protocol_module.py @@ -71,9 +71,10 @@ def _protocol_bacnet_version(self): if len(self._bacnet.devices) > 0: for device in self._bacnet.devices: LOGGER.debug(f'Checking BACnet version for device: {device}') + device_addr = device[2] + device_id = device[3] result_status, result_description = \ - self._bacnet.validate_protocol_version(self._device_ipv4_addr, - device[3]) + self._bacnet.validate_protocol_version(device_addr,device_id) break LOGGER.info(result_description)