mirror of
https://github.com/home-assistant/core.git
synced 2025-07-23 21:27:38 +00:00
Clean up yaml configurations for all fritz integrations (#39995)
This commit is contained in:
parent
2b83af856f
commit
1366354725
@ -15,13 +15,14 @@ import homeassistant.helpers.config_validation as cv
|
|||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_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(
|
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
||||||
{
|
{
|
||||||
vol.Optional(CONF_HOST, default=CONF_DEFAULT_IP): cv.string,
|
vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
|
||||||
vol.Optional(CONF_PASSWORD, default="admin"): cv.string,
|
vol.Optional(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string,
|
||||||
vol.Optional(CONF_USERNAME, default=""): cv.string,
|
vol.Optional(CONF_PASSWORD): cv.string,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -40,7 +41,7 @@ class FritzBoxScanner(DeviceScanner):
|
|||||||
self.last_results = []
|
self.last_results = []
|
||||||
self.host = config[CONF_HOST]
|
self.host = config[CONF_HOST]
|
||||||
self.username = config[CONF_USERNAME]
|
self.username = config[CONF_USERNAME]
|
||||||
self.password = config[CONF_PASSWORD]
|
self.password = config.get(CONF_PASSWORD)
|
||||||
self.success_init = True
|
self.success_init = True
|
||||||
|
|
||||||
# Establish a connection to the FRITZ!Box.
|
# Establish a connection to the FRITZ!Box.
|
||||||
|
@ -28,8 +28,10 @@ CONF_PHONEBOOK = "phonebook"
|
|||||||
CONF_PREFIXES = "prefixes"
|
CONF_PREFIXES = "prefixes"
|
||||||
|
|
||||||
DEFAULT_HOST = "169.254.1.1" # IP valid for all Fritz!Box routers
|
DEFAULT_HOST = "169.254.1.1" # IP valid for all Fritz!Box routers
|
||||||
|
DEFAULT_USERNAME = "admin"
|
||||||
DEFAULT_NAME = "Phone"
|
DEFAULT_NAME = "Phone"
|
||||||
DEFAULT_PORT = 1012
|
DEFAULT_PORT = 1012
|
||||||
|
DEFAULT_PHONEBOOK = 0
|
||||||
|
|
||||||
INTERVAL_RECONNECT = 60
|
INTERVAL_RECONNECT = 60
|
||||||
|
|
||||||
@ -48,9 +50,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
|||||||
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
|
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
|
||||||
vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
|
vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
|
||||||
vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
|
vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
|
||||||
vol.Optional(CONF_PASSWORD, default="admin"): cv.string,
|
vol.Optional(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string,
|
||||||
vol.Optional(CONF_USERNAME, default=""): cv.string,
|
vol.Optional(CONF_PASSWORD): cv.string,
|
||||||
vol.Optional(CONF_PHONEBOOK, default=0): cv.positive_int,
|
vol.Optional(CONF_PHONEBOOK, default=DEFAULT_PHONEBOOK): cv.positive_int,
|
||||||
vol.Optional(CONF_PREFIXES, default=[]): vol.All(cv.ensure_list, [cv.string]),
|
vol.Optional(CONF_PREFIXES, default=[]): vol.All(cv.ensure_list, [cv.string]),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@ -58,19 +60,19 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
|||||||
|
|
||||||
def setup_platform(hass, config, add_entities, discovery_info=None):
|
def setup_platform(hass, config, add_entities, discovery_info=None):
|
||||||
"""Set up Fritz!Box call monitor sensor platform."""
|
"""Set up Fritz!Box call monitor sensor platform."""
|
||||||
name = config.get(CONF_NAME)
|
name = config[CONF_NAME]
|
||||||
host = config.get(CONF_HOST)
|
host = config[CONF_HOST]
|
||||||
# Try to resolve a hostname; if it is already an IP, it will be returned as-is
|
# Try to resolve a hostname; if it is already an IP, it will be returned as-is
|
||||||
try:
|
try:
|
||||||
host = socket.gethostbyname(host)
|
host = socket.gethostbyname(host)
|
||||||
except OSError:
|
except OSError:
|
||||||
_LOGGER.error("Could not resolve hostname %s", host)
|
_LOGGER.error("Could not resolve hostname %s", host)
|
||||||
return
|
return
|
||||||
port = config.get(CONF_PORT)
|
port = config[CONF_PORT]
|
||||||
username = config.get(CONF_USERNAME)
|
username = config[CONF_USERNAME]
|
||||||
password = config.get(CONF_PASSWORD)
|
password = config.get(CONF_PASSWORD)
|
||||||
phonebook_id = config.get(CONF_PHONEBOOK)
|
phonebook_id = config[CONF_PHONEBOOK]
|
||||||
prefixes = config.get(CONF_PREFIXES)
|
prefixes = config[CONF_PREFIXES]
|
||||||
|
|
||||||
try:
|
try:
|
||||||
phonebook = FritzBoxPhonebook(
|
phonebook = FritzBoxPhonebook(
|
||||||
|
@ -15,8 +15,8 @@ from homeassistant.util import Throttle
|
|||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
CONF_DEFAULT_NAME = "fritz_netmonitor"
|
DEFAULT_NAME = "fritz_netmonitor"
|
||||||
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.
|
||||||
|
|
||||||
ATTR_BYTES_RECEIVED = "bytes_received"
|
ATTR_BYTES_RECEIVED = "bytes_received"
|
||||||
ATTR_BYTES_SENT = "bytes_sent"
|
ATTR_BYTES_SENT = "bytes_sent"
|
||||||
@ -38,16 +38,16 @@ ICON = "mdi:web"
|
|||||||
|
|
||||||
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
||||||
{
|
{
|
||||||
vol.Optional(CONF_NAME, default=CONF_DEFAULT_NAME): cv.string,
|
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
|
||||||
vol.Optional(CONF_HOST, default=CONF_DEFAULT_IP): cv.string,
|
vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def setup_platform(hass, config, add_entities, discovery_info=None):
|
def setup_platform(hass, config, add_entities, discovery_info=None):
|
||||||
"""Set up the FRITZ!Box monitor sensors."""
|
"""Set up the FRITZ!Box monitor sensors."""
|
||||||
name = config.get(CONF_NAME)
|
name = config[CONF_NAME]
|
||||||
host = config.get(CONF_HOST)
|
host = config[CONF_HOST]
|
||||||
|
|
||||||
try:
|
try:
|
||||||
fstatus = FritzStatus(address=host)
|
fstatus = FritzStatus(address=host)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user