Skip to content
Merged
Changes from all commits
Commits
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
14 changes: 6 additions & 8 deletions modules/test/protocol/python/src/protocol_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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
Expand Down
Loading