Make ZHA Scene channel an eventable channel. (home-assistant#32546)

Thrilleratplay · Mar 6, 2020 · dd91b51 · dd91b51
1 parent 28a5fca
commit dd91b51
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/homeassistant/components/zha/core/channels/general.py b/homeassistant/components/zha/core/channels/general.py
@@ -401,7 +401,7 @@ class RSSILocation(ZigbeeChannel):
     pass
 
 
-@registries.OUTPUT_CHANNEL_ONLY_CLUSTERS.register(general.Scenes.cluster_id)
+@registries.EVENT_RELAY_CLUSTERS.register(general.Scenes.cluster_id)
 @registries.ZIGBEE_CHANNEL_REGISTRY.register(general.Scenes.cluster_id)
 class Scenes(ZigbeeChannel):
     """Scenes channel."""

diff --git a/tests/components/zha/zha_devices_list.py b/tests/components/zha/zha_devices_list.py
@@ -627,7 +627,7 @@
                 "entity_id": "light.ikea_of_sweden_tradfri_bulb_e12_ws_opal_600lm_77665544_level_light_color_on_off",
             }
         },
-        "event_channels": [],
+        "event_channels": ["1:0x0005"],
         "manufacturer": "IKEA of Sweden",
         "model": "TRADFRI bulb E12 WS opal 600lm",
         "node_descriptor": b"\x01@\x8e|\x11RR\x00\x00,R\x00\x00",
@@ -653,7 +653,7 @@
                 "entity_id": "light.ikea_of_sweden_tradfri_bulb_e26_cws_opal_600lm_77665544_level_light_color_on_off",
             }
         },
-        "event_channels": [],
+        "event_channels": ["1:0x0005"],
         "manufacturer": "IKEA of Sweden",
         "model": "TRADFRI bulb E26 CWS opal 600lm",
         "node_descriptor": b"\x01@\x8e|\x11RR\x00\x00\x00R\x00\x00",
@@ -679,7 +679,7 @@
                 "entity_id": "light.ikea_of_sweden_tradfri_bulb_e26_w_opal_1000lm_77665544_level_on_off",
             }
         },
-        "event_channels": [],
+        "event_channels": ["1:0x0005"],
         "manufacturer": "IKEA of Sweden",
         "model": "TRADFRI bulb E26 W opal 1000lm",
         "node_descriptor": b"\x01@\x8e|\x11RR\x00\x00\x00R\x00\x00",
@@ -705,7 +705,7 @@
                 "entity_id": "light.ikea_of_sweden_tradfri_bulb_e26_ws_opal_980lm_77665544_level_light_color_on_off",
             }
         },
-        "event_channels": [],
+        "event_channels": ["1:0x0005"],
         "manufacturer": "IKEA of Sweden",
         "model": "TRADFRI bulb E26 WS opal 980lm",
         "node_descriptor": b"\x01@\x8e|\x11RR\x00\x00\x00R\x00\x00",
@@ -731,7 +731,7 @@
                 "entity_id": "light.ikea_of_sweden_tradfri_bulb_e26_opal_1000lm_77665544_level_on_off",
             }
         },
-        "event_channels": [],
+        "event_channels": ["1:0x0005"],
         "manufacturer": "IKEA of Sweden",
         "model": "TRADFRI bulb E26 opal 1000lm",
         "node_descriptor": b"\x01@\x8e|\x11RR\x00\x00\x00R\x00\x00",
@@ -755,7 +755,7 @@
                 "entity_id": "switch.ikea_of_sweden_tradfri_control_outlet_77665544_on_off",
             }
         },
-        "event_channels": [],
+        "event_channels": ["1:0x0005"],
         "manufacturer": "IKEA of Sweden",
         "model": "TRADFRI control outlet",
         "node_descriptor": b"\x01@\x8e|\x11RR\x00\x00,R\x00\x00",
@@ -838,7 +838,7 @@
                 "entity_id": "sensor.ikea_of_sweden_tradfri_remote_control_77665544_power",
             }
         },
-        "event_channels": ["1:0x0006", "1:0x0008"],
+        "event_channels": ["1:0x0005", "1:0x0006", "1:0x0008"],
         "manufacturer": "IKEA of Sweden",
         "model": "TRADFRI remote control",
         "node_descriptor": b"\x02@\x80|\x11RR\x00\x00\x00R\x00\x00",
@@ -1510,7 +1510,7 @@
                 "entity_id": "sensor.lumi_lumi_remote_b186acn01_77665544_multistate_input",
             },
         },
-        "event_channels": [],
+        "event_channels": ["1:0x0005", "2:0x0005", "3:0x0005"],
         "manufacturer": "LUMI",
         "model": "lumi.remote.b186acn01",
         "node_descriptor": b"\x02@\x807\x10\x7fd\x00\x00\x00d\x00\x00",
