Skip to content

Inconsistent entity_id when multiple sensors #16205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 3 commits into from
Aug 26, 2018
Merged

Inconsistent entity_id when multiple sensors #16205

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ba8823
Inconsistent entity_id when multiple sensors
grea09 Aug 26, 2018
3d08111
Line too long
grea09 Aug 26, 2018
6a05c17
Removing trailing whitespace
grea09 Aug 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions homeassistant/components/sensor/dnsip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@

_LOGGER = logging.getLogger(__name__)

CONF_NAME = 'name'
CONF_HOSTNAME = 'hostname'
CONF_RESOLVER = 'resolver'
CONF_RESOLVER_IPV6 = 'resolver_ipv6'
CONF_IPV6 = 'ipv6'

DEFAULT_NAME = 'myip'
DEFAULT_HOSTNAME = 'myip.opendns.com'
DEFAULT_RESOLVER = '208.67.222.222'
DEFAULT_RESOLVER_IPV6 = '2620:0:ccc::2'
Expand All @@ -32,6 +34,7 @@
SCAN_INTERVAL = timedelta(seconds=120)

PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_NAME): cv.string,
vol.Optional(CONF_HOSTNAME, default=DEFAULT_HOSTNAME): cv.string,
vol.Optional(CONF_RESOLVER, default=DEFAULT_RESOLVER): cv.string,
vol.Optional(CONF_RESOLVER_IPV6, default=DEFAULT_RESOLVER_IPV6): cv.string,
Expand All @@ -40,28 +43,34 @@


@asyncio.coroutine
def async_setup_platform(hass, config, async_add_entities,
discovery_info=None):
def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
"""Set up the DNS IP sensor."""
hostname = config.get(CONF_HOSTNAME)
name = config.get(CONF_NAME)
if not name:
if hostname == DEFAULT_HOSTNAME:
name = DEFAULT_NAME
else:
name = hostname
ipv6 = config.get(CONF_IPV6)
if ipv6:
resolver = config.get(CONF_RESOLVER_IPV6)
else:
resolver = config.get(CONF_RESOLVER)

async_add_entities([WanIpSensor(
hass, hostname, resolver, ipv6)], True)
async_add_devices([WanIpSensor(
hass, name, hostname, resolver, ipv6)], True)


class WanIpSensor(Entity):
"""Implementation of a DNS IP sensor."""

def __init__(self, hass, hostname, resolver, ipv6):
def __init__(self, hass, name, hostname, resolver, ipv6):
"""Initialize the sensor."""
import aiodns
self.hass = hass
self._name = hostname
self._name = name
self.hostname = hostname
self.resolver = aiodns.DNSResolver(loop=self.hass.loop)
self.resolver.nameservers = [resolver]
self.querytype = 'AAAA' if ipv6 else 'A'
Expand All @@ -80,7 +89,8 @@ def state(self):
@asyncio.coroutine
def async_update(self):
"""Get the current DNS IP address for hostname."""
response = yield from self.resolver.query(self._name, self.querytype)
response = yield from self.resolver.query(self.hostname,
self.querytype)
if response:
self._state = response[0].host
else:
Expand Down