Add ability to have same entity names on different sub devices (#9355)

Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>

tests/integration/fixtures/areas_and_devices.yaml

@@ -54,3 +54,45 @@ sensor:
     device_id: smart_switch_device
     lambda: return 4.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)
+  - platform: template
+    name: Test Switch
+    id: test_switch_main
+    optimistic: true
+    turn_on_action:
+      - logger.log: "Turning on Test Switch on Main Device (no device_id)"
+    turn_off_action:
+      - logger.log: "Turning off Test Switch on Main Device (no device_id)"
+
+  - platform: template
+    name: Test Switch
+    device_id: light_controller_device
+    id: test_switch_light_controller
+    optimistic: true
+    turn_on_action:
+      - logger.log: "Turning on Test Switch on Light Controller"
+    turn_off_action:
+      - logger.log: "Turning off Test Switch on Light Controller"
+
+  - platform: template
+    name: Test Switch
+    device_id: temp_sensor_device
+    id: test_switch_temp_sensor
+    optimistic: true
+    turn_on_action:
+      - logger.log: "Turning on Test Switch on Temperature Sensor"
+    turn_off_action:
+      - logger.log: "Turning off Test Switch on Temperature Sensor"
+
+  - platform: template
+    name: Test Switch
+    device_id: motion_detector_device
+    id: test_switch_motion_detector
+    optimistic: true
+    turn_on_action:
+      - logger.log: "Turning on Test Switch on Motion Detector"
+    turn_off_action:
+      - logger.log: "Turning off Test Switch on Motion Detector"

tests/integration/fixtures/duplicate_entities_on_different_devices.yaml

@@ -1,6 +1,6 @@
 esphome:
   name: duplicate-entities-test
-  # Define devices to test multi-device unique name validation
+  # Define devices to test multi-device duplicate handling
   devices:
     - id: controller_1
       name: Controller 1
@@ -13,31 +13,31 @@ host:
 api:  # Port will be automatically injected
 logger:
 
-# Test that duplicate entity names are NOT allowed on different devices
+# Test that duplicate entity names are allowed on different devices
 
-# Scenario 1: Different sensor names on different devices (allowed)
+# Scenario 1: Same sensor name on different devices (allowed)
 sensor:
   - platform: template
-    name: Temperature Controller 1
+    name: Temperature
     device_id: controller_1
     lambda: return 21.0;
     update_interval: 0.1s
 
   - platform: template
-    name: Temperature Controller 2
+    name: Temperature
     device_id: controller_2
     lambda: return 22.0;
     update_interval: 0.1s
 
   - platform: template
-    name: Temperature Controller 3
+    name: Temperature
     device_id: controller_3
     lambda: return 23.0;
     update_interval: 0.1s
 
   # Main device sensor (no device_id)
   - platform: template
-    name: Temperature Main
+    name: Temperature
     lambda: return 20.0;
     update_interval: 0.1s
 
@@ -47,20 +47,20 @@ sensor:
     lambda: return 60.0;
     update_interval: 0.1s
 
-# Scenario 2: Different binary sensor names on different devices
+# Scenario 2: Same binary sensor name on different devices (allowed)
 binary_sensor:
   - platform: template
-    name: Status Controller 1
+    name: Status
     device_id: controller_1
     lambda: return true;
 
   - platform: template
-    name: Status Controller 2
+    name: Status
     device_id: controller_2
     lambda: return false;
 
   - platform: template
-    name: Status Main
+    name: Status
     lambda: return true;  # Main device
 
   # Different platform can have same name as sensor
@@ -68,43 +68,43 @@ binary_sensor:
     name: Temperature
     lambda: return true;
 
-# Scenario 3: Different text sensor names on different devices
+# Scenario 3: Same text sensor name on different devices
 text_sensor:
   - platform: template
-    name: Device Info Controller 1
+    name: Device Info
     device_id: controller_1
     lambda: return {"Controller 1 Active"};
     update_interval: 0.1s
 
   - platform: template
-    name: Device Info Controller 2
+    name: Device Info
     device_id: controller_2
     lambda: return {"Controller 2 Active"};
     update_interval: 0.1s
 
   - platform: template
-    name: Device Info Main
+    name: Device Info
     lambda: return {"Main Device Active"};
     update_interval: 0.1s
 
-# Scenario 4: Different switch names on different devices
+# Scenario 4: Same switch name on different devices
 switch:
   - platform: template
-    name: Power Controller 1
+    name: Power
     device_id: controller_1
     lambda: return false;
     turn_on_action: []
     turn_off_action: []
 
   - platform: template
-    name: Power Controller 2
+    name: Power
     device_id: controller_2
     lambda: return true;
     turn_on_action: []
     turn_off_action: []
 
   - platform: template
-    name: Power Controller 3
+    name: Power
     device_id: controller_3
     lambda: return false;
     turn_on_action: []
@@ -117,54 +117,26 @@ switch:
     turn_on_action: []
     turn_off_action: []
 
-# Scenario 5: Buttons with unique names
+# Scenario 5: Empty names on different devices (should use device name)
 button:
   - platform: template
-    name: "Reset Controller 1"
+    name: ""
     device_id: controller_1
     on_press: []
 
   - platform: template
-    name: "Reset Controller 2"
+    name: ""
     device_id: controller_2
     on_press: []
 
   - platform: template
-    name: "Reset Main"
+    name: ""
     on_press: []  # Main device
 
-# Scenario 6: Empty names (should use device names)
-select:
-  - platform: template
-    name: ""
-    device_id: controller_1
-    options:
-      - "Option 1"
-      - "Option 2"
-    lambda: return {"Option 1"};
-    set_action: []
-
-  - platform: template
-    name: ""
-    device_id: controller_2
-    options:
-      - "Option 1"
-      - "Option 2"
-    lambda: return {"Option 1"};
-    set_action: []
-
-  - platform: template
-    name: ""  # Main device
-    options:
-      - "Option 1"
-      - "Option 2"
-    lambda: return {"Option 1"};
-    set_action: []
-
-# Scenario 7: Special characters in names - now with unique names
+# Scenario 6: Special characters in names
 number:
   - platform: template
-    name: "Temperature Setpoint! Controller 1"
+    name: "Temperature Setpoint!"
     device_id: controller_1
     min_value: 10.0
     max_value: 30.0
@@ -173,7 +145,7 @@ number:
     set_action: []
 
   - platform: template
-    name: "Temperature Setpoint! Controller 2"
+    name: "Temperature Setpoint!"
     device_id: controller_2
     min_value: 10.0
     max_value: 30.0