From 071e29bf1d8f4f9a6c788be44552770b818b3bea Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Mon, 20 Dec 2021 17:15:30 +0100 Subject: [PATCH] Use new enums in systemmonitor (#62401) Co-authored-by: epenet --- .../components/systemmonitor/sensor.py | 52 +++++++++---------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/homeassistant/components/systemmonitor/sensor.py b/homeassistant/components/systemmonitor/sensor.py index 8bbdae820e3..5c6294107f8 100644 --- a/homeassistant/components/systemmonitor/sensor.py +++ b/homeassistant/components/systemmonitor/sensor.py @@ -16,10 +16,10 @@ import voluptuous as vol from homeassistant.components.sensor import ( PLATFORM_SCHEMA, - STATE_CLASS_MEASUREMENT, - STATE_CLASS_TOTAL_INCREASING, + SensorDeviceClass, SensorEntity, SensorEntityDescription, + SensorStateClass, ) from homeassistant.const import ( CONF_RESOURCES, @@ -28,8 +28,6 @@ from homeassistant.const import ( DATA_GIBIBYTES, DATA_MEBIBYTES, DATA_RATE_MEGABYTES_PER_SECOND, - DEVICE_CLASS_TEMPERATURE, - DEVICE_CLASS_TIMESTAMP, EVENT_HOMEASSISTANT_STOP, PERCENTAGE, STATE_OFF, @@ -80,21 +78,21 @@ SENSOR_TYPES: dict[str, SysMonitorSensorEntityDescription] = { name="Disk free", native_unit_of_measurement=DATA_GIBIBYTES, icon="mdi:harddisk", - state_class=STATE_CLASS_MEASUREMENT, + state_class=SensorStateClass.MEASUREMENT, ), "disk_use": SysMonitorSensorEntityDescription( key="disk_use", name="Disk use", native_unit_of_measurement=DATA_GIBIBYTES, icon="mdi:harddisk", - state_class=STATE_CLASS_MEASUREMENT, + state_class=SensorStateClass.MEASUREMENT, ), "disk_use_percent": SysMonitorSensorEntityDescription( key="disk_use_percent", name="Disk use (percent)", native_unit_of_measurement=PERCENTAGE, icon="mdi:harddisk", - state_class=STATE_CLASS_MEASUREMENT, + state_class=SensorStateClass.MEASUREMENT, ), "ipv4_address": SysMonitorSensorEntityDescription( key="ipv4_address", @@ -111,53 +109,53 @@ SENSOR_TYPES: dict[str, SysMonitorSensorEntityDescription] = { "last_boot": SysMonitorSensorEntityDescription( key="last_boot", name="Last boot", - device_class=DEVICE_CLASS_TIMESTAMP, + device_class=SensorDeviceClass.TIMESTAMP, ), "load_15m": SysMonitorSensorEntityDescription( key="load_15m", name="Load (15m)", icon=CPU_ICON, - state_class=STATE_CLASS_MEASUREMENT, + state_class=SensorStateClass.MEASUREMENT, ), "load_1m": SysMonitorSensorEntityDescription( key="load_1m", name="Load (1m)", icon=CPU_ICON, - state_class=STATE_CLASS_MEASUREMENT, + state_class=SensorStateClass.MEASUREMENT, ), "load_5m": SysMonitorSensorEntityDescription( key="load_5m", name="Load (5m)", icon=CPU_ICON, - state_class=STATE_CLASS_MEASUREMENT, + state_class=SensorStateClass.MEASUREMENT, ), "memory_free": SysMonitorSensorEntityDescription( key="memory_free", name="Memory free", native_unit_of_measurement=DATA_MEBIBYTES, icon="mdi:memory", - state_class=STATE_CLASS_MEASUREMENT, + state_class=SensorStateClass.MEASUREMENT, ), "memory_use": SysMonitorSensorEntityDescription( key="memory_use", name="Memory use", native_unit_of_measurement=DATA_MEBIBYTES, icon="mdi:memory", - state_class=STATE_CLASS_MEASUREMENT, + state_class=SensorStateClass.MEASUREMENT, ), "memory_use_percent": SysMonitorSensorEntityDescription( key="memory_use_percent", name="Memory use (percent)", native_unit_of_measurement=PERCENTAGE, icon="mdi:memory", - state_class=STATE_CLASS_MEASUREMENT, + state_class=SensorStateClass.MEASUREMENT, ), "network_in": SysMonitorSensorEntityDescription( key="network_in", name="Network in", native_unit_of_measurement=DATA_MEBIBYTES, icon="mdi:server-network", - state_class=STATE_CLASS_TOTAL_INCREASING, + state_class=SensorStateClass.TOTAL_INCREASING, mandatory_arg=True, ), "network_out": SysMonitorSensorEntityDescription( @@ -165,21 +163,21 @@ SENSOR_TYPES: dict[str, SysMonitorSensorEntityDescription] = { name="Network out", native_unit_of_measurement=DATA_MEBIBYTES, icon="mdi:server-network", - state_class=STATE_CLASS_TOTAL_INCREASING, + state_class=SensorStateClass.TOTAL_INCREASING, mandatory_arg=True, ), "packets_in": SysMonitorSensorEntityDescription( key="packets_in", name="Packets in", icon="mdi:server-network", - state_class=STATE_CLASS_TOTAL_INCREASING, + state_class=SensorStateClass.TOTAL_INCREASING, mandatory_arg=True, ), "packets_out": SysMonitorSensorEntityDescription( key="packets_out", name="Packets out", icon="mdi:server-network", - state_class=STATE_CLASS_TOTAL_INCREASING, + state_class=SensorStateClass.TOTAL_INCREASING, mandatory_arg=True, ), "throughput_network_in": SysMonitorSensorEntityDescription( @@ -187,7 +185,7 @@ SENSOR_TYPES: dict[str, SysMonitorSensorEntityDescription] = { name="Network throughput in", native_unit_of_measurement=DATA_RATE_MEGABYTES_PER_SECOND, icon="mdi:server-network", - state_class=STATE_CLASS_MEASUREMENT, + state_class=SensorStateClass.MEASUREMENT, mandatory_arg=True, ), "throughput_network_out": SysMonitorSensorEntityDescription( @@ -195,14 +193,14 @@ SENSOR_TYPES: dict[str, SysMonitorSensorEntityDescription] = { name="Network throughput out", native_unit_of_measurement=DATA_RATE_MEGABYTES_PER_SECOND, icon="mdi:server-network", - state_class=STATE_CLASS_MEASUREMENT, + state_class=SensorStateClass.MEASUREMENT, mandatory_arg=True, ), "process": SysMonitorSensorEntityDescription( key="process", name="Process", icon=CPU_ICON, - state_class=STATE_CLASS_MEASUREMENT, + state_class=SensorStateClass.MEASUREMENT, mandatory_arg=True, ), "processor_use": SysMonitorSensorEntityDescription( @@ -210,35 +208,35 @@ SENSOR_TYPES: dict[str, SysMonitorSensorEntityDescription] = { name="Processor use", native_unit_of_measurement=PERCENTAGE, icon=CPU_ICON, - state_class=STATE_CLASS_MEASUREMENT, + state_class=SensorStateClass.MEASUREMENT, ), "processor_temperature": SysMonitorSensorEntityDescription( key="processor_temperature", name="Processor temperature", native_unit_of_measurement=TEMP_CELSIUS, - device_class=DEVICE_CLASS_TEMPERATURE, - state_class=STATE_CLASS_MEASUREMENT, + device_class=SensorDeviceClass.TEMPERATURE, + state_class=SensorStateClass.MEASUREMENT, ), "swap_free": SysMonitorSensorEntityDescription( key="swap_free", name="Swap free", native_unit_of_measurement=DATA_MEBIBYTES, icon="mdi:harddisk", - state_class=STATE_CLASS_MEASUREMENT, + state_class=SensorStateClass.MEASUREMENT, ), "swap_use": SysMonitorSensorEntityDescription( key="swap_use", name="Swap use", native_unit_of_measurement=DATA_MEBIBYTES, icon="mdi:harddisk", - state_class=STATE_CLASS_MEASUREMENT, + state_class=SensorStateClass.MEASUREMENT, ), "swap_use_percent": SysMonitorSensorEntityDescription( key="swap_use_percent", name="Swap use (percent)", native_unit_of_measurement=PERCENTAGE, icon="mdi:harddisk", - state_class=STATE_CLASS_MEASUREMENT, + state_class=SensorStateClass.MEASUREMENT, ), }