Use Voluptuous for Luci and Netgear device trackers (#3123)

* Use Voluptuous for Luci and NEtgear device trackers

* str_schema shortcut

* Undo str_schema
This commit is contained in:
Johann Kellerman authored and Teagan Glenn committed 2016-09-05 11:37:36 -06:00
1 parent e0a6d7941c
commit 17a2cac7e1
2 files changed
+35 -30

No files matched your search

@@ -8,9 +8,12 @@ import logging
import threading
from datetime import timedelta
from homeassistant.components.device_tracker import DOMAIN
from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, \
CONF_PORT
import voluptuous as vol
import homeassistant.helpers.config_validation as cv
from homeassistant.components.device_tracker import DOMAIN, PLATFORM_SCHEMA
from homeassistant.const import (
CONF_HOST, CONF_PASSWORD, CONF_USERNAME, CONF_PORT)
from homeassistant.util import Throttle
# Return cached results if last scan was less then this time ago.
@@ -19,6 +22,17 @@ MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)
_LOGGER = logging.getLogger(__name__)
REQUIREMENTS = ['pynetgear==0.3.3']
DEFAULT_HOST = 'routerlogin.net'
DEFAULT_USER = 'admin'
DEFAULT_PORT = 5000
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
vol.Optional(CONF_USERNAME, default=DEFAULT_USER): cv.string,
vol.Required(CONF_PASSWORD): cv.string,
vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port
})
def get_scanner(hass, config):
"""Validate the configuration and returns a Netgear scanner."""
@@ -28,10 +42,6 @@ def get_scanner(hass, config):
password = info.get(CONF_PASSWORD)
port = info.get(CONF_PORT)
if password is not None and host is None:
_LOGGER.warning('Found username or password but no host')
return None
scanner = NetgearDeviceScanner(host, username, password, port)
return scanner if scanner.success_init else None
@@ -47,16 +57,9 @@ class NetgearDeviceScanner(object):
self.last_results = []
self.lock = threading.Lock()
if host is None:
self._api = pynetgear.Netgear()
elif username is None:
self._api = pynetgear.Netgear(password, host)
elif port is None:
self._api = pynetgear.Netgear(password, host, username)
else:
self._api = pynetgear.Netgear(password, host, username, port)
self._api = pynetgear.Netgear(password, host, username, port)
_LOGGER.info("Logging in")
_LOGGER.info('Logging in')
results = self._api.get_attached_devices()
@@ -65,7 +68,7 @@ class NetgearDeviceScanner(object):
if self.success_init:
self.last_results = results
else:
_LOGGER.error("Failed to Login")
_LOGGER.error('Failed to Login')
def scan_devices(self):
"""Scan for new devices and return a list with found device IDs."""
@@ -91,7 +94,7 @@ class NetgearDeviceScanner(object):
return
with self.lock:
_LOGGER.info("Scanning")
_LOGGER.info('Scanning')
results = self._api.get_attached_devices()