From b71773fd1d93188ca25505ae71a37c57a65fa239 Mon Sep 17 00:00:00 2001
From: Raman Gupta <7243222+raman325@users.noreply.github.com>
Date: Mon, 25 Oct 2021 17:54:13 -0400
Subject: [PATCH] Set entity_category for node status sensor (#58434)

---
 homeassistant/components/zwave_js/sensor.py |  2 +-
 tests/components/zwave_js/test_sensor.py    | 21 +++------------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/homeassistant/components/zwave_js/sensor.py b/homeassistant/components/zwave_js/sensor.py
index 815158ee967..715affe351e 100644
--- a/homeassistant/components/zwave_js/sensor.py
+++ b/homeassistant/components/zwave_js/sensor.py
@@ -456,7 +456,7 @@ class ZWaveNodeStatusSensor(SensorEntity):
     """Representation of a node status sensor."""
 
     _attr_should_poll = False
-    _attr_entity_registry_enabled_default = False
+    _attr_entity_category = ENTITY_CATEGORY_DIAGNOSTIC
 
     def __init__(
         self, config_entry: ConfigEntry, client: ZwaveClient, node: ZwaveNode
diff --git a/tests/components/zwave_js/test_sensor.py b/tests/components/zwave_js/test_sensor.py
index 9e77d877b5c..de290e14760 100644
--- a/tests/components/zwave_js/test_sensor.py
+++ b/tests/components/zwave_js/test_sensor.py
@@ -166,16 +166,9 @@ async def test_node_status_sensor(hass, client, lock_id_lock_as_id150, integrati
     node = lock_id_lock_as_id150
     ent_reg = er.async_get(hass)
     entity_entry = ent_reg.async_get(NODE_STATUS_ENTITY)
-    assert entity_entry.disabled
-    assert entity_entry.disabled_by == er.DISABLED_INTEGRATION
-    updated_entry = ent_reg.async_update_entity(
-        entity_entry.entity_id, **{"disabled_by": None}
-    )
 
-    await hass.config_entries.async_reload(integration.entry_id)
-    await hass.async_block_till_done()
-
-    assert not updated_entry.disabled
+    assert not entity_entry.disabled
+    assert entity_entry.entity_category == ENTITY_CATEGORY_DIAGNOSTIC
     assert hass.states.get(NODE_STATUS_ENTITY).state == "alive"
 
     # Test transitions work
@@ -227,16 +220,8 @@ async def test_node_status_sensor_not_ready(
     assert not node.ready
     ent_reg = er.async_get(hass)
     entity_entry = ent_reg.async_get(NODE_STATUS_ENTITY)
-    assert entity_entry.disabled
-    assert entity_entry.disabled_by == er.DISABLED_INTEGRATION
-    updated_entry = ent_reg.async_update_entity(
-        entity_entry.entity_id, **{"disabled_by": None}
-    )
 
-    await hass.config_entries.async_reload(integration.entry_id)
-    await hass.async_block_till_done()
-
-    assert not updated_entry.disabled
+    assert not entity_entry.disabled
     assert hass.states.get(NODE_STATUS_ENTITY)
     assert hass.states.get(NODE_STATUS_ENTITY).state == "alive"