From 75a3747f61d2d692b97590623e639add0d9466f3 Mon Sep 17 00:00:00 2001
From: Adam Mills <adam@armills.info>
Date: Wed, 5 Apr 2017 08:11:37 -0400
Subject: [PATCH] Rename zwave nodes by node ID instead of entity ID (#6938)

---
 homeassistant/components/zwave/__init__.py   | 5 ++---
 homeassistant/components/zwave/services.yaml | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/homeassistant/components/zwave/__init__.py b/homeassistant/components/zwave/__init__.py
index efef8b39b64..f8903fd28cf 100755
--- a/homeassistant/components/zwave/__init__.py
+++ b/homeassistant/components/zwave/__init__.py
@@ -68,7 +68,7 @@ DATA_ZWAVE_DICT = 'zwave_devices'
 NETWORK = None
 
 RENAME_NODE_SCHEMA = vol.Schema({
-    vol.Required(ATTR_ENTITY_ID): cv.entity_id,
+    vol.Required(const.ATTR_NODE_ID): vol.Coerce(int),
     vol.Required(const.ATTR_NAME): cv.string,
 })
 SET_CONFIG_PARAMETER_SCHEMA = vol.Schema({
@@ -393,8 +393,7 @@ def setup(hass, config):
 
     def rename_node(service):
         """Rename a node."""
-        state = hass.states.get(service.data.get(ATTR_ENTITY_ID))
-        node_id = state.attributes.get(const.ATTR_NODE_ID)
+        node_id = service.data.get(const.ATTR_NODE_ID)
         node = NETWORK.nodes[node_id]
         name = service.data.get(const.ATTR_NAME)
         node.name = name
diff --git a/homeassistant/components/zwave/services.yaml b/homeassistant/components/zwave/services.yaml
index f7ff285fe79..166bd4e6f81 100644
--- a/homeassistant/components/zwave/services.yaml
+++ b/homeassistant/components/zwave/services.yaml
@@ -102,9 +102,9 @@ test_network:
 rename_node:
   description: Set the name(s) of a node.
   fields:
-    entity_id:
-      description: Name(s) of entities to to rename
-      example: 'light.leviton_vrmx11lz_multilevel_scene_switch_level_40'
+    node_id:
+      description: ID of the node to rename.
+      example: 10
     name:
       description: New Name
       example: 'kitchen'