diff --git a/homeassistant/components/fritz/device_tracker.py b/homeassistant/components/fritz/device_tracker.py index 6eb23d4b85e630..4da566376a6f8d 100644 --- a/homeassistant/components/fritz/device_tracker.py +++ b/homeassistant/components/fritz/device_tracker.py @@ -15,13 +15,14 @@ _LOGGER = logging.getLogger(__name__) -CONF_DEFAULT_IP = "169.254.1.1" # This IP is valid for all FRITZ!Box routers. +DEFAULT_HOST = "169.254.1.1" # This IP is valid for all FRITZ!Box routers. +DEFAULT_USERNAME = "admin" PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( { - vol.Optional(CONF_HOST, default=CONF_DEFAULT_IP): cv.string, - vol.Optional(CONF_PASSWORD, default="admin"): cv.string, - vol.Optional(CONF_USERNAME, default=""): cv.string, + vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string, + vol.Optional(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string, + vol.Optional(CONF_PASSWORD): cv.string, } ) @@ -40,7 +41,7 @@ def __init__(self, config): self.last_results = [] self.host = config[CONF_HOST] self.username = config[CONF_USERNAME] - self.password = config[CONF_PASSWORD] + self.password = config.get(CONF_PASSWORD) self.success_init = True # Establish a connection to the FRITZ!Box. diff --git a/homeassistant/components/fritzbox_callmonitor/sensor.py b/homeassistant/components/fritzbox_callmonitor/sensor.py index 40791458505c48..2656e07c3a5076 100644 --- a/homeassistant/components/fritzbox_callmonitor/sensor.py +++ b/homeassistant/components/fritzbox_callmonitor/sensor.py @@ -28,8 +28,10 @@ CONF_PREFIXES = "prefixes" DEFAULT_HOST = "169.254.1.1" # IP valid for all Fritz!Box routers +DEFAULT_USERNAME = "admin" DEFAULT_NAME = "Phone" DEFAULT_PORT = 1012 +DEFAULT_PHONEBOOK = 0 INTERVAL_RECONNECT = 60 @@ -48,9 +50,9 @@ vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string, vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port, - vol.Optional(CONF_PASSWORD, default="admin"): cv.string, - vol.Optional(CONF_USERNAME, default=""): cv.string, - vol.Optional(CONF_PHONEBOOK, default=0): cv.positive_int, + vol.Optional(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string, + vol.Optional(CONF_PASSWORD): cv.string, + vol.Optional(CONF_PHONEBOOK, default=DEFAULT_PHONEBOOK): cv.positive_int, vol.Optional(CONF_PREFIXES, default=[]): vol.All(cv.ensure_list, [cv.string]), } ) @@ -58,19 +60,19 @@ def setup_platform(hass, config, add_entities, discovery_info=None): """Set up Fritz!Box call monitor sensor platform.""" - name = config.get(CONF_NAME) - host = config.get(CONF_HOST) + name = config[CONF_NAME] + host = config[CONF_HOST] # Try to resolve a hostname; if it is already an IP, it will be returned as-is try: host = socket.gethostbyname(host) except OSError: _LOGGER.error("Could not resolve hostname %s", host) return - port = config.get(CONF_PORT) - username = config.get(CONF_USERNAME) + port = config[CONF_PORT] + username = config[CONF_USERNAME] password = config.get(CONF_PASSWORD) - phonebook_id = config.get(CONF_PHONEBOOK) - prefixes = config.get(CONF_PREFIXES) + phonebook_id = config[CONF_PHONEBOOK] + prefixes = config[CONF_PREFIXES] try: phonebook = FritzBoxPhonebook( diff --git a/homeassistant/components/fritzbox_netmonitor/sensor.py b/homeassistant/components/fritzbox_netmonitor/sensor.py index 5601ad5d74f0ca..13b822ae8a42b8 100644 --- a/homeassistant/components/fritzbox_netmonitor/sensor.py +++ b/homeassistant/components/fritzbox_netmonitor/sensor.py @@ -15,8 +15,8 @@ _LOGGER = logging.getLogger(__name__) -CONF_DEFAULT_NAME = "fritz_netmonitor" -CONF_DEFAULT_IP = "169.254.1.1" # This IP is valid for all FRITZ!Box routers. +DEFAULT_NAME = "fritz_netmonitor" +DEFAULT_HOST = "169.254.1.1" # This IP is valid for all FRITZ!Box routers. ATTR_BYTES_RECEIVED = "bytes_received" ATTR_BYTES_SENT = "bytes_sent" @@ -38,16 +38,16 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( { - vol.Optional(CONF_NAME, default=CONF_DEFAULT_NAME): cv.string, - vol.Optional(CONF_HOST, default=CONF_DEFAULT_IP): cv.string, + vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, + vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string, } ) def setup_platform(hass, config, add_entities, discovery_info=None): """Set up the FRITZ!Box monitor sensors.""" - name = config.get(CONF_NAME) - host = config.get(CONF_HOST) + name = config[CONF_NAME] + host = config[CONF_HOST] try: fstatus = FritzStatus(address=host)