From dfad8aa6dc866a9d260131dfef5cf6ce9be03c04 Mon Sep 17 00:00:00 2001 From: Robby Grossman Date: Fri, 5 Aug 2016 00:04:08 -0400 Subject: [PATCH] Remove 'remove node (secure)' service; is not a specialized implementation in Python-OZW and standard removal works fine. (#2730) --- homeassistant/components/services.yaml | 3 --- homeassistant/components/zwave.py | 7 ------- 2 files changed, 10 deletions(-) diff --git a/homeassistant/components/services.yaml b/homeassistant/components/services.yaml index 3068aed9e67..f9ecc007bd1 100644 --- a/homeassistant/components/services.yaml +++ b/homeassistant/components/services.yaml @@ -51,9 +51,6 @@ zwave: remove_node: description: Remove a node from the zwave network. Refer to OZW.log for details. - remove_node_secure: - description: Remove a node from the zwave network with secure communications. Node must support this, and network key must be set. Refer to OZW.log for details. - test_network: description: This will send test to nodes in the zwave network. This will greatly slow down the zwave network while it is being processed. Refer to OZW.log for details. diff --git a/homeassistant/components/zwave.py b/homeassistant/components/zwave.py index d31884d1767..7befeef0b95 100644 --- a/homeassistant/components/zwave.py +++ b/homeassistant/components/zwave.py @@ -34,7 +34,6 @@ NETWORK_READY_WAIT_SECS = 30 SERVICE_ADD_NODE = "add_node" SERVICE_ADD_NODE_SECURE = "add_node_secure" SERVICE_REMOVE_NODE = "remove_node" -SERVICE_REMOVE_NODE_SECURE = "remove_node_secure" SERVICE_HEAL_NETWORK = "heal_network" SERVICE_SOFT_RESET = "soft_reset" SERVICE_TEST_NETWORK = "test_network" @@ -414,10 +413,6 @@ def setup(hass, config): """Switch into exclusion mode.""" NETWORK.controller.remove_node() - def remove_node_secure(service): - """Switch into secure exclusion mode.""" - NETWORK.controller.remove_node(True) - def heal_network(service): """Heal the network.""" _LOGGER.info("ZWave heal running.") @@ -471,8 +466,6 @@ def setup(hass, config): hass.services.register(DOMAIN, SERVICE_ADD_NODE_SECURE, add_node_secure) hass.services.register(DOMAIN, SERVICE_REMOVE_NODE, remove_node) - hass.services.register(DOMAIN, SERVICE_REMOVE_NODE_SECURE, - remove_node_secure) hass.services.register(DOMAIN, SERVICE_HEAL_NETWORK, heal_network) hass.services.register(DOMAIN, SERVICE_SOFT_RESET, soft_reset) hass.services.register(DOMAIN, SERVICE_TEST_NETWORK, test_network)