From c1595d5ceb7fbf7d097ef83d6c28ba15bd8ebb3a Mon Sep 17 00:00:00 2001
From: Raman Gupta <7243222+raman325@users.noreply.github.com>
Date: Wed, 18 Aug 2021 11:53:00 -0400
Subject: [PATCH] Only show zwave_js command classes that are on the node
 (#54794)

---
 .../components/zwave_js/device_condition.py         |  5 ++++-
 tests/components/zwave_js/test_device_condition.py  | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/zwave_js/device_condition.py b/homeassistant/components/zwave_js/device_condition.py
index b419230a0bd..4ae8142ec9e 100644
--- a/homeassistant/components/zwave_js/device_condition.py
+++ b/homeassistant/components/zwave_js/device_condition.py
@@ -197,7 +197,10 @@ async def async_get_condition_capabilities(
             "extra_fields": vol.Schema(
                 {
                     vol.Required(ATTR_COMMAND_CLASS): vol.In(
-                        {cc.value: cc.name for cc in CommandClass}
+                        {
+                            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]
+                        }
                     ),
                     vol.Required(ATTR_PROPERTY): cv.string,
                     vol.Optional(ATTR_PROPERTY_KEY): cv.string,
diff --git a/tests/components/zwave_js/test_device_condition.py b/tests/components/zwave_js/test_device_condition.py
index eef672c4c5b..0256981a726 100644
--- a/tests/components/zwave_js/test_device_condition.py
+++ b/tests/components/zwave_js/test_device_condition.py
@@ -430,7 +430,18 @@ async def test_get_condition_capabilities_value(
     )
     assert capabilities and "extra_fields" in capabilities
 
-    cc_options = [(cc.value, cc.name) for cc in CommandClass]
+    cc_options = [
+        (133, "ASSOCIATION"),
+        (128, "BATTERY"),
+        (112, "CONFIGURATION"),
+        (98, "DOOR_LOCK"),
+        (122, "FIRMWARE_UPDATE_MD"),
+        (114, "MANUFACTURER_SPECIFIC"),
+        (113, "ALARM"),
+        (152, "SECURITY"),
+        (99, "USER_CODE"),
+        (134, "VERSION"),
+    ]
 
     assert voluptuous_serialize.convert(
         capabilities["extra_fields"], custom_serializer=cv.custom_serializer