From 1075a65bbd770b2c7c07e9d28d019d5e27266a44 Mon Sep 17 00:00:00 2001 From: Raman Gupta <7243222+raman325@users.noreply.github.com> Date: Sat, 21 Aug 2021 00:09:27 -0400 Subject: [PATCH] Remove Configuration CC as choice in zwave_js value device condition (#54962) --- homeassistant/components/zwave_js/device_condition.py | 3 +++ tests/components/zwave_js/test_device_condition.py | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/zwave_js/device_condition.py b/homeassistant/components/zwave_js/device_condition.py index 4ae8142ec9e..861c15322b3 100644 --- a/homeassistant/components/zwave_js/device_condition.py +++ b/homeassistant/components/zwave_js/device_condition.py @@ -193,6 +193,8 @@ async def async_get_condition_capabilities( return {"extra_fields": vol.Schema({vol.Required(ATTR_VALUE): value_schema})} if config[CONF_TYPE] == VALUE_TYPE: + # Only show command classes on this node and exclude Configuration CC since it + # is already covered return { "extra_fields": vol.Schema( { @@ -200,6 +202,7 @@ async def async_get_condition_capabilities( { CommandClass(cc.id).value: CommandClass(cc.id).name for cc in sorted(node.command_classes, key=lambda cc: cc.name) # type: ignore[no-any-return] + if cc.id != CommandClass.CONFIGURATION } ), vol.Required(ATTR_PROPERTY): cv.string, diff --git a/tests/components/zwave_js/test_device_condition.py b/tests/components/zwave_js/test_device_condition.py index dd5507d4c0a..e9ed2266e10 100644 --- a/tests/components/zwave_js/test_device_condition.py +++ b/tests/components/zwave_js/test_device_condition.py @@ -433,7 +433,6 @@ async def test_get_condition_capabilities_value( cc_options = [ (133, "ASSOCIATION"), (128, "BATTERY"), - (112, "CONFIGURATION"), (98, "DOOR_LOCK"), (122, "FIRMWARE_UPDATE_MD"), (114, "MANUFACTURER_SPECIFIC"),