1
0
mirror of https://github.com/esphome/esphome.git synced 2025-10-29 22:24:26 +00:00

[entity] Allow `device_id` to be blank on entities (#10217)

This commit is contained in:
Jesse Hills
2025-08-14 09:42:11 +12:00
parent 1c2e1ab3e5
commit 7922462bcf
5 changed files with 63 additions and 5 deletions

View File

@@ -55,6 +55,12 @@ sensor:
lambda: return 4.0;
update_interval: 0.1s
- platform: template
name: Living Room Sensor
device_id: ""
lambda: return 5.0;
update_interval: 0.1s
# Switches with the same name on different devices to test device_id lookup
switch:
# Switch with no device_id (defaults to 0)
@@ -96,3 +102,23 @@ switch:
- logger.log: "Turning on Test Switch on Motion Detector"
turn_off_action:
- logger.log: "Turning off Test Switch on Motion Detector"
- platform: template
name: Living Room Blank Switch
device_id: ""
id: test_switch_blank_living_room
optimistic: true
turn_on_action:
- logger.log: "Turning on Living Room Blank Switch"
turn_off_action:
- logger.log: "Turning off Living Room Blank Switch"
- platform: template
name: Living Room None Switch
device_id:
id: test_switch_none_living_room
optimistic: true
turn_on_action:
- logger.log: "Turning on Living Room None Switch"
turn_off_action:
- logger.log: "Turning off Living Room None Switch"

View File

@@ -132,6 +132,7 @@ async def test_areas_and_devices(
"Temperature Sensor Reading": temp_sensor.device_id,
"Motion Detector Status": motion_detector.device_id,
"Smart Switch Power": smart_switch.device_id,
"Living Room Sensor": 0, # Main device
}
for entity in sensor_entities:
@@ -160,6 +161,18 @@ async def test_areas_and_devices(
"Should have a switch with device_id 0 (main device)"
)
# Verify extra switches with blank and none device_id are correctly available
extra_switches = [
e for e in switch_entities if e.name.startswith("Living Room")
]
assert len(extra_switches) == 2, (
f"Expected 2 extra switches for Living Room, got {len(extra_switches)}"
)
extra_switch_device_ids = [e.device_id for e in extra_switches]
assert all(d == 0 for d in extra_switch_device_ids), (
"All extra switches should have device_id 0 (main device)"
)
# Wait for initial states to be received for all switches
await asyncio.wait_for(initial_states_future, timeout=2.0)