diff --git a/homeassistant/components/sfr_box/binary_sensor.py b/homeassistant/components/sfr_box/binary_sensor.py index d90c1944aa4..8b3883c6eee 100644 --- a/homeassistant/components/sfr_box/binary_sensor.py +++ b/homeassistant/components/sfr_box/binary_sensor.py @@ -42,7 +42,7 @@ class SFRBoxBinarySensorEntityDescription( DSL_SENSOR_TYPES: tuple[SFRBoxBinarySensorEntityDescription[DslInfo], ...] = ( SFRBoxBinarySensorEntityDescription[DslInfo]( key="status", - name="Status", + name="DSL status", device_class=BinarySensorDeviceClass.CONNECTIVITY, entity_category=EntityCategory.DIAGNOSTIC, value_fn=lambda x: x.status == "up", diff --git a/homeassistant/components/sfr_box/sensor.py b/homeassistant/components/sfr_box/sensor.py index 5f4aadce7e2..48d1c16d0ff 100644 --- a/homeassistant/components/sfr_box/sensor.py +++ b/homeassistant/components/sfr_box/sensor.py @@ -46,28 +46,28 @@ class SFRBoxSensorEntityDescription(SensorEntityDescription, SFRBoxSensorMixin[_ DSL_SENSOR_TYPES: tuple[SFRBoxSensorEntityDescription[DslInfo], ...] = ( SFRBoxSensorEntityDescription[DslInfo]( key="linemode", - name="Line mode", + name="DSL line mode", entity_category=EntityCategory.DIAGNOSTIC, entity_registry_enabled_default=False, value_fn=lambda x: x.linemode, ), SFRBoxSensorEntityDescription[DslInfo]( key="counter", - name="Counter", + name="DSL counter", entity_category=EntityCategory.DIAGNOSTIC, entity_registry_enabled_default=False, value_fn=lambda x: x.counter, ), SFRBoxSensorEntityDescription[DslInfo]( key="crc", - name="CRC", + name="DSL CRC", entity_category=EntityCategory.DIAGNOSTIC, entity_registry_enabled_default=False, value_fn=lambda x: x.crc, ), SFRBoxSensorEntityDescription[DslInfo]( key="noise_down", - name="Noise down", + name="DSL noise down", device_class=SensorDeviceClass.SIGNAL_STRENGTH, entity_category=EntityCategory.DIAGNOSTIC, entity_registry_enabled_default=False, @@ -77,7 +77,7 @@ DSL_SENSOR_TYPES: tuple[SFRBoxSensorEntityDescription[DslInfo], ...] = ( ), SFRBoxSensorEntityDescription[DslInfo]( key="noise_up", - name="Noise up", + name="DSL noise up", device_class=SensorDeviceClass.SIGNAL_STRENGTH, entity_category=EntityCategory.DIAGNOSTIC, entity_registry_enabled_default=False, @@ -87,7 +87,7 @@ DSL_SENSOR_TYPES: tuple[SFRBoxSensorEntityDescription[DslInfo], ...] = ( ), SFRBoxSensorEntityDescription[DslInfo]( key="attenuation_down", - name="Attenuation down", + name="DSL attenuation down", device_class=SensorDeviceClass.SIGNAL_STRENGTH, entity_category=EntityCategory.DIAGNOSTIC, entity_registry_enabled_default=False, @@ -97,7 +97,7 @@ DSL_SENSOR_TYPES: tuple[SFRBoxSensorEntityDescription[DslInfo], ...] = ( ), SFRBoxSensorEntityDescription[DslInfo]( key="attenuation_up", - name="Attenuation up", + name="DSL attenuation up", device_class=SensorDeviceClass.SIGNAL_STRENGTH, entity_category=EntityCategory.DIAGNOSTIC, entity_registry_enabled_default=False, @@ -107,7 +107,7 @@ DSL_SENSOR_TYPES: tuple[SFRBoxSensorEntityDescription[DslInfo], ...] = ( ), SFRBoxSensorEntityDescription[DslInfo]( key="rate_down", - name="Rate down", + name="DSL rate down", device_class=SensorDeviceClass.DATA_RATE, native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND, state_class=SensorStateClass.MEASUREMENT, @@ -115,7 +115,7 @@ DSL_SENSOR_TYPES: tuple[SFRBoxSensorEntityDescription[DslInfo], ...] = ( ), SFRBoxSensorEntityDescription[DslInfo]( key="rate_up", - name="Rate up", + name="DSL rate up", device_class=SensorDeviceClass.DATA_RATE, native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND, state_class=SensorStateClass.MEASUREMENT, @@ -123,7 +123,7 @@ DSL_SENSOR_TYPES: tuple[SFRBoxSensorEntityDescription[DslInfo], ...] = ( ), SFRBoxSensorEntityDescription[DslInfo]( key="line_status", - name="Line status", + name="DSL line status", device_class=SensorDeviceClass.ENUM, entity_category=EntityCategory.DIAGNOSTIC, entity_registry_enabled_default=False, @@ -140,7 +140,7 @@ DSL_SENSOR_TYPES: tuple[SFRBoxSensorEntityDescription[DslInfo], ...] = ( ), SFRBoxSensorEntityDescription[DslInfo]( key="training", - name="Training", + name="DSL training", device_class=SensorDeviceClass.ENUM, entity_category=EntityCategory.DIAGNOSTIC, entity_registry_enabled_default=False, diff --git a/tests/components/sfr_box/const.py b/tests/components/sfr_box/const.py index 8b7513aaf8c..fb1694ebef0 100644 --- a/tests/components/sfr_box/const.py +++ b/tests/components/sfr_box/const.py @@ -45,7 +45,7 @@ EXPECTED_ENTITIES = { Platform.BINARY_SENSOR: [ { ATTR_DEVICE_CLASS: BinarySensorDeviceClass.CONNECTIVITY, - ATTR_ENTITY_ID: "binary_sensor.sfr_box_status", + ATTR_ENTITY_ID: "binary_sensor.sfr_box_dsl_status", ATTR_STATE: STATE_ON, ATTR_UNIQUE_ID: "e4:5d:51:00:11:22_dsl_status", }, @@ -85,26 +85,26 @@ EXPECTED_ENTITIES = { }, { ATTR_DEFAULT_DISABLED: True, - ATTR_ENTITY_ID: "sensor.sfr_box_line_mode", + ATTR_ENTITY_ID: "sensor.sfr_box_dsl_line_mode", ATTR_STATE: "ADSL2+", ATTR_UNIQUE_ID: "e4:5d:51:00:11:22_dsl_linemode", }, { ATTR_DEFAULT_DISABLED: True, - ATTR_ENTITY_ID: "sensor.sfr_box_counter", + ATTR_ENTITY_ID: "sensor.sfr_box_dsl_counter", ATTR_STATE: "16", ATTR_UNIQUE_ID: "e4:5d:51:00:11:22_dsl_counter", }, { ATTR_DEFAULT_DISABLED: True, - ATTR_ENTITY_ID: "sensor.sfr_box_crc", + ATTR_ENTITY_ID: "sensor.sfr_box_dsl_crc", ATTR_STATE: "0", ATTR_UNIQUE_ID: "e4:5d:51:00:11:22_dsl_crc", }, { ATTR_DEFAULT_DISABLED: True, ATTR_DEVICE_CLASS: SensorDeviceClass.SIGNAL_STRENGTH, - ATTR_ENTITY_ID: "sensor.sfr_box_noise_down", + ATTR_ENTITY_ID: "sensor.sfr_box_dsl_noise_down", ATTR_STATE: "5.8", ATTR_STATE_CLASS: SensorStateClass.MEASUREMENT, ATTR_UNIQUE_ID: "e4:5d:51:00:11:22_dsl_noise_down", @@ -113,7 +113,7 @@ EXPECTED_ENTITIES = { { ATTR_DEFAULT_DISABLED: True, ATTR_DEVICE_CLASS: SensorDeviceClass.SIGNAL_STRENGTH, - ATTR_ENTITY_ID: "sensor.sfr_box_noise_up", + ATTR_ENTITY_ID: "sensor.sfr_box_dsl_noise_up", ATTR_STATE: "6.0", ATTR_STATE_CLASS: SensorStateClass.MEASUREMENT, ATTR_UNIQUE_ID: "e4:5d:51:00:11:22_dsl_noise_up", @@ -122,7 +122,7 @@ EXPECTED_ENTITIES = { { ATTR_DEFAULT_DISABLED: True, ATTR_DEVICE_CLASS: SensorDeviceClass.SIGNAL_STRENGTH, - ATTR_ENTITY_ID: "sensor.sfr_box_attenuation_down", + ATTR_ENTITY_ID: "sensor.sfr_box_dsl_attenuation_down", ATTR_STATE: "28.5", ATTR_STATE_CLASS: SensorStateClass.MEASUREMENT, ATTR_UNIQUE_ID: "e4:5d:51:00:11:22_dsl_attenuation_down", @@ -131,7 +131,7 @@ EXPECTED_ENTITIES = { { ATTR_DEFAULT_DISABLED: True, ATTR_DEVICE_CLASS: SensorDeviceClass.SIGNAL_STRENGTH, - ATTR_ENTITY_ID: "sensor.sfr_box_attenuation_up", + ATTR_ENTITY_ID: "sensor.sfr_box_dsl_attenuation_up", ATTR_STATE: "20.8", ATTR_STATE_CLASS: SensorStateClass.MEASUREMENT, ATTR_UNIQUE_ID: "e4:5d:51:00:11:22_dsl_attenuation_up", @@ -139,7 +139,7 @@ EXPECTED_ENTITIES = { }, { ATTR_DEVICE_CLASS: SensorDeviceClass.DATA_RATE, - ATTR_ENTITY_ID: "sensor.sfr_box_rate_down", + ATTR_ENTITY_ID: "sensor.sfr_box_dsl_rate_down", ATTR_STATE: "5549", ATTR_STATE_CLASS: SensorStateClass.MEASUREMENT, ATTR_UNIQUE_ID: "e4:5d:51:00:11:22_dsl_rate_down", @@ -147,7 +147,7 @@ EXPECTED_ENTITIES = { }, { ATTR_DEVICE_CLASS: SensorDeviceClass.DATA_RATE, - ATTR_ENTITY_ID: "sensor.sfr_box_rate_up", + ATTR_ENTITY_ID: "sensor.sfr_box_dsl_rate_up", ATTR_STATE: "187", ATTR_STATE_CLASS: SensorStateClass.MEASUREMENT, ATTR_UNIQUE_ID: "e4:5d:51:00:11:22_dsl_rate_up", @@ -156,7 +156,7 @@ EXPECTED_ENTITIES = { { ATTR_DEFAULT_DISABLED: True, ATTR_DEVICE_CLASS: SensorDeviceClass.ENUM, - ATTR_ENTITY_ID: "sensor.sfr_box_line_status", + ATTR_ENTITY_ID: "sensor.sfr_box_dsl_line_status", ATTR_OPTIONS: [ "no_defect", "of_frame", @@ -171,7 +171,7 @@ EXPECTED_ENTITIES = { { ATTR_DEFAULT_DISABLED: True, ATTR_DEVICE_CLASS: SensorDeviceClass.ENUM, - ATTR_ENTITY_ID: "sensor.sfr_box_training", + ATTR_ENTITY_ID: "sensor.sfr_box_dsl_training", ATTR_OPTIONS: [ "idle", "g_994_training",