diff --git a/homeassistant/components/glances/sensor.py b/homeassistant/components/glances/sensor.py index a3578bf6f6613aeb010eed09c63b94b0ec2e8e53..2119e990e447da9b61981bb0bb2d5c3d48f18e68 100644 --- a/homeassistant/components/glances/sensor.py +++ b/homeassistant/components/glances/sensor.py @@ -13,15 +13,12 @@ from homeassistant.components.sensor import ( ) from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( - CONF_NAME, PERCENTAGE, REVOLUTIONS_PER_MINUTE, - Platform, UnitOfInformation, UnitOfTemperature, ) -from homeassistant.core import HomeAssistant, callback -from homeassistant.helpers import entity_registry as er +from homeassistant.core import HomeAssistant from homeassistant.helpers.device_registry import DeviceInfo from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.update_coordinator import CoordinatorEntity @@ -35,7 +32,6 @@ class GlancesSensorEntityDescriptionMixin: """Mixin for required keys.""" type: str - name_suffix: str @dataclass(frozen=True) @@ -49,7 +45,7 @@ SENSOR_TYPES = { ("fs", "disk_use_percent"): GlancesSensorEntityDescription( key="disk_use_percent", type="fs", - name_suffix="used percent", + translation_key="disk_usage", native_unit_of_measurement=PERCENTAGE, icon="mdi:harddisk", state_class=SensorStateClass.MEASUREMENT, @@ -57,7 +53,7 @@ SENSOR_TYPES = { ("fs", "disk_use"): GlancesSensorEntityDescription( key="disk_use", type="fs", - name_suffix="used", + translation_key="disk_used", native_unit_of_measurement=UnitOfInformation.GIBIBYTES, device_class=SensorDeviceClass.DATA_SIZE, icon="mdi:harddisk", @@ -66,7 +62,7 @@ SENSOR_TYPES = { ("fs", "disk_free"): GlancesSensorEntityDescription( key="disk_free", type="fs", - name_suffix="free", + translation_key="disk_free", native_unit_of_measurement=UnitOfInformation.GIBIBYTES, device_class=SensorDeviceClass.DATA_SIZE, icon="mdi:harddisk", @@ -75,7 +71,7 @@ SENSOR_TYPES = { ("mem", "memory_use_percent"): GlancesSensorEntityDescription( key="memory_use_percent", type="mem", - name_suffix="RAM used percent", + translation_key="memory_usage", native_unit_of_measurement=PERCENTAGE, icon="mdi:memory", state_class=SensorStateClass.MEASUREMENT, @@ -83,7 +79,7 @@ SENSOR_TYPES = { ("mem", "memory_use"): GlancesSensorEntityDescription( key="memory_use", type="mem", - name_suffix="RAM used", + translation_key="memory_used", native_unit_of_measurement=UnitOfInformation.MEBIBYTES, device_class=SensorDeviceClass.DATA_SIZE, icon="mdi:memory", @@ -92,7 +88,7 @@ SENSOR_TYPES = { ("mem", "memory_free"): GlancesSensorEntityDescription( key="memory_free", type="mem", - name_suffix="RAM free", + translation_key="memory_free", native_unit_of_measurement=UnitOfInformation.MEBIBYTES, device_class=SensorDeviceClass.DATA_SIZE, icon="mdi:memory", @@ -101,7 +97,7 @@ SENSOR_TYPES = { ("memswap", "swap_use_percent"): GlancesSensorEntityDescription( key="swap_use_percent", type="memswap", - name_suffix="Swap used percent", + translation_key="swap_usage", native_unit_of_measurement=PERCENTAGE, icon="mdi:memory", state_class=SensorStateClass.MEASUREMENT, @@ -109,7 +105,7 @@ SENSOR_TYPES = { ("memswap", "swap_use"): GlancesSensorEntityDescription( key="swap_use", type="memswap", - name_suffix="Swap used", + translation_key="swap_used", native_unit_of_measurement=UnitOfInformation.GIBIBYTES, device_class=SensorDeviceClass.DATA_SIZE, icon="mdi:memory", @@ -118,7 +114,7 @@ SENSOR_TYPES = { ("memswap", "swap_free"): GlancesSensorEntityDescription( key="swap_free", type="memswap", - name_suffix="Swap free", + translation_key="swap_free", native_unit_of_measurement=UnitOfInformation.GIBIBYTES, device_class=SensorDeviceClass.DATA_SIZE, icon="mdi:memory", @@ -127,42 +123,42 @@ SENSOR_TYPES = { ("load", "processor_load"): GlancesSensorEntityDescription( key="processor_load", type="load", - name_suffix="CPU load", + translation_key="processor_load", icon=CPU_ICON, state_class=SensorStateClass.MEASUREMENT, ), ("processcount", "process_running"): GlancesSensorEntityDescription( key="process_running", type="processcount", - name_suffix="Running", + translation_key="process_running", icon=CPU_ICON, state_class=SensorStateClass.MEASUREMENT, ), ("processcount", "process_total"): GlancesSensorEntityDescription( key="process_total", type="processcount", - name_suffix="Total", + translation_key="process_total", icon=CPU_ICON, state_class=SensorStateClass.MEASUREMENT, ), ("processcount", "process_thread"): GlancesSensorEntityDescription( key="process_thread", type="processcount", - name_suffix="Thread", + translation_key="process_threads", icon=CPU_ICON, state_class=SensorStateClass.MEASUREMENT, ), ("processcount", "process_sleeping"): GlancesSensorEntityDescription( key="process_sleeping", type="processcount", - name_suffix="Sleeping", + translation_key="process_sleeping", icon=CPU_ICON, state_class=SensorStateClass.MEASUREMENT, ), ("cpu", "cpu_use_percent"): GlancesSensorEntityDescription( key="cpu_use_percent", type="cpu", - name_suffix="CPU used", + translation_key="cpu_usage", native_unit_of_measurement=PERCENTAGE, icon=CPU_ICON, state_class=SensorStateClass.MEASUREMENT, @@ -170,7 +166,7 @@ SENSOR_TYPES = { ("sensors", "temperature_core"): GlancesSensorEntityDescription( key="temperature_core", type="sensors", - name_suffix="Temperature", + translation_key="temperature", native_unit_of_measurement=UnitOfTemperature.CELSIUS, device_class=SensorDeviceClass.TEMPERATURE, state_class=SensorStateClass.MEASUREMENT, @@ -178,7 +174,7 @@ SENSOR_TYPES = { ("sensors", "temperature_hdd"): GlancesSensorEntityDescription( key="temperature_hdd", type="sensors", - name_suffix="Temperature", + translation_key="temperature", native_unit_of_measurement=UnitOfTemperature.CELSIUS, device_class=SensorDeviceClass.TEMPERATURE, state_class=SensorStateClass.MEASUREMENT, @@ -186,7 +182,7 @@ SENSOR_TYPES = { ("sensors", "fan_speed"): GlancesSensorEntityDescription( key="fan_speed", type="sensors", - name_suffix="Fan speed", + translation_key="fan_speed", native_unit_of_measurement=REVOLUTIONS_PER_MINUTE, icon="mdi:fan", state_class=SensorStateClass.MEASUREMENT, @@ -194,7 +190,7 @@ SENSOR_TYPES = { ("sensors", "battery"): GlancesSensorEntityDescription( key="battery", type="sensors", - name_suffix="Charge", + translation_key="charge", native_unit_of_measurement=PERCENTAGE, device_class=SensorDeviceClass.BATTERY, icon="mdi:battery", @@ -203,14 +199,14 @@ SENSOR_TYPES = { ("docker", "docker_active"): GlancesSensorEntityDescription( key="docker_active", type="docker", - name_suffix="Containers active", + translation_key="container_active", icon="mdi:docker", state_class=SensorStateClass.MEASUREMENT, ), ("docker", "docker_cpu_use"): GlancesSensorEntityDescription( key="docker_cpu_use", type="docker", - name_suffix="Containers CPU used", + translation_key="container_cpu_usage", native_unit_of_measurement=PERCENTAGE, icon="mdi:docker", state_class=SensorStateClass.MEASUREMENT, @@ -218,7 +214,7 @@ SENSOR_TYPES = { ("docker", "docker_memory_use"): GlancesSensorEntityDescription( key="docker_memory_use", type="docker", - name_suffix="Containers RAM used", + translation_key="container_memory_used", native_unit_of_measurement=UnitOfInformation.MEBIBYTES, device_class=SensorDeviceClass.DATA_SIZE, icon="mdi:docker", @@ -227,14 +223,14 @@ SENSOR_TYPES = { ("raid", "available"): GlancesSensorEntityDescription( key="available", type="raid", - name_suffix="Raid available", + translation_key="raid_available", icon="mdi:harddisk", state_class=SensorStateClass.MEASUREMENT, ), ("raid", "used"): GlancesSensorEntityDescription( key="used", type="raid", - name_suffix="Raid used", + translation_key="raid_used", icon="mdi:harddisk", state_class=SensorStateClass.MEASUREMENT, ), @@ -249,54 +245,26 @@ async def async_setup_entry( """Set up the Glances sensors.""" coordinator: GlancesDataUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id] - name = config_entry.data.get(CONF_NAME) entities = [] - @callback - def _migrate_old_unique_ids( - hass: HomeAssistant, old_unique_id: str, new_key: str - ) -> None: - """Migrate unique IDs to the new format.""" - ent_reg = er.async_get(hass) - - if entity_id := ent_reg.async_get_entity_id( - Platform.SENSOR, DOMAIN, old_unique_id - ): - ent_reg.async_update_entity( - entity_id, new_unique_id=f"{config_entry.entry_id}-{new_key}" - ) - for sensor_type, sensors in coordinator.data.items(): if sensor_type in ["fs", "sensors", "raid"]: for sensor_label, params in sensors.items(): for param in params: if sensor_description := SENSOR_TYPES.get((sensor_type, param)): - _migrate_old_unique_ids( - hass, - f"{coordinator.host}-{name} {sensor_label} {sensor_description.name_suffix}", - f"{sensor_label}-{sensor_description.key}", - ) entities.append( GlancesSensor( coordinator, - name, - sensor_label, sensor_description, + sensor_label, ) ) else: for sensor in sensors: if sensor_description := SENSOR_TYPES.get((sensor_type, sensor)): - _migrate_old_unique_ids( - hass, - f"{coordinator.host}-{name} {sensor_description.name_suffix}", - f"-{sensor_description.key}", - ) entities.append( GlancesSensor( coordinator, - name, - "", sensor_description, ) ) @@ -313,21 +281,23 @@ class GlancesSensor(CoordinatorEntity[GlancesDataUpdateCoordinator], SensorEntit def __init__( self, coordinator: GlancesDataUpdateCoordinator, - name: str | None, - sensor_name_prefix: str, description: GlancesSensorEntityDescription, + sensor_label: str = "", ) -> None: """Initialize the sensor.""" super().__init__(coordinator) - self._sensor_name_prefix = sensor_name_prefix + self._sensor_label = sensor_label self.entity_description = description - self._attr_name = f"{sensor_name_prefix} {description.name_suffix}".strip() + if sensor_label: + self._attr_translation_placeholders = {"sensor_label": sensor_label} self._attr_device_info = DeviceInfo( identifiers={(DOMAIN, coordinator.config_entry.entry_id)}, manufacturer="Glances", - name=name or coordinator.host, + name=coordinator.host, + ) + self._attr_unique_id = ( + f"{coordinator.config_entry.entry_id}-{sensor_label}-{description.key}" ) - self._attr_unique_id = f"{coordinator.config_entry.entry_id}-{sensor_name_prefix}-{description.key}" @property def available(self) -> bool: @@ -346,8 +316,8 @@ class GlancesSensor(CoordinatorEntity[GlancesDataUpdateCoordinator], SensorEntit """Return the state of the resources.""" value = self.coordinator.data[self.entity_description.type] - if isinstance(value.get(self._sensor_name_prefix), dict): + if isinstance(value.get(self._sensor_label), dict): return cast( - StateType, value[self._sensor_name_prefix][self.entity_description.key] + StateType, value[self._sensor_label][self.entity_description.key] ) return cast(StateType, value[self.entity_description.key]) diff --git a/homeassistant/components/glances/strings.json b/homeassistant/components/glances/strings.json index 7e69e7f7912f6cc43a366a6f122180d507af908d..972106d352f7354958da2ae583627f217124a06c 100644 --- a/homeassistant/components/glances/strings.json +++ b/homeassistant/components/glances/strings.json @@ -30,6 +30,79 @@ "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]" } }, + "entity": { + "sensor": { + "disk_usage": { + "name": "{sensor_label} disk usage" + }, + "disk_used": { + "name": "{sensor_label} disk used" + }, + "disk_free": { + "name": "{sensor_label} disk free" + }, + "memory_usage": { + "name": "Memory usage" + }, + "memory_use": { + "name": "Memory use" + }, + "memory_free": { + "name": "Memory free" + }, + "swap_usage": { + "name": "Swap usage" + }, + "swap_use": { + "name": "Swap use" + }, + "swap_free": { + "name": "Swap free" + }, + "cpu_load": { + "name": "CPU load" + }, + "process_running": { + "name": "Running" + }, + "process_total": { + "name": "Total" + }, + "process_threads": { + "name": "Threads" + }, + "process_sleeping": { + "name": "Sleeping" + }, + "cpu_usage": { + "name": "CPU usage" + }, + "temperature": { + "name": "{sensor_label} temperature" + }, + "fan_speed": { + "name": "{sensor_label} fan speed" + }, + "charge": { + "name": "{sensor_label} charge" + }, + "container_active": { + "name": "Containers active" + }, + "container_cpu_usage": { + "name": "Containers CPU usage" + }, + "container_memory_used": { + "name": "Containers memory used" + }, + "raid_available": { + "name": "{sensor_label} available" + }, + "raid_used": { + "name": "{sensor_label} used" + } + } + }, "issues": { "deprecated_version": { "title": "Glances servers with version 2 is deprecated", diff --git a/tests/components/glances/snapshots/test_sensor.ambr b/tests/components/glances/snapshots/test_sensor.ambr index 0dbdec5471473aee2933793379305c2d890300f9..d08064e86471c0e33bb00b124446ba1415a85be7 100644 --- a/tests/components/glances/snapshots/test_sensor.ambr +++ b/tests/components/glances/snapshots/test_sensor.ambr @@ -27,7 +27,7 @@ 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, + 'translation_key': 'container_active', 'unique_id': 'test--docker_active', 'unit_of_measurement': None, }) @@ -46,7 +46,7 @@ 'state': '2', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_containers_cpu_used-entry] +# name: test_sensor_states[sensor.0_0_0_0_containers_cpu_usage-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -60,7 +60,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_containers_cpu_used', + 'entity_id': 'sensor.0_0_0_0_containers_cpu_usage', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -70,31 +70,31 @@ }), 'original_device_class': None, 'original_icon': 'mdi:docker', - 'original_name': 'Containers CPU used', + 'original_name': 'Containers CPU usage', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, + 'translation_key': 'container_cpu_usage', 'unique_id': 'test--docker_cpu_use', 'unit_of_measurement': '%', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_containers_cpu_used-state] +# name: test_sensor_states[sensor.0_0_0_0_containers_cpu_usage-state] StateSnapshot({ 'attributes': ReadOnlyDict({ - 'friendly_name': '0.0.0.0 Containers CPU used', + 'friendly_name': '0.0.0.0 Containers CPU usage', 'icon': 'mdi:docker', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, 'unit_of_measurement': '%', }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_containers_cpu_used', + 'entity_id': 'sensor.0_0_0_0_containers_cpu_usage', 'last_changed': <ANY>, 'last_updated': <ANY>, 'state': '77.2', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_containers_ram_used-entry] +# name: test_sensor_states[sensor.0_0_0_0_containers_memory_used-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -108,7 +108,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_containers_ram_used', + 'entity_id': 'sensor.0_0_0_0_containers_memory_used', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -118,26 +118,26 @@ }), 'original_device_class': <SensorDeviceClass.DATA_SIZE: 'data_size'>, 'original_icon': 'mdi:docker', - 'original_name': 'Containers RAM used', + 'original_name': 'Containers memory used', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, + 'translation_key': 'container_memory_used', 'unique_id': 'test--docker_memory_use', 'unit_of_measurement': <UnitOfInformation.MEBIBYTES: 'MiB'>, }) # --- -# name: test_sensor_states[sensor.0_0_0_0_containers_ram_used-state] +# name: test_sensor_states[sensor.0_0_0_0_containers_memory_used-state] StateSnapshot({ 'attributes': ReadOnlyDict({ 'device_class': 'data_size', - 'friendly_name': '0.0.0.0 Containers RAM used', + 'friendly_name': '0.0.0.0 Containers memory used', 'icon': 'mdi:docker', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, 'unit_of_measurement': <UnitOfInformation.MEBIBYTES: 'MiB'>, }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_containers_ram_used', + 'entity_id': 'sensor.0_0_0_0_containers_memory_used', 'last_changed': <ANY>, 'last_updated': <ANY>, 'state': '1149.6', @@ -167,11 +167,11 @@ }), 'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>, 'original_icon': None, - 'original_name': 'cpu_thermal 1 Temperature', + 'original_name': 'cpu_thermal 1 temperature', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, + 'translation_key': 'temperature', 'unique_id': 'test-cpu_thermal 1-temperature_core', 'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>, }) @@ -180,7 +180,7 @@ StateSnapshot({ 'attributes': ReadOnlyDict({ 'device_class': 'temperature', - 'friendly_name': '0.0.0.0 cpu_thermal 1 Temperature', + 'friendly_name': '0.0.0.0 cpu_thermal 1 temperature', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, 'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>, }), @@ -191,7 +191,7 @@ 'state': '59', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_err_temp_temperature-entry] +# name: test_sensor_states[sensor.0_0_0_0_data_size-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -205,7 +205,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_err_temp_temperature', + 'entity_id': 'sensor.0_0_0_0_data_size', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -213,33 +213,34 @@ 'name': None, 'options': dict({ }), - 'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>, - 'original_icon': None, - 'original_name': 'err_temp Temperature', + 'original_device_class': <SensorDeviceClass.DATA_SIZE: 'data_size'>, + 'original_icon': 'mdi:memory', + 'original_name': 'Data size', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, - 'unique_id': 'test-err_temp-temperature_hdd', - 'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>, + 'translation_key': 'memory_used', + 'unique_id': 'test--memory_use', + 'unit_of_measurement': <UnitOfInformation.MEBIBYTES: 'MiB'>, }) # --- -# name: test_sensor_states[sensor.0_0_0_0_err_temp_temperature-state] +# name: test_sensor_states[sensor.0_0_0_0_data_size-state] StateSnapshot({ 'attributes': ReadOnlyDict({ - 'device_class': 'temperature', - 'friendly_name': '0.0.0.0 err_temp Temperature', + 'device_class': 'data_size', + 'friendly_name': '0.0.0.0 Data size', + 'icon': 'mdi:memory', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, - 'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>, + 'unit_of_measurement': <UnitOfInformation.MEBIBYTES: 'MiB'>, }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_err_temp_temperature', + 'entity_id': 'sensor.0_0_0_0_data_size', 'last_changed': <ANY>, 'last_updated': <ANY>, - 'state': 'unavailable', + 'state': '1047.1', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_md1_raid_available-entry] +# name: test_sensor_states[sensor.0_0_0_0_err_temp_temperature-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -253,7 +254,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_md1_raid_available', + 'entity_id': 'sensor.0_0_0_0_err_temp_temperature', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -261,32 +262,33 @@ 'name': None, 'options': dict({ }), - 'original_device_class': None, - 'original_icon': 'mdi:harddisk', - 'original_name': 'md1 Raid available', + 'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>, + 'original_icon': None, + 'original_name': 'err_temp temperature', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, - 'unique_id': 'test-md1-available', - 'unit_of_measurement': None, + 'translation_key': 'temperature', + 'unique_id': 'test-err_temp-temperature_hdd', + 'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>, }) # --- -# name: test_sensor_states[sensor.0_0_0_0_md1_raid_available-state] +# name: test_sensor_states[sensor.0_0_0_0_err_temp_temperature-state] StateSnapshot({ 'attributes': ReadOnlyDict({ - 'friendly_name': '0.0.0.0 md1 Raid available', - 'icon': 'mdi:harddisk', + 'device_class': 'temperature', + 'friendly_name': '0.0.0.0 err_temp temperature', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, + 'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>, }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_md1_raid_available', + 'entity_id': 'sensor.0_0_0_0_err_temp_temperature', 'last_changed': <ANY>, 'last_updated': <ANY>, - 'state': '2', + 'state': 'unavailable', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_md1_raid_used-entry] +# name: test_sensor_states[sensor.0_0_0_0_md1_available-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -300,7 +302,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_md1_raid_used', + 'entity_id': 'sensor.0_0_0_0_md1_available', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -310,30 +312,30 @@ }), 'original_device_class': None, 'original_icon': 'mdi:harddisk', - 'original_name': 'md1 Raid used', + 'original_name': 'md1 available', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, - 'unique_id': 'test-md1-used', + 'translation_key': 'raid_available', + 'unique_id': 'test-md1-available', 'unit_of_measurement': None, }) # --- -# name: test_sensor_states[sensor.0_0_0_0_md1_raid_used-state] +# name: test_sensor_states[sensor.0_0_0_0_md1_available-state] StateSnapshot({ 'attributes': ReadOnlyDict({ - 'friendly_name': '0.0.0.0 md1 Raid used', + 'friendly_name': '0.0.0.0 md1 available', 'icon': 'mdi:harddisk', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_md1_raid_used', + 'entity_id': 'sensor.0_0_0_0_md1_available', 'last_changed': <ANY>, 'last_updated': <ANY>, 'state': '2', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_md3_raid_available-entry] +# name: test_sensor_states[sensor.0_0_0_0_md1_used-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -347,7 +349,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_md3_raid_available', + 'entity_id': 'sensor.0_0_0_0_md1_used', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -357,30 +359,30 @@ }), 'original_device_class': None, 'original_icon': 'mdi:harddisk', - 'original_name': 'md3 Raid available', + 'original_name': 'md1 used', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, - 'unique_id': 'test-md3-available', + 'translation_key': 'raid_used', + 'unique_id': 'test-md1-used', 'unit_of_measurement': None, }) # --- -# name: test_sensor_states[sensor.0_0_0_0_md3_raid_available-state] +# name: test_sensor_states[sensor.0_0_0_0_md1_used-state] StateSnapshot({ 'attributes': ReadOnlyDict({ - 'friendly_name': '0.0.0.0 md3 Raid available', + 'friendly_name': '0.0.0.0 md1 used', 'icon': 'mdi:harddisk', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_md3_raid_available', + 'entity_id': 'sensor.0_0_0_0_md1_used', 'last_changed': <ANY>, 'last_updated': <ANY>, 'state': '2', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_md3_raid_used-entry] +# name: test_sensor_states[sensor.0_0_0_0_md3_available-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -394,7 +396,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_md3_raid_used', + 'entity_id': 'sensor.0_0_0_0_md3_available', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -404,30 +406,30 @@ }), 'original_device_class': None, 'original_icon': 'mdi:harddisk', - 'original_name': 'md3 Raid used', + 'original_name': 'md3 available', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, - 'unique_id': 'test-md3-used', + 'translation_key': 'raid_available', + 'unique_id': 'test-md3-available', 'unit_of_measurement': None, }) # --- -# name: test_sensor_states[sensor.0_0_0_0_md3_raid_used-state] +# name: test_sensor_states[sensor.0_0_0_0_md3_available-state] StateSnapshot({ 'attributes': ReadOnlyDict({ - 'friendly_name': '0.0.0.0 md3 Raid used', + 'friendly_name': '0.0.0.0 md3 available', 'icon': 'mdi:harddisk', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_md3_raid_used', + 'entity_id': 'sensor.0_0_0_0_md3_available', 'last_changed': <ANY>, 'last_updated': <ANY>, 'state': '2', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_media_free-entry] +# name: test_sensor_states[sensor.0_0_0_0_md3_used-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -441,7 +443,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_media_free', + 'entity_id': 'sensor.0_0_0_0_md3_used', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -449,34 +451,32 @@ 'name': None, 'options': dict({ }), - 'original_device_class': <SensorDeviceClass.DATA_SIZE: 'data_size'>, + 'original_device_class': None, 'original_icon': 'mdi:harddisk', - 'original_name': '/media free', + 'original_name': 'md3 used', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, - 'unique_id': 'test-/media-disk_free', - 'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>, + 'translation_key': 'raid_used', + 'unique_id': 'test-md3-used', + 'unit_of_measurement': None, }) # --- -# name: test_sensor_states[sensor.0_0_0_0_media_free-state] +# name: test_sensor_states[sensor.0_0_0_0_md3_used-state] StateSnapshot({ 'attributes': ReadOnlyDict({ - 'device_class': 'data_size', - 'friendly_name': '0.0.0.0 /media free', + 'friendly_name': '0.0.0.0 md3 used', 'icon': 'mdi:harddisk', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, - 'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>, }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_media_free', + 'entity_id': 'sensor.0_0_0_0_md3_used', 'last_changed': <ANY>, 'last_updated': <ANY>, - 'state': '426.5', + 'state': '2', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_media_used-entry] +# name: test_sensor_states[sensor.0_0_0_0_media_disk_free-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -490,7 +490,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_media_used', + 'entity_id': 'sensor.0_0_0_0_media_disk_free', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -500,32 +500,32 @@ }), 'original_device_class': <SensorDeviceClass.DATA_SIZE: 'data_size'>, 'original_icon': 'mdi:harddisk', - 'original_name': '/media used', + 'original_name': '/media disk free', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, - 'unique_id': 'test-/media-disk_use', + 'translation_key': 'disk_free', + 'unique_id': 'test-/media-disk_free', 'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>, }) # --- -# name: test_sensor_states[sensor.0_0_0_0_media_used-state] +# name: test_sensor_states[sensor.0_0_0_0_media_disk_free-state] StateSnapshot({ 'attributes': ReadOnlyDict({ 'device_class': 'data_size', - 'friendly_name': '0.0.0.0 /media used', + 'friendly_name': '0.0.0.0 /media disk free', 'icon': 'mdi:harddisk', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, 'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>, }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_media_used', + 'entity_id': 'sensor.0_0_0_0_media_disk_free', 'last_changed': <ANY>, 'last_updated': <ANY>, - 'state': '30.7', + 'state': '426.5', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_media_used_percent-entry] +# name: test_sensor_states[sensor.0_0_0_0_media_disk_usage-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -539,7 +539,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_media_used_percent', + 'entity_id': 'sensor.0_0_0_0_media_disk_usage', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -549,31 +549,31 @@ }), 'original_device_class': None, 'original_icon': 'mdi:harddisk', - 'original_name': '/media used percent', + 'original_name': '/media disk usage', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, + 'translation_key': 'disk_usage', 'unique_id': 'test-/media-disk_use_percent', 'unit_of_measurement': '%', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_media_used_percent-state] +# name: test_sensor_states[sensor.0_0_0_0_media_disk_usage-state] StateSnapshot({ 'attributes': ReadOnlyDict({ - 'friendly_name': '0.0.0.0 /media used percent', + 'friendly_name': '0.0.0.0 /media disk usage', 'icon': 'mdi:harddisk', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, 'unit_of_measurement': '%', }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_media_used_percent', + 'entity_id': 'sensor.0_0_0_0_media_disk_usage', 'last_changed': <ANY>, 'last_updated': <ANY>, 'state': '6.7', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_na_temp_temperature-entry] +# name: test_sensor_states[sensor.0_0_0_0_media_disk_used-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -587,7 +587,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_na_temp_temperature', + 'entity_id': 'sensor.0_0_0_0_media_disk_used', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -595,33 +595,34 @@ 'name': None, 'options': dict({ }), - 'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>, - 'original_icon': None, - 'original_name': 'na_temp Temperature', + 'original_device_class': <SensorDeviceClass.DATA_SIZE: 'data_size'>, + 'original_icon': 'mdi:harddisk', + 'original_name': '/media disk used', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, - 'unique_id': 'test-na_temp-temperature_hdd', - 'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>, + 'translation_key': 'disk_used', + 'unique_id': 'test-/media-disk_use', + 'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>, }) # --- -# name: test_sensor_states[sensor.0_0_0_0_na_temp_temperature-state] +# name: test_sensor_states[sensor.0_0_0_0_media_disk_used-state] StateSnapshot({ 'attributes': ReadOnlyDict({ - 'device_class': 'temperature', - 'friendly_name': '0.0.0.0 na_temp Temperature', + 'device_class': 'data_size', + 'friendly_name': '0.0.0.0 /media disk used', + 'icon': 'mdi:harddisk', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, - 'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>, + 'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>, }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_na_temp_temperature', + 'entity_id': 'sensor.0_0_0_0_media_disk_used', 'last_changed': <ANY>, 'last_updated': <ANY>, - 'state': 'unavailable', + 'state': '30.7', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_ram_free-entry] +# name: test_sensor_states[sensor.0_0_0_0_memory_free-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -635,7 +636,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_ram_free', + 'entity_id': 'sensor.0_0_0_0_memory_free', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -645,32 +646,32 @@ }), 'original_device_class': <SensorDeviceClass.DATA_SIZE: 'data_size'>, 'original_icon': 'mdi:memory', - 'original_name': 'RAM free', + 'original_name': 'Memory free', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, + 'translation_key': 'memory_free', 'unique_id': 'test--memory_free', 'unit_of_measurement': <UnitOfInformation.MEBIBYTES: 'MiB'>, }) # --- -# name: test_sensor_states[sensor.0_0_0_0_ram_free-state] +# name: test_sensor_states[sensor.0_0_0_0_memory_free-state] StateSnapshot({ 'attributes': ReadOnlyDict({ 'device_class': 'data_size', - 'friendly_name': '0.0.0.0 RAM free', + 'friendly_name': '0.0.0.0 Memory free', 'icon': 'mdi:memory', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, 'unit_of_measurement': <UnitOfInformation.MEBIBYTES: 'MiB'>, }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_ram_free', + 'entity_id': 'sensor.0_0_0_0_memory_free', 'last_changed': <ANY>, 'last_updated': <ANY>, 'state': '2745.0', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_ram_used-entry] +# name: test_sensor_states[sensor.0_0_0_0_memory_usage-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -684,7 +685,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_ram_used', + 'entity_id': 'sensor.0_0_0_0_memory_usage', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -692,34 +693,33 @@ 'name': None, 'options': dict({ }), - 'original_device_class': <SensorDeviceClass.DATA_SIZE: 'data_size'>, + 'original_device_class': None, 'original_icon': 'mdi:memory', - 'original_name': 'RAM used', + 'original_name': 'Memory usage', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, - 'unique_id': 'test--memory_use', - 'unit_of_measurement': <UnitOfInformation.MEBIBYTES: 'MiB'>, + 'translation_key': 'memory_usage', + 'unique_id': 'test--memory_use_percent', + 'unit_of_measurement': '%', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_ram_used-state] +# name: test_sensor_states[sensor.0_0_0_0_memory_usage-state] StateSnapshot({ 'attributes': ReadOnlyDict({ - 'device_class': 'data_size', - 'friendly_name': '0.0.0.0 RAM used', + 'friendly_name': '0.0.0.0 Memory usage', 'icon': 'mdi:memory', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, - 'unit_of_measurement': <UnitOfInformation.MEBIBYTES: 'MiB'>, + 'unit_of_measurement': '%', }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_ram_used', + 'entity_id': 'sensor.0_0_0_0_memory_usage', 'last_changed': <ANY>, 'last_updated': <ANY>, - 'state': '1047.1', + 'state': '27.6', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_ram_used_percent-entry] +# name: test_sensor_states[sensor.0_0_0_0_na_temp_temperature-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -733,7 +733,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_ram_used_percent', + 'entity_id': 'sensor.0_0_0_0_na_temp_temperature', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -741,33 +741,33 @@ 'name': None, 'options': dict({ }), - 'original_device_class': None, - 'original_icon': 'mdi:memory', - 'original_name': 'RAM used percent', + 'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>, + 'original_icon': None, + 'original_name': 'na_temp temperature', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, - 'unique_id': 'test--memory_use_percent', - 'unit_of_measurement': '%', + 'translation_key': 'temperature', + 'unique_id': 'test-na_temp-temperature_hdd', + 'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>, }) # --- -# name: test_sensor_states[sensor.0_0_0_0_ram_used_percent-state] +# name: test_sensor_states[sensor.0_0_0_0_na_temp_temperature-state] StateSnapshot({ 'attributes': ReadOnlyDict({ - 'friendly_name': '0.0.0.0 RAM used percent', - 'icon': 'mdi:memory', + 'device_class': 'temperature', + 'friendly_name': '0.0.0.0 na_temp temperature', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, - 'unit_of_measurement': '%', + 'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>, }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_ram_used_percent', + 'entity_id': 'sensor.0_0_0_0_na_temp_temperature', 'last_changed': <ANY>, 'last_updated': <ANY>, - 'state': '27.6', + 'state': 'unavailable', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_ssl_free-entry] +# name: test_sensor_states[sensor.0_0_0_0_ssl_disk_free-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -781,7 +781,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_ssl_free', + 'entity_id': 'sensor.0_0_0_0_ssl_disk_free', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -791,32 +791,32 @@ }), 'original_device_class': <SensorDeviceClass.DATA_SIZE: 'data_size'>, 'original_icon': 'mdi:harddisk', - 'original_name': '/ssl free', + 'original_name': '/ssl disk free', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, + 'translation_key': 'disk_free', 'unique_id': 'test-/ssl-disk_free', 'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>, }) # --- -# name: test_sensor_states[sensor.0_0_0_0_ssl_free-state] +# name: test_sensor_states[sensor.0_0_0_0_ssl_disk_free-state] StateSnapshot({ 'attributes': ReadOnlyDict({ 'device_class': 'data_size', - 'friendly_name': '0.0.0.0 /ssl free', + 'friendly_name': '0.0.0.0 /ssl disk free', 'icon': 'mdi:harddisk', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, 'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>, }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_ssl_free', + 'entity_id': 'sensor.0_0_0_0_ssl_disk_free', 'last_changed': <ANY>, 'last_updated': <ANY>, 'state': '426.5', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_ssl_used-entry] +# name: test_sensor_states[sensor.0_0_0_0_ssl_disk_usage-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -830,7 +830,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_ssl_used', + 'entity_id': 'sensor.0_0_0_0_ssl_disk_usage', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -838,34 +838,33 @@ 'name': None, 'options': dict({ }), - 'original_device_class': <SensorDeviceClass.DATA_SIZE: 'data_size'>, + 'original_device_class': None, 'original_icon': 'mdi:harddisk', - 'original_name': '/ssl used', + 'original_name': '/ssl disk usage', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, - 'unique_id': 'test-/ssl-disk_use', - 'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>, + 'translation_key': 'disk_usage', + 'unique_id': 'test-/ssl-disk_use_percent', + 'unit_of_measurement': '%', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_ssl_used-state] +# name: test_sensor_states[sensor.0_0_0_0_ssl_disk_usage-state] StateSnapshot({ 'attributes': ReadOnlyDict({ - 'device_class': 'data_size', - 'friendly_name': '0.0.0.0 /ssl used', + 'friendly_name': '0.0.0.0 /ssl disk usage', 'icon': 'mdi:harddisk', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, - 'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>, + 'unit_of_measurement': '%', }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_ssl_used', + 'entity_id': 'sensor.0_0_0_0_ssl_disk_usage', 'last_changed': <ANY>, 'last_updated': <ANY>, - 'state': '30.7', + 'state': '6.7', }) # --- -# name: test_sensor_states[sensor.0_0_0_0_ssl_used_percent-entry] +# name: test_sensor_states[sensor.0_0_0_0_ssl_disk_used-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ }), @@ -879,7 +878,7 @@ 'disabled_by': None, 'domain': 'sensor', 'entity_category': None, - 'entity_id': 'sensor.0_0_0_0_ssl_used_percent', + 'entity_id': 'sensor.0_0_0_0_ssl_disk_used', 'has_entity_name': True, 'hidden_by': None, 'icon': None, @@ -887,29 +886,30 @@ 'name': None, 'options': dict({ }), - 'original_device_class': None, + 'original_device_class': <SensorDeviceClass.DATA_SIZE: 'data_size'>, 'original_icon': 'mdi:harddisk', - 'original_name': '/ssl used percent', + 'original_name': '/ssl disk used', 'platform': 'glances', 'previous_unique_id': None, 'supported_features': 0, - 'translation_key': None, - 'unique_id': 'test-/ssl-disk_use_percent', - 'unit_of_measurement': '%', + 'translation_key': 'disk_used', + 'unique_id': 'test-/ssl-disk_use', + 'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>, }) # --- -# name: test_sensor_states[sensor.0_0_0_0_ssl_used_percent-state] +# name: test_sensor_states[sensor.0_0_0_0_ssl_disk_used-state] StateSnapshot({ 'attributes': ReadOnlyDict({ - 'friendly_name': '0.0.0.0 /ssl used percent', + 'device_class': 'data_size', + 'friendly_name': '0.0.0.0 /ssl disk used', 'icon': 'mdi:harddisk', 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, - 'unit_of_measurement': '%', + 'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>, }), 'context': <ANY>, - 'entity_id': 'sensor.0_0_0_0_ssl_used_percent', + 'entity_id': 'sensor.0_0_0_0_ssl_disk_used', 'last_changed': <ANY>, 'last_updated': <ANY>, - 'state': '6.7', + 'state': '30.7', }) # --- diff --git a/tests/components/glances/test_sensor.py b/tests/components/glances/test_sensor.py index 7369bb927ffc16c9d1f1d170bd9477e7a6021ed5..aeef1de0b09e14d81d61a8780080b5d1169d428a 100644 --- a/tests/components/glances/test_sensor.py +++ b/tests/components/glances/test_sensor.py @@ -1,9 +1,7 @@ """Tests for glances sensors.""" -import pytest from syrupy import SnapshotAssertion from homeassistant.components.glances.const import DOMAIN -from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er @@ -29,48 +27,3 @@ async def test_sensor_states( assert hass.states.get(entity_entry.entity_id) == snapshot( name=f"{entity_entry.entity_id}-state" ) - - -@pytest.mark.parametrize( - ("object_id", "old_unique_id", "new_unique_id"), - [ - ( - "glances_ssl_used_percent", - "0.0.0.0-Glances /ssl used percent", - "/ssl-disk_use_percent", - ), - ( - "glances_cpu_thermal_1_temperature", - "0.0.0.0-Glances cpu_thermal 1 Temperature", - "cpu_thermal 1-temperature_core", - ), - ], -) -async def test_migrate_unique_id( - hass: HomeAssistant, - entity_registry: er.EntityRegistry, - object_id: str, - old_unique_id: str, - new_unique_id: str, -) -> None: - """Test unique id migration.""" - old_config_data = {**MOCK_USER_INPUT, "name": "Glances"} - entry = MockConfigEntry(domain=DOMAIN, data=old_config_data) - entry.add_to_hass(hass) - - entity: er.RegistryEntry = entity_registry.async_get_or_create( - suggested_object_id=object_id, - disabled_by=None, - domain=SENSOR_DOMAIN, - platform=DOMAIN, - unique_id=old_unique_id, - config_entry=entry, - ) - assert entity.unique_id == old_unique_id - - assert await hass.config_entries.async_setup(entry.entry_id) - await hass.async_block_till_done() - - entity_migrated = entity_registry.async_get(entity.entity_id) - assert entity_migrated - assert entity_migrated.unique_id == f"{entry.entry_id}-{new_unique_id}"