@@ -1569,7 +1569,7 @@
                 "entity_id": "sensor.lumi_lumi_remote_b286acn01_77665544_multistate_input",
             },
         },
-        "event_channels": [],
+        "event_channels": ["1:0x0005", "2:0x0005", "3:0x0005"],
         "manufacturer": "LUMI",
         "model": "lumi.remote.b286acn01",
         "node_descriptor": b"\x02@\x807\x10\x7fd\x00\x00\x00d\x00\x00",
@@ -1925,7 +1925,7 @@
                 "entity_id": "sensor.lumi_lumi_sensor_86sw1_77665544_multistate_input",
             },
         },
-        "event_channels": [],
+        "event_channels": ["1:0x0005", "2:0x0005", "3:0x0005"],
         "manufacturer": "LUMI",
         "model": "lumi.sensor_86sw1",
         "node_descriptor": b"\x02@\x807\x10\x7fd\x00\x00\x00d\x00\x00",
@@ -1978,7 +1978,7 @@
                 "entity_id": "sensor.lumi_lumi_sensor_cube_aqgl01_77665544_analog_input",
             },
         },
-        "event_channels": [],
+        "event_channels": ["1:0x0005", "2:0x0005", "3:0x0005"],
         "manufacturer": "LUMI",
         "model": "lumi.sensor_cube.aqgl01",
         "node_descriptor": b"\x02@\x807\x10\x7fd\x00\x00\x00d\x00\x00",
@@ -2031,7 +2031,7 @@
                 "entity_id": "sensor.lumi_lumi_sensor_ht_77665544_humidity",
             },
         },
-        "event_channels": [],
+        "event_channels": ["1:0x0005", "2:0x0005", "3:0x0005"],
         "manufacturer": "LUMI",
         "model": "lumi.sensor_ht",
         "node_descriptor": b"\x02@\x807\x10\x7fd\x00\x00\x00d\x00\x00",
@@ -2064,7 +2064,7 @@
                 "entity_id": "binary_sensor.lumi_lumi_sensor_magnet_77665544_on_off",
             },
         },
-        "event_channels": ["1:0x0006", "1:0x0008"],
+        "event_channels": ["1:0x0005", "1:0x0006", "1:0x0008"],
         "manufacturer": "LUMI",
         "model": "lumi.sensor_magnet",
         "node_descriptor": b"\x02@\x807\x10\x7fd\x00\x00\x00d\x00\x00",
@@ -2212,7 +2212,7 @@
                 "entity_id": "sensor.lumi_lumi_sensor_switch_77665544_power",
             }
         },
-        "event_channels": ["1:0x0006", "1:0x0008"],
+        "event_channels": ["1:0x0005", "1:0x0006", "1:0x0008"],
         "manufacturer": "LUMI",
         "model": "lumi.sensor_switch",
         "node_descriptor": b"\x02@\x807\x10\x7fd\x00\x00\x00d\x00\x00",
@@ -2349,7 +2349,7 @@
                 "entity_id": "binary_sensor.lumi_lumi_vibration_aq1_77665544_ias_zone",
             },
         },
-        "event_channels": [],
+        "event_channels": ["1:0x0005", "2:0x0005"],
         "manufacturer": "LUMI",
         "model": "lumi.vibration.aq1",
         "node_descriptor": b"\x02@\x807\x10\x7fd\x00\x00\x00d\x00\x00",
@@ -2704,21 +2704,27 @@
             }
         },
         "event_channels": [
+            "1:0x0005",
             "1:0x0006",
             "1:0x0008",
             "1:0x0300",
+            "2:0x0005",
             "2:0x0006",
             "2:0x0008",
             "2:0x0300",
+            "3:0x0005",
             "3:0x0006",
             "3:0x0008",
             "3:0x0300",
+            "4:0x0005",
             "4:0x0006",
             "4:0x0008",
             "4:0x0300",
+            "5:0x0005",
             "5:0x0006",
             "5:0x0008",
             "5:0x0300",
+            "6:0x0005",
             "6:0x0006",
             "6:0x0008",
             "6:0x0300",
@@ -2754,7 +2760,7 @@
                 "entity_id": "sensor.philips_rwl020_77665544_power",
             }
         },
-        "event_channels": ["1:0x0006", "1:0x0008"],
+        "event_channels": ["1:0x0005", "1:0x0006", "1:0x0008"],
         "manufacturer": "Philips",
         "model": "RWL020",
         "node_descriptor": b"\x02@\x80\x0b\x10G-\x00\x00\x00-\x00\x00",
@@ -2910,7 +2916,7 @@
                 "entity_id": "sensor.securifi_ltd_unk_model_77665544_electrical_measurement",
             },
         },
-        "event_channels": ["1:0x0006"],
+        "event_channels": ["1:0x0005", "1:0x0006"],
         "manufacturer": "Securifi Ltd.",
         "model": None,
         "node_descriptor": b"\x01@\x8e\x02\x10RR\x00\x00\x00R\x00\x00",