From 1ffe34b6d62737ece21424e6e3c92bbcb14cc369 Mon Sep 17 00:00:00 2001 From: Robbie Trencheny Date: Sat, 6 May 2017 19:32:41 -0700 Subject: [PATCH 1/2] Add network_key as a config option --- homeassistant/components/zwave/__init__.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/homeassistant/components/zwave/__init__.py b/homeassistant/components/zwave/__init__.py index 19a813c1ed6a16..fadf2c61db38d2 100755 --- a/homeassistant/components/zwave/__init__.py +++ b/homeassistant/components/zwave/__init__.py @@ -53,6 +53,7 @@ CONF_DEVICE_CONFIG = 'device_config' CONF_DEVICE_CONFIG_GLOB = 'device_config_glob' CONF_DEVICE_CONFIG_DOMAIN = 'device_config_domain' +CONF_NETWORK_KEY = 'network_key' ATTR_POWER = 'power_consumption' @@ -122,6 +123,7 @@ DOMAIN: vol.Schema({ vol.Optional(CONF_AUTOHEAL, default=DEFAULT_CONF_AUTOHEAL): cv.boolean, vol.Optional(CONF_CONFIG_PATH): cv.string, + vol.Optional(CONF_NETWORK_KEY): cv.string, vol.Optional(CONF_DEVICE_CONFIG, default={}): vol.Schema({cv.entity_id: DEVICE_CONFIG_SCHEMA_ENTRY}), vol.Optional(CONF_DEVICE_CONFIG_GLOB, default={}): @@ -242,6 +244,10 @@ def setup(hass, config): config_path=config[DOMAIN].get(CONF_CONFIG_PATH)) options.set_console_output(use_debug) + + if config[DOMAIN][CONF_NETWORK_KEY] is not None: + options.addOption("NetworkKey", config[DOMAIN][CONF_NETWORK_KEY]) + options.lock() network = hass.data[ZWAVE_NETWORK] = ZWaveNetwork(options, autostart=False) From 8155223d4a72ed13f4d8d25574e9ade8b12bda9d Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 17 May 2017 18:40:12 -0700 Subject: [PATCH 2/2] Update __init__.py --- homeassistant/components/zwave/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/zwave/__init__.py b/homeassistant/components/zwave/__init__.py index fadf2c61db38d2..76e3390e467054 100755 --- a/homeassistant/components/zwave/__init__.py +++ b/homeassistant/components/zwave/__init__.py @@ -245,7 +245,7 @@ def setup(hass, config): options.set_console_output(use_debug) - if config[DOMAIN][CONF_NETWORK_KEY] is not None: + if CONF_NETWORK_KEY in config[DOMAIN]: options.addOption("NetworkKey", config[DOMAIN][CONF_NETWORK_KEY]) options.lock()