diff --git a/devices/devices/docker_device.py b/devices/devices/docker_device.py index 81abc26ee8ba4021b8e52bcefcf420a20cbdf28a..2acf7aeecf04755b71337d42f6a64946ef7cd54a 100644 --- a/devices/devices/docker_device.py +++ b/devices/devices/docker_device.py @@ -31,7 +31,6 @@ from clients.docker_client import DockerClient from clients.attribute_wrapper import attribute_wrapper from devices.hardware_device import hardware_device from common.lofar_logging import device_logging_to_python, log_exceptions -from common.lofar_git import get_version __all__ = ["Docker", "main"] @@ -50,7 +49,6 @@ class Docker(hardware_device): # ---------- # Attributes # ---------- - version_R = attribute(dtype=str, access=AttrWriteType.READ, fget=lambda self: get_version()) archiver_maria_db_R = attribute_wrapper(comms_annotation={"container": "archiver-maria-db"}, datatype=numpy.bool_) archiver_maria_db_RW = attribute_wrapper(comms_annotation={"container": "archiver-maria-db"}, datatype=numpy.bool_, access=AttrWriteType.READ_WRITE) databaseds_R = attribute_wrapper(comms_annotation={"container": "databaseds"}, datatype=numpy.bool_) diff --git a/devices/devices/hardware_device.py b/devices/devices/hardware_device.py index 6b28fd7ab5acd8bbf4a3742824fde597d5b23d69..a25b863ebc8255fa05c02a5f420f23f309ebf0fb 100644 --- a/devices/devices/hardware_device.py +++ b/devices/devices/hardware_device.py @@ -15,11 +15,12 @@ from abc import ABCMeta, abstractmethod # PyTango imports from tango.server import Device, command, DeviceMeta, attribute -from tango import DevState, DebugIt, Attribute, DeviceProxy +from tango import DevState, DebugIt, Attribute, DeviceProxy, AttrWriteType # Additional import from clients.attribute_wrapper import attribute_wrapper from common.lofar_logging import log_exceptions +from common.lofar_git import get_version from devices.abstract_device import AbstractDeviceMetas from devices.device_decorators import only_in_states, fault_on_error @@ -56,6 +57,8 @@ class hardware_device(Device, metaclass=AbstractDeviceMetas): The user triggers their transitions by the commands reflecting the target state (Initialise(), On(), Fault()). """ + version_R = attribute(dtype=str, access=AttrWriteType.READ, fget=lambda self: get_version()) + # list of property names too be set first by set_defaults first_default_settings = [] diff --git a/devices/devices/opcua_device.py b/devices/devices/opcua_device.py index d95a8426ed0dc260c0f6eb6d85149e3f5f0ec4ba..698df95705b0dce00cb869ed880a29f97d472cb1 100644 --- a/devices/devices/opcua_device.py +++ b/devices/devices/opcua_device.py @@ -29,7 +29,6 @@ from devices.device_decorators import * from clients.opcua_client import OPCUAConnection from devices.hardware_device import hardware_device from common.lofar_logging import device_logging_to_python, log_exceptions -from common.lofar_git import get_version __all__ = ["opcua_device", "main"] diff --git a/devices/devices/recv.py b/devices/devices/recv.py index e28d402099b71cdcf09f9a7410a271b034e5d689..a078f601c7d1962f4a11367e7ca9745ec590d5f2 100644 --- a/devices/devices/recv.py +++ b/devices/devices/recv.py @@ -30,7 +30,6 @@ from device_decorators import * from clients.attribute_wrapper import attribute_wrapper from devices.opcua_device import opcua_device from common.lofar_logging import device_logging_to_python, log_exceptions -from common.lofar_git import get_version __all__ = ["RECV", "main"] @@ -61,7 +60,6 @@ class RECV(opcua_device): # ---------- # Attributes # ---------- - version_R = attribute(dtype=str, access=AttrWriteType.READ, fget=lambda self: get_version()) Ant_mask_RW = attribute_wrapper(comms_annotation=["2:PCC", "2:Ant_mask_RW"], datatype=numpy.bool_, dims=(3, 32), access=AttrWriteType.READ_WRITE) CLK_Enable_PWR_R = attribute_wrapper(comms_annotation=["2:PCC", "2:CLK_Enable_PWR_R"], datatype=numpy.bool_) CLK_I2C_STATUS_R = attribute_wrapper(comms_annotation=["2:PCC", "2:CLK_I2C_STATUS_R"], datatype=numpy.int64) diff --git a/devices/devices/sdp/sdp.py b/devices/devices/sdp/sdp.py index 221afb245361d4f330aab42b395532624fb4edde..693fab3a9b912a3e8e3e30d58dc237be6149df56 100644 --- a/devices/devices/sdp/sdp.py +++ b/devices/devices/sdp/sdp.py @@ -28,7 +28,6 @@ from clients.attribute_wrapper import attribute_wrapper from devices.opcua_device import opcua_device from common.lofar_logging import device_logging_to_python, log_exceptions -from common.lofar_git import get_version import numpy @@ -78,8 +77,6 @@ class SDP(opcua_device): # Attributes # ---------- - version_R = attribute(dtype=str, access=AttrWriteType.READ, fget=lambda self: get_version()) - FPGA_beamlet_output_enable_R = attribute_wrapper(comms_annotation=["2:FPGA_beamlet_output_enable_R"], datatype=numpy.bool_, dims=(16,)) FPGA_beamlet_output_enable_RW = attribute_wrapper(comms_annotation=["2:FPGA_beamlet_output_enable_RW"], datatype=numpy.bool_, dims=(16,), access=AttrWriteType.READ_WRITE) FPGA_beamlet_output_hdr_eth_destination_mac_R = attribute_wrapper(comms_annotation=["2:FPGA_beamlet_output_hdr_eth_destination_mac_R"], datatype=numpy.str, dims=(16,)) diff --git a/devices/devices/sdp/statistics.py b/devices/devices/sdp/statistics.py index a884783ddd85c669e35a2230e72e3e4ca2f85d60..63f1cb0a7b1d2763fc51fa79abfa6317684bfd38 100644 --- a/devices/devices/sdp/statistics.py +++ b/devices/devices/sdp/statistics.py @@ -31,7 +31,6 @@ from clients.attribute_wrapper import attribute_wrapper from devices.opcua_device import opcua_device -from common.lofar_git import get_version from common.lofar_logging import device_logging_to_python, log_exceptions import logging @@ -67,8 +66,6 @@ class Statistics(opcua_device, metaclass=ABCMeta): # Attributes # ---------- - version_R = attribute(dtype = str, access = AttrWriteType.READ, fget = lambda self: get_version()) - # number of UDP packets and bytes that were received nof_packets_received_R = attribute_wrapper(comms_id=StatisticsClient, comms_annotation={"type": "udp", "parameter": "nof_packets_received"}, datatype=numpy.uint64) nof_bytes_received_R = attribute_wrapper(comms_id=StatisticsClient, comms_annotation={"type": "udp", "parameter": "nof_bytes_received"}, datatype=numpy.uint64) diff --git a/devices/devices/unb2.py b/devices/devices/unb2.py index 83fb44ca93cb38795cc77b49354aa53dfafc5cf8..e2f781a24e5e59c52591f0826e36000a38687aa1 100644 --- a/devices/devices/unb2.py +++ b/devices/devices/unb2.py @@ -27,7 +27,6 @@ from clients.attribute_wrapper import attribute_wrapper from devices.opcua_device import opcua_device from common.lofar_logging import device_logging_to_python, log_exceptions -from common.lofar_git import get_version import numpy @@ -43,8 +42,6 @@ class UNB2(opcua_device): # Attributes # ---------- - version_R = attribute(dtype=str, access=AttrWriteType.READ, fget=lambda self: get_version()) - N_unb = 2 N_fpga = 4 N_ddr = 2