From 726acc38c6ef846c3cb16372fd6843c0361abb98 Mon Sep 17 00:00:00 2001
From: Raman Gupta <7243222+raman325@users.noreply.github.com>
Date: Sat, 21 Aug 2021 02:57:20 -0400
Subject: [PATCH] Improve Command Class choices for zwave_js device triggers
 and conditions (#54970)

---
 .../components/zwave_js/device_condition.py    |  2 +-
 .../components/zwave_js/device_trigger.py      |  2 +-
 .../zwave_js/test_device_condition.py          | 18 +++++++++---------
 .../components/zwave_js/test_device_trigger.py | 18 +++++++++---------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/homeassistant/components/zwave_js/device_condition.py b/homeassistant/components/zwave_js/device_condition.py
index 861c15322b3..2eac4b7d7b0 100644
--- a/homeassistant/components/zwave_js/device_condition.py
+++ b/homeassistant/components/zwave_js/device_condition.py
@@ -200,7 +200,7 @@ async def async_get_condition_capabilities(
                 {
                     vol.Required(ATTR_COMMAND_CLASS): vol.In(
                         {
-                            CommandClass(cc.id).value: CommandClass(cc.id).name
+                            CommandClass(cc.id).value: cc.name
                             for cc in sorted(node.command_classes, key=lambda cc: cc.name)  # type: ignore[no-any-return]
                             if cc.id != CommandClass.CONFIGURATION
                         }
diff --git a/homeassistant/components/zwave_js/device_trigger.py b/homeassistant/components/zwave_js/device_trigger.py
index d2f7c18ca78..e0588e0ea4e 100644
--- a/homeassistant/components/zwave_js/device_trigger.py
+++ b/homeassistant/components/zwave_js/device_trigger.py
@@ -497,7 +497,7 @@ async def async_get_trigger_capabilities(
                 {
                     vol.Required(ATTR_COMMAND_CLASS): vol.In(
                         {
-                            CommandClass(cc.id).value: CommandClass(cc.id).name
+                            CommandClass(cc.id).value: cc.name
                             for cc in sorted(node.command_classes, key=lambda cc: cc.name)  # type: ignore[no-any-return]
                             if cc.id != CommandClass.CONFIGURATION
                         }
diff --git a/tests/components/zwave_js/test_device_condition.py b/tests/components/zwave_js/test_device_condition.py
index e9ed2266e10..73ac9957071 100644
--- a/tests/components/zwave_js/test_device_condition.py
+++ b/tests/components/zwave_js/test_device_condition.py
@@ -431,15 +431,15 @@ async def test_get_condition_capabilities_value(
     assert capabilities and "extra_fields" in capabilities
 
     cc_options = [
-        (133, "ASSOCIATION"),
-        (128, "BATTERY"),
-        (98, "DOOR_LOCK"),
-        (122, "FIRMWARE_UPDATE_MD"),
-        (114, "MANUFACTURER_SPECIFIC"),
-        (113, "NOTIFICATION"),
-        (152, "SECURITY"),
-        (99, "USER_CODE"),
-        (134, "VERSION"),
+        (133, "Association"),
+        (128, "Battery"),
+        (98, "Door Lock"),
+        (122, "Firmware Update Meta Data"),
+        (114, "Manufacturer Specific"),
+        (113, "Notification"),
+        (152, "Security"),
+        (99, "User Code"),
+        (134, "Version"),
     ]
 
     assert voluptuous_serialize.convert(
diff --git a/tests/components/zwave_js/test_device_trigger.py b/tests/components/zwave_js/test_device_trigger.py
index f593bb406e8..c7cd8e23943 100644
--- a/tests/components/zwave_js/test_device_trigger.py
+++ b/tests/components/zwave_js/test_device_trigger.py
@@ -1085,15 +1085,15 @@ async def test_get_trigger_capabilities_value_updated_value(
             "required": True,
             "type": "select",
             "options": [
-                (133, "ASSOCIATION"),
-                (128, "BATTERY"),
-                (98, "DOOR_LOCK"),
-                (122, "FIRMWARE_UPDATE_MD"),
-                (114, "MANUFACTURER_SPECIFIC"),
-                (113, "NOTIFICATION"),
-                (152, "SECURITY"),
-                (99, "USER_CODE"),
-                (134, "VERSION"),
+                (133, "Association"),
+                (128, "Battery"),
+                (98, "Door Lock"),
+                (122, "Firmware Update Meta Data"),
+                (114, "Manufacturer Specific"),
+                (113, "Notification"),
+                (152, "Security"),
+                (99, "User Code"),
+                (134, "Version"),
             ],
         },
         {"name": "property", "required": True, "type": "string"